diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 69e225bb3b15..90a2fd441272 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -106,6 +106,11 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
 - [ ] If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
     - [ ] I verified that all the inputs inside a form are aligned with each other.
     - [ ] I added `Design` label and/or tagged `@Expensify/design` so the design team can review the changes.
+- [ ] If the PR adds or modifies the UI:
+    - [ ] I asked an AI agent to review the changes for accessibility issues and addressed its findings.
+    - [ ] I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
+    - [ ] I verified all new/changed elements have meaningful accessible names and roles.
+    - [ ] I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
 - [ ] I added [unit tests](https://github.com/Expensify/App/blob/main/tests/README.md) for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
 - [ ] If the `main` branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the `Test` steps.
 
diff --git a/.github/actions/composite/uploadSentrySizeAnalysis/action.yml b/.github/actions/composite/uploadSentrySizeAnalysis/action.yml
index 153279494c81..32dd91ca5c58 100644
--- a/.github/actions/composite/uploadSentrySizeAnalysis/action.yml
+++ b/.github/actions/composite/uploadSentrySizeAnalysis/action.yml
@@ -61,9 +61,17 @@ runs:
         ASSET: ${{ inputs.asset-name }}
         PLATFORM: ${{ inputs.platform }}
       run: |
+        # Capture the exit code so bash -e does not discard the CLI diagnostic on failure
+        set +e
         OUTPUT=$(npx sentry-cli build upload "$ASSET" \
           --org expensify --project app --build-configuration Release --log-level info 2>&1)
+        EXIT_CODE=$?
+        set -e
         echo "$OUTPUT"
+        if [ "$EXIT_CODE" -ne 0 ]; then
+          echo "::error::${PLATFORM} Sentry size-analysis upload failed (exit $EXIT_CODE)"
+          exit "$EXIT_CODE"
+        fi
         SENTRY_URL=$(echo "$OUTPUT" | grep -oE 'https://expensify\.sentry\.io/[^ )"}]+' | head -1)
         if [ -n "$SENTRY_URL" ]; then
           echo "::notice::${PLATFORM} Sentry size analysis: $SENTRY_URL"
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index ba528f117579..62a50ec22616 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -26670,6 +26670,12 @@ function getDeployTableMessage(platformResult) {
       return `${platformResult} \u274C`;
   }
 }
+function parseDeployList(input) {
+  if (!Array.isArray(input) || input.some((item) => typeof item !== "string" && typeof item !== "number")) {
+    throw new TypeError("Deploy pull request list must be an array of strings or numbers");
+  }
+  return input.map((item) => Number.parseInt(String(item), 10));
+}
 async function commentPR(PR, message, repo = context2.repo.repo) {
   try {
     await GithubUtils_default.createComment(repo, PR, message);
@@ -26716,7 +26722,10 @@ async function commentOnDeployChecklistPRs(prList, repoName, recentTags, getDepl
         const deployMessage = deployer ? getDeployMessage(deployer, isCP ? "Cherry-picked" : "Deployed", title) : "";
         await commentPR(prNumber, deployMessage, repoName);
       } catch (error2) {
-        if (error2.status === 404) {
+        if (error2 === null || error2 === void 0) {
+          throw new TypeError(`Cannot read properties of ${String(error2)} (reading 'status')`);
+        }
+        if ((typeof error2 === "object" || typeof error2 === "function") && "status" in error2 && error2.status === 404) {
           console.log(`Unable to comment on ${repoName} PR #${prNumber}. GitHub responded with 404.`);
         } else if (repoName === CONST_default.MOBILE_EXPENSIFY_REPO && process.env.GITHUB_REPOSITORY !== `${CONST_default.GITHUB_OWNER}/${CONST_default.APP_REPO}`) {
           console.warn(`Unable to comment on ${repoName} PR #${prNumber} from forked repository. This is expected.`);
@@ -26729,10 +26738,10 @@ async function commentOnDeployChecklistPRs(prList, repoName, recentTags, getDepl
   await Promise.all(commentPromises);
 }
 async function run() {
-  const prList = getJSONInput("PR_LIST", { required: true }).map((num) => Number.parseInt(num, 10));
+  const prList = parseDeployList(getJSONInput("PR_LIST", { required: true }));
   const mobileExpensifyPRListInput = getJSONInput("MOBILE_EXPENSIFY_PR_LIST", { required: false });
-  const mobileExpensifyPRList = Array.isArray(mobileExpensifyPRListInput) ? mobileExpensifyPRListInput.map((num) => Number.parseInt(num, 10)) : [];
-  const isProd = getJSONInput("IS_PRODUCTION_DEPLOY", {
+  const mobileExpensifyPRList = Array.isArray(mobileExpensifyPRListInput) ? parseDeployList(mobileExpensifyPRListInput) : [];
+  const isProd = !!getJSONInput("IS_PRODUCTION_DEPLOY", {
     required: true
   });
   const version = getInput("DEPLOY_VERSION", { required: true });
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts
index addf9aa3b931..0ea99f581d39 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts
@@ -5,18 +5,14 @@ import GithubUtils from '@github/libs/GithubUtils';
 
 import PromisePool from '@scripts/utils/PromisePool';
 
-import type {RequestError} from '@octokit/types';
-
 import * as core from '@actions/core';
 import {context} from '@actions/github';
 import memoize from 'lodash/memoize';
 
-type PlatformResult = 'success' | 'cancelled' | 'skipped' | 'failure';
-
 /**
  * Return a nicely formatted message for the table based on the result of the GitHub action job
  */
-function getDeployTableMessage(platformResult: PlatformResult): string {
+function getDeployTableMessage(platformResult: string): string {
     switch (platformResult) {
         case 'success':
             return `${platformResult} ✅`;
@@ -30,6 +26,14 @@ function getDeployTableMessage(platformResult: PlatformResult): string {
     }
 }
 
+function parseDeployList(input: unknown): number[] {
+    if (!Array.isArray(input) || input.some((item) => typeof item !== 'string' && typeof item !== 'number')) {
+        throw new TypeError('Deploy pull request list must be an array of strings or numbers');
+    }
+
+    return input.map((item) => Number.parseInt(String(item), 10));
+}
+
 async function commentPR(PR: number, message: string, repo: string = context.repo.repo) {
     try {
         await GithubUtils.createComment(repo, PR, message);
@@ -90,7 +94,11 @@ async function commentOnDeployChecklistPRs(
                 const deployMessage = deployer ? getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', title) : '';
                 await commentPR(prNumber, deployMessage, repoName);
             } catch (error) {
-                if ((error as RequestError).status === 404) {
+                // Preserve the former direct `.status` access ordering for nullish rejections.
+                if (error === null || error === undefined) {
+                    throw new TypeError(`Cannot read properties of ${String(error)} (reading 'status')`);
+                }
+                if ((typeof error === 'object' || typeof error === 'function') && 'status' in error && error.status === 404) {
                     console.log(`Unable to comment on ${repoName} PR #${prNumber}. GitHub responded with 404.`);
                 } else if (repoName === CONST.MOBILE_EXPENSIFY_REPO && process.env.GITHUB_REPOSITORY !== `${CONST.GITHUB_OWNER}/${CONST.APP_REPO}`) {
                     console.warn(`Unable to comment on ${repoName} PR #${prNumber} from forked repository. This is expected.`);
@@ -105,17 +113,17 @@ async function commentOnDeployChecklistPRs(
 }
 
 async function run() {
-    const prList = (ActionUtils.getJSONInput('PR_LIST', {required: true}) as string[]).map((num) => Number.parseInt(num, 10));
+    const prList = parseDeployList(ActionUtils.getJSONInput('PR_LIST', {required: true}));
     const mobileExpensifyPRListInput = ActionUtils.getJSONInput('MOBILE_EXPENSIFY_PR_LIST', {required: false});
-    const mobileExpensifyPRList = Array.isArray(mobileExpensifyPRListInput) ? mobileExpensifyPRListInput.map((num: string) => Number.parseInt(num, 10)) : [];
-    const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {
+    const mobileExpensifyPRList = Array.isArray(mobileExpensifyPRListInput) ? parseDeployList(mobileExpensifyPRListInput) : [];
+    const isProd = !!ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {
         required: true,
-    }) as boolean;
+    });
     const version = core.getInput('DEPLOY_VERSION', {required: true});
 
-    const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}) as PlatformResult);
-    const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}) as PlatformResult);
-    const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}) as PlatformResult);
+    const androidResult = getDeployTableMessage(core.getInput('ANDROID', {required: true}));
+    const iOSResult = getDeployTableMessage(core.getInput('IOS', {required: true}));
+    const webResult = getDeployTableMessage(core.getInput('WEB', {required: true}));
 
     const date = core.getInput('DATE');
     const note = core.getInput('NOTE');
diff --git a/.github/scripts/syncVersions.sh b/.github/scripts/syncVersions.sh
index 6a961183fa6a..eed20edf5d22 100755
--- a/.github/scripts/syncVersions.sh
+++ b/.github/scripts/syncVersions.sh
@@ -17,16 +17,17 @@
 #     with push access to App main.
 #   - GITHUB_OUTPUT: written by `check` and `sync` (defaults to /dev/null outside GitHub Actions).
 #   - TARGET_VERSION (sync, optional): version to sync to. Must equal the Mobile-Expensify version,
-#     since only the App side is rewritten and the final verification compares the two. Empty means
-#     "use the Mobile-Expensify version".
+#     since only the App side is rewritten and the final verification compares the two. Anything else
+#     is rejected before the sync writes or pushes. Empty means "use the Mobile-Expensify version".
 #   - NEED_FULL_VERSION_SYNC (sync): 'true' to rewrite versions, anything else to only bump the
 #     submodule pointer. Threaded from `check` so exactly one decision exists across both steps.
 #   - EXPECTED_SUBMODULE_SHA (sync): Mobile-Expensify SHA `check` updated to. The submodule-only
-#     path asserts against it so a checkout that moved in between is caught.
+#     path asserts against it so a checkout that moved in between is caught, and verification uses
+#     it to tell "this sync went wrong" apart from "Mobile-Expensify moved on again".
 #
 # Outputs (via GITHUB_OUTPUT):
 #   - check: IN_SYNC, NEED_FULL_VERSION_SYNC, ACTUAL_SHA
-#   - sync:  POST_SYNC_APP_VERSION
+#   - sync:  POST_SYNC_APP_VERSION, SUBMODULE_MATCHES_REMOTE
 #
 # Side effects:
 #   - `check` is not read-only: it runs `git submodule update --remote`.
@@ -96,17 +97,25 @@ function update_ios_versions {
 }
 
 function resolve_target_version {
-    if [[ -n "$TARGET_VERSION" ]]; then
-        echo "Using provided target version: $TARGET_VERSION" >&2
-        echo "$TARGET_VERSION"
-        return
-    fi
-
     # Use Mobile-Expensify version as source of truth since it was pushed first
     local me_version
     me_version="$(get_mobile_expensify_version)"
-    echo "Using Mobile-Expensify version as target: $me_version" >&2
-    echo "$me_version"
+
+    if [[ -z "$TARGET_VERSION" ]]; then
+        echo "Using Mobile-Expensify version as target: $me_version" >&2
+        echo "$me_version"
+        return
+    fi
+
+    # Only the App side is rewritten, so any other target fails verification -- after the commits
+    # have already been pushed to main. Reject it before anything is written.
+    if [[ "$TARGET_VERSION" != "$me_version" ]]; then
+        echo "::error::TARGET_VERSION ($TARGET_VERSION) must match the Mobile-Expensify version ($me_version)" >&2
+        exit 1
+    fi
+
+    echo "Using provided target version: $TARGET_VERSION" >&2
+    echo "$TARGET_VERSION"
 }
 
 function cmd_check {
@@ -168,10 +177,12 @@ function sync_full_version {
     git add package.json package-lock.json android/app/build.gradle ios/*/Info.plist
     git commit -m "Update version to $target (sync recovery)"
 
-    # Stages the submodule's checked-out HEAD, which is the commit `check` moved it to with
-    # --remote, not whatever main currently records.
+    # Stages the submodule's checked-out HEAD, the commit `check` moved it to with --remote. That can
+    # already be what main records, when a previous sync got this far and then died, hence the guard.
     git add Mobile-Expensify
-    git commit -m "Update Mobile-Expensify submodule version to $target (sync recovery)"
+    if ! git diff --staged --quiet; then
+        git commit -m "Update Mobile-Expensify submodule version to $target (sync recovery)"
+    fi
 
     # main is busy enough that another merge can land between `check` and here, which makes this
     # push non fast-forward.
@@ -233,12 +244,25 @@ function verify_sync {
     recorded=$(git rev-parse HEAD:Mobile-Expensify)
     remote_sha=$(git -C Mobile-Expensify rev-parse origin/main)
     if [[ "$recorded" != "$remote_sha" ]]; then
-        echo "::error::Submodule on App main ($recorded) still differs from Mobile-Expensify origin/main ($remote_sha)"
-        exit 1
+        # Mobile-Expensify main can advance mid-run, which is likely because a deployer triggers this
+        # during a deploy. Recording what `check` pinned is still a successful sync, so report it and
+        # let the next run collect the newer commit.
+        if [[ "$recorded" == "$EXPECTED_SUBMODULE_SHA" ]]; then
+            echo "::warning::Mobile-Expensify main advanced to $remote_sha while syncing. App main records $recorded, which is what this run set out to record. Re-run to pick up the newer commit."
+            set_output SUBMODULE_MATCHES_REMOTE false
+        else
+            echo "::error::Submodule on App main ($recorded) still differs from Mobile-Expensify origin/main ($remote_sha)"
+            exit 1
+        fi
     fi
 
     set_output POST_SYNC_APP_VERSION "$app_version"
-    echo "::notice::✅ Verified versions ($app_version) and submodule match Mobile-Expensify main ($recorded)"
+    if [[ "$recorded" == "$remote_sha" ]]; then
+        set_output SUBMODULE_MATCHES_REMOTE true
+        echo "::notice::✅ Verified versions ($app_version) and submodule match Mobile-Expensify main ($recorded)"
+    else
+        echo "::notice::✅ Verified versions ($app_version); submodule records $recorded, one behind Mobile-Expensify main"
+    fi
 }
 
 function cmd_sync {
diff --git a/.github/workflows/buildAdHoc.yml b/.github/workflows/buildAdHoc.yml
index 694b9927898a..3633c87fb9cb 100644
--- a/.github/workflows/buildAdHoc.yml
+++ b/.github/workflows/buildAdHoc.yml
@@ -136,6 +136,7 @@ jobs:
           BUCKET="s3://ad-hoc-expensify-cash/web/${{ inputs.APP_PR_NUMBER }}"
 
           aws s3 sync dist "$BUCKET" --delete --acl public-read \
+            --exclude "*.br" \
             --exclude "index.html" \
             --exclude "service-worker.js" \
             --exclude "workbox-*.js" \
diff --git a/.github/workflows/claude-review.yml b/.github/workflows/claude-review.yml
index 98324697a22a..0b09c8f85a77 100644
--- a/.github/workflows/claude-review.yml
+++ b/.github/workflows/claude-review.yml
@@ -3,23 +3,22 @@ name: PR Reviews with Claude Code
 permissions:
   contents: read
   pull-requests: write
+  statuses: write
 
 on:
   pull_request_target:
     types: [opened, ready_for_review]
-
-concurrency:
-  group: claude-review-${{ github.event.pull_request.html_url }}
-  cancel-in-progress: true
+  issue_comment:
+    types: [created]
 
 jobs:
-  review:
-    if: |
-      github.event.pull_request.draft != true
-      && !contains(github.event.pull_request.title, 'Revert')
+  authorize:
+    if: >-
+      (github.event_name == 'pull_request_target' && github.event.pull_request.draft != true && !contains(github.event.pull_request.title, 'Revert')) ||
+      (github.event_name == 'issue_comment' && github.event.issue.pull_request && contains(github.event.comment.body, '@claude review'))
     runs-on: blacksmith-2vcpu-ubuntu-2404
-    env:
-      PR_NUMBER: ${{ github.event.pull_request.number }}
+    outputs:
+      IS_AUTHORIZED: ${{ steps.gate.outputs.IS_AUTHORIZED }}
     steps:
       - name: Checkout
         uses: useblacksmith/checkout@0647fdbab2614a5eb86d2971070e325060d91056 # v1.7.0
@@ -28,98 +27,113 @@ jobs:
         id: gate
         uses: ./.github/actions/javascript/isAuthorizedContributor
         with:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          ACTOR: ${{ github.event.pull_request.user.login }}
-          ACTOR_ASSOCIATION: ${{ github.event.pull_request.author_association }}
+          PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
+          ACTOR: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.user.login || github.event.comment.user.login }}
+          ACTOR_ASSOCIATION: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.author_association || github.event.comment.author_association }}
           GITHUB_TOKEN: ${{ github.token }}
           OS_BOTIFY_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
-      - name: Set review authorized
-        id: set-authorized
-        run: |
-          if [ "${{ steps.gate.outputs.IS_AUTHORIZED }}" = "true" ]; then
-            echo "IS_AUTHORIZED=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "IS_AUTHORIZED=false" >> "$GITHUB_OUTPUT"
-          fi
-
+  review:
+    needs: authorize
+    if: needs.authorize.outputs.IS_AUTHORIZED == 'true'
+    # Set on this job, after authorization, so an unauthorized "@claude review" comment cannot cancel a running review
+    concurrency:
+      group: claude-review-${{ github.event.pull_request.html_url || github.event.issue.html_url }}
+      cancel-in-progress: true
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    env:
+      PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}
+    steps:
       - name: Checkout repository
-        if: steps.set-authorized.outputs.IS_AUTHORIZED == 'true'
         uses: useblacksmith/checkout@0647fdbab2614a5eb86d2971070e325060d91056 # v1.7.0
         with:
           fetch-depth: 1
 
-      - name: Setup Node
-        if: steps.set-authorized.outputs.IS_AUTHORIZED == 'true'
-        uses: ./.github/actions/composite/setupNode
-
-      - name: Filter paths
-        if: steps.set-authorized.outputs.IS_AUTHORIZED == 'true'
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
-        id: filter
-        with:
-          filters: |
-            code:
-              - 'src/**'
-            docs:
-              - 'docs/**/*.md'
-              - 'docs/**/*.csv'
-
       - name: Setup Claude review toolkit
-        if: steps.set-authorized.outputs.IS_AUTHORIZED == 'true'
         id: toolkit
         uses: Expensify/GitHub-Actions/.github/actions/claude-review-toolkit@54bfb8923d4f94c3cb209bfbad362fca9f0816f5
         with:
           rules_directory: .claude/skills/app-coding-standards/rules
 
+      - name: Check for an existing review of this commit
+        id: skip
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: shouldSkipReview.sh "$PR_NUMBER" "ai-review-completed/claude"
+
+      - name: Filter paths
+        if: steps.skip.outputs.skip != 'true'
+        id: filter
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          # gh pr view --json files is a GraphQL query capped at 100 files with no pagination,
+          # so a large PR would silently lose the paths that decide whether a review runs.
+          gh api --paginate "/repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/files" --jq '.[].filename' > "$RUNNER_TEMP/changed-files.txt"
+          if grep -q '^src/' "$RUNNER_TEMP/changed-files.txt"; then
+            echo "code=true" >> "$GITHUB_OUTPUT"
+          fi
+          if grep -qE '^docs/.*\.(md|csv)$' "$RUNNER_TEMP/changed-files.txt"; then
+            echo "docs=true" >> "$GITHUB_OUTPUT"
+          fi
       - name: Mark review as in progress
-        if: steps.set-authorized.outputs.IS_AUTHORIZED == 'true'
+        if: steps.skip.outputs.skip != 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
           addPrReaction.sh "$PR_NUMBER" "eyes"
 
+      - name: Setup Node
+        if: steps.skip.outputs.skip != 'true' && (steps.filter.outputs.code == 'true' || steps.filter.outputs.docs == 'true')
+        uses: ./.github/actions/composite/setupNode
+
       - name: Run Claude Code (code)
         id: code-review
-        if: steps.set-authorized.outputs.IS_AUTHORIZED == 'true' && steps.filter.outputs.code == 'true'
+        if: steps.skip.outputs.skip != 'true' && steps.filter.outputs.code == 'true'
         uses: anthropics/claude-code-action@4d7e1f0cd85743fdc93b1c8040ab54395da024e2 # v1.0.149
         with:
           display_report: 'true'
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           allowed_non_write_users: '*'
-          prompt: '/review-code-pr REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number }}'
+          prompt: '/review-code-pr REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}'
           claude_args: |
             --model claude-opus-4-8
             --effort xhigh
             --allowedTools "Task,Glob,Grep,Read,Bash(gh pr diff:*),Bash(gh pr view:*),Bash(check-compiler.sh:*)" --json-schema '${{ steps.toolkit.outputs.schema_json }}'
 
       - name: Post code review results
-        if: |
-          steps.set-authorized.outputs.IS_AUTHORIZED == 'true'
-          && steps.code-review.outcome == 'success'
-          && steps.filter.outputs.code == 'true'
+        if: steps.code-review.outcome == 'success'
         env:
           GH_TOKEN: ${{ github.token }}
           STRUCTURED_OUTPUT: ${{ steps.code-review.outputs.structured_output }}
         run: postCodeReviewResults.sh "$PR_NUMBER"
 
       - name: Run Claude Code (docs)
-        if: steps.set-authorized.outputs.IS_AUTHORIZED == 'true' && steps.filter.outputs.docs == 'true'
+        id: docs-review
+        if: steps.skip.outputs.skip != 'true' && steps.filter.outputs.docs == 'true'
         uses: anthropics/claude-code-action@4d7e1f0cd85743fdc93b1c8040ab54395da024e2 # v1.0.149
         with:
           display_report: 'true'
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           allowed_non_write_users: '*'
-          prompt: '/review-helpdot-pr REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number }}'
+          prompt: '/review-helpdot-pr REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number || github.event.issue.number }}'
           claude_args: |
             --model claude-opus-4-8
             --effort high
             --allowedTools "Task,Glob,Grep,Read,Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),mcp__github_inline_comment__create_inline_comment"
 
+      - name: Record review completion
+        if: steps.code-review.outcome == 'success' || steps.docs-review.outcome == 'success'
+        env:
+          GH_TOKEN: ${{ github.token }}
+          HEAD_SHA: ${{ steps.skip.outputs.head_sha }}
+          STATUS_CONTEXT: ${{ steps.skip.outputs.context }}
+        run: recordReviewComplete.sh "$HEAD_SHA" "$STATUS_CONTEXT" "Reviewed at this commit - comment @claude review to re-run"
+
       - name: Remove in-progress indicator
-        if: always() && steps.set-authorized.outputs.IS_AUTHORIZED == 'true'
+        if: always() && steps.skip.outputs.skip != 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a1e6219d0b9e..0621b4cda065 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -741,7 +741,16 @@ jobs:
 
       - name: Deploy to S3
         run: |
-          aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist ${{ env.S3_BUCKET }}/
+          aws s3 cp --recursive --acl public-read --exclude "*.br" "$GITHUB_WORKSPACE"/dist ${{ env.S3_BUCKET }}/
+
+          for PAIR in js:text/javascript css:text/css html:text/html svg:image/svg+xml wasm:application/wasm ttf:font/ttf; do
+            EXT="${PAIR%%:*}"
+            CONTENT_TYPE="${PAIR#*:}"
+            aws s3 cp --recursive --acl public-read --exclude "*" --include "*.${EXT}.br" \
+              --content-encoding br --content-type "$CONTENT_TYPE" \
+              "$GITHUB_WORKSPACE"/dist ${{ env.S3_BUCKET }}/
+          done
+
           aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE ${{ env.S3_BUCKET }}/.well-known/apple-app-site-association ${{ env.S3_BUCKET }}/.well-known/apple-app-site-association
           aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE ${{ env.S3_BUCKET }}/.well-known/apple-app-site-association ${{ env.S3_BUCKET }}/apple-app-site-association
         env:
@@ -1142,18 +1151,19 @@ jobs:
   iosUploadSentry:
     name: Upload iOS build to Sentry for size analysis
     needs: [prep, iosBuild, checkDeploymentSuccess]
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    # sentry-cli only supports IPA uploads when running on Apple Silicon macOS
+    runs-on: blacksmith-6vcpu-macos-latest
     if: >-
       ${{ always()
           && needs.prep.outputs.DEPLOY_ENV == 'production'
           && fromJSON(needs.checkDeploymentSuccess.outputs.IS_RELEASE_READY) }}
     continue-on-error: true
-    timeout-minutes: 10
+    timeout-minutes: 20
     outputs:
       SENTRY_URL: ${{ steps.sentry-upload.outputs.SENTRY_URL }}
     steps:
       - name: Checkout
-        uses: useblacksmith/checkout@0647fdbab2614a5eb86d2971070e325060d91056 # v1.7.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Upload to Sentry for size analysis
         id: sentry-upload
diff --git a/.github/workflows/syncVersions.yml b/.github/workflows/syncVersions.yml
index 4bac587a75dd..fa2800575792 100644
--- a/.github/workflows/syncVersions.yml
+++ b/.github/workflows/syncVersions.yml
@@ -89,7 +89,7 @@ jobs:
               "channel": "#deployer",
               "attachments": [{
                 "color": "good",
-                "text": "✅ Version sync completed. E/App and Mobile-Expensify are at ${{ steps.performSync.outputs.POST_SYNC_APP_VERSION }}; submodule matches Mobile-Expensify main."
+                "text": "✅ Version sync completed. E/App and Mobile-Expensify are at ${{ steps.performSync.outputs.POST_SYNC_APP_VERSION }}; ${{ steps.performSync.outputs.SUBMODULE_MATCHES_REMOTE == 'true' && 'submodule matches Mobile-Expensify main.' || 'Mobile-Expensify main has advanced since, so run this again to record it.' }}"
               }]
             }
 
diff --git a/CLAUDE.md b/CLAUDE.md
index 57e70fe5024d..b83dc7430e44 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -56,7 +56,7 @@ Use the `/react-native-best-practices` skill when working on performance-sensiti
 
 ### Memoization
 
-React Compiler auto-memoizes code in components and hooks (excluding `tests/`). Two different compilers run it: `babel-plugin-react-compiler` on native/Jest (see `babel.config.js`) and `oxc-transform-react` on web (see `config/rsbuild/`). They do not behave identically. The compliance check and the ESLint processor run BOTH compilers via the shared helpers in `config/reactCompiler/` and only relax manual-memoization rules when both compilers memoize the file.
+React Compiler auto-memoizes code in components and hooks (excluding `tests/`). Two different compilers run it: `babel-plugin-react-compiler` on native (see `babel.config.js`) and `oxc-transform-react` on web (see `config/rsbuild/`) and under Jest (see `config/babel/oxcJestTransformer.js`). They do not behave identically. The compliance check and the ESLint processor run BOTH compilers via the shared helpers in `config/reactCompiler/` and only relax manual-memoization rules when both compilers memoize the file.
 
 Do not use `useMemo`, `useCallback`, or `React.memo` in components or hooks that compile with React Compiler.
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8a1ddf25dcff..cf527b83283e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,7 +15,7 @@ GEM
       minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.8)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
@@ -103,7 +103,7 @@ GEM
     ethon (0.15.0)
       ffi (>= 1.15.0)
     excon (0.112.0)
-    faraday (1.10.4)
+    faraday (1.10.6)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -242,7 +242,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.18.0)
-    jwt (2.10.2)
+    jwt (2.10.3)
       base64
     logger (1.7.0)
     mime-types (3.7.0)
diff --git a/Mobile-Expensify b/Mobile-Expensify
index be6570d405b4..1667f64712fe 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit be6570d405b47095ebc0f1895241dfb470fc4328
+Subproject commit 1667f64712fe146f87ece9f5acb70dee1c21f608
diff --git a/README.md b/README.md
index 08da77928ec8..5e737b99952d 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@
 * [Expensify Code of Conduct](CODE_OF_CONDUCT.md)
 * [Contributor License Agreement](CLA.md)
 * [React StrictMode](contributingGuides/STRICT_MODE.md)
-* [Left Hand Navigation(LHN)](contributingGuides/LEFT_HAND_NAVIGATION.md)
+* [Left Hand Navigation (LHN)](contributingGuides/LEFT_HAND_NAVIGATION.md)
 * [HybridApp - additional info & troubleshooting](contributingGuides/HYBRID_APP.md)
 
 ----
diff --git a/__mocks__/@ua/react-native-airship.ts b/__mocks__/@ua/react-native-airship.ts
index 0f5c34559dda..3c484269589a 100644
--- a/__mocks__/@ua/react-native-airship.ts
+++ b/__mocks__/@ua/react-native-airship.ts
@@ -1,4 +1,16 @@
-import type {AirshipContact, AirshipLiveActivityManager, AirshipPush, AirshipPushAndroid, AirshipPushIOS, AirshipRoot, AirshipRootIOS} from '@ua/react-native-airship';
+import type {
+    AirshipContact,
+    AirshipLiveActivityManager,
+    AirshipPush,
+    AirshipPushAndroid,
+    AirshipPushIOS,
+    AirshipRoot,
+    AirshipRootIOS,
+    LiveActivity,
+    PushNotificationStatus,
+} from '@ua/react-native-airship';
+
+import createMock from 'tests/utils/createMock';
 
 // eslint-disable-next-line no-restricted-syntax
 enum EventType {
@@ -43,43 +55,51 @@ namespace iOS {
     }
 }
 
-const pushIOS = jest.fn().mockImplementation(() => ({
+const pushIOS = createMock<AirshipPushIOS>({
     setBadgeNumber: jest.fn(),
     setForegroundPresentationOptions: jest.fn(),
     setForegroundPresentationOptionsCallback: jest.fn(),
-}))() as AirshipPushIOS;
+});
 
-const pushAndroid = jest.fn().mockImplementation(() => ({
+const pushAndroid = createMock<AirshipPushAndroid>({
     setForegroundDisplayPredicate: jest.fn(),
-}))() as AirshipPushAndroid;
+});
 
-const push = jest.fn().mockImplementation(() => ({
+const notificationStatus: PushNotificationStatus = {
+    isUserNotificationsEnabled: false,
+    areNotificationsAllowed: false,
+    isPushPrivacyFeatureEnabled: false,
+    isPushTokenRegistered: false,
+    isOptedIn: false,
+    isUserOptedIn: false,
+    notificationPermissionStatus: PermissionStatus.Denied,
+};
+const push = createMock<AirshipPush>({
     iOS: pushIOS,
     android: pushAndroid,
     enableUserNotifications: () => Promise.resolve(false),
     clearNotifications: jest.fn(),
-    getNotificationStatus: () => Promise.resolve({airshipOptIn: false, systemEnabled: false, airshipEnabled: false}),
+    getNotificationStatus: () => Promise.resolve(notificationStatus),
     getActiveNotifications: () => Promise.resolve([]),
-}))() as AirshipPush;
+});
 
-const contact = jest.fn().mockImplementation(() => ({
+const contact = createMock<AirshipContact>({
     identify: jest.fn(),
     getNamedUserId: () => Promise.resolve(undefined),
     reset: jest.fn(),
-    module: jest.fn(),
-}))() as AirshipContact;
+});
 
-const liveActivityManager = jest.fn().mockImplementation(() => ({
+const liveActivityManager = createMock<AirshipLiveActivityManager>({
     list: jest.fn(() => Promise.resolve([])),
     listAll: jest.fn(() => Promise.resolve([])),
-    start: jest.fn(() => Promise.resolve({id: 'mock-activity-id'})),
+    start: jest.fn(() => Promise.resolve(createMock<LiveActivity>({id: 'mock-activity-id'}))),
     update: jest.fn(() => Promise.resolve()),
     end: jest.fn(() => Promise.resolve()),
-}))() as AirshipLiveActivityManager;
+});
 
-const airshipIOS = jest.fn().mockImplementation(() => ({
+const airshipIOS = createMock<AirshipRootIOS>({
     liveActivityManager,
-}))() as AirshipRootIOS;
+});
 
 const Airship: Partial<AirshipRoot> = {
     addListener: jest.fn(),
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9ddc5209beea..0347309794a0 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009049500
-        versionName "9.4.95-0"
+        versionCode 1009050204
+        versionName "9.5.2-4"
         // 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"
diff --git a/assets/images/bank-icons/first-citizens-bank.svg b/assets/images/bank-icons/first-citizens-bank.svg
new file mode 100644
index 000000000000..14369613d98f
--- /dev/null
+++ b/assets/images/bank-icons/first-citizens-bank.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"><path fill="#00205b" d="M0 0h40v40H0z"/><path fill="#fff" d="M9.32 31.19V8.72h16.25l6.22-2.5v24.97z"/><path fill="#fff" d="M30.15 29.54H10.96V10.36h10.53l8.66-3.48z"/><path fill="#00205b" d="m18.44 15.22.07-.02c.1-.03.24-.1.34-.16v-1.41c0-2.24 1.85-2.96 2.46-3.2l.18-.07H10.97v7.79l7.48-2.93Zm3.71 7.67c-.01.63-.01 1.41-.01 1.41 0 1.79-1.52 2.82-2.45 3.16l-3.32 1.34v.74h13.79v-9.89c-2.79 1.13-8 3.23-8 3.23Z"/><path fill="#f30032" d="M14.69 22.14c1.73-.67 3.42-1.34 5.14-2.07.27-.13.45-.32.57-.5v1.52c.01.33-.24.74-.76.98-1.58.72-3.27 1.32-4.95 1.97zm7.24-10.1c-1 .39-1.36.81-1.36 1.59v1.66c0 1.1-1.58 1.57-1.58 1.57l-8.04 3.15v9.55h3.68v-1.91l4.43-1.79s1.34-.47 1.34-1.56c0 0 0-.98.02-1.65.01-.61.35-1.06 1.08-1.36l8.64-3.49v-3.51l-8.36 3.33c-1.05.43-1.22.88-1.22.88v-1.58c0-.14-.06-.71 1.44-1.32l8.14-3.27V8.74z"/></svg>
\ No newline at end of file
diff --git a/assets/images/cardicons/first-citizens-bank.svg b/assets/images/cardicons/first-citizens-bank.svg
new file mode 100644
index 000000000000..be333ccb6b13
--- /dev/null
+++ b/assets/images/cardicons/first-citizens-bank.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 26"><path fill="#00205b" d="M0 0h40v26H0z"/><path fill="#fff" d="M13.18 19.87V6.23h9.86l3.78-1.51v15.15z"/><path fill="#fff" d="M25.82 18.87H14.18V7.23h6.39l5.25-2.11z"/><path fill="#00205b" d="M18.72 10.18h.04c.06-.03.15-.07.21-.11v-.85c0-1.36 1.12-1.8 1.49-1.94l.11-.04h-6.39v4.73l4.54-1.78Zm2.25 4.65v.86c0 1.09-.92 1.71-1.49 1.92l-2.01.81v.45h8.36v-6c-1.69.68-4.85 1.96-4.85 1.96Z"/><path fill="#f30032" d="M16.44 14.38c1.05-.4 2.07-.81 3.12-1.26.16-.08.27-.2.35-.3v.92c0 .2-.15.45-.46.6-.96.44-1.98.8-3 1.19v-1.15Zm4.4-6.13c-.6.23-.82.49-.82.96v1.01c0 .67-.96.95-.96.95l-4.88 1.91v5.79h2.23v-1.16l2.69-1.08s.81-.28.81-.95c0 0 0-.6.01-1 0-.37.21-.64.66-.82l5.24-2.12V9.61l-5.07 2.02c-.64.26-.74.54-.74.54v-.96c0-.08-.03-.43.87-.8l4.94-1.98V6.25z"/></svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/business-central-icon-square.svg b/assets/images/integrationicons/business-central-icon-square.svg
deleted file mode 100644
index 8cbd22c4e013..000000000000
--- a/assets/images/integrationicons/business-central-icon-square.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" fill="none" viewBox="0 0 40 40"><path fill="#1e304f" d="M0 0h40v40H0z"/><g transform="translate(6 6)scale(.29167)"><g clip-path="url(#a)"><g clip-path="url(#b)"><path fill="url(#c)" d="M34 34c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"/><path fill="url(#d)" d="M34 34c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"/><path fill="url(#e)" d="M34 34c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"/><path fill="url(#f)" d="M62 62c-7.732-7.732-20.268-7.732-28 0s-7.732 20.268 0 28 20.268 7.732 28 0 7.732-20.268 0-28"/><path fill="url(#g)" d="M62 62c-7.732-7.732-20.268-7.732-28 0s-7.732 20.268 0 28 20.268 7.732 28 0 7.732-20.268 0-28"/><path fill="url(#h)" d="M62 62c-7.732-7.732-20.268-7.732-28 0s-7.732 20.268 0 28 20.268 7.732 28 0 7.732-20.268 0-28"/><path fill="url(#i)" d="M34 62c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"/><path fill="url(#j)" d="M34 62c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"/><path fill="url(#k)" d="M34 62c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"/><path fill="url(#l)" d="M6 34 34 6c-7.732 7.732-7.732 20.268 0 28s7.732 20.268 0 28-20.268 7.732-28 0-7.732-20.268 0-28"/><path fill="url(#m)" d="M6 34 34 6c-7.732 7.732-7.732 20.268 0 28s7.732 20.268 0 28-20.268 7.732-28 0-7.732-20.268 0-28"/><path fill="url(#n)" d="M90 62 62 90c7.732-7.732 7.732-20.268 0-28s-7.732-20.268 0-28 20.268-7.732 28 0 7.732 20.268 0 28"/></g></g><defs><linearGradient id="c" x1="30" x2="67" y1="9.5" y2="25" gradientUnits="userSpaceOnUse"><stop stop-color="#0c74a1"/><stop offset=".468" stop-color="#1384b1"/><stop offset="1" stop-color="#16bbda"/></linearGradient><linearGradient id="e" x1="49" x2="26.5" y1="14" y2="24" gradientUnits="userSpaceOnUse"><stop stop-color="#1384b1" stop-opacity="0"/><stop offset="1" stop-color="#004695"/></linearGradient><linearGradient id="f" x1="68.5" x2="29" y1="79.5" y2="71" gradientUnits="userSpaceOnUse"><stop stop-color="#06517b"/><stop offset=".509" stop-color="#09638e"/><stop offset="1" stop-color="#0c74a1"/></linearGradient><linearGradient id="g" x1="53" x2="69.5" y1="76" y2="72" gradientUnits="userSpaceOnUse"><stop stop-color="#09638e" stop-opacity="0"/><stop offset="1" stop-color="#003580"/></linearGradient><linearGradient id="i" x1="44.5" x2="45" y1="29.5" y2="68.5" gradientUnits="userSpaceOnUse"><stop stop-color="#43e5ca"/><stop offset=".372" stop-color="#26cfe8"/><stop offset="1" stop-color="#1384b1"/></linearGradient><linearGradient id="l" x1="14.5" x2="43.5" y1="26" y2="55" gradientUnits="userSpaceOnUse"><stop stop-color="#b6f6c7"/><stop offset=".278" stop-color="#43e5ca"/><stop offset="1" stop-color="#26cfe8"/></linearGradient><linearGradient id="n" x1="63" x2="92.5" y1="30" y2="59.5" gradientUnits="userSpaceOnUse"><stop stop-color="#9ff2e4"/><stop offset=".266" stop-color="#2bdabe"/><stop offset=".621" stop-color="#16bbda"/><stop offset="1" stop-color="#1384b1"/></linearGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientTransform="rotate(-90 48 0)scale(29.5)" gradientUnits="userSpaceOnUse"><stop offset=".456" stop-color="#0057aa"/><stop offset="1" stop-color="#1384b1" stop-opacity="0"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientTransform="rotate(90 0 48)scale(36)" gradientUnits="userSpaceOnUse"><stop offset=".423" stop-color="#003580"/><stop offset="1" stop-color="#09638e" stop-opacity="0"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientTransform="matrix(0 32 -32 0 76 48)" gradientUnits="userSpaceOnUse"><stop offset=".4" stop-color="#09638e"/><stop offset="1" stop-color="#119fc5" stop-opacity="0"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientTransform="matrix(0 34 -34 0 20 48)" gradientUnits="userSpaceOnUse"><stop offset=".4" stop-color="#09638e"/><stop offset="1" stop-color="#119fc5" stop-opacity="0"/></radialGradient><radialGradient id="m" cx="0" cy="0" r="1" gradientTransform="matrix(18.50004 40.5 -40.76334 18.62033 11.5 26)" gradientUnits="userSpaceOnUse"><stop offset=".585" stop-color="#2bdabe" stop-opacity="0"/><stop offset="1" stop-color="#119fc5"/></radialGradient><clipPath id="a"><path fill="#fff" d="M0 0h96v96H0z"/></clipPath><clipPath id="b"><path fill="#fff" d="M0 0h96v96H0z"/></clipPath></defs></g></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__chartsync.svg b/assets/images/simple-illustrations/simple-illustration__chartsync.svg
new file mode 100644
index 000000000000..3f3173f1f64e
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__chartsync.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80" fill="none" viewBox="0 0 80 80"><path fill="#fcdcff" stroke="#002140" d="M18.823 12.264h43.53a6.56 6.56 0 0 1 6.56 6.558v43.53a6.56 6.56 0 0 1-6.56 6.56h-43.53a6.56 6.56 0 0 1-6.558-6.56v-43.53a6.56 6.56 0 0 1 6.558-6.558Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M20.897 17.749v43.315m-4.663-41.158h4.662m-2.717 5.053h2.716m-4.661 5.242h4.662m-2.717 5.052h2.716m-4.661 5.237h4.662m-2.717 5.038h2.716m-4.661 5.242h4.662m-2.717 5.053h2.716m43.333 5.353H20.896"/><rect width="9.412" height="15.294" x="25.883" y="45.882" fill="#f9b5fe" stroke="#002140" rx="1.176"/><rect width="9.412" height="28.235" x="38.823" y="32.941" fill="#f9b5fe" stroke="#002140" rx="1.176"/><rect width="9.412" height="37.647" x="51.765" y="23.529" fill="#f9b5fe" stroke="#002140" rx="1.176"/><path fill="#03d47c" stroke="#002140" stroke-linecap="round" d="M66.617 64.03H79.5v12.88a2.59 2.59 0 0 1-5.177 0v-2.299l-.844.803c-2.642 2.513-6.153 4.085-10.087 4.085-6.034 0-11.092-3.707-13.511-8.831-.657-1.39-.043-3.047 1.392-3.697 1.44-.653 3.138-.033 3.797 1.363 1.621 3.434 4.824 5.587 8.322 5.587 2.888 0 5.585-1.476 7.344-3.925l.57-.79h-4.689a2.589 2.589 0 0 1 0-5.178Zm-2.95-16.471c6.033 0 11.091 3.706 13.51 8.829.657 1.39.044 3.048-1.39 3.698-1.44.653-3.14.034-3.8-1.362-1.621-3.433-4.823-5.586-8.32-5.586-2.888 0-5.585 1.474-7.345 3.922l-.568.792h4.687a2.589 2.589 0 0 1 0 5.177H47.56V50.147a2.588 2.588 0 0 1 5.176 0v2.3l.845-.804c2.642-2.513 6.153-4.084 10.087-4.084Z"/></svg>
\ No newline at end of file
diff --git a/config/babel/oxcJestTransformer.js b/config/babel/oxcJestTransformer.js
index 8ce531614943..b36f35e90b63 100644
--- a/config/babel/oxcJestTransformer.js
+++ b/config/babel/oxcJestTransformer.js
@@ -1,19 +1,79 @@
 const crypto = require('crypto');
 const fs = require('fs');
 const path = require('path');
-const esbuild = require('esbuild');
-const {transformSync} = require('oxc-transform-react');
 
 const babelJest = require('babel-jest');
-const OXC_TRANSFORM_REACT_VERSION = require('oxc-transform-react/package.json').version;
 const oxcReactCompilerConfig = require('./oxcReactCompilerConfig');
 
 const babelTransformer = babelJest.createTransformer();
 
+let oxcPipeline;
+/**
+ * esbuild and oxc-transform-react are native modules, loaded once per worker. Requiring them lazily
+ * keeps a run that never takes the OXC path from paying for them at all.
+ *
+ * @returns {{esbuild: typeof import('esbuild'), transformSync: Function, oxcVersion: string}}
+ */
+function getOxcPipeline() {
+    if (!oxcPipeline) {
+        oxcPipeline = {
+            esbuild: require('esbuild'),
+            transformSync: require('oxc-transform-react').transformSync,
+            oxcVersion: require('oxc-transform-react/package.json').version,
+        };
+    }
+    return oxcPipeline;
+}
+
 const NODE_MODULES_RE = /[/\\]node_modules[/\\]/;
 const TESTS_RE = /[/\\]tests[/\\]/;
 const JEST_SETUP_RE = /[/\\]jest[/\\]/;
 const MOCKS_RE = /[/\\]__mocks__[/\\]/;
+// Test files live under tests/ today, but a colocated one would lose `jest.mock` hoisting silently.
+const TEST_FILE_RE = /\.(test|spec)\.[jt]sx?$/;
+
+// esbuild's export helpers act differently from Babel's: `jest.spyOn` can't override their exports,
+// and a circular import throws instead of giving `undefined`. Patch both to act like Babel. Regexes,
+// because esbuild renames the helper's variables (`name` becomes `name2`) when the name is taken.
+const ESBUILD_HELPERS = [
+    {
+        marker: 'var __defProp',
+        pattern: /var (__defProp\d*) = Object\.defineProperty;/,
+        replace: (_match, defProp) => `var ${defProp} = (target, key, descriptor) => Object.defineProperty(target, key, {...descriptor, configurable: true});`,
+    },
+    {
+        marker: 'var __export',
+        pattern: /var (__export\d*) = \(target, all\) => \{\s*for \(var (\w+) in all\)\s*(__defProp\d*)\(target, \2, \{ get: all\[\2\], enumerable: true \}\);\s*\};/,
+        // Keep this to 4 lines, like esbuild's helper: patching runs after the source map is made.
+        replace: (_match, exportName, _loopVar, defProp) => `var ${exportName} = (target, all) => {
+  for (const key of Object.keys(all))
+    ${defProp}(target, key, {get: () => {try {return all[key]();} catch (e) {if (e instanceof ReferenceError) {return undefined;} throw e;}}, enumerable: true});
+};`,
+    },
+];
+
+/**
+ * Patch the esbuild helpers above. A missing helper is fine (the module doesn't need it), but one
+ * we can't match means esbuild changed it and the patch would silently do nothing, so throw.
+ *
+ * @param {string} code
+ * @param {string} sourcePath
+ * @returns {string}
+ */
+function patchEsbuildHelpers(code, sourcePath) {
+    let patched = code;
+    for (const {marker, pattern, replace} of ESBUILD_HELPERS) {
+        if (!patched.includes(marker)) {
+            continue;
+        }
+        const next = patched.replace(pattern, replace);
+        if (next === patched) {
+            throw new Error(`oxcJestTransformer: esbuild interop helper changed shape, update ESBUILD_HELPERS (while transforming ${sourcePath})`);
+        }
+        patched = next;
+    }
+    return patched;
+}
 
 const TRANSFORMER_SOURCE = fs.readFileSync(__filename);
 const REACT_COMPILER_CONFIG_KEY = JSON.stringify(oxcReactCompilerConfig());
@@ -31,11 +91,19 @@ function getLang(filename) {
     return 'jsx';
 }
 
-function shouldUseOxc(filename) {
-    return !NODE_MODULES_RE.test(filename) && !TESTS_RE.test(filename) && !JEST_SETUP_RE.test(filename) && !MOCKS_RE.test(filename);
+/**
+ * Coverage runs stay on babel-jest: it adds coverage in the pass it already makes, while the OXC path
+ * would need a third pass (OXC, esbuild, then istanbul). On CI that was slower and used more memory.
+ */
+function shouldUseOxc(filename, transformOptions) {
+    if (transformOptions?.instrument) {
+        return false;
+    }
+    return !NODE_MODULES_RE.test(filename) && !TESTS_RE.test(filename) && !JEST_SETUP_RE.test(filename) && !MOCKS_RE.test(filename) && !TEST_FILE_RE.test(filename);
 }
 
 function processWithOxc(sourceText, sourcePath) {
+    const {esbuild, transformSync} = getOxcPipeline();
     const oxcResult = transformSync(sourcePath, sourceText, {
         lang: getLang(sourcePath),
         sourcemap: true,
@@ -47,7 +115,9 @@ function processWithOxc(sourceText, sourcePath) {
         return null;
     }
 
-    const cjs = esbuild.transformSync(oxcResult.code, {
+    // esbuild chains an inline input map, so its output maps straight back to the original file.
+    const inputMap = Buffer.from(JSON.stringify(oxcResult.map)).toString('base64');
+    const cjs = esbuild.transformSync(`${oxcResult.code}\n//# sourceMappingURL=data:application/json;base64,${inputMap}`, {
         loader: 'js',
         format: 'cjs',
         supported: {'dynamic-import': false},
@@ -55,16 +125,19 @@ function processWithOxc(sourceText, sourcePath) {
         sourcemap: true,
     });
 
-    return {code: cjs.code, map: cjs.map};
+    return {code: patchEsbuildHelpers(cjs.code, sourcePath), map: cjs.map};
 }
 
 module.exports = {
-    canInstrument: false,
+    // Coverage runs go to babel-jest, which instruments them itself, so Jest must not instrument again.
+    canInstrument: true,
     getCacheKey(sourceText, sourcePath, transformOptions) {
-        if (!shouldUseOxc(sourcePath)) {
+        if (!shouldUseOxc(sourcePath, transformOptions)) {
             return babelTransformer.getCacheKey(sourceText, sourcePath, transformOptions);
         }
 
+        const {esbuild, oxcVersion} = getOxcPipeline();
+
         return crypto
             .createHash('sha1')
             .update(sourceText)
@@ -73,11 +146,11 @@ module.exports = {
             .update(TRANSFORMER_SOURCE)
             .update(REACT_COMPILER_CONFIG_KEY)
             .update(esbuild.version)
-            .update(OXC_TRANSFORM_REACT_VERSION)
+            .update(oxcVersion)
             .digest('hex');
     },
     process(sourceText, sourcePath, transformOptions) {
-        if (shouldUseOxc(sourcePath)) {
+        if (shouldUseOxc(sourcePath, transformOptions)) {
             const result = processWithOxc(sourceText, sourcePath);
             if (result) {
                 return result;
diff --git a/config/eslint/eslint.config.mjs b/config/eslint/eslint.config.mjs
index b4bc885c092c..10e73863e75b 100644
--- a/config/eslint/eslint.config.mjs
+++ b/config/eslint/eslint.config.mjs
@@ -206,6 +206,14 @@ const restrictedPaidGroupPolicyImportPatterns = [
     },
 ];
 
+// `HeaderWithBackButton` is being migrated to the composed `Header` (`@components/Header`).
+const restrictedHeaderImportPatterns = [
+    {
+        group: ['**/HeaderWithBackButton'],
+        message: 'HeaderWithBackButton is being migrated to the composed Header. Please use `@components/Header` instead for new usages.',
+    },
+];
+
 // Headless email chart CLI cannot use useTheme; charts always render with the light theme.
 const victoryChartRendererRestrictedImportPaths = restrictedImportPaths.filter((restriction) => restriction.name !== '@styles/theme');
 const victoryChartRendererRestrictedImportPatterns = [
@@ -704,7 +712,7 @@ const config = defineConfig([
                 'error',
                 {
                     paths: restrictedImportPaths,
-                    patterns: [...restrictedImportPatterns, ...restrictedReportNameImportPatterns, ...restrictedPaidGroupPolicyImportPatterns],
+                    patterns: [...restrictedImportPatterns, ...restrictedReportNameImportPatterns, ...restrictedPaidGroupPolicyImportPatterns, ...restrictedHeaderImportPatterns],
                 },
             ],
         },
diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv
index 6281c209adee..2d3c0bf9e57e 100644
--- a/config/eslint/eslint.seatbelt.tsv
+++ b/config/eslint/eslint.seatbelt.tsv
@@ -5,7 +5,6 @@
 "../../__mocks__/@react-native-camera-roll/camera-roll.ts"	"@typescript-eslint/no-deprecated/CameraRoll.save"	1
 "../../__mocks__/@react-native-community/netinfo.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../__mocks__/@react-navigation/native/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../__mocks__/@ua/react-native-airship.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
 "../../__mocks__/expo-video.tsx"	"react-hooks/refs"	2
 "../../__mocks__/openai.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../__mocks__/react-freeze.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -20,7 +19,6 @@
 "../../.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../.github/actions/javascript/getPullRequestIncrementalChanges/getPullRequestIncrementalChanges.ts"	"@typescript-eslint/no-unsafe-type-assertion"	5
-"../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
 "../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts"	"no-restricted-imports"	1
 "../../.github/actions/javascript/postOrReplaceComment/postOrReplaceComment.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../.github/actions/javascript/proposalPoliceComment/proposalPoliceComment.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -63,31 +61,52 @@
 "../../src/components/AnimatedSubmitButton/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/AnimatedSubmitButton/index.tsx"	"react-hooks/refs"	4
 "../../src/components/AnimatedSubmitButton/index.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/components/ArchivedReportFooter.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/components/ApproverSelectionList.tsx"	"no-restricted-imports"	1
 "../../src/components/AttachmentPicker/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/AttachmentPicker/index.native.tsx"	"react-hooks/refs"	1
 "../../src/components/AttachmentPicker/index.tsx"	"react-hooks/refs"	1
 "../../src/components/AttachmentPreview.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx"	"@typescript-eslint/no-deprecated/GestureType"	3
+"../../src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx"	"@typescript-eslint/no-deprecated/LegacyComposedGesture"	1
 "../../src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx"	"react-hooks/refs"	3
 "../../src/components/Attachments/AttachmentCarousel/index.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/components/Attachments/AttachmentCarousel/Pager/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Native"	2
 "../../src/components/Attachments/AttachmentCarousel/Pager/index.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/components/Attachments/AttachmentCarousel/Pager/types.ts"	"@typescript-eslint/no-deprecated/GestureType"	2
 "../../src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts"	"no-restricted-syntax"	1
+"../../src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
 "../../src/components/Attachments/AttachmentView/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay.tsx"	"no-restricted-syntax"	1
 "../../src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay.tsx"	"react-hooks/refs"	1
 "../../src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/AutoCompleteSuggestions/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/AutoSubmitModal.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/components/AvatarCropModal/AvatarCropView.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/AvatarCropModal/AvatarCropView.tsx"	"@typescript-eslint/no-deprecated/PanGestureChangeEventPayload"	1
+"../../src/components/AvatarCropModal/AvatarCropView.tsx"	"no-restricted-imports"	1
+"../../src/components/AvatarCropModal/ImageCropView.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/AvatarCropModal/ImageCropView.tsx"	"@typescript-eslint/no-deprecated/LegacyPanGesture"	1
 "../../src/components/AvatarCropModal/ImageCropView.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/AvatarCropModal/Slider.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/AvatarCropModal/Slider.tsx"	"@typescript-eslint/no-deprecated/PanGestureChangeEventPayload"	1
 "../../src/components/AvatarCropModal/Slider.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/AvatarSelector.tsx"	"no-restricted-syntax"	2
 "../../src/components/AvatarWithImagePicker.tsx"	"react-hooks/set-state-in-effect"	2
+"../../src/components/BaseVacationDelegateSelectionComponent.tsx"	"no-restricted-imports"	1
+"../../src/components/BlockingViews/FullPageNotFoundView.tsx"	"no-restricted-imports"	1
 "../../src/components/BookTravelButton.tsx"	"no-restricted-imports"	1
 "../../src/components/ButtonWithDropdownMenu/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/CategoryPicker/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/Charts/hooks/useChartInteractions.ts"	"@typescript-eslint/no-deprecated/Gesture.Hover"	2
+"../../src/components/Charts/hooks/useChartInteractions.ts"	"@typescript-eslint/no-deprecated/Gesture.Race"	2
+"../../src/components/Charts/hooks/useChartInteractions.ts"	"@typescript-eslint/no-deprecated/Gesture.Tap"	2
 "../../src/components/Charts/hooks/useChartLabelFormats.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Charts/hooks/useChartLabelMeasurements.ts"	"rulesdir/no-raw-typography"	1
+"../../src/components/Charts/PieChart/PieChartContent.tsx"	"@typescript-eslint/no-deprecated/Gesture.Hover"	2
+"../../src/components/Charts/PieChart/PieChartContent.tsx"	"@typescript-eslint/no-deprecated/Gesture.Race"	2
+"../../src/components/Charts/PieChart/PieChartContent.tsx"	"@typescript-eslint/no-deprecated/Gesture.Tap"	2
 "../../src/components/Charts/utils/chartFontAssets.native.ts"	"@typescript-eslint/no-unsafe-type-assertion"	13
 "../../src/components/Charts/utils/chartFontAssets.ts"	"@typescript-eslint/no-unsafe-type-assertion"	13
 "../../src/components/Charts/utils/chartFontsCache.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
@@ -95,19 +114,27 @@
 "../../src/components/Charts/utils/getChartSkiaTypeface.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/CheckboxWithLabel.tsx"	"no-restricted-syntax"	1
 "../../src/components/ColumnsSettingsList.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/ColumnsSettingsList.tsx"	"no-restricted-imports"	1
 "../../src/components/Composer/implementation/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Composer/implementation/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/components/Composer/implementation/index.tsx"	"react-hooks/set-state-in-effect"	2
 "../../src/components/ConfirmationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/ConfirmModal.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
+"../../src/components/ConnectionLayout.tsx"	"no-restricted-imports"	1
+"../../src/components/ConnectToMergeFlow/index.ios.tsx"	"no-restricted-imports"	1
+"../../src/components/ConnectToMergeFlow/index.native.tsx"	"no-restricted-imports"	1
 "../../src/components/ConnectToNetSuiteFlow/index.tsx"	"react-hooks/refs"	5
 "../../src/components/ConnectToNetSuiteFlow/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/ConnectToXeroFlow/index.native.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/ConnectToXeroFlow/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/CountryPicker/CountrySelectorModal.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/CountryPicker/CountrySelectorModal.tsx"	"no-restricted-imports"	1
 "../../src/components/CountryPicker/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/createOnyxContext.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/components/CurrencyPicker.tsx"	"no-restricted-imports"	1
+"../../src/components/DatePicker/CalendarPicker/MonthPickerModal.tsx"	"no-restricted-imports"	1
 "../../src/components/DatePicker/CalendarPicker/MonthPickerModal.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/components/DatePicker/CalendarPicker/YearPickerModal.tsx"	"no-restricted-imports"	1
 "../../src/components/DatePicker/CalendarPicker/YearPickerModal.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/DatePicker/DatePickerModal.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/DatePicker/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -120,6 +147,7 @@
 "../../src/components/DragAndDrop/Provider/index.tsx"	"react-hooks/refs"	6
 "../../src/components/DraggableList/SortableItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/DropZone/DropZoneWrapper.tsx"	"react-hooks/refs"	1
+"../../src/components/EditableCell/usePopoverEditState.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/EmojiPicker/CategoryShortcutButton.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/EmojiPicker/EmojiPicker.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/EmojiPicker/EmojiPicker.tsx"	"react-hooks/refs"	3
@@ -132,8 +160,6 @@
 "../../src/components/FeedbackSurvey.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/FilePicker/index.native.tsx"	"react-hooks/refs"	1
 "../../src/components/FilePicker/index.tsx"	"react-hooks/refs"	1
-"../../src/components/FlatList/FlatList/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
-"../../src/components/FlatList/FlatList/index.tsx"	"react-hooks/refs"	1
 "../../src/components/FlatList/hooks/useFlatListHandle.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/FocusTrap/FocusTrapForScreen/index.web.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -142,8 +168,8 @@
 "../../src/components/Form/FormProvider.tsx"	"react-hooks/refs"	2
 "../../src/components/Form/InputWrapper.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/Form/InputWrapper.tsx"	"react-hooks/refs"	1
-"../../src/components/GPSInProgressModal/index.native.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
-"../../src/components/GPSTripStateChecker/index.native.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
+"../../src/components/GrowlNotification/GrowlNotificationContent.tsx"	"@typescript-eslint/no-deprecated/Gesture.Fling"	2
+"../../src/components/HeaderPageLayout.tsx"	"no-restricted-imports"	2
 "../../src/components/HeaderWithBackButton/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/Hoverable/ActiveHoverable.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Hoverable/ActiveHoverable.tsx"	"react-hooks/refs"	3
@@ -156,6 +182,7 @@
 "../../src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx"	"@typescript-eslint/no-deprecated/fontSize"	3
 "../../src/components/HTMLEngineProvider/HTMLRenderers/EmojiRenderer.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/components/HTMLEngineProvider/HTMLRenderers/HTMLTableScroll/index.native.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
 "../../src/components/HTMLEngineProvider/HTMLRenderers/MentionHereRenderer.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -177,8 +204,10 @@
 "../../src/components/ImageSVG/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/ImportOnyxState/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/ImportSpreadsheet.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/components/ImportSpreadsheet.tsx"	"no-restricted-imports"	1
 "../../src/components/ImportSpreadsheet.tsx"	"react-hooks/refs"	1
 "../../src/components/InitialURLContextProvider.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/InteractiveStepWrapper.tsx"	"no-restricted-imports"	1
 "../../src/components/KYCWall/BaseKYCWall.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/components/KYCWall/BaseKYCWall.tsx"	"react-hooks/refs"	2
 "../../src/components/LHNOptionsList/LHNEmptyState.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -194,7 +223,10 @@
 "../../src/components/Modal/BaseModal.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Modal/Global/ConfirmModalWrapper.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/components/Modal/Global/ModalContext.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/components/Modal/ReanimatedModal/Container/GestureHandler.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/Modal/ReanimatedModal/Container/GestureHandler.tsx"	"@typescript-eslint/no-deprecated/GestureType"	1
 "../../src/components/Modal/ReanimatedModal/Container/index.web.tsx"	"react-hooks/refs"	1
+"../../src/components/MoneyReportHeader.tsx"	"no-restricted-imports"	1
 "../../src/components/MoneyReportHeaderActions/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/MoneyRequestAmountInput.tsx"	"react-hooks/immutability"	2
 "../../src/components/MoneyRequestConfirmationList/ConfirmationFooterContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -208,20 +240,33 @@
 "../../src/components/MoneyRequestConfirmationListFooter/hooks/useReceiptThumbnailSource.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/MoneyRequestConfirmationListFooter/sections/DistanceMapSection.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/MoneyRequestConfirmationListFooter/sections/ReceiptSection.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/MoneyRequestHeader.tsx"	"no-restricted-imports"	1
 "../../src/components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/MoneyRequestReportView/MoneyRequestViewReportFields.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/MultifactorAuthentication/components/Modals/createCancelConfirmModal.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
+"../../src/components/MultifactorAuthentication/components/OutcomeScreen/OutcomeScreenBase.tsx"	"no-restricted-imports"	1
 "../../src/components/MultifactorAuthentication/config/scenarios/ChangePIN.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/MultifactorAuthentication/config/scenarios/DefaultUserInterface.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/MultifactorAuthentication/Context/stateReducer.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/MultifactorAuthentication/Context/usePromptContent.ts"	"react-hooks/refs"	10
 "../../src/components/MultifactorAuthentication/ValidateCodeResendButton.tsx"	"no-restricted-syntax"	1
+"../../src/components/MultiGestureCanvas/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/MultiGestureCanvas/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Race"	2
+"../../src/components/MultiGestureCanvas/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Simultaneous"	2
+"../../src/components/MultiGestureCanvas/index.tsx"	"@typescript-eslint/no-deprecated/GestureRef"	1
+"../../src/components/MultiGestureCanvas/index.tsx"	"@typescript-eslint/no-deprecated/GestureType"	2
 "../../src/components/MultiGestureCanvas/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/MultiGestureCanvas/index.tsx"	"no-restricted-syntax"	1
 "../../src/components/MultiGestureCanvas/index.tsx"	"react-hooks/preserve-manual-memoization"	1
 "../../src/components/MultiGestureCanvas/index.tsx"	"react-hooks/refs"	2
+"../../src/components/MultiGestureCanvas/usePanGesture.ts"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/MultiGestureCanvas/usePanGesture.ts"	"@typescript-eslint/no-deprecated/LegacyPanGesture"	1
 "../../src/components/MultiGestureCanvas/usePanGesture.ts"	"no-restricted-syntax"	1
+"../../src/components/MultiGestureCanvas/usePinchGesture.ts"	"@typescript-eslint/no-deprecated/Gesture.Pinch"	2
+"../../src/components/MultiGestureCanvas/usePinchGesture.ts"	"@typescript-eslint/no-deprecated/LegacyPinchGesture"	1
 "../../src/components/MultiGestureCanvas/usePinchGesture.ts"	"react-hooks/set-state-in-effect"	1
+"../../src/components/MultiGestureCanvas/useTapGestures.ts"	"@typescript-eslint/no-deprecated/Gesture.Tap"	4
+"../../src/components/MultiGestureCanvas/useTapGestures.ts"	"@typescript-eslint/no-deprecated/LegacyTapGesture"	2
 "../../src/components/MultiGestureCanvas/useTapGestures.ts"	"no-restricted-syntax"	1
 "../../src/components/Navigation/QuickCreationActionsBar/index.tsx"	"no-restricted-imports"	1
 "../../src/components/NumberWithSymbolForm.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -230,6 +275,7 @@
 "../../src/components/OptionRow.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/components/OptionRow.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/ParentNavigationSubtitle.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/ParticipantPicker/BaseParticipantPicker.tsx"	"no-restricted-imports"	1
 "../../src/components/PDFView/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/PDFView/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/PDFView/index.tsx"	"react-hooks/set-state-in-effect"	1
@@ -245,11 +291,16 @@
 "../../src/components/PressableWithSecondaryInteraction/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/PressableWithSecondaryInteraction/index.native.tsx"	"no-restricted-syntax"	1
 "../../src/components/PressableWithSecondaryInteraction/index.tsx"	"no-restricted-syntax"	1
+"../../src/components/PromotedActionsBar.tsx"	"no-restricted-imports"	1
+"../../src/components/PushRowWithModal/PushRowModal.tsx"	"no-restricted-imports"	1
 "../../src/components/RadioButtonWithLabel.tsx"	"no-restricted-syntax"	1
 "../../src/components/Reactions/AddReactionBubble.tsx"	"react-hooks/refs"	1
 "../../src/components/Reactions/MiniQuickEmojiReactions.tsx"	"react-hooks/refs"	1
+"../../src/components/ReceiptCropView/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	4
+"../../src/components/ReceiptCropView/index.tsx"	"@typescript-eslint/no-deprecated/PanGestureChangeEventPayload"	2
 "../../src/components/ReceiptCropView/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/ReceiptHoverZoom/useReceiptHoverZoom.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/ReimbursementAccountLoadingIndicator.tsx"	"no-restricted-imports"	1
 "../../src/components/ReportActionAvatars/useReportPreviewSenderID.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/ReportActionItem/IssueCardMessage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/ReportActionItem/MoneyReportView.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
@@ -263,17 +314,24 @@
 "../../src/components/RNMaskedTextInput.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/RoomHeaderAvatars.tsx"	"no-restricted-syntax"	2
 "../../src/components/Rule/RuleBooleanBase.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/Rule/RuleBooleanBase.tsx"	"no-restricted-imports"	1
+"../../src/components/Rule/RuleSelectionBase.tsx"	"no-restricted-imports"	1
+"../../src/components/Rule/RuleTextBase.tsx"	"no-restricted-imports"	1
 "../../src/components/Rule/TextBase.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/SAMLLoadingIndicator.tsx"	"@typescript-eslint/no-deprecated/fontSize"	1
 "../../src/components/ScreenWrapper/ScreenWrapperContainer.tsx"	"react-hooks/refs"	2
 "../../src/components/Search/chartGroupByConfig.ts"	"@typescript-eslint/no-unsafe-type-assertion"	20
+"../../src/components/Search/FilterComponents/AdvancedFilters/DateFilterContent.tsx"	"no-restricted-imports"	1
+"../../src/components/Search/FilterComponents/DateFilterBase.tsx"	"no-restricted-imports"	1
 "../../src/components/Search/FilterComponents/DateFilterBase.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Search/FilterComponents/DatePresetFilterBase.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/Search/FilterComponents/ReportField/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/Search/FilterComponents/ReportField/index.tsx"	"no-restricted-imports"	1
 "../../src/components/Search/FilterComponents/SingleSelect.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/FilterComponents/TypeSelector.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/Search/FilterDropdowns/BasePopup.tsx"	"no-restricted-imports"	1
+"../../src/components/Search/FilterDropdowns/DateSelectPopup/SelectedDateModifierHeader.tsx"	"no-restricted-imports"	1
 "../../src/components/Search/FilterDropdowns/SortByPopup.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/components/Search/hooks/useFilterUserValue.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/components/Search/hooks/useOptimisticSearchTracking.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/components/Search/hooks/useStableOptimisticSortedData.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
@@ -281,13 +339,12 @@
 "../../src/components/Search/index.tsx"	"react-hooks/refs"	5
 "../../src/components/Search/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Search/SearchAutocompleteInput.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
-"../../src/components/Search/SearchAutocompleteList.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchBulkActionsButton.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/Search/SearchContextDefinitions.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchList/ListItem/BaseListItemHeader.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchList/ListItem/CardListItemHeader.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/components/Search/SearchList/ListItem/ChatListItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	5
+"../../src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchList/ListItem/GroupChildrenContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/components/Search/SearchList/ListItem/MemberListItemHeader.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
@@ -306,16 +363,17 @@
 "../../src/components/Search/SearchRouter/getQueryWithSubstitutions.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchRouter/getUpdatedSubstitutionsMap.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchRouter/SearchRouter.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/Search/SearchRouter/SearchRouter.tsx"	"no-restricted-imports"	1
 "../../src/components/Search/SearchRouter/SearchRouterUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/Search/SearchSingleSelectionPicker.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/SelectionButton.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/SelectionList/BaseSelectionList.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/SelectionList/components/Footer.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/SelectionList/hooks/useFlattenedSections.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
-"../../src/components/SelectionList/ListItem/SpendRuleListItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/components/SelectionList/ListItem/SplitListItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/components/SelectionList/ListItem/SplitListItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/SelectionList/utils/getListboxRole/index.web.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/SelectionScreen.tsx"	"no-restricted-imports"	1
 "../../src/components/SettlementButton/AnimatedSettlementButton.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/SettlementButton/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	10
 "../../src/components/SettlementButton/index.tsx"	"no-restricted-imports"	1
@@ -323,8 +381,14 @@
 "../../src/components/SidePanel/SidePanelReport/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/SignInButtons/IconButton.tsx"	"no-restricted-syntax"	1
 "../../src/components/SkeletonViewContentLoader/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/SpendRules/configuration/SpendRuleCategoryBase.tsx"	"no-restricted-imports"	1
+"../../src/components/SpendRules/configuration/SpendRuleMaxAmountBase.tsx"	"no-restricted-imports"	1
+"../../src/components/SpendRules/configuration/SpendRuleMerchantEditBase.tsx"	"no-restricted-imports"	1
+"../../src/components/SpendRules/configuration/SpendRuleMerchantsBase.tsx"	"no-restricted-imports"	1
+"../../src/components/SpendRules/configuration/SpendRulesCurrencyBase.tsx"	"no-restricted-imports"	1
 "../../src/components/StatePicker/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/StatePicker/StateSelectorModal.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/components/StatePicker/StateSelectorModal.tsx"	"no-restricted-imports"	1
 "../../src/components/StatusBadge.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/SubStepForms/AddressStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/components/SubStepForms/CountryFullStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -355,11 +419,13 @@
 "../../src/components/TextInput/index.tsx"	"no-restricted-syntax"	1
 "../../src/components/TextInput/TextInputMeasurement/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/TextLinkBlock.tsx"	"no-restricted-syntax"	1
+"../../src/components/TextPicker/TextSelectorModal.tsx"	"no-restricted-imports"	1
 "../../src/components/TextPicker/TextSelectorModal.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/TextWithTooltip/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/ThemeStylesContextProvider/default.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/ThreeDotsMenu/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/ThreeDotsMenu/index.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/components/TimeModalPicker.tsx"	"no-restricted-imports"	1
 "../../src/components/TimePicker/TimePicker.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	6
 "../../src/components/TimePicker/TimePicker.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/components/Tooltip/BaseGenericTooltip/index.native.tsx"	"react-hooks/refs"	2
@@ -372,16 +438,21 @@
 "../../src/components/Tooltip/PopoverAnchorTooltip.tsx"	"react-hooks/refs"	7
 "../../src/components/TransactionItemRow/DataCells/ChatBubbleCell.tsx"	"rulesdir/no-raw-typography"	2
 "../../src/components/TransactionItemRow/DataCells/MerchantCell.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/components/TransactionItemRow/EditableCell/usePopoverEditState.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/UploadFile.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/UserInitialsAvatar.tsx"	"@typescript-eslint/no-deprecated/fontSize"	1
+"../../src/components/ValidateCodeInput.tsx"	"@typescript-eslint/no-deprecated/Gesture.Tap"	2
 "../../src/components/ValidateCodeInput.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/components/ValidateCodeInput.tsx"	"react-hooks/refs"	1
 "../../src/components/ValidateCodeInput.tsx"	"react-hooks/set-state-in-effect"	3
+"../../src/components/ValuePicker/ValueSelectorModal.tsx"	"no-restricted-imports"	1
 "../../src/components/VideoPlayer/BaseVideoPlayer.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	7
 "../../src/components/VideoPlayer/BaseVideoPlayer.tsx"	"react-hooks/refs"	13
 "../../src/components/VideoPlayer/BaseVideoPlayer.tsx"	"react-hooks/set-state-in-effect"	2
 "../../src/components/VideoPlayer/useHandleNativeVideoControls/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx"	"@typescript-eslint/no-deprecated/PanGestureChangeEventPayload"	1
+"../../src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
+"../../src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx"	"@typescript-eslint/no-deprecated/PanGestureChangeEventPayload"	1
 "../../src/components/VideoPlayerContexts/PlaybackContext/playbackContextReportIDUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/WalletStatementModal/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/WideRHPContextProvider/useShouldRenderOverlay.ts"	"react-hooks/set-state-in-effect"	1
@@ -390,6 +461,8 @@
 "../../src/components/withNavigationTransitionEnd.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/withToggleVisibilityView.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/components/withViewportOffsetTop.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/components/WorkspaceConfirmationForm.tsx"	"no-restricted-imports"	1
+"../../src/components/WorkspaceMemberRoleList.tsx"	"no-restricted-imports"	1
 "../../src/components/ZeroWidthView/index.tsx"	"no-restricted-syntax"	2
 "../../src/CONST/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/CONST/runtimeConfigured.ts"	"rulesdir/no-direct-personal-details-list"	1
@@ -425,7 +498,6 @@
 "../../src/hooks/useDynamicBackPath.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/hooks/useExportedToFilterOptions.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/hooks/useFilterFormValues.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/hooks/useGeographicalStateAndCountryFromRoute.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/hooks/useHtmlPaste/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/hooks/useHydrateReportsFromSnapshot.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/hooks/useImportSpreadsheetConfirmModal.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -439,6 +511,7 @@
 "../../src/hooks/useLazyAsset.ts"	"react-hooks/set-state-in-effect"	1
 "../../src/hooks/useListKeyboardNav.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/hooks/useMarkdownStyle.ts"	"rulesdir/no-raw-typography"	3
+"../../src/hooks/useNativeCamera.ts"	"@typescript-eslint/no-deprecated/Gesture.Tap"	2
 "../../src/hooks/useNewTransactions.ts"	"react-hooks/refs"	2
 "../../src/hooks/useOnyx.ts"	"@typescript-eslint/no-unsafe-type-assertion"	10
 "../../src/hooks/useOptimisticDraftTransactions.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -459,7 +532,6 @@
 "../../src/hooks/useReviewDuplicatesNavigation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/hooks/useReviewDuplicatesNavigation.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/hooks/useSearchBulkActions.ts"	"@typescript-eslint/no-unsafe-type-assertion"	9
-"../../src/hooks/useSearchHighlightAndScroll.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
 "../../src/hooks/useSidebarOrderedReports.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/hooks/useSidebarOrderedReports.tsx"	"react-hooks/refs"	5
 "../../src/hooks/useSidebarOrderedReports.tsx"	"react-hooks/set-state-in-effect"	1
@@ -469,18 +541,15 @@
 "../../src/hooks/useSubPage/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/hooks/useTackInputFocus/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/hooks/useTextWithMiddleEllipsis.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/hooks/useTodoSearchResults.ts"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/hooks/useTransactionViolationOfWorkspace.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/hooks/useViolations.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/hooks/useWindowDimensions/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/hooks/useWorkletStateMachine/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/languages/flattenObject.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/libs/Accessibility/moveAccessibilityFocus/types.ts"	"@typescript-eslint/no-deprecated/ElementRef"	1
 "../../src/libs/AccountingUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/__mocks__/App.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/__mocks__/App.ts"	"no-restricted-syntax"	2
 "../../src/libs/actions/__mocks__/OnyxUpdates.ts"	"no-restricted-syntax"	1
-"../../src/libs/actions/App.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/App.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/applyOnyxUpdatesReliably.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/BankAccounts.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
@@ -523,8 +592,7 @@
 "../../src/libs/actions/IOU/Duplicate.ts"	"no-restricted-syntax"	2
 "../../src/libs/actions/IOU/Hold.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/libs/actions/IOU/Hold.ts"	"no-restricted-syntax"	2
-"../../src/libs/actions/IOU/index.ts"	"rulesdir/no-direct-personal-details-list"	2
-"../../src/libs/actions/IOU/index.ts"	"rulesdir/no-onyx-connect"	11
+"../../src/libs/actions/IOU/index.ts"	"rulesdir/no-onyx-connect"	7
 "../../src/libs/actions/IOU/MoneyRequest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/IOU/MoneyRequestBuilder.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	2
 "../../src/libs/actions/IOU/MoneyRequestBuilder.ts"	"@typescript-eslint/no-deprecated/translateLocal"	1
@@ -542,7 +610,6 @@
 "../../src/libs/actions/IOU/ReportWorkflow.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	5
 "../../src/libs/actions/IOU/ReportWorkflow.ts"	"no-restricted-imports"	1
 "../../src/libs/actions/IOU/ReportWorkflow.ts"	"no-restricted-syntax"	1
-"../../src/libs/actions/IOU/SearchUpdate.ts"	"rulesdir/no-direct-personal-details-list"	2
 "../../src/libs/actions/IOU/SendInvoice.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/IOU/SendInvoice.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/IOU/SendMoney.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -594,10 +661,10 @@
 "../../src/libs/actions/Policy/Plan.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/Policy/Policy.ts"	"@typescript-eslint/no-unsafe-type-assertion"	8
 "../../src/libs/actions/Policy/Policy.ts"	"no-restricted-imports"	2
-"../../src/libs/actions/Policy/Policy.ts"	"no-restricted-syntax"	10
+"../../src/libs/actions/Policy/Policy.ts"	"no-restricted-syntax"	9
 "../../src/libs/actions/Policy/ReportField.ts"	"no-restricted-imports"	1
 "../../src/libs/actions/Policy/ReportField.ts"	"no-restricted-syntax"	4
-"../../src/libs/actions/Policy/Rules.ts"	"no-restricted-syntax"	3
+"../../src/libs/actions/Policy/Rules.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/Policy/Tag.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/Policy/Tag.ts"	"no-restricted-imports"	1
 "../../src/libs/actions/Policy/Tag.ts"	"no-restricted-syntax"	4
@@ -611,8 +678,7 @@
 "../../src/libs/actions/Report/index.ts"	"@typescript-eslint/no-deprecated/reportAction.originalMessage"	1
 "../../src/libs/actions/Report/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	19
 "../../src/libs/actions/Report/index.ts"	"no-restricted-syntax"	7
-"../../src/libs/actions/Report/index.ts"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/libs/actions/Report/index.ts"	"rulesdir/no-onyx-connect"	3
+"../../src/libs/actions/Report/index.ts"	"rulesdir/no-onyx-connect"	2
 "../../src/libs/actions/Report/MarkAllMessageAsRead.tsx"	"no-restricted-syntax"	1
 "../../src/libs/actions/ReportLayout.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/ReportLayout.ts"	"no-restricted-syntax"	1
@@ -630,7 +696,6 @@
 "../../src/libs/actions/Tab.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/actions/Task.ts"	"no-restricted-imports"	1
 "../../src/libs/actions/Task.ts"	"no-restricted-syntax"	5
-"../../src/libs/actions/Task.ts"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/libs/actions/TaxRate.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/TeachersUnite.ts"	"no-restricted-syntax"	1
 "../../src/libs/actions/Transaction.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	2
@@ -651,11 +716,10 @@
 "../../src/libs/API/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/API/makeRequest.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/AttendeeUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
-"../../src/libs/Avatars/InitialAvatars.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/BankAccountUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/canFocusInputOnScreenFocus/index.ts"	"no-restricted-syntax"	1
 "../../src/libs/CardFeedUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	7
-"../../src/libs/CardUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	13
+"../../src/libs/CardUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	12
 "../../src/libs/CategoryOptionListUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/clearSelectedTextIfComposerBlurred/clearSelectedTextIfComposerBlurred.web.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Clipboard/index.ts"	"@typescript-eslint/no-deprecated/document.execCommand"	1
@@ -664,7 +728,6 @@
 "../../src/libs/ComposerFocusManager.ts"	"@typescript-eslint/no-deprecated/TextInput.State.currentlyFocusedField"	1
 "../../src/libs/ComposerFocusManager.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/ComposerUtils/index.ts"	"no-restricted-syntax"	1
-"../../src/libs/compoundParamsKey.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/CountryUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/CurrencyUtils.ts"	"rulesdir/no-onyx-connect"	1
 "../../src/libs/DateUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
@@ -777,6 +840,7 @@
 "../../src/libs/Navigation/OnyxTabNavigator.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/libs/Navigation/PlatformStackNavigation/navigationOptions/animation/withAnimation.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
 "../../src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/libs/NetSuiteUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Network/enhanceParameters.ts"	"no-restricted-syntax"	1
 "../../src/libs/Network/index.ts"	"no-restricted-syntax"	1
 "../../src/libs/Network/LoadTestState.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -791,16 +855,13 @@
 "../../src/libs/ObjectUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/OptionsListUtils/index.ts"	"@typescript-eslint/no-deprecated/translateLocal"	7
 "../../src/libs/OptionsListUtils/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
-"../../src/libs/OptionsListUtils/index.ts"	"rulesdir/no-onyx-connect"	1
-"../../src/libs/OptionsListUtils/searchMatchUtils.ts"	"@typescript-eslint/no-deprecated/translateLocal"	2
 "../../src/libs/PageHTMLCapture/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/libs/Parser.ts"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/libs/Parser.ts"	"rulesdir/no-onyx-connect"	2
+"../../src/libs/Parser.ts"	"rulesdir/no-onyx-connect"	1
 "../../src/libs/ParsingUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/PaymentUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/PersonalDetailsUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/PhoneNumber.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/libs/PolicyUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	9
+"../../src/libs/PolicyUtils/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	8
 "../../src/libs/prepareRequestPayload/index.native.ts"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../src/libs/prepareRequestPayload/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Pusher/index.native.ts"	"@typescript-eslint/no-unsafe-type-assertion"	6
@@ -825,7 +886,6 @@
 "../../src/libs/SearchQueryUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	48
 "../../src/libs/SearchUIUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	71
 "../../src/libs/SearchUIUtils.ts"	"no-restricted-imports"	1
-"../../src/libs/ShortMentionLogins.ts"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/libs/SidebarUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/Sound/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/libs/SpendRulesUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
@@ -836,9 +896,11 @@
 "../../src/libs/telemetry/forwardLogsToSentry.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/libs/telemetry/TelemetrySynchronizer.ts"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/libs/TransactionPreviewUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/libs/TransactionUtils/duplicates.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
+"../../src/libs/TransactionUtils/getUpdatedTransaction.ts"	"@typescript-eslint/no-deprecated/translateLocal"	2
 "../../src/libs/TransactionUtils/index.ts"	"@typescript-eslint/no-deprecated/getReportTransactions"	1
-"../../src/libs/TransactionUtils/index.ts"	"@typescript-eslint/no-deprecated/translateLocal"	3
-"../../src/libs/TransactionUtils/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	7
+"../../src/libs/TransactionUtils/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/libs/TransactionUtils/tax.ts"	"@typescript-eslint/no-deprecated/translateLocal"	1
 "../../src/libs/UnreadIndicatorUpdater/index.ts"	"no-restricted-imports"	1
 "../../src/libs/UnreadIndicatorUpdater/index.ts"	"no-restricted-syntax"	1
 "../../src/libs/updateMultilineInputRange/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -850,65 +912,97 @@
 "../../src/libs/WorkspaceReportFieldUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/libs/WorkspacesSettingsUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/ONYXKEYS.ts"	"no-restricted-syntax"	2
+"../../src/pages/AddExistingExpense.tsx"	"no-restricted-imports"	1
 "../../src/pages/AddPersonalBankAccountPage/substeps/AddressStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	6
 "../../src/pages/AddPersonalBankAccountPage/substeps/AddressStep.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/AddressPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/AddressPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/AddressPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/ChronosScheduleOOOPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Debug/ConstantPicker.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/Debug/ConstantSelector.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/Debug/DateTimeSelector.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/Debug/DebugDetails.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	8
-"../../src/pages/Debug/Report/DebugReportActions.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/Debug/Report/DebugReportPage.tsx"	"rulesdir/no-direct-personal-details-list"	2
+"../../src/pages/Debug/DynamicDebugDetailsConstantPickerPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Debug/DynamicDebugDetailsDateTimePickerPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Debug/Report/DebugReportPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/Debug/ReportAction/DebugReportActionCreatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Debug/ReportAction/DebugReportActionPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Debug/ReportAction/DebugReportActionPreview.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/Debug/Transaction/DebugTransactionPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Debug/Transaction/DebugTransactionViolations.tsx"	"no-restricted-syntax"	1
 "../../src/pages/Debug/TransactionViolation/DebugTransactionViolationCreatePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
+"../../src/pages/Debug/TransactionViolation/DebugTransactionViolationCreatePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Admins/DomainAdminDetailsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Admins/DomainAdminsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/BaseDomainMemberDetailsComponent.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/DomainAddMemberPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/DomainMemberDetailsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/DomainMembersPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/DomainReportSuspiciousActivityPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/MoveUserBetweenGroupsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/TwoFactorAuth/DomainMemberForceTwoFactorAuthPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/domain/Members/TwoFactorAuth/DomainMemberResetTwoFactorAuthPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/Debug/TransactionViolation/DebugTransactionViolationPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/AddDomainPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Admins/DomainAddAdminPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Admins/DomainAdminsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/BaseDomainMemberDetailsComponent.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/BaseDomainMembersPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/BaseDomainRequireTwoFactorAuthPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/BaseDomainSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/BaseDomainVerifiedPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/BaseVerifyDomainPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/DomainAccessRestrictedPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/DomainAddedPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/DomainAlreadyExistsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/DomainInitialPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/DomainResetPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/DomainSamlPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Groups/BaseDomainGroupPreferredWorkspacePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Groups/DomainGroupCreatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Groups/DomainGroupDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Groups/DomainGroupEditNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Groups/DomainGroupsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Members/DomainAddMemberPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Members/DomainMembersPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Members/MoveUserBetweenGroupsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/domain/Members/MoveUsersBetweenGroupsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/DynamicEditReportFieldPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/DynamicReportChangeWorkspacePage.tsx"	"rulesdir/no-direct-personal-details-list"	3
-"../../src/pages/DynamicReportDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
-"../../src/pages/DynamicReportDetailsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/DynamicEditReportFieldPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicFlagCommentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicNewReportWorkspaceSelectionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicReportChangeApproverPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicReportChangeWorkspacePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicReportDetailsPage/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/DynamicReportDetailsPage/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/DynamicReportParticipantDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/DynamicReportParticipantDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicReportParticipantRoleSelectionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicReportParticipantsInvitePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicReportParticipantsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicRoomInvitePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/DynamicRoomMemberDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/DynamicRoomMemberDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/DynamicRoomMembersPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/DynamicRoomMembersPage.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/DynamicRoomMembersPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/DynamicWorkspaceCurrencySelectionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/EnablePayments/Pay/Activate/ActivateStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/EnablePayments/Pay/AdditionalDetails/AdditionalDetailsStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/EnablePayments/Pay/EnablePaymentsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/EnablePayments/Pay/Onfido/OnfidoStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/EnablePayments/Pay/Terms/TermsStep.tsx"	"no-restricted-imports"	1
 "../../src/pages/EnablePayments/shared/IdologyQuestions.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/EnablePayments/Wallet/AddBankAccount/AddBankAccount.tsx"	"no-restricted-imports"	1
+"../../src/pages/EnablePayments/Wallet/EnablePayments.tsx"	"no-restricted-imports"	1
 "../../src/pages/EnablePayments/Wallet/PersonalInfo/substeps/DateOfBirthStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/pages/EnablePayments/Wallet/utils/getSubstepValues.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/EnablePayments/Wallet/VerifyIdentity/VerifyIdentity.tsx"	"no-restricted-imports"	1
+"../../src/pages/GroupChatNameEditPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/home/ForYouSection/ConciergePromptBox.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/home/GettingStartedSection/hooks/useGettingStartedItems.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/home/GettingStartedSection/hooks/useGettingStartedItems.ts"	"no-restricted-imports"	1
 "../../src/pages/home/TimeSensitiveSection/items/FixCompanyCardConnection.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/home/YourSpendSection/useYourSpendData.ts"	"no-restricted-imports"	1
-"../../src/pages/inbox/AccountManagerBanner.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/inbox/AgentZeroStatusContext.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/inbox/cleanStaleReportActionBackToParam.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
-"../../src/pages/inbox/ConciergeDraftContext.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/inbox/HeaderView.tsx"	"rulesdir/no-direct-personal-details-list"	2
 "../../src/pages/inbox/hooks/useReportWasDeleted.ts"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/inbox/ReactionListWrapper.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/inbox/report/actionContents/ActionContentRouter.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/inbox/report/actionContents/JoinRequestContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/inbox/report/actionContents/JoinRequestContent.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/inbox/report/actionContents/MemberChangeContent.tsx"	"rulesdir/no-direct-personal-details-list"	2
-"../../src/pages/inbox/report/actionContents/MentionWhisperContent.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/inbox/report/actionContents/ReimbursedContent.tsx"	"rulesdir/no-direct-personal-details-list"	2
 "../../src/pages/inbox/report/actionContents/ReimbursementDeQueuedContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/inbox/report/actionContents/ReimbursementQueuedContent.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/inbox/report/actionContents/RemovedFromApprovalChainContent.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/inbox/report/comment/TextCommentFragment.tsx"	"@typescript-eslint/no-deprecated/fontSize"	1
 "../../src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx"	"react-hooks/refs"	1
@@ -916,13 +1010,11 @@
 "../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	1
 "../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/inbox/report/ContextMenu/PopoverReportActionContextMenu.tsx"	"react-hooks/refs"	28
-"../../src/pages/inbox/report/DelegateOnBehalfOfText.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/inbox/report/HumanAgentAssistedByText.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/inbox/report/DynamicReportDetailsExportPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/inbox/report/LinkPreviewer.tsx"	"@typescript-eslint/no-deprecated/fontSize"	3
 "../../src/pages/inbox/report/ReactionList/HeaderReactionList.tsx"	"no-restricted-syntax"	1
-"../../src/pages/inbox/report/ReactionList/PopoverReactionList.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/inbox/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/inbox/report/ReportActionCompose/ComposerLocalTime.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/inbox/report/ReportActionCompose/ComposerSendButton.tsx"	"@typescript-eslint/no-deprecated/Gesture.Tap"	2
 "../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx"	"react-hooks/refs"	7
 "../../src/pages/inbox/report/ReportActionCompose/SuggestionEmoji.tsx"	"react-hooks/refs"	1
@@ -933,20 +1025,17 @@
 "../../src/pages/inbox/report/ReportActionCompose/useReceiptDrop.ts"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../src/pages/inbox/report/ReportActionItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/pages/inbox/report/ReportActionItem.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/inbox/report/ReportActionItem.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/inbox/report/ReportActionItemCreated.tsx"	"rulesdir/no-direct-personal-details-list"	3
 "../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"no-restricted-syntax"	1
 "../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"react-hooks/refs"	5
 "../../src/pages/inbox/report/ReportActionItemMessageEdit.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/inbox/report/ReportActionItemParentAction.tsx"	"rulesdir/no-direct-personal-details-list"	2
-"../../src/pages/inbox/report/ReportActionItemSingle.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/inbox/report/SearchActionHeader.tsx"	"@typescript-eslint/no-deprecated/fontSize"	1
 "../../src/pages/inbox/report/shouldUseEmojiPickerSelection/index.web.ts"	"no-restricted-syntax"	1
 "../../src/pages/inbox/report/TripSummary.tsx"	"rulesdir/no-default-id-values"	1
 "../../src/pages/inbox/report/useDebouncedSaveDraft.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/inbox/report/WhisperBanner.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/inbox/report/withReportAndPrivateNotesOrNotFound.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/inbox/report/withReportAndPrivateNotesOrNotFound.tsx"	"no-restricted-imports"	1
 "../../src/pages/inbox/report/withReportAndReportActionOrNotFound.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/inbox/report/withReportOrNotFound.tsx"	"react-hooks/refs"	3
 "../../src/pages/inbox/ReportHeader.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
@@ -956,50 +1045,55 @@
 "../../src/pages/inbox/sidebar/FABPopoverContent/menuItems/NewWorkspaceMenuItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/inbox/sidebar/FABPopoverContent/menuItems/TravelMenuItem.tsx"	"no-restricted-imports"	1
 "../../src/pages/inbox/sidebar/FABPopoverContent/useScanActions.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/iou/DynamicSplitBillDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/iou/DynamicSplitExpenseCreateDateRangePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/iou/DynamicSplitExpenseEditPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/DynamicSplitExpensePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/iou/DynamicSplitExpensePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/DynamicSplitExpensePage.tsx"	"react-hooks/set-state-in-effect"	3
+"../../src/pages/iou/HoldReasonFormView.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/MoneyRequestAmountForm.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/iou/RejectReasonFormView.tsx"	"no-restricted-imports"	1
+"../../src/pages/iou/request/DistanceRequestStartPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/iou/request/IOURequestStartPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/ParticipantSearchResults.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
-"../../src/pages/iou/request/step/AmountSubmitDataSync.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/iou/request/step/DistanceManualTabContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/iou/request/step/DynamicIOURequestEditReport.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepCategoryCreate.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepDate.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepDescription.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/iou/request/step/DynamicIOURequestStepDistance.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepDistanceRate.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepMerchant.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/iou/request/step/DynamicIOURequestStepReport.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepTag.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepTaxAmountPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/DynamicIOURequestStepWaypoint.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/iou/request/step/DynamicIOURequestStepWaypoint.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/IOURequestEditReportCommon.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/iou/request/step/IOURequestStepAmount.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/iou/request/step/IOURequestStepConfirmation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/iou/request/step/IOURequestStepConfirmation.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/IOURequestStepConfirmation.tsx"	"react-hooks/preserve-manual-memoization"	1
-"../../src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx"	"@typescript-eslint/no-deprecated/ConfirmModal"	3
-"../../src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/iou/request/step/IOURequestStepCurrencyModal.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/IOURequestStepDistanceMap.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/iou/request/step/IOURequestStepGPSTripEdit/Slider.tsx"	"@typescript-eslint/no-deprecated/Gesture.Pan"	2
 "../../src/pages/iou/request/step/IOURequestStepOdometerImage/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/iou/request/step/IOURequestStepScan/components/CameraViewport.tsx"	"@typescript-eslint/no-deprecated/GestureType"	1
 "../../src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/WebCamera.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx"	"rulesdir/no-direct-personal-details-list"	1
 "../../src/pages/iou/request/step/IOURequestStepScan/DynamicReceiptView/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/iou/request/step/IOURequestStepScan/DynamicReceiptView/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/IOURequestStepScan/DynamicReceiptView/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/iou/request/step/IOURequestStepScan/hooks/useScanRouteParams.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/iou/request/step/IOURequestStepScan/utils/getFileSource.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/StepScreenWrapper.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/iou/request/step/StepScreenWrapper.tsx"	"no-restricted-imports"	1
 "../../src/pages/iou/request/step/withFullTransactionOrNotFound.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/iou/request/step/withWritableReportOrNotFound.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/iou/SplitList/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/LoadingPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/media/AttachmentModalScreen/AttachmentModalBaseContent/index.tsx"	"react-hooks/set-state-in-effect"	3
 "../../src/pages/media/AttachmentModalScreen/AttachmentModalContext.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/media/AttachmentModalScreen/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	16
@@ -1007,15 +1101,25 @@
 "../../src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	7
 "../../src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx"	"react-hooks/set-state-in-effect"	2
 "../../src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/MissingPersonalDetails/MissingPersonalDetailsContent.tsx"	"no-restricted-imports"	1
 "../../src/pages/MissingPersonalDetails/MissingPersonalDetailsValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/MissingPersonalDetails/subPages/Address.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	5
 "../../src/pages/MissingPersonalDetails/subPages/Address.tsx"	"react-hooks/refs"	4
 "../../src/pages/MultifactorAuthentication/AuthorizeTransactionPage/AuthorizeCardTransactionPreview.tsx"	"@typescript-eslint/no-deprecated/fontSize"	2
+"../../src/pages/MultifactorAuthentication/AuthorizeTransactionPage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/MultifactorAuthentication/PromptPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/MultifactorAuthentication/RevokePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/MultifactorAuthentication/ValidateCodePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/NewChatConfirmPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/NewChatSelectorPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/OnboardingPrivateDomain/BaseOnboardingPrivateDomain.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/PrivateNotes/PrivateNotesEditPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/PrivateNotes/PrivateNotesListPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/ProfilePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/ProfilePage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/ProfilePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReimbursementAccount/AddressFormFields.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/ReimbursementAccount/ConnectedVerifiedBankAccount.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReimbursementAccount/EnterSignerInfo/subSteps/Address.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/AccountHolderDetails.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	7
 "../../src/pages/ReimbursementAccount/NonUSD/BankInfo/subSteps/BankAccountDetails.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	7
@@ -1027,6 +1131,7 @@
 "../../src/pages/ReimbursementAccount/NonUSD/BusinessInfo/subSteps/ContactInformation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ReimbursementAccount/NonUSD/BusinessInfo/subSteps/IncorporationLocation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/ReimbursementAccount/NonUSD/BusinessInfo/subSteps/Website.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReimbursementAccount/NonUSD/SignerInfo/subSteps/Address.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ReimbursementAccount/NonUSD/utils/getBankInfoStepValues.ts"	"@typescript-eslint/no-unsafe-type-assertion"	11
 "../../src/pages/ReimbursementAccount/NonUSD/utils/getInitialSubStepForBankInfoStep.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1034,6 +1139,7 @@
 "../../src/pages/ReimbursementAccount/NonUSD/utils/getInputKeysForBankInfoStep.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ReimbursementAccount/NonUSD/utils/getValuesForBeneficialOwner.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx"	"react-hooks/refs"	3
 "../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx"	"react-hooks/set-state-in-effect"	4
 "../../src/pages/ReimbursementAccount/USD/BankInfo/BankInfo.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1041,71 +1147,206 @@
 "../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/ConfirmationBusiness.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/TypeBusiness/BusinessTypePicker/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/WebsiteBusiness.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/BankAccountValidationForm.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReimbursementAccount/utils/getSubStepValues.ts"	"@typescript-eslint/no-unsafe-type-assertion"	4
+"../../src/pages/ReimbursementAccount/VerifiedBankAccountFlowEntryPoint.tsx"	"no-restricted-imports"	1
+"../../src/pages/RejectExpenseReportPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReportDescriptionPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/ReportDescriptionPage.tsx"	"no-restricted-syntax"	1
-"../../src/pages/ReportSubmitToContent.tsx"	"rulesdir/no-direct-personal-details-list"	2
+"../../src/pages/RestrictedAction/Workspace/WorkspaceAdminRestrictedAction.tsx"	"no-restricted-imports"	1
+"../../src/pages/RestrictedAction/Workspace/WorkspaceOwnerRestrictedAction/index.native.tsx"	"no-restricted-imports"	1
+"../../src/pages/RestrictedAction/Workspace/WorkspaceOwnerRestrictedAction/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/RestrictedAction/Workspace/WorkspaceUserRestrictedAction.tsx"	"no-restricted-imports"	1
+"../../src/pages/RoomDescriptionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/ScheduleCall/ScheduleCallConfirmationPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/ScheduleCall/ScheduleCallPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Search/SavedSearchRenamePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/Search/SavedSearchRenamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchAdvancedFiltersContentPage/SearchAdvancedFiltersContentBase.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchAdvancedFiltersPage/SearchAdvancedFiltersBase.tsx"	"no-restricted-imports"	1
 "../../src/pages/Search/SearchChangeApproverPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/Search/SearchChangeApproverPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleAmountPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleAttendeesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleBooleanPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleCategoryPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleDatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleDescriptionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleMerchantPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Search/SearchEditMultiple/SearchEditMultipleTagPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleTagPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchEditMultiple/SearchEditMultipleTaxPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Search/SearchEditMultiple/SearchEditMultipleUtils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/pages/Search/SearchMoneyRequestReportPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/Search/SearchPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/Search/SearchPageNarrow/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/Search/SearchSavePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Search/SearchTransactionsChangeReport.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/SetDefaultWorkspacePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/AboutPage/AboutPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/AboutPage/AboutPage.tsx"	"react-hooks/refs"	1
-"../../src/pages/settings/Agents/EditAgentPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/settings/Agents/Fields/EditNamePage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/settings/Agents/AddAgentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/AgentsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/EditAgentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/Fields/EditNamePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Agents/Fields/EditPromptPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Agents/Fields/EditPromptPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Agents/NewAgentPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/AppDownloadLinks.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Copilot/CopilotPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/settings/Copilot/CopilotPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/DynamicKeyboardShortcutsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/ExitSurvey/DynamicExitSurveyConfirmPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/ExitSurvey/DynamicExitSurveyConfirmPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/ExitSurvey/DynamicExitSurveyReasonPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/HelpPage/HelpPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Preferences/LanguagePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Preferences/PaymentCurrencyPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Preferences/PreferencesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Preferences/PriorityModePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Preferences/ThemePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/AgentAIPromptSection.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Profile/Avatar/UserProfileAvatar.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx"	"react-hooks/refs"	3
 "../../src/pages/settings/Profile/Contacts/DynamicContactMethodDetailsPage.tsx"	"react-hooks/set-state-in-effect"	3
+"../../src/pages/settings/Profile/Contacts/DynamicContactMethodsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/Contacts/DynamicNewContactMethodPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/CustomStatus/SetDatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/CustomStatus/SetTimePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/settings/Profile/CustomStatus/StatusPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/CustomStatus/StatusPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/settings/Profile/CustomStatus/VacationDelegateMissingWorkspacesPage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/DisplayNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/PersonalDetails/BaseLegalNamePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/PersonalDetails/DynamicCountrySelectionPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Profile/PersonalDetails/DynamicCountrySelectionPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/PersonalDetails/DynamicStateSelectionPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/settings/Profile/PersonalDetails/DynamicStateSelectionPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/PersonalDetails/PersonalAddressPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsConfirmValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	8
+"../../src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/ProfilePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Profile/ProfilePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Profile/PronounsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/PronounsPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/settings/Profile/TimezoneInitialPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Profile/TimezoneInitialPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Profile/TimezoneSelectPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Profile/TimezoneSelectPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Report/DynamicNotificationPreferencePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Report/DynamicReportSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Report/DynamicVisibilityPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Report/DynamicWriteCapabilityPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Report/RoomNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Rules/ExpenseRulesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Rules/RulePageBase.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Security/AddDelegate/ConfirmDelegatePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/settings/Security/AddDelegate/ConfirmDelegateValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Security/AddDelegate/SelectDelegateRolePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateRolePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Security/AddDelegate/UpdateDelegateRole/UpdateDelegateValidateCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Security/CloseAccount/CloseAccountPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/DeviceManagementPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/LockAccount/FailedToLockAccountPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/LockAccount/UnlockAccountPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/MergeAccounts/AccountDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/MergeAccounts/AccountValidatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/MergeAccounts/MergeResultPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/SecuritySettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthWrapper.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/CancelSubscriptionPage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/CardAuthenticationModal/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Subscription/CardAuthenticationModal/index.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/ExpensifyCodePage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.tsx"	"no-restricted-syntax"	1
 "../../src/pages/settings/Subscription/PaymentCard/DynamicPaymentCardCurrencySelectorPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Subscription/PaymentCard/DynamicPaymentCardCurrencySelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/PaymentCard/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/SubscriptionPlan/ComparePlansModal.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Subscription/SubscriptionPlan/ComparePlansModal.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/settings/Subscription/SubscriptionPlan/DynamicSubscriptionPlanDowngradeBlockedPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/SubscriptionSettings/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/SubscriptionSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Subscription/SubscriptionSize/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Troubleshoot/DynamicBetaOverridesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Troubleshoot/ServerSelector.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Troubleshoot/TroubleshootPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/VerifyAccountPageBase.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/AddCardToDigitalWalletPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/AddDebitCardPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/BankAccountPurposePage/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/BankAccountPurposePage/substeps/CountrySelection.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Wallet/CardAddedToWalletPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/ChooseTransferAccountPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Wallet/ChooseTransferAccountPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/CountrySelectionList.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/settings/Wallet/EnableGlobalReimbursements/EnableGlobalReimbursementsAgreementsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Wallet/EnableGlobalReimbursements/EnableGlobalReimbursementsBusinessPage/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Wallet/ExpensifyCardPage/ChangePINPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ExpensifyCardPage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ImportTransactionsCardNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ImportTransactionsCurrencyPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ImportTransactionsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/InternationalDepositAccount/subPages/AccountFlowEntryPoint.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/InternationalDepositAccount/subPages/Confirmation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Wallet/InternationalDepositAccount/utils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/settings/Wallet/PaymentMethodList.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	7
 "../../src/pages/settings/Wallet/PersonalCardDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/settings/Wallet/PersonalCardDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCardEditNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCardEditTransactionStartDatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCards/FixPersonalCardConnectionPage/index.native.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCards/FixPersonalCardConnectionPage/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/PersonalCards/FixPersonalCardConnectionPage/useFixPersonalCardConnection.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.native.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCards/steps/PlaidConnectionStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCards/steps/SelectBankStep.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/PersonalCards/steps/SelectCountryStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Wallet/PersonalCards/steps/SelectCountryStep.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/PersonalCards/steps/SelectCountryStep.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Wallet/PersonalCards/steps/SuccessStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ReportCardLostConfirmValidateCodePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ReportCardLostPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ReportVirtualCardFraudConfirmationPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/ShareBankAccount/ShareBankAccount.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/ShareBankAccount/ShareBankAccount.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/settings/Wallet/TransactionsImportedPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/TransferBalancePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/TravelCVVPage/TravelCVVPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/UnshareBankAccount/UnshareBankAccount.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/UpdatePersonalBankAccountPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/settings/Wallet/UpdatePersonalBankAccountPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/settings/Wallet/WalletPage/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/pages/settings/Wallet/WalletPage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/settings/Wallet/WalletPage/index.tsx"	"no-restricted-imports"	2
 "../../src/pages/settings/Wallet/WalletPage/index.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/Share/ShareDetailsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Share/ShareRootPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/Share/ShareRootPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Share/ShareTab.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/Share/SubmitDetailsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/ShareCodePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/ShareCodePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/signin/SAMLSignInPage/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/signin/SAMLSignInPage/index.native.tsx"	"no-restricted-imports"	1
+"../../src/pages/signin/SignInModal.tsx"	"no-restricted-imports"	1
 "../../src/pages/signin/SignInPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/signin/SignInPageLayout/BackgroundImage/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/signin/SignInPageLayout/FooterRow/index.native.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1113,32 +1354,69 @@
 "../../src/pages/signin/SignInPageLayout/SignInPageContent.tsx"	"rulesdir/no-raw-typography"	2
 "../../src/pages/signin/SMSDeliveryFailurePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx"	"react-hooks/set-state-in-effect"	4
-"../../src/pages/tasks/DynamicNewTaskDetailsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/tasks/DynamicNewTaskPage.tsx"	"rulesdir/no-direct-personal-details-list"	2
+"../../src/pages/tasks/DynamicNewTaskDescriptionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/tasks/DynamicNewTaskDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/tasks/DynamicNewTaskPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/tasks/DynamicNewTaskTitlePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/tasks/DynamicTaskAssigneeSelectorModal.tsx"	"no-restricted-imports"	1
 "../../src/pages/tasks/DynamicTaskShareDestinationSelectorModal.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/tasks/DynamicTaskShareDestinationSelectorModal.tsx"	"no-restricted-imports"	1
+"../../src/pages/tasks/TaskDescriptionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/tasks/TaskTitlePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TeachersUnite/ImTeacherUpdateEmailPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TeachersUnite/KnowATeacherPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/TeachersUnite/SaveTheWorldPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/TeachersUnite/SaveTheWorldPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/TransactionDuplicate/DynamicConfirmationPage.tsx"	"@typescript-eslint/no-deprecated/fontSize"	1
 "../../src/pages/TransactionDuplicate/DynamicConfirmationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/TransactionDuplicate/DynamicConfirmationPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicConfirmationPage.tsx"	"no-restricted-imports"	2
 "../../src/pages/TransactionDuplicate/DynamicConfirmationPage.tsx"	"react-hooks/refs"	12
+"../../src/pages/TransactionDuplicate/DynamicReviewBillablePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicReviewCategoryPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicReviewDescriptionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicReviewMerchantPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicReviewPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicReviewReimbursablePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicReviewTagPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionDuplicate/DynamicReviewTaxCodePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/TransactionDuplicate/ReviewFields.tsx"	"@typescript-eslint/no-deprecated/fontSize"	1
 "../../src/pages/TransactionMerge/DynamicConfirmationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/TransactionMerge/DynamicConfirmationPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/TransactionMerge/DynamicConfirmationPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/TransactionMerge/DynamicDetailsReviewPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionMerge/DynamicMergeTransactionsListPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/TransactionMerge/DynamicReceiptReviewPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/TransactionMerge/MergeTransactionItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/TransactionMerge/MergeTransactionsListContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/Travel/DynamicTravelUpgrade.tsx"	"no-restricted-imports"	1
-"../../src/pages/Travel/DynamicTripDetailsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/Travel/DynamicDomainPermissionInfoPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Travel/DynamicPublicDomainErrorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Travel/DynamicTravelUpgrade.tsx"	"no-restricted-imports"	2
+"../../src/pages/Travel/DynamicTripSummaryPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/Travel/DynamicWorkspaceConfirmationForTravelPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/Travel/EnableTravel/EnableTravelContent.tsx"	"no-restricted-imports"	1
+"../../src/pages/Travel/MyTripsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/Travel/TravelDotLinkWebview.tsx"	"no-restricted-imports"	1
+"../../src/pages/TripChatNameEditPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/UnreportedExpenseListItem.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/ValidateLoginPage/index.web.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/wallet/WalletStatementPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/AccountingContext/default.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/AccountingSetupWebViewPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/accounting/businessCentral/BusinessCentralPrerequisitesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/accounting/campfire/CampfireExistingConnectionsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/accounting/campfire/export/CampfireExportPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/certinia/CertiniaExistingConnectionsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/certinia/import/CertiniaDimensionMappingPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/ClaimOfferPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/ClaimOfferPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/accounting/dualentry/DualEntryExistingConnectionsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/dualentry/export/DualEntryExportPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/intacct/advanced/DynamicSageIntacctAccountingMethodPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/intacct/DynamicSageIntacctPrerequisitesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/intacct/export/DynamicSageIntacctNonReimbursableExpensesDestinationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/intacct/export/SageIntacctDatePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesDestinationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1147,6 +1425,7 @@
 "../../src/pages/workspace/accounting/intacct/import/SageIntacctMappingsTypePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/workspace/accounting/netsuite/advanced/DynamicNetSuiteAccountingMethodPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/netsuite/advanced/DynamicNetSuiteAutoSyncPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/netsuite/advanced/NetSuiteExpenseReportApprovalLevelSelectPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/netsuite/advanced/NetSuiteJournalEntryApprovalLevelSelectPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1159,6 +1438,7 @@
 "../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx"	"no-restricted-syntax"	2
 "../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx"	"rulesdir/no-default-id-values"	1
 "../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	12
+"../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ChooseSegmentTypeStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/subPages/ConfirmCustomSegmentList.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
@@ -1168,6 +1448,7 @@
 "../../src/pages/workspace/accounting/netsuite/import/NetSuiteImportMappingPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/subPages/NetSuiteTokenSetupContent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/workspace/accounting/PolicyAccountingPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/accounting/PolicyAccountingPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/PolicyAccountingPage.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/workspace/accounting/qbd/advanced/QuickbooksDesktopAccountingMethodPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/qbd/export/DynamicQuickbooksDesktopCompanyCardExpenseAccountSelectCardPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1186,9 +1467,13 @@
 "../../src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx"	"no-restricted-syntax"	3
 "../../src/pages/workspace/accounting/qbd/import/QuickbooksDesktopItemsPage.tsx"	"rulesdir/no-default-id-values"	1
+"../../src/pages/workspace/accounting/qbd/QuickbooksDesktopExistingConnectionsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupFlowSyncPage.tsx"	"rulesdir/no-default-id-values"	2
+"../../src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/qbd/QuickBooksDesktopSetupPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/workspace/accounting/qbd/RequireQuickBooksDesktopPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/qbo/advanced/DynamicQuickbooksOnlineAccountingMethodPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/qbo/advanced/DynamicQuickbooksOnlineAutoSyncPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/qbo/export/DynamicQuickbooksCompanyCardExpenseAccountSelectCardPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/qbo/export/DynamicQuickbooksOutOfPocketExpenseEntitySelectPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx"	"no-restricted-syntax"	2
@@ -1202,9 +1487,12 @@
 "../../src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx"	"no-restricted-syntax"	2
 "../../src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx"	"rulesdir/no-default-id-values"	1
 "../../src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/rillet/export/RilletExportPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/rillet/RilletExistingConnectionsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/utils.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/xero/advanced/DynamicXeroAccountingMethodPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/accounting/xero/advanced/DynamicXeroAutoSyncPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/accounting/xero/export/DynamicXeroPurchaseBillDateSelectPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/xero/export/DynamicXeroPurchaseBillStatusSelectorPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx"	"@typescript-eslint/no-deprecated/fontSize"	1
@@ -1221,71 +1509,228 @@
 "../../src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx"	"no-restricted-syntax"	4
 "../../src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx"	"rulesdir/no-default-id-values"	1
 "../../src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/categories/CategoryGLCodePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/CategoryPayrollCodePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/CategorySettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCategoryApproverPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCategoryDefaultTaxRatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCategoryDescriptionHintPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCategoryFlagAmountsOverPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCategoryRequiredFieldsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCategoryRequireItemizedReceiptsOverPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCategoryRequireReceiptsOverPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicCreateCategoryPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicDefaultCategorySelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicEditCategoryPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicExpenseLimitTypeSelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicSpendCategorySelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/DynamicWorkspaceCategoriesSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/ImportedCategoriesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/categories/WorkspaceCategoriesPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/categories/WorkspaceCategoriesPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/workspace/companyCards/addNew/AmexCustomFeed.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/CardInstructionsStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/CardNameStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/CardTypeStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/CompanyCardLayoutNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/CompanyCardsImportedPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/DetailsStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/ImportFromFileStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/PlaidConnectionStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/SelectBankStep.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/addNew/SelectCountryStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/companyCards/addNew/SelectCountryStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/addNew/SelectFeedType.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/assignCard/CardNameStep.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/BankConnection/index.native.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/BankConnection/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/BankConnection/index.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardAddWorkEmailPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/companyCards/WorkspaceCompanyCardAddWorkEmailPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardEditTransactionStartDatePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/companyCards/WorkspaceCompanyCardEditTransactionStartDatePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsFeedNamePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/companyCards/WorkspaceCompanyCardStatementCloseDateSelectionList/index.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/companyCards/WorkspaceVerifyWorkAccountPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/workspace/companyCards/WorkspaceVerifyWorkAccountPage.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/workspace/deleteWorkspace/DeleteWorkspaceFlow.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/workspace/ConnectExistingBusinessBankAccountPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectWorkspacesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/copyPolicySettings/CopyPolicySettingsUpgradePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyCommuterExclusionsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRateDateEditPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRateNameEditPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/distanceRates/PolicyDistanceRateUnitPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/downgrade/DynamicPayAndDowngradePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/downgrade/DynamicWorkspaceDowngradePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/duplicate/WorkspaceDuplicateForm.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx"	"react-hooks/set-state-in-effect"	1
-"../../src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/workspace/DynamicWorkspaceConfirmationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/DynamicWorkspaceConfirmationPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/DynamicWorkspaceInvitePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/DynamicWorkspaceOverviewPlanTypePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/DynamicWorkspaceOverviewPlanTypePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/DynamicWorkspaceOverviewPlanTypePage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/workspace/DynamicWorkspacePlanTypeSelectionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/workspace/expensifyCard/DynamicWorkspaceExpensifyCardDetailsPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/DynamicExpensifyCardNamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/DynamicWorkspaceExpensifyCardDetailsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/expensifyCard/DynamicWorkspaceSettlementAccountPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/workspace/expensifyCard/DynamicWorkspaceSettlementAccountPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/expensifyCard/issueNew/spendRules/SetSpendRulesStep.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/expensifyCard/issueNew/spendRules/SpendRuleSelectionPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/WorkspaceExpensifyCardAddWorkEmailPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/CreateFieldsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsAddListValuePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsEditValuePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsInitialListValuePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsInitialValuePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsListValuesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsTypeSelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/fields/FieldsValueSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/hr/HRApprovalModePageBase.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/hr/merge/MergeHRGroupsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/hr/utils.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/mcp/WorkspaceMCPPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/members/DynamicWorkspaceOwnerChangeErrorPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/DynamicWorkspaceOwnerChangeErrorPage.tsx"	"react-hooks/refs"	2
+"../../src/pages/workspace/members/DynamicWorkspaceOwnerChangeSuccessPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/DynamicWorkspaceOwnerChangeSuccessPage.tsx"	"react-hooks/refs"	2
+"../../src/pages/workspace/members/DynamicWorkspaceOwnerChangeWrapperPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/members/ImportedMembersConfirmationPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/ImportedMembersConfirmationPage.tsx"	"react-hooks/refs"	7
+"../../src/pages/workspace/members/ImportedMembersPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/ImportMembersPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/ImportMembersPage.tsx"	"no-restricted-syntax"	1
 "../../src/pages/workspace/members/ImportMembersPage.tsx"	"rulesdir/no-default-id-values"	1
+"../../src/pages/workspace/members/WorkArrangementPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/workspace/members/WorkspaceMemberCustomFieldPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	4
+"../../src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx"	"react-hooks/set-state-in-effect"	2
+"../../src/pages/workspace/merge/MergeConnectionsPageBase.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/EditPerDiemCurrencyPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/ImportedPerDiemPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/WorkspacePerDiemDetailsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/perDiem/WorkspacePerDiemSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/receiptPartners/ChangeReceiptBillingAccountPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/receiptPartners/DynamicEditInviteReceiptPartnerPolicyPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/receiptPartners/DynamicEditInviteReceiptPartnerPolicyPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/reports/ReportsDefaultTitle.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/reports/TypeSelector/index.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
-"../../src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/workspace/reports/WorkspaceReportsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/rooms/WorkspaceRoomsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/DynamicEditTagPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/DynamicTagApproverPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/DynamicTagGLCodePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/DynamicTagSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/DynamicWorkspaceEditTagsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/DynamicWorkspaceViewTagsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/ImportedMultiLevelTagsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/ImportedTagsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/ImportMultiLevelTagsSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/ImportTagsOptionsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/tags/WorkspaceCreateTagPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/tags/WorkspaceTagsPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/workspace/tags/WorkspaceTagsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/tags/WorkspaceTagsPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/NamePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/ValuePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceCreateTaxValuePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceTaxesPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/taxes/WorkspaceTaxesPage.tsx"	"react-hooks/set-state-in-effect"	1
+"../../src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/timeTracking/WorkspaceTimeTrackingDefaultRatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/travel/PolicyTravelPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/travel/WorkspaceTravelBillingExportPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/travel/WorkspaceTravelBillingFeedSelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/travel/WorkspaceTravelBillingMonthlyLimitPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/travel/WorkspaceTravelBillingSettlementAccountPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/travel/WorkspaceTravelBillingSettlementAccountPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/travel/WorkspaceTravelBillingSettlementFrequencyPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/upgrade/UpgradeIntro.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx"	"no-restricted-imports"	2
+"../../src/pages/workspace/vendors/WorkspaceVendorsPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/withPolicy.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/pages/workspace/withPolicyAndFullscreenLoading.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/withPolicyConnections.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApprovalLimitPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
+"../../src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/workflows/WorkspaceWorkflowsCurrencyConversionFeesPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/WorkspaceConfirmationOwnerSelectorPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/WorkspaceConfirmationSuccessPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/WorkspaceInitialPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/WorkspaceMembersPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/pages/workspace/WorkspaceMembersPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/WorkspaceNamePage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/WorkspaceNewRoomPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	3
+"../../src/pages/workspace/WorkspaceNewRoomPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/WorkspaceNewRoomPage.tsx"	"react-hooks/set-state-in-effect"	3
+"../../src/pages/workspace/WorkspaceOverviewClientIDPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
+"../../src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/WorkspaceOverviewDescriptionPage.tsx"	"no-restricted-imports"	1
 "../../src/pages/workspace/WorkspaceOverviewPage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	2
 "../../src/pages/workspace/WorkspaceOverviewSharePage.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
-"../../src/pages/workspace/WorkspacesListPage.tsx"	"rulesdir/no-direct-personal-details-list"	1
+"../../src/pages/workspace/WorkspaceOverviewSharePage.tsx"	"no-restricted-imports"	1
+"../../src/pages/workspace/WorkspacePageWithSections.tsx"	"no-restricted-imports"	2
 "../../src/polyfills/requestIdleCallback.ts"	"@typescript-eslint/no-unsafe-type-assertion"	2
-"../../src/ROUTES.ts"	"@typescript-eslint/no-deprecated/getUrlWithBackToParam"	52
+"../../src/ROUTES.ts"	"@typescript-eslint/no-deprecated/getUrlWithBackToParam"	53
 "../../src/ROUTES.ts"	"@typescript-eslint/no-unsafe-type-assertion"	3
 "../../src/selectors/AdvancedSearchFiltersForm.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/selectors/Domain.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1298,6 +1743,7 @@
 "../../src/stories/DragAndDrop.stories.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/stories/EReceipt.stories.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	1
 "../../src/stories/Form.stories.tsx"	"@typescript-eslint/no-unsafe-type-assertion"	10
+"../../src/stories/HeaderWithBackButton.stories.tsx"	"no-restricted-imports"	2
 "../../src/stories/ReportActionItemImages.stories.tsx"	"no-restricted-syntax"	1
 "../../src/stories/TextInput.stories.tsx"	"react-hooks/set-state-in-effect"	1
 "../../src/styles/index.ts"	"@typescript-eslint/no-unsafe-type-assertion"	1
@@ -1392,8 +1838,11 @@
 "../../tests/actions/TaskTest.ts"	"no-restricted-imports"	1
 "../../tests/actions/TransactionTest.ts"	"no-restricted-imports"	1
 "../../tests/ui/components/IOURequestStepConfirmationPageTest.tsx"	"@typescript-eslint/no-restricted-imports"	1
+"../../tests/ui/components/MoneyReportHeaderFocusSelectionModeTest.tsx"	"no-restricted-imports"	1
+"../../tests/ui/components/MoneyReportHeaderSelectionModeTest.tsx"	"no-restricted-imports"	1
 "../../tests/ui/ComposerTest.tsx"	"rulesdir/no-raw-typography"	1
 "../../tests/ui/MoneyRequestReportPreview.test.tsx"	"no-restricted-imports"	1
+"../../tests/ui/ServerSelectionTest.tsx"	"no-restricted-imports"	1
 "../../tests/ui/UnreadIndicatorsTest.tsx"	"@typescript-eslint/no-restricted-imports"	1
 "../../tests/ui/WorkspaceMoreFeaturesPageTest.tsx"	"no-restricted-imports"	1
 "../../tests/unit/canEditFieldOfMoneyRequestTest.ts"	"@typescript-eslint/no-deprecated/randomReportAction.originalMessage"	3
diff --git a/config/rsbuild/BrotliCompressionPlugin.ts b/config/rsbuild/BrotliCompressionPlugin.ts
new file mode 100644
index 000000000000..0d3cbf69fbdc
--- /dev/null
+++ b/config/rsbuild/BrotliCompressionPlugin.ts
@@ -0,0 +1,55 @@
+import type {Compiler} from '@rspack/core';
+
+import {promisify} from 'util';
+import zlib from 'zlib';
+
+const PLUGIN_NAME = 'BrotliCompressionPlugin';
+
+const brotliCompress = promisify(zlib.brotliCompress);
+
+type Options = {
+    /** Every emitted asset whose name matches gets a `.br` twin. */
+    test: RegExp;
+};
+
+/**
+ * Rspack plugin that writes a Brotli 11 twin (`foo.js` -> `foo.js.br`) beside every emitted asset matching `test`.
+ * Every match gets one, however small or incompressible: the CDN rewrite appends `.br` blindly, and a missing twin doesn't even 404 — the SPA fallback answers 200
+ * with the app shell, so the browser either fails to decode that HTML as Brotli or refuses to run it as a script.
+ */
+class BrotliCompressionPlugin {
+    private readonly options: Options;
+
+    constructor(options: Options) {
+        this.options = options;
+    }
+
+    apply(compiler: Compiler): void {
+        const {Compilation, sources} = compiler.rspack;
+
+        // `thisCompilation` skips child compilations, whose assets end up in the parent's anyway.
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.processAssets.tapPromise(
+                // OPTIMIZE_TRANSFER runs after minification, content hashing, HTML and the service worker are emitted,
+                // so the twins are made from the final bytes that will be deployed.
+                {name: PLUGIN_NAME, stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_TRANSFER},
+                async () => {
+                    const assets = compilation.getAssets().filter(({name, info}) => !info.compressed && this.options.test.test(name));
+
+                    // zlib runs each compression on the libuv thread pool, so these proceed in parallel.
+                    await Promise.all(
+                        assets.map(async ({name, source, info}) => {
+                            const compressed = await brotliCompress(source.buffer(), {params: {[zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY}});
+
+                            // `compressed` is the webpack convention that tells other plugins (and this one on a rebuild) not to
+                            // compress the twin again. A twin of a content-hashed file is as immutable as its original.
+                            compilation.emitAsset(`${name}.br`, new sources.RawSource(compressed), {compressed: true, immutable: info.immutable});
+                        }),
+                    );
+                },
+            );
+        });
+    }
+}
+
+export default BrotliCompressionPlugin;
diff --git a/config/rsbuild/rsbuild.common.ts b/config/rsbuild/rsbuild.common.ts
index 5fa24d76aa5c..f610e45b943e 100644
--- a/config/rsbuild/rsbuild.common.ts
+++ b/config/rsbuild/rsbuild.common.ts
@@ -5,6 +5,7 @@ import {GenerateSW} from '@aaroon/workbox-rspack-plugin';
 import {pluginSvgr} from '@rsbuild/plugin-svgr';
 import {RsdoctorRspackPlugin} from '@rsdoctor/rspack-plugin';
 import {rspack} from '@rspack/core';
+import canvaskitPackageJson from 'canvaskit-wasm/package.json' with {type: 'json'};
 import {execSync} from 'child_process';
 import dotenv from 'dotenv';
 import fs from 'fs';
@@ -21,6 +22,8 @@ import SENTRY_APPLICATION_KEY from '../../src/libs/telemetry/sentryApplicationKe
 import getAppVersion from '../../src/libs/VersionUtils.ts'; // eslint-disable-line @dword-design/import-alias/prefer-alias
 import oxcReactCompilerConfig from '../babel/oxcReactCompilerConfig.js';
 // @ts-expect-error -- Can't use .ts extensions without allowImportingTsExtensions in tsconfig
+import BrotliCompressionPlugin from './BrotliCompressionPlugin.ts';
+// @ts-expect-error -- Can't use .ts extensions without allowImportingTsExtensions in tsconfig
 import CustomVersionFilePlugin from './CustomVersionFilePlugin.ts';
 // @ts-expect-error -- Can't use .ts extensions without allowImportingTsExtensions in tsconfig
 import ModuleInitTimingPlugin from './ModuleInitTimingPlugin.ts';
@@ -43,6 +46,17 @@ function getCurrentBranchName(): string {
 
 const localBranchName = getCurrentBranchName();
 
+/**
+ * CanvasKit ships as a matched pair: the JS glue (`canvaskit.js`, bundled into a content-hashed chunk) and
+ * the `canvaskit.wasm` binary it instantiates. The pair is only compatible within a single `canvaskit-wasm`
+ * release, so the binary must be served from a URL that changes with the release too. Otherwise a client can
+ * pair one deploy's glue with another deploy's binary (stale HTTP cache, or a tab that outlived a deploy and
+ * got claimed by the new service worker) and CanvasKit either fails to link (`LinkError: Import #N "a" "wd"`)
+ * or links against the wrong exports and resolves without its bindings (`PictureRecorder is not a constructor`).
+ * See https://github.com/Expensify/App/issues/102042.
+ */
+const CANVASKIT_WASM_FILENAME = `canvaskit-${canvaskitPackageJson.version}.wasm`;
+
 /**
  * React Compiler + react-native-worklets loaders.
  */
@@ -137,6 +151,9 @@ function getDefineValues(file: string): DefinePluginOptions {
         // Expose the current git branch so the debug menu can display it in the browser tab title.
         // Empty string in non-development builds.
         __GIT_BRANCH__: JSON.stringify(isDevelopmentFile ? localBranchName : ''),
+        // Where `SkiaWebChart` tells CanvasKit to fetch its wasm binary from. Versioned so the glue in this
+        // bundle can never be paired with another release's binary (see `CANVASKIT_WASM_FILENAME`).
+        __CANVASKIT_WASM_URL__: JSON.stringify(`/${CANVASKIT_WASM_FILENAME}`),
     };
     /* eslint-enable @typescript-eslint/naming-convention */
 }
@@ -327,6 +344,7 @@ const getSharedConfiguration = ({file = '.env', isDevServer = false}: Environmen
  */
 const getCommonConfiguration = async ({file = '.env', platform = 'web', isDevServer = false}: Environment): Promise<RsbuildConfig> => {
     const isDevelopment = file === '.env' || file === '.env.development';
+    const shouldCompressWithBrotli = !isDevelopment && file !== '.env.adhoc';
     const shared = getSharedConfiguration({file, platform, isDevServer});
     const sharedRspackTool = shared.tools?.rspack;
     const sentryWebpackPlugin = isDevelopment ? undefined : (await import('@sentry/webpack-plugin')).sentryWebpackPlugin;
@@ -404,8 +422,10 @@ const getCommonConfiguration = async ({file = '.env', platform = 'web', isDevSer
                 {from: 'node_modules/pdfjs-dist/cmaps/', to: 'cmaps/'},
                 // Group‑IB web SDK injection file
                 {from: 'web/snippets/gib.js', to: 'gib.js'},
-                // CanvasKit WASM files for @shopify/react-native-skia web support (uses full version)
-                {from: 'node_modules/canvaskit-wasm/bin/full/canvaskit.wasm'},
+                // CanvasKit WASM binary for @shopify/react-native-skia web support (uses the full build). Emitted
+                // under a versioned name so it can't be served stale against newer glue. The URL is passed to
+                // the app through the `__CANVASKIT_WASM_URL__` define above.
+                {from: 'node_modules/canvaskit-wasm/bin/full/canvaskit.wasm', to: CANVASKIT_WASM_FILENAME},
             ],
         },
         html: {
@@ -419,6 +439,9 @@ const getCommonConfiguration = async ({file = '.env', platform = 'web', isDevSer
             },
         },
         performance: {
+            // Rsbuild's default exclusion, plus the `.br` twins BrotliCompressionPlugin emits below: listing them would
+            // double the report with a meaningless "gzipped size" of already-Brotli-compressed bytes.
+            printFileSize: {exclude: (asset) => /\.(?:map|LICENSE\.txt|d\.(?:ts|mts|cts)|br)$/.test(asset.name)},
             // We have to load the whole lottie player to get the player to work in offline mode
             // heic-to library is used sparsely so we load it as a separate chunk to reduce initial bundle size
             // ExpensifyIcons/illustrations chunks are loaded eagerly for offline support
@@ -498,10 +521,16 @@ const getCommonConfiguration = async ({file = '.env', platform = 'web', isDevSer
                                   clientsClaim: true,
                                   skipWaiting: true,
                                   // Cap is generous on purpose: the vendor (~6.5 MiB), main (~5.5 MiB),
-                                  // authScreens.prefetch (~6.3 MiB) chunks and canvaskit.wasm (~7.6 MiB) are
-                                  // all critical for offline boot, so we precache the lot. Everything in the
-                                  // App build is content-hashed, so growth here only costs first-install bytes.
-                                  maximumFileSizeToCacheInBytes: 10 * 1024 * 1024,
+                                  // authScreens.prefetch (~10.1 MiB) chunks and the canvaskit wasm (~7.7 MiB) are
+                                  // all critical for offline boot, so we precache the lot. JS chunks are
+                                  // content-hashed and the wasm is versioned (see `CANVASKIT_WASM_FILENAME`),
+                                  // so growth here only costs first-install bytes. Copied assets that keep a
+                                  // fixed name (e.g. `cmaps/`) are keyed by Workbox revision instead.
+                                  maximumFileSizeToCacheInBytes: 15 * 1024 * 1024,
+                                  // Workbox's defaults, plus the `.br` twins BrotliCompressionPlugin emits: the service
+                                  // worker requests the original URLs and the CDN transparently serves the Brotli copy,
+                                  // so adding the twins to the precache as well would download every chunk twice.
+                                  exclude: [/\.map$/, /^manifest.*\.js$/, /\.br$/],
                                   // Single-page app: any unmatched navigation should serve the cached app shell.
                                   navigateFallback: '/index.html',
                                   // Don't fall back for asset-like or .well-known requests.
@@ -591,6 +620,9 @@ const getCommonConfiguration = async ({file = '.env', platform = 'web', isDevSer
                         : []),
                     // This allows us to interactively inspect JS bundle contents, loader/plugin timings, and duplicate packages
                     ...(process.env.ANALYZE_BUNDLE === 'true' ? [new RsdoctorRspackPlugin()] : []),
+                    // Writes a Brotli 11 twin (`foo.js` -> `foo.js.br`) beside every deployable text/bytecode asset, so the CDN
+                    // can serve it instead of compressing with gzip on the fly: 25-30% fewer bytes over the wire.
+                    ...(shouldCompressWithBrotli ? [new BrotliCompressionPlugin({test: /\.(?:js|css|html|svg|wasm|ttf)$/})] : []),
                 );
 
                 return afterShared;
diff --git a/contributingGuides/REVIEWER_CHECKLIST.md b/contributingGuides/REVIEWER_CHECKLIST.md
index c8cb021b0abc..4c3053fdac2d 100644
--- a/contributingGuides/REVIEWER_CHECKLIST.md
+++ b/contributingGuides/REVIEWER_CHECKLIST.md
@@ -40,6 +40,11 @@
 - [ ] If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
     - [ ] I verified that all the inputs inside a form are aligned with each other.
     - [ ] I added `Design` label and/or tagged `@Expensify/design` so the design team can review the changes.
+- [ ] If the PR adds or modifies the UI:
+    - [ ] I asked an AI agent to review the changes for accessibility issues and addressed its findings.
+    - [ ] I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
+    - [ ] I verified all new/changed elements have meaningful accessible names and roles.
+    - [ ] I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
 - [ ] For any bug fix or new feature in this PR, I verified that sufficient [unit tests](https://github.com/Expensify/App/blob/main/tests/README.md) are included to prevent regressions in this flow.
 - [ ] If the `main` branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the `Test` steps.
 - [ ] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
diff --git a/contributingGuides/philosophies/DEPLOYING.md b/contributingGuides/philosophies/DEPLOYING.md
index 69f6c0fb6c4b..e75098f6ec1d 100644
--- a/contributingGuides/philosophies/DEPLOYING.md
+++ b/contributingGuides/philosophies/DEPLOYING.md
@@ -15,20 +15,20 @@ This describes the deployment processes, QA cycles, and build workflows for the
 ### - All code MUST be deployed to staging before production
 We utilize a CI/CD deployment system built using [GitHub Actions](https://github.com/features/actions) to ensure that new code is automatically deployed to our users as fast as possible. All code is first deployed to our staging environments, where it undergoes quality assurance (QA) testing before it is deployed to production.
 
-### - Pull requests SHOULD be deployed to staging immediately after merge
-Typically, pull requests are deployed to staging immediately after they are merged if the checklist is unlocked.
+### - Pull requests are deployed to staging when the current checklist is closed
+The deploy checklist is locked from the moment it is created, so pull requests are not deployed to staging when they are merged. OSBotify comments on the merged PR, and it is deployed to staging together with everything else merged since the previous checklist when the current checklist is closed. If a change must reach staging sooner, it has to be cherry-picked.
 
 ### - StagingDeployCash MUST be used to track deployment progress
 Every time a PR is deployed to staging, it is added to a [special tracking issue](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) with the label `StagingDeployCash` (there will only ever be one open at a time). This tracking issue contains information about the new application version, a list of recently deployed pull requests, and any issues found on staging that are not present on production.
 
-### - QA team MUST lock deploys during testing cycles
-Every weekday at 9am PST, our QA team adds the `🔐LockCashDeploys🔐` label to that tracking issue, and that signifies that they are starting their daily QA cycle. They will perform both regular regression testing and the QA steps listed for every pull request on the `StagingDeployCash` checklist.
+### - Staging deploys are locked during testing cycles
+The `🔐LockCashDeploys🔐` label is added to the tracking issue by OSBotify when it is created, so staging deploys are locked for the whole QA cycle. Our QA team performs both regular regression testing and the QA steps listed for every pull request on the `StagingDeployCash` checklist.
 
 ### - Deploy blockers MUST prevent production deployment
 Once the `StagingDeployCash` is locked, we won't run any staging deploys until it is either unlocked, or we run a production deploy. If severe issues are found on staging that are not present on production, a new issue (or the PR that caused the issue) will be labeled with `DeployBlockerCash`, and added to the `StagingDeployCash` deploy checklist.
 
-### - A hotfix MAY be deployed directly to staging using CP Staging label
-If we want to resolve a deploy blocker by reverting a pull request or deploying a hotfix directly to the staging environment, we can merge a pull request with the `CP Staging` label.
+### - A hotfix MAY be deployed directly to staging with a cherry-pick
+If we want to resolve a deploy blocker by reverting a pull request or deploying a hotfix directly to the staging environment, a member of [@Expensify/mobile-deployers](https://github.com/orgs/Expensify/teams/mobile-deployers) can run the [`cherryPick` workflow](https://github.com/Expensify/App/actions/workflows/cherryPick.yml) on the merged pull request. The workflow applies the `CP Staging` label itself; adding the label manually does not trigger a cherry-pick.
 
 ### - Production deployment MUST be triggered by closing StagingDeployCash
 Once we have confirmed to the best of our ability that there are no deploy-blocking issues and that all our new features are working as expected on staging, we'll close the `StagingDeployCash`. That will automatically trigger a production deployment, open a new `StagingDeployCash` checklist, and deploy to staging any pull requests that were merged while the previous checklist was locked.
@@ -44,29 +44,22 @@ The [preDeploy workflow](https://github.com/Expensify/App/blob/main/.github/work
 - Otherwise:
   - Create a new version by triggering the [`createNewVersion` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/createNewVersion.yml)
   - Update the `staging` branch from main.
-- Also, if the pull request has the `CP Staging` label, it will execute the [`cherryPick` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/cherryPick.yml) to deploy the pull request directly to staging, even if the `StagingDeployCash` is locked.
 
 ### deploy
-The [`deploy` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/deploy.yml) is really quite simple. It runs when code is pushed to the `staging` or `production` branches, and:
-
-- If `staging` was updated, it creates a tag matching the new version, and pushes tags.
-- If `production` was updated, it creates a GitHub Release for the new version.
-
-### platformDeploy
-The [`platformDeploy` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/platformDeploy.yml) is what actually runs the deployment on all three platforms (iOS, Android, Web). It runs a staging deploy whenever a new tag is pushed to GitHub, and runs a production deploy whenever a new release is created.
+The [`deploy` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/deploy.yml) runs when code is pushed to the `staging` or `production` branches. It creates a tag matching the new version, runs the deployment on all three platforms (iOS, Android, Web), creates or updates the `StagingDeployCash` checklist (staging only), and creates a GitHub Release for the new version.
 
 ### lockDeploys
-The [`lockDeploys` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/lockDeploys.yml) executes when the `StagingDeployCash` is locked, and it waits for any currently running staging deploys to finish, then gives Applause the :green_circle: to begin QA by commenting in the `StagingDeployCash` checklist.
+The [`lockDeploys` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/lockDeploys.yml) executes when a person re-adds the lock label to the `StagingDeployCash` after removing it (it does not run for the label OSBotify adds at creation), and it waits for any currently running staging deploys to finish, then gives Applause the :green_circle: to begin QA by commenting in the `StagingDeployCash` checklist.
 
 ### finishReleaseCycle
-The [`finishReleaseCycle` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/finishReleaseCycle.yml) executes when the `StagingDeployCash` is closed. It updates the `production` branch from `staging` (triggering a production deploy), deploys `main` to staging (with a new `PATCH` version), and creates a new `StagingDeployCash` deploy checklist.
+The [`finishReleaseCycle` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/finishReleaseCycle.yml) executes when the `StagingDeployCash` is closed. It updates the `production` branch from `staging` (triggering a production deploy), deploys `main` to staging (with a new `PATCH` version), which creates a new `StagingDeployCash` deploy checklist.
 
 ### testBuild
 The [`testBuild` workflow](https://github.com/Expensify/App/blob/main/.github/workflows/testBuild.yml) builds ad-hoc staging apps (hybrid iOS, hybrid Android, and web) from pull requests submitted to the App and Mobile-Expensify repositories. This process enables testers to review modifications before they are merged into the main branch and deployed to the staging environment. This workflow accepts up to two inputs:
-- A PR number from the App repository for testing New Dot (ND) changes.
-- A PR number from the Mobile-Expensify repository for testing Old Dot (OD) changes.
+- A PR URL from the App repository for testing New Dot (ND) changes.
+- A PR URL from the Mobile-Expensify repository for testing Old Dot (OD) changes.
 
-Both PR numbers can be entered simultaneously if the changes from both repositories need to be combined and tested. Additionally, contributors can explicitly link related PRs from the Mobile-Expensify repository in the App repository PR description if required. Guidance on linking PRs can be found [in PR template](https://github.com/Expensify/App/blob/main/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L25-L30)
+Both PR URLs can be entered simultaneously if the changes from both repositories need to be combined and tested. Additionally, contributors can explicitly link related PRs from the Mobile-Expensify repository in the App repository PR description if required. Guidance on linking PRs can be found [in PR template](https://github.com/Expensify/App/blob/main/.github/PULL_REQUEST_TEMPLATE.md?plain=1#L25-L30)
 
 ## Local Production Builds
 
diff --git a/cspell.json b/cspell.json
index 0e195ee10cf9..232fb5466088 100644
--- a/cspell.json
+++ b/cspell.json
@@ -164,6 +164,7 @@
         "FinancialForce",
         "Fiscale",
         "Flamegraph",
+        "Forcepoint",
         "Français",
         "Frederico",
         "Fábio",
@@ -431,6 +432,7 @@
         "Unassigning",
         "Uncapitalize",
         "Undelete",
+        "Undeletes",
         "Unlaminated",
         "Unmigrated",
         "Unsharing",
@@ -450,6 +452,7 @@
         "Woohoo",
         "Wooo",
         "Wordmark",
+        "XHRAPI",
         "XNOR",
         "XYWH",
         "Xfermode",
@@ -720,6 +723,7 @@
         "illion",
         "imagebutton",
         "inbetweenCompo",
+        "incentivized",
         "initialises",
         "inputmethod",
         "insperity",
@@ -1083,6 +1087,7 @@
         "unassigns",
         "uncategorized",
         "unconfigured",
+        "undeleting",
         "unflushed",
         "unheld",
         "unhold",
@@ -1095,6 +1100,7 @@
         "unredacted",
         "unregisters",
         "unreimbursed",
+        "unreporting",
         "unscrollable",
         "unsharing",
         "unsubmits",
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index b1b195dcbaa4..1cd4f06c6d84 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
     bigdecimal (3.1.8)
     colorator (1.1.0)
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index fe786b23176f..274ca75cdcef 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy" content="script-src https://kit.fontawesome.com https://cdnjs.cloudflare.com https://vjs.zencdn.net https://unpkg.com https://www.google.com https://www.gstatic.com/ https://cse.google.com http://cse.google.com https://clients1.google.com https://partner.googleadservices.com/ https://cdnjs.cloudflare.com/ajax/libs/tocbot/ https://www.googletagmanager.com 'self' 'unsafe-eval' 'unsafe-inline'; style-src cdnjs.cloudflare.com vjs.zencdn.net unpkg.com cse.google.com www.google.com ka-f.fontawesome.com fonts.googleapis.com 'self' 'unsafe-inline'; worker-src blob: 'self';" >
-    <title>Expensify Help</title>
+    <title>ExpensifyHelp</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <link rel="icon" type="image/png" href="{{ '/assets/images/expensify-logo-round.png' | cache_bust }}">
     <link rel="stylesheet" href="{{ site.main_style | cache_bust}}">
diff --git a/docs/articles/expensify-classic/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md b/docs/articles/expensify-classic/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md
index 093cc78f3deb..7d9a26e860be 100644
--- a/docs/articles/expensify-classic/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md
+++ b/docs/articles/expensify-classic/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md
@@ -1,78 +1,41 @@
 ---
 title: ONL583 Export Error in QuickBooks Online Integration
-description: Learn what the ONL583 export error means in QuickBooks Online and how to resolve vendor record matching conflicts.
-keywords: ONL583, QuickBooks Online export error, vendor already exists QuickBooks, vendor could not be matched QuickBooks, duplicate vendor record QuickBooks, Expensify QuickBooks Online integration, Workspace Admin
-internalScope: Audience is Workspace Admins using the QuickBooks Online integration. Covers resolving the ONL583 export error caused by duplicate or mismatched vendor records. Does not cover other QuickBooks Online error codes.
+description: Learn how to fix the ONL583 export error when a vendor, supplier, customer, or employee name in QuickBooks Online prevents Expensify from creating a vendor for the report submitter.
+keywords: ONL583, QuickBooks Online duplicate name, vendor already exists, supplier name conflict, customer or employee name conflict, submitter email mismatch, Expensify QuickBooks Online integration, Workspace Admin
+internalScope: Audience is Workspace Admins using the QuickBooks Online integration. Covers fixing the ONL583 export error caused by a name conflict when automatically creating a vendor for the report submitter. Does not cover other QuickBooks Online error codes.
 ---
 
 # ONL583 Export Error in QuickBooks Online Integration
 
-If you see the error:
+The ONL583 error identifies the submitter's email and the conflicting record name. For example:
 
-ONL583: A vendor with this name already exists but could not be matched.
+> ONL583 Export Error: We could not find a vendor/supplier in QuickBooks Online for jane@acme.com. A record named 'Jane Doe' already exists in QuickBooks Online under a different email, or as another record type such as a customer or employee. Please rename that record, or create a vendor/supplier for jane@acme.com under a different name.
 
-This means Expensify attempted to create or match a Vendor record for the report submitter, but QuickBooks Online could not confidently match it to an existing vendor, preventing the export from completing.
+This means Expensify cannot find a matching vendor/supplier by email, and QuickBooks Online rejects creating one because its name is already in use.
 
 ---
 
 ## Why the ONL583 Export Error Happens in QuickBooks Online
 
-The ONL583 error typically indicates:
+The ONL583 error occurs when:
 
-- A Vendor record already exists in QuickBooks Online.
-- The email address on the Vendor record does not exactly match the email address used in Expensify.
-- The same email address appears on multiple records (such as both an Employee and a Vendor).
-- QuickBooks cannot determine which record to use.
+- Expensify cannot find a vendor/supplier matching the report submitter's email address.
+- Expensify attempts to create a vendor for the submitter.
+- The name is already used by a vendor/supplier with a different email, or by a customer or employee record.
 
-QuickBooks requires a clear one-to-one match between the report submitter and a single Vendor record.
-
-This is a QuickBooks Online vendor matching issue, not a Workspace configuration issue.
+Expensify matches vendors by email address. QuickBooks Online requires unique names across vendors/suppliers, customers, and employees.
 
 ---
 
-## How to Fix the ONL583 Export Error
-
-This issue can be resolved by reviewing and correcting Vendor records in QuickBooks Online.
-
-### Confirm the Vendor Email Matches Expensify
+## How to Fix the Name Conflict in QuickBooks Online
 
 1. Log in to QuickBooks Online.
-2. Open the Vendor record for the report creator or submitter.
-3. Confirm the email address exactly matches the email listed in Expensify.
-4. Save any changes.
-
-The email must match exactly for Expensify to link the records correctly.
-
----
-
-### Check for Duplicate Records
-
-1. Use the QuickBooks Online search function.
-2. Search for the report submitter’s email address.
-3. Confirm the email is not listed on multiple records (such as both an Employee and Vendor).
-
-If duplicates exist:
-
-- Remove the email from the incorrect record, or  
-- Deactivate duplicate records if appropriate.
-
-Only one active Vendor record should contain the matching email.
-
----
-
-### Disable Automatic Entity Creation (If Needed)
-
-If matching issues continue:
-
-1. Go to **Settings > Workspaces**.
-2. Select your Workspace.
-3. Click **Accounting**.
-4. Click **Configure**.
-5. Open the **Advanced** tab.
-6. Disable **Automatically Create Employees/Vendors**.
-7. Click **Save**.
-
-Then retry exporting the report.
+2. Search for the **record name shown in the error**, not just the submitter's email. Check vendor/supplier, customer, and employee records.
+3. If the record is the correct vendor/supplier for the submitter, update its email to exactly match the submitter's email in Expensify and save your changes.
+4. If the record belongs to someone else or is a customer or employee, choose one of these fixes:
+   - Rename the conflicting record so Expensify can automatically create the vendor/supplier under the original name.
+   - Create a vendor/supplier with a different, unique name and the submitter's exact email address.
+5. In Expensify, select **Sync Now** for the QuickBooks Online connection. Once the sync completes, retry exporting the report.
 
 ---
 
@@ -80,12 +43,16 @@ Then retry exporting the report.
 
 ## Can I Retry the Export?
 
-Yes. After correcting Vendor records and selecting **Sync Now**, retry the export.
+Yes. After correcting the records in QuickBooks Online, select **Sync Now** in Expensify and retry exporting the report.
 
 ## Does ONL583 Mean the Vendor Does Not Exist?
 
-Not necessarily. It usually means the Vendor exists but could not be matched due to email differences or duplicate records.
+Not necessarily. A vendor/supplier may exist under a different email, or the name may belong to a customer or employee. Expensify cannot find a vendor/supplier matching the submitter's email and cannot create one with the conflicting name.
+
+## Can I Fix This by Disabling Automatic Vendor Creation?
+
+Disabling automatic creation does not resolve the name conflict or create a matching vendor/supplier. If you manage vendors manually, create a vendor/supplier with a unique name and the submitter's exact email, then select **Sync Now** in Expensify and retry the export.
 
 ## Do I Need to Reconnect QuickBooks Online?
 
-No. Correcting Vendor records and retrying the export is typically sufficient.
+No. Resolve the name conflict or correct the vendor/supplier email, then select **Sync Now** in Expensify and retry the export.
diff --git a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
index aa9a4a85ca61..903469427f77 100644
--- a/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
+++ b/docs/articles/new-expensify/ai-agents/AI-Agent-Capabilities.md
@@ -173,6 +173,18 @@ To accomplish this, include phrases like:
 
 ---
 
+## How to write instructions that delete expense reports
+
+**Goal:** Deletes an unsubmitted expense report the requester owns, after they confirm the deletion. Only reports that are still open or in draft can be deleted — a report that has been submitted, approved, reimbursed, or closed cannot be. Deleting an individual expense rather than a whole report is covered by the edit-expenses capability.
+
+To accomplish this, include phrases like:
+- Delete this report
+- Remove the report I just created
+- Cancel this expense report
+- Delete the report named Q1 Travel
+
+---
+
 ## How to write instructions that create expenses
 
 **Goal:** Creates a new expense — a cash or receipt expense, or a distance/mileage entry — for the person who asked, using the details in their message.
@@ -215,6 +227,20 @@ To accomplish this, include phrases like:
 
 ---
 
+## How to write instructions that send direct messages to workspace members
+
+**Goal:** Opens a 1:1 direct message with any workspace member and sends a message from the agent, creating the DM thread if one does not already exist.
+
+To accomplish this, include phrases like:
+- Send each employee a reminder to submit their expenses at the end of the month
+- Message the submitter directly when their report is rejected
+- Notify individual workspace members of a workspace change
+- DM each person with outstanding reports a personalized nudge
+- Send a private message to the submitter when a receipt is missing
+- Reach out to each team member individually with their spending summary
+
+---
+
 ## How to write instructions that look up expense data
 
 **Goal:** Runs a read-only lookup across expense history to retrieve spend totals, rankings, period comparisons, or per-submitter figures the rule needs to make a decision.
@@ -269,4 +295,4 @@ To accomplish this, include phrases like:
 
 ---
 
-*This reference covers all 20 AI Agent capabilities.*
+*This reference covers all 22 AI Agent capabilities.*
diff --git a/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md b/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
index 08da0392b128..729426ee14f8 100644
--- a/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
+++ b/docs/articles/new-expensify/ai-agents/AI-Agent-Triggers.md
@@ -102,20 +102,27 @@ To react to this event, include phrases like:
 - When someone changes what a report is called
 - When someone updates a report title
 
-**An expense report was marked as done.**
+**An expense report was marked as done, or a support ticket was resolved.**
 
 To react to this event, include phrases like:
 - When an expense report is marked as done
 - When an invoice is closed
+- When a support ticket is resolved
 - When someone closes a report
 
-**A previously closed or approved expense report was reopened, returning it to an open (draft/editable) state so the submitter can revise it.**
+**A previously closed or approved expense report was reopened, returning it to an open (draft/editable) state so the submitter can revise it. A resolved support ticket was reopened for further help.**
 
 To react to this event, include phrases like:
 - When a closed report is reopened
+- When a support ticket is reopened
 - When an approved report is sent back for editing
 - When a report is moved back to draft state
 
+**A satisfaction survey was added to a resolved support ticket.**
+
+To react to this event, include phrases like:
+- When a customer is asked to rate their support experience
+
 **The current approver manually assigned the expense report to themselves, taking ownership of it from whoever it was previously assigned to.**
 
 To react to this event, include phrases like:
@@ -258,6 +265,12 @@ To react to this event, include phrases like:
 - When a transaction is permanently removed
 - When someone deletes an expense from a report
 
+**A previously deleted expense was restored.**
+
+To react to this event, include phrases like:
+- When a deleted expense is restored
+- When someone undeletes an expense
+
 **An expense was removed from all expense reports and returned to "Unreported" status.**
 
 To react to this event, include phrases like:
@@ -711,6 +724,12 @@ To react to this event, include phrases like:
 - When an employee's workspace role or approver is changed
 - When a member's settings are updated in the workspace
 
+**A workspace admin set the display name of a member who did not have one.**
+
+To react to this event, include phrases like:
+- When an admin names a member who signed up with a phone number
+- When a member gets a display name for the first time
+
 **A workspace admin changed whether users with matching email domains automatically join the workspace.**
 
 To react to this event, include phrases like:
@@ -899,4 +918,4 @@ To react to this event, include phrases like:
 
 ---
 
-*This reference covers all 123 events AI Agents can react to.*
+*This reference covers all 126 events AI Agents can react to.*
diff --git a/docs/articles/new-expensify/ai-agents/Use-Agent-Templates.md b/docs/articles/new-expensify/ai-agents/Use-Agent-Templates.md
index 560e243d999e..c77f6fa47b00 100644
--- a/docs/articles/new-expensify/ai-agents/Use-Agent-Templates.md
+++ b/docs/articles/new-expensify/ai-agents/Use-Agent-Templates.md
@@ -1,68 +1,73 @@
 ---
 title: Use Agent Templates
-description: Learn what each built-in Agent template does and when to use it to automate common workflows.
-keywords: [Agent templates, AI agents, TipMaster, Translator Tess, Splitter Sam, starter agents, AI workflows]
-internalScope: Audience is members creating personal Agents. Covers the available built-in Agent templates, how they work, and when to use each one. Does not cover creating or managing Agents, Agent rules, or writing custom Agent instructions.
-retrievalIntent: Which Agent template should I use?
+description: Learn what each built-in agent template does, how it works, and when to use it.
+keywords: [agent templates, agents, TipMaster, Translator Tess, Splitter Sam, Description Dan, AI agent, receipt translator, card splitter, automate description]
+internalScope: Audience is New Expensify members creating AI agents. Covers the built-in agent templates available when creating a new agent and what each one does. Does not cover creating custom agents, editing agent instructions, Agent rules, or RuleBot.
 contentType: topic
+platform: New Expensify
 ---
 
 # Use Agent Templates
 
-Agent templates are prebuilt personal Agents with instructions already written for common tasks. Instead of creating an Agent from scratch, you can start with a template and customize its instructions before creating the Agent.
+Agent templates are prebuilt personal Agents with instructions already written for common tasks. Instead of creating an agent from scratch, you can start with a template and customize its instructions at any time.
 
-To learn how to create an Agent, see [Create and Manage Agents](/articles/new-expensify/ai-agents/Create-and-Use-Custom-Agents).
+Expensify includes a growing library of built-in templates, each designed for a specific workflow. This article explains what each template does and when you might want to use it.
 
 ---
 
-## How Agent templates work
+## How agent templates work
 
-Each Agent template includes a predefined set of instructions designed for a specific workflow.
+Every template is a standard Expensify agent with instructions that are already written for you. Like any agent, it runs from its own Expensify account and is added as a full-access Copilot on your account, allowing it to review expenses and act on your behalf.
 
-When you create an Agent from a template, you can review and edit those instructions before saving the Agent. After it's created, you can continue updating its instructions at any time.
+Each template monitors your expenses and receipts for specific conditions. When those conditions are met, the agent performs its configured action, such as adding a comment or moving an expense to another report. If an expense doesn't match the template's instructions, the agent takes no action.
 
-For guidance on writing clear, effective instructions, see [How to Write Agent Instructions](/articles/new-expensify/ai-agents/How-to-Write-Agent-Instructions).
+When you create an agent from a template, you can edit its instructions at any time to customize its behavior.
+
+![Agents page showing available templates]({{site.url}}/assets/images/Agent_Templates.png){:width="100%"}
 
 ---
 
 ## What TipMaster does
 
-TipMaster identifies restaurant receipts where the tip exceeds 20% of the pre-tax subtotal and adds a comment showing the subtotal, tip amount, and calculated tip percentage.
+TipMaster flags restaurant receipts where the tip exceeds 20%. 
+
+When you add a restaurant receipt, TipMaster calculates the tip percentage using the pre-tax subtotal. If the tip is greater than 20%, it adds a comment showing the subtotal, tip amount, and calculated percentage. It ignores receipts that aren't from restaurants and tips that are 20% or less.
 
-TipMaster is useful for monitoring meal spending, identifying accidental over-tipping, or highlighting expenses that may need additional review.
+TipMaster is useful for maintaining consistent meal spending, identifying accidental over-tipping, or highlighting expenses that may need additional review.
 
 ---
 
 ## What Translator Tess does
 
-Translator Tess translates receipts that aren't written in English and comments with an English translation of the receipt's key details, including the merchant, date, line items, subtotal, tax, and total.
+Translator Tess translates receipts that aren't written in English.
+
+When you add a receipt in another language, Translator Tess comments with an English translation of the receipt's key details, including the merchant, date, line items, subtotal, tax, and total. Receipts that are already in English are ignored.
 
 Translator Tess is useful for international travel, reviewing foreign-language receipts, or keeping expense documentation consistent across global teams.
 
 ---
 
-## What Splitter Sam does
+## What HotelSplitBot does
+
+HotelSplitBot itemizes hotel expenses so each charge can have its own category.
 
-Splitter Sam moves company card expenses to the correct card report, creating the report if necessary. Cash expenses aren't affected.
+When a hotel receipt includes separate charges, such as the room, meals, parking, or laundry, HotelSplitBot splits them into individual expenses while keeping the room charge as its own expense. The split amounts add up to the original expense total. Hotel expenses that only include a room charge or have already been split aren't changed.
 
-Splitter Sam is useful if you use multiple company cards and want each card's expenses grouped on its own report for easier reconciliation.
+HotelSplitBot is useful for itemizing hotel stays and categorizing room charges and incidentals separately.
 
 ---
 
-## What happens after you create an Agent from a template
+## What Description Dan Does 
 
-Creating an Agent from a template creates a standard personal Agent with the template's instructions pre-filled.
+Description Dan automatically adds descriptions to expenses based on descriptions you've previously used for the same merchant.
 
-After the Agent is created, you can:
+When an expense has no description, Description Dan looks at your past expenses from that merchant. If the same description has been used repeatedly, it adds that description to the new expense. Expenses that already have a manually entered description aren't changed.
 
- - Edit its instructions at any time.
- - Chat with the Agent.
- - Copilot into the Agent's account.
- - Use the Agent the same way you would any other personal Agent.
+Description Dan is useful for recurring purchases where you typically use the same description, helping keep expense details consistent without entering them manually each time.
 
 ---
 
 ## Related articles
 
- - [Understand How AI Agents Work in Expensify](/articles/new-expensify/ai-agents/Understand-How-AI-Agents-Work-in-Expensify)
- - [Create and Use Agents](/articles/new-expensify/ai-agents/Create-and-Use-Agents)
+- [Create and use agents](/articles/new-expensify/ai-agents/Create-and-Use-Custom-Agents)
+- [Write agent rules](/articles/new-expensify/ai-agents/How-to-Write-Agent-Rules)
diff --git a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Import-Personal-Card-Transactions-From-a-Spreadsheet.md b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Import-Personal-Card-Transactions-From-a-Spreadsheet.md
index 658073248542..6b4452db5d17 100644
--- a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Import-Personal-Card-Transactions-From-a-Spreadsheet.md
+++ b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Import-Personal-Card-Transactions-From-a-Spreadsheet.md
@@ -1,8 +1,8 @@
 ---
 title: Import Personal Card Transactions From a Spreadsheet
-description: Learn how members can manually import personal card transactions using a spreadsheet or bank statement file in Wallet.
-keywords: [New Expensify, import personal card, upload file, import spreadsheet, CSV, TXT, XLS, XLSX, OFX, QFX, bank statement, Wallet, card feed, reimbursable, bring your own card, BYOC, csv import, import csv, upload csv, spreadsheet import, import transactions, csv file, excel import, xls import, ofx import, qfx import, upload bank statement]
-internalScope: Audience is all members. Covers how to import, update, and delete personal card transactions from a spreadsheet or an .ofx/.qfx bank statement file. Does not cover company cards or Plaid connections.
+description: Learn how members can manually import personal card transactions, including categories and tags, using a spreadsheet or bank statement file in Wallet.
+keywords: [New Expensify, import personal card, upload file, import spreadsheet, CSV, TXT, XLS, XLSX, OFX, QFX, bank statement, Wallet, card feed, reimbursable, bring your own card, BYOC, csv import, import csv, upload csv, spreadsheet import, import transactions, csv file, excel import, xls import, ofx import, qfx import, upload bank statement, import tags, tag column, import categories, category column]
+internalScope: Audience is all members. Covers how to import, update, and delete personal card transactions from a spreadsheet or an .ofx/.qfx bank statement file, including mapping optional Category and Tag columns and the 255-character tag limit. Does not cover company cards or Plaid connections.
 order: 3
 ---
 
@@ -27,7 +27,8 @@ Anyone can import personal card transactions using a spreadsheet or bank stateme
 3. Enter a **Card display name** and configure the currency, reimbursable state, and amount sign direction, then click **Next**.
 4. Click **Choose file** and select your spreadsheet, or drag and drop it onto the upload area.
 5. Map your spreadsheet columns to the required fields (**Date**, **Merchant**, **Amount**).
-6. Click **Import**.
+6. (Optional) Map columns to **Category** or **Tag** to add a category or tag to each imported expense.
+7. Click **Import**.
 
 <!-- SCREENSHOT:
 Suggestion: The **Upload a spreadsheet** screen with the supported formats line and the **Choose file** button visible.
@@ -54,6 +55,7 @@ Expensify processes the statement after the upload finishes, so the new card and
 ## What happens after you import personal card transactions from a spreadsheet
 
 - Imported transactions appear as **Unreported** expenses.
+- If you mapped a **Category** or **Tag** column, each expense includes the value from that column.
 - You can edit, categorize, and submit these expenses on a report.
 - Imported transactions are available on both web and mobile.
 
@@ -92,6 +94,18 @@ Your file must include at least the following columns:
 - Amount  
 - Merchant  
 
+You can also map optional **Category** and **Tag** columns.
+
+## How do I import tags with personal card transactions?
+
+Add a column with the tag for each transaction to your spreadsheet, then map it to **Tag** when you map your columns. Columns with the header `Tag`, `Tags`, `Label`, or `Labels` are mapped to **Tag** automatically.
+
+Expensify doesn't check imported tags against a Workspace's tag list, so review each tag before you submit the expense.
+
+## Why can't I import a spreadsheet with long tags?
+
+Each tag can be up to 255 characters. If any value in your **Tag** column is longer, you'll see an error and can't import until you shorten it. Edit the values in your spreadsheet, then upload the file again.
+
 ## What happens if I use the same column twice when mapping fields?
 
 You’ll see an error message and won’t be able to proceed until the issue is resolved.
diff --git a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Manage-Personal-Cards.md b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Manage-Personal-Cards.md
index 558ad2c4fc3b..c27ec68d7723 100644
--- a/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Manage-Personal-Cards.md
+++ b/docs/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Manage-Personal-Cards.md
@@ -1,7 +1,7 @@
 ---
 title: Manage Personal Cards
 description: Learn how to view, manage, and fix broken connections for personal credit cards in New Expensify.
-keywords: [New Expensify, personal cards, Wallet, reimbursable, credit card import, Expensify Classic, cards, card details, broken connection, fix card, temporary bank issue, can't auto-match receipt]
+keywords: [New Expensify, personal cards, Wallet, reimbursable, credit card import, Expensify Classic, cards, card details, broken connection, fix card, temporary bank issue, can't auto-match receipt, card number changed, account not found, account no longer active, account closed]
 internalScope: Audience is members with personal credit cards already connected to their account. Covers viewing and managing existing personal cards in the Wallet, including reimbursable settings, fixing broken card connections, and recognizing temporary bank issues that resolve on their own. Does not cover connecting new personal cards or company card programs.
 order: 2
 ---
@@ -72,6 +72,7 @@ A personal card connection can break when your bank can no longer authenticate y
 - Your bank requires additional verification (e.g., multi-factor authentication expired).
 - Your bank revoked access to the third-party connection.
 - A temporary outage at your bank disrupted the connection.
+- Your card number changed, or the account is no longer active at your bank.
 
 When a connection breaks, Expensify can no longer import new transactions from that card.
 
@@ -161,6 +162,14 @@ The broken connection error is automatically removed when any of the following o
 
 Your bank returned a temporary error, so Expensify couldn't pull the card transaction to match against the receipt. Your card connection is not broken, so you don't need to choose **Fix card**. Expensify retries automatically and the message clears once the transaction imports.
 
+## What should I do if my card number changed at the bank?
+
+When your bank issues a new card number, Expensify can't find the account and the connection breaks. The card shows a red dot in **Wallet**, and the **Card details** page shows the broken connection error with a **Fix card** option. Choose **Fix card** and log into your bank to reconnect the updated account.
+
+## What should I do if my account is no longer active at my bank?
+
+When the account is no longer active, Expensify can't find it and the connection breaks. The card shows a red dot in **Wallet**, and the **Card details** page shows the broken connection error with a **Fix card** option. If your bank moved the card to a new account, choose **Fix card** and log into your bank to reconnect it. If the account is closed for good, [connect the new card as a personal card](/articles/new-expensify/connect-credit-cards/connect-and-manage-personal-cards/Connect-Personal-Cards).
+
 ## Why did the broken connection reminders disappear while the card still shows an error?
 
 If a personal card has gone 90 days or more without a successful sync, Expensify stops showing the proactive reminders — the **Time Sensitive** notification on **Home** and the red dot on **Wallet** in the navigation tabs. The card itself still appears in **Wallet** with a red dot, so you can select it and choose **Fix card** to reconnect it whenever you're ready.
diff --git a/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Import-Company-Card-Transactions-From-a-Spreadsheet.md b/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Import-Company-Card-Transactions-From-a-Spreadsheet.md
index 3e5d3a8db1d3..06b7fa6f82df 100644
--- a/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Import-Company-Card-Transactions-From-a-Spreadsheet.md
+++ b/docs/articles/new-expensify/connect-credit-cards/connect-company-cards/Import-Company-Card-Transactions-From-a-Spreadsheet.md
@@ -29,18 +29,28 @@ Only workspace admins can import transactions for company cards.
 3. Select **Add cards**.
     - If you don’t see **Add cards**, select your existing company card connection, then select **Add cards**.
 4. Choose the country your bank is located in and select **Next**.
-5. Choose **Import transactions from file**.
-6. Enter a company card layout name and select **Save**. Then select **Next**.
-7. Select **Choose file** to choose the CSV, TXT, XLS, or XLSX file you want to upload.
-8. Choose which fields to map to your spreadsheet columns by selecting **Card number** or a **Card name**, along with **Date**, **Merchant**, **Amount**, and **Currency** from the list. 
-9. Map **Unique ID** to a column that holds a unique reference for each transaction, if your file has one.
-10. Select **Import**.
+5. Select **Import transactions from file**, then select **Next**.
+6. Select **Company card layout name**.
+7. Enter a name for the card feed on the page that opens.
+8. Select **Save**.
+9. Select **Next**.
+10. Select **Choose file** and choose the CSV, TXT, XLS, or XLSX file containing the transactions you want to import.
+11. Map the transaction fields. You must map:
+    - Either **Card number** or **Card name**
+    - **Date**
+    - **Merchant**
+    - **Amount**
+    - **Currency**
+12. Map **Unique ID** to a column that holds a unique reference for each transaction, if your file has one.
+13. Select **Import**.
 
 You must map at least one card-identity column — a **Card number** or a **Card name** — so each transaction can be grouped under a card.
 
-**Note:** Download the [CSV template](https://s3-us-west-1.amazonaws.com/concierge-responses-expensify-com/uploads%2F1594908368712-Best+Example+CSV+for+Domains.csv) for an example of the recommended column structure and formatting for company card transaction imports.
+**Note:** Select **Download our template** on the **Import transactions from file** step to download an example CSV with the recommended columns and formatting for company card transaction imports.
 
-![Company Cards page with Add cards highlighted]({{site.url}}/assets/images/company-cards-add-cards.png){:width="100%"}
+![Company cards page with Add cards highlighted]({{site.url}}/assets/images/Companycards_add_cards.png){:width="100%"}
+
+![Company cards import options with file import highlighted]({{site.url}}/assets/images/Companycards_file_import.png){:width="100%"}
 
 ---
 
@@ -101,7 +111,7 @@ You must map **Unique ID** yourself on every import. Unlike the other field mapp
 
 ## What should I do if my spreadsheet file upload fails or results in an error?
 
-Ensure the file includes the required fields and matches the formatting guidelines. Use Expensify’s [CSV template](https://s3-us-west-1.amazonaws.com/concierge-responses-expensify-com/uploads%2F1594908368712-Best+Example+CSV+for+Domains.csv) for reference.
+Ensure the file includes the required fields and matches the formatting guidelines. Select **Download our template** on the **Import transactions from file** step for an example of the recommended structure and formatting.
 
 ## What spreadsheet file formats are supported for company card imports?
 
@@ -113,13 +123,13 @@ Your file must include a way to identify each card so transactions can be matche
 - Date
 - Merchant
 - Amount
-- Currency (optional but recommended)
+- Currency
 
 **Unique ID** is optional, but map it whenever your file has a unique reference for each transaction so re-uploading the file doesn't create duplicates.
 
 ## How does matching transactions by card name work?
 
-Instead of a **Card number**, you can map a **Card name** column, and Expensify groups each transaction under the card identified by that name. After you upload the file, those cards appear as entries you can assign to users — the name doesn't need to match a card you've already assigned. You only need one card-identity column, so map a **Card number** column instead if you'd rather identify cards by number.
+Instead of a **Card number**, you can map a **Card name** column, and Expensify groups each transaction under the card identified by that name. After you upload the file, those cards appear as entries you can assign to workspace members — the name doesn't need to match a card you've already assigned. You only need one card-identity column, so map a **Card number** column instead if you'd rather identify cards by number.
 
 ## What happens if I map the same spreadsheet file column twice?
 
diff --git a/docs/articles/new-expensify/connections/Connect-Greenhouse-to-Expensify.md b/docs/articles/new-expensify/connections/Connect-Greenhouse-to-Expensify.md
index 35c99581d90b..d7ddcbfe1da8 100644
--- a/docs/articles/new-expensify/connections/Connect-Greenhouse-to-Expensify.md
+++ b/docs/articles/new-expensify/connections/Connect-Greenhouse-to-Expensify.md
@@ -1,8 +1,10 @@
 ---
 title: Connect Greenhouse to Expensify
 description: Learn how to connect Greenhouse to your Expensify workspace, choose which candidates to import, and set their expense approver.
-keywords: [New Expensify, Greenhouse, Greenhouse integration, connect Greenhouse, recruiting integration, ATS, applicant tracking system, import candidates, candidate reimbursement, Recruiting, Import settings, Default approver]
-internalScope: Audience is Workspace Admins on Control plans. Covers connecting Greenhouse through the Recruiting page, completing the initial setup, choosing which candidates to import, setting the candidate approval mode, and managing Greenhouse syncs. Does not cover HR integrations, accounting integrations, or the legacy Greenhouse webhook integration in Expensify Classic.
+keywords: [New Expensify, Greenhouse, Greenhouse integration, connect Greenhouse, recruiting integration, ATS, applicant tracking system, import candidates, candidate reimbursement, Greenhouse candidates not importing, sync Greenhouse, disconnect Greenhouse, Recruiting, Import settings, Default approver]
+internalScope: Audience is Workspace Admins on Control plans. Covers connecting Greenhouse through the Recruiting page, completing the initial setup, choosing which candidates to import, setting the candidate approval mode, managing Greenhouse syncs, and disconnecting Greenhouse. Does not cover HR integrations, accounting integrations, or the legacy Greenhouse webhook integration in Expensify Classic.
+contentType: task
+platform: new
 ---
 
 # Connect Greenhouse to Expensify
@@ -23,29 +25,33 @@ To connect Greenhouse, you must:
 
 - Be a Workspace Admin on a Control workspace in Expensify.
 - Be an administrator in Greenhouse.
-- Ensure every candidate in Greenhouse has an email address.
 - Have **Recruiting** enabled under **More features** in the workspace.
 
 To turn on **Recruiting**, go to **Workspaces** > [Workspace Name] > **More features**, and under **Integrate**, turn on **Recruiting**. If your workspace is on the Collect plan, you'll be asked to upgrade to Control. After you upgrade, **Recruiting** is turned on automatically.
 
 You can connect only one applicant tracking system (ATS) to a workspace at a time.
 
+You can connect and manage Greenhouse on web and mobile.
+
 ---
 
 ## How to connect Greenhouse to Expensify
 
 1. In the navigation tabs (on the left on web, on the bottom on mobile), select **Workspaces**.
-2. Click the workspace you want to import candidates into.
+2. Click the name of the workspace you want to import candidates into.
 3. In the left menu, select **Recruiting**.
 4. Next to **Greenhouse**, click **Connect**.
 5. In the connection window that opens, sign in with your Greenhouse administrator account and authorize Expensify to access your Greenhouse account.
-6. Wait for the connection to complete. Greenhouse then displays **Connected. Complete setup to import candidates.**
-7. Click **Complete setup** in that message, or select the three dots **(⋮)** next to **Greenhouse** and click **Complete setup**.
-8. Choose which candidates to import, then click **Save**.
+6. When the connection completes, click **Complete setup** in the **Connected. Complete setup to import candidates.** message under **Greenhouse**. You can also select the three dots **(⋮)** next to **Greenhouse** and click **Complete setup**.
+7. On the **Import settings** page, choose which candidates to import, then click **Save**.
 
-> **Note:** After you connect, you'll see a **Your connection is syncing** message. The first connection can take some time to complete.
+<!-- SCREENSHOT:
+Suggestion: The Recruiting page right after authorization, showing the Greenhouse row with the "Connected. Complete setup to import candidates." message and the Complete setup link.
+Location: After step 6 of "How to connect Greenhouse to Expensify".
+Purpose: Shows admins that the connection isn't finished yet and where to click to start importing candidates, which prevents "connected but nothing imported" questions.
+-->
 
-Nothing is imported until you choose which candidates to import and click **Save**.
+After you connect, you'll see **Your connection is syncing**. The first connection can take some time. Nothing is imported until you choose which candidates to import and click **Save**.
 
 ---
 
@@ -53,7 +59,7 @@ Nothing is imported until you choose which candidates to import and click **Save
 
 The **Import settings** page controls which Greenhouse candidates are imported into the workspace. You must use **Job stages**, **Tags**, or both. **Offices** is optional and narrows the import further.
 
-When more than one filter is on, a candidate must match all of them to be imported. Within a single filter, a candidate only needs to match one of the values you select. For example, if you select two tags, a candidate with either tag matches and will be invited.
+When more than one filter is on, a candidate must match all of them to be imported. Within a single filter, a candidate only needs to match one of the values you select. For example, if you select two tags, a candidate with either tag is imported.
 
 1. On the **Recruiting** page, click **Import settings**.
 2. Turn on **Job stages**, **Tags**, or both:
@@ -63,17 +69,25 @@ When more than one filter is on, a candidate must match all of them to be import
 4. By default, turning on a filter selects every value. To choose specific values, click **Job stage**, **Tag**, or **Office**, select the values you want, and click **Save**.
 5. Click **Save**.
 
+<!-- SCREENSHOT:
+Suggestion: The Import settings page with Job stages and Tags turned on, Offices turned off, and the Job stage row showing a specific selected value instead of "All job stages".
+Location: After step 5 of "How to choose which Greenhouse candidates to import".
+Purpose: Clarifies the difference between turning on a filter (which selects every value) and opening the filter row to pick specific values, a common source of importing too many candidates.
+-->
+
 If you click **Save** without turning on **Job stages** or **Tags**, you'll see **Enable Job stages or Tags to continue**. Turning on **Offices** by itself isn't enough.
 
-Saving your import settings starts a sync. After that, Expensify checks Greenhouse for new matching candidates about once a day. If a candidate has more than one application in Greenhouse, they're imported as long as any one of their applications matches your filters. Expensify doesn't remove candidates automatically, even after they move to a different stage or have their tag removed in Greenhouse.
+Saving your import settings starts a sync. If a candidate has more than one application in Greenhouse, they're imported as long as any one of their applications matches your filters. Candidates without an email address in Greenhouse are skipped.
+
+---
 
-**Example: Using Job stages and Tags to filter candidate imports**
+## How to control when Greenhouse candidates get an Expensify invite
 
-You can combine a job stage and a tag so candidates don't get an Expensify invite before they hear from you.
+Combine a job stage and a tag so candidates don't get an Expensify invite before they hear from you.
 
 1. In Greenhouse, create a tag called **Ready for Expensify**.
-2. In Expensify, turn on **Job stages** and select **Onsite Interview**.
-3. Turn on **Tags** and select **Ready for Expensify**.
+2. In Expensify, on the **Import settings** page, turn on **Job stages** and select **Onsite Interview**.
+3. Turn on **Tags**, select **Ready for Expensify**, and click **Save**.
 
 Then, for each candidate:
 
@@ -81,13 +95,15 @@ Then, for each candidate:
 2. After you've emailed them, add the **Ready for Expensify** tag to the candidate in Greenhouse.
 3. On the next sync, Expensify imports the candidate and sends their invite.
 
-Because candidates must match both the stage and the tag, no one is invited until you've tagged them. 
+Because candidates must match both the stage and the tag, no one is invited until you've tagged them.
+
+---
 
-**Example: Using Job stages, Tags and Offices to filter candidate imports**
+## How to import Greenhouse candidates into different workspaces by office
 
-If you use separate workspaces for different entities, you can use **Offices** to send each candidate to the workspace that exports to the right entity.
+If you use separate workspaces for different entities, use **Offices** to send each candidate to the workspace that exports to the right entity.
 
-1. Set up the same job stage and tag filters from the example above in each workspace.
+1. In each workspace, set up the same **Job stages** and **Tags** filters.
 2. In the workspace that exports to your UK entity, turn on **Offices** and select **London**.
 3. In the workspace that exports to your US entity, turn on **Offices** and select **New York**.
 
@@ -95,22 +111,19 @@ London candidates are imported only into the UK workspace, and New York candidat
 
 ---
 
-## What happens after you connect Greenhouse to Expensify
+## What happens after Greenhouse syncs candidates to Expensify
 
-- If you're on the **Recruiting** or **Members** page when a sync finishes, the **Greenhouse sync complete** screen opens with the **Added**, **Removed**, and **Skipped** candidate counts. Click **Skipped** to see each skipped candidate and the reason they were skipped, then click **Got it** to close the screen. This screen doesn't open for syncs that finish in the background, such as the daily automatic sync, or if you leave the page before the sync finishes.
-- The Greenhouse connection displays the **Last synced** timestamp.
 - Candidates who match your import settings are added to the workspace and appear on the **Members** page.
 - Candidates who don't already have an Expensify account receive an email invitation to finish setting up their account.
-- You can configure the **Default approver** for candidates from the **Recruiting** page.
-
-Expensify also runs a daily auto-sync to keep candidates up to date:
+- The Greenhouse connection displays the **Last synced** timestamp.
+- Expensify checks Greenhouse about once a day for new matching candidates and updates candidate details to match Greenhouse.
+- Expensify doesn't remove candidates automatically, even after they move to a different stage or have their tag removed in Greenhouse.
 
-- New candidates who match your import settings are added to the workspace.
-- Candidate details are updated to match Greenhouse.
+If you're on the **Recruiting** or **Members** page when a sync finishes, the **Greenhouse sync complete** screen shows the **Added** and **Skipped** candidate counts. Click **Skipped** to see why each candidate was skipped. This screen doesn't appear for syncs that finish in the background, such as the daily sync, or if you leave the page before the sync finishes.
 
 ---
 
-## How to configure the approval mode for Greenhouse
+## How to set the default approver for Greenhouse candidates
 
 The **Default approver** setting controls who approves expenses for candidates imported from Greenhouse.
 
@@ -123,7 +136,7 @@ The **Default approver** setting controls who approves expenses for candidates i
 
 ---
 
-## What happens to approval workflows after connecting Greenhouse
+## What happens to approval workflows when you set a Greenhouse approval mode
 
 When **Basic approval** or **Advanced approval** is selected:
 
@@ -131,10 +144,7 @@ When **Basic approval** or **Advanced approval** is selected:
 - You can't edit approval workflows on the **Workflows** page.
 - To change approvers, update the **Default approver** setting on the **Recruiting** page.
 
-When **Custom approval** is selected:
-
-- Approval workflows remain editable in **Workflows**.
-- You can manage approval routing manually in Expensify.
+When **Custom approval** is selected, you manage approval workflows manually on the **Workflows** page.
 
 Learn more about [how to add approvals to a workspace](/articles/new-expensify/workspaces/Add-Approvals).
 
@@ -142,16 +152,12 @@ Learn more about [how to add approvals to a workspace](/articles/new-expensify/w
 
 ## How to manually refresh the Greenhouse sync
 
-After connecting Greenhouse, a daily auto-sync runs to keep your workspace candidates up to date with Greenhouse. You can also refresh the sync manually.
-
-To refresh the sync manually:
-
 1. In the navigation tabs (on the left on web, on the bottom on mobile), select **Workspaces**.
 2. Click the name of the workspace connected to Greenhouse.
 3. In the left menu, select **Recruiting**.
 4. Next to **Greenhouse**, select the three dots **(⋮)**, then click **Sync now**.
 
-Manual syncs are limited to two in 24 hours. If you've reached the limit, you'll see **Try again tomorrow**. The daily auto-sync still runs as usual.
+Manual syncs are limited to two in 24 hours. If you've reached the limit, you'll see **Try again tomorrow**. The daily sync still runs as usual.
 
 ---
 
@@ -171,7 +177,7 @@ Disconnecting Greenhouse stops future candidate syncs.
 
 ## Why is Greenhouse connected but no candidates were imported?
 
-Connecting Greenhouse authorizes the integration. To start importing candidates, click **Complete setup** on **Greenhouse**, turn on **Job stages** or **Tags** on the **Import settings** page, and click **Save**. If the sync finishes but no candidates were added, check that your import settings match candidates in Greenhouse.
+Connecting Greenhouse only authorizes the integration. To start importing candidates, click **Complete setup** under **Greenhouse**, turn on **Job stages** or **Tags** on the **Import settings** page, and click **Save**. If the sync finishes but no candidates were added, check that your import settings match candidates in Greenhouse.
 
 ## Why wasn't a candidate imported from Greenhouse?
 
@@ -189,6 +195,6 @@ We recommend a separate workspace for candidates. This lets you set up categorie
 
 You must disconnect Greenhouse before you can turn off **Recruiting** under **More features**.
 
-## I don't see my ATS on the Recruiting page. What should I do?
+## What if I don't see my ATS on the Recruiting page?
 
 To request another ATS integration, click **Ask Concierge** on the **Recruiting** page.
diff --git a/docs/articles/new-expensify/connections/connect-ai-assistants/Connect-ChatGPT-to-Expensify-Using-MCP.md b/docs/articles/new-expensify/connections/connect-ai-assistants/Connect-ChatGPT-to-Expensify-Using-MCP.md
index 2958d4488c4c..b95db84b976a 100644
--- a/docs/articles/new-expensify/connections/connect-ai-assistants/Connect-ChatGPT-to-Expensify-Using-MCP.md
+++ b/docs/articles/new-expensify/connections/connect-ai-assistants/Connect-ChatGPT-to-Expensify-Using-MCP.md
@@ -16,7 +16,7 @@ Learn more about supported AI clients, permissions, and security in [Use the Exp
 
 ## Who can connect ChatGPT to Expensify using MCP
 
-Any member with an Expensify account and access to ChatGPT can connect using the Expensify connector in the ChatGPT connector directory.
+Any member with an Expensify account and access to ChatGPT can connect using the Expensify plugin in the ChatGPT plugin directory.
 
 Requirements:
 
@@ -29,22 +29,19 @@ Requirements:
 ## How to connect Expensify in ChatGPT
 
 1. Open ChatGPT.
-2. Go to **Settings**.
-3. Select **Plugins**.
-4. Select **Expensify** from the list.
-5. Click **Connect**.
-6. Complete the OAuth sign-in and approval flow in your browser.
-7. Click **Allow**.
+2. Click **Plugins**.
+3. Search **Expensify**.
+4. Click the **+** to connect.
+5. Click **Allow**.
 
 ---
 
-## How to use the Expensify connector in ChatGPT conversations
+## How to use the Expensify plugin in ChatGPT conversations
 
 1. Open a new chat in ChatGPT.
 2. Click the **+** button near the message composer.
-3. Select **More**.
-4. Select the Expensify connector.
-5. Ask a question about your Expensify data.
+3. Select the **Expensify** plugin.
+4. Ask a question about your Expensify data.
 
 ---
 
@@ -76,9 +73,9 @@ Make sure you completed the OAuth approval flow in your browser.
 
 If ChatGPT still cannot access your data:
 
-- Go to **Settings** > **Plugins** in ChatGPT and confirm that **Expensify** appears under **Enabled Plugins**.
-- Open the **Expensify** connector in ChatGPT, select the three dots **(⋮)**, and click **Reconnect**.
-- Remove the Expensify connector and add it again by following the setup instructions in this article.
+- Go to **Plugins** in ChatGPT and confirm that **Expensify** appears under **Installed**.
+- Open the **Expensify** plugin in ChatGPT, select the three dots **(⋮)**, and click **Reconnect**.
+- Remove the Expensify plugin and add it again by following the setup instructions in this article.
 
 ## Can ChatGPT edit expenses or approve reports?
 
diff --git a/docs/articles/new-expensify/connections/dualentry/Configure-DualEntry.md b/docs/articles/new-expensify/connections/dualentry/Configure-DualEntry.md
index 07821604e83a..ca1fd7f15564 100644
--- a/docs/articles/new-expensify/connections/dualentry/Configure-DualEntry.md
+++ b/docs/articles/new-expensify/connections/dualentry/Configure-DualEntry.md
@@ -70,6 +70,8 @@ An individual card uses its per-card account when one is configured. Otherwise,
 
 You can also change an individual company card's DualEntry export account from its card details.
 
+To review or change the vendor on an individual expense before it exports, learn how to [manage vendor matching for DualEntry](/articles/new-expensify/connections/dualentry/Manage-Vendor-Matching-for-DualEntry).
+
 ---
 
 ## How to configure DualEntry advanced settings
diff --git a/docs/articles/new-expensify/connections/dualentry/Manage-Vendor-Matching-for-DualEntry.md b/docs/articles/new-expensify/connections/dualentry/Manage-Vendor-Matching-for-DualEntry.md
new file mode 100644
index 000000000000..b63936276903
--- /dev/null
+++ b/docs/articles/new-expensify/connections/dualentry/Manage-Vendor-Matching-for-DualEntry.md
@@ -0,0 +1,116 @@
+---
+title: Manage Vendor Matching for DualEntry
+description: Learn how DualEntry vendor matching assigns vendors to non-reimbursable company card expenses before they export, including automatic matching, manual selection, subsidiary scoping, and default vendor behavior.
+keywords: [DualEntry, vendor matching, vendor, company card expenses, default vendor for all company cards, Credit Card Misc, company card export]
+internalScope: Audience is workspace admins using the DualEntry connection for company card exports. Covers imported DualEntry vendors, subsidiary scoping, automatic and manual vendor assignment, default vendor behavior, the Credit Card Misc export fallback, and vendors that are no longer valid. Does not cover DualEntry connection setup, other DualEntry configuration settings, or vendor matching for other accounting connections.
+order: 3
+---
+
+# Manage Vendor Matching for DualEntry
+
+DualEntry vendor matching lets workspace admins review and update the vendor assigned to non-reimbursable company card expenses before they export to DualEntry. Expensify imports your DualEntry vendor list, automatically matches vendors where possible, and lets admins set or update the **Vendor** field before export. This helps ensure expenses export with the correct vendor instead of requiring manual corrections in DualEntry.
+
+## Who can use DualEntry vendor matching
+
+This feature is available to workspace admins whose workspace:
+
+ - Is connected to DualEntry.
+ - Has finished configuring the DualEntry connection.
+
+If your workspace isn't connected to DualEntry yet, learn how to [connect to DualEntry](/articles/new-expensify/connections/dualentry/Connect-to-DualEntry).
+
+## Which DualEntry vendors are available in Expensify
+
+Expensify only imports the vendors a workspace can actually export to. A DualEntry vendor appears in Expensify when it is:
+
+ - Active in DualEntry.
+ - Either assigned to the **Subsidiary** selected for the connection, or not assigned to any subsidiary.
+
+Vendors assigned to a different subsidiary are not available, so changing the **Subsidiary** on the connection changes which vendors you can select.
+
+The same list is used everywhere vendors appear in Expensify: automatic matching, the **Vendor** field on an expense, workspace merchant rules, and the **Default vendor for all company cards** setting.
+
+## How vendors are matched to DualEntry company card expenses
+
+Expensify assigns vendors automatically in the following order:
+
+ - If a workspace merchant rule specifies a vendor, that vendor is assigned.
+ - Otherwise, Expensify automatically matches the merchant name against your imported DualEntry vendor list. For example, **STARBUCKS #456 DOWNTOWN** matches **Starbucks**.
+ - If no match is found, the **Vendor** field remains empty until a workspace admin selects one.
+
+Whenever a vendor is assigned automatically, Concierge posts a system message on the expense indicating whether the vendor was set by a merchant rule or by vendor matching.
+
+The **Vendor** field appears only on non-reimbursable expenses. It isn't shown on reimbursable expenses or on invoices.
+
+## How to select a DualEntry vendor on an expense
+
+1. Open the non-reimbursable expense.
+2. Select **Vendor**.
+3. Search for the vendor by name.
+4. Select the vendor you want to assign.
+
+Once a vendor is selected manually, Expensify preserves that selection and won't overwrite it with automatic matching.
+
+![The expense details view for a non-reimbursable company card expense on a DualEntry-connected workspace, with the Vendor row visible directly below Category and a matched vendor name shown]({{site.url}}/assets/images/Expense_select-vendor.png){:width="100%"}
+
+## Where to find your imported DualEntry vendors
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile), go to **Workspaces > [workspace name]**.
+2. Select **Vendors**.
+3. Use **Find vendor** to search the list by name.
+
+Vendors are managed in DualEntry, so the list is read-only in Expensify and refreshes when the connection syncs.
+
+## How to set a default vendor for all company cards in DualEntry
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile), go to **Workspaces > [workspace name]**.
+2. Select **Accounting**.
+3. On the DualEntry connection, select **Export**.
+4. Select **Default vendor for all company cards**.
+5. Select a vendor from your imported DualEntry vendor list.
+
+The default vendor is used only when an expense doesn't already have a vendor assigned.
+
+## How vendors export to DualEntry
+
+When company card expenses are exported, Expensify assigns vendors in the following order:
+
+1. The vendor selected on the expense.
+2. The **Default vendor for all company cards** configured in the DualEntry export settings.
+3. A vendor named **Credit Card Misc**, if neither of the above is available.
+
+If no **Credit Card Misc** vendor exists in DualEntry, Expensify creates one on the first export that needs it and reuses it afterward. Expensify does not set it as your **Default vendor for all company cards**, so that setting stays empty until you choose a vendor yourself.
+
+## What happens when a DualEntry vendor is no longer valid
+
+If a vendor assigned to an expense is deactivated in DualEntry, or is no longer available to the selected **Subsidiary**, the expense displays a **Vendor no longer valid** error, similar to category, tag, and tax violations.
+
+Select an active vendor on the expense to clear the error. You can also select **None** to leave the **Vendor** field empty.
+
+A merchant rule that points at a vendor which is no longer available displays **Vendor unavailable** instead of a vendor name. Edit the rule and choose an available vendor to resolve it.
+
+---
+
+# FAQ
+
+## Do I have to set a vendor?
+
+No. The **Vendor** field is optional.
+
+Expensify automatically attempts to match a vendor using your imported DualEntry vendor list. If no match is found, the field can remain blank, and the expense exports using the **Default vendor for all company cards** configured in your DualEntry export settings, or **Credit Card Misc** if no default is set.
+
+## Does manually assigning a vendor stop automatic matching?
+
+Yes. Once a workspace admin manually assigns a vendor to an expense, Expensify preserves that selection and won't replace it with automatic matching.
+
+## Why don't I see any vendors to choose from?
+
+The vendor selector shows **No vendors found** when no DualEntry vendors are available to your workspace. This happens when your DualEntry vendor list is empty, when every vendor is inactive, or when every vendor belongs to a different subsidiary than the one selected for the connection. Add or activate the vendors in DualEntry, then sync the connection again.
+
+## Why did a vendor disappear after I changed the subsidiary?
+
+Vendors are scoped to the **Subsidiary** selected for the DualEntry connection. After you change the subsidiary, vendors that belong only to the previous subsidiary are no longer available, and expenses or merchant rules using them need an available vendor selected instead.
+
+## How do I know why Expensify assigned a vendor automatically?
+
+When Expensify automatically assigns a vendor, Concierge posts a system message on the expense indicating whether the vendor was assigned by a merchant rule or by vendor matching.
diff --git a/docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md b/docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md
index 0f6e0d05e5ba..c86a302ed2bd 100644
--- a/docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md
+++ b/docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md
@@ -1,7 +1,7 @@
 ---
 title: Configure NetSuite
 description: Learn how to configure the import, export, and advanced settings for Expensify's integration with NetSuite.
-keywords: [New Expensify, NetSuite configuration, import settings, export settings, advanced sync, tags, corporate card export]
+keywords: [New Expensify, NetSuite configuration, import settings, export settings, advanced sync, tags, corporate card export, Split exports by posting period, Export to next open period]
 order: 2
 ---
 
@@ -75,7 +75,8 @@ To manage how reports are exported from Expensify to NetSuite:
 - **Export Invoices To** – Choose the Accounts Receivable account
 - **Invoice Item** – Select or create the item line for invoices
 - **Export Foreign Currency Amount** – Enable to export original currency values
-- **Export to Next Open Period** – Enable to skip closed periods and use the next available NetSuite period
+- **Export to next open period** – Enable to skip closed periods and use the next available NetSuite period
+- **Split exports by posting period** – Enable to export non-reimbursable expenses as one NetSuite transaction per calendar month, each dated in its own month. **Export to next open period** must be on first. While this toggle is on, **Export to next open period** stays locked on.
 - **Export Expensify Travel Payable To** – If Expensify Travel's Consolidated Travel Billing feature is enabled, configure where travel card expenses are exported:
   - **Non-reimbursable journal posting account** – Select the payable account for Expensify Travel expenses
 
@@ -157,6 +158,21 @@ Check the **Use as Field ID** box in NetSuite. This assigns a usable ID to older
 No. Auto-sync only applies to newly approved reports. Export older reports manually if needed.
 
 
+## How does Split exports by posting period work in NetSuite?
+
+When **Split exports by posting period** is on, a report with non-reimbursable expenses from different months exports as a separate NetSuite transaction for each month. Each transaction is dated in its own month. If a month falls in a closed NetSuite period, **Export to next open period** moves that transaction to the next open period.
+
+
+## Why can’t I turn off Export to next open period?
+
+**Export to next open period** is locked on while **Split exports by posting period** is on. To turn off **Export to next open period**, first turn off **Split exports by posting period**.
+
+
+## Why can’t I turn on Split exports by posting period?
+
+**Split exports by posting period** is locked until **Export to next open period** is on. Turn on **Export to next open period** first, then turn on **Split exports by posting period**.
+
+
 ## How does multi-currency exporting work in NetSuite?
 
 - The employee/vendor currency must match the subsidiary
diff --git a/docs/articles/new-expensify/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md b/docs/articles/new-expensify/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md
index be4c4c815bd2..b4cbee822bf4 100644
--- a/docs/articles/new-expensify/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md
+++ b/docs/articles/new-expensify/connections/quickbooks-online/Troubleshooting/Export-Errors/ONL583-Export-Error.md
@@ -1,17 +1,17 @@
 ---
 title: ONL583 Export Error in QuickBooks Online
-description: Learn how to fix the ONL583 export error in QuickBooks Online when a vendor already exists but cannot be matched to the report submitter.
-keywords: ONL583, QuickBooks Online vendor already exists, vendor could not be matched, submitter email mismatch, duplicate vendor record, Automatically create employees vendors, Expensify QuickBooks Online export error, Workspace Admin, accounting export error
-internalScope: Audience is Workspace Admins using QuickBooks Online integration. Covers fixing the ONL583 export error caused by vendor email mismatches or duplicate records. Does not cover other export error codes.
+description: Learn how to fix the ONL583 export error when a vendor, supplier, customer, or employee name in QuickBooks Online prevents Expensify from creating a vendor for the report submitter.
+keywords: ONL583, QuickBooks Online duplicate name, vendor already exists, supplier name conflict, customer or employee name conflict, submitter email mismatch, Expensify QuickBooks Online export error, Workspace Admin
+internalScope: Audience is Workspace Admins using the QuickBooks Online integration. Covers fixing the ONL583 export error caused by a name conflict when automatically creating a vendor for the report submitter. Does not cover other export error codes.
 ---
 
 # ONL583 Export Error in QuickBooks Online
 
-If you see the error:
+The ONL583 error identifies the submitter's email and the conflicting record name. For example:
 
-ONL583: A vendor with this name already exists in QuickBooks Online, but couldn’t be matched. Please confirm the existing vendor record uses the same email as the submitter.
+> We could not find a vendor/supplier in QuickBooks Online for jane@acme.com. A record named 'Jane Doe' already exists in QuickBooks Online under a different email, or as another record type such as a customer or employee. Please rename that record, or create a vendor/supplier for jane@acme.com under a different name.
 
-This means QuickBooks Online already has a vendor with the same name, but Expensify cannot match it to the report submitter based on email address.
+This means Expensify cannot find a matching vendor/supplier by email, and QuickBooks Online rejects creating one because its name is already in use.
 
 ---
 
@@ -19,67 +19,23 @@ This means QuickBooks Online already has a vendor with the same name, but Expens
 
 The ONL583 error occurs when:
 
-- Expensify attempts to create a vendor for the report submitter.
-- A vendor with the same name already exists in QuickBooks Online.
-- The existing vendor record does not have the same email address as the submitter in Expensify.
-- The submitter’s email address is associated with multiple records (for example, both an employee and a vendor).
+- Expensify cannot find a vendor/supplier matching the report submitter's email address.
+- Expensify attempts to create a vendor for the submitter.
+- The name is already used by a vendor/supplier with a different email, or by a customer or employee record.
 
-Expensify matches vendors using email addresses. If the email does not match exactly, the export will fail.
+Expensify matches vendors by email address. QuickBooks Online requires unique names across vendors/suppliers, customers, and employees.
 
 ---
 
-## How to Confirm the Vendor Email in QuickBooks Online
+## How to Fix the Name Conflict in QuickBooks Online
 
 1. Log in to QuickBooks Online.
-2. Go to **Expenses**.
-3. Select **Vendors**.
-4. Search for the vendor with the same name as the report submitter.
-5. Open the vendor record.
-6. Confirm the **Email** field exactly matches the submitter’s email address in Expensify.
-7. Update the email if needed and click **Save**.
-
-After updating the email, retry exporting the report.
-
----
-
-## How to Check for Duplicate Records in QuickBooks Online
-
-If the export still fails:
-
-1. Use the global search bar in QuickBooks Online.
-2. Search for the report submitter’s email address.
-3. Review all associated records (vendor, employee, etc.).
-4. Identify any duplicate records using the same email.
-5. Remove or deactivate duplicate records as appropriate.
-6. Save your changes.
-
-Retry exporting the report after cleaning up duplicate records.
-
----
-
-## How to Disable Automatically Create Employees/Vendors in Expensify
-
-If you prefer to manage vendors manually:
-
-### On Web
-
-1. Go to the **Workspaces** navigation tab on the left.
-2. Select your Workspace.
-3. Click **Accounting**.
-4. Click **Advanced**.
-5. Turn off **Automatically create employees/vendors**.
-6. Click **Save**.
-
-### On Mobile
-
-1. Tap the **Workspaces** navigation tab on the bottom.
-2. Select your Workspace.
-3. Tap **Accounting**.
-4. Tap **Advanced**.
-5. Turn off **Automatically create employees/vendors**.
-6. Tap **Save**.
-
-After disabling automatic creation, retry exporting the report.
+2. Search for the **record name shown in the error**, not just the submitter's email. Check vendor/supplier, customer, and employee records.
+3. If the record is the correct vendor/supplier for the submitter, update its email to exactly match the submitter's email in Expensify and save your changes.
+4. If the record belongs to someone else or is a customer or employee, choose one of these fixes:
+   - Rename the conflicting record so Expensify can automatically create the vendor/supplier under the original name.
+   - Create a vendor/supplier with a different, unique name and the submitter's exact email address.
+5. In Expensify, select **Sync now** for the QuickBooks Online connection. Once the sync completes, retry exporting the report.
 
 ---
 
@@ -87,8 +43,12 @@ After disabling automatic creation, retry exporting the report.
 
 ## Does the Vendor Email Have to Match Exactly?
 
-Yes. The vendor email in QuickBooks Online must exactly match the submitter’s email address in Expensify for the export to work.
+Yes. The vendor/supplier email in QuickBooks Online must exactly match the submitter's email address in Expensify for Expensify to match the records.
+
+## Can a Customer or Employee Record Cause This Error?
+
+Yes. A customer or employee record can use the name Expensify is trying to give the vendor/supplier. Search by the name shown in the error, even if that record uses a different email.
 
-## Can Duplicate Vendor or Employee Records Cause This Error?
+## Can I Fix This by Disabling Automatic Vendor Creation?
 
-Yes. If multiple records share the same email address, QuickBooks Online may not correctly match the vendor during export, resulting in the ONL583 error.
+Disabling automatic creation does not resolve the name conflict or create a matching vendor/supplier. If you manage vendors manually, create a vendor/supplier with a unique name and the submitter's exact email, then select **Sync now** in Expensify and retry the export.
diff --git a/docs/articles/new-expensify/domains/Manage-Domain-Members.md b/docs/articles/new-expensify/domains/Manage-Domain-Members.md
index 80a299f5bf0b..b5cb0976cde8 100644
--- a/docs/articles/new-expensify/domains/Manage-Domain-Members.md
+++ b/docs/articles/new-expensify/domains/Manage-Domain-Members.md
@@ -102,6 +102,18 @@ Domain Admins can move a member from one domain group to another to change which
 6. Select the group you want to move the member to.
 7. Click **Save**.
 
+## How to assign a Vacation Delegate on behalf of a Domain Member
+
+Domain Admins can assign or unassign a vacation delegate on behalf of a domain member.
+
+1. Go to **Workspaces**, then select the **Domains** tab.
+2. Select your domain.
+3. Click **Domain Members**.
+4. Select the member.
+5. Click **Vacation delegate**.
+6. Select the member you want to assign as the delegate.
+7. Click **Confirm**.
+
 ---
 
 # FAQ
@@ -122,3 +134,7 @@ Yes. Domain Admins don’t need to use a domain email — they can manage the do
 
 No. To remove a Domain Member, you must deactivate (close) the account. However, you can always reinvite them later.
 
+## Can I add or remove a vacation delegate for a Domain Member?
+
+Yes. As a Domain Admin, you can add or remove a Vacation Delegate on behalf of a domain member. This is a great option if the member is already out of office, but forgot to set their own delegate.
+
diff --git a/docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md b/docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md
index afca646215a0..f6098d22ba53 100644
--- a/docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md
+++ b/docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md
@@ -202,6 +202,39 @@ You can also use keyboard shortcuts on web to jump directly to specific items:
 
 ---
 
+## How to start an action using Search
+
+You can start common actions from **Search** instead of using the **➕ Create** button.
+
+1. Select **Search** (the magnifying glass icon).
+2. Type the name of the action you want to start, such as **Create expense**, **Create report**, **Track distance**, **Start chat**, or **Book travel**. You can also type **go** or **go to** before the name, such as **go to book travel**.
+3. Select the action to start it.
+
+Only the actions available to you appear. **Book travel** appears only when Expensify Travel is enabled on your active workspace, and it opens the same booking tool as the **Book travel** option in the **➕ Create** button.
+
+Learn how to [enable Expensify Travel on a workspace](/articles/travel/company-setup/Enable-Travel-on-a-Workspace).
+## How to jump to a domain page using Search
+
+If you are a Domain Admin, **Search** also suggests the pages of each domain you administer, so you can open them without going through **Workspaces** > **Domains**.
+
+1. Select **Search** (the magnifying glass icon).
+2. Type the name of the page you want to open — **Domain members**, **Domain admins**, **Groups**, or **SAML** — or type the domain name, such as **example.com**.
+3. Select the suggestion to open that page for that domain.
+
+Each domain suggestion shows the domain name on the right of the row, so you can tell the suggestions apart when you administer more than one domain.
+
+These suggestions only appear for domains you administer. If you are not a Domain Admin of any domain, only **Go to Domains** appears.
+
+Learn more about [what Domain Admins can manage](/articles/new-expensify/domains/Domain-Admins).
+
+<!-- SCREENSHOT:
+Suggestion: Search with a domain page suggestion visible, showing the Go to Domain members row with the domain name displayed on the right
+Location: After the "How to jump to a domain page using Search" section
+Purpose: Shows Domain Admins that the domain name identifies which domain a suggestion belongs to, which prevents opening the wrong domain when they administer several
+-->
+
+---
+
 # FAQ
 
 ## Where are navigation tabs located in Expensify?
@@ -212,6 +245,14 @@ On web, navigation tabs appear on the left. On mobile, navigation tabs appear on
 
 Yes. Select **Search** (the magnifying glass icon), then type the name of a top-level destination: **Home**, **Inbox**, **Spend**, **Workspaces**, or **Account**. Select the **Go to [destination]** result to open it. You can also type **go** or **go to** before the name.
 
+## Can I book travel from Search?
+
+Yes. Select **Search** (the magnifying glass icon), type **Book travel**, then select the **Book travel** result. This opens the same booking tool as the **Book travel** option in the **➕ Create** button.
+
+## Why don’t I see Book travel in Search?
+
+**Book travel** appears only when Expensify Travel is enabled on your active workspace. If a different workspace has Expensify Travel enabled, make that workspace active and search again. If no workspace has it enabled, ask a Workspace Admin to [enable Expensify Travel on a workspace](/articles/travel/company-setup/Enable-Travel-on-a-Workspace).
+
 ## Where do I manage workspace settings?
 
 Open the **Workspaces** tab from the navigation tabs.
diff --git a/docs/articles/new-expensify/reports-and-expenses/Attach-and-edit-receipts-on-expenses.md b/docs/articles/new-expensify/reports-and-expenses/Attach-and-edit-receipts-on-expenses.md
index a9abfb89550d..3d85c24b3a9b 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Attach-and-edit-receipts-on-expenses.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Attach-and-edit-receipts-on-expenses.md
@@ -1,8 +1,8 @@
 ---
 title: Attach and edit receipts on expenses
 description: Learn how to properly attach, verify, and troubleshoot receipts on expenses in New Expensify for audits and accounting.
-keywords: [New Expensify, attach receipt, verify receipt, missing receipt, expense attachments, audit trail, receipt not showing, crop receipt, rotate receipt, trim receipt, receipt upload failed, receipt upload error, save receipt, delete expense, ereceipt, ereceipts, e-receipt, electronic receipt, digital receipt, auto-generated receipt, add additional receipt, who can add a receipt, add additional receipt icon missing, expand receipt, receipt on approved report, add receipt after approval, admin add receipt approved expense]
-internalScope: Audience is Expensify members and Workspace Admins. Covers attaching, replacing, and cropping receipts on expenses, who is allowed to add a receipt versus only view one, and the Workspace Admin exception that allows attaching or replacing a receipt on an Approved report. Does not cover SmartScan configuration or receipt forwarding via email.
+keywords: [New Expensify, attach receipt, verify receipt, missing receipt, expense attachments, audit trail, receipt not showing, crop receipt, rotate receipt, trim receipt, receipt upload failed, receipt upload error, save receipt, delete expense, ereceipt, ereceipts, e-receipt, electronic receipt, digital receipt, auto-generated receipt, add additional receipt, who can add a receipt, add additional receipt icon missing, expand receipt, receipt on approved report, add receipt after approval, admin add receipt approved expense, added a receipt, receipt system message, receipt history, who added a receipt]
+internalScope: Audience is Expensify members and Workspace Admins. Covers attaching, replacing, and cropping receipts on expenses, the system message posted when a receipt is added, who is allowed to add a receipt versus only view one, and the Workspace Admin exception that allows attaching or replacing a receipt on an Approved report. Does not cover SmartScan configuration or receipt forwarding via email.
 ---
 
 Make sure your receipts are attached correctly to individual expenses for audit and accounting compliance. This guide explains how to attach, verify, and troubleshoot receipts in New Expensify — and when to use report comments for additional documentation.
@@ -69,6 +69,14 @@ You can rotate a receipt to correct its orientation. Rotation is available for u
 
 ---
 
+## What system message appears when you add a receipt to an expense
+
+When you attach a receipt to an existing expense, or click **Replace** to swap in a different receipt, Expensify posts an "added a receipt" system message in the expense. The message shows who added the receipt, so the expense keeps an audit trail of receipt changes. Removing a receipt also posts a system message in the expense.
+
+Cropping or rotating a receipt doesn't post a system message. An expense created with a receipt, such as a SmartScan expense, doesn't get an "added a receipt" message either.
+
+---
+
 ## How to Add Additional Receipts to an Expense
 
 Each expense has one primary receipt, but you can attach additional receipt images directly on the expense for situations where multiple receipts are needed — for example, the front and back of a paper receipt, or both the credit card slip and the itemized breakdown.
@@ -147,6 +155,9 @@ Apart from a Workspace Admin attaching or replacing a receipt, Approved and Paid
 ## Why isn’t my receipt showing on the expense?
 It was likely uploaded in the report comments. Receipts must be attached directly to the expense to appear properly.
 
+## Can I see who added a receipt to an expense?
+Yes. When someone attaches or replaces a receipt on an existing expense, Expensify posts an "added a receipt" system message in the expense showing who made the change. Cropping or rotating a receipt doesn't post a message.
+
 ## Can I attach one receipt to multiple expenses?
 No. Each expense must have its own receipt. You can upload the same file more than once if needed.
 
diff --git a/docs/articles/new-expensify/reports-and-expenses/Distance-Expenses.md b/docs/articles/new-expensify/reports-and-expenses/Distance-Expenses.md
index e2618428e85c..ec6190b6f080 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Distance-Expenses.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Distance-Expenses.md
@@ -1,7 +1,7 @@
 ---
 title: Distance Expenses
 description: Learn how to create a Distance expense using GPS tracking, map-based routes, manual entry, or odometer readings, and how the reimbursement rate is determined in New Expensify.
-keywords: [New Expensify, distance expense, mileage, mileage reimbursement, create expense, distance rate, workspace rate, map route, reimbursement rate, manual mileage, manual distance, global create, track distance, GPS, GPS tracking, start GPS, track route, track mileage, mileage tracking, calculate mileage reimbursement, mileage rate, odometer, odometer reading, odometer image, odometer mileage, odometer distance, start reading, end reading, save for later, in-progress odometer, incomplete odometer, edit distance, edit waypoints, manual edit distance, edit stop, trim trip, edit GPS trip, shorten GPS route, GPS slider, total distance, stop GPS trip, stop without moving, resume GPS trip, discard GPS trip, zero distance trip, same start and stop location, no edit icon, can't create expense]
+keywords: [New Expensify, distance expense, mileage, mileage reimbursement, create expense, distance rate, workspace rate, map route, reimbursement rate, manual mileage, manual distance, global create, track distance, GPS, GPS tracking, start GPS, track route, track mileage, mileage tracking, calculate mileage reimbursement, mileage rate, odometer, odometer reading, odometer image, odometer mileage, odometer distance, start reading, end reading, save for later, in-progress odometer, incomplete odometer, edit distance, edit waypoints, manual edit distance, edit stop, trim trip, edit GPS trip, shorten GPS route, GPS slider, total distance, stop GPS trip, stop without moving, resume GPS trip, discard GPS trip, zero distance trip, same start and stop location, no edit icon, can't create expense, change distance rate, edit distance rate, move distance expense, move expense to another workspace, rate not valid for this workspace, distance rate violation]
 internalScope: Audience is all members. Covers creating Distance expenses using GPS tracking, map-based routes, manual entry, and odometer readings, plus how reimbursement rates are applied. Does not cover configuring Workspace distance rates in detail or broader report submission workflows.
 ---
 
@@ -161,15 +161,21 @@ Yes! You can edit the expense before it is approved. When editing a map-based Di
 
 ## Can I update the Distance expense unit or rate?
 
-The distance unit and rate can only be updated by a Workspace Admin on the Workspace. It is not possible to adjust the distance rate or unit at the expense level.
+The distance unit is set by a Workspace Admin on the Workspace and can’t be changed at the expense level.
+
+The rate can be changed on an individual expense. Open the Distance expense, select the **Rate** field, and choose another rate from the Workspace. The distance, amount, and currency are recalculated to match the rate you select.
 
 If a Workspace has rates with effective dates and you manually select a rate that doesn't match the expense date, the expense shows a violation indicating the rate doesn't match the selected date. This is informational and does not block submission — selecting the rate that matches the expense date clears the violation.
 
 ## What happens if a Distance expense is moved to a different Workspace?
 
-When a Distance expense is moved to another Workspace, it keeps its original unit and rate.
+What happens depends on whether you move individual expenses or a whole report.
+
+**If you move individual expenses to a report on another Workspace:** when the expense’s rate does not exist on the new Workspace, or is disabled there, the expense automatically switches to that Workspace’s default distance rate. The unit, distance, amount, and currency are recalculated to match.
+
+**If you move a whole report to another Workspace:** the expenses keep their original unit and rate. If a rate isn’t valid in the new Workspace, the expense shows a “Rate not valid for this workspace” violation.
 
-If the rate isn’t valid in the new Workspace, the expense will show a “Rate not valid for this workspace” violation. Selecting a valid rate will update the expense.
+Selecting a valid rate on the expense clears the violation and updates the expense. Open the expense and select the **Rate** field to choose a rate from the new Workspace.
 
 ## Do I need to keep the mobile app open during GPS tracking?
 
diff --git a/docs/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report.md b/docs/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report.md
index d6c8a438c80f..8f136fb9d16f 100644
--- a/docs/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report.md
+++ b/docs/articles/new-expensify/reports-and-expenses/Managing-Expenses-in-a-Report.md
@@ -45,8 +45,8 @@ You can move expenses to a different report, create a new report, or remove them
 **To move or remove a single expense from a report:**
 
 1. Open the draft report. 
-2. Click the checkbox next to the expense you want to move. 
-3. Click the green **1 selected** button > **Move to report**.
+2. Select **More**.
+3. Select **Move to report**.
 4. Choose a destination report, select **Create report** to create a new report, or select **Remove from report** to move the expense to your personal space.
 
 **To move or remove all expenses from a report**
diff --git a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
index dcc4212e3991..eef91bd6fa0e 100644
--- a/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
+++ b/docs/articles/new-expensify/settings/Delegate-when-out-of-office.md
@@ -37,7 +37,7 @@ When you're ready to take back control of your reports:
 
 ## Can my admin assign a vacation delegate for me?
 
-No. Only you can assign your own vacation delegate.
+Yes. In New Expensify, domain admins can [assign a vacation delegate on your behalf](/articles/new-expensify/domains/Manage-Domain-Members#how-to-assign-a-vacation-delegate-on-behalf-of-a-domain-member) under Domain member settings.
 
 ## Why can't my vacation delegate reimburse reports?
 
diff --git a/docs/articles/new-expensify/settings/Merge-Accounts.md b/docs/articles/new-expensify/settings/Merge-Accounts.md
index fe796b5e44d1..892dd87b9042 100644
--- a/docs/articles/new-expensify/settings/Merge-Accounts.md
+++ b/docs/articles/new-expensify/settings/Merge-Accounts.md
@@ -14,8 +14,8 @@ If you have multiple Expensify accounts, you can merge them into a single login.
 - **Merging accounts is permanent and cannot be undone.**
 - You must log in to the **company account** and merge the **personal account** into it.
 - You **cannot merge**:
-  - A company account into a personal account.
-  - Two company accounts on private domains.
+  - A company account into a personal account while logged in from the personal account.
+  - Two company accounts on private domains if both private domains are [verified on Expensify](https://help.expensify.com/articles/new-expensify/domains/Claim-and-Verify-a-Domain). If only one of the private domains is verified, then you can sign into the Expensify account with the verified private domain, then merge the other Expensify account without the verified private domain.
 
 **Note:** If your company uses **SAML authentication**, a domain admin must approve the request. In that case, you’ll be prompted to **Switch to Classic** to initiate this.
 
diff --git a/docs/articles/new-expensify/wallet-and-payments/Connect-a-Business-Bank-Account.md b/docs/articles/new-expensify/wallet-and-payments/Connect-a-Business-Bank-Account.md
index 2ac72a6b6718..69b0e05bd42f 100644
--- a/docs/articles/new-expensify/wallet-and-payments/Connect-a-Business-Bank-Account.md
+++ b/docs/articles/new-expensify/wallet-and-payments/Connect-a-Business-Bank-Account.md
@@ -97,10 +97,10 @@ Provide the following company information:
 ## How to add Beneficial Owner details
 
 1. Check the appropriate box under **Beneficial Owner**. A Beneficial Owner is an individual who owns 25% or more of the business. If no individual owns 25% or more, leave both boxes unchecked.
-2. For each Beneficial Owner, enter their legal name, date of birth, Social Security Number, and address.
+2. For each Beneficial Owner, enter their legal name, date of birth, the last four digits of their Social Security Number, and address.
 3. Accept the agreement terms and verify that all details are true and accurate.
 
-Expensify asks for each Beneficial Owner's complete Social Security Number in the **Full 9 digits of SSN** field. The last four digits are not enough. This differs from your own personal details, where Expensify asks only for the last four digits. Expensify does not run a personal credit check.
+Expensify asks only for the last four digits of each Beneficial Owner's Social Security Number, in the **Last 4 of SSN** field. This matches your own personal details. Expensify does not run a personal credit check.
 
 ---
 
@@ -118,12 +118,19 @@ After you submit your details:
 
 Once connected, your business bank account appears in **Account > Wallet**. If you have both personal and business bank accounts, Wallet separates them into **Personal bank accounts** and **Business bank accounts** sections.
 
-Every bank account shows a status badge. A finished account shows **Active**, while an account you never finished setting up shows **Incomplete** along with the message **Finish adding bank account**. Click **Finish** to resume setup from where you left off. [Learn what each bank account connection status means](/articles/new-expensify/wallet-and-payments/Check-Bank-Account-and-Card-Connection-Status).
+Every bank account shows a status badge. A finished account shows **Active**. An account that still needs your attention shows a badge that tells you what is left to do:
+
+- **Incomplete** with a **Finish adding bank account** message and a **Finish** action means setup was not submitted. Click **Finish** to resume setup from where you left off.
+- **Pending** with a **Please confirm test transactions** message and a **Confirm** action means the account was submitted and is waiting on test transactions. Click the account row to open **Validate your bank account**. If **Continue setup** and **Start over** appear first, click **Continue setup** to reach it. Learn how to [validate a business bank account](/articles/new-expensify/wallet-and-payments/Validate-a-Business-Bank-Account).
+- **Verifying** means Expensify is reviewing your documentation and no action is needed from you.
+- **Locked** means the account requires attention before it can be used. Learn how to [unlock a business bank account](/articles/new-expensify/wallet-and-payments/Unlock-a-Business-Bank-Account).
+
+[Learn what each bank account connection status means](/articles/new-expensify/wallet-and-payments/Check-Bank-Account-and-Card-Connection-Status).
 
 <!-- SCREENSHOT:
-Suggestion: Wallet page showing separate Personal and Business bank account sections, with an Incomplete badge and the Finish adding bank account message on a partially set-up account
-Location: After the paragraph
-Purpose: Shows the new Wallet layout with separated sections and status badges
+Suggestion: Wallet page showing separate Personal and Business bank account sections, with an Incomplete badge on one account and a Pending badge on another
+Location: After the badge list
+Purpose: Distinguishes the Incomplete and Pending badges, which lead to different screens and are easy to confuse when deciding whether setup still needs to be finished
 -->
 
 ---
diff --git a/docs/articles/new-expensify/wallet-and-payments/Share-a-Business-Bank-Account.md b/docs/articles/new-expensify/wallet-and-payments/Share-a-Business-Bank-Account.md
index af181f0d030c..da9a625c9ccd 100644
--- a/docs/articles/new-expensify/wallet-and-payments/Share-a-Business-Bank-Account.md
+++ b/docs/articles/new-expensify/wallet-and-payments/Share-a-Business-Bank-Account.md
@@ -48,8 +48,8 @@ The receiving admin must validate their copy (required for US accounts) before u
 - The account appears in their **Wallet**.
 
 **For US accounts:**
-- The account shows a **Pending** badge with the message **Please confirm test transactions**
-- The admin must validate the account with the test transactions before using it.
+- The account shows a **Pending** badge with a **Please confirm test transactions** message and a **Confirm** action.
+- The admin must validate the account with the test transactions before using it. Opening the account from **Wallet** shows **Validate your bank account**, or **Continue setup** and **Start over** first — in which case they click **Continue setup** to reach the validation screen.
 - After validation, the account is ready to use
  
 **For non-US accounts:**
diff --git a/docs/articles/new-expensify/wallet-and-payments/Validate-a-Business-Bank-Account.md b/docs/articles/new-expensify/wallet-and-payments/Validate-a-Business-Bank-Account.md
index 23872df6901a..deef68b7ce81 100644
--- a/docs/articles/new-expensify/wallet-and-payments/Validate-a-Business-Bank-Account.md
+++ b/docs/articles/new-expensify/wallet-and-payments/Validate-a-Business-Bank-Account.md
@@ -1,8 +1,8 @@
 ---
 title: Validate a Business Bank Account
 description: Enter test transaction amounts to complete validation of a business bank account in Expensify.
-keywords: [New Expensify, validate bank account, test deposits, ACH validation, business bank verification, confirm test transactions, micro-transactions, pending bank account, validation failed, test deposits wrong, Fix button missing, Unlock button missing, bank account pending, verification expired, wrong amounts, validation locked]
-internalScope: Audience is all members with a pending business bank account. Covers entering test transactions to validate a bank account. Does not cover initial bank account setup, sharing, unsharing, or unlocking.
+keywords: [New Expensify, validate bank account, test deposits, ACH validation, business bank verification, confirm test transactions, micro-transactions, pending bank account, Pending badge, validation failed, test deposits wrong, Fix button missing, Unlock button missing, bank account pending, verification expired, wrong amounts, validation locked, validate from Workflows, Please confirm test transactions, Continue setup, Start over]
+internalScope: Audience is all members with a pending business bank account. Covers entering test transactions to validate a bank account from Wallet and from a workspace's Workflows page. Does not cover initial bank account setup, sharing, unsharing, or unlocking.
 ---
 
 # Validate a Business Bank Account
@@ -15,7 +15,9 @@ The three transactions (two small withdrawals and one small deposit) typically a
 
 ## Who can validate a business bank account
 
-Any member who has a **Pending** business bank account in **Wallet** can validate it using the test transactions. 
+Any member who has a **Pending** business bank account in **Wallet** can validate it using the test transactions.
+
+To validate a workspace's bank account from **Workflows**, you must be a Workspace Admin or a Payments Admin on that workspace. Members without those permissions should use **Account > Wallet** instead.
 
 ---
 
@@ -33,19 +35,53 @@ When you see the three test amounts post to your bank account:
 
 1. In the navigation tabs (on the left on web, on the bottom on mobile) go to **Account > Wallet**.
 2. In the **Bank accounts** section, find the business bank account with the **Pending** badge and the message **Please confirm test transactions**, then click **Confirm**.
-3. In the **Validate your bank account** section that appears, enter each transaction amount. 
-4. Click **Validate**.
+3. If **Continue setup** and **Start over** appear instead of the validation screen, click **Continue setup**. Don't click **Start over**, which clears the setup already completed for the account.
+4. On the **Validate your bank account** screen, enter each amount in **Transaction 1**, **Transaction 2**, and **Transaction 3**.
+5. Click **Validate**.
 
 Once the values are confirmed, your business bank account is fully connected and ready to use.
 
 ---
 
-![Account > Wallet > bank account with a callout on the Pending badge]({{site.url}}/assets/images/ExpensifyHelp-BetterBusinessBankAccount_02.png){:width="100%"}
+![Account > Wallet > bank account with a Pending badge and a callout on the Confirm action]({{site.url}}/assets/images/wallet-test-transactions.png){:width="100%"}
 
 ![Account > Wallet > bank account with a Pending badge > expose validation pane]({{site.url}}/assets/images/ExpensifyHelp-BetterBusinessBankAccount_03.png){:width="100%"}
 
 ---
 
+## How to validate a workspace business bank account from Workflows
+
+If the pending bank account is connected to a workspace, you can validate it from the workspace instead of from **Wallet**. Opening a pending US bank account here goes straight to **Validate your bank account** — the **Continue setup** and **Start over** options are not shown, because the account has already been submitted.
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile), click **Workspaces > [Workspace name]**.
+2. Select **Workflows**.
+3. In the **Payments** section, click the bank account with the **Pending** badge.
+4. On the **Validate your bank account** screen, enter each amount in **Transaction 1**, **Transaction 2**, and **Transaction 3**.
+5. Click **Validate**.
+
+This step requires an internet connection. While you are offline, the **Payments** section in **Workflows** is disabled, so use **Account > Wallet** instead.
+
+<!-- SCREENSHOT:
+Suggestion: Workflows page with the Payments section expanded, showing a business bank account row with the Pending badge
+Location: After step 3
+Purpose: Confirms members are clicking the correct row in Workflows, since a pending account opens validation directly rather than the setup screen they may expect
+-->
+
+---
+
+## What happens when you open a pending US business bank account
+
+A pending US business bank account has already been submitted, so there is no setup left to finish. Which screen opens depends on how you get there:
+
+- **Workflows**, or **Account > Wallet** when you are a Workspace Admin or Payments Admin on the workspace the account belongs to: Expensify takes you straight to **Validate your bank account**, and **Continue setup** and **Start over** are not shown.
+- **Account > Wallet** in every other case, including a business bank account that is not connected to a workspace: **Continue setup** and **Start over** are shown first. Click **Continue setup** to reach the same **Validate your bank account** screen. **Start over** discards the completed setup and restarts it from the beginning, so avoid it unless you intend to redo the whole account.
+
+Either route ends on the same validation screen, and neither asks you to re-enter company or ownership details.
+
+This applies only to US bank accounts, because they are the accounts that receive test transactions. A non-US business bank account that is still being set up shows an **Incomplete** badge with a **Finish** action, and opening it resumes setup where you left off. [Learn how to connect an international business bank account](/articles/new-expensify/wallet-and-payments/Enable-Global-Reimbursement).
+
+---
+
 ## What to do if test transactions don't arrive
 
 If the test deposits don't appear after two business days:
@@ -99,15 +135,15 @@ If you have confirmed all of the above and validation still fails, contact Conci
 
 A locked bank account shows a **Locked** badge with the message **This account requires attention** and an **Unlock** button. If you do not see that button:
 
-1. Check **Settings > Wallet** in the **Bank accounts** section and click the locked bank account.
-2. If no option appears there, check **Workspaces > [Workspace Name] > Workflows** in the **Payments** section.
+1. Check **Account > Wallet** in the **Bank accounts** section and click the locked bank account.
+2. If no option appears there, check **Workspaces > [Workspace name] > Workflows** in the **Payments** section.
 3. Also look for a time-sensitive alert on the **Home** screen, which may include a **Fix** button.
 
 If you still cannot find the option, refer to [Unlock a Business Bank Account](https://help.expensify.com/articles/new-expensify/wallet-and-payments/Unlock-a-Business-Bank-Account) for detailed steps, or contact Concierge.
 
 ## Validation is temporarily locked after failed attempts
 
-If you enter incorrect amounts multiple times, validation is temporarily locked to protect your account. The lock typically lasts a few hours. After the lock period ends, you can try again by going to **Settings > Wallet** and clicking the bank account.
+If you enter incorrect amounts multiple times, validation is temporarily locked to protect your account. The lock typically lasts a few hours. After the lock period ends, you can try again by going to **Account > Wallet** and clicking the bank account.
 
 If you are still unable to validate after the lock period has passed, contact Concierge.
 
diff --git a/docs/articles/new-expensify/workspaces/Add-Approvals.md b/docs/articles/new-expensify/workspaces/Add-Approvals.md
index 24817d75d09c..5f9dbd621ad7 100644
--- a/docs/articles/new-expensify/workspaces/Add-Approvals.md
+++ b/docs/articles/new-expensify/workspaces/Add-Approvals.md
@@ -1,6 +1,8 @@
 ---
 title: Add Approvals
 description: Require report approvals in your Expensify workspace, including setting approval thresholds and over-limit approvers.
+keywords: [New Expensify, approvals, report approvals, approving reports, approval workflow, workspace workflows, approver, final approver, approval chain, approval threshold, approval limit, over-limit approval, report amount limit, dollar limit approver, reassign approver, automatic approver reassignment, change approver workflow, automatic approval, approval audit, category approver, tag approver, category rules, tag rules, invite member to approval workflow, invite new user approval workflow, import workflows, import approval workflows, bulk approval workflows, spreadsheet import, multiple approval paths, multiple approvers, shared approver, audit team approver, forward to different approver, approval path per submitter, edit approvals in Expensify Classic]
+internalScope: Audience is Workspace Admins and People Admins, covers enabling approvals and building default, custom, and multi-path approval workflows in New Expensify, does not cover Category and Tag approver setup or connecting a bank account.
 keywords: [New Expensify, approvals, report approvals, approving reports, approval workflow, workspace workflows, approver, final approver, approval chain, approval threshold, approval limit, over-limit approval, report amount limit, dollar limit approver, remove limit, remove approval limit, reassign approver, automatic approver reassignment, change approver workflow, approval workflow change message, admins room system message, automatic approval, approval audit, category approver, tag approver, category rules, tag rules, invite member to approval workflow, invite new user approval workflow, import workflows, import approval workflows, bulk approval workflows, spreadsheet import]
 ---
 
@@ -64,6 +66,33 @@ Once the limit is set, the approver's row shows a hint such as `Reports above $1
 
 **Note:** Custom workflows are only available on the Control plan. To enable custom workflows, upgrade to the Control plan in Settings > Billing & Subscriptions.
 
+## Send one approver's reports to different next approvers
+
+An approver can forward to a different next approver depending on who submitted the report. This lets a shared reviewer — an audit team or an office manager, for example — sit in the middle of several approval paths without sending every report they approve down the same route.
+
+For example, you can set up both of these approval paths on the same workspace:
+
+- Employee A → Audit team → Manager A
+- Employee C → Audit team → Manager C
+
+The Audit team approves both reports, but each report continues to a different next approver.
+
+To set this up, create a separate approval workflow for each submitter and give each one its own next approver after the shared approver:
+
+1. In the navigation tabs (on the left on web, on the bottom on mobile), select **Workspaces > [Workspace Name] > Workflows**.
+2. On the **Approvals** tab, click **Add approval workflow**.
+3. On the **Expenses from** page, choose the member whose expenses should follow this path.
+4. Click **Next**.
+5. Select the shared approver as the first approver.
+6. Click **Next**.
+7. Use **Additional approver** to add the next approver for this submitter.
+8. Click **Add workflow** to save.
+9. Repeat these steps for each submitter who routes through the same shared approver to a different next approver.
+
+Editing one of these workflows changes only that workflow. The other workflows that use the same approver keep their own next approvers.
+
+**Note:** Multiple approval paths through the same approver require the Control plan, and they can only be created and edited in New Expensify.
+
 ---
 
 ## How to import approval workflows from a spreadsheet
@@ -163,22 +192,26 @@ No. Each employee can only be assigned one approval workflow per workspace.
 
 ## Why did adding an approver to one workflow change other members' workflows?
 
-Approval routing is built from per-approver relationships, not separate paths for each submitter. When you place someone *after* an approver in a workflow, you're defining who that approver forwards their approvals to — and that applies to **every** report they approve, not just one submitter's.
-
-For example, if Joe is the first approver for several members and you set up a workflow of **John → Joe → Jane**, you're telling Expensify that "Joe forwards to Jane." Because Joe also approves for other members, their reports will now route to Jane after Joe approves them too.
+Each approval workflow keeps its own approvers, so adding or changing an approver in one workflow doesn't change another workflow that uses the same approver. A shared approver can forward to a different next approver in each workflow they belong to.
 
-This is why you may see the following warning when editing a workflow:
+You'll see the message below only on workspaces whose approvals are still routed by per-approver relationships rather than by separate paths for each submitter:
 
 > This member already belongs to another approval workflow. Any updates here will reflect there too.
 
-Deleting and recreating the workflow won't change this, because the limitation is tied to the shared approver's forwarding rather than to any one submitter's workflow.
+On those workspaces, placing someone *after* an approver defines who that approver forwards to for **every** report they approve. For example, if Joe is the first approver for several members and you set up **John → Joe → Jane**, other members' reports also route to Jane after Joe approves them. Deleting and recreating the workflow won't change that, because the behavior is tied to the shared approver's forwarding rather than to any one submitter's workflow.
 
-To keep a second-level approver limited to a single submitter, that submitter's first approver must be unique to their chain — that is, not shared as an approver for any other member. If your goal is instead to add an extra review step only when a report exceeds a certain amount, use the workflow-specific over-limit **Additional approver** (set in the **Report amount** field), which applies only to that workflow.
+If your goal is to add an extra review step only when a report exceeds a certain amount, use the workflow-specific over-limit **Additional approver** (set in the **Report amount** field), which applies only to that workflow.
 
 ## How can I assign custom approval workflows to specific members?
 
 You’ll need to be on the Control plan, as this feature isn’t available on Collect.
 
+## Why can't I see or edit approval settings in Expensify Classic?
+
+Expensify Classic can't represent a workspace where one approver forwards to different next approvers. On those workspaces, Classic hides the approval fields on the **Members** page and in the member settings, and shows a banner linking you to New Expensify. Make your approval changes in New Expensify instead.
+
+If you later remove the extra paths so that every approver forwards to a single next approver, the banner disappears and the approval fields return in Classic.
+
 ## What happens to pending reports when I change an approver?
 
 Outstanding reports are automatically reassigned to the new approver, with no prompt or confirmation required. A system message appears in each report indicating the approver was reassigned. This applies to reports that are already in the approval process, not just new reports, and it happens in these situations:
diff --git a/docs/articles/new-expensify/workspaces/Create-and-manage-expense-tags.md b/docs/articles/new-expensify/workspaces/Create-and-manage-expense-tags.md
index 28d68aefbb8d..a31e25113360 100644
--- a/docs/articles/new-expensify/workspaces/Create-and-manage-expense-tags.md
+++ b/docs/articles/new-expensify/workspaces/Create-and-manage-expense-tags.md
@@ -1,7 +1,7 @@
 ---
 title: Create and Manage Expense Tags
 description: Add tags to use for coding expenses.
-keywords: [New Expensify, expense tags, class tracking, cost center, import tags, coding expenses, tag GL code, tag approver, tag rules, tag approval]
+keywords: [New Expensify, expense tags, class tracking, cost center, import tags, coding expenses, tag GL code, multi-level tag GL code, dependent tag GL code, tag approver, tag rules, tag approval]
 internalScope: Audience is Workspace Admins. Covers enabling, creating, importing, activating, and managing expense tags, including multi-level tags, tag GL codes, and tag approvers (Tag Rules) and how Tag/Category/workspace approvers combine in the approval chain. Does not cover personal expense rules or accounting system configuration.
 ---
 
@@ -105,7 +105,7 @@ Example: If you use single-level Tags for Department, members will see one field
 
 **Note:**
 - With single-level Tags, you can edit or delete individual tags directly in the workspace.
-- With multi-level Tags, you must update and re-import your spreadsheet to make changes.
+- With multi-level Tags, you must update and re-import your spreadsheet to make changes. The exception is tag GL codes, which you can edit directly in the workspace.
 
 ---
 
@@ -157,12 +157,15 @@ When importing multi-level Tags, enable **These are independent tags** to import
 
 ## How to add or edit a tag GL code
 
-Workspaces on the Control plan can assign a GL code to each tag for exporting purposes. By default, tag GL codes are not visible to members, but you can choose to show them in the tag picker.
+Workspaces on the Control plan can assign a GL code to each tag for exporting purposes. This includes single-level tags and every level of dependent or independent multi-level tags. By default, tag GL codes are not visible to members, but you can choose to show them in the tag picker.
 
 1. In the **navigation tabs** (on the left on web, and at the bottom on mobile), select **Workspaces** > **[workspace name]**.
 2. Select **Tags**.
-3. Select a tag to open its detail panel.
-4. Select the **GL Code** field, enter or update the code, then select **Save**.
+3. If you use multi-level tags, select the tag list for the level you want to update (for example: **State**, **Region**, or **City**).
+4. Select a tag to open its detail panel.
+5. Select **GL code**, enter or update the code, then select **Save**.
+
+For dependent multi-level tags, each GL code is saved to the tag you selected under its parent tags. If the same tag name appears under different parents (for example: **Springfield** under both **Illinois** and **Missouri**), each one keeps its own GL code.
 
 ---
 
@@ -248,6 +251,10 @@ Multi-level tags are available on Control workspaces only. If your Control works
 
 By default, no. Tag GL codes are visible only to Workspace Admins. However, a Workspace Admin can turn on **Show GL codes when selecting a tag** in **Tags** > **More** > **Settings** to display each tag's GL code in the tag picker for members. If that setting is off, you can still include the GL code in the tag name (for example: `1001 - Marketing`).
 
+## Can I add GL codes to dependent multi-level tags?
+
+Yes. Dependent multi-level tags support a GL code at each level, the same as independent multi-level tags. You can include GL codes in the adjacent columns when you import your spreadsheet, or edit a tag's **GL code** directly in the workspace.
+
 ## Why isn't a GL code displayed for a tag?
 
 If **Show GL codes when selecting a tag** is on but a tag has no GL code next to it, that tag doesn't have a GL code available in your accounting system. Add the GL code in your accounting system and sync the connection so it appears in Expensify.
diff --git a/docs/articles/new-expensify/workspaces/Set-distance-rates.md b/docs/articles/new-expensify/workspaces/Set-distance-rates.md
index e5a273b9d9ac..bcead478f396 100644
--- a/docs/articles/new-expensify/workspaces/Set-distance-rates.md
+++ b/docs/articles/new-expensify/workspaces/Set-distance-rates.md
@@ -15,7 +15,7 @@ Distance rates determine how much members are reimbursed for distance-based trav
 
 Workspace admins can configure distance rates for a workspace.
 
-Automatic updates are available for Control workspaces with a default currency of USD, CAD, GBP, or AUD.
+Automatic updates are available for Control workspaces with a default currency of USD, CAD, GBP, AUD, NOK, SEK, or ZAR.
 
 ---
 
@@ -94,7 +94,7 @@ Expensify can automatically update distance rates in your workspace when the sta
 
 When **Auto-update government rates** is enabled, Expensify adds a new effective-dated distance rate when a supported government publishes a new rate. This means admins don't need to manually update the standard rate each time it changes.
 
-Expensify uses the workspace default currency to determine which government publishes the rate: USD for the United States, CAD for Canada, GBP for Great Britain, and AUD for Australia.
+Expensify uses the workspace default currency to determine which government publishes the rate: USD for the United States, CAD for Canada, GBP for Great Britain, AUD for Australia, NOK for Norway, SEK for Sweden, and ZAR for South Africa.
 
 To enable automatic updates:
 
@@ -134,7 +134,7 @@ Changes Expensify makes on its own, such as converting a rate between **Miles**
 Expensify determines the publishing government from the workspace default currency, so changing the default currency changes which government rate applies. When **Auto-update government rates** is enabled and you change the default currency to another supported currency:
 
 - Expensify adds a new government rate for the new currency's country, with the lightning bolt icon.
-- Expensify sets the workspace **Unit** to the unit that country publishes in: **Miles** for the United States and Great Britain, and **Kilometers** for Canada and Australia.
+- Expensify sets the workspace **Unit** to the unit that country publishes in: **Miles** for the United States and Great Britain, and **Kilometers** for Canada, Australia, Norway, Sweden, and South Africa.
 - Government rates created before the change remain in the workspace, converted to the new **Unit** so every rate is shown in the same unit.
 - Those earlier rates keep the lightning bolt icon, because converting a rate to a different unit is not a manual edit. Rates that an admin edited stay without the icon.
 
@@ -184,7 +184,7 @@ Yes. When **Distance rates** is enabled, the workspace must always have at least
 
 ## Why isn't Auto-update government rates turned on for my workspace?
 
-**Auto-update government rates** is turned on by default only for new workspaces. Existing workspaces are opted out by default, so you'll need to turn it on manually. It's also only available for workspaces with a default currency of USD, CAD, GBP, or AUD.
+**Auto-update government rates** is turned on by default only for new workspaces. Existing workspaces are opted out by default, so you'll need to turn it on manually. It's also only available for workspaces with a default currency of USD, CAD, GBP, AUD, NOK, SEK, or ZAR.
 
 ## Why did the lightning bolt icon disappear from one of my distance rates?
 
diff --git a/docs/articles/new-expensify/workspaces/Workspace-Workflows.md b/docs/articles/new-expensify/workspaces/Workspace-Workflows.md
index 4604bdf270d3..0d19705b4a6f 100644
--- a/docs/articles/new-expensify/workspaces/Workspace-Workflows.md
+++ b/docs/articles/new-expensify/workspaces/Workspace-Workflows.md
@@ -1,5 +1,8 @@
 ---
 title: Workspace Workflows
+description: Configure your workspace approval and submission workflows to match your team's needs.
+keywords: [New Expensify, workflows, workflows tabs, submissions, approvals, payments, advanced, approval workflows, delay submission, add approver, connect bank, workspace settings, submission frequency, authorized payer, mark as paid, payer, prevent self-approvals, auto-approve compliant reports, auto-pay approved reports, multiple approval paths, shared approver, forward to different approver]
+internalScope: Audience is Workspace Admins. Covers configuring approval, submission, reimbursement, and advanced report workflows including choosing an authorized payer; does not cover connecting a bank account.
 description: Configure your workspace submission, approval, and payment workflows to match your team's needs.
 keywords: [New Expensify, workflows, approval workflows, delay submission, add approver, connect bank, workspace settings, submission frequency, authorized payer, mark as paid, payer, who can pay a report]
 internalScope: Audience is workspace admins, people admins and payment admins. Covers configuring approval, submission, and reimbursement workflows including choosing an authorized payer; does not cover connecting a bank account.
@@ -45,11 +48,14 @@ Once enabled, admins with the appropriate permissions can configure workflow set
 Approvals control who reviews expenses before payment.
 
 - You can assign an approver per workspace member.
+- An approver can forward to a different next approver depending on who submitted the report, so a shared reviewer such as an audit team can sit in more than one approval path.
 - You can also set an over-limit approver for reports that exceed a specific amount. 
-- The default approver is the workspace owner, but any workspace member can be selected.
-- Both workspace admins and people admins can enable and configure Approvals.
+- The default approver is the **Workspace Owner**, but any workspace member can be selected.
+- Both **Workspace Admins** and **People Admins** can enable and configure Approvals.
 
-Learn how to [configure Approvals](/articles/new-expensify/workspaces/Add-Approvals). 
+Learn how to [enable Approvals](https://help.expensify.com/articles/new-expensify/workspaces/Add-Approvals) and [configure Approvals](/articles/new-expensify/workspaces/Add-Approvals) on your workspace. 
+
+Workspaces that route one approver to different next approvers can only be configured in New Expensify. [Learn how to send one approver's reports to different next approvers](/articles/new-expensify/workspaces/Add-Approvals#send-one-approvers-reports-to-different-next-approvers).
 
 ## How Submissions work
 
diff --git a/docs/articles/travel/booking-travel/Arrange-Travel-for-Another-User.md b/docs/articles/travel/booking-travel/Arrange-Travel-for-Another-User.md
index d8ea2244fe57..8ce3b9aac574 100644
--- a/docs/articles/travel/booking-travel/Arrange-Travel-for-Another-User.md
+++ b/docs/articles/travel/booking-travel/Arrange-Travel-for-Another-User.md
@@ -13,6 +13,8 @@ After you're assigned the Travel Arranger role, you can arrange travel for anoth
 
 Tap the **➕ Create** button at the bottom of your screen, then choose **Book travel**.
 
+You can also select **Search** (the magnifying glass icon), type **Book travel**, then select the **Book travel** result. **Book travel** appears in both places only when Expensify Travel is enabled on your active workspace.
+
 If you don’t see **Book travel**, ask a Workspace Admin to [enable Expensify Travel](https://help.expensify.com/articles/travel/company-setup/Enable-Travel-on-a-Workspace) on the workspace. 
 
 ---
diff --git a/docs/articles/travel/booking-travel/Book-Rail-Travel.md b/docs/articles/travel/booking-travel/Book-Rail-Travel.md
index 711d54c0b471..d3c46cf16ca7 100644
--- a/docs/articles/travel/booking-travel/Book-Rail-Travel.md
+++ b/docs/articles/travel/booking-travel/Book-Rail-Travel.md
@@ -12,6 +12,8 @@ Book train tickets directly in Expensify Travel. This guide covers how to search
 
 Tap the **➕ Create** button at the bottom of your screen, then choose **Book travel**.
 
+You can also select **Search** (the magnifying glass icon), type **Book travel**, then select the **Book travel** result. **Book travel** appears in both places only when Expensify Travel is enabled on your active workspace.
+
 If you don’t see **Book travel**, ask a Workspace Admin to [enable Expensify Travel](https://help.expensify.com/articles/travel/company-setup/Enable-Travel-on-a-Workspace) on the workspace. 
 
 # How to book rail travel
diff --git a/docs/articles/travel/booking-travel/Book-Travel-for-a-Guest.md b/docs/articles/travel/booking-travel/Book-Travel-for-a-Guest.md
index 858cc8fd6c27..a0b3d74caf3b 100644
--- a/docs/articles/travel/booking-travel/Book-Travel-for-a-Guest.md
+++ b/docs/articles/travel/booking-travel/Book-Travel-for-a-Guest.md
@@ -13,6 +13,8 @@ Any member with guest booking permission can book travel for someone who doesn
 
 Tap the **➕ Create** button at the bottom of your screen, then choose **Book travel**.
 
+You can also select **Search** (the magnifying glass icon), type **Book travel**, then select the **Book travel** result. **Book travel** appears in both places only when Expensify Travel is enabled on your active workspace.
+
 If you don’t see **Book travel**, ask a Workspace Admin to [enable Expensify Travel](https://help.expensify.com/articles/travel/company-setup/Enable-Travel-on-a-Workspace) on the workspace. 
 
 ---
diff --git a/docs/articles/travel/booking-travel/Book-a-Flight.md b/docs/articles/travel/booking-travel/Book-a-Flight.md
index b8a965991c2c..027d856aa046 100644
--- a/docs/articles/travel/booking-travel/Book-a-Flight.md
+++ b/docs/articles/travel/booking-travel/Book-a-Flight.md
@@ -13,6 +13,8 @@ Book flights easily with Expensify Travel. This guide walks you through finding
 
 Tap the **➕ Create** button at the bottom of your screen, then choose **Book travel**.
 
+You can also select **Search** (the magnifying glass icon), type **Book travel**, then select the **Book travel** result. **Book travel** appears in both places only when Expensify Travel is enabled on your active workspace.
+
 If you don’t see **Book travel**, ask a Workspace Admin to [enable Expensify Travel](https://help.expensify.com/articles/travel/company-setup/Enable-Travel-on-a-Workspace) on the workspace. 
 
 # How to book a flight
diff --git a/docs/articles/travel/booking-travel/Book-a-Hotel.md b/docs/articles/travel/booking-travel/Book-a-Hotel.md
index b3957baa9faa..b6666e1e1884 100644
--- a/docs/articles/travel/booking-travel/Book-a-Hotel.md
+++ b/docs/articles/travel/booking-travel/Book-a-Hotel.md
@@ -12,6 +12,8 @@ Book hotels easily with Expensify Travel. This guide covers how to search for ho
 
 Tap the **➕ Create** button at the bottom of your screen, then choose **Book travel**.
 
+You can also select **Search** (the magnifying glass icon), type **Book travel**, then select the **Book travel** result. **Book travel** appears in both places only when Expensify Travel is enabled on your active workspace.
+
 If you don’t see **Book travel**, ask a Workspace Admin to [enable Expensify Travel](https://help.expensify.com/articles/travel/company-setup/Enable-Travel-on-a-Workspace) on the workspace. 
 
 # How to book a hotel
diff --git a/docs/articles/travel/booking-travel/Book-a-Rental-Car.md b/docs/articles/travel/booking-travel/Book-a-Rental-Car.md
index 944ac6bba680..f84241f502a8 100644
--- a/docs/articles/travel/booking-travel/Book-a-Rental-Car.md
+++ b/docs/articles/travel/booking-travel/Book-a-Rental-Car.md
@@ -12,6 +12,8 @@ Book rental cars quickly and easily through Expensify’s integrated travel port
 
 Tap the **➕ Create** button at the bottom of your screen, then choose **Book travel**.
 
+You can also select **Search** (the magnifying glass icon), type **Book travel**, then select the **Book travel** result. **Book travel** appears in both places only when Expensify Travel is enabled on your active workspace.
+
 If you don’t see **Book travel**, ask a Workspace Admin to [enable Expensify Travel](https://help.expensify.com/articles/travel/company-setup/Enable-Travel-on-a-Workspace) on the workspace. 
 
 # How to book a rental car
diff --git a/docs/assets/images/Companycards_add_cards.png b/docs/assets/images/Companycards_add_cards.png
new file mode 100644
index 000000000000..cd221e48c821
Binary files /dev/null and b/docs/assets/images/Companycards_add_cards.png differ
diff --git a/docs/assets/images/Companycards_file_import.png b/docs/assets/images/Companycards_file_import.png
new file mode 100644
index 000000000000..b203b881368f
Binary files /dev/null and b/docs/assets/images/Companycards_file_import.png differ
diff --git a/docs/assets/images/Expense_select-vendor.png b/docs/assets/images/Expense_select-vendor.png
new file mode 100644
index 000000000000..d9b828123ee2
Binary files /dev/null and b/docs/assets/images/Expense_select-vendor.png differ
diff --git a/docs/assets/images/wallet-test-transactions.png b/docs/assets/images/wallet-test-transactions.png
new file mode 100644
index 000000000000..479bc405c9e9
Binary files /dev/null and b/docs/assets/images/wallet-test-transactions.png differ
diff --git a/eslint-plugin-local-rules/no-direct-personal-details-list.js b/eslint-plugin-local-rules/no-direct-personal-details-list.js
index e7798f05a117..5ede37c804a0 100644
--- a/eslint-plugin-local-rules/no-direct-personal-details-list.js
+++ b/eslint-plugin-local-rules/no-direct-personal-details-list.js
@@ -38,6 +38,38 @@ function getStaticPropertyName(node) {
     return undefined;
 }
 
+/**
+ * Search snapshot payloads key their personal details by the same string as the Onyx key, so building one
+ * (`data[ONYXKEYS.PERSONAL_DETAILS_LIST] = …`, `Object.assign(data, {[ONYXKEYS.PERSONAL_DETAILS_LIST]: …})`,
+ * `{data: {[ONYXKEYS.PERSONAL_DETAILS_LIST]: …}}`) names a payload field rather than touching the Onyx key.
+ *
+ * @param {import('estree').MemberExpression & import('eslint').Rule.NodeParentExtension} node
+ * @returns {boolean}
+ */
+function isSnapshotPayloadKey(node) {
+    const parent = node.parent;
+    if (parent.type === 'MemberExpression') {
+        return parent.computed && parent.property === node && parent.parent.type === 'AssignmentExpression' && parent.parent.left === parent;
+    }
+    if (parent.type !== 'Property' || !parent.computed || parent.key !== node) {
+        return false;
+    }
+    const objectLiteral = parent.parent;
+    const container = objectLiteral.parent;
+    if (container.type === 'Property') {
+        return container.value === objectLiteral && !container.computed && container.key.type === 'Identifier' && container.key.name === 'data';
+    }
+    return (
+        container.type === 'CallExpression' &&
+        container.arguments.indexOf(objectLiteral) > 0 &&
+        container.callee.type === 'MemberExpression' &&
+        container.callee.object.type === 'Identifier' &&
+        container.callee.object.name === 'Object' &&
+        container.callee.property.type === 'Identifier' &&
+        container.callee.property.name === 'assign'
+    );
+}
+
 /**
  * @param {import('eslint').Rule.RuleContext} context
  * @returns {import('eslint').Rule.RuleListener}
@@ -50,7 +82,7 @@ function create(context) {
             if (node.object.type !== 'Identifier' || node.object.name !== ONYXKEYS_IDENTIFIER) {
                 return;
             }
-            if (getStaticPropertyName(node) !== PERSONAL_DETAILS_LIST_PROPERTY) {
+            if (getStaticPropertyName(node) !== PERSONAL_DETAILS_LIST_PROPERTY || isSnapshotPayloadKey(node)) {
                 return;
             }
             context.report({node, messageId: 'directUsage'});
diff --git a/index.js b/index.js
index cf005180666d..eee4a231fd3d 100644
--- a/index.js
+++ b/index.js
@@ -5,6 +5,7 @@
 import './src/polyfills/NitroFetch';
 import './src/polyfills/PromiseWithResolvers';
 import './src/polyfills/requestIdleCallback';
+import './src/polyfills/SymbolDispose';
 import {AppRegistry} from 'react-native';
 import App from './src/App';
 import Config from './src/CONFIG';
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 55345eddc24f..20b8325c9905 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.4.95</string>
+	<string>9.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.4.95.0</string>
+	<string>9.5.2.4</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
@@ -95,6 +95,8 @@
 	</array>
 	<key>RCTNewArchEnabled</key>
 	<true/>
+	<key>RNNitroSQLite_DatabaseLocation</key>
+	<string>ApplicationSupport</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>ExpensifyNewKansas-Medium.otf</string>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 687fba77a262..8bd1c0acde15 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.4.95</string>
+	<string>9.5.2</string>
 	<key>CFBundleVersion</key>
-	<string>9.4.95.0</string>
+	<string>9.5.2.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 5a54a64a1e5a..63acb97ed248 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2928,7 +2928,7 @@ PODS:
     - React-Core
   - RNFS (2.20.0):
     - React-Core
-  - RNGestureHandler (2.32.0):
+  - RNGestureHandler (3.3.0):
     - hermes-engine
     - RCTRequired
     - RCTTypeSafety
@@ -2950,6 +2950,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - ReactNativeDependencies
+    - RNWorklets (>= 0.8.0)
     - Yoga
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
@@ -3028,7 +3029,12 @@ PODS:
     - ReactNativeDependencies
     - Turf
     - Yoga
-  - RNNitroSQLite (9.6.0):
+  - RNNitroSQLite (9.8.3):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
     - hermes-engine
     - NitroModules
     - RCTRequired
@@ -4101,12 +4107,12 @@ SPEC CHECKSUMS:
   RNFBAnalytics: 2f451df50833a890974d55a93557da878a85b29e
   RNFBApp: db9c2e6d36fe579ab19b82c0a4a417ff7569db7e
   RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
-  RNGestureHandler: 7b07d9192bc65c6883fb37fdecc05dc6b61c814f
+  RNGestureHandler: 85e32defcf23dd3b023356355c5c1dd1d9d51bde
   RNGoogleSignin: 89877c73f0fbf6af2038fbdb7b73b5a25b8330cc
   RNLiveMarkdown: f4c383d846d5d756f42bdf6006e85d5baf0ebfc8
   RNLocalize: 82e7aa2857ce5dcd9e2a0c04f8c34c2ed50821df
   rnmapbox-maps: 54eb40428a4fd89f484a492fc7186bc1c1eea9ce
-  RNNitroSQLite: e354c4a31133050e6bbde1c136b8ac4857830236
+  RNNitroSQLite: c986393b7cb0e5e4587d0c9f7108e56ee8db9627
   RNPermissions: 32bd3b977f28442af0900b102f4458f0f9f9b77c
   RNReactNativeHapticFeedback: 6c8677db48f62a635e6a2065f5d2bd02498d7a73
   RNReanimated: f093c30aa11e45a8044dcc19417f44cffa1c4e1d
diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist
index b8dc635c683e..f350b63c1d2e 100644
--- a/ios/ShareViewController/Info.plist
+++ b/ios/ShareViewController/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.4.95</string>
+	<string>9.5.2</string>
 	<key>CFBundleVersion</key>
-	<string>9.4.95.0</string>
+	<string>9.5.2.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/jest.config.js b/jest.config.js
index e8e628bb3bd9..58b96c5f43b7 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -27,10 +27,10 @@ module.exports = {
         `<rootDir>/?(*.)+(spec|test).${testFileExtension}`,
     ],
     transform: {
-        // Reassure re-transforms ~7k files under `--max-opt=1` (V8 sparkplug only), which
-        // makes Babel ~half of each measure job. OXC + esbuild is native and stays fast
-        // without TurboFan. Test files stay on babel-jest so `jest.mock` is still hoisted.
-        '^.+\\.[jt]sx?$': isPerfTestRun ? '<rootDir>/config/babel/oxcJestTransformer.js' : 'babel-jest',
+        // OXC + esbuild is native and stays fast without TurboFan, where Babel was measured as
+        // roughly half of each Reassure measure job. The transformer sends test files, mocks and
+        // node_modules to babel-jest itself, so `jest.mock` is still hoisted there.
+        '^.+\\.[jt]sx?$': '<rootDir>/config/babel/oxcJestTransformer.js',
         '^.+\\.svg?$': 'jest-transformer-svg',
     },
     transformIgnorePatterns: [
@@ -49,6 +49,8 @@ module.exports = {
     globals: {
         __DEV__: true,
         WebSocket: {},
+        // Build-time define from config/rsbuild/rsbuild.common.ts. SkiaWebChart reads it when mounting CanvasKit.
+        __CANVASKIT_WASM_URL__: '/canvaskit-test.wasm',
     },
     fakeTimers: {
         enableGlobally: true,
diff --git a/jest/setup.ts b/jest/setup.ts
index 44fbb6e59862..9afaa8f219a1 100644
--- a/jest/setup.ts
+++ b/jest/setup.ts
@@ -38,6 +38,14 @@ Object.assign(global, {TextDecoder, TextEncoder});
 // https://reactnavigation.org/docs/testing/#mocking-native-modules
 jest.mock('react-native/src/private/animated/NativeAnimatedHelper');
 
+// Gesture Handler 3 throws in __DEV__ when a GestureDetector has no GestureHandlerRootView above it. In the app every screen
+// renders under the root view in App.tsx, but tests render screens on their own, so the context pretends a root view is always present.
+// Jest resolves the package through `main` (lib/module), so the compiled file is the one to mock.
+jest.mock('react-native-gesture-handler/lib/module/GestureHandlerRootViewContext', () => ({
+    __esModule: true,
+    default: jest.requireActual<typeof React>('react').createContext(true),
+}));
+
 // Mock react-native-onyx storage layer because the SQLite storage layer doesn't work in jest.
 // Mocking this file in __mocks__ does not work because jest doesn't support mocking files that are not directly used in the testing project,
 // and we only want to mock the storage layer, not the whole Onyx module.
@@ -144,6 +152,11 @@ jest.mock('react-native-reanimated', () => ({
     // react-native-reanimated/mock leaves dispatchCommand out (see its own "ADD ME IF NEEDED" comment). forceClearInput
     // (src/libs/ComponentUtils) dispatches it from a UI-thread worklet, so any test exercising that path needs it mocked.
     dispatchCommand: jest.fn(),
+    // react-native-reanimated/mock also leaves out useComposedEventHandler, useHandler and isSharedValue, which Gesture Handler 3
+    // calls from its detectors (including the ones behind its ScrollView / FlatList wrappers).
+    useComposedEventHandler: jest.fn(() => () => {}),
+    useHandler: jest.fn(() => ({context: {}, doDependenciesDiffer: false})),
+    isSharedValue: jest.fn((value: unknown) => typeof value === 'object' && value !== null && 'value' in value && 'get' in value && typeof value.get === 'function'),
     useReducedMotion: jest.fn,
     useScrollViewOffset: jest.fn(() => 0),
     useAnimatedRef: jest.fn(() => jest.fn()),
diff --git a/package-lock.json b/package-lock.json
index 39b864a769ef..17599b761265 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.4.95-0",
+  "version": "9.5.2-4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.4.95-0",
+      "version": "9.5.2-4",
       "hasInstallScript": true,
       "license": "MIT",
       "workspaces": [
@@ -62,6 +62,7 @@
         "array.prototype.tosorted": "^1.1.4",
         "awesome-phonenumber": "^5.4.0",
         "canvas-size": "^1.2.6",
+        "canvaskit-wasm": "0.41.0",
         "d3-scale": "^4.0.2",
         "date-fns": "^4.1.0",
         "date-fns-tz": "^3.2.0",
@@ -115,7 +116,7 @@
         "react-native-device-info": "10.3.1",
         "react-native-draggable-flatlist": "^4.0.3",
         "react-native-fs": "^2.20.0",
-        "react-native-gesture-handler": "2.32.0",
+        "react-native-gesture-handler": "3.3.0",
         "react-native-google-places-autocomplete": "2.6.4",
         "react-native-haptic-feedback": "^2.3.3",
         "react-native-image-picker": "^7.1.2",
@@ -125,8 +126,8 @@
         "react-native-localize": "^3.5.4",
         "react-native-nitro-fetch": "1.6.2",
         "react-native-nitro-modules": "0.37.1",
-        "react-native-nitro-sqlite": "9.6.0",
-        "react-native-onyx": "3.0.113",
+        "react-native-nitro-sqlite": "9.8.3",
+        "react-native-onyx": "3.0.115",
         "react-native-pager-view": "9.0.4",
         "react-native-pdf": "7.0.2",
         "react-native-permissions": "^5.4.0",
@@ -5219,16 +5220,6 @@
         "url": "https://github.com/sponsors/dword-design"
       }
     },
-    "node_modules/@egjs/hammerjs": {
-      "version": "2.0.17",
-      "license": "MIT",
-      "dependencies": {
-        "@types/hammerjs": "^2.0.36"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/@emnapi/core": {
       "version": "1.11.2",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
@@ -5882,10 +5873,20 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
+      "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -8504,9 +8505,9 @@
       }
     },
     "node_modules/@expo/xcpretty/node_modules/js-yaml": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
-      "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
+      "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
       "funding": [
         {
           "type": "github",
@@ -14367,29 +14368,24 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/codegen": {
-      "version": "2.0.4",
+      "version": "2.0.5",
       "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/eventemitter": {
-      "version": "1.1.0",
+      "version": "1.1.1",
       "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/fetch": {
-      "version": "1.1.0",
+      "version": "1.1.1",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
+        "@protobufjs/aspromise": "^1.1.1"
       }
     },
     "node_modules/@protobufjs/float": {
       "version": "1.0.2",
       "license": "BSD-3-Clause"
     },
-    "node_modules/@protobufjs/inquire": {
-      "version": "1.1.0",
-      "license": "BSD-3-Clause"
-    },
     "node_modules/@protobufjs/path": {
       "version": "1.1.2",
       "license": "BSD-3-Clause"
@@ -14399,7 +14395,7 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@protobufjs/utf8": {
-      "version": "1.1.0",
+      "version": "1.1.1",
       "license": "BSD-3-Clause"
     },
     "node_modules/@pusher/pusher-websocket-react-native": {
@@ -14562,10 +14558,20 @@
       }
     },
     "node_modules/@react-native-community/cli-config/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
+      "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
       "devOptional": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -16123,9 +16129,9 @@
       }
     },
     "node_modules/@rsbuild/plugin-svgr/node_modules/js-yaml": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz",
-      "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
+      "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
       "dev": true,
       "funding": [
         {
@@ -19965,10 +19971,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/hammerjs": {
-      "version": "2.0.41",
-      "license": "MIT"
-    },
     "node_modules/@types/howler": {
       "version": "2.2.12",
       "dev": true,
@@ -21571,13 +21573,13 @@
       }
     },
     "node_modules/adm-zip": {
-      "version": "0.5.17",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.17.tgz",
-      "integrity": "sha512-+Ut8d9LLqwEvHHJl1+PIHqoyDxFgVN847JTVM3Izi3xHDWPE4UtzzXysMZQs64DMcrJfBeS/uoEP4AD3HQHnQQ==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.6.1.tgz",
+      "integrity": "sha512-Xwrja8nx9e5o2N1my4DsKCeKpdrnACyr1wtbPxBDgGzKzKyE9kRtBFA8mWldI+RVlD7CBZNWY/wQ2+ydwOR6kQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=12.0"
+        "node": ">=14.0"
       }
     },
     "node_modules/agent-base": {
@@ -23963,19 +23965,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/concurrently/node_modules/shell-quote": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz",
-      "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/concurrently/node_modules/supports-color": {
       "version": "8.1.1",
       "dev": true,
@@ -29314,17 +29303,6 @@
         "hermes-estree": "0.36.1"
       }
     },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "node_modules/hoist-non-react-statics/node_modules/react-is": {
-      "version": "16.13.1",
-      "license": "MIT"
-    },
     "node_modules/hosted-git-info": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
@@ -32854,7 +32832,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
+      "version": "3.15.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
+      "integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -33398,19 +33378,6 @@
         "shell-quote": "^1.8.4"
       }
     },
-    "node_modules/launch-editor/node_modules/shell-quote": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz",
-      "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==",
-      "devOptional": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/lefthook": {
       "version": "2.1.9",
       "resolved": "https://registry.npmjs.org/lefthook/-/lefthook-2.1.9.tgz",
@@ -36841,22 +36808,21 @@
       "license": "MIT"
     },
     "node_modules/protobufjs": {
-      "version": "7.5.3",
+      "version": "7.6.6",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "dependencies": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/codegen": "^2.0.5",
+        "@protobufjs/eventemitter": "^1.1.1",
+        "@protobufjs/fetch": "^1.1.1",
         "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.1",
         "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
+        "long": "^5.3.2"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -37485,14 +37451,12 @@
       }
     },
     "node_modules/react-native-gesture-handler": {
-      "version": "2.32.0",
-      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-2.32.0.tgz",
-      "integrity": "sha512-uYIMOKlKENORq2SABE+jIjbPU+h5I/sQKcq2v16zRq848nwEp1fWRVwML4QWqijc8UcXJC25o54S8GQd4Mf2OA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-3.3.0.tgz",
+      "integrity": "sha512-ZCTlJ09nE3GPbm7J74lvwpxmx1TQ/7MDlHZNLARVYTN82k21mJUJ7BmI9eWjEi8eevHiAudI5O1Cpnt0rJfoJA==",
       "license": "MIT",
       "dependencies": {
-        "@egjs/hammerjs": "^2.0.17",
         "@types/react-test-renderer": "^19.1.0",
-        "hoist-non-react-statics": "^3.3.0",
         "invariant": "^2.2.4"
       },
       "peerDependencies": {
@@ -37699,9 +37663,9 @@
       }
     },
     "node_modules/react-native-nitro-sqlite": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.6.0.tgz",
-      "integrity": "sha512-a/N1yGhM8RvCCnaYhEHhh35YS+HDOAcGKeKFsp2ExCzIjP8vPXuzQtHylgLQLeAh7rUaism5q0QQFfogXm1SXA==",
+      "version": "9.8.3",
+      "resolved": "https://registry.npmjs.org/react-native-nitro-sqlite/-/react-native-nitro-sqlite-9.8.3.tgz",
+      "integrity": "sha512-pw4ZNYNQiMiyJZr6bu0dg+IPTskoEngg1wZBD/H5bg1oyH1rJM4HfS5nVgU7jydibIMko1YhrHK+3m5AEndcDg==",
       "license": "MIT",
       "dependencies": {
         "typeorm": "0.3.27"
@@ -37878,9 +37842,9 @@
       }
     },
     "node_modules/react-native-onyx": {
-      "version": "3.0.113",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-3.0.113.tgz",
-      "integrity": "sha512-6+pk3ArtP2QcsH+IlXLgNWeWiC7c9abwoTVs9yxzWuMUHlHkyQ7QvsxMM5f2iYlX3qBcFkHqU2puGsnhhKy7mw==",
+      "version": "3.0.115",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-3.0.115.tgz",
+      "integrity": "sha512-6JLYMjsSD/tGWFK/zGsQs7ml+LCKK5gfjF4JhWhg5dAW1rzZ91S63dYoi80GU31nIXcP8avN8q7M2FtOInhfNg==",
       "license": "MIT",
       "dependencies": {
         "ascii-table": "0.0.9",
@@ -39768,9 +39732,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
-      "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz",
+      "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -42446,7 +42410,9 @@
       }
     },
     "node_modules/underscore": {
-      "version": "1.13.6",
+      "version": "1.13.8",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.8.tgz",
+      "integrity": "sha512-DXtD3ZtEQzc7M8m4cXotyHR+FAS18C64asBYY5vqZexfYryNNnDc02W4hKg3rdQuqOYas1jkseX0+nZXjTXnvQ==",
       "license": "MIT"
     },
     "node_modules/undici": {
diff --git a/package.json b/package.json
index f7e48ffc1f31..7842b155e40e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.4.95-0",
+  "version": "9.5.2-4",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -138,6 +138,7 @@
     "array.prototype.tosorted": "^1.1.4",
     "awesome-phonenumber": "^5.4.0",
     "canvas-size": "^1.2.6",
+    "canvaskit-wasm": "0.41.0",
     "d3-scale": "^4.0.2",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
@@ -191,7 +192,7 @@
     "react-native-device-info": "10.3.1",
     "react-native-draggable-flatlist": "^4.0.3",
     "react-native-fs": "^2.20.0",
-    "react-native-gesture-handler": "2.32.0",
+    "react-native-gesture-handler": "3.3.0",
     "react-native-google-places-autocomplete": "2.6.4",
     "react-native-haptic-feedback": "^2.3.3",
     "react-native-image-picker": "^7.1.2",
@@ -201,8 +202,8 @@
     "react-native-localize": "^3.5.4",
     "react-native-nitro-fetch": "1.6.2",
     "react-native-nitro-modules": "0.37.1",
-    "react-native-nitro-sqlite": "9.6.0",
-    "react-native-onyx": "3.0.113",
+    "react-native-nitro-sqlite": "9.8.3",
+    "react-native-onyx": "3.0.115",
     "react-native-pager-view": "9.0.4",
     "react-native-pdf": "7.0.2",
     "react-native-permissions": "^5.4.0",
@@ -401,6 +402,7 @@
     "path-to-regexp": "0.1.10",
     "send": "0.19.0",
     "regexpu-core": "6.4.0",
+    "adm-zip": "0.6.1",
     "babel-plugin-react-compiler": "0.0.0-experimental-a1856f3-20260507",
     "react": "19.2.3",
     "react-dom": "19.2.3",
@@ -453,6 +455,10 @@
       }
     }
   },
+  "nitroSQLite": {
+    "threadSafe": true,
+    "performanceMode": true
+  },
   "engines": {
     "bun": "1.3.14",
     "node": "26.5.0",
diff --git a/patches/@shopify/react-native-skia/@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch b/patches/@shopify/react-native-skia/@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch
new file mode 100644
index 000000000000..4848d545479f
--- /dev/null
+++ b/patches/@shopify/react-native-skia/@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch
@@ -0,0 +1,78 @@
+diff --git a/node_modules/@shopify/react-native-skia/lib/commonjs/web/LoadSkiaWeb.js b/node_modules/@shopify/react-native-skia/lib/commonjs/web/LoadSkiaWeb.js
+index 571eca9..061b15c 100644
+--- a/node_modules/@shopify/react-native-skia/lib/commonjs/web/LoadSkiaWeb.js
++++ b/node_modules/@shopify/react-native-skia/lib/commonjs/web/LoadSkiaWeb.js
+@@ -10,12 +10,33 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
+ // @ts-ignore
+ 
+ let ckSharedPromise;
++
++// The glue (`canvaskit.js`) and the binary (`canvaskit.wasm`) are only compatible within one canvaskit-wasm
++// release. When they come from different releases the binary can still link, but the glue then reads the
++// exports under stale names and the embind constructors are never registered: `CanvasKitInit` resolves with
++// an object that has none of its classes, and `Skia.web.ts` would happily wrap it until the first draw throws
++// `PictureRecorder is not a constructor` from a worklet, out of reach of any React error boundary.
++// Check a couple of embind classes here so the mismatch surfaces at load time instead.
++// See patches/@shopify/react-native-skia and https://github.com/Expensify/App/issues/102042.
++const isUsableCanvasKit = CanvasKit => typeof CanvasKit === "object" && CanvasKit !== null && typeof CanvasKit.PictureRecorder === "function" && typeof CanvasKit.Paint === "function";
+ const LoadSkiaWeb = async opts => {
+   if (global.CanvasKit !== undefined) {
+     return;
+   }
+   ckSharedPromise = ckSharedPromise !== null && ckSharedPromise !== void 0 ? ckSharedPromise : (0, _canvaskit.default)(opts);
+-  const CanvasKit = await ckSharedPromise;
++  let CanvasKit;
++  try {
++    CanvasKit = await ckSharedPromise;
++  } catch (error) {
++    // Don't cache the rejection: a later mount (different network conditions, or a reload of a stale
++    // cached binary) should get a fresh attempt instead of re-throwing the first failure forever.
++    ckSharedPromise = undefined;
++    throw error;
++  }
++  if (!isUsableCanvasKit(CanvasKit)) {
++    ckSharedPromise = undefined;
++    throw new Error("CanvasKit initialized without its bindings; canvaskit.js and canvaskit.wasm are probably from different versions");
++  }
+   // The CanvasKit API is stored on the global object and used
+   // to create the JsiSKApi in the Skia.web.ts file.
+   global.CanvasKit = CanvasKit;
+diff --git a/node_modules/@shopify/react-native-skia/lib/module/web/LoadSkiaWeb.js b/node_modules/@shopify/react-native-skia/lib/module/web/LoadSkiaWeb.js
+index cb11667..2f5b666 100644
+--- a/node_modules/@shopify/react-native-skia/lib/module/web/LoadSkiaWeb.js
++++ b/node_modules/@shopify/react-native-skia/lib/module/web/LoadSkiaWeb.js
+@@ -2,12 +2,33 @@
+ // @ts-ignore
+ import CanvasKitInit from "canvaskit-wasm/bin/full/canvaskit";
+ let ckSharedPromise;
++
++// The glue (`canvaskit.js`) and the binary (`canvaskit.wasm`) are only compatible within one canvaskit-wasm
++// release. When they come from different releases the binary can still link, but the glue then reads the
++// exports under stale names and the embind constructors are never registered: `CanvasKitInit` resolves with
++// an object that has none of its classes, and `Skia.web.ts` would happily wrap it until the first draw throws
++// `PictureRecorder is not a constructor` from a worklet, out of reach of any React error boundary.
++// Check a couple of embind classes here so the mismatch surfaces at load time instead.
++// See patches/@shopify/react-native-skia and https://github.com/Expensify/App/issues/102042.
++const isUsableCanvasKit = CanvasKit => typeof CanvasKit === "object" && CanvasKit !== null && typeof CanvasKit.PictureRecorder === "function" && typeof CanvasKit.Paint === "function";
+ export const LoadSkiaWeb = async opts => {
+   if (global.CanvasKit !== undefined) {
+     return;
+   }
+   ckSharedPromise = ckSharedPromise !== null && ckSharedPromise !== void 0 ? ckSharedPromise : CanvasKitInit(opts);
+-  const CanvasKit = await ckSharedPromise;
++  let CanvasKit;
++  try {
++    CanvasKit = await ckSharedPromise;
++  } catch (error) {
++    // Don't cache the rejection: a later mount (different network conditions, or a reload of a stale
++    // cached binary) should get a fresh attempt instead of re-throwing the first failure forever.
++    ckSharedPromise = undefined;
++    throw error;
++  }
++  if (!isUsableCanvasKit(CanvasKit)) {
++    ckSharedPromise = undefined;
++    throw new Error("CanvasKit initialized without its bindings; canvaskit.js and canvaskit.wasm are probably from different versions");
++  }
+   // The CanvasKit API is stored on the global object and used
+   // to create the JsiSKApi in the Skia.web.ts file.
+   global.CanvasKit = CanvasKit;
diff --git a/patches/@shopify/react-native-skia/details.md b/patches/@shopify/react-native-skia/details.md
index 22f5616f461a..df49c88726e7 100644
--- a/patches/@shopify/react-native-skia/details.md
+++ b/patches/@shopify/react-native-skia/details.md
@@ -51,7 +51,7 @@
     Fix: keep the renderer alive without a GrDirectContext and fall back to
     CanvasKit.MakeSWCanvasSurface in onResize, so the chart still renders (on the
     CPU) instead of crashing the page. If that also fails, leave this.surface null -
-    the constructor already initialises it to null and both draw() and
+    the constructor already initializes it to null and both draw() and
     makeImageSnapshot() null-check it. This mirrors the sibling
     renderPictureToSurface path, which already treats a failed WebGL surface as
     recoverable rather than fatal. Charts on capable clients are unaffected and
@@ -159,3 +159,37 @@
 - Upstream PR/issue:
 - E/App issue: https://github.com/Expensify/App/issues/95221
 - PR introducing patch:
+
+### [@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch](@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch)
+
+- Reason:
+
+    ```
+    Makes LoadSkiaWeb fail closed when CanvasKit comes up without its bindings
+    (Sentry APP-M73 / APP-M7F: "PictureRecorder is not a constructor"), and stops
+    it from caching a rejected init forever (APP-M6B / APP-M76: the LinkError was
+    re-thrown on every later chart mount in the tab).
+
+    Both come from pairing canvaskit.js glue from one canvaskit-wasm release with
+    canvaskit.wasm from another. Newer glue plus an older binary fails to link
+    (the binary declares an import the glue no longer supplies). Older glue plus a
+    newer binary is worse: it links, because the newer binary's imports are a
+    subset of what the old glue provides, but the glue then reads the exports
+    under stale minified names, the embind constructors never register, and
+    CanvasKitInit resolves with an object that has no classes at all.
+    LoadSkiaWeb stored that object on global.CanvasKit, Skia.web.ts wrapped it,
+    and the first draw threw from a worklet queue where no React error boundary
+    can reach it. The App side fixes the pairing itself (the binary is served
+    under a versioned URL); this patch is the safety net for tabs that still hit
+    a mismatch.
+
+    LoadSkiaWeb now checks that the resolved module has its PictureRecorder and
+    Paint constructors before publishing it, throwing otherwise so the failure
+    surfaces inside WithSkiaWeb's lazy() and reaches the chart's error boundary.
+    It also clears ckSharedPromise when the init rejects or fails that check, so
+    the next mount gets a fresh attempt instead of the cached failure.
+    ```
+
+- Upstream PR/issue:
+- E/App issue: https://github.com/Expensify/App/issues/102042
+- PR introducing patch: https://github.com/Expensify/App/pull/102138
diff --git a/patches/howler/details.md b/patches/howler/details.md
new file mode 100644
index 000000000000..d5ca9ce35e24
--- /dev/null
+++ b/patches/howler/details.md
@@ -0,0 +1,16 @@
+# `howler` patches
+
+### [howler+2.2.4+001+catch-audio-context-resume-rejection.patch](howler+2.2.4+001+catch-audio-context-resume-rejection.patch)
+
+- Reason:
+
+    ```
+    Howler calls `AudioContext.resume()` in the audio unlock handler and in `_autoResume()` without handling a rejected promise.
+    iOS Safari rejects it with `InvalidStateError: Failed to start the audio device` when it can't start the audio session
+    (for example, during a phone call or while another app holds the audio session), which surfaces as an unhandled promise rejection.
+    This patch adds no-op rejection handlers. Howler only sets its state to 'running' after a successful resume, so the next play() still retries.
+    ```
+
+- Upstream PR/issue: https://github.com/goldfire/howler.js/issues/1743, https://github.com/goldfire/howler.js/pull/1764
+- E/App issue: https://github.com/Expensify/App/issues/102744
+- PR introducing patch: https://github.com/Expensify/App/pull/102795
diff --git a/patches/howler/howler+2.2.4+001+catch-audio-context-resume-rejection.patch b/patches/howler/howler+2.2.4+001+catch-audio-context-resume-rejection.patch
new file mode 100644
index 000000000000..c782bc6f52a3
--- /dev/null
+++ b/patches/howler/howler+2.2.4+001+catch-audio-context-resume-rejection.patch
@@ -0,0 +1,25 @@
+diff --git a/node_modules/howler/dist/howler.js b/node_modules/howler/dist/howler.js
+--- a/node_modules/howler/dist/howler.js
++++ b/node_modules/howler/dist/howler.js
+@@ -382,7 +382,9 @@
+
+         // Calling resume() on a stack initiated by user gesture is what actually unlocks the audio on Android Chrome >= 55.
+         if (typeof self.ctx.resume === 'function') {
+-          self.ctx.resume();
++          // The browser can refuse to start the audio device (for example, iOS Safari while another app holds the audio session).
++          // Swallow the rejection so it doesn't surface as an unhandled promise rejection.
++          self.ctx.resume().catch(function() {});
+         }
+
+         // Setup a timeout to check that we are unlocked on the next event loop.
+@@ -529,7 +531,9 @@
+           for (var i=0; i<self._howls.length; i++) {
+             self._howls[i]._emit('resume');
+           }
+-        });
++        }).catch(function() {
++          // The browser refused to start the audio device. Keep the state as suspended so the next play() tries to resume again.
++        });
+
+         if (self._suspendTimer) {
+           clearTimeout(self._suspendTimer);
diff --git a/patches/pusher-js/details.md b/patches/pusher-js/details.md
new file mode 100644
index 000000000000..d912f6d3c9f2
--- /dev/null
+++ b/patches/pusher-js/details.md
@@ -0,0 +1,23 @@
+# `pusher-js` patches
+
+### [pusher-js+8.3.0+001+ignore-malformed-http-frames.patch](pusher-js+8.3.0+001+ignore-malformed-http-frames.patch)
+
+- Reason:
+  
+    ```
+    When WebSockets are unavailable, pusher-js falls back to the xhr_streaming and xhr_polling transports.
+    Those transports split the response into lines and pass any line that starts with o, a, m or c to
+    JSON.parse without a try/catch. Forcepoint DLP adds its own script (`class FPClassifier {`) to Pusher's
+    `application/javascript` stream, so JSON.parse throws out of the XHR progress handler and Sentry
+    reports it (APP-27B).
+
+    This patch skips any line that fails to parse, and skips an array (a) or close (c) frame whose payload
+    is not an array. It emits nothing for a skipped line: an `error` event would reach Log.alert through
+    PusherConnectionManager. Valid frames in the same response are still handled.
+
+    Only dist/web/pusher-with-encryption.js is patched, because App imports `pusher-js/with-encryption`.
+    ```
+  
+- Upstream PR/issue: https://github.com/pusher/pusher-js/issues/985 (fix: https://github.com/pusher/pusher-js/pull/984)
+- E/App issue: https://github.com/Expensify/App/issues/102745
+- PR introducing patch: https://github.com/Expensify/App/pull/102752
diff --git a/patches/pusher-js/pusher-js+8.3.0+001+ignore-malformed-http-frames.patch b/patches/pusher-js/pusher-js+8.3.0+001+ignore-malformed-http-frames.patch
new file mode 100644
index 000000000000..b59ea601bb3b
--- /dev/null
+++ b/patches/pusher-js/pusher-js+8.3.0+001+ignore-malformed-http-frames.patch
@@ -0,0 +1,61 @@
+diff --git a/node_modules/pusher-js/dist/web/pusher-with-encryption.js b/node_modules/pusher-js/dist/web/pusher-with-encryption.js
+--- a/node_modules/pusher-js/dist/web/pusher-with-encryption.js
++++ b/node_modules/pusher-js/dist/web/pusher-with-encryption.js
+@@ -5838,24 +5838,36 @@ class http_socket_HTTPSocket {
+         var type = chunk.data.slice(0, 1);
+         switch (type) {
+             case 'o':
+-                payload = JSON.parse(chunk.data.slice(1) || '{}');
++                payload = parseFrame(chunk.data.slice(1) || '{}');
++                if (payload === undefined) {
++                    return;
++                }
+                 this.onOpen(payload);
+                 break;
+             case 'a':
+-                payload = JSON.parse(chunk.data.slice(1) || '[]');
++                payload = parseFrame(chunk.data.slice(1) || '[]');
++                if (!Array.isArray(payload)) {
++                    return;
++                }
+                 for (var i = 0; i < payload.length; i++) {
+                     this.onEvent(payload[i]);
+                 }
+                 break;
+             case 'm':
+-                payload = JSON.parse(chunk.data.slice(1) || 'null');
++                payload = parseFrame(chunk.data.slice(1) || 'null');
++                if (payload === undefined) {
++                    return;
++                }
+                 this.onEvent(payload);
+                 break;
+             case 'h':
+                 this.hooks.onHeartbeat(this);
+                 break;
+             case 'c':
+-                payload = JSON.parse(chunk.data.slice(1) || '[]');
++                payload = parseFrame(chunk.data.slice(1) || '[]');
++                if (!Array.isArray(payload)) {
++                    return;
++                }
+                 this.onClose(payload[0], payload[1], true);
+                 break;
+         }
+@@ -5918,6 +5930,16 @@ class http_socket_HTTPSocket {
+         }
+     }
+ }
++// A line that is not valid JSON did not come from Pusher. A proxy that injects its own script into
++// the stream sends such lines, so skip them instead of throwing out of the XHR progress handler.
++function parseFrame(data) {
++    try {
++        return JSON.parse(data);
++    }
++    catch (e) {
++        return undefined;
++    }
++}
+ function getLocation(url) {
+     var parts = /([^\?]*)\/*(\??.*)/.exec(url);
+     return {
diff --git a/patches/react-native-nitro-sqlite/details.md b/patches/react-native-nitro-sqlite/details.md
deleted file mode 100644
index 47198d20deda..000000000000
--- a/patches/react-native-nitro-sqlite/details.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# react-native-nitro-sqlite patches
-
-### [react-native-nitro-sqlite+9.6.0+001+dont-mask-original-error-on-rollback-failure.patch](react-native-nitro-sqlite+9.6.0+001+dont-mask-original-error-on-rollback-failure.patch)
-
-- Reason:
-
-    ```
-    When a statement inside executeBatch fails and SQLite has already auto-rolled the transaction
-    back (disk-full I/O errors do this), the library's own ROLLBACK fails with "cannot rollback -
-    no transaction is active" and that error is thrown instead of the original one, hiding the real
-    failure (~2.8k masked log lines/day on iOS). The patch wraps both ROLLBACK calls in try/catch
-    so the original error is rethrown.
-    ```
-
-- Upstream PR/issue: Already fixed upstream in 9.7.0 via https://github.com/margelo/react-native-nitro-sqlite/pull/292. We stay on 9.6.0 because the 9.7.0 podspec force-enables `SQLITE_THREADSAFE=0` on iOS and its new per-database queue breaks second opens of the same database (used by `src/libs/ExportOnyxState/index.native.ts`). The patch can be dropped when those are resolved and we bump.
-- E/App issue: https://github.com/Expensify/App/issues/97908
-- PR introducing patch: https://github.com/Expensify/App/pull/97954
-
-### [react-native-nitro-sqlite+9.6.0+002+store-database-outside-documents.patch](react-native-nitro-sqlite+9.6.0+002+store-database-outside-documents.patch)
-
-- Reason:
-
-    ```
-    The library stores SQLite databases in the iOS Documents directory, which is exposed to users
-    via the Files app when file sharing is enabled. This patch stores databases in
-    Library/Application Support instead (persistent, backed up, never user-visible) and migrates
-    databases created by older app versions out of Documents on first launch. The database and its
-    -wal/-shm journal files are copied as a set before the originals are deleted, and if the copy
-    fails the database keeps being opened from Documents and the migration retries on the next
-    launch, so committed writes are never separated from their WAL.
-    ```
-
-- Upstream PR/issue: https://github.com/margelo/react-native-nitro-sqlite/issues/289
-- E/App issue: https://github.com/Expensify/App/issues/96649
-- PR introducing patch: https://github.com/Expensify/App/pull/96531
diff --git a/patches/react-native-nitro-sqlite/react-native-nitro-sqlite+9.6.0+001+dont-mask-original-error-on-rollback-failure.patch b/patches/react-native-nitro-sqlite/react-native-nitro-sqlite+9.6.0+001+dont-mask-original-error-on-rollback-failure.patch
deleted file mode 100644
index 0dadc3344a4a..000000000000
--- a/patches/react-native-nitro-sqlite/react-native-nitro-sqlite+9.6.0+001+dont-mask-original-error-on-rollback-failure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/node_modules/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.cpp b/node_modules/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.cpp
-index 4aca8b5..2ea8581 100644
---- a/node_modules/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.cpp
-+++ b/node_modules/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.cpp
-@@ -51,7 +51,11 @@ SQLiteOperationResult sqliteExecuteBatch(const std::string& dbName, const std::v
-         auto result = sqliteExecute(dbName, command.sql, command.params);
-         rowsAffected += result->getRowsAffected();
-       } catch (NitroSQLiteException& e) {
--        sqliteExecuteLiteral(dbName, "ROLLBACK");
-+        // A failed ROLLBACK (SQLite may have already rolled back on its own) must not mask the original error.
-+        try {
-+          sqliteExecuteLiteral(dbName, "ROLLBACK");
-+        } catch (...) {
-+        }
-         throw e;
-       }
-     }
-@@ -61,7 +65,11 @@ SQLiteOperationResult sqliteExecuteBatch(const std::string& dbName, const std::v
-         .commands = (int)commandCount,
-     };
-   } catch (NitroSQLiteException& e) {
--    sqliteExecuteLiteral(dbName, "ROLLBACK");
-+    // A failed ROLLBACK (SQLite may have already rolled back on its own) must not mask the original error.
-+    try {
-+      sqliteExecuteLiteral(dbName, "ROLLBACK");
-+    } catch (...) {
-+    }
-     throw e;
-   }
- }
diff --git a/patches/react-native-nitro-sqlite/react-native-nitro-sqlite+9.6.0+002+store-database-outside-documents.patch b/patches/react-native-nitro-sqlite/react-native-nitro-sqlite+9.6.0+002+store-database-outside-documents.patch
deleted file mode 100644
index a98111df979c..000000000000
--- a/patches/react-native-nitro-sqlite/react-native-nitro-sqlite+9.6.0+002+store-database-outside-documents.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/node_modules/react-native-nitro-sqlite/ios/OnLoad.mm b/node_modules/react-native-nitro-sqlite/ios/OnLoad.mm
-index 6ce7258..65c29cb 100644
---- a/node_modules/react-native-nitro-sqlite/ios/OnLoad.mm
-+++ b/node_modules/react-native-nitro-sqlite/ios/OnLoad.mm
-@@ -10,6 +10,63 @@
- using namespace margelo::nitro;
- using namespace margelo::nitro::rnnitrosqlite;
- 
-+// The Documents directory can be exposed to the user (Files app) when file sharing
-+// is enabled, so databases are stored in Library/Application Support instead.
-+// Databases created by older app versions are moved out of Documents on first launch.
-+//
-+// The "OnyxDB" name must match the database the app opens: DEFAULT_DB_NAME in
-+// src/CONST/index.ts and DB_NAME in react-native-onyx's SQLiteProvider. A Jest test
-+// (MoveFilesOutOfDocumentsTest) fails if the names drift apart.
-+static void migrateDatabaseFiles(NSString *fromDirectory, NSString *toDirectory) {
-+  NSFileManager *fileManager = [NSFileManager defaultManager];
-+  NSArray<NSString *> *databaseFiles = @[ @"OnyxDB", @"OnyxDB-wal", @"OnyxDB-shm" ];
-+
-+  if (![fileManager fileExistsAtPath:[fromDirectory stringByAppendingPathComponent:@"OnyxDB"]]) {
-+    // Nothing to migrate. A previous run may have been interrupted after copying the set but
-+    // before removing the journal files, so sweep any leftovers out of Documents.
-+    [fileManager removeItemAtPath:[fromDirectory stringByAppendingPathComponent:@"OnyxDB-wal"] error:nil];
-+    [fileManager removeItemAtPath:[fromDirectory stringByAppendingPathComponent:@"OnyxDB-shm"] error:nil];
-+    return;
-+  }
-+
-+  // A database in Documents means an older build was writing there, so it is the live copy.
-+  // Remove whatever sits at the destination (e.g. after a downgrade and re-upgrade) so a -wal
-+  // from one database generation is never replayed into a database from another.
-+  for (NSString *file in databaseFiles) {
-+    [fileManager removeItemAtPath:[toDirectory stringByAppendingPathComponent:file] error:nil];
-+  }
-+
-+  // Copy the whole set before deleting anything: committed-but-uncheckpointed writes live in
-+  // the -wal file and SQLite only replays it when it sits next to its database, so the files
-+  // must never be separated. If any copy fails, the intact originals in Documents keep being
-+  // used (see the fallback in +load) and the migration retries on the next launch.
-+  for (NSString *file in databaseFiles) {
-+    NSString *sourcePath = [fromDirectory stringByAppendingPathComponent:file];
-+    if (![fileManager fileExistsAtPath:sourcePath]) {
-+      continue;
-+    }
-+
-+    NSError *error = nil;
-+    if (![fileManager copyItemAtPath:sourcePath toPath:[toDirectory stringByAppendingPathComponent:file] error:&error]) {
-+      NSLog(@"Failed to migrate database file %@: %@", file, error.localizedDescription);
-+      return;
-+    }
-+  }
-+
-+  // The database file is deleted first, and the journals only once that succeeds: if the
-+  // database cannot be removed, the existence check in +load keeps using the source database
-+  // on this launch, so its -wal must stay next to it or committed writes would be lost.
-+  // An interruption after the first delete can only leave journal files behind, which the
-+  // sweep above removes on the next launch.
-+  NSError *removeError = nil;
-+  if (![fileManager removeItemAtPath:[fromDirectory stringByAppendingPathComponent:@"OnyxDB"] error:&removeError]) {
-+    NSLog(@"Failed to remove migrated database from its old location: %@", removeError.localizedDescription);
-+    return;
-+  }
-+  [fileManager removeItemAtPath:[fromDirectory stringByAppendingPathComponent:@"OnyxDB-wal"] error:nil];
-+  [fileManager removeItemAtPath:[fromDirectory stringByAppendingPathComponent:@"OnyxDB-shm"] error:nil];
-+}
-+
- + (void)load {
-   // Get appGroupID value from Info.plist using key "AppGroup"
-   NSString *appGroupID = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RNNitroSQLite_AppGroup"];
-@@ -30,9 +80,24 @@
- 
-     documentPath = [storeUrl path];
-   } else {
--    // Get iOS app's document directory (to safely store database .sqlite3 file)
--    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true);
-+    // Store databases in Library/Application Support, which is persistent, backed up,
-+    // and never exposed to the user via the Files app (unlike the Documents directory)
-+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true);
-     documentPath = [paths objectAtIndex:0];
-+
-+    NSFileManager *fileManager = [NSFileManager defaultManager];
-+    if (![fileManager fileExistsAtPath:documentPath]) {
-+      [fileManager createDirectoryAtPath:documentPath withIntermediateDirectories:YES attributes:nil error:nil];
-+    }
-+
-+    NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true) objectAtIndex:0];
-+    migrateDatabaseFiles(documentsDirectory, documentPath);
-+
-+    // If the database could not be moved out of Documents, keep opening it there rather than
-+    // creating a fresh empty one; the migration retries on the next launch.
-+    if ([fileManager fileExistsAtPath:[documentsDirectory stringByAppendingPathComponent:@"OnyxDB"]]) {
-+      documentPath = documentsDirectory;
-+    }
-   }
- 
-   HybridNitroSQLite::docPath = [documentPath UTF8String];
diff --git a/patches/react-navigation/@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch b/patches/react-navigation/@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch
new file mode 100644
index 000000000000..244e9ecc8a13
--- /dev/null
+++ b/patches/react-navigation/@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch
@@ -0,0 +1,48 @@
+diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js
+--- a/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js
++++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/Card.js
+@@ -48,6 +48,7 @@ function Card({
+   gestureVelocityImpact = GESTURE_VELOCITY_IMPACT,
+   overlay = defaultOverlay,
+   animated,
++  active,
+   interpolationIndex,
+   opening,
+   closing,
+@@ -375,7 +376,11 @@ function Card({
+         children: /*#__PURE__*/_jsxs(Animated.View, {
+           pointerEvents: "box-none",
+           needsOffscreenAlphaCompositing: hasOpacityStyle(cardStyle),
+-          style: [styles.container, cardStyle],
++          style: [styles.container, {
++            // Avoid unfocused larger pages increasing scroll area
++            // e.g. when a smaller screen is pushed over a larger one on web
++            overflow: active ? undefined : 'hidden'
++          }, cardStyle],
+           children: [shadowEnabled && shadowStyle && !isTransparent ? /*#__PURE__*/_jsx(Animated.View, {
+             pointerEvents: "none",
+             style: [styles.shadow, gestureDirection === 'horizontal' ? [styles.shadowHorizontal, styles.shadowStart] : gestureDirection === 'horizontal-inverted' ? [styles.shadowHorizontal, styles.shadowEnd] : gestureDirection === 'vertical' ? [styles.shadowVertical, styles.shadowTop] : [styles.shadowVertical, styles.shadowBottom], {
+diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js
+--- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js
++++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardA11yWrapper.js
+@@ -22,9 +22,6 @@ export const CardA11yWrapper = /*#__PURE__*/React.forwardRef(({
+     "aria-hidden": !focused,
+     pointerEvents: (animated ? inert : !focused) ? 'none' : 'box-none',
+     style: [StyleSheet.absoluteFill, {
+-      // This is necessary to avoid unfocused larger pages increasing scroll area
+-      // The issue can be seen on the web when a smaller screen is pushed over a larger one
+-      overflow: active ? undefined : 'hidden',
+       // We use visibility on web
+       display: Platform.OS !== 'web' && isHidden ? 'none' : 'flex',
+       zIndex: Platform.OS === 'web' ? 'auto' : undefined,
+diff --git a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js
+--- a/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js
++++ b/node_modules/@react-navigation/stack/lib/module/views/Stack/CardContainer.js
+@@ -198,6 +198,7 @@ function CardContainerInner({
+     detachCurrentScreen: detachCurrentScreen,
+     children: /*#__PURE__*/_jsx(Card, {
+       animated: animated,
++      active: active,
+       interpolationIndex: interpolationIndex,
+       gestureDirection: gestureDirection,
+       layout: layout,
diff --git a/patches/react-navigation/details.md b/patches/react-navigation/details.md
index 7e5f8c7caa01..955b43b2c86b 100644
--- a/patches/react-navigation/details.md
+++ b/patches/react-navigation/details.md
@@ -67,3 +67,14 @@
 - Upstream PR/issue: https://github.com/react-navigation/react-navigation/issues/11145
 - E/App issue: [#94571](https://github.com/Expensify/App/issues/94571)
 - PR Introducing Patch: [#95980](https://github.com/Expensify/App/pull/95980)
+
+### [@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch](@react-navigation+stack+7.8.5+005+clip-inactive-card-inside-card.patch)
+
+- Reason: On the web floating RHP each stacked card draws its own drop shadow through the interpolator's `cardStyle` (`getRHPExtendedCardFrame`). `CardA11yWrapper` puts `overflow: hidden` on every card that is not on top, and the wrapper is sized to the navigator frame, so it clips the shadow of the card under the focused one. Opening an expense over an expense report cut the report card's left and bottom shadow. The patch moves that clip from `CardA11yWrapper` to the `Animated.View` in `Card` that receives `cardStyle`. That view paints the shadow, and `overflow: hidden` does not clip an element's own shadow, so the shadow stays and the content is still clipped. `CardContainer` passes `active` down to `Card`.
+- Upstream PR/issue: https://github.com/react-navigation/react-navigation/issues/13254, fix in https://github.com/react-navigation/react-navigation/pull/13255. Upstream declined an opt-out option and asked for this instead. The patch is that change applied to the compiled 7.8.5 output.
+- E/App issue: N/A, the patch came out of the internal web floating-RHP styling work. Removing it is tracked in [#101715](https://github.com/Expensify/App/issues/101715), the react-navigation upgrade.
+- PR Introducing Patch: [#101093](https://github.com/callstack-internal/Expensify-App/pull/101093)
+- PR Updating Patch: N/A
+- Note: Not gated to the RHP. Every stack now clips inactive cards one level lower, so the built-in `styles.shadow` edge view inside `Card` is clipped on inactive cards too. The active card covers that edge.
+- Note: Upstream shipped the fix in `@react-navigation/stack` 7.11.2, first release containing https://github.com/react-navigation/react-navigation/pull/13255. Their shape differs from ours: `CardA11yWrapper` drops `overflow` completely, and `CardContainer` passes `pageOverflowEnabled: active && headerMode !== 'float' && presentation !== 'modal'`, so the clip lands in `CardContent`, whose `styles.card` still carries `overflow: 'hidden'`. Inactive cards stay clipped and the stacked RHP shadow survives, but the clip sits one level below ours, which leaves the built-in `styles.shadow` edge view unclipped on inactive cards.
+- Note: Drop this patch by moving to `stack` 7.11.2 or newer, see #101715 above. It cannot be bumped on its own: `createStackNavigator` there reads `render` from `useNavigationBuilder`, which starts in `core` 7.22.1, and `elements` 2.9.43 plus every sibling declare `native ^7.4.1` as a peer, so npm rejects 7.11.2 next to our `native` 7.1.33. `stack+001+edge-drag-gesture` and `stack+002+dontDetachScreen` need hand-porting to 7.11.2 because it rewrote the gesture and animation lifecycle in `Card.js` and switched the gesture wrapper to `pointerEvents: "auto"`.
diff --git a/scripts/createOrUpdateDeployChecklist.ts b/scripts/createOrUpdateDeployChecklist.ts
index a109693e1246..d32bb5102139 100644
--- a/scripts/createOrUpdateDeployChecklist.ts
+++ b/scripts/createOrUpdateDeployChecklist.ts
@@ -229,7 +229,8 @@ async function run(): Promise<IssuesCreateResponse | void> {
         const {mergedPRs: mergedPREntries, submoduleUpdates} = await GitUtils.getMergedPRsDeployedBetween(previousChecklistData.tag, newStagingTag, CONST.APP_REPO);
         const mergedPRs = mergedPREntries.map((pr) => pr.prNumber).sort((a, b) => a - b);
 
-        const previousPRNumbers = new Set(previousChecklistData.PRList.map((pr) => pr.number));
+        // Previous PRs should include PRs and internalQA items
+        const previousPRNumbers = new Set([...previousChecklistData.PRList, ...previousChecklistData.internalQAPRList].map((pr) => pr.number));
         const previousMobileExpensifyPRNumbers = new Set(previousChecklistData.PRListMobileExpensify.map((pr) => pr.number));
         core.startGroup('Filtering PRs:');
         core.info('mergedPRs includes cherry-picked PRs that have already been released with previous checklist, so we need to filter these out');
diff --git a/src/App.tsx b/src/App.tsx
index 7c382d815219..8a1ed222ff7b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -18,6 +18,7 @@ import {CurrencyListContextProvider} from './components/CurrencyListContextProvi
 import {CurrentUserPersonalDetailsProvider} from './components/CurrentUserPersonalDetailsProvider';
 import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';
 import CustomStatusBarAndBackgroundContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider';
+import {EditingCellProvider} from './components/EditableCell';
 import EnvironmentProvider from './components/EnvironmentContextProvider';
 import ErrorBoundary from './components/ErrorBoundary';
 import FullScreenBlockingViewContextProvider from './components/FullScreenBlockingViewContextProvider';
@@ -38,7 +39,6 @@ import SVGDefinitionsProvider from './components/SVGDefinitionsProvider';
 import ThemeIllustrationsProvider from './components/ThemeIllustrationsProvider';
 import ThemeProvider from './components/ThemeProvider';
 import ThemeStylesProvider from './components/ThemeStylesContextProvider';
-import {EditingCellProvider} from './components/TransactionItemRow/EditableCell';
 import {KeyboardStateProvider} from './components/withKeyboardState';
 import CONFIG from './CONFIG';
 import CONST from './CONST';
diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index b5abc0f4084b..69d557570e35 100644
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -225,6 +225,13 @@ const RESERVATION_TYPE = {
     TRAIN: 'train',
 } as const;
 
+/** Every event that can fire a rule, across all rule kinds. Hoisted so `RULES` can list subsets of it. */
+const RULE_TRIGGERS = {
+    REPORT_SUBMIT: 'ReportSubmit',
+    REPORT_APPROVE: 'ReportApprove',
+    CREATE_TRANSACTION: 'CreateTransaction',
+} as const;
+
 const EMAIL = {
     ACCOUNTING: 'accounting@expensify.com',
     ACCOUNTS_PAYABLE: 'accountspayable@expensify.com',
@@ -1130,11 +1137,11 @@ const CONST = {
         CAMPFIRE: 'campfire',
         BUSINESS_CENTRAL: 'businessCentral',
         COMMUTER_EXCLUSIONS: 'commuterExclusions',
+        COMMUTER_EXCLUSIONS_ARRANGEMENTS: 'commuterExclusionsArrangements',
         MULTIPLE_APPROVERS: 'multipleApprovers',
         GLOBAL_REIMBURSEMENTS: 'globalReimbursements',
         GLOBAL_REIMBURSEMENT_FX: 'globalReimbursementFX',
         DEFAULT_LETTER_AVATARS: 'defaultLetterAvatars',
-        NETSUITE_OAUTH: 'netSuiteOAuth',
         TRAVEL_CODING_SYNC: 'travelCodingSync',
         CONCIERGE_RESPOND_IN_THREAD: 'conciergeRespondInThread',
         ARCHIVE_POLICIES: 'archivePolicies',
@@ -1143,6 +1150,7 @@ const CONST = {
         INSIGHTS_PAGE: 'insightsPage',
         INSIGHTS_COMPARE: 'insightsCompare',
         PAYMENT_HISTORY: 'paymentHistory',
+        ANCHORED_FIELD_DROPDOWNS: 'anchoredFieldDropdowns',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -1738,6 +1746,7 @@ const CONST = {
                 ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER: 'ACTIONABLEMENTIONINVITETOSUBMITEXPENSECONFIRMWHISPER',
                 ACTIONABLE_REPORT_MENTION_WHISPER: 'ACTIONABLEREPORTMENTIONWHISPER',
                 ACTIONABLE_TRACK_EXPENSE_WHISPER: 'ACTIONABLETRACKEXPENSEWHISPER',
+                AGENT_PROMPT_UPDATED: 'AGENTPROMPTUPDATED',
                 POLICY_EXPENSE_CHAT_WELCOME_WHISPER: 'POLICYEXPENSECHATWELCOMEWHISPER',
                 ADD_COMMENT: 'ADDCOMMENT',
 
@@ -1796,6 +1805,7 @@ const CONST = {
                 MOVED: 'MOVED',
                 MOVED_TRANSACTION: 'MOVEDTRANSACTION',
                 UNREPORTED_TRANSACTION: 'UNREPORTEDTRANSACTION',
+                UNDELETED_TRANSACTION: 'UNDELETEDTRANSACTION',
                 OUTDATED_BANK_ACCOUNT: 'OUTDATEDBANKACCOUNT', // OldDot Action
                 REIMBURSED: 'REIMBURSED',
                 REIMBURSEMENT_ACH_BOUNCE: 'REIMBURSEMENTACHBOUNCE', // OldDot Action
@@ -1916,6 +1926,7 @@ const CONST = {
                     UPDATE_FEATURE_ENABLED: 'POLICYCHANGELOG_UPDATE_FEATURE_ENABLED',
                     UPDATE_IS_ATTENDEE_TRACKING_ENABLED: 'POLICYCHANGELOG_UPDATE_IS_ATTENDEE_TRACKING_ENABLED',
                     UPDATE_REQUIRE_COMPANY_CARDS_ENABLED: 'POLICYCHANGELOG_UPDATE_REQUIRE_COMPANY_CARDS_ENABLED',
+                    UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES: 'POLICYCHANGELOG_UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES',
                     UPDATE_REQUIRES_CATEGORY: 'POLICYCHANGELOG_UPDATE_REQUIRES_CATEGORY',
                     UPDATE_REQUIRES_TAG: 'POLICYCHANGELOG_UPDATE_REQUIRES_TAG',
                     UPDATE_GLOBAL_REIMBURSEMENTS_FX_PREFERENCE: 'POLICYCHANGELOG_UPDATE_GLOBAL_REIMBURSEMENTS_FX_PREFERENCE',
@@ -1941,6 +1952,7 @@ const CONST = {
                     UPDATE_REIMBURSER: 'POLICYCHANGELOG_UPDATE_REIMBURSER',
                     UPDATE_PROHIBITED_EXPENSES: 'POLICYCHANGELOG_UPDATE_PROHIBITED_EXPENSES',
                     UPDATE_COMMUTER_EXCLUSIONS: 'POLICYCHANGELOG_UPDATE_COMMUTER_EXCLUSIONS',
+                    UPDATE_MEMBER_WORK_ARRANGEMENT: 'POLICYCHANGELOG_UPDATE_MEMBER_WORK_ARRANGEMENT',
                     UPDATE_REIMBURSEMENT_CHOICE: 'POLICYCHANGELOG_UPDATE_REIMBURSEMENT_CHOICE',
                     UPDATE_REIMBURSEMENT_ENABLED: 'POLICYCHANGELOG_UPDATE_REIMBURSEMENT_ENABLED',
                     UPDATE_REPORT_FIELD: 'POLICYCHANGELOG_UPDATE_REPORT_FIELD',
@@ -2311,10 +2323,13 @@ const CONST = {
         BREADCRUMB_MEMORY_PERIODIC: 'Periodic memory check',
         BREADCRUMB_MEMORY_FOREGROUND: 'App foreground - memory check',
         TAGS: {
+            APP_BLOCKING: 'app_blocking',
             ACTIVE_POLICY: 'active_policy_id',
             POLICIES_COUNT: 'policies_count',
             REPORTS_COUNT: 'reports_count',
             PERSONAL_DETAILS_COUNT: 'personal_details_count',
+            TRANSACTIONS_COUNT: 'transactions_count',
+            DB_SIZE: 'db_size',
             USER_ROLE: 'user_role',
             NUDGE_MIGRATION_COHORT: 'nudge_migration_cohort',
             AUTHENTICATION_FUNCTION: 'authentication_function',
@@ -2347,6 +2362,13 @@ const CONST = {
             INDEXED_DB: 'indexed_db',
             UNAVAILABLE: 'unavailable',
         },
+        // Numeric prefix keeps Sentry's alphabetical sort in size order
+        SIZE_TIER: {
+            SMALL: '1-small',
+            MEDIUM: '2-medium',
+            LARGE: '3-large',
+            XLARGE: '4-xlarge',
+        },
         BUILD_TYPE_HYBRID_APP: 'hybrid_app',
         BUILD_TYPE_STANDALONE: 'standalone',
         // Span names
@@ -2720,6 +2742,7 @@ const CONST = {
         EXP_ERROR: 666,
         UNABLE_TO_RETRY: 'unableToRetry',
         UPDATE_REQUIRED: 426,
+        TOO_MANY_REQUESTS: 429,
         INCORRECT_VALIDATE_CODE: 451,
         ADMIN_REQUIRED: 460,
         SERVICE_UNAVAILABLE: 503,
@@ -3086,6 +3109,16 @@ const CONST = {
         MAX_FILE_LIMIT_EXCEEDED: 'maxFileLimitExceeded',
     },
 
+    INPUT_VALIDATION_ERRORS: {
+        REQUIRED: 'required',
+        EXISTING: 'existing',
+        INVALID: 'invalid',
+        TOO_LONG: 'tooLong',
+        NOT_INTEGER: 'notInteger',
+        TOO_HIGH: 'tooHigh',
+        TOO_LOW: 'tooLow',
+    },
+
     IOS_CAMERA_ROLL_ACCESS_ERROR: 'Access to photo library was denied',
     EMOJI_PICKER_ITEM_TYPES: {
         HEADER: 'header',
@@ -3971,6 +4004,32 @@ const CONST = {
         SYNC_TAX_RATES: 'syncTaxRates',
         SYNC_ITEMS: 'syncItems',
         FIELD_MAPPING_PREFIX: 'fieldMapping_',
+        EXPORTER: 'exporter',
+        EXPORT_DATE: 'exportDate',
+        REIMBURSABLE: 'reimbursable',
+        NON_REIMBURSABLE: 'nonReimbursable',
+        REIMBURSABLE_ACCOUNT: 'reimbursableAccount',
+        NON_REIMBURSABLE_ACCOUNT: 'nonReimbursableAccount',
+        DEFAULT_VENDOR_ID: 'defaultVendorID',
+        PAYMENT_METHOD_CODE: 'paymentMethodCode',
+    },
+
+    BUSINESS_CENTRAL_EXPORT_DATE: {
+        LAST_EXPENSE: 'LAST_EXPENSE',
+        REPORT_EXPORTED: 'REPORT_EXPORTED',
+        REPORT_SUBMITTED: 'REPORT_SUBMITTED',
+    },
+
+    /** Business Central document an expense exports to */
+    BUSINESS_CENTRAL_EXPORT_DESTINATION: {
+        JOURNAL_ENTRY: 'JOURNAL_ENTRY',
+        PURCHASE_INVOICE: 'PURCHASE_INVOICE',
+    },
+
+    /** Whether an exported Business Central document is only created or also posted */
+    BUSINESS_CENTRAL_POSTING_MODE: {
+        CREATE_ONLY: 'CREATE_ONLY',
+        CREATE_AND_POST: 'CREATE_AND_POST',
     },
 
     BUSINESS_CENTRAL_MAPPING_VALUE: {
@@ -4967,6 +5026,12 @@ const CONST = {
                 BUSINESS_CENTRAL_SYNC_IMPORT_DATA: 'businessCentralSyncImportData',
             },
             SYNC_STAGE_TIMEOUT_MINUTES: 20,
+            /** How many days before a QuickBooks Online refresh token expires the workspace starts warning admins to reconnect */
+            QBO_REFRESH_TOKEN_EXPIRY_WARNING_DAYS: 7,
+            QBO_REFRESH_TOKEN_EXPIRY_STATUS: {
+                EXPIRING_SOON: 'expiringSoon',
+                EXPIRED: 'expired',
+            },
         },
         ACCESS_VARIANTS: {
             PAID: 'paid',
@@ -5120,7 +5185,7 @@ const CONST = {
         // Corner radius scaled to the avatar size, used for workspace avatars
         ROUNDED_SQUARE: 'rounded-square',
     },
-
+    CASH_CARD_NAME: '__CASH__',
     COMPANY_CARD: {
         // Mostly used for feed details
         FEED_BANK_NAME: {
@@ -5545,6 +5610,14 @@ const CONST = {
     SUBSCRIPTION: {
         TEAM_2025_PRICING_START_DATE: new Date(2025, 3, 1),
         PRICING_TYPE_2025: 'team2025Pricing',
+        EARLY_RENEWAL: {
+            NON_INCENTIVIZED_START: '2026-10-01T00:00:00Z',
+            INCENTIVIZED_START: '2026-10-15T00:00:00Z',
+            CAMPAIGN_END: '2027-01-01T00:00:00Z',
+            OFFER_ID: {
+                NON_INCENTIVIZED_ONE_YEAR: 'nonIncentivizedOneYear',
+            },
+        },
         TYPE: {
             ANNUAL: 'yearly2018',
             PAY_PER_USE: 'monthly2018',
@@ -7157,6 +7230,7 @@ const CONST = {
         RHP_HOME_PAGE: 'rhpHomePage',
         TRACK_EXPENSES_WITH_CONCIERGE: 'trackExpensesWithConcierge',
         INBOX_ADMINS_BESPOKE: 'inboxAdminsBespoke',
+        HOME_PAGE_NO_RHP: 'homePageNoRHP',
     },
     ONBOARDING_JOINABLE_WORKSPACES_LIMIT: 5,
     ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE: 'What would you like to do with this expense?',
@@ -7246,6 +7320,7 @@ const CONST = {
     SESSION_STORAGE_KEYS: {
         INITIAL_URL: 'INITIAL_URL',
         RETRY_LAZY_REFRESHED: 'RETRY_LAZY_REFRESHED',
+        UPDATE_REQUIRED_RELOADED_VERSION: 'UPDATE_REQUIRED_RELOADED_VERSION',
         LAST_REFRESH_TIMESTAMP: 'LAST_REFRESH_TIMESTAMP',
         LAST_VISITED_PATH: {
             WORKSPACES_TAB: 'LAST_VISITED_PATH_WORKSPACES_TAB',
@@ -8002,6 +8077,7 @@ const CONST = {
             EXPORTER: 'exporter',
             CATEGORY: 'category',
             TAG: 'tag',
+            VENDOR: 'vendor',
             TAX_RATE: 'taxRate',
             CARD_ID: 'cardID',
             FEED: 'feed',
@@ -8053,6 +8129,7 @@ const CONST = {
         TAG_EMPTY_VALUE: 'none',
         CATEGORY_EMPTY_VALUE: 'none',
         CATEGORY_DEFAULT_VALUE: 'Uncategorized',
+        VENDOR_EMPTY_VALUE: 'none',
         MERCHANT_EMPTY_VALUE: 'none',
         SEARCH_ROUTER_ITEM_TYPE: {
             CONTEXTUAL_SUGGESTION: 'contextualSuggestion',
@@ -8089,6 +8166,7 @@ const CONST = {
             EXPORTER: 'exporter',
             CATEGORY: 'category',
             TAG: 'tag',
+            VENDOR: 'vendor',
             TAX_RATE: 'tax-rate',
             CARD_ID: 'card',
             FEED: 'feed',
@@ -8250,7 +8328,7 @@ const CONST = {
             MAX_STALE_HOLD_DURATION: 500,
         },
         TODO_BADGE_MAX_COUNT: 50,
-        TOP_SEARCH_LIMIT: 10,
+        TOP_SEARCH_LIMIT: 5,
     },
     SEARCH_SELECTOR: {
         SELECTION_MODE_SINGLE: 'single',
@@ -8722,16 +8800,33 @@ const CONST = {
     RULES: {
         SCOPE: {
             POLICY: 'policy',
+            ACCOUNT: 'account',
+        },
+        TRIGGERS: RULE_TRIGGERS,
+        /** Every action a rule can perform, across all rule kinds. */
+        ACTIONS: {
+            FORWARD_TO: 'ForwardTo',
+            APPROVE_REPORT: 'ApproveReport',
+            SET: 'Set',
         },
         APPROVAL_WORKFLOW: {
-            TRIGGER: {
-                REPORT_SUBMIT: 'ReportSubmit',
-                REPORT_APPROVE: 'ReportApprove',
-            },
-            ACTION: {
-                FORWARD_TO: 'ForwardTo',
-                APPROVE_REPORT: 'ApproveReport',
+            /** A rule firing only on these is an approval workflow rather than an expense default. */
+            TRIGGERS: [RULE_TRIGGERS.REPORT_SUBMIT, RULE_TRIGGERS.REPORT_APPROVE],
+        },
+        EXPENSE_DEFAULT: {
+            /** Expense fields a `Set` action can write to */
+            FIELD: {
+                BILLABLE: 'billable',
+                CATEGORY: 'category',
+                COMMENT: 'comment',
+                MERCHANT: 'merchant',
+                REIMBURSABLE: 'reimbursable',
+                TAG: 'tag',
+                TAX: 'tax',
+                VENDOR_ID: 'vendorID',
             },
+            /** Every expense default rule is created with the same priority, per the rules engine spec */
+            PRIORITY: 10000,
         },
     },
 
@@ -8774,6 +8869,11 @@ const CONST = {
         EXTERNAL_ID: 'externalID',
         MAX_AMOUNT_NO_RECEIPT: 'maxAmountNoReceipt',
         MAX_AMOUNT_NO_ITEMIZED_RECEIPT: 'maxAmountNoItemizedReceipt',
+        PAYROLL_CODE: 'payrollCode',
+        ARE_COMMENTS_REQUIRED: 'areCommentsRequired',
+        COMMENT_HINT: 'commentHint',
+        EXPENSE_LIMIT_TYPE: 'expenseLimitType',
+        MAX_EXPENSE_AMOUNT: 'maxExpenseAmount',
         MERCHANT_IS: 'merchantIs',
         MERCHANT_CONTAINS: 'merchantContains',
         UPDATED_MERCHANT: 'updatedMerchant',
@@ -9072,8 +9172,28 @@ const CONST = {
     OFFLINE_INDICATOR_HEIGHT: 25,
 
     BILLING: {
+        TYPE_FAILED: 'failed',
         TYPE_FAILED_2018: 'failed_2018',
+        TYPE_FAILED_SMARTSCAN: 'failed_smartscan2018',
         TYPE_STRIPE_FAILED_AUTHENTICATION: 'failed_stripe_authentication',
+        TYPE_CLEAR: 'clear',
+        TYPE_REFUND: 'refund',
+        TYPE_CC_REFUND: 'ccRefund',
+        TYPE_DISPUTE: 'dispute',
+        TYPE_TRANSFER: 'transfer',
+        TYPE_TRANSFER_TO: 'transfer_to',
+        TYPE_TRANSFER_FAILED: 'transfer_failed',
+        TYPE_TRANSFER_OLD: 'transfer_old',
+    },
+    PAYMENT_HISTORY: {
+        STATE: {
+            PAID: 'paid',
+            CLEARED: 'cleared',
+            FAILED: 'failed',
+            REFUNDED: 'refunded',
+            DISPUTED: 'disputed',
+            BALANCE_TRANSFER: 'balanceTransfer',
+        },
     },
 
     ONBOARDING_HELP: {
@@ -9136,6 +9256,18 @@ const CONST = {
             MULTI_SELECT: 'multiSelect',
         },
 
+        /** Where the column header is rendered. The placements are exclusive, so the table is always in exactly one of them. */
+        COLUMN_HEADER_PLACEMENT: {
+            /** The table has no column header anywhere. */
+            NONE: 'none',
+            /** A direct child of the table container, outside the list. Where every table without a page header keeps it. */
+            OUTSIDE_LIST: 'outsideList',
+            /** A synthetic list row, which FlashList paints as a sticky overlay outside the scroller. */
+            STICKY_ROW: 'stickyRow',
+            /** In flow inside the list header, so the scroller carries it sideways with the columns it labels. */
+            LIST_HEADER: 'listHeader',
+        },
+
         DYNAMIC_COLUMNS: {
             /** How many of the longest strings are measured per column, since character count only approximates rendered width. */
             MEASURED_CANDIDATES_PER_COLUMN: 5,
@@ -9149,6 +9281,9 @@ const CONST = {
     },
 
     SENTRY_LABEL: {
+        TEST_TOOL_MENU: {
+            SERVER: 'TestToolMenu-Server',
+        },
         BILLING_BANNER: {
             RIGHT_ICON: 'BillingBanner-RightIcon',
         },
@@ -9333,6 +9468,7 @@ const CONST = {
             CONTROL_WORKSPACE: 'Insights-ControlWorkspace',
             CONTROL_GROUP_CURRENCY: 'Insights-ControlGroupCurrency',
             CONTROL_GROUP_BY: 'Insights-ControlGroupBy',
+            CONTROL_COMPARE: 'Insights-ControlCompare',
         },
         EXPENSE_RULES: {
             TABLE_ROW: 'ExpenseRules-TableRow',
@@ -9807,6 +9943,7 @@ const CONST = {
                 AGENT_RULE_ITEM: 'WorkspaceRules-AgentRuleItem',
                 ADD_AGENT_RULE: 'WorkspaceRules-AddAgentRule',
                 SUGGESTED_AGENT_RULE: 'WorkspaceRules-SuggestedAgentRule',
+                SUGGESTED_AGENT_RULE_CATEGORY: 'WorkspaceRules-SuggestedAgentRuleCategory',
                 AGENT_RULE_DELETE: 'WorkspaceRules-AgentRuleDelete',
                 NEW_RULE_MENU_ITEM: 'WorkspaceRules-NewRuleMenuItem',
                 NEW_RULE_MENU_ITEM_RESTRICT_CARD_SPEND: 'WorkspaceRules-NewRuleMenuItem-RestrictCardSpend',
@@ -10005,6 +10142,7 @@ const CONST = {
             RETRY_PAYMENT: 'SettingsSubscription-RetryPayment',
             AUTHENTICATE_PAYMENT: 'SettingsSubscription-AuthenticatePayment',
             VIEW_PAYMENT_HISTORY: 'SettingsSubscription-ViewPaymentHistory',
+            PAYMENT_HISTORY_ROW: 'SettingsSubscription-PaymentHistoryRow',
             REQUEST_REFUND: 'SettingsSubscription-RequestRefund',
             CANCEL_SUBSCRIPTION: 'SettingsSubscription-CancelSubscription',
         },
diff --git a/src/DeepLinkHandler.tsx b/src/DeepLinkHandler.tsx
index 8ed1e7ba0604..704fa8b8ed02 100644
--- a/src/DeepLinkHandler.tsx
+++ b/src/DeepLinkHandler.tsx
@@ -8,6 +8,7 @@ import type {Route} from './ROUTES';
 import CONST from './CONST';
 import useIsAuthenticated from './hooks/useIsAuthenticated';
 import useOnyx from './hooks/useOnyx';
+import {usePersonalDetailsByIDs} from './hooks/usePersonalDetails';
 import {openReportFromDeepLink} from './libs/actions/Link';
 import * as Report from './libs/actions/Report';
 import {hasAuthToken, isAnonymousUser} from './libs/actions/Session';
@@ -17,6 +18,7 @@ import {endSpan} from './libs/telemetry/activeSpans';
 import {hasSecureLinkKey} from './libs/Url';
 import ONYXKEYS from './ONYXKEYS';
 import {guidedSetupAndTourStatusSelector} from './selectors/Onboarding';
+import {isEmptyObject} from './types/utils/EmptyObject';
 import isLoadingOnyxValue from './types/utils/isLoadingOnyxValue';
 
 type DeepLinkHandlerProps = {
@@ -45,12 +47,20 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
     const [introSelected, introSelectedMetadata] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [guidedSetupAndTourStatus, guidedSetupAndTourStatusMetadata] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
     const [, betasMetadata] = useOnyx(ONYXKEYS.BETAS);
+    // Only Concierge's personal detail is needed to create the Concierge chat when a deep link points to a missing report.
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
+    // Read through a ref so a Concierge personal detail update (e.g. OpenApp loading it) does not re-run deep link handling.
+    const conciergePersonalDetailsRef = useRef(conciergePersonalDetails);
     const isAuthenticated = useIsAuthenticated();
 
     useEffect(() => {
         reportNameValuePairsRef.current = reportNameValuePairs;
     }, [reportNameValuePairs]);
 
+    useEffect(() => {
+        conciergePersonalDetailsRef.current = conciergePersonalDetails;
+    }, [conciergePersonalDetails]);
+
     // An anonymous deep link into a public room needs to be re-fetched after OpenApp settles (see the effect
     // below). Track the pending reportID so both the initial-URL and the url-change paths stay in sync.
     const trackPendingPublicRoomFromDeepLink = useCallback((url: string, isCurrentlyAuthenticated: boolean) => {
@@ -121,6 +131,9 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
                     if (introSelected === undefined) {
                         Log.info('[Deep link] introSelected is undefined when processing initial URL', false, {url});
                     }
+                    if (isEmptyObject(conciergePersonalDetailsRef.current)) {
+                        Log.info('[Deep link] Concierge personal details are empty when processing initial URL', false, {url});
+                    }
                     openReportFromDeepLink(
                         url,
                         allReports,
@@ -130,6 +143,7 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
                         guidedSetupAndTourStatus?.isSelfTourViewed,
                         session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
                         reportNameValuePairsRef.current,
+                        conciergePersonalDetailsRef.current,
                     );
                     trackPendingPublicRoomFromDeepLink(url, isCurrentlyAuthenticated);
                 } else {
@@ -157,6 +171,9 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
             if (introSelected === undefined) {
                 Log.info('[Deep link] introSelected is undefined when processing URL change', false, {url: state.url});
             }
+            if (isEmptyObject(conciergePersonalDetailsRef.current)) {
+                Log.info('[Deep link] Concierge personal details are empty when processing URL change', false, {url: state.url});
+            }
             const isCurrentlyAuthenticated = hasAuthToken();
             // A Submit-via-PDF secure access link can arrive while the app is already running (warm), where
             // getInitialURL() is empty. Record it so onboarding suppression has a session-sticky signal, the same
@@ -173,6 +190,7 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
                 guidedSetupAndTourStatus?.isSelfTourViewed,
                 session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
                 reportNameValuePairsRef.current,
+                conciergePersonalDetailsRef.current,
             );
             trackPendingPublicRoomFromDeepLink(state.url, isCurrentlyAuthenticated);
         });
diff --git a/src/GlobalModals.tsx b/src/GlobalModals.tsx
index 9e6a7b48a156..d7235959d289 100644
--- a/src/GlobalModals.tsx
+++ b/src/GlobalModals.tsx
@@ -2,8 +2,10 @@ import React, {startTransition, useEffect, useState} from 'react';
 
 import DelegateNoAccessModalProvider from './components/DelegateNoAccessModalProvider';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
+import ExpenseAddedGrowl from './components/ExpenseAddedGrowl';
 import GrowlNotification from './components/GrowlNotification';
 import LazyModalSlot from './components/LazyModalSlot';
+import useIsAuthenticated from './hooks/useIsAuthenticated';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
 import {growlRef} from './libs/Growl';
 import * as ReportActionContextMenu from './pages/inbox/report/ContextMenu/ReportActionContextMenu';
@@ -22,6 +24,7 @@ const IDLE_CALLBACK_TIMEOUT_MS = 2000;
 function GlobalModals() {
     const [shouldRenderContextMenu, setShouldRenderContextMenu] = useState(false);
     const [shouldRenderDeferredModals, setShouldRenderDeferredModals] = useState(false);
+    const isAuthenticated = useIsAuthenticated();
 
     // Defer loading the context menu and rare-condition modals until after startup to avoid
     // pulling in their dependencies (ContextMenuActions, ReportUtils, ModifiedExpenseMessage,
@@ -48,6 +51,7 @@ function GlobalModals() {
     return (
         <>
             <GrowlNotification ref={growlRef} />
+            {isAuthenticated && <ExpenseAddedGrowl />}
             <DelegateNoAccessModalProvider>
                 {shouldRenderContextMenu && (
                     <LazyModalSlot>
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index aa1fffc6b9c9..5fa8917f1f3b 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -14,6 +14,7 @@ import type {Attendee, DistanceExpenseType, Participant} from './types/onyx/IOU'
 import type Onboarding from './types/onyx/Onboarding';
 import type {AnyOnyxUpdate} from './types/onyx/Request';
 import type {SavedCSVColumnLayoutList} from './types/onyx/SavedCSVColumnLayout';
+import type {SearchDataTypes} from './types/onyx/SearchResults';
 import type AssertTypesEqual from './types/utils/AssertTypesEqual';
 import type DeepValueOf from './types/utils/DeepValueOf';
 
@@ -46,9 +47,15 @@ const ONYXKEYS = {
     /** Whether a semantic modal is covering the product marketing window in this app instance */
     RAM_ONLY_IS_PRODUCT_MARKETING_WINDOW_COVERED: 'isProductMarketingWindowCovered',
 
+    /** Whether the current user can claim or nudge a billing owner about the Early Renewal 2027 offer */
+    EARLY_RENEWAL_OFFER_ELIGIBILITY: 'earlyRenewalOfferEligibility',
+
     /** Boolean flag set whenever we are searching for reports in the server */
     RAM_ONLY_IS_SEARCHING_FOR_REPORTS: 'isSearchingForReports',
 
+    /** Ordered reportIDs from the latest SearchForReports response, used to display server search results in the tier order Auth returned. */
+    RAM_ONLY_SEARCH_RESULT_REPORT_IDS: 'searchResultReportIDs',
+
     /** Pagination state for tag filter search (hasMore, nextCursor). RAM-only so it resets on app restart. */
     RAM_ONLY_SEARCH_TAG_FILTERS_PAGINATION: 'searchTagFiltersPagination',
 
@@ -475,6 +482,10 @@ const ONYXKEYS = {
 
     IS_LOADING_APP: 'isLoadingApp',
 
+    /** Set when we are switching to a delegator */
+    IS_SWITCHING_TO_DELEGATOR: 'isSwitchingToDelegator',
+
+    /** Is loading policy rules preview? */
     IS_LOADING_POLICY_CODING_RULES_PREVIEW: 'isLoadingPolicyCodingRulesPreview',
 
     /** Is loading agent rule suggestions for the add-rule Suggestions tab? */
@@ -495,9 +506,24 @@ const ONYXKEYS = {
     /** Set whether the search filters category data has loaded */
     IS_SEARCH_FILTERS_CATEGORY_DATA_LOADED: 'isSearchFiltersCategoryDataLoaded',
 
+    /**
+     * Set once `GetRules` has answered, so screens that only consume the rules collection fetch it once.
+     * RAM only, so a new session fetches again rather than trusting a collection another device has since changed.
+     */
+    RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED: 'hasRulesDataBeenFetched',
+
+    /** Set while a `GetRules` request is in flight, so screens can wait for it instead of reading an empty collection */
+    RAM_ONLY_IS_LOADING_RULES: 'isLoadingRules',
+
     /** Set while search filter category data is loading */
     RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA: 'isLoadingSearchFiltersCategoryData',
 
+    /** Set whether the search filters vendor data has loaded */
+    IS_SEARCH_FILTERS_VENDOR_DATA_LOADED: 'isSearchFiltersVendorDataLoaded',
+
+    /** Set while search filter vendor data is loading */
+    RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA: 'isLoadingSearchFiltersVendorData',
+
     HAS_LOADED_APP: 'hasLoadedApp',
 
     IS_TEST_TOOLS_MODAL_OPEN: 'isTestToolsModalOpen',
@@ -742,7 +768,7 @@ const ONYXKEYS = {
     /** Caches converted footer-total amounts (by transaction and by whole-search query, nested by currency) for the Search footer currency picker */
     SEARCH_FOOTER_CONVERSION: 'searchFooterConversion',
 
-    /** Maps each loaded search snapshot's hash to its original query string, used to fan optimistic IOU updates to every matching snapshot */
+    /** @deprecated Use `search.inputQuery` on the snapshot. Only read by the MoveSearchQueryByHashToSnapshots migration. */
     SEARCH_QUERY_BY_HASH: 'searchQueryByHash',
 
     /** Stores recently used currencies */
@@ -850,6 +876,10 @@ const ONYXKEYS = {
     /** List of transaction IDs used when navigating to prev/next transaction when viewing it in RHP */
     TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS: 'transactionThreadNavigationTransactionIDs',
 
+    /** Hash of the search snapshot that holds the transactions referenced by TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS.
+     * Used to fall back to snapshot data when the live transaction collection hasn't loaded those transactions yet (e.g. opening an expense from the Spend page as an approver). */
+    TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH: 'transactionThreadNavigationSnapshotHash',
+
     /** Optional map of transactionID -> sibling descriptor for prev/next navigation in snapshot-backed flows (e.g. Home "Recently added"), where siblings may be absent from the main Onyx collections. When set, navigation resolves (and lazily creates) each sibling's thread on demand from its descriptor. */
     TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS: 'transactionThreadNavigationThreadReportIDs',
 
@@ -884,8 +914,8 @@ const ONYXKEYS = {
     /** Whether the user has denied the contact import permission prompt */
     HAS_DENIED_CONTACT_IMPORT_PROMPT: 'hasDeniedContactImportPrompt',
 
-    /** The transaction IDs to be highlighted when opening the Expenses search route page */
-    TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE: 'transactionIdsHighlightOnSearchRoute',
+    /** Maps each newly-added transaction ID to its search data type, flagging it for the "Expense added" growl */
+    RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS: 'expenseAddedGrowlTransactionIDs',
 
     /** The report ID to be highlighted when returning to the workspace rooms page */
     ROOM_ID_HIGHLIGHT_ON_ROOMS_PAGE: 'roomIDHighlightOnRoomsPage',
@@ -946,6 +976,12 @@ const ONYXKEYS = {
         /** Session-scoped loading flags for the Expensify Card page, keyed by policyID.
          *  Registered as RAM-only in `setup/index.ts`. */
         RAM_ONLY_EXPENSIFY_CARD_LOADING_STATE: 'expensifyCardLoadingState_',
+        /** Session-scoped loading flags for a policy's on-demand categories read, keyed by policyID.
+         *  Registered as RAM-only in `setup/index.ts`. */
+        RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE: 'policyCategoriesLoadingState_',
+        /** Session-scoped loading flags for a policy's on-demand tags read, keyed by policyID.
+         *  Registered as RAM-only in `setup/index.ts`. */
+        RAM_ONLY_POLICY_TAGS_LOADING_STATE: 'policyTagsLoadingState_',
         /** Pagination cursors for a report's action list. */
         REPORT_PAGINATION_STATE: 'reportPaginationState_',
         REPORT_ACTIONS: 'reportActions_',
@@ -1366,6 +1402,8 @@ const ONYXKEYS = {
         RAM_ONLY_SORTED_REPORT_ACTIONS: 'sortedReportActions',
         LOGIN_TO_ACCOUNT_ID_MAP: 'loginToAccountIDMap',
         GUIDE_ACCOUNT_IDS: 'guideAccountIDs',
+        SPEND_DATA_SIGNATURE: 'spendDataSignature',
+        ONE_ON_ONE_CHAT_REPORT_IDS: 'oneOnOneChatReportIDs',
     },
 
     /** Stores HybridApp specific state required to interoperate with OldDot */
@@ -1543,6 +1581,8 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE]: OnyxTypes.ReportLoadingState;
     [ONYXKEYS.COLLECTION.RAM_ONLY_COMPANY_CARDS_LOADING_STATE]: OnyxTypes.CompanyCardsLoadingState;
     [ONYXKEYS.COLLECTION.RAM_ONLY_EXPENSIFY_CARD_LOADING_STATE]: OnyxTypes.ExpensifyCardLoadingState;
+    [ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE]: OnyxTypes.PolicyDataLoadingState;
+    [ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE]: OnyxTypes.PolicyDataLoadingState;
     [ONYXKEYS.COLLECTION.REPORT_PAGINATION_STATE]: OnyxTypes.ReportPaginationState;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS]: OnyxTypes.ReportActions;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS]: OnyxTypes.ReportActionsDrafts;
@@ -1609,6 +1649,7 @@ type OnyxCollectionValuesMapping = {
 type OnyxValuesMapping = {
     [ONYXKEYS.ACCOUNT]: OnyxTypes.Account;
     [ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID]: string;
+    [ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY]: OnyxTypes.EarlyRenewalOfferEligibility;
     [ONYXKEYS.DEFAULT_P2P_MILEAGE_RATE]: DefaultP2PMileageRate;
     [ONYXKEYS.GOVERNMENT_MILEAGE_RATES]: OnyxTypes.GovernmentMileageRate[];
 
@@ -1622,6 +1663,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_HAS_SEEDED_MY_EXPENSES_SEARCH]: boolean;
     [ONYXKEYS.SEARCH_CONTEXT]: OnyxTypes.SearchContext;
     [ONYXKEYS.SEARCH_FOOTER_CONVERSION]: OnyxTypes.SearchFooterConversion;
+    // eslint-disable-next-line @typescript-eslint/no-deprecated -- the key stays typed while the migration still reads it
     [ONYXKEYS.SEARCH_QUERY_BY_HASH]: Record<string, string>;
     [ONYXKEYS.RECENTLY_USED_CURRENCIES]: string[];
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
@@ -1747,11 +1789,16 @@ type OnyxValuesMapping = {
     [ONYXKEYS.IS_LOADING_REPORT_DATA]: boolean;
     [ONYXKEYS.IS_SEARCH_FILTERS_CARD_DATA_LOADED]: boolean;
     [ONYXKEYS.IS_SEARCH_FILTERS_CATEGORY_DATA_LOADED]: boolean;
+    [ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED]: boolean;
+    [ONYXKEYS.RAM_ONLY_IS_LOADING_RULES]: boolean;
     [ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA]: boolean;
+    [ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED]: boolean;
+    [ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA]: boolean;
     [ONYXKEYS.IS_LOADING_SUBSCRIPTION_DATA]: boolean;
     [ONYXKEYS.IS_PENDING_UPDATE_PERSONAL_KARMA]: boolean;
     [ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN]: boolean;
     [ONYXKEYS.IS_LOADING_APP]: boolean;
+    [ONYXKEYS.IS_SWITCHING_TO_DELEGATOR]: boolean;
     [ONYXKEYS.ARE_AGENTS_LOADED]: boolean;
     [ONYXKEYS.AGENT_NEW_AVATAR_DRAFT]: OnyxTypes.AgentNewAvatarDraft;
     [ONYXKEYS.POLICY_ROOMS_METADATA]: Record<string, OnyxTypes.PolicyRoomsMetadata>;
@@ -1788,6 +1835,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID]: string;
     [ONYXKEYS.ONBOARDING_LAST_VISITED_PATH]: string;
     [ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS]: boolean;
+    [ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS]: string[] | null;
     [ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_PAGINATION]: OnyxTypes.SearchTagFiltersPaginationState;
     [ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_RESULTS]: OnyxTypes.SearchTagFilterItem[];
     [ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_USERS]: boolean;
@@ -1889,6 +1937,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY]: OnyxTypes.LastSearchParams;
     [ONYXKEYS.NVP_LAST_ANDROID_LOGIN]: string;
     [ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS]: string[];
+    [ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH]: number;
     [ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS]: Record<string, TransactionThreadNavigationDescriptor>;
     [ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES]: OnyxTypes.ExportTemplate[];
     [ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION]: OnboardingAccounting;
@@ -1903,7 +1952,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_REPORT_DETAILS_COLUMNS]: string[];
     [ONYXKEYS.HAS_DENIED_CONTACT_IMPORT_PROMPT]: boolean | undefined;
     [ONYXKEYS.PERSONAL_POLICY_ID]: string;
-    [ONYXKEYS.TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE]: Record<string, Record<string, boolean>>;
+    [ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS]: Record<string, SearchDataTypes>;
     [ONYXKEYS.ROOM_ID_HIGHLIGHT_ON_ROOMS_PAGE]: string | null;
     [ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID]: string | undefined;
 };
@@ -1918,7 +1967,9 @@ type OnyxDerivedValuesMapping = {
     [ONYXKEYS.DERIVED.CARD_FEED_ERRORS]: OnyxTypes.CardFeedErrorsDerivedValue;
     [ONYXKEYS.DERIVED.RAM_ONLY_SORTED_REPORT_ACTIONS]: OnyxTypes.SortedReportActionsDerivedValue;
     [ONYXKEYS.DERIVED.LOGIN_TO_ACCOUNT_ID_MAP]: OnyxTypes.LoginToAccountIDMapDerivedValue;
+    [ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE]: OnyxTypes.SpendDataSignatureDerivedValue;
     [ONYXKEYS.DERIVED.GUIDE_ACCOUNT_IDS]: OnyxTypes.GuideAccountIDsDerivedValue;
+    [ONYXKEYS.DERIVED.ONE_ON_ONE_CHAT_REPORT_IDS]: OnyxTypes.OneOnOneChatReportIDsDerivedValue;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping & OnyxDerivedValuesMapping;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 40eb53dd6ede..f10be93c951c 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -125,6 +125,7 @@ const DYNAMIC_ROUTES = {
             SCREENS.MONEY_REQUEST.STEP_CONFIRMATION,
             SCREENS.TRAVEL.MY_TRIPS,
             SCREENS.WORKSPACE.TRAVEL,
+            SCREENS.WORKSPACES_ADD_DOMAIN,
         ],
     },
     CONTACT_METHODS: {
@@ -1089,6 +1090,14 @@ const DYNAMIC_ROUTES = {
         path: 'rules/require-fields',
         entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
     },
+    WORKSPACE_CATEGORY_RULES_TAX_NEW: {
+        path: 'tax-default',
+        entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_RULES_NEW],
+    },
+    WORKSPACE_CATEGORY_RULES_TAX_EDIT: {
+        path: 'rules/tax',
+        entryScreens: [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_SETTINGS, SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS],
+    },
     RULES_MERCHANT_NEW_FROM_EXPENSE: {
         path: 'merchant-rule/new',
         entryScreens: [SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.RIGHT_MODAL.EXPENSE_REPORT, SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT],
@@ -1118,7 +1127,7 @@ const DYNAMIC_ROUTES = {
     },
     RULES_MERCHANT_TAX_FROM_EXPENSE: {
         path: 'rule-tax',
-        entryScreens: [SCREENS.WORKSPACE.DYNAMIC_RULES_MERCHANT_NEW],
+        entryScreens: [SCREENS.WORKSPACE.DYNAMIC_RULES_MERCHANT_NEW, SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_NEW, SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_EDIT],
     },
     RULES_MERCHANT_VENDOR_FROM_EXPENSE: {
         path: 'rule-vendor',
@@ -1375,6 +1384,7 @@ const DYNAMIC_ROUTES = {
             SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_DETAILS,
             SCREENS.WORKSPACE.ACCOUNTING.RILLET_CARD_ACCOUNT_CARD_LIST,
             SCREENS.WORKSPACE.ACCOUNTING.DUALENTRY_CARD_ACCOUNT_CARD_LIST,
+            SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT_CARD_LIST,
         ],
         getRoute: (feed: CardFeedWithDomainID, cardID: string) => `edit/export/${encodeURIComponent(feed)}/${encodeURIComponent(cardID)}` as const,
     },
@@ -2096,14 +2106,18 @@ const ROUTES = {
     },
     SEARCH_REPORT: {
         route: 'search/view/:reportID/:reportActionID?',
-        getRoute: ({reportID, reportActionID, backTo}: {reportID: string | undefined; reportActionID?: string; backTo?: string}) => {
+        getRoute: ({reportID, reportActionID, backTo, anchorTransactionID}: {reportID: string | undefined; reportActionID?: string; backTo?: string; anchorTransactionID?: string}) => {
             if (!reportID) {
                 Log.warn('Invalid reportID is used to build the SEARCH_REPORT route');
             }
 
             const baseRoute = reportActionID ? (`search/view/${reportID}/${reportActionID}` as const) : (`search/view/${reportID}` as const);
+            // Which expense in the prev/next carousel this screen is anchored to. The header falls back to it while
+            // the thread's own parent report action is still loading, so the carousel doesn't wink out of existence
+            // on a cold open (e.g. straight after clearing the cache).
+            const routeWithAnchor = anchorTransactionID ? (`${baseRoute}?anchorTransactionID=${anchorTransactionID}` as const) : baseRoute;
 
-            return getUrlWithBackToParam(baseRoute, backTo);
+            return getUrlWithBackToParam(routeWithAnchor, backTo);
         },
     },
 
@@ -2653,6 +2667,7 @@ const ROUTES = {
     SETTINGS_VACATION_DELEGATE: 'settings/profile/status/vacation-delegate',
     SETTINGS_VACATION_DELEGATE_MISSING_WORKSPACES: 'settings/profile/status/vacation-delegate/missing-workspaces',
     SETTINGS_TROUBLESHOOT: 'settings/troubleshoot',
+    SETTINGS_TROUBLESHOOT_SERVER: 'settings/troubleshoot/server',
     SETTINGS_HELP: 'settings/help',
 
     SETTINGS_SAVE_THE_WORLD: 'settings/teachersunite',
@@ -3030,12 +3045,19 @@ const ROUTES = {
     },
     WORKSPACE_OVERVIEW_CURRENCY: {
         route: 'workspaces/:policyID/overview/currency',
-        getRoute: (policyID: string, isForcedToChangeCurrency?: boolean) => {
-            let queryParams = '';
+        getRoute: (
+            policyID: string,
+            {isForcedToChangeCurrency, shouldStartExpensifyCardEnrollment}: {isForcedToChangeCurrency?: boolean; shouldStartExpensifyCardEnrollment?: boolean} = {},
+        ) => {
+            const params = new URLSearchParams();
             if (isForcedToChangeCurrency) {
-                queryParams += `?isForcedToChangeCurrency=true`;
+                params.set('isForcedToChangeCurrency', 'true');
+            }
+            if (shouldStartExpensifyCardEnrollment) {
+                params.set('shouldStartExpensifyCardEnrollment', 'true');
             }
-            return `workspaces/${policyID}/overview/currency${queryParams}` as const;
+            const query = params.toString();
+            return `workspaces/${policyID}/overview/currency${query ? `?${query}` : ''}` as const;
         },
     },
     POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT: {
@@ -3628,6 +3650,10 @@ const ROUTES = {
         route: 'workspaces/:policyID/members/:accountID/role',
         getRoute: (policyID: string, accountID: number) => `workspaces/${policyID}/members/${accountID}/role` as const,
     },
+    WORKSPACE_MEMBER_WORK_ARRANGEMENT: {
+        route: 'workspaces/:policyID/members/:accountID/work-arrangement',
+        getRoute: (policyID: string, accountID: number) => `workspaces/${policyID}/members/${accountID}/work-arrangement` as const,
+    },
     WORKSPACE_CUSTOM_FIELDS: {
         route: 'workspaces/:policyID/members/:accountID/:customFieldType',
         getRoute: (policyID: string, accountID: number, customFieldType: CustomFieldType) => `/workspaces/${policyID}/members/${accountID}/${customFieldType}` as const,
@@ -5094,6 +5120,22 @@ const ROUTES = {
         route: 'workspaces/:policyID/accounting/campfire/export/company-card-account',
         getRoute: (policyID: string) => `workspaces/${policyID}/accounting/campfire/export/company-card-account` as const,
     },
+    POLICY_ACCOUNTING_CAMPFIRE_CARD_PROGRAM_ACCOUNT: {
+        route: 'workspaces/:policyID/accounting/campfire/export/card-program-account',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/campfire/export/card-program-account` as const,
+    },
+    POLICY_ACCOUNTING_CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR: {
+        route: 'workspaces/:policyID/accounting/campfire/export/card-program-account/:feed',
+        getRoute: (policyID: string, feed: CardFeedWithDomainID) => `workspaces/${policyID}/accounting/campfire/export/card-program-account/${encodeURIComponent(feed)}` as const,
+    },
+    POLICY_ACCOUNTING_CAMPFIRE_CARD_ACCOUNT: {
+        route: 'workspaces/:policyID/accounting/campfire/export/card-account',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/campfire/export/card-account` as const,
+    },
+    POLICY_ACCOUNTING_CAMPFIRE_CARD_ACCOUNT_CARD_LIST: {
+        route: 'workspaces/:policyID/accounting/campfire/export/card-account/:feed',
+        getRoute: (policyID: string, feed: CardFeedWithDomainID) => `workspaces/${policyID}/accounting/campfire/export/card-account/${encodeURIComponent(feed)}` as const,
+    },
     POLICY_ACCOUNTING_CAMPFIRE_ADVANCED: {
         route: 'workspaces/:policyID/accounting/campfire/advanced',
         getRoute: (policyID: string) => `workspaces/${policyID}/accounting/campfire/advanced` as const,
@@ -5134,6 +5176,42 @@ const ROUTES = {
         route: 'workspaces/:policyID/accounting/business-central/import',
         getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/import` as const,
     },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT: {
+        route: 'workspaces/:policyID/accounting/business-central/export',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER: {
+        route: 'workspaces/:policyID/accounting/business-central/export/preferred-exporter',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/preferred-exporter` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_DATE: {
+        route: 'workspaces/:policyID/accounting/business-central/export/date',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/date` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: {
+        route: 'workspaces/:policyID/accounting/business-central/export/reimbursable-destination',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/reimbursable-destination` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT: {
+        route: 'workspaces/:policyID/accounting/business-central/export/reimbursable-account',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/reimbursable-account` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION: {
+        route: 'workspaces/:policyID/accounting/business-central/export/non-reimbursable-destination',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/non-reimbursable-destination` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT: {
+        route: 'workspaces/:policyID/accounting/business-central/export/company-card-account',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/company-card-account` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR: {
+        route: 'workspaces/:policyID/accounting/business-central/export/default-vendor',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/default-vendor` as const,
+    },
+    POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD: {
+        route: 'workspaces/:policyID/accounting/business-central/export/payment-method',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/business-central/export/payment-method` as const,
+    },
     ADD_EXISTING_EXPENSE: {
         route: 'search/r/:reportID/add-existing-expense/:backToReport?',
         getRoute: (reportID: string | undefined, backToReport?: string) => `search/r/${reportID}/add-existing-expense/${backToReport ?? ''}` as const,
@@ -5233,6 +5311,11 @@ const ROUTES = {
 
         getRoute: (backTo?: string) => getUrlWithBackToParam('test-tools' as const, backTo),
     },
+    TEST_TOOLS_SERVER: {
+        route: 'test-tools/server',
+
+        getRoute: (backTo?: string) => getUrlWithBackToParam('test-tools/server' as const, backTo),
+    },
     WORKSPACES_VERIFY_DOMAIN: {
         route: 'workspaces/verify-domain/:domainAccountID',
         getRoute: (domainAccountID: number) => `workspaces/verify-domain/${domainAccountID}` as const,
@@ -5242,7 +5325,6 @@ const ROUTES = {
         getRoute: (domainAccountID: number) => `workspaces/domain-verified/${domainAccountID}` as const,
     },
     WORKSPACES_ADD_DOMAIN: 'workspaces/add-domain',
-    WORKSPACES_ADD_DOMAIN_VERIFY_ACCOUNT: `workspaces/add-domain/${VERIFY_ACCOUNT}`,
     WORKSPACES_DOMAIN_ADDED: {
         route: 'workspaces/domain-added/:domainAccountID',
         getRoute: (domainAccountID: number) => `workspaces/domain-added/${domainAccountID}` as const,
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index f39a2448a606..1e6e1d4f9b0c 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -93,6 +93,7 @@ const SCREENS = {
         REPORT_CARD_LOST_OR_DAMAGED: 'Settings_ReportCardLostOrDamaged',
         REPORT_CARD_LOST_OR_DAMAGED_CONFIRM_VALIDATE_CODE: 'Settings_ReportCardLostOrDamaged_ConfirmValidateCode',
         TROUBLESHOOT: 'Settings_Troubleshoot',
+        TROUBLESHOOT_SERVER: 'Settings_Troubleshoot_Server',
         HELP: 'Settings_Help',
         DYNAMIC_VERIFY_ACCOUNT: 'Dynamic_Verify_Account',
         DYNAMIC_ADD_BANK_ACCOUNT_VERIFY_ACCOUNT: 'Dynamic_Add_Bank_Account_Verify_Account',
@@ -740,6 +741,10 @@ const SCREENS = {
             CAMPFIRE_VENDOR_BILL_DATE: 'Policy_Accounting_Campfire_Vendor_Bill_Date',
             CAMPFIRE_DEFAULT_COMPANY_CARD_VENDOR: 'Policy_Accounting_Campfire_Default_Company_Card_Vendor',
             CAMPFIRE_COMPANY_CARD_ACCOUNT: 'Policy_Accounting_Campfire_Company_Card_Account',
+            CAMPFIRE_CARD_PROGRAM_ACCOUNT: 'Policy_Accounting_Campfire_Card_Program_Account',
+            CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR: 'Policy_Accounting_Campfire_Card_Program_Account_Selector',
+            CAMPFIRE_CARD_ACCOUNT: 'Policy_Accounting_Campfire_Card_Account',
+            CAMPFIRE_CARD_ACCOUNT_CARD_LIST: 'Policy_Accounting_Campfire_Card_Account_Card_List',
             CAMPFIRE_ADVANCED: 'Policy_Accounting_Campfire_Advanced',
             CAMPFIRE_EXPORT_METHOD: 'Policy_Accounting_Campfire_Export_Method',
             CAMPFIRE_BILL_PAYMENT_ACCOUNT: 'Policy_Accounting_Campfire_Bill_Payment_Account',
@@ -750,6 +755,15 @@ const SCREENS = {
             BUSINESS_CENTRAL_SETUP: 'Policy_Accounting_Business_Central_Setup',
             BUSINESS_CENTRAL_COMPANY_SELECTOR: 'Policy_Accounting_Business_Central_Company_Selector',
             BUSINESS_CENTRAL_IMPORT: 'Policy_Accounting_Business_Central_Import',
+            BUSINESS_CENTRAL_EXPORT: 'Policy_Accounting_Business_Central_Export',
+            BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER: 'Policy_Accounting_Business_Central_Export_Preferred_Exporter',
+            BUSINESS_CENTRAL_EXPORT_DATE: 'Policy_Accounting_Business_Central_Export_Date',
+            BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'Policy_Accounting_Business_Central_Export_Reimbursable_Expenses_Export_Destination',
+            BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT: 'Policy_Accounting_Business_Central_Export_Reimbursable_Account',
+            BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'Policy_Accounting_Business_Central_Export_Nonreimbursable_Expenses_Export_Destination',
+            BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT: 'Policy_Accounting_Business_Central_Export_Company_Card_Account',
+            BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR: 'Policy_Accounting_Business_Central_Export_Default_Vendor',
+            BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD: 'Policy_Accounting_Business_Central_Export_Payment_Method',
             CARD_RECONCILIATION: 'Policy_Accounting_Card_Reconciliation',
             CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC: 'Policy_Accounting_Card_Reconciliation_Sage_Intacct_Auto_Sync',
             DYNAMIC_RECONCILIATION_ACCOUNT_SETTINGS: 'Dynamic_Policy_Accounting_Reconciliation_Account_Settings',
@@ -920,6 +934,8 @@ const SCREENS = {
         DYNAMIC_CATEGORY_FLAG_FOR_REVIEW_RULE_AMOUNT: 'Dynamic_Category_Flag_For_Review_Rule_Amount',
         DYNAMIC_CATEGORY_REQUIRE_FIELDS_RULE_NEW: 'Dynamic_Category_Require_Fields_Rule_New',
         DYNAMIC_CATEGORY_REQUIRE_FIELDS_RULE_EDIT: 'Dynamic_Category_Require_Fields_Rule_Edit',
+        DYNAMIC_CATEGORY_TAX_RULE_NEW: 'Dynamic_Category_Tax_Rule_New',
+        DYNAMIC_CATEGORY_TAX_RULE_EDIT: 'Dynamic_Category_Tax_Rule_Edit',
         CATEGORIES_SETTINGS: 'Categories_Settings',
         DYNAMIC_CATEGORIES_SETTINGS: 'Dynamic_Categories_Settings',
         DYNAMIC_CATEGORIES_IMPORT: 'Dynamic_Categories_Import',
@@ -929,6 +945,7 @@ const SCREENS = {
         MORE_FEATURES: 'Workspace_More_Features',
         MEMBER_DETAILS: 'Workspace_Member_Details',
         MEMBER_DETAILS_ROLE: 'Workspace_Member_Details_Role',
+        MEMBER_WORK_ARRANGEMENT: 'Workspace_Member_Work_Arrangement',
         MEMBER_CUSTOM_FIELD: 'Workspace_Member_Custom_Field',
         MEMBER_NEW_CARD: 'Workspace_Member_NewCard',
         DYNAMIC_OWNER_CHANGE_CHECK: 'Dynamic_Workspace_Owner_Change_Check',
@@ -1167,11 +1184,11 @@ const SCREENS = {
     },
     TEST_TOOLS_MODAL: {
         ROOT: 'TestToolsModal_Root',
+        SERVER: 'TestToolsModal_Server',
     },
     WORKSPACES_VERIFY_DOMAIN: 'Workspaces_Verify_Domain',
     WORKSPACES_DOMAIN_VERIFIED: 'Workspaces_Domain_Verified',
     WORKSPACES_ADD_DOMAIN: 'Workspaces_Add_Domain',
-    WORKSPACES_ADD_DOMAIN_VERIFY_ACCOUNT: 'Workspaces_Add_Domain_VerifyAccount',
     WORKSPACES_DOMAIN_ADDED: 'Workspaces_Domain_Added',
     WORKSPACES_DOMAIN_ACCESS_RESTRICTED: 'Workspaces_Domain_Access_Restricted',
     WORKSPACES_DOMAIN_ALREADY_EXISTS: 'Workspaces_Domain_Already_Exists',
diff --git a/src/components/AccountSwitcherButton.tsx b/src/components/AccountSwitcherButton.tsx
index e7697eb41cc2..476bbf091f28 100644
--- a/src/components/AccountSwitcherButton.tsx
+++ b/src/components/AccountSwitcherButton.tsx
@@ -15,7 +15,7 @@ import {clearDelegatorErrors, connect, disconnect} from '@libs/actions/Delegate'
 import {close} from '@libs/actions/Modal';
 import {getLatestError} from '@libs/ErrorUtils';
 import {getGpsPoints, stopGpsTrip} from '@libs/GPSDraftDetailsUtils';
-import {sortAlphabetically} from '@libs/OptionsListUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import type {AnchorPosition} from '@styles/index';
diff --git a/src/components/AddExistingExpenseFooter.tsx b/src/components/AddExistingExpenseFooter.tsx
index 2e0a07da4fe1..5a3a5831fff9 100644
--- a/src/components/AddExistingExpenseFooter.tsx
+++ b/src/components/AddExistingExpenseFooter.tsx
@@ -63,6 +63,7 @@ function AddExistingExpenseFooter({selectedIds, report, reportToConfirm, policy,
     const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
 
     const [transactions] = useTransactionsByID(selectedIds);
     const reports = useChangeTransactionsReportReports(transactions, reportToConfirm?.reportID);
@@ -111,6 +112,7 @@ function AddExistingExpenseFooter({selectedIds, report, reportToConfirm, policy,
                         allTransactionViolation: transactionViolations,
                         reports,
                         rules,
+                        cardList,
                         isTrackIntentUser,
                         personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
                         selfDMReportActions,
diff --git a/src/components/ApprovalWorkflowSection.tsx b/src/components/ApprovalWorkflowSection.tsx
index a5127864dfd3..942e62683cac 100644
--- a/src/components/ApprovalWorkflowSection.tsx
+++ b/src/components/ApprovalWorkflowSection.tsx
@@ -5,7 +5,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {sortAlphabetically} from '@libs/OptionsListUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import {getApprovalLimitDescription} from '@libs/WorkflowUtils';
 
 import CONST from '@src/CONST';
diff --git a/src/components/ApproverSelectionList.tsx b/src/components/ApproverSelectionList.tsx
index 2775c1edf2ab..833e9a64baec 100644
--- a/src/components/ApproverSelectionList.tsx
+++ b/src/components/ApproverSelectionList.tsx
@@ -6,9 +6,10 @@ import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
-import {getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
+import {getSearchValueForPhoneOrEmail} from '@libs/OptionsListUtils';
 import {goBackFromInvalidPolicy, isPendingDeletePolicy, isPolicyAdmin} from '@libs/PolicyUtils';
 import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import variables from '@styles/variables';
@@ -191,7 +192,7 @@ function ApproverSelectionList({
                     shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
                     disableMaintainingScrollPosition
                     showScrollIndicator
-                    isRowMultilineSupported
+                    titleNumberOfLines={2}
                 />
             </FullPageNotFoundView>
         </ScreenWrapper>
diff --git a/src/components/ArchivedReportFooter.tsx b/src/components/ArchivedReportFooter.tsx
index 360b4f28371b..7b8454966b8c 100644
--- a/src/components/ArchivedReportFooter.tsx
+++ b/src/components/ArchivedReportFooter.tsx
@@ -1,6 +1,7 @@
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
@@ -9,8 +10,6 @@ import {getPolicyName} from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList} from '@src/types/onyx';
-import {getEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {getLastClosedReportAction} from '@selectors/ReportAction';
 import lodashEscape from 'lodash/escape';
@@ -28,10 +27,10 @@ function ArchivedReportFooter({reportID}: ArchivedReportFooterProps) {
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
 
-    const [personalDetails = getEmptyObject<PersonalDetailsList>()] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [reportClosedAction] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {selector: getLastClosedReportAction});
     const originalMessage = isClosedAction(reportClosedAction) ? getOriginalMessage(reportClosedAction) : null;
     const archiveReason = originalMessage?.reason ?? CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+    const [personalDetails] = usePersonalDetailsByIDs([reportClosedAction?.actorAccountID, originalMessage?.newAccountID, originalMessage?.oldAccountID]);
     const actorPersonalDetails = personalDetails?.[reportClosedAction?.actorAccountID ?? CONST.DEFAULT_NUMBER_ID];
     let displayName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: actorPersonalDetails, translate, formatPhoneNumber});
 
diff --git a/src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx b/src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx
index 3ab9ffb5a3ad..c207987a8ad7 100644
--- a/src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx
+++ b/src/components/Attachments/AttachmentCarousel/AttachmentCarouselView/index.tsx
@@ -23,7 +23,7 @@ import CONST from '@src/CONST';
 
 import type {RefObject} from 'react';
 import type {ListRenderItemInfo} from 'react-native';
-import type {ComposedGesture, GestureType} from 'react-native-gesture-handler';
+import type {LegacyComposedGesture, GestureType} from 'react-native-gesture-handler';
 
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {Keyboard, PixelRatio, View} from 'react-native';
@@ -42,7 +42,7 @@ const MIN_FLING_VELOCITY = 500;
 
 type DeviceAwareGestureDetectorProps = {
     canUseTouchScreen: boolean;
-    gesture: ComposedGesture | GestureType;
+    gesture: LegacyComposedGesture | GestureType;
     children: React.ReactNode;
 };
 
diff --git a/src/components/Attachments/AttachmentView/index.tsx b/src/components/Attachments/AttachmentView/index.tsx
index 61132ec616cd..d573a3bba224 100644
--- a/src/components/Attachments/AttachmentView/index.tsx
+++ b/src/components/Attachments/AttachmentView/index.tsx
@@ -2,11 +2,11 @@ import {useAttachmentCarouselPagerActions} from '@components/Attachments/Attachm
 import MultiGestureIcon from '@components/Attachments/MultiGestureIcon';
 import type {Attachment, AttachmentSource} from '@components/Attachments/types';
 import Button from '@components/Button';
-import DistanceEReceipt from '@components/DistanceEReceipt';
 import EReceipt from '@components/EReceipt';
 import Icon from '@components/Icon';
 import {useSession} from '@components/OnyxListItemProvider';
 import PerDiemEReceipt from '@components/PerDiemEReceipt';
+import ScaledDistanceEReceipt from '@components/ScaledDistanceEReceipt';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import {usePlaybackActionsContext} from '@components/VideoPlayerContexts/PlaybackContext';
@@ -28,7 +28,7 @@ import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import {getFileResolution, isHighResolutionImage} from '@libs/fileDownload/FileUtils';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import {hasEReceipt, hasReceiptSource, isDistanceRequest, isManualDistanceRequest, isOdometerDistanceRequest, isPerDiemRequest} from '@libs/TransactionUtils';
+import {hasEReceipt, hasReceiptSource, isMapBasedDistanceRequest, isPerDiemRequest} from '@libs/TransactionUtils';
 
 import type {ColorValue} from '@styles/utils/types';
 import variables from '@styles/variables';
@@ -244,6 +244,16 @@ function AttachmentView({
         );
     }
 
+    // New Expensify builds the distance e-receipt from the expense, which is why the server stores only the route
+    // map as the thumbnail for it to draw around. The generated PDF beside it is for Expensify Classic, which
+    // cannot build one in the frontend, and it prints the routed trip rather than what the expense bills. Showing
+    // that PDF here made the enlarged receipt contradict every other surface, so draw the card instead. This runs
+    // before the PDF branch below, which would otherwise return first.
+    // See https://github.com/Expensify/Expensify/issues/545298 and https://github.com/Expensify/App/issues/97013.
+    if (transaction && isMapBasedDistanceRequest(transaction)) {
+        return <ScaledDistanceEReceipt transaction={transaction} />;
+    }
+
     // Check both source and file.name since PDFs dragged into the text field
     // will appear with a source that is a blob
     const isSourcePDF = typeof source === 'string' && Str.isPDF(source);
@@ -303,14 +313,6 @@ function AttachmentView({
         );
     }
 
-    if (isDistanceRequest(transaction) && !isManualDistanceRequest(transaction) && !isOdometerDistanceRequest(transaction) && transaction) {
-        // Distance eReceipts are now generated as a PDF, but to keep it backwards compatible we still show the old eReceipt view for image receipts
-        const isImageReceiptSource = checkIsFileImage(source, file?.name, file?.type);
-        if (!hasReceiptSource(transaction) || isImageReceiptSource) {
-            return <DistanceEReceipt transaction={transaction} />;
-        }
-    }
-
     // For this check we use both source and file.name since temporary file source is a blob
     // both PDFs and images will appear as images when pasted into the text field.
     // We also check for numeric source since this is how static images (used for preview) are represented in RN.
diff --git a/src/components/Avatar/connected/ChatThreadAvatar.tsx b/src/components/Avatar/connected/ChatThreadAvatar.tsx
new file mode 100644
index 000000000000..8782125c547d
--- /dev/null
+++ b/src/components/Avatar/connected/ChatThreadAvatar.tsx
@@ -0,0 +1,166 @@
+import type {HorizontalStackingOptions} from '@components/Avatar/layouts/HorizontalAvatars';
+import SingleAvatar from '@components/Avatar/layouts/SingleAvatar';
+import SubscriptAvatar from '@components/Avatar/layouts/SubscriptAvatar';
+import type {AvatarIcon} from '@components/Avatar/types';
+import {usePersonalDetails} from '@components/OnyxListItemProvider';
+
+import useDefaultAvatars from '@hooks/useDefaultAvatars';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+import useStyleUtils from '@hooks/useStyleUtils';
+
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import {
+    getDelegateAccountIDFromReportAction,
+    getHumanAgentAccountIDFromReportAction,
+    getHumanAgentFirstName,
+    getOriginalMessage,
+    getReportActionActorAccountID,
+    isMoneyRequestAction,
+    isTransactionThread,
+} from '@libs/ReportActionsUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type {ColorValue, StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+
+import {reportAvatarFieldsSelector, reportAvatarKindSelector} from '@selectors/Report';
+import {getParentReportActionSelector} from '@selectors/ReportAction';
+import React from 'react';
+
+import useAccountIcons, {seedFallbackIcons} from './useAccountIcons';
+import WorkspaceHorizontalAvatars from './WorkspaceHorizontalAvatars';
+import WorkspaceSubscriptAvatar from './WorkspaceSubscriptAvatar';
+
+type SortingOption = ValueOf<typeof CONST.REPORT_ACTION_AVATARS.SORT_BY>;
+
+type ChatThreadAvatarProps = {
+    /** Chat thread whose avatars to render */
+    reportID: string;
+
+    /** Size of the avatar */
+    size: ValueOf<typeof CONST.AVATAR_SIZE>;
+
+    /** Color of the row surface behind the avatar. Affects secondary avatar so it blends into the row. */
+    backdropColor?: ColorValue;
+
+    /** Container styles for the single-avatar layout. Replaces the size-derived default container styles when provided */
+    containerStyle?: StyleProp<ViewStyle>;
+
+    /** Container styles for the subscript stack, merged over its size-derived defaults */
+    subscriptContainerStyle?: StyleProp<ViewStyle>;
+
+    /** Whether (and how) to stack the avatars horizontally. Only a thread that pairs its actor with a workspace icon has a second avatar to stack */
+    horizontalStacking?: HorizontalStackingOptions | boolean;
+
+    /** How to order the avatars before rendering them. Only applies to a horizontal stack, where every avatar sits in an equivalent slot */
+    sort?: SortingOption | SortingOption[];
+
+    /** Display name used as a fallback for avatar tooltips */
+    fallbackDisplayName?: string;
+};
+
+/** Renders a chat thread's avatars from its parent report action. */
+function ChatThreadAvatar({reportID, size, backdropColor, containerStyle, subscriptContainerStyle, horizontalStacking, sort, fallbackDisplayName}: ChatThreadAvatarProps) {
+    const StyleUtils = useStyleUtils();
+    const {translate} = useLocalize();
+    const personalDetails = usePersonalDetails();
+    const defaultAvatars = useDefaultAvatars();
+
+    const [thread] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: reportAvatarFieldsSelector});
+    const parentReportID = getNonEmptyStringOnyxID(thread?.parentReportID);
+    const [parentKind] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`, {selector: reportAvatarKindSelector});
+    const [parentAction] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, {
+        selector: (actions) => getParentReportActionSelector(actions, thread?.parentReportActionID),
+    });
+
+    // A transaction thread points `chatReportID` at its parent, a comment thread leaves it unset. Only a linked thread shows the copilot, the revealed agent and the expense subscript.
+    const isParentActionLinked = !!parentKind && !!thread?.chatReportID && thread.chatReportID === thread.parentReportID;
+    // An expense request is a transaction thread under an expense report.
+    const isExpenseRequest = parentKind === CONST.REPORT_AVATAR_KIND.EXPENSE && isTransactionThread(parentAction);
+    // Only a created expense takes the subscript. A tracked expense or a paid send-money action keeps a single avatar.
+    const isCreatedExpenseRequest =
+        isParentActionLinked && isExpenseRequest && isMoneyRequestAction(parentAction) && getOriginalMessage(parentAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE;
+    // A trip room is a thread of its trip preview, so it gets the workspace subscript too.
+    const hasTripRoomChatType = thread?.chatType === CONST.REPORT.CHAT_TYPE.TRIP_ROOM;
+    const isArchivedTripRoom = useReportIsArchived(hasTripRoomChatType ? reportID : undefined);
+    // Once a linked parent action loads, only a trip preview gives the subscript, archived or not. Without one, an archived trip room drops it. A horizontal stack never takes it.
+    const hasTripRoomSubscript =
+        !horizontalStacking && hasTripRoomChatType && (isParentActionLinked && !!parentAction ? parentAction.actionName === CONST.REPORT.ACTIONS.TYPE.TRIP_PREVIEW : !isArchivedTripRoom);
+    // A thread inherits its room's chat type.
+    const isWorkspaceThread = CONST.WORKSPACE_ROOM_TYPES.some((chatType) => thread?.chatType === chatType);
+
+    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    // A thread under the Concierge chat is a conversation with Concierge, so it shows Concierge rather than whoever asked.
+    const isConciergeThread = !!conciergeReportID && parentReportID === conciergeReportID;
+
+    const delegateAccountID = isParentActionLinked && !isConciergeThread ? getDelegateAccountIDFromReportAction(parentAction) : undefined;
+    // Concierge for harvested and automatic actions.
+    const actorAccountID = getReportActionActorAccountID(parentAction, undefined, undefined);
+    const humanAgentAccountID = isParentActionLinked ? getHumanAgentAccountIDFromReportAction(parentAction) : undefined;
+    // The copilot and a revealed agent only show once their personal details have loaded. Until then the actor or Concierge stands alone, though the copilot badge still shows.
+    const loadedDelegateAccountID = delegateAccountID && personalDetails?.[delegateAccountID] ? delegateAccountID : undefined;
+    const loadedHumanAgentAccountID = humanAgentAccountID && personalDetails?.[humanAgentAccountID] ? humanAgentAccountID : undefined;
+    const primaryAccountID = isConciergeThread ? CONST.ACCOUNT_ID.CONCIERGE : (loadedDelegateAccountID ?? actorAccountID ?? CONST.DEFAULT_NUMBER_ID);
+    const iconAccountIDs = loadedHumanAgentAccountID ? [primaryAccountID, loadedHumanAgentAccountID] : [primaryAccountID];
+    const accountIcons = useAccountIcons(iconAccountIDs);
+    // A linked thread keeps the generic fallback for an account without personal details. Any other thread seeds a default avatar from the account ID.
+    const [primaryAvatar, humanAgentIcon] = isParentActionLinked ? accountIcons : seedFallbackIcons(accountIcons, iconAccountIDs, defaultAvatars.FallbackAvatar);
+
+    // A horizontal stack pairs every workspace thread with its workspace icon. Without one, only a created expense request and a trip room show it, as a subscript.
+    if (horizontalStacking && (isExpenseRequest || (hasTripRoomChatType && !isArchivedTripRoom) || isWorkspaceThread)) {
+        return (
+            <WorkspaceHorizontalAvatars
+                report={thread}
+                primaryAvatar={primaryAvatar}
+                size={size}
+                horizontalStacking={horizontalStacking}
+                sort={sort}
+                fallbackDisplayName={fallbackDisplayName}
+            />
+        );
+    }
+
+    // The subscript shows the copilot as the primary avatar without the copilot badge, which only the single avatar carries.
+    if (isCreatedExpenseRequest || hasTripRoomSubscript) {
+        return (
+            <WorkspaceSubscriptAvatar
+                report={thread}
+                primaryAvatar={primaryAvatar}
+                size={size}
+                backdropColor={backdropColor}
+                containerStyle={subscriptContainerStyle}
+                fallbackDisplayName={fallbackDisplayName}
+            />
+        );
+    }
+
+    if (humanAgentIcon) {
+        return (
+            <SubscriptAvatar
+                primaryAvatar={primaryAvatar}
+                secondaryAvatar={{...humanAgentIcon, name: getHumanAgentFirstName(parentAction, personalDetails) ?? translate('reportAction.humanSupportAgent')}}
+                size={size}
+                backdropColor={backdropColor}
+                containerStyle={subscriptContainerStyle}
+                fallbackDisplayName={fallbackDisplayName}
+            />
+        );
+    }
+
+    const singleAvatar: AvatarIcon = delegateAccountID ? {...primaryAvatar, copilot: {accountID: delegateAccountID, actedForAccountID: actorAccountID}} : primaryAvatar;
+
+    return (
+        <SingleAvatar
+            avatar={singleAvatar}
+            size={size}
+            containerStyles={containerStyle ?? StyleUtils.getContainerStyles(size)}
+            fallbackDisplayName={fallbackDisplayName}
+        />
+    );
+}
+
+export default ChatThreadAvatar;
diff --git a/src/components/Avatar/connected/ExpenseReportAvatar.tsx b/src/components/Avatar/connected/ExpenseReportAvatar.tsx
index 681b38b08fbf..c28e48b1fc2e 100644
--- a/src/components/Avatar/connected/ExpenseReportAvatar.tsx
+++ b/src/components/Avatar/connected/ExpenseReportAvatar.tsx
@@ -1,12 +1,9 @@
-import SubscriptAvatar from '@components/Avatar/layouts/SubscriptAvatar';
 import type {AvatarIcon} from '@components/Avatar/types';
 
-import useDefaultAvatars from '@hooks/useDefaultAvatars';
 import useOnyx from '@hooks/useOnyx';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {getDelegateAccountIDFromReportAction} from '@libs/ReportActionsUtils';
-import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -16,12 +13,12 @@ import type {ColorValue, StyleProp, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
-import {expenseReportAvatarSelector} from '@selectors/Report';
+import {reportAvatarFieldsSelector} from '@selectors/Report';
 import {getReportActionByIDSelector} from '@selectors/ReportAction';
 import React from 'react';
 
-import useAccountIcons from './useAccountIcons';
-import useReportWorkspaceIcon from './useReportWorkspaceIcon';
+import {useSeededAccountIcons} from './useAccountIcons';
+import WorkspaceSubscriptAvatar from './WorkspaceSubscriptAvatar';
 
 type ExpenseReportAvatarProps = {
     /** Expense report whose avatars to render */
@@ -41,32 +38,25 @@ type ExpenseReportAvatarProps = {
 };
 
 /**
- * Renders an expense report's avatars: the report owner as the primary avatar with the workspace icon as the subscript.
+ * Renders an expense report's avatars: the owner with the workspace icon as the subscript.
  * When a copilot created the report on the owner's behalf, the copilot is the primary avatar instead, matching the LHN row.
- * Expense reports never render in any other layout.
  */
 function ExpenseReportAvatar({reportID, size, backdropColor, containerStyle, fallbackDisplayName}: ExpenseReportAvatarProps) {
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: expenseReportAvatarSelector});
-    const defaultAvatars = useDefaultAvatars();
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: reportAvatarFieldsSelector});
     const parentReportActionID = report?.parentReportActionID;
     const delegateAccountIDSelector = (reportActions: OnyxEntry<ReportActions>) => getDelegateAccountIDFromReportAction(getReportActionByIDSelector(reportActions, parentReportActionID));
+    // An optimistic expense report links its workspace chat only through chatReportID.
     const parentChatReportID = getNonEmptyStringOnyxID(report?.chatReportID) ?? getNonEmptyStringOnyxID(report?.parentReportID);
     const [delegateAccountID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentChatReportID}`, {selector: delegateAccountIDSelector});
     const ownerAccountID = report?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID;
     const primaryAccountID = delegateAccountID ?? ownerAccountID;
-    const [primaryIcon] = useAccountIcons([primaryAccountID]);
-    // Get deterministic user fallback icon instead of generic.
-    const resolvedIcon =
-        primaryIcon.source === defaultAvatars.FallbackAvatar && primaryAccountID !== CONST.DEFAULT_NUMBER_ID
-            ? {...primaryIcon, source: getDefaultAvatarURL({accountID: primaryAccountID})}
-            : primaryIcon;
-    const primaryAvatar: AvatarIcon = delegateAccountID ? {...resolvedIcon, copilot: {accountID: delegateAccountID, actedForAccountID: ownerAccountID}} : resolvedIcon;
-    const workspaceIcon = useReportWorkspaceIcon(report);
+    const [primaryIcon] = useSeededAccountIcons([primaryAccountID]);
+    const primaryAvatar: AvatarIcon = delegateAccountID ? {...primaryIcon, copilot: {accountID: delegateAccountID, actedForAccountID: ownerAccountID}} : primaryIcon;
 
     return (
-        <SubscriptAvatar
+        <WorkspaceSubscriptAvatar
+            report={report}
             primaryAvatar={primaryAvatar}
-            secondaryAvatar={workspaceIcon}
             size={size}
             backdropColor={backdropColor}
             containerStyle={containerStyle}
diff --git a/src/components/Avatar/connected/PolicyExpenseChatAvatar.tsx b/src/components/Avatar/connected/PolicyExpenseChatAvatar.tsx
new file mode 100644
index 000000000000..a43d74f226e8
--- /dev/null
+++ b/src/components/Avatar/connected/PolicyExpenseChatAvatar.tsx
@@ -0,0 +1,124 @@
+import HorizontalAvatars from '@components/Avatar/layouts/HorizontalAvatars';
+import type {HorizontalStackingOptions} from '@components/Avatar/layouts/HorizontalAvatars';
+import SingleAvatar from '@components/Avatar/layouts/SingleAvatar';
+import SubscriptAvatar from '@components/Avatar/layouts/SubscriptAvatar';
+import {PersonalDetailsContext} from '@components/OnyxListItemProvider';
+
+import useDefaultAvatars from '@hooks/useDefaultAvatars';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
+import useStyleUtils from '@hooks/useStyleUtils';
+
+import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
+import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+
+import type {ColorValue, StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+
+import {reportAvatarFieldsSelector} from '@selectors/Report';
+import React, {use} from 'react';
+
+import useReportWorkspaceIcon from './useReportWorkspaceIcon';
+import useSortedIcons from './useSortedIcons';
+
+type SortingOption = ValueOf<typeof CONST.REPORT_ACTION_AVATARS.SORT_BY>;
+
+type PolicyExpenseChatAvatarProps = {
+    /** Policy expense chat whose avatars to render */
+    reportID: string;
+
+    /** Size of the avatar */
+    size: ValueOf<typeof CONST.AVATAR_SIZE>;
+
+    /** Color of the row surface behind the avatar. Affects secondary avatar so it blends into the row. */
+    backdropColor?: ColorValue;
+
+    /** Container styles for the single-avatar layout. Replaces the size-derived default container styles when provided */
+    containerStyle?: StyleProp<ViewStyle>;
+
+    /** Container styles for the subscript stack, merged over its size-derived defaults */
+    subscriptContainerStyle?: StyleProp<ViewStyle>;
+
+    /** Whether (and how) to stack the workspace icon and the member side by side instead of nesting the member as the subscript */
+    horizontalStacking?: HorizontalStackingOptions | boolean;
+
+    /** How to order the avatars before rendering them. Only applies to a horizontal stack, where every avatar sits in an equivalent slot */
+    sort?: SortingOption | SortingOption[];
+
+    /** Display name used as a fallback for avatar tooltips */
+    fallbackDisplayName?: string;
+};
+
+/** Renders a policy expense chat's avatars: the workspace icon with the member as the subscript, or side by side inside a horizontal stack. */
+function PolicyExpenseChatAvatar({reportID, size, backdropColor, containerStyle, subscriptContainerStyle, horizontalStacking, sort, fallbackDisplayName}: PolicyExpenseChatAvatarProps) {
+    const StyleUtils = useStyleUtils();
+    const {formatPhoneNumber, translate} = useLocalize();
+    const [personalDetailsFromSnapshot] = useAllPersonalDetails();
+    // On Search, the snapshot can hold a member missing from the live list. Like the legacy component, fall back to the live list while the snapshot loads.
+    const personalDetails = personalDetailsFromSnapshot ?? use(PersonalDetailsContext);
+    const defaultAvatars = useDefaultAvatars();
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: reportAvatarFieldsSelector});
+    const workspaceIcon = useReportWorkspaceIcon(report);
+
+    // The unknown account, standing in for a missing workspace or member the same way the legacy component does.
+    const placeholderIcon: Icon = {id: CONST.DEFAULT_NUMBER_ID, type: CONST.ICON_TYPE_AVATAR, source: defaultAvatars.FallbackAvatar, name: ''};
+    // A chat without a policyID has no workspace to show, so the legacy component falls back to the unknown account instead.
+    const primaryIcon = report?.policyID ? workspaceIcon : placeholderIcon;
+    const ownerAccountID = report?.ownerAccountID;
+    const ownerDetails = ownerAccountID ? personalDetails?.[ownerAccountID] : undefined;
+    // Built like the legacy member icon: a default avatar seeded from the account ID, named by display name, then login, then "Hidden" while personal details are missing.
+    const ownerIcon: Icon = ownerAccountID
+        ? {
+              id: ownerAccountID,
+              type: CONST.ICON_TYPE_AVATAR,
+              source: ownerDetails?.avatar ?? getDefaultAvatarURL({accountID: ownerAccountID}),
+              name: temporaryGetDisplayNameOrDefault({passedPersonalDetails: ownerDetails, translate, formatPhoneNumber}),
+              fallbackIcon: ownerDetails?.fallbackIcon,
+          }
+        : placeholderIcon;
+    // The workspace leads the row, unlike a thread or an expense report where the account does.
+    const icons = useSortedIcons([primaryIcon, ownerIcon], sort);
+
+    // A stack always shows both avatars, even without a member.
+    if (horizontalStacking) {
+        return (
+            <HorizontalAvatars
+                {...(horizontalStacking === true ? {} : horizontalStacking)}
+                size={size}
+                icons={icons}
+                isInReportAction={false}
+                fallbackDisplayName={fallbackDisplayName}
+            />
+        );
+    }
+
+    // A member without personal details keeps the subscript. Only a chat without a member drops it.
+    if (ownerAccountID) {
+        return (
+            <SubscriptAvatar
+                primaryAvatar={primaryIcon}
+                secondaryAvatar={ownerIcon}
+                size={size}
+                backdropColor={backdropColor}
+                containerStyle={subscriptContainerStyle}
+                fallbackDisplayName={fallbackDisplayName}
+            />
+        );
+    }
+
+    return (
+        <SingleAvatar
+            avatar={primaryIcon}
+            size={size}
+            containerStyles={containerStyle ?? StyleUtils.getContainerStyles(size)}
+            fallbackDisplayName={fallbackDisplayName}
+        />
+    );
+}
+
+export default PolicyExpenseChatAvatar;
diff --git a/src/components/Avatar/connected/ReportAvatar.tsx b/src/components/Avatar/connected/ReportAvatar.tsx
index dd9c4ef134bd..eecea10fe724 100644
--- a/src/components/Avatar/connected/ReportAvatar.tsx
+++ b/src/components/Avatar/connected/ReportAvatar.tsx
@@ -15,8 +15,10 @@ import {reportAvatarKindSelector} from '@selectors/Report';
 import React from 'react';
 
 import AccountAvatar from './AccountAvatar';
+import ChatThreadAvatar from './ChatThreadAvatar';
 import ExpenseReportAvatar from './ExpenseReportAvatar';
 import GroupChatAvatar from './GroupChatAvatar';
+import PolicyExpenseChatAvatar from './PolicyExpenseChatAvatar';
 
 type SortingOption = ValueOf<typeof CONST.REPORT_ACTION_AVATARS.SORT_BY>;
 
@@ -50,8 +52,8 @@ function ReportAvatar({
     backdropColor,
     subscriptAvatarContainerStyle,
     horizontalStacking,
+    sort,
     fallbackDisplayName,
-    ...rest
 }: ReportAvatarProps) {
     const [kindFromOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`, {selector: reportAvatarKindSelector});
     const kind = kindFromOnyx ?? CONST.REPORT_AVATAR_KIND.DEFAULT;
@@ -88,13 +90,39 @@ function ReportAvatar({
                     fallbackDisplayName={fallbackDisplayName}
                 />
             );
+        case CONST.REPORT_AVATAR_KIND.CHAT_THREAD:
+            return (
+                <ChatThreadAvatar
+                    reportID={reportID}
+                    size={size}
+                    backdropColor={backdropColor}
+                    // A thread without a workspace icon renders a single avatar even inside a horizontal stack, and there it drops its container styles.
+                    containerStyle={horizontalStacking ? [] : singleAvatarContainerStyle}
+                    subscriptContainerStyle={subscriptAvatarContainerStyle}
+                    horizontalStacking={horizontalStacking}
+                    sort={sort}
+                    fallbackDisplayName={fallbackDisplayName}
+                />
+            );
+        case CONST.REPORT_AVATAR_KIND.POLICY_EXPENSE_CHAT:
+            return (
+                <PolicyExpenseChatAvatar
+                    reportID={reportID}
+                    size={size}
+                    backdropColor={backdropColor}
+                    // The single layout is only reachable outside a horizontal stack, so the stacking guard the other kinds need is not required here.
+                    containerStyle={singleAvatarContainerStyle}
+                    subscriptContainerStyle={subscriptAvatarContainerStyle}
+                    horizontalStacking={horizontalStacking}
+                    sort={sort}
+                    fallbackDisplayName={fallbackDisplayName}
+                />
+            );
         // TODO: The remaining kinds still render the legacy component. https://github.com/Expensify/App/issues/94590 adds a
         // dedicated wrapper per kind, one PR at a time. The last of those deletes the ReportActionAvatars import and simplifies props.
         case CONST.REPORT_AVATAR_KIND.IOU:
         case CONST.REPORT_AVATAR_KIND.TASK:
         case CONST.REPORT_AVATAR_KIND.INVOICE:
-        case CONST.REPORT_AVATAR_KIND.CHAT_THREAD:
-        case CONST.REPORT_AVATAR_KIND.POLICY_EXPENSE_CHAT:
         case CONST.REPORT_AVATAR_KIND.ROOM:
         case CONST.REPORT_AVATAR_KIND.DEFAULT:
         default:
@@ -106,8 +134,8 @@ function ReportAvatar({
                     backdropColor={backdropColor}
                     subscriptAvatarContainerStyle={subscriptAvatarContainerStyle}
                     horizontalStacking={horizontalStacking}
+                    sort={sort}
                     fallbackDisplayName={fallbackDisplayName}
-                    {...rest}
                 />
             );
     }
diff --git a/src/components/Avatar/connected/WorkspaceHorizontalAvatars.tsx b/src/components/Avatar/connected/WorkspaceHorizontalAvatars.tsx
new file mode 100644
index 000000000000..04c99e96be9f
--- /dev/null
+++ b/src/components/Avatar/connected/WorkspaceHorizontalAvatars.tsx
@@ -0,0 +1,55 @@
+import HorizontalAvatars from '@components/Avatar/layouts/HorizontalAvatars';
+import type {HorizontalStackingOptions} from '@components/Avatar/layouts/HorizontalAvatars';
+
+import type CONST from '@src/CONST';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+
+import type {ReportAvatarFields} from '@selectors/Report';
+import type {ValueOf} from 'type-fest';
+
+import React from 'react';
+
+import useReportWorkspaceIcon from './useReportWorkspaceIcon';
+import useSortedIcons from './useSortedIcons';
+
+type SortingOption = ValueOf<typeof CONST.REPORT_ACTION_AVATARS.SORT_BY>;
+
+type WorkspaceHorizontalAvatarsProps = {
+    /** The report the workspace icon resolves from, through its policy and the chat it links to */
+    report: ReportAvatarFields | undefined;
+
+    /** The account the report is about */
+    primaryAvatar: Icon;
+
+    /** Size of the avatars */
+    size: ValueOf<typeof CONST.AVATAR_SIZE>;
+
+    /** How to stack the avatars. `true` takes the stack's defaults */
+    horizontalStacking: HorizontalStackingOptions | true;
+
+    /** How to order the avatars before rendering them */
+    sort?: SortingOption | SortingOption[];
+
+    /** Display name used as a fallback for avatar tooltips */
+    fallbackDisplayName?: string;
+};
+
+/** Renders the given account and the report's workspace icon side by side, in the requested order. */
+function WorkspaceHorizontalAvatars({report, primaryAvatar, size, horizontalStacking, sort, fallbackDisplayName}: WorkspaceHorizontalAvatarsProps) {
+    const workspaceIcon = useReportWorkspaceIcon(report);
+    const {isHovered = false, ...stackingOptions} = horizontalStacking === true ? {} : horizontalStacking;
+    const icons = useSortedIcons([primaryAvatar, workspaceIcon], sort);
+
+    return (
+        <HorizontalAvatars
+            {...stackingOptions}
+            isHovered={isHovered}
+            size={size}
+            icons={icons}
+            isInReportAction={false}
+            fallbackDisplayName={fallbackDisplayName}
+        />
+    );
+}
+
+export default WorkspaceHorizontalAvatars;
diff --git a/src/components/Avatar/connected/WorkspaceSubscriptAvatar.tsx b/src/components/Avatar/connected/WorkspaceSubscriptAvatar.tsx
new file mode 100644
index 000000000000..54bb7badbfeb
--- /dev/null
+++ b/src/components/Avatar/connected/WorkspaceSubscriptAvatar.tsx
@@ -0,0 +1,50 @@
+import SubscriptAvatar from '@components/Avatar/layouts/SubscriptAvatar';
+import type {AvatarIcon} from '@components/Avatar/types';
+
+import type CONST from '@src/CONST';
+
+import type {ReportAvatarFields} from '@selectors/Report';
+import type {ColorValue, StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+
+import React from 'react';
+
+import useReportWorkspaceIcon from './useReportWorkspaceIcon';
+
+type WorkspaceSubscriptAvatarProps = {
+    /** The report the workspace icon resolves from, through its policy and the chat it links to */
+    report: ReportAvatarFields | undefined;
+
+    /** The account the report is about, or the copilot who acted for it */
+    primaryAvatar: AvatarIcon;
+
+    /** Size of the avatar */
+    size: ValueOf<typeof CONST.AVATAR_SIZE>;
+
+    /** Color of the row surface behind the avatar. Affects secondary avatar so it blends into the row. */
+    backdropColor?: ColorValue;
+
+    /** Container styles for the subscript stack, merged over its size-derived defaults */
+    containerStyle?: StyleProp<ViewStyle>;
+
+    /** Display name used as a fallback for avatar tooltips */
+    fallbackDisplayName?: string;
+};
+
+/** Renders the given account as the primary avatar with the report's workspace icon as the subscript. */
+function WorkspaceSubscriptAvatar({report, primaryAvatar, size, backdropColor, containerStyle, fallbackDisplayName}: WorkspaceSubscriptAvatarProps) {
+    const workspaceIcon = useReportWorkspaceIcon(report);
+
+    return (
+        <SubscriptAvatar
+            primaryAvatar={primaryAvatar}
+            secondaryAvatar={workspaceIcon}
+            size={size}
+            backdropColor={backdropColor}
+            containerStyle={containerStyle}
+            fallbackDisplayName={fallbackDisplayName}
+        />
+    );
+}
+
+export default WorkspaceSubscriptAvatar;
diff --git a/src/components/Avatar/connected/useAccountIcons.ts b/src/components/Avatar/connected/useAccountIcons.ts
index d02de19b6b64..8132ae763e72 100644
--- a/src/components/Avatar/connected/useAccountIcons.ts
+++ b/src/components/Avatar/connected/useAccountIcons.ts
@@ -2,11 +2,32 @@ import {usePersonalDetails} from '@components/OnyxListItemProvider';
 
 import useDefaultAvatars from '@hooks/useDefaultAvatars';
 
-import {buildUserIcon} from '@libs/UserAvatarUtils';
+import {buildUserIcon, getDefaultAvatarURL} from '@libs/UserAvatarUtils';
 
+import CONST from '@src/CONST';
 import type {InvitedEmailsToAccountIDs} from '@src/types/onyx';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 
+type DefaultAvatars = ReturnType<typeof useDefaultAvatars>;
+
+function buildAccountIcons(
+    accountIDs: number[],
+    personalDetails: ReturnType<typeof usePersonalDetails>,
+    defaultAvatars: DefaultAvatars,
+    invitedEmailsToAccountIDs?: InvitedEmailsToAccountIDs,
+    accountEmails?: Array<string | undefined>,
+): Icon[] {
+    return accountIDs.map((accountID, index) =>
+        buildUserIcon({
+            accountID,
+            personalDetails,
+            defaultAvatars,
+            invitedEmail: invitedEmailsToAccountIDs ? Object.keys(invitedEmailsToAccountIDs).find((email) => invitedEmailsToAccountIDs[email] === accountID) : undefined,
+            accountEmail: accountEmails?.[index],
+        }),
+    );
+}
+
 /**
  * Resolves account IDs into avatar {@link Icon}s from the personal-details context and the default-avatar set.
  *
@@ -19,15 +40,27 @@ function useAccountIcons(accountIDs: number[], invitedEmailsToAccountIDs?: Invit
     const personalDetails = usePersonalDetails();
     const defaultAvatars = useDefaultAvatars();
 
-    return accountIDs.map((accountID, index) =>
-        buildUserIcon({
-            accountID,
-            personalDetails,
-            defaultAvatars,
-            invitedEmail: invitedEmailsToAccountIDs ? Object.keys(invitedEmailsToAccountIDs).find((email) => invitedEmailsToAccountIDs[email] === accountID) : undefined,
-            accountEmail: accountEmails?.[index],
-        }),
-    );
+    return buildAccountIcons(accountIDs, personalDetails, defaultAvatars, invitedEmailsToAccountIDs, accountEmails);
+}
+
+/**
+ * Like {@link useAccountIcons}, but an account whose personal details haven't loaded gets a default avatar seeded from its
+ * account ID instead of the generic gray fallback. The unknown account (`DEFAULT_NUMBER_ID`) keeps the generic fallback.
+ */
+function useSeededAccountIcons(accountIDs: number[]): Icon[] {
+    const personalDetails = usePersonalDetails();
+    const defaultAvatars = useDefaultAvatars();
+
+    return seedFallbackIcons(buildAccountIcons(accountIDs, personalDetails, defaultAvatars), accountIDs, defaultAvatars.FallbackAvatar);
+}
+
+/** Replaces the generic fallback of each icon, index-aligned with `accountIDs`, with a default avatar seeded from its account ID. The unknown account keeps the generic fallback. */
+function seedFallbackIcons(icons: Icon[], accountIDs: number[], fallbackAvatar: DefaultAvatars['FallbackAvatar']): Icon[] {
+    return icons.map((icon, index) => {
+        const accountID = accountIDs.at(index) ?? CONST.DEFAULT_NUMBER_ID;
+        return icon.source === fallbackAvatar && accountID !== CONST.DEFAULT_NUMBER_ID ? {...icon, source: getDefaultAvatarURL({accountID})} : icon;
+    });
 }
 
 export default useAccountIcons;
+export {seedFallbackIcons, useSeededAccountIcons};
diff --git a/src/components/Avatar/connected/useSortedIcons.ts b/src/components/Avatar/connected/useSortedIcons.ts
new file mode 100644
index 000000000000..0bfadcb83a63
--- /dev/null
+++ b/src/components/Avatar/connected/useSortedIcons.ts
@@ -0,0 +1,37 @@
+import {PersonalDetailsContext} from '@components/OnyxListItemProvider';
+
+import useLocalize from '@hooks/useLocalize';
+
+import {sortIconsByName} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+
+import type {ValueOf} from 'type-fest';
+
+import lodashSortBy from 'lodash/sortBy';
+import {use} from 'react';
+
+type SortingOption = ValueOf<typeof CONST.REPORT_ACTION_AVATARS.SORT_BY>;
+
+/** Orders avatars for a horizontal stack, where every avatar sits in an equivalent slot. `undefined` keeps the given order. */
+function useSortedIcons(icons: Icon[], sort?: SortingOption | SortingOption[]): Icon[] {
+    const {localeCompare} = useLocalize();
+    const sortBy: SortingOption[] = sort === undefined ? [] : [sort].flat();
+
+    let sortedIcons = icons;
+    if (sortBy.includes(CONST.REPORT_ACTION_AVATARS.SORT_BY.NAME)) {
+        // Read personal details only for a name sort, so other stacks don't re-render on every personal details change.
+        // `sortIconsByName` sorts in place, so sort a copy and leave the given array as it was
+        sortedIcons = sortIconsByName([...icons], use(PersonalDetailsContext), localeCompare);
+    } else if (sortBy.includes(CONST.REPORT_ACTION_AVATARS.SORT_BY.ID)) {
+        sortedIcons = lodashSortBy(icons, (icon) => icon.id);
+    }
+    if (sortBy.includes(CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE)) {
+        sortedIcons = [...sortedIcons].reverse();
+    }
+
+    return sortedIcons;
+}
+
+export default useSortedIcons;
diff --git a/src/components/AvatarCropModal/ImageCropView.tsx b/src/components/AvatarCropModal/ImageCropView.tsx
index adb26cfd55d4..cf7127f89563 100644
--- a/src/components/AvatarCropModal/ImageCropView.tsx
+++ b/src/components/AvatarCropModal/ImageCropView.tsx
@@ -9,7 +9,7 @@ import ControlSelection from '@libs/ControlSelection';
 import type IconAsset from '@src/types/utils/IconAsset';
 
 import type {ComponentRef} from 'react';
-import type {PanGesture} from 'react-native-gesture-handler';
+import type {LegacyPanGesture} from 'react-native-gesture-handler';
 import type {SharedValue} from 'react-native-reanimated';
 
 import React from 'react';
@@ -40,7 +40,7 @@ type ImageCropViewProps = {
     scale: SharedValue<number>;
 
     /** Configuration object for pan gesture for handling image panning */
-    panGesture?: PanGesture;
+    panGesture?: LegacyPanGesture;
 
     /** Image crop vector mask */
     maskImage?: IconAsset;
diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index 4d9e8444f917..60a4e0dfbf60 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -384,3 +384,4 @@ function AvatarWithDisplayName({
 }
 
 export default AvatarWithDisplayName;
+export type {AvatarWithDisplayNameProps};
diff --git a/src/components/Banner.tsx b/src/components/Banner.tsx
index 2a79ec92e538..817bfb01e14a 100644
--- a/src/components/Banner.tsx
+++ b/src/components/Banner.tsx
@@ -14,7 +14,6 @@ import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 import React, {memo} from 'react';
 import {View} from 'react-native';
 
-import Button from './Button';
 import Hoverable from './Hoverable';
 import Icon from './Icon';
 import PressableWithFeedback from './Pressable/PressableWithFeedback';
@@ -52,12 +51,7 @@ type BannerProps = {
     /** Styles to be assigned to the Banner text */
     textStyles?: StyleProp<TextStyle>;
 
-    /** Whether to display button in the banner */
-    shouldShowButton?: boolean;
-
-    onButtonPress?: () => void;
-
-    /** Custom action content rendered in the right side of the banner. Overrides the configured `shouldShowButton` when provided. */
+    /** Custom action content rendered in the right side of the banner. */
     children?: React.ReactNode;
 };
 
@@ -67,14 +61,12 @@ function Banner({
     icon,
     onClose,
     onPress,
-    onButtonPress,
     containerStyles,
     textStyles,
     children,
     shouldRenderHTML = false,
     shouldShowIcon = false,
     shouldShowCloseButton = false,
-    shouldShowButton = false,
 }: BannerProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -125,16 +117,7 @@ function Banner({
                                     </Text>
                                 ))}
                         </View>
-                        {children ??
-                            (shouldShowButton && (
-                                <Button
-                                    variant={CONST.BUTTON_VARIANT.SUCCESS}
-                                    style={[styles.ph3]}
-                                    onPress={onButtonPress}
-                                >
-                                    <Button.Text>{translate('common.chatNow')}</Button.Text>
-                                </Button>
-                            ))}
+                        {children}
                         {shouldShowCloseButton && !!onClose && (
                             <Tooltip text={translate('common.close')}>
                                 <PressableWithFeedback
diff --git a/src/components/BlockingViews/FullPageErrorView.tsx b/src/components/BlockingViews/FullPageErrorView.tsx
index 4ecbfb7fef41..d96b2c672ecd 100644
--- a/src/components/BlockingViews/FullPageErrorView.tsx
+++ b/src/components/BlockingViews/FullPageErrorView.tsx
@@ -14,10 +14,10 @@ import BlockingView from './BlockingView';
 import ForceFullScreenView from './ForceFullScreenView';
 
 /**
- * Illustrations this view can show. Both are requested up front, because the lazy illustrations hook
+ * Illustrations this view can show. All are requested up front, because the lazy illustrations hook
  * only seeds its asset map once per mount, so a name it wasn't given at mount resolves to PlaceholderIcon.
  */
-type FullPageErrorViewIllustration = 'BrokenMagnifyingGlass' | 'FolderSync';
+type FullPageErrorViewIllustration = 'BrokenMagnifyingGlass' | 'FolderSync' | 'ChartSync';
 
 type FullPageErrorViewProps = {
     testID?: string;
@@ -71,7 +71,7 @@ function FullPageErrorView({
     illustrationHeight = variables.errorPageIconHeight,
 }: FullPageErrorViewProps) {
     const styles = useThemeStyles();
-    const illustrations = useMemoizedLazyIllustrations(['BrokenMagnifyingGlass', 'FolderSync']);
+    const illustrations = useMemoizedLazyIllustrations(['BrokenMagnifyingGlass', 'FolderSync', 'ChartSync']);
 
     if (shouldShow) {
         return (
diff --git a/src/components/BulkActionBar/BulkActionBarButton.tsx b/src/components/BulkActionBar/BulkActionBarButton.tsx
index f01abb64e003..544aff053090 100644
--- a/src/components/BulkActionBar/BulkActionBarButton.tsx
+++ b/src/components/BulkActionBar/BulkActionBarButton.tsx
@@ -4,6 +4,7 @@ import PopoverMenu from '@components/PopoverMenu';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import usePopoverPosition from '@hooks/usePopoverPosition';
 import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
 
 import shouldPopoverUseScrollView from '@libs/shouldPopoverUseScrollView';
 
@@ -26,6 +27,7 @@ import {defaultPopoverAnchorPosition, SUB_MENU_ANCHOR_ALIGNMENT} from './popover
  */
 function BulkActionBarButton<TValueType>({option, onSubItemSelected}: BulkActionBarButtonProps<TValueType>) {
     const theme = useTheme();
+    const styles = useThemeStyles();
     const icons = useMemoizedLazyExpensifyIcons(['DownArrow', 'UpArrow']);
     const {calculatePopoverPosition} = usePopoverPosition();
 
@@ -91,7 +93,12 @@ function BulkActionBarButton<TValueType>({option, onSubItemSelected}: BulkAction
                         anchorRef={anchorRef}
                         anchorPosition={anchorPosition}
                         anchorAlignment={SUB_MENU_ANCHOR_ALIGNMENT}
-                        menuItems={subMenuItems.map((subItem) => ({...subItem, shouldCallAfterModalHide: true}))}
+                        headerText={option.subMenuHeaderText}
+                        headerStyles={styles.lineHeightNormal}
+                        menuItems={subMenuItems.map((subItem) => ({
+                            ...subItem,
+                            shouldCallAfterModalHide: true,
+                        }))}
                         onClose={() => setIsMenuVisible(false)}
                         onItemSelected={(selectedSubItem, index, event) => {
                             onSubItemSelected?.(selectedSubItem, index, event);
diff --git a/src/components/BulkActionBar/index.tsx b/src/components/BulkActionBar/index.tsx
index 4e42844312aa..a63631deb9dd 100644
--- a/src/components/BulkActionBar/index.tsx
+++ b/src/components/BulkActionBar/index.tsx
@@ -14,13 +14,14 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePopoverPosition from '@hooks/usePopoverPosition';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSidePanelState from '@hooks/useSidePanelState';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import Accessibility from '@libs/Accessibility';
 import shouldPopoverUseScrollView from '@libs/shouldPopoverUseScrollView';
 
-import {setDisableDismissOnEscape} from '@userActions/Modal';
+import {areAllModalsHidden, setDisableDismissOnEscape} from '@userActions/Modal';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -87,25 +88,47 @@ function BulkActionBarContent<TValueType>({
     const moreOptions = hasMoreMenu ? options.slice(inlineActionCount) : [];
 
     // Esc clears the selection, but not while something is open over the bar. An RHP the bar is rendered inside
-    // reports itself visible too, and is told apart by the screen still being focused.
+    // reports itself visible too, and is told apart by the screen still being focused. The type is not worth reading
+    // here, because a popover opened and closed over an RHP leaves it stale at `popover`.
     const [modal] = useOnyx(ONYXKEYS.MODAL);
     const isFocused = useIsFocused();
-    const isCoveredByModal = !!modal?.isVisible && !(isFocused && modal?.type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED);
-    const shouldClearSelectionOnEscape = !modal?.willAlertModalBecomeVisible && !isCoveredByModal;
+    const isCoveredByModal = !!modal?.isVisible && !isFocused;
+
+    const canOwnEscape = !modal?.willAlertModalBecomeVisible && !isCoveredByModal;
+
+    // The Side Panel is not a `BaseModal`, so it is absent from both the modal state and the registry of open modals.
+    // Below extra large it is laid over the page and takes Esc for itself, so the bar has to stand down for it.
+    const {isSidePanelHiddenOrLargeScreen} = useSidePanelState();
+    const shouldClearSelectionOnEscape = canOwnEscape && isSidePanelHiddenOrLargeScreen;
+
+    // `willAlertModalBecomeVisible` is a single flag that every modal writes, so closing the topmost of a stack reads
+    // as though nothing is open any more. The registry of open modals is the only answer that survives stacking, and
+    // it has to be read when the key arrives rather than at subscribe time.
+    useKeyboardShortcut(
+        CONST.KEYBOARD_SHORTCUTS.ESCAPE,
+        () => {
+            if (!areAllModalsHidden()) {
+                return;
+            }
 
-    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, onClearSelection, {isActive: shouldClearSelectionOnEscape});
+            onClearSelection();
+        },
+        {isActive: shouldClearSelectionOnEscape},
+    );
 
-    // Whichever Esc handler subscribed last runs first, so holding the pane back keeps it from closing out from under
-    // a selection Esc was meant to clear.
+    // Escape must not dismiss the screen the selection sits on while the bar is the one answering it. The Side Panel
+    // is deliberately left out of the condition, because each write to this flag resubscribes the app's own Escape
+    // handler to the top of the stack, over the Side Panel's, and that one Escape would then both dismiss the screen
+    // and close the panel.
     useEffect(() => {
-        if (!shouldClearSelectionOnEscape) {
+        if (!canOwnEscape) {
             return;
         }
 
         setDisableDismissOnEscape(true);
 
         return () => setDisableDismissOnEscape(false);
-    }, [shouldClearSelectionOnEscape]);
+    }, [canOwnEscape]);
 
     useEffect(() => {
         if (!moreAnchorRef.current || !isMoreMenuVisible) {
@@ -167,6 +190,7 @@ function BulkActionBarContent<TValueType>({
                                 anchorRef={moreAnchorRef}
                                 anchorPosition={moreMenuAnchorPosition}
                                 anchorAlignment={MORE_MENU_ANCHOR_ALIGNMENT}
+                                headerStyles={styles.lineHeightNormal}
                                 onClose={() => setIsMoreMenuVisible(false)}
                                 onItemSelected={(selectedItem, index, event) => {
                                     onSubItemSelected?.(selectedItem, index, event);
diff --git a/src/components/ButtonWithDropdownMenu/types.ts b/src/components/ButtonWithDropdownMenu/types.ts
index f5a194d026ad..40b5602a06ef 100644
--- a/src/components/ButtonWithDropdownMenu/types.ts
+++ b/src/components/ButtonWithDropdownMenu/types.ts
@@ -64,6 +64,9 @@ type DropdownOption<TValueType> = WithSentryLabel & {
 
     /** Whether to ignore compact popover menu styling for this item */
     shouldIgnoreCompactStyle?: boolean;
+
+    /** Text shown above `subMenuItems` once the sub-menu is open */
+    subMenuHeaderText?: string;
 };
 
 type ButtonWithDropdownMenuProps<TValueType> = WithSentryLabel & {
diff --git a/src/components/CategoryPicker/CategoryPickerModal.tsx b/src/components/CategoryPicker/CategoryPickerModal.tsx
index d87d61c6b721..3fee5ad3886e 100644
--- a/src/components/CategoryPicker/CategoryPickerModal.tsx
+++ b/src/components/CategoryPicker/CategoryPickerModal.tsx
@@ -3,24 +3,25 @@ import type PopoverWithMeasuredContentProps from '@components/PopoverWithMeasure
 import type {ListItem} from '@components/SelectionList/types';
 
 import useKeyboardState from '@hooks/useKeyboardState';
+import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getEnabledCategoriesCount} from '@libs/CategoryUtils';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import getSelectionListPopoverContentHeight from '@libs/getSelectionListPopoverContentHeight';
+
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 import type {ComponentRef} from 'react';
 
-import React, {useRef} from 'react';
+import React, {useRef, useState} from 'react';
 import {View} from 'react-native';
 
 import CategoryPicker from '.';
 
-const popoverDimensions = {
-    width: CONST.POPOVER_DROPDOWN_WIDTH,
-    height: CONST.POPOVER_DROPDOWN_MAX_HEIGHT,
-};
-
 const DEFAULT_ANCHOR_ALIGNMENT = {
     horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
     vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
@@ -36,6 +37,18 @@ type CategoryPickerModalProps = {
 
     /** Called when the user confirms a category selection */
     onSelected?: (item: ListItem) => void;
+
+    /** Width of the pop-over. Defaults to the standard dropdown width, a field row passes its own width instead */
+    popoverWidth?: number;
+
+    /** Height of the pop-over. Defaults to the standard dropdown height, a caller short on room passes a smaller one */
+    popoverHeight?: number;
+
+    /** Whether the pop-over shrinks to the height its list needs, treating `popoverHeight` as a ceiling. */
+    shouldFitContentHeight?: boolean;
+
+    /** Whether the pop-over may flip to the other side of the anchor when it overflows. It shifts by a whole pop-over height, so a caller that already picked the side turns this off. */
+    shouldSwitchPositionIfOverflow?: boolean;
 } & Omit<PopoverWithMeasuredContentProps, 'anchorRef' | 'children' | 'onClose'>;
 
 function CategoryPickerModal({
@@ -47,6 +60,10 @@ function CategoryPickerModal({
     onSelected,
     anchorAlignment = DEFAULT_ANCHOR_ALIGNMENT,
     shouldMeasureAnchorPositionFromTop = false,
+    popoverWidth = CONST.POPOVER_DROPDOWN_WIDTH,
+    popoverHeight = CONST.POPOVER_DROPDOWN_MAX_HEIGHT,
+    shouldFitContentHeight = false,
+    shouldSwitchPositionIfOverflow = true,
 }: CategoryPickerModalProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -55,6 +72,17 @@ function CategoryPickerModal({
     const {isKeyboardActive} = useKeyboardState();
     const anchorRef = useRef<ComponentRef<typeof View>>(null);
 
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(policyID)}`, {selector: getEnabledCategoriesCount});
+    const [renderedRowCount, setRenderedRowCount] = useState<number>();
+
+    const categoriesCount = policyCategories ?? 0;
+    const isSearchable = categoriesCount >= CONST.STANDARD_LIST_ITEM_LIMIT;
+    const estimatedContentHeight = getSelectionListPopoverContentHeight({optionCount: Math.max(renderedRowCount ?? categoriesCount, 1), isSearchable});
+
+    // A bottom sheet is sized by the screen, so the content estimate only applies to the pop-over.
+    const resolvedHeight = shouldFitContentHeight && !isSmallScreenWidth ? Math.min(popoverHeight, estimatedContentHeight) : popoverHeight;
+    const popoverDimensions = {width: popoverWidth, height: resolvedHeight};
+
     const handleCategorySelect = (item: ListItem) => {
         // If clicking the same category that's already selected, treat it as deselection
         if (item.keyForList === selectedCategory) {
@@ -73,9 +101,9 @@ function CategoryPickerModal({
             anchorPosition={anchorPosition}
             popoverDimensions={popoverDimensions}
             anchorAlignment={anchorAlignment}
-            innerContainerStyle={StyleUtils.getWidthStyle(popoverDimensions.width)}
+            innerContainerStyle={isSmallScreenWidth ? undefined : StyleUtils.getWidthStyle(popoverDimensions.width)}
             restoreFocusType={CONST.MODAL.RESTORE_FOCUS_TYPE.DELETE}
-            shouldSwitchPositionIfOverflow
+            shouldSwitchPositionIfOverflow={shouldSwitchPositionIfOverflow}
             shouldEnableNewFocusManagement
             shouldMeasureAnchorPositionFromTop={shouldMeasureAnchorPositionFromTop}
             shouldSkipRemeasurement
@@ -84,6 +112,7 @@ function CategoryPickerModal({
         >
             <View style={[StyleUtils.getHeight(popoverDimensions.height), styles.flexColumn, styles.pt4]}>
                 <CategoryPicker
+                    onRenderedRowCountChange={setRenderedRowCount}
                     selectedCategory={selectedCategory}
                     policyID={policyID}
                     onSubmit={handleCategorySelect}
diff --git a/src/components/CategoryPicker/index.tsx b/src/components/CategoryPicker/index.tsx
index 5028a6acc93b..f0a1870a3c61 100644
--- a/src/components/CategoryPicker/index.tsx
+++ b/src/components/CategoryPicker/index.tsx
@@ -5,6 +5,7 @@ import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useDebouncedState from '@hooks/useDebouncedState';
+import useLoadPolicyCategories from '@hooks/useLoadPolicyCategories';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -21,8 +22,9 @@ import type {OptionTree} from '@libs/OptionsListUtils/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import getEmptyArray from '@src/types/utils/getEmptyArray';
 
-import React from 'react';
+import React, {useEffect} from 'react';
 // eslint-disable-next-line no-restricted-imports -- Need original useOnyx to avoid reading partial Search snapshot policy data (GL code flags are trimmed from the snapshot).
 import {useOnyx as useOnyxWithoutSnapshots} from 'react-native-onyx';
 
@@ -39,6 +41,13 @@ type CategoryPickerProps = {
 
     /** Whether the search input should auto-focus when the picker mounts. Only opted into by the inline-edit popover wrapper. */
     shouldAutoFocusSearchInput?: boolean;
+
+    /**
+     * Reports how many rows the unfiltered list renders, for a pop-over wrapper to size itself from. The category
+     * count does not match: nested names add a row per parent, a selected out-of-policy category adds one, and
+     * the `Recent` and `All` headings add one each. Only reported unfiltered, so searching never resizes it.
+     */
+    onRenderedRowCountChange?: (rowCount: number) => void;
 };
 
 const getSelectedOptions = (selectedCategory?: string): Category[] => {
@@ -55,7 +64,15 @@ const getSelectedOptions = (selectedCategory?: string): Category[] => {
     ];
 };
 
-function CategoryPicker({selectedCategory, policyID, onSubmit, shouldShowNoneOption = false, addBottomSafeAreaPadding = false, shouldAutoFocusSearchInput = false}: CategoryPickerProps) {
+function CategoryPicker({
+    selectedCategory,
+    policyID,
+    onSubmit,
+    shouldShowNoneOption = false,
+    addBottomSafeAreaPadding = false,
+    shouldAutoFocusSearchInput = false,
+    onRenderedRowCountChange,
+}: CategoryPickerProps) {
     const styles = useThemeStyles();
     const {inputCallbackRef} = useAutoFocusInput();
     const [shouldShowGLCode] = useOnyxWithoutSnapshots(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(policyID)}`, {
@@ -66,6 +83,9 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, shouldShowNoneOpt
     const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${getNonEmptyStringOnyxID(policyID)}`);
     const {isOffline} = useNetwork();
 
+    // Backfill the policy's categories on demand so lazy-loaded accounts don't get stuck showing only the selected category.
+    const {isLoadingPolicyCategories} = useLoadPolicyCategories(policyID);
+
     const {translate, localeCompare} = useLocalize();
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
     const offlineMessage = isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : '';
@@ -105,10 +125,24 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, shouldShowNoneOpt
     const sectionsWithNoneOption =
         noneOption.length > 0 ? [...sections.slice(0, selectedCategorySectionIndex + 1), noneOptionSection, ...sections.slice(selectedCategorySectionIndex + 1)] : sections;
 
+    const sectionsWithTitleStyles = sectionsWithNoneOption.map((section) => ({...section, data: section.data.map((category) => ({...category, titleStyles: styles.w100}))}));
     const categoryData = sectionsWithNoneOption.flatMap((section) => section.data);
+    const renderedRowCount = sectionsWithNoneOption.reduce((total, section) => total + section.data.length + (section.title ? 1 : 0), 0);
+
+    useEffect(() => {
+        if (debouncedSearchValue) {
+            return;
+        }
+        onRenderedRowCountChange?.(renderedRowCount);
+    }, [renderedRowCount, debouncedSearchValue, onRenderedRowCountChange]);
+
     const categoriesCount = getEnabledCategoriesCount(categories);
     const selectedOptionKey = categoryData.find((category) => category.searchText === selectedCategory)?.keyForList;
 
+    // While the on-demand fetch above is in flight, show the list skeleton instead of flashing the selected-only
+    // fallback. A draft collection is a complete local list, so it renders immediately rather than waiting on the read.
+    const isLoadingNewOptions = isLoadingPolicyCategories && policyCategoriesDraft === undefined;
+
     const textInputOptions = {
         value: searchValue,
         label: translate('common.search'),
@@ -122,15 +156,17 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, shouldShowNoneOpt
 
     return (
         <SelectionListWithSections
-            sections={sectionsWithNoneOption}
+            // The list only renders the skeleton when it has no items, so the sections have to be emptied too.
+            // Otherwise the selected-only fallback row still shows while the fetch is in flight.
+            sections={isLoadingNewOptions ? getEmptyArray<never>() : sectionsWithTitleStyles}
             onSelectRow={onSubmit}
             ListItem={SingleSelectListItem}
             shouldShowTextInput={categoriesCount >= CONST.STANDARD_LIST_ITEM_LIMIT}
             textInputOptions={textInputOptions}
+            shouldShowLoadingPlaceholder={isLoadingNewOptions}
+            isLoadingNewOptions={isLoadingNewOptions}
             initiallyFocusedItemKey={selectedOptionKey}
             addBottomSafeAreaPadding={addBottomSafeAreaPadding}
-            style={{listItemTitleStyles: styles.w100}}
-            isRowMultilineSupported
             titleNumberOfLines={CONST.TRANSACTION_TAG_AND_CATEGORY_PICKER_MAX_TITLE_LINES}
         />
     );
diff --git a/src/components/Charts/BarChart/BarChartContent.tsx b/src/components/Charts/BarChart/BarChartContent.tsx
index 6bdcabfbf3e7..d1fc94719d12 100644
--- a/src/components/Charts/BarChart/BarChartContent.tsx
+++ b/src/components/Charts/BarChart/BarChartContent.tsx
@@ -1,12 +1,69 @@
-import {ChartFontsProvider} from '@components/Charts/hooks';
+import BAR_INNER_PADDING, {VERTICAL_BAR_DOMAIN_PADDING} from '@components/Charts/barChartConstants';
+import {ChartFontsProvider, useChartFontManager, useChartLabelFormats, useChartLabelLayout, useChartLabelMeasurements} from '@components/Charts/hooks';
+import {getVerticalBarLabelLayoutInputs, getVerticalBarPlotBounds, getYAxisLabelWidth} from '@components/Charts/utils';
+import {GLYPH_PADDING, LABEL_ROTATIONS} from '@components/Charts/VictoryTheme';
+
+import variables from '@styles/variables';
+
+import type {LayoutChangeEvent} from 'react-native';
+
+import React, {useState} from 'react';
+import {View} from 'react-native';
 
 import type {BarChartContentProps} from './types';
 
 import HorizontalBarChartContentBody from './HorizontalBarChartContent';
 import VerticalBarChartContentBody from './VerticalBarChartContent';
 
-function BarChartContent({isHorizontal = false, ...props}: BarChartContentProps) {
-    return <ChartFontsProvider>{isHorizontal ? <HorizontalBarChartContentBody {...props} /> : <VerticalBarChartContentBody {...props} />}</ChartFontsProvider>;
+const FONT_SIZE = variables.iconSizeExtraSmall;
+
+/**
+ * Resolves the bar chart orientation on every layout change and renders the matching body. Wide layouts pass
+ * `isHorizontal`. Narrow layouts predict the vertical chart's label fit from the container width, so the chart
+ * switches to horizontal bars when labels don't fit even at 45° and back to vertical when the container grows.
+ */
+function BarChartOrientationDispatcher({isHorizontal = false, canFallBackToHorizontalBars = false, ...props}: BarChartContentProps) {
+    const fontManager = useChartFontManager();
+    const [containerWidth, setContainerWidth] = useState(0);
+    const {data, yAxisUnit, yAxisUnitPosition = 'left'} = props;
+
+    const {formatCompactValue} = useChartLabelFormats({data, unit: yAxisUnit, unitPosition: yAxisUnitPosition});
+    const measurements = useChartLabelMeasurements(data, fontManager, FONT_SIZE);
+
+    // Predict the vertical chart's plot geometry from the container width so the fit decision matches what it would measure after mounting.
+    const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, FONT_SIZE, VERTICAL_BAR_DOMAIN_PADDING);
+    const plotBounds = getVerticalBarPlotBounds(containerWidth, yAxisLabelWidth + GLYPH_PADDING);
+
+    const {labelRotation} = useChartLabelLayout({
+        data,
+        fontManager,
+        fontSize: FONT_SIZE,
+        measurements,
+        ...getVerticalBarLabelLayoutInputs({
+            containerWidth,
+            plotLeft: plotBounds.left,
+            plotRight: plotBounds.right,
+            plotWidth: plotBounds.width,
+            dataLength: data.length,
+            innerPadding: BAR_INNER_PADDING,
+        }),
+    });
+
+    const renderHorizontal = isHorizontal || (canFallBackToHorizontalBars && labelRotation === LABEL_ROTATIONS.VERTICAL);
+
+    const handleLayout = (event: LayoutChangeEvent) => {
+        setContainerWidth(event.nativeEvent.layout.width);
+    };
+
+    return <View onLayout={handleLayout}>{renderHorizontal ? <HorizontalBarChartContentBody {...props} /> : <VerticalBarChartContentBody {...props} />}</View>;
+}
+
+function BarChartContent(props: BarChartContentProps) {
+    return (
+        <ChartFontsProvider>
+            <BarChartOrientationDispatcher {...props} />
+        </ChartFontsProvider>
+    );
 }
 
 export default BarChartContent;
diff --git a/src/components/Charts/BarChart/HorizontalBarChartContent.tsx b/src/components/Charts/BarChart/HorizontalBarChartContent.tsx
index eae09d67fd3c..277b4dd6415c 100644
--- a/src/components/Charts/BarChart/HorizontalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/HorizontalBarChartContent.tsx
@@ -1,11 +1,12 @@
 import ActivityIndicator from '@components/ActivityIndicator';
+import {HORIZONTAL_BAR_DOMAIN_PADDING, MIN_BAR_ROW_HEIGHT} from '@components/Charts/barChartConstants';
 import ChartTooltipLayer from '@components/Charts/components/ChartTooltipLayer';
 import ChartYAxisLabels from '@components/Charts/components/ChartYAxisLabels';
 import type {HitTestArgs, ResolveTargetIndexArgs} from '@components/Charts/hooks';
 import {useChartFontManager, useChartInteractions, useChartLabelFormats, useChartParagraphs} from '@components/Charts/hooks';
 import {findClosestPoint} from '@components/Charts/hooks/useChartInteractions';
-import {calculateMinDomainPadding, getFontLineMetrics, getNiceValueDomain, getNiceValueTicks, measureTextWidth} from '@components/Charts/utils';
-import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING, LABEL_PADDING, MAX_Y_AXIS_LABEL_WIDTH} from '@components/Charts/VictoryTheme';
+import {getFontLineMetrics, getHorizontalChartHeight, getNiceValueDomain, getNiceValueTicks, measureTextWidth} from '@components/Charts/utils';
+import VictoryTheme, {CATEGORY_LABEL_WIDTH_RATIO, CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING, LABEL_PADDING, MAX_Y_AXIS_LABEL_WIDTH} from '@components/Charts/VictoryTheme';
 
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -26,9 +27,6 @@ import {CartesianChart} from 'victory-native';
 
 import type {BarChartProps} from './types';
 
-/** Extra pixel spacing between the chart boundary and the data range. `right` keeps the longest bar's tip and its tooltip off the edge. */
-const BASE_DOMAIN_PADDING = {top: 8, bottom: 8, left: 0, right: 8};
-
 /** Gap between the bar tip and the tooltip pointer, lifting the tooltip clear of the bar. */
 const TOOLTIP_TIP_GAP = 4;
 
@@ -157,7 +155,6 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
     const styles = useThemeStyles();
     const fontManager = useChartFontManager();
     const [chartWidth, setChartWidth] = useState(0);
-    const [barAreaHeight, setBarAreaHeight] = useState(0);
 
     // Transpose: value on the x-axis, category index on the y-axis.
     // Categories are reversed (index 0 mapped to the top row) so a descending-sorted ranking reads top-to-bottom.
@@ -169,7 +166,7 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
 
     const valueDomain = getNiceValueDomain(data, VictoryTheme.axis.tickCount);
 
-    const {formatValue} = useChartLabelFormats({
+    const {formatValue, formatCompactValue} = useChartLabelFormats({
         data,
         unit: yAxisUnit,
         unitPosition: yAxisUnitPosition,
@@ -189,14 +186,6 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
         setChartWidth(event.nativeEvent.layout.width);
     };
 
-    const domainPadding = (() => {
-        if (barAreaHeight === 0) {
-            return BASE_DOMAIN_PADDING;
-        }
-        const verticalPadding = calculateMinDomainPadding(barAreaHeight, data.length, HORIZONTAL_BAR_PADDING);
-        return {...BASE_DOMAIN_PADDING, top: verticalPadding, bottom: verticalPadding};
-    })();
-
     const barThickness = useSharedValue(0);
     const rowHeight = useSharedValue(0);
     const xZero = useSharedValue(0);
@@ -204,7 +193,6 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
 
     const handleChartBoundsChange = (bounds: ChartBounds) => {
         const plotHeight = bounds.bottom - bounds.top;
-        setBarAreaHeight(plotHeight);
         barThickness.set(data.length > 0 ? (1 - HORIZONTAL_BAR_PADDING) * (plotHeight / data.length) : 0);
         plotLeft.set(bounds.left);
     };
@@ -288,6 +276,10 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
         cursor: isCursorOverClickable.get() ? 'pointer' : 'auto',
     }));
 
+    // Cap the label column as a fraction of the width so long labels can't starve the plot on narrow containers.
+    // Shared by the left padding and ChartYAxisLabels truncation so the gutter and rendered labels agree.
+    const categoryLabelMaxWidth = chartWidth > 0 ? Math.min(MAX_Y_AXIS_LABEL_WIDTH, CATEGORY_LABEL_WIDTH_RATIO * chartWidth) : MAX_Y_AXIS_LABEL_WIDTH;
+
     const categoryLabelWidth = (() => {
         if (!fontManager || data.length === 0) {
             return 0;
@@ -296,7 +288,7 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
         for (const point of data) {
             widest = Math.max(widest, measureTextWidth(point.label, fontManager, variables.iconSizeExtraSmall));
         }
-        return Math.min(MAX_Y_AXIS_LABEL_WIDTH, widest);
+        return Math.min(categoryLabelMaxWidth, widest);
     })();
 
     const {ascent, descent} = fontManager ? getFontLineMetrics(fontManager, variables.iconSizeExtraSmall) : {ascent: 0, descent: 0};
@@ -312,7 +304,7 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
         }
         let widest = 0;
         for (const tick of getNiceValueTicks(valueDomain, VictoryTheme.axis.tickCount)) {
-            widest = Math.max(widest, measureTextWidth(formatValue(tick), fontManager, variables.iconSizeExtraSmall));
+            widest = Math.max(widest, measureTextWidth(formatCompactValue(tick), fontManager, variables.iconSizeExtraSmall));
         }
         return widest / 2;
     })();
@@ -333,7 +325,7 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
                     fontSize={variables.iconSizeExtraSmall}
                     fontManager={fontManager}
                     labelColor={theme.textSupporting}
-                    formatValue={formatValue}
+                    formatValue={formatCompactValue}
                 />
                 <ChartYAxisLabels
                     yTicks={chartData.map((point) => point.y)}
@@ -343,7 +335,7 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
                     fontManager={fontManager}
                     labelColor={theme.textSupporting}
                     formatValue={(yValue: number) => data.at(lastIndex - yValue)?.label ?? ''}
-                    labelGap={CATEGORY_LABEL_GAP}
+                    maxLabelWidth={categoryLabelMaxWidth}
                     leftAlign
                     avoidOverlap
                 />
@@ -351,14 +343,18 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
         );
     };
 
-    const dynamicChartStyle = {height: CHART_CONTENT_MIN_HEIGHT + labelSpace};
     const chartPadding = {
         ...VictoryTheme.axis.padding,
+        top: 0,
         right: VictoryTheme.axis.padding.right + valueLabelRightGutter,
-        bottom: labelSpace + VictoryTheme.axis.padding.bottom,
+        // Just enough to hold the axis-label gap and the label itself. The card's own bottom padding sits below the
+        // canvas, so no extra padding is needed here and the labels stay a card-padding's distance from the edge.
+        bottom: labelSpace,
         left: categoryLabelWidth + CATEGORY_LABEL_GAP + GLYPH_PADDING,
     };
 
+    const dynamicChartStyle = {height: getHorizontalChartHeight(data.length, MIN_BAR_ROW_HEIGHT, chartPadding.top + chartPadding.bottom, CHART_CONTENT_MIN_HEIGHT + labelSpace)};
+
     // Draw each bar as its own Skia path so the rounded pill sits on the value tip and the axis end stays square,
     // for both positive (right-pointing) and negative (left-pointing) bars. thickness mirrors BarGroup's own
     // barWidth for a single series: (1 - betweenGroupPadding) * plotHeight / groupCount.
@@ -416,7 +412,7 @@ function HorizontalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPos
                         padding={chartPadding}
                         yKeys={['y']}
                         domain={valueDomain ? {x: valueDomain} : undefined}
-                        domainPadding={domainPadding}
+                        domainPadding={HORIZONTAL_BAR_DOMAIN_PADDING}
                         onChartBoundsChange={handleChartBoundsChange}
                         onScaleChange={handleScaleChange}
                         renderOutside={renderOutside}
diff --git a/src/components/Charts/BarChart/VerticalBarChartContent.tsx b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
index 0fa24cdd9c87..4c10e2fb0cdd 100644
--- a/src/components/Charts/BarChart/VerticalBarChartContent.tsx
+++ b/src/components/Charts/BarChart/VerticalBarChartContent.tsx
@@ -1,5 +1,5 @@
 import ActivityIndicator from '@components/ActivityIndicator';
-import BAR_INNER_PADDING from '@components/Charts/barChartConstants';
+import BAR_INNER_PADDING, {VERTICAL_BAR_DOMAIN_PADDING} from '@components/Charts/barChartConstants';
 import ChartTooltipLayer from '@components/Charts/components/ChartTooltipLayer';
 import ChartXAxisLabels from '@components/Charts/components/ChartXAxisLabels';
 import ChartYAxisLabels from '@components/Charts/components/ChartYAxisLabels';
@@ -13,7 +13,7 @@ import {
     useDynamicYDomain,
     useLabelHitTesting,
 } from '@components/Charts/hooks';
-import {calculateMinDomainPadding, getXAxisLabel, getYAxisLabelWidth} from '@components/Charts/utils';
+import {calculateMinDomainPadding, getVerticalBarLabelLayoutInputs, getXAxisLabel, getYAxisLabelWidth} from '@components/Charts/utils';
 import VictoryTheme, {CHART_CONTENT_MIN_HEIGHT, GLYPH_PADDING} from '@components/Charts/VictoryTheme';
 
 import useTheme from '@hooks/useTheme';
@@ -32,11 +32,6 @@ import {Bar, CartesianChart} from 'victory-native';
 
 import type {BarChartProps} from './types';
 
-/** Extra pixel spacing between the chart boundary and the data range, applied per side (Victory's `domainPadding` prop)
- * We need bottom: 1 for proper display of the bottom label
- */
-const BASE_DOMAIN_PADDING = {top: 32, bottom: 1, left: 0, right: 0};
-
 function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = 'left', color, onBarPress}: BarChartProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -69,15 +64,12 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
 
     const domainPadding = (() => {
         if (chartWidth === 0) {
-            return BASE_DOMAIN_PADDING;
+            return VERTICAL_BAR_DOMAIN_PADDING;
         }
         const horizontalPadding = calculateMinDomainPadding(chartWidth, data.length, BAR_INNER_PADDING);
-        return {...BASE_DOMAIN_PADDING, left: horizontalPadding, right: horizontalPadding};
+        return {...VERTICAL_BAR_DOMAIN_PADDING, left: horizontalPadding, right: horizontalPadding};
     })();
 
-    const totalDomainPadding = domainPadding.left + domainPadding.right;
-    const paddingScale = barAreaWidth > 0 ? barAreaWidth / (barAreaWidth + totalDomainPadding) : 0;
-
     const originalLabels = data.map(getXAxisLabel);
 
     const measurements = useChartLabelMeasurements(data, fontManager, variables.iconSizeExtraSmall);
@@ -86,14 +78,18 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
         data,
         fontManager,
         fontSize: variables.iconSizeExtraSmall,
-        tickSpacing: barAreaWidth > 0 ? barAreaWidth / data.length : 0,
-        labelAreaWidth: barAreaWidth,
-        firstTickLeftSpace: boundsLeft + domainPadding.left * paddingScale,
-        lastTickRightSpace: chartWidth > 0 ? chartWidth - boundsRight + domainPadding.right * paddingScale : 0,
         measurements,
+        ...getVerticalBarLabelLayoutInputs({
+            containerWidth: chartWidth,
+            plotLeft: boundsLeft,
+            plotRight: boundsRight,
+            plotWidth: barAreaWidth,
+            dataLength: data.length,
+            innerPadding: BAR_INNER_PADDING,
+        }),
     });
 
-    const {formatValue} = useChartLabelFormats({
+    const {formatValue, formatCompactValue} = useChartLabelFormats({
         data,
         unit: yAxisUnit,
         unitPosition: yAxisUnitPosition,
@@ -211,7 +207,7 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
                     fontSize={variables.iconSizeExtraSmall}
                     fontManager={fontManager}
                     labelColor={theme.textSupporting}
-                    formatValue={formatValue}
+                    formatValue={formatCompactValue}
                     leftAlign
                 />
             </>
@@ -220,7 +216,7 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
 
     const labelSpace = VictoryTheme.axis.labelGap + (xAxisLabelHeight ?? 0);
     const dynamicChartStyle = {height: CHART_CONTENT_MIN_HEIGHT + labelSpace};
-    const yAxisLabelWidth = getYAxisLabelWidth(data, formatValue, fontManager, variables.iconSizeExtraSmall, BASE_DOMAIN_PADDING);
+    const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, variables.iconSizeExtraSmall, VERTICAL_BAR_DOMAIN_PADDING);
     const chartPadding = {...VictoryTheme.axis.padding, bottom: labelSpace + VictoryTheme.axis.padding.bottom, left: yAxisLabelWidth + GLYPH_PADDING};
 
     if (isLoading || !fontManager) {
@@ -256,6 +252,9 @@ function VerticalBarChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosit
                         xAxis={{
                             tickCount: data.length,
                             lineWidth: VictoryTheme.axis.xLineWidth,
+                            // "outset" makes victory-native reserve 2 * yAxis.labelOffset below the plot for labels it
+                            // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
+                            labelPosition: 'inset',
                         }}
                         yAxis={[
                             {
diff --git a/src/components/Charts/BarChart/index.native.tsx b/src/components/Charts/BarChart/index.native.tsx
index b85c3b65074d..16a2c0787c93 100644
--- a/src/components/Charts/BarChart/index.native.tsx
+++ b/src/components/Charts/BarChart/index.native.tsx
@@ -7,13 +7,14 @@ import type {BarChartProps} from './types';
 import BarChartContent from './BarChartContent';
 
 function BarChart(props: BarChartProps) {
-    // Horizontal bars on wide layouts, vertical on narrow (mobile/RHP).
-    const {isHorizontal} = useBarChartOrientation();
+    // Horizontal bars on wide layouts, vertical on narrow (mobile/RHP) unless labels don't fit.
+    const {isHorizontal, canFallBackToHorizontalBars} = useBarChartOrientation();
 
     return (
         <BarChartContent
             {...props}
             isHorizontal={isHorizontal}
+            canFallBackToHorizontalBars={canFallBackToHorizontalBars}
         />
     );
 }
diff --git a/src/components/Charts/BarChart/index.tsx b/src/components/Charts/BarChart/index.tsx
index db4696a25ce7..1dd7cd8d9cab 100644
--- a/src/components/Charts/BarChart/index.tsx
+++ b/src/components/Charts/BarChart/index.tsx
@@ -8,13 +8,13 @@ import type {BarChartProps} from './types';
 
 const getBarChartContent = () => import('./BarChartContent');
 function BarChart(props: BarChartProps) {
-    // Horizontal bars on wide layouts, vertical on narrow (mobile/RHP). A single lazy module receives orientation as a prop.
-    const {isHorizontal} = useBarChartOrientation();
+    // Horizontal bars on wide layouts, vertical on narrow (mobile/RHP) unless labels don't fit. A single lazy module receives orientation as a prop.
+    const {isHorizontal, canFallBackToHorizontalBars} = useBarChartOrientation();
 
     return (
         <SkiaWebChart
             getComponent={getBarChartContent}
-            componentProps={{...props, isHorizontal}}
+            componentProps={{...props, isHorizontal, canFallBackToHorizontalBars}}
         />
     );
 }
diff --git a/src/components/Charts/BarChart/types.ts b/src/components/Charts/BarChart/types.ts
index eab5e92441f6..201fb9d6aaa9 100644
--- a/src/components/Charts/BarChart/types.ts
+++ b/src/components/Charts/BarChart/types.ts
@@ -11,6 +11,9 @@ type BarChartProps = CartesianChartProps & {
 type BarChartContentProps = BarChartProps & {
     /** When true, renders horizontal bars (value on the x-axis) instead of the default vertical bars. */
     isHorizontal?: boolean;
+
+    /** When true, the vertical chart may switch to horizontal bars if category labels don't fit even at 45° (narrow layout, beta on). */
+    canFallBackToHorizontalBars?: boolean;
 };
 
 export type {BarChartProps, BarChartContentProps};
diff --git a/src/components/Charts/LineChart/LineChartContent.tsx b/src/components/Charts/LineChart/LineChartContent.tsx
index f1320357b7c0..8fee71050a1f 100644
--- a/src/components/Charts/LineChart/LineChartContent.tsx
+++ b/src/components/Charts/LineChart/LineChartContent.tsx
@@ -82,13 +82,13 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
     const measurements = useChartLabelMeasurements(data, fontManager, variables.iconSizeExtraSmall);
     const {lineHeight, firstLabelWidth, lastLabelWidth, maxLabelWidth, labelWidths} = measurements;
 
-    const {formatValue} = useChartLabelFormats({
+    const {formatValue, formatCompactValue} = useChartLabelFormats({
         data,
         unit: yAxisUnit,
         unitPosition: yAxisUnitPosition,
     });
 
-    const yAxisLabelWidth = getYAxisLabelWidth(data, formatValue, fontManager, variables.iconSizeExtraSmall, BASE_DOMAIN_PADDING);
+    const yAxisLabelWidth = getYAxisLabelWidth(data, formatCompactValue, fontManager, variables.iconSizeExtraSmall, BASE_DOMAIN_PADDING);
 
     const tickSpacing = plotAreaWidth > 0 && data.length > 0 ? plotAreaWidth / data.length : 0;
     const chartPaddingLeft = yAxisLabelWidth + GLYPH_PADDING;
@@ -214,7 +214,7 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
                         fontSize={variables.iconSizeExtraSmall}
                         fontManager={fontManager}
                         labelColor={theme.textSupporting}
-                        formatValue={formatValue}
+                        formatValue={formatCompactValue}
                         leftAlign
                     />
                 )}
@@ -263,6 +263,9 @@ function LineChartContentBody({data, isLoading, yAxisUnit, yAxisUnitPosition = '
                         xAxis={{
                             tickCount: data.length,
                             lineWidth: VictoryTheme.axis.xLineWidth,
+                            // "outset" makes victory-native reserve 2 * yAxis.labelOffset below the plot for labels it
+                            // doesn't draw (we render ChartXAxisLabels ourselves), on top of our own labelSpace.
+                            labelPosition: 'inset',
                         }}
                         yAxis={[
                             {
diff --git a/src/components/Charts/PieChart/PieChartContent.tsx b/src/components/Charts/PieChart/PieChartContent.tsx
index 4f261f1919bb..180542eea001 100644
--- a/src/components/Charts/PieChart/PieChartContent.tsx
+++ b/src/components/Charts/PieChart/PieChartContent.tsx
@@ -139,7 +139,7 @@ function PieChartContent({data, isLoading, valueUnit, valueUnitPosition, onSlice
         return (
             <View
                 key={`legend-${slice.originalIndex}`}
-                style={[styles.flexRow, styles.alignItemsCenter, styles.mr4, styles.mb2]}
+                style={[styles.flexRow, styles.alignItemsCenter]}
                 onMouseEnter={() => {
                     tooltipPosition.set(slice.tooltipPosition);
                     setActiveSliceIndex(slice.ordinalIndex);
diff --git a/src/components/Charts/SkiaWebChart/index.tsx b/src/components/Charts/SkiaWebChart/index.tsx
index 781d6f18354e..8268fa6de3c9 100644
--- a/src/components/Charts/SkiaWebChart/index.tsx
+++ b/src/components/Charts/SkiaWebChart/index.tsx
@@ -6,14 +6,19 @@ import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import Log from '@libs/Log';
+
 import variables from '@styles/variables';
 
+import type {TranslationPaths} from '@src/languages/types';
 import viewRef from '@src/types/utils/viewRef';
 
 import type {ComponentType} from 'react';
 
+import * as Sentry from '@sentry/react-native';
 import {WithSkiaWeb} from '@shopify/react-native-skia/lib/module/web';
 import React, {useRef, useState} from 'react';
+import {ErrorBoundary} from 'react-error-boundary';
 import {View} from 'react-native';
 
 import isSkiaWebSupported from './isSkiaWebSupported';
@@ -29,7 +34,19 @@ type SkiaWebChartProps<TProps> = {
     /** Identifies the loading skeleton span for telemetry. */
 };
 
-function ChartUnavailable() {
+type ChartUnavailableProps = {
+    /** Explains why the chart can't be shown. Defaults to the WebGL message. */
+    description?: TranslationPaths;
+};
+
+/**
+ * The CanvasKit glue asks `locateFile` where to fetch `canvaskit.wasm` from. The binary is emitted under a
+ * versioned name (see `CANVASKIT_WASM_FILENAME` in `config/rsbuild/rsbuild.common.ts`) so this bundle's glue
+ * can never be handed another release's binary. Every other file keeps the default root-relative path.
+ */
+const locateCanvasKitFile = (file: string) => (file === 'canvaskit.wasm' ? __CANVASKIT_WASM_URL__ : `/${file}`);
+
+function ChartUnavailable({description = 'common.webGLNotSupported'}: ChartUnavailableProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const illustrations = useMemoizedLazyIllustrations(['MonitorSyncNo']);
@@ -42,15 +59,37 @@ function ChartUnavailable() {
                 height={variables.iconSizeSuperLarge}
             />
             <Text style={styles.notFoundTextHeader}>{translate('common.unableToDisplayChart')}</Text>
-            <Text style={[styles.textSupporting, styles.textAlignCenter]}>{translate('common.webGLNotSupported')}</Text>
+            <Text style={[styles.textSupporting, styles.textAlignCenter]}>{translate(description)}</Text>
         </View>
     );
 }
 
+function ChartFailedToLoad() {
+    return <ChartUnavailable description="common.chartFailedToLoad" />;
+}
+
+/**
+ * CanvasKit failing to initialize is environmental rather than a bug in the chart: a stale or mismatched
+ * `canvaskit.wasm` (see https://github.com/Expensify/App/issues/102042), an 8 MB download failing offline,
+ * or a chunk that vanished from the CDN. Report it as a warning under one fingerprint so it stays visible in
+ * Sentry without fragmenting per chart, and let the boundary show the empty state instead of crashing.
+ */
+const logSkiaLoadError = (error: Error, info: {componentStack?: string | null}) => {
+    const componentStack = info.componentStack ?? undefined;
+    Log.warn(`[SkiaWebChart] failed to load CanvasKit - ${error.message}`, {componentStack});
+    Sentry.captureException(error, {
+        level: 'warning',
+        tags: {context: 'skia-web-chart-load'},
+        fingerprint: ['skia-web-chart-load-failure'],
+        extra: {componentStack},
+    });
+};
+
 /**
  * Shared web wrapper around `WithSkiaWeb` for the chart entry points (Pie/Line/Bar and the Victory
  * renderer). When the environment can't provide a usable WebGL/Skia surface it shows an "unable to
  * display chart" empty state instead of mounting Skia, avoiding the CanvasKit GL-init crash (see `isSkiaWebSupported`).
+ * If CanvasKit itself fails to load or link, the error boundary degrades to the same empty state.
  */
 // `object` mirrors WithSkiaWeb's own constraint; `Record<string, unknown>` would reject the
 // interface-based render-html renderer props (VictoryChartRendererProps) that lack an index signature.
@@ -83,12 +122,18 @@ function SkiaWebChart<TProps extends object>({getComponent, componentProps}: Ski
             ref={viewRef(containerRef)}
             style={styles.mw100}
         >
-            <WithSkiaWeb
-                opts={{locateFile: (file: string) => `/${file}`}}
-                getComponent={getComponent}
-                componentProps={componentProps}
-                fallback={fallback}
-            />
+            <ErrorBoundary
+                FallbackComponent={ChartFailedToLoad}
+                onError={logSkiaLoadError}
+            >
+                {/* The glue mutates `opts` into the module object, so give each mount its own object rather than sharing one. */}
+                <WithSkiaWeb
+                    opts={{locateFile: locateCanvasKitFile}}
+                    getComponent={getComponent}
+                    componentProps={componentProps}
+                    fallback={fallback}
+                />
+            </ErrorBoundary>
         </View>
     );
 }
diff --git a/src/components/Charts/VictoryTheme.ts b/src/components/Charts/VictoryTheme.ts
index b11720661f13..02d089d2f98b 100644
--- a/src/components/Charts/VictoryTheme.ts
+++ b/src/components/Charts/VictoryTheme.ts
@@ -119,6 +119,10 @@ const DIAGONAL_ANGLE_RADIAN_THRESHOLD = 1;
 // Maximum width for Y-axis labels in pixels
 const MAX_Y_AXIS_LABEL_WIDTH = 200;
 
+// Max fraction of the chart width the horizontal chart's category labels may occupy, so the plot
+// stays usable on narrow containers where the fixed MAX_Y_AXIS_LABEL_WIDTH would starve it.
+const CATEGORY_LABEL_WIDTH_RATIO = 0.4;
+
 // Maximum width for X-axis labels in pixels
 const MAX_X_AXIS_LABEL_WIDTH = 500;
 
@@ -137,6 +141,7 @@ export {
     DIAGONAL_ANGLE_RADIAN_THRESHOLD,
     MAX_X_AXIS_LABEL_WIDTH,
     MAX_Y_AXIS_LABEL_WIDTH,
+    CATEGORY_LABEL_WIDTH_RATIO,
     GLYPH_PADDING,
 };
 export default VictoryTheme;
diff --git a/src/components/Charts/barChartConstants.ts b/src/components/Charts/barChartConstants.ts
index ccba322c2f1a..13018f275c0a 100644
--- a/src/components/Charts/barChartConstants.ts
+++ b/src/components/Charts/barChartConstants.ts
@@ -1,4 +1,14 @@
 /** Inner padding between bars (0.3 = 30% of bar width) */
 const BAR_INNER_PADDING = 0.3;
 
+/** Minimum vertical space (px) per category row in a horizontal bar chart, so labels show in full. */
+const MIN_BAR_ROW_HEIGHT = 36;
+
+/** Per-side domain padding (Victory's `domainPadding`). `bottom: 1` keeps the bottom label visible. */
+const VERTICAL_BAR_DOMAIN_PADDING = {top: 32, bottom: 1, left: 0, right: 0};
+
+/** Per-side domain padding (Victory's `domainPadding`). `right` keeps the longest bar's tip and tooltip off the edge. */
+const HORIZONTAL_BAR_DOMAIN_PADDING = {top: 8, bottom: 8, left: 0, right: 8};
+
 export default BAR_INNER_PADDING;
+export {MIN_BAR_ROW_HEIGHT, VERTICAL_BAR_DOMAIN_PADDING, HORIZONTAL_BAR_DOMAIN_PADDING};
diff --git a/src/components/Charts/components/ChartYAxisLabels.tsx b/src/components/Charts/components/ChartYAxisLabels.tsx
index a01d8426ce4f..d8f92f1e99a3 100644
--- a/src/components/Charts/components/ChartYAxisLabels.tsx
+++ b/src/components/Charts/components/ChartYAxisLabels.tsx
@@ -1,6 +1,6 @@
 import {useChartParagraphs} from '@components/Charts/hooks';
 import {getFontLineMetrics, measureTextWidth, truncateLabel} from '@components/Charts/utils';
-import VictoryTheme, {ELLIPSIS, GLYPH_PADDING, LABEL_PADDING, MAX_X_AXIS_LABEL_WIDTH, MAX_Y_AXIS_LABEL_WIDTH} from '@components/Charts/VictoryTheme';
+import {ELLIPSIS, GLYPH_PADDING, LABEL_PADDING, MAX_X_AXIS_LABEL_WIDTH, MAX_Y_AXIS_LABEL_WIDTH} from '@components/Charts/VictoryTheme';
 
 import type {SkTypefaceFontProvider} from '@shopify/react-native-skia';
 import type {ChartBounds, Scale} from 'victory-native';
@@ -33,11 +33,11 @@ type ChartYAxisLabelsProps = {
     /** When true, labels are left-aligned starting at the left edge of the chart instead of right-aligned. */
     leftAlign?: boolean;
 
-    /** Horizontal gap between the labels and the chart's left edge. Defaults to the shared axis gap. */
-    labelGap?: number;
-
     /** When true, thin out labels so vertically stacked rows never overlap (used by the horizontal chart's category axis). */
     avoidOverlap?: boolean;
+
+    /** Width (px) labels truncate to. Must match the left padding the caller reserves for them. */
+    maxLabelWidth?: number;
 };
 
 function ChartYAxisLabels({
@@ -49,19 +49,18 @@ function ChartYAxisLabels({
     labelColor,
     formatValue,
     leftAlign = false,
-    labelGap = VictoryTheme.axis.labelGap,
     avoidOverlap = false,
+    maxLabelWidth = MAX_Y_AXIS_LABEL_WIDTH,
 }: ChartYAxisLabelsProps) {
     const formattedLabels = yTicks.map((tick) => formatValue(tick));
 
     // Truncate to a single line: labels wider than the max would otherwise wrap onto a second line and
     // overflow the row height (positioning below assumes one line).
     const ellipsisWidth = measureTextWidth(ELLIPSIS, fontManager, fontSize);
-    const truncatedLabels = formattedLabels.map((label) => truncateLabel(label, measureTextWidth(label, fontManager, fontSize), MAX_Y_AXIS_LABEL_WIDTH, ellipsisWidth));
+    const truncatedLabels = formattedLabels.map((label) => truncateLabel(label, measureTextWidth(label, fontManager, fontSize), maxLabelWidth, ellipsisWidth));
 
     // Lay out at the wide width so the already-truncated labels never wrap.
     const paragraphs = useChartParagraphs(truncatedLabels, fontManager, fontSize, labelColor, MAX_X_AXIS_LABEL_WIDTH);
-    const maxWidth = Math.max(0, ...paragraphs.map((item) => item.width));
 
     const {ascent, descent} = getFontLineMetrics(fontManager, fontSize);
     const lineHeight = ascent + descent;
@@ -94,7 +93,9 @@ function ChartYAxisLabels({
             return null;
         }
 
-        const x = chartBounds.left - labelGap + GLYPH_PADDING - (leftAlign ? maxWidth : paraData.width);
+        // Left-aligned labels (horizontal bar chart) start at the canvas origin so they sit on the same left
+        // key line as the chart title. Right-aligned labels end just inside the plot's left edge.
+        const x = leftAlign ? 0 : chartBounds.left + GLYPH_PADDING - paraData.width;
         const tickY = yScale(tick);
 
         return (
diff --git a/src/components/Charts/hooks/useChartLabelFormats.ts b/src/components/Charts/hooks/useChartLabelFormats.ts
index b05e02c166bf..f025e2c85ef0 100644
--- a/src/components/Charts/hooks/useChartLabelFormats.ts
+++ b/src/components/Charts/hooks/useChartLabelFormats.ts
@@ -21,14 +21,15 @@ export default function useChartLabelFormats({data, unit, unitPosition = 'left',
 
     const displayUnit = typeof unit === 'string' ? unit : unit?.value;
     const unitToDisplay = fontManager && !canFontRenderText(displayUnit, fontManager) ? (unit as UnitWithFallback)?.fallback : displayUnit;
-    const formatValue = (value: number) => {
-        const formatted = numberFormat(value);
+    const withUnit = (formatted: string) => {
         if (!unitToDisplay) {
             return formatted;
         }
         const separator = unitToDisplay.length > 1 ? ' ' : '';
         return unitPosition === 'left' ? `${unitToDisplay}${separator}${formatted}` : `${formatted}${separator}${unitToDisplay}`;
     };
+    const formatValue = (value: number) => withUnit(numberFormat(value));
+    const formatCompactValue = (value: number) => withUnit(numberFormat(value, {notation: 'compact'}).replace('K', 'k'));
 
     const formatLabel = (value: number) => {
         const index = Math.round(value);
@@ -45,5 +46,6 @@ export default function useChartLabelFormats({data, unit, unitPosition = 'left',
     return {
         formatLabel,
         formatValue,
+        formatCompactValue,
     };
 }
diff --git a/src/components/Charts/hooks/useChartLabelLayout.ts b/src/components/Charts/hooks/useChartLabelLayout.ts
index 804cfa0b8070..2faa7776b4da 100644
--- a/src/components/Charts/hooks/useChartLabelLayout.ts
+++ b/src/components/Charts/hooks/useChartLabelLayout.ts
@@ -61,7 +61,8 @@ function useChartLabelLayout({data, fontManager, tickSpacing, labelAreaWidth, fi
     const effectiveFirstTickLeftSpace = data.length === 1 ? Infinity : firstTickLeftSpace;
     const effectiveLastTickRightSpace = data.length === 1 ? Infinity : lastTickRightSpace;
 
-    // Pick rotation (prefer 0° → 45° → 90°)
+    // Pick rotation (prefer 0° → 45° → 90°). When neither 0° nor 45° fits, rotation stays 90° and bar-chart
+    // callers read that as the signal to fall back to horizontal bars.
     let rotation: LabelRotation = LABEL_ROTATIONS.VERTICAL;
 
     const hWidth = effectiveWidth(maxLabelWidth, lineHeight, LABEL_ROTATIONS.HORIZONTAL);
diff --git a/src/components/Charts/utils/index.ts b/src/components/Charts/utils/index.ts
index b4bab37aa2ec..4857079332ad 100644
--- a/src/components/Charts/utils/index.ts
+++ b/src/components/Charts/utils/index.ts
@@ -101,7 +101,8 @@ function canFontRenderText(text: string | undefined, fontManager: SkTypefaceFont
  */
 function measureTextWidth(text: string, fontManager: SkTypefaceFontProvider, fontSize: number): number {
     const para = buildChartParagraph(text, fontManager, fontSize);
-    para.layout(MAX_X_AXIS_LABEL_WIDTH);
+    // Unbounded width so text never wraps; a wrapped getLongestLine would underestimate long labels.
+    para.layout(Number.MAX_SAFE_INTEGER);
     return para.getLongestLine();
 }
 
@@ -463,6 +464,55 @@ function getNiceValueTicks(domain: [number, number], tickCount: number): number[
     return scaleLinear().domain(domain).ticks(tickCount);
 }
 
+/**
+ * Horizontal plot bounds of a vertical bar chart for a container width, mirroring victory-native's layout.
+ * Deriving it from the width (not post-mount) lets the wrapper re-decide orientation on every resize.
+ */
+function getVerticalBarPlotBounds(chartWidth: number, paddingLeft: number): {left: number; right: number; width: number} {
+    const left = paddingLeft + VictoryTheme.axis.labelGap;
+    const right = Math.max(left, chartWidth - VictoryTheme.axis.padding.right);
+    return {left, right, width: right - left};
+}
+
+/**
+ * Layout inputs shared by the vertical bar chart body and the orientation dispatcher, derived from the plot bounds.
+ * The body passes its measured bounds and the dispatcher passes bounds predicted from the container width, so both
+ * feed `useChartLabelLayout` the exact same geometry and cannot drift apart.
+ */
+function getVerticalBarLabelLayoutInputs({
+    containerWidth,
+    plotLeft,
+    plotRight,
+    plotWidth,
+    dataLength,
+    innerPadding,
+}: {
+    containerWidth: number;
+    plotLeft: number;
+    plotRight: number;
+    plotWidth: number;
+    dataLength: number;
+    innerPadding: number;
+}): {tickSpacing: number; labelAreaWidth: number; firstTickLeftSpace: number; lastTickRightSpace: number} {
+    const domainPadding = containerWidth > 0 && dataLength > 0 ? calculateMinDomainPadding(containerWidth, dataLength, innerPadding) : 0;
+    const paddingScale = plotWidth > 0 ? plotWidth / (plotWidth + 2 * domainPadding) : 0;
+    return {
+        tickSpacing: plotWidth > 0 && dataLength > 0 ? plotWidth / dataLength : 0,
+        labelAreaWidth: plotWidth,
+        firstTickLeftSpace: plotLeft + domainPadding * paddingScale,
+        lastTickRightSpace: containerWidth > 0 ? containerWidth - plotRight + domainPadding * paddingScale : 0,
+    };
+}
+
+/**
+ * Height of a horizontal bar chart. Grows with the row count so every category row gets at least
+ * `minRowHeight` of vertical space, keeping all category labels visible instead of thinning them out.
+ * Never smaller than `minHeight`, so small datasets keep the shared minimum.
+ */
+function getHorizontalChartHeight(rowCount: number, minRowHeight: number, verticalPadding: number, minHeight: number): number {
+    return Math.max(minHeight, rowCount * minRowHeight + verticalPadding);
+}
+
 /** Returns the pixel width needed for Y-axis labels given the chart data. */
 function getYAxisLabelWidth(
     data: ChartDataPoint[],
@@ -512,6 +562,9 @@ export {
     getNiceValueDomain,
     getNiceValueTicks,
     getYAxisLabelWidth,
+    getHorizontalChartHeight,
+    getVerticalBarPlotBounds,
+    getVerticalBarLabelLayoutInputs,
 };
 
 export type {ChartLabelHitTestParams};
diff --git a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
index c98ec9f3ad10..0672715a273a 100644
--- a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
+++ b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx
@@ -8,7 +8,7 @@ import useInitialSelection from '@hooks/useInitialSelection';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
+import moveInitialSelectionToTop, {shouldMoveInitialSelectionToTop} from '@libs/SelectionListOrderUtils';
 
 import CONST from '@src/CONST';
 
@@ -39,7 +39,18 @@ function YearPickerModal({isVisible, years, currentYear, onYearChange, onClose,
     const initialYear = useInitialSelection(resolvedCurrentYear, {isVisible});
     // Pin the frozen initial year to the top of the full sorted list before search filtering, so it stays pinned while searching.
     // Copy before sorting so we don't mutate the caller's `years` prop during render.
-    const sortedYears = [...years].sort((a, b) => b.value - a.value);
+    // Long lists (where the pin applies) show upcoming years ascending, then past years nearest first, so the row after the pinned year is the next year.
+    // Short lists aren't pinned, so they keep the newest-first order.
+    const compareNewestFirst = (a: CalendarPickerListItem, b: CalendarPickerListItem) => b.value - a.value;
+    const compareAroundInitialYear = (a: CalendarPickerListItem, b: CalendarPickerListItem) => {
+        const isAUpcoming = a.value > initialYear;
+        const isBUpcoming = b.value > initialYear;
+        if (isAUpcoming !== isBUpcoming) {
+            return isAUpcoming ? -1 : 1;
+        }
+        return isAUpcoming ? a.value - b.value : b.value - a.value;
+    };
+    const sortedYears = [...years].sort(shouldMoveInitialSelectionToTop(years.length) ? compareAroundInitialYear : compareNewestFirst);
     const orderedYears = moveInitialSelectionToTop(sortedYears, [String(initialYear)]);
     const data = searchText === '' ? orderedYears : orderedYears.filter((year) => year.text?.includes(searchText));
     const headerMessage = !data.length ? translate('common.noResultsFound') : '';
diff --git a/src/components/DistanceEReceipt.tsx b/src/components/DistanceEReceipt.tsx
index 7cf18bc0a319..b489c9dfccbd 100644
--- a/src/components/DistanceEReceipt.tsx
+++ b/src/components/DistanceEReceipt.tsx
@@ -1,28 +1,12 @@
-import EReceiptBackground from '@assets/images/eReceipt_background.svg';
-
-import {useCurrencyListActions} from '@hooks/useCurrencyList';
-import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
-import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
-import {getTransactionDetails} from '@libs/ReportUtils';
-import {getWaypointIndex, hasReceipt, isFetchingWaypointsFromServer} from '@libs/TransactionUtils';
-import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
-
-import type {TranslationPaths} from '@src/languages/types';
 import type {Transaction} from '@src/types/onyx';
-import type {WaypointCollection} from '@src/types/onyx/Transaction';
 
-import React, {useMemo} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 
-import Icon from './Icon';
-import ImageSVG from './ImageSVG';
-import PendingMapView from './MapView/PendingMapView';
-import ReceiptImage from './ReceiptImage';
+import DistanceEReceiptPanel from './DistanceEReceiptPanel';
 import ScrollView from './ScrollView';
-import Text from './Text';
 
 type DistanceEReceiptProps = {
     /** The transaction for the distance expense */
@@ -34,86 +18,14 @@ type DistanceEReceiptProps = {
 
 function DistanceEReceipt({transaction, hoverPreview = false}: DistanceEReceiptProps) {
     const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const {convertToDisplayString} = useCurrencyListActions();
-    const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark']);
-    const thumbnail = hasReceipt(transaction) ? getThumbnailAndImageURIs(transaction).thumbnail : null;
-    const {amount: transactionAmount, currency: transactionCurrency, merchant: transactionMerchant, created: transactionDate} = getTransactionDetails(transaction) ?? {};
-    const formattedTransactionAmount = convertToDisplayString(transactionAmount, transactionCurrency);
-    const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail ?? '');
-    const waypoints = useMemo(() => transaction?.comment?.waypoints ?? {}, [transaction?.comment?.waypoints]);
-    const sortedWaypoints = useMemo<WaypointCollection>(
-        () =>
-            // The waypoint keys are sometimes out of order
-            Object.keys(waypoints)
-                .sort((keyA, keyB) => getWaypointIndex(keyA) - getWaypointIndex(keyB))
-                .map((key) => ({[key]: waypoints[key]}))
-                .reduce((result, obj) => (obj ? Object.assign(result, obj) : result), {}),
-        [waypoints],
-    );
+
     return (
         <View style={[styles.flex1, styles.alignItemsCenter, hoverPreview && styles.mhv5]}>
             <ScrollView
                 style={styles.w100}
                 contentContainerStyle={[styles.flexGrow1, styles.justifyContentCenter, styles.alignItemsCenter]}
             >
-                <View style={styles.eReceiptPanel}>
-                    <ImageSVG
-                        src={EReceiptBackground}
-                        style={styles.eReceiptBackground}
-                        pointerEvents="none"
-                    />
-
-                    <View style={[styles.moneyRequestViewImage, styles.mh0, styles.mt0, styles.mb5, styles.borderNone]}>
-                        {isFetchingWaypointsFromServer(transaction) || !thumbnailSource ? (
-                            <PendingMapView />
-                        ) : (
-                            <ReceiptImage
-                                source={thumbnailSource}
-                                shouldUseThumbnailImage
-                                shouldUseInitialObjectPosition
-                                isAuthTokenRequired
-                            />
-                        )}
-                    </View>
-                    <View style={[styles.mb10, styles.gap5, styles.ph2, styles.flexColumn, styles.alignItemsCenter]}>
-                        {transactionAmount !== null && transactionAmount !== undefined && <Text style={styles.eReceiptAmount}>{formattedTransactionAmount}</Text>}
-                        <Text style={styles.eReceiptMerchant}>{transactionMerchant !== translate('iou.fieldPending') ? transactionMerchant : transaction.merchant}</Text>
-                    </View>
-                    <View style={[styles.mb10, styles.gap5, styles.ph2]}>
-                        {Object.entries(sortedWaypoints).map(([key, waypoint]) => {
-                            const index = getWaypointIndex(key);
-                            let descriptionKey: TranslationPaths = 'distance.waypointDescription.stop';
-                            if (index === 0) {
-                                descriptionKey = 'distance.waypointDescription.start';
-                            }
-
-                            return (
-                                <View
-                                    style={styles.gap1}
-                                    key={key}
-                                >
-                                    <Text style={styles.eReceiptWaypointTitle}>{translate(descriptionKey)}</Text>
-                                    {!!waypoint?.name && <Text style={styles.eReceiptWaypointAddress}>{waypoint.name}</Text>}
-                                    {!!waypoint?.address && <Text style={styles.eReceiptGuaranteed}>{waypoint.address}</Text>}
-                                </View>
-                            );
-                        })}
-                        <View style={styles.gap1}>
-                            <Text style={styles.eReceiptWaypointTitle}>{translate('common.date')}</Text>
-                            <Text style={styles.eReceiptWaypointAddress}>{transactionDate}</Text>
-                        </View>
-                    </View>
-                    <View style={[styles.ph2, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-                        <Icon
-                            width={86}
-                            height={19.25}
-                            src={icons.ExpensifyWordmark}
-                        />
-
-                        <Text style={styles.eReceiptGuaranteed}>{translate('eReceipt.guaranteed')}</Text>
-                    </View>
-                </View>
+                <DistanceEReceiptPanel transaction={transaction} />
             </ScrollView>
         </View>
     );
diff --git a/src/components/DistanceEReceiptPanel.tsx b/src/components/DistanceEReceiptPanel.tsx
new file mode 100644
index 000000000000..53a8ef6ad82a
--- /dev/null
+++ b/src/components/DistanceEReceiptPanel.tsx
@@ -0,0 +1,120 @@
+import EReceiptBackground from '@assets/images/eReceipt_background.svg';
+
+import {useCurrencyListActions} from '@hooks/useCurrencyList';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
+import {getTransactionDetails} from '@libs/ReportUtils';
+import {getWaypointIndex, hasPendingDistanceReceiptRegeneration, hasReceipt} from '@libs/TransactionUtils';
+import hasDistanceRouteErrors from '@libs/TransactionUtils/hasDistanceRouteErrors';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
+
+import type {TranslationPaths} from '@src/languages/types';
+import type {Transaction} from '@src/types/onyx';
+import type {WaypointCollection} from '@src/types/onyx/Transaction';
+
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+
+import Icon from './Icon';
+import ImageSVG from './ImageSVG';
+import PendingMapView from './MapView/PendingMapView';
+import ReceiptImage from './ReceiptImage';
+import Text from './Text';
+
+type DistanceEReceiptPanelProps = {
+    /** The transaction for the distance expense */
+    transaction: Transaction;
+};
+
+/**
+ * The distance e-receipt card on its own, at its natural height. `DistanceEReceipt` wraps it in a scrolling layout that
+ * fills its parent; `ScaledDistanceEReceipt` measures the card to scale it, so it renders this directly, because inside a
+ * parent with no height of its own the filling layout resolves to zero height on native.
+ */
+function DistanceEReceiptPanel({transaction}: DistanceEReceiptPanelProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {convertToDisplayString} = useCurrencyListActions();
+    const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark']);
+    const thumbnail = hasReceipt(transaction) ? getThumbnailAndImageURIs(transaction).thumbnail : null;
+    const {amount: transactionAmount, currency: transactionCurrency, merchant: transactionMerchant, created: transactionDate} = getTransactionDetails(transaction) ?? {};
+    const formattedTransactionAmount = convertToDisplayString(transactionAmount, transactionCurrency);
+    const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail ?? '');
+    // The thumbnail this card draws is the stored route map. An edit that makes the server rebuild the receipt
+    // invalidates its URL, and a route error means there is no trip to draw, so show the pending map for both.
+    const canShowStoredRouteMap = !hasPendingDistanceReceiptRegeneration(transaction) && !hasDistanceRouteErrors(transaction);
+    const waypoints = useMemo(() => transaction?.comment?.waypoints ?? {}, [transaction?.comment?.waypoints]);
+    const sortedWaypoints = useMemo<WaypointCollection>(
+        () =>
+            // The waypoint keys are sometimes out of order
+            Object.keys(waypoints)
+                .sort((keyA, keyB) => getWaypointIndex(keyA) - getWaypointIndex(keyB))
+                .map((key) => ({[key]: waypoints[key]}))
+                .reduce((result, obj) => (obj ? Object.assign(result, obj) : result), {}),
+        [waypoints],
+    );
+    return (
+        <View style={styles.eReceiptPanel}>
+            <ImageSVG
+                src={EReceiptBackground}
+                style={styles.eReceiptBackground}
+                pointerEvents="none"
+            />
+
+            <View style={[styles.moneyRequestViewImage, styles.mh0, styles.mt0, styles.mb5, styles.borderNone]}>
+                {!canShowStoredRouteMap || !thumbnailSource ? (
+                    <PendingMapView />
+                ) : (
+                    <ReceiptImage
+                        source={thumbnailSource}
+                        shouldUseThumbnailImage
+                        shouldUseInitialObjectPosition
+                        isAuthTokenRequired
+                    />
+                )}
+            </View>
+            <View style={[styles.mb10, styles.gap5, styles.ph2, styles.flexColumn, styles.alignItemsCenter]}>
+                {transactionAmount !== null && transactionAmount !== undefined && <Text style={styles.eReceiptAmount}>{formattedTransactionAmount}</Text>}
+                <Text style={styles.eReceiptMerchant}>{transactionMerchant !== translate('iou.fieldPending') ? transactionMerchant : transaction.merchant}</Text>
+            </View>
+            <View style={[styles.mb10, styles.gap5, styles.ph2]}>
+                {Object.entries(sortedWaypoints).map(([key, waypoint]) => {
+                    const index = getWaypointIndex(key);
+                    let descriptionKey: TranslationPaths = 'distance.waypointDescription.stop';
+                    if (index === 0) {
+                        descriptionKey = 'distance.waypointDescription.start';
+                    }
+
+                    return (
+                        <View
+                            style={styles.gap1}
+                            key={key}
+                        >
+                            <Text style={styles.eReceiptWaypointTitle}>{translate(descriptionKey)}</Text>
+                            {!!waypoint?.name && <Text style={styles.eReceiptWaypointAddress}>{waypoint.name}</Text>}
+                            {!!waypoint?.address && <Text style={styles.eReceiptGuaranteed}>{waypoint.address}</Text>}
+                        </View>
+                    );
+                })}
+                <View style={styles.gap1}>
+                    <Text style={styles.eReceiptWaypointTitle}>{translate('common.date')}</Text>
+                    <Text style={styles.eReceiptWaypointAddress}>{transactionDate}</Text>
+                </View>
+            </View>
+            <View style={[styles.ph2, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
+                <Icon
+                    width={86}
+                    height={19.25}
+                    src={icons.ExpensifyWordmark}
+                />
+
+                <Text style={styles.eReceiptGuaranteed}>{translate('eReceipt.guaranteed')}</Text>
+            </View>
+        </View>
+    );
+}
+
+export default DistanceEReceiptPanel;
diff --git a/src/components/TransactionItemRow/EditableCell/EditableCell.tsx b/src/components/EditableCell/EditableCell.tsx
similarity index 100%
rename from src/components/TransactionItemRow/EditableCell/EditableCell.tsx
rename to src/components/EditableCell/EditableCell.tsx
diff --git a/src/components/TransactionItemRow/EditableCell/EditingCellContext.tsx b/src/components/EditableCell/EditingCellContext.tsx
similarity index 100%
rename from src/components/TransactionItemRow/EditableCell/EditingCellContext.tsx
rename to src/components/EditableCell/EditingCellContext.tsx
diff --git a/src/components/EditableCell/InlineNumberEditCell.tsx b/src/components/EditableCell/InlineNumberEditCell.tsx
new file mode 100644
index 000000000000..e93ffca75ce5
--- /dev/null
+++ b/src/components/EditableCell/InlineNumberEditCell.tsx
@@ -0,0 +1,132 @@
+/**
+ * Generic inline number editing cell for tables. Same role as InlineTextEditCell, but the
+ * editor is NumberWithSymbolForm so currency amounts and rates share focus, Escape, and save
+ * wiring instead of copying it per table.
+ *
+ * Callers convert to a frontend numeric string before passing `value`. Invalid values are
+ * handled by onSave, which no-ops on rejection. The cell then reverts to the original value.
+ */
+import NumberWithSymbolForm from '@components/NumberWithSymbolForm';
+import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
+import TextWithTooltip from '@components/TextWithTooltip';
+
+import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getLocalizedCurrencySymbol} from '@libs/CurrencyUtils';
+
+import CONST from '@src/CONST';
+
+import React, {useRef} from 'react';
+
+import type {EditableProps} from './types';
+
+import EditableCell from './EditableCell';
+import useInlineEditState from './useInlineEditState';
+
+type InlineNumberEditCellProps = {
+    /** Frontend numeric string used as the initial edit buffer. Conversion stays at the call site. */
+    value: string;
+
+    currency: string;
+
+    /** Formatted display string (includes the currency symbol). Differs from `value`, which is the editable number only. */
+    displayText: string;
+
+    accessibilityLabel: string;
+
+    /** NumberWithSymbolForm decimal places. Omit to use its default of 0. */
+    decimals?: number;
+
+    /** Lets the user type a leading minus. */
+    allowNegativeInput?: boolean;
+
+    /**
+     * Defaults to right, with the pencil on the left so it does not cover the number.
+     * Pass left to keep the pencil on the right.
+     */
+    textAlign?: 'left' | 'right';
+
+    /** Defaults to Number() comparison so "1.00" and "1" are treated as unchanged. */
+    isEqual?: (newValue: string, originalValue: string) => boolean;
+} & EditableProps<string>;
+
+const areNumericValuesEqual = (newValue: string, originalValue: string) => Number(newValue) === Number(originalValue);
+
+function InlineNumberEditCell({
+    value,
+    currency,
+    displayText,
+    accessibilityLabel,
+    decimals,
+    allowNegativeInput = false,
+    textAlign = 'right',
+    isEqual = areNumericValuesEqual,
+    canEdit,
+    onSave,
+}: InlineNumberEditCellProps) {
+    const styles = useThemeStyles();
+    const {preferredLocale} = useLocalize();
+    const inputRef = useRef<BaseTextInputRef | null>(null);
+    const isRightAligned = textAlign === 'right';
+
+    const {isEditing, setLocalValue, startEditing, save, cancelEditing} = useInlineEditState(canEdit, value, onSave, isEqual);
+
+    const focusOnMount = (ref: BaseTextInputRef | null) => {
+        inputRef.current = ref;
+        ref?.focus();
+    };
+
+    const handleEscape = () => {
+        cancelEditing();
+        inputRef.current?.blur();
+    };
+
+    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, handleEscape, {captureOnInputs: true, isActive: isEditing});
+
+    return (
+        <EditableCell
+            canEdit={canEdit}
+            isEditing={isEditing}
+            onStartEditing={startEditing}
+            editIconPosition={isRightAligned ? 'left' : 'right'}
+            editContent={
+                <NumberWithSymbolForm
+                    ref={focusOnMount}
+                    value={value}
+                    decimals={decimals}
+                    currency={currency}
+                    symbol={getLocalizedCurrencySymbol(preferredLocale, currency) ?? ''}
+                    symbolPosition={CONST.TEXT_INPUT_SYMBOL_POSITION.PREFIX}
+                    isSymbolPressable={false}
+                    allowNegativeInput={allowNegativeInput}
+                    disableKeyboard={false}
+                    shouldShowBigNumberPad={false}
+                    shouldWrapInputInContainer={false}
+                    shouldApplyPaddingToContainer={false}
+                    shouldRefocusOnScrollViewClick
+                    hideFocusedState
+                    onInputChange={setLocalValue}
+                    onBlur={save}
+                    onSubmitEditing={save}
+                    accessibilityLabel={accessibilityLabel}
+                    style={[styles.lh16, styles.optionDisplayName, styles.pr0, isRightAligned && styles.textAlignRight]}
+                    containerStyle={[styles.editableCellInputStyle]}
+                    touchableInputWrapperStyle={styles.editableCellInputStyle}
+                    scrollViewStyle={[styles.flexRow, styles.alignItemsCenter, isRightAligned && styles.justifyContentEnd]}
+                    symbolTextStyle={styles.editableCellSymbolStyle}
+                />
+            }
+        >
+            <TextWithTooltip
+                shouldShowTooltip
+                numberOfLines={1}
+                text={displayText}
+                style={[styles.lh16, styles.optionDisplayName, styles.pre, styles.flexShrink1, isRightAligned && styles.textAlignRight]}
+            />
+        </EditableCell>
+    );
+}
+
+export default InlineNumberEditCell;
diff --git a/src/components/EditableCell/InlineTextEditCell.tsx b/src/components/EditableCell/InlineTextEditCell.tsx
new file mode 100644
index 000000000000..83a16dc5c69e
--- /dev/null
+++ b/src/components/EditableCell/InlineTextEditCell.tsx
@@ -0,0 +1,100 @@
+import TextInput from '@components/TextInput';
+import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
+import TextWithTooltip from '@components/TextWithTooltip';
+
+import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import StringUtils from '@libs/StringUtils';
+
+import CONST from '@src/CONST';
+
+import type {StyleProp, TextStyle} from 'react-native';
+
+import React, {useRef} from 'react';
+
+import type {EditableProps} from './types';
+
+import EditableCell from './EditableCell';
+import useInlineEditState from './useInlineEditState';
+
+type InlineTextEditCellProps = {
+    /** Current value shown in display mode and used as the initial edit buffer */
+    value: string;
+
+    accessibilityLabel: string;
+
+    /** Style applied to the display text and to the TextInput while editing, so font size and color stay in sync */
+    displayTextStyle?: StyleProp<TextStyle>;
+
+    /**
+     * Normalizes the value before saving and for change detection.
+     * Defaults to sanitizeName so a pasted non-breaking space is treated as unchanged when the action would no-op.
+     */
+    sanitize?: (value: string) => string;
+} & EditableProps<string>;
+
+/**
+ * Generic inline text editing cell for tables. Composes EditableCell with an inline TextInput
+ * and the shared inline edit state. Domain tables supply the value, a canEdit flag, and an onSave
+ * handler that performs the actual persistence.
+ *
+ * Invalid values are handled by onSave, which no-ops on rejection. The cell then reverts to the
+ * original value. On narrow layouts EditableCell renders the display text only, so tables keep
+ * their existing tap-to-navigate behavior there.
+ */
+function InlineTextEditCell({value, accessibilityLabel, displayTextStyle, canEdit, onSave, sanitize = StringUtils.sanitizeName}: InlineTextEditCellProps) {
+    const styles = useThemeStyles();
+    const inputRef = useRef<BaseTextInputRef | null>(null);
+
+    const {isEditing, localValue, setLocalValue, startEditing, save, cancelEditing} = useInlineEditState(
+        canEdit,
+        value,
+        onSave ? (newValue) => onSave(sanitize(newValue)) : undefined,
+        (newValue, originalValue) => sanitize(newValue) === sanitize(originalValue),
+    );
+
+    const handleChangeText = (text: string) => setLocalValue(StringUtils.lineBreaksToSpaces(text));
+
+    const handleEscape = () => {
+        cancelEditing();
+        inputRef.current?.blur();
+    };
+
+    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, handleEscape, {captureOnInputs: true, isActive: isEditing});
+
+    return (
+        <EditableCell
+            canEdit={canEdit}
+            isEditing={isEditing}
+            onStartEditing={startEditing}
+            editContent={
+                <TextInput
+                    ref={inputRef}
+                    accessibilityLabel={accessibilityLabel}
+                    value={localValue}
+                    onChangeText={handleChangeText}
+                    onBlur={save}
+                    onSubmitEditing={save}
+                    autoFocus
+                    submitBehavior="blurAndSubmit"
+                    // Match the display cell's type.
+                    inputStyle={displayTextStyle}
+                    textInputContainerStyles={styles.editableCellInputStyle}
+                    touchableInputWrapperStyle={styles.editableCellInputStyle}
+                    hideFocusedState
+                    shouldApplyPaddingToContainer={false}
+                />
+            }
+        >
+            <TextWithTooltip
+                shouldShowTooltip
+                text={localValue}
+                numberOfLines={1}
+                style={displayTextStyle}
+            />
+        </EditableCell>
+    );
+}
+
+export default InlineTextEditCell;
diff --git a/src/components/TransactionItemRow/EditableCell/index.ts b/src/components/EditableCell/index.ts
similarity index 72%
rename from src/components/TransactionItemRow/EditableCell/index.ts
rename to src/components/EditableCell/index.ts
index 97412b9e7e7a..979840643a2c 100644
--- a/src/components/TransactionItemRow/EditableCell/index.ts
+++ b/src/components/EditableCell/index.ts
@@ -1,4 +1,6 @@
 export {default as EditableCell} from './EditableCell';
+export {default as InlineNumberEditCell} from './InlineNumberEditCell';
+export {default as InlineTextEditCell} from './InlineTextEditCell';
 export {default as EditingCellProvider} from './EditingCellContext';
 export {useEditingCellState} from './EditingCellContext';
 export {default as useInlineEditState} from './useInlineEditState';
diff --git a/src/components/TransactionItemRow/EditableCell/types.ts b/src/components/EditableCell/types.ts
similarity index 100%
rename from src/components/TransactionItemRow/EditableCell/types.ts
rename to src/components/EditableCell/types.ts
diff --git a/src/components/TransactionItemRow/EditableCell/useInlineEditState.ts b/src/components/EditableCell/useInlineEditState.ts
similarity index 100%
rename from src/components/TransactionItemRow/EditableCell/useInlineEditState.ts
rename to src/components/EditableCell/useInlineEditState.ts
diff --git a/src/components/TransactionItemRow/EditableCell/usePopoverEditState.ts b/src/components/EditableCell/usePopoverEditState.ts
similarity index 100%
rename from src/components/TransactionItemRow/EditableCell/usePopoverEditState.ts
rename to src/components/EditableCell/usePopoverEditState.ts
diff --git a/src/components/ErrorBoundary/logError.ts b/src/components/ErrorBoundary/logError.ts
index 4e9074761f0b..6e1da7795ff6 100644
--- a/src/components/ErrorBoundary/logError.ts
+++ b/src/components/ErrorBoundary/logError.ts
@@ -1,13 +1,27 @@
 import Log from '@libs/Log';
 
+import CONST from '@src/CONST';
+
 import * as Sentry from '@sentry/react-native';
 
 import type {LogError} from './types';
 
 const logError: LogError = (errorMessage, error, errorInfo) => {
     Log.alert(`${errorMessage} - ${error.message}`, {errorInfo}, false);
+    if (error.message === CONST.ERROR.UPDATE_REQUIRED) {
+        return;
+    }
+
     Sentry.addBreadcrumb({message: `errorInfo: ${errorInfo}`});
-    Sentry.captureException(error, {extra: {errorInfo}});
+    // The root boundary replaces the app with a blocking fallback, so catching the error does not mean the app recovered.
+    Sentry.captureException(error, {
+        mechanism: {type: 'generic', handled: false},
+        captureContext: {
+            level: 'fatal',
+            extra: {errorInfo},
+            tags: {[CONST.TELEMETRY.TAGS.APP_BLOCKING]: 'true'},
+        },
+    });
 };
 
 export default logError;
diff --git a/src/components/ExceededCommentLength.tsx b/src/components/ExceededCommentLength.tsx
index 368cc6c992b5..598b34ecb493 100644
--- a/src/components/ExceededCommentLength.tsx
+++ b/src/components/ExceededCommentLength.tsx
@@ -1,4 +1,5 @@
 import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import CONST from '@src/CONST';
@@ -14,13 +15,14 @@ type ExceededCommentLengthProps = {
 
 function ExceededCommentLength({maxCommentLength = CONST.MAX_COMMENT_LENGTH, isTaskTitle = false}: ExceededCommentLengthProps) {
     const styles = useThemeStyles();
+    const theme = useTheme();
     const {numberFormat, translate} = useLocalize();
 
     const translationKey = isTaskTitle ? 'composer.taskTitleExceededMaxLength' : 'composer.commentExceededMaxLength';
 
     return (
         <Text
-            style={[styles.textMicro, styles.textDanger, styles.chatItemComposeSecondaryRow, styles.mlAuto, styles.pl2]}
+            style={[styles.textMicro, {color: theme.textError}, styles.chatItemComposeSecondaryRow, styles.mlAuto, styles.pl2]}
             numberOfLines={1}
         >
             {translate(translationKey, numberFormat(maxCommentLength))}
diff --git a/src/components/ExpenseAddedGrowl.tsx b/src/components/ExpenseAddedGrowl.tsx
new file mode 100644
index 000000000000..555aa6c9f50e
--- /dev/null
+++ b/src/components/ExpenseAddedGrowl.tsx
@@ -0,0 +1,175 @@
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
+import useReportTransactions from '@hooks/useReportTransactions';
+
+import {close} from '@libs/actions/Modal';
+import {createTransactionThreadReport, setOptimisticTransactionThread} from '@libs/actions/Report';
+import {mergeExpenseAddedGrowlTransactionIDs} from '@libs/actions/Transaction';
+import Log from '@libs/Log';
+import navigateToCreatedExpense from '@libs/Navigation/helpers/navigateToCreatedExpense';
+import Navigation from '@libs/Navigation/Navigation';
+import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
+import {findSelfDMReportID, isInvoiceReport, isMoneyRequestReport} from '@libs/ReportUtils';
+import {isTransactionPendingDelete} from '@libs/TransactionUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+
+import type {Dispatch, SetStateAction} from 'react';
+
+import {useEffect, useRef, useState} from 'react';
+
+import GrowlNotificationContent from './GrowlNotification/GrowlNotificationContent';
+
+type ActiveGrowl = {
+    /** ID of the transaction the growl was raised for */
+    transactionID: string;
+
+    /** Search data type the growl belongs to (expense, invoice, etc.) */
+    dataType: SearchDataTypes;
+
+    /** Identifies each growl instance so a stale slide-out dismissal can't clear a newer growl */
+    nonce: number;
+};
+
+type ExpenseAddedGrowlContentProps = {
+    /** Transaction to read for the growl: the active growl's transaction, or the latest pending signal ID */
+    transactionID: string;
+
+    /** Pending expense-added notifications, keyed by transaction ID with its search data type as the value */
+    signal: Record<string, SearchDataTypes> | undefined;
+
+    /** Currently displayed growl */
+    active: ActiveGrowl | null;
+
+    /** Setter for the active growl */
+    setActive: Dispatch<SetStateAction<ActiveGrowl | null>>;
+};
+
+/** Watches the "an expense was just added" Onyx signal and shows an "Expense added" growl with a "View" action. */
+function ExpenseAddedGrowl() {
+    const [active, setActive] = useState<ActiveGrowl | null>(null);
+    const [signal] = useOnyx(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS);
+    const transactionID = active?.transactionID ?? Object.keys(signal ?? {}).at(-1);
+
+    if (!transactionID) {
+        return null;
+    }
+
+    return (
+        <ExpenseAddedGrowlContent
+            transactionID={transactionID}
+            signal={signal}
+            active={active}
+            setActive={setActive}
+        />
+    );
+}
+
+function ExpenseAddedGrowlContent({transactionID, signal, active, setActive}: ExpenseAddedGrowlContentProps) {
+    const nonceRef = useRef(0);
+
+    const {translate} = useLocalize();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
+    const reportID = transaction?.reportID;
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+
+    // A tracked expense's IOU action lives on the self-DM report, not on transaction.reportID, so read actions
+    // from the report that actually hosts it so "View" can resolve the real transaction thread.
+    const isUnreportedExpense = !reportID || reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+    const selfDMReportID = isUnreportedExpense ? findSelfDMReportID() : undefined;
+    const hostReportID = isUnreportedExpense ? selfDMReportID : reportID;
+    const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${hostReportID}`);
+    const iouAction = getIOUActionForTransactionID(Object.values(reportActions ?? {}), transactionID);
+    const [personalDetails] = usePersonalDetailsByIDs([currentUserPersonalDetails?.accountID, iouAction?.actorAccountID]);
+
+    // A tracked expense lives in a chat, not an expense report. Leaving iouReportID undefined tells
+    // navigateToCreatedExpense to open the transaction thread directly instead of an expense report RHP.
+    const iouReport = isMoneyRequestReport(report) || isInvoiceReport(report) ? report : undefined;
+    const iouReportID = iouReport?.reportID;
+    const reportTransactions = useReportTransactions(iouReportID);
+
+    useEffect(() => {
+        if (active) {
+            return;
+        }
+        const pendingTransactionIDs = Object.keys(signal ?? {});
+
+        // The last key is the last-created transaction: IDs are large (rand64), so they exceed the array-index
+        // range and JS preserves insertion order rather than sorting them numerically ascending.
+        const latestTransactionID = pendingTransactionIDs.at(-1);
+        const dataType = latestTransactionID ? signal?.[latestTransactionID] : undefined;
+        if (!latestTransactionID || !dataType || !transaction) {
+            return;
+        }
+
+        // Clear every pending ID but surface only the latest: rapid creations that pile up before this runs
+        // collapse into a single growl for the newest expense.
+        mergeExpenseAddedGrowlTransactionIDs(Object.fromEntries(pendingTransactionIDs.map((id) => [id, null])));
+
+        // Suppress the growl when the user is already viewing the expense's money-request report
+        if (Navigation.getFocusedReportId() === transaction.reportID) {
+            return;
+        }
+        nonceRef.current += 1;
+        setActive({transactionID: latestTransactionID, dataType, nonce: nonceRef.current});
+    }, [signal, active, transaction, setActive]);
+
+    if (!active) {
+        return null;
+    }
+
+    const isInvoice = active.dataType === CONST.SEARCH.DATA_TYPES.INVOICE;
+
+    // Build the thread on press rather than when the growl shows, so it is only created if the user taps
+    // "View" and is built against the freshest Onyx data.
+    const navigateToExpense = () => {
+        // The expense was deleted while the growl was up, so there is nothing left to open.
+        if (!transaction || isTransactionPendingDelete(transaction)) {
+            return;
+        }
+        let threadReportID = transaction?.transactionThreadReportID ?? iouAction?.childReportID;
+        if (threadReportID) {
+            setOptimisticTransactionThread(threadReportID, iouReport?.reportID, iouAction?.reportActionID, iouReport?.policyID);
+        } else {
+            const optimisticThread = createTransactionThreadReport({
+                introSelected,
+                conciergeChat,
+                currentUserLogin: currentUserPersonalDetails?.login ?? '',
+                currentUserAccountID: currentUserPersonalDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID,
+                iouReport,
+                iouReportAction: iouAction,
+                transaction,
+                personalDetails,
+            });
+            threadReportID = optimisticThread?.reportID;
+        }
+        if (!threadReportID) {
+            Log.warn('[ExpenseAddedGrowl] Unable to resolve transaction thread reportID on View press.');
+            return;
+        }
+        // The growl sits above popovers, so close any open one first, the same as tapping a notification.
+        close(() => navigateToCreatedExpense({threadReportID, transactionID: active.transactionID, iouReportID, reportTransactions}));
+    };
+
+    return (
+        <GrowlNotificationContent
+            key={active.nonce}
+            nonce={active.nonce}
+            type={CONST.GROWL.SUCCESS}
+            duration={CONST.GROWL.DURATION_WITH_ACTION}
+            bodyText={translate(isInvoice ? 'iou.invoiceSent' : 'iou.expenseAdded')}
+            action={{label: translate('common.view'), onPress: navigateToExpense}}
+            onDismissed={(dismissedNonce) => setActive((prev) => (prev?.nonce === dismissedNonce ? null : prev))}
+        />
+    );
+}
+
+export default ExpenseAddedGrowl;
diff --git a/src/components/FlatList/FlatList/index.tsx b/src/components/FlatList/FlatList/index.tsx
index fb977c60a232..fc35d965553e 100644
--- a/src/components/FlatList/FlatList/index.tsx
+++ b/src/components/FlatList/FlatList/index.tsx
@@ -5,11 +5,11 @@ import useEmitComposerScrollEvents from '@hooks/useEmitComposerScrollEvents';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {isMobileSafari} from '@libs/Browser';
+import mergeRefs from '@libs/mergeRefs';
 
-import type {ForwardedRef, RefObject} from 'react';
 import type {NativeScrollEvent, NativeSyntheticEvent} from 'react-native';
 
-import React, {useCallback, useEffect, useMemo, useRef} from 'react';
+import React, {useCallback, useEffect, useLayoutEffect, useRef} from 'react';
 import {FlatList} from 'react-native';
 
 import type {CustomFlatListProps} from './types';
@@ -18,35 +18,9 @@ import type {CustomFlatListProps} from './types';
 // We do a best effort to avoid content jumping by using some hacks on mobile Safari only.
 const IS_MOBILE_SAFARI = isMobileSafari();
 
-function mergeRefs(...args: Array<RefObject<FlatList> | ForwardedRef<FlatList> | null>) {
-    return function (node: FlatList) {
-        for (const ref of args) {
-            if (ref == null) {
-                continue;
-            }
-            if (typeof ref === 'function') {
-                ref(node);
-                continue;
-            }
-            if (typeof ref === 'object') {
-                ref.current = node;
-                continue;
-            }
-            console.error(`mergeRefs cannot handle Refs of type boolean, number or string, received ref ${String(ref)}`);
-        }
-    };
-}
-
-function useMergeRefs(...args: Array<RefObject<FlatList> | ForwardedRef<FlatList> | null>) {
-    return useMemo(
-        () => mergeRefs(...args),
-        // eslint-disable-next-line
-        [...args],
-    );
-}
-
 function getScrollableNode(flatList: FlatList | null): HTMLElement | undefined {
-    return flatList?.getScrollableNode() as HTMLElement | undefined;
+    const scrollableNode: unknown = flatList?.getScrollableNode();
+    return scrollableNode instanceof HTMLElement ? scrollableNode : undefined;
 }
 
 function MVCPFlatList<T>({
@@ -67,7 +41,10 @@ function MVCPFlatList<T>({
     const lastScrollOffsetRef = useRef(0);
     const isListRenderedRef = useRef(false);
     const mvcpAutoscrollToTopThresholdRef = useRef(mvcpAutoscrollToTopThreshold);
-    mvcpAutoscrollToTopThresholdRef.current = mvcpAutoscrollToTopThreshold;
+
+    useLayoutEffect(() => {
+        mvcpAutoscrollToTopThresholdRef.current = mvcpAutoscrollToTopThreshold;
+    }, [mvcpAutoscrollToTopThreshold]);
 
     const getScrollOffset = useCallback((): number => {
         if (!listRef.current) {
@@ -115,7 +92,10 @@ function MVCPFlatList<T>({
 
         const contentViewLength = contentView.childNodes.length;
         for (let i = mvcpMinIndexForVisible; i < contentViewLength; i++) {
-            const subview = contentView.childNodes[i] as HTMLElement;
+            const subview = contentView.childNodes[i];
+            if (!(subview instanceof HTMLElement)) {
+                continue;
+            }
             const subviewOffset = horizontal ? subview.offsetLeft : subview.offsetTop;
             if (subviewOffset > scrollOffset) {
                 prevFirstVisibleOffsetRef.current = subviewOffset;
@@ -171,7 +151,7 @@ function MVCPFlatList<T>({
                     firstVisibleViewRef.current = null;
                 }
                 for (const node of mutation.addedNodes) {
-                    if (node.nodeType !== Node.ELEMENT_NODE || !(node as HTMLElement).querySelector('#composer')) {
+                    if (!(node instanceof Element) || !node.querySelector('#composer')) {
                         continue;
                     }
                     isEditComposerAdded = true;
@@ -213,8 +193,6 @@ function MVCPFlatList<T>({
         };
     }, [prepareForMaintainVisibleContentPosition, setupMutationObserver]);
 
-    const setMergedRef = useMergeRefs(listRef, ref as ForwardedRef<FlatList>);
-
     const onRef = useCallback(
         (newRef: FlatList) => {
             // Make sure to only call refs and re-attach listeners if the node changed.
@@ -222,11 +200,11 @@ function MVCPFlatList<T>({
                 return;
             }
 
-            setMergedRef(newRef);
+            mergeRefs<FlatList>(listRef, ref)(newRef);
             prepareForMaintainVisibleContentPosition();
             setupMutationObserver();
         },
-        [prepareForMaintainVisibleContentPosition, setMergedRef, setupMutationObserver],
+        [prepareForMaintainVisibleContentPosition, ref, setupMutationObserver],
     );
 
     useFlatListHandle<T>({
diff --git a/src/components/Form/types.ts b/src/components/Form/types.ts
index 2a5df318e2f6..853d78f54398 100644
--- a/src/components/Form/types.ts
+++ b/src/components/Form/types.ts
@@ -23,6 +23,7 @@ import type TimeModalPicker from '@components/TimeModalPicker';
 import type UploadFile from '@components/UploadFile';
 import type ValuePicker from '@components/ValuePicker';
 
+import type {AccessibilityFocusTarget} from '@libs/Accessibility/moveAccessibilityFocus/types';
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 
 import type ConstantSelector from '@pages/Debug/ConstantSelector';
@@ -44,8 +45,8 @@ import type {BaseForm} from '@src/types/form/Form';
 import type {FileObject} from '@src/types/utils/Attachment';
 import type WithSentryLabel from '@src/types/utils/SentryLabel';
 
-import type {ComponentRef, ComponentType, FocusEvent, Key, ReactNode, Ref, RefObject} from 'react';
-import type {GestureResponderEvent, HostComponent, InputModeOptions, KeyboardTypeOptions, StyleProp, SubmitBehavior, TextInputSubmitEditingEvent, ViewStyle} from 'react-native';
+import type {ComponentType, FocusEvent, Key, ReactNode, Ref, RefObject} from 'react';
+import type {GestureResponderEvent, InputModeOptions, KeyboardTypeOptions, StyleProp, SubmitBehavior, TextInputSubmitEditingEvent, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 /**
@@ -136,7 +137,7 @@ type InputComponentBaseProps<TValue extends ValueTypeKey = ValueTypeKey> = Input
     uncontrolled?: boolean;
     inputMode?: InputModeOptions;
     keyboardType?: KeyboardTypeOptions;
-    getNativeRef?: () => ComponentRef<HostComponent<unknown>> & RefObject<HTMLOrSVGElement>;
+    getNativeRef?: () => AccessibilityFocusTarget;
 };
 
 type FormOnyxValues<TFormID extends OnyxFormKey = OnyxFormKey> = Omit<OnyxValues[TFormID], keyof BaseForm>;
diff --git a/src/components/GPSInProgressModal/index.native.tsx b/src/components/GPSInProgressModal/index.native.tsx
deleted file mode 100644
index 7df4b41635c0..000000000000
--- a/src/components/GPSInProgressModal/index.native.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import ConfirmModal from '@components/ConfirmModal';
-
-import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
-import useOnyx from '@hooks/useOnyx';
-
-import {closeReactNativeApp} from '@libs/actions/HybridApp';
-import {setIsGPSInProgressModalOpen} from '@libs/actions/isGPSInProgressModalOpen';
-import {getGpsPoints, stopGpsTrip} from '@libs/GPSDraftDetailsUtils';
-
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-
-function GPSInProgressModal() {
-    const [isGPSInProgressModalOpen] = useOnyx(ONYXKEYS.IS_GPS_IN_PROGRESS_MODAL_OPEN);
-    const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
-    const {translate} = useLocalize();
-    const {isOffline} = useNetwork();
-
-    const stopGpsAndSwitchToOD = async () => {
-        setIsGPSInProgressModalOpen(false);
-        await stopGpsTrip(isOffline, getGpsPoints(gpsDraftDetails));
-        closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false, shouldIgnoreTryNewDotLoading: true});
-    };
-
-    return (
-        <ConfirmModal
-            title={translate('gps.switchToODWarningTripInProgress.title')}
-            isVisible={!!isGPSInProgressModalOpen}
-            onCancel={() => setIsGPSInProgressModalOpen(false)}
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
-            onConfirm={stopGpsAndSwitchToOD}
-            confirmText={translate('gps.switchToODWarningTripInProgress.confirm')}
-            cancelText={translate('common.cancel')}
-            prompt={translate('gps.switchToODWarningTripInProgress.prompt')}
-            buttonVariant={CONST.BUTTON_VARIANT.DANGER}
-        />
-    );
-}
-
-GPSInProgressModal.displayName = 'GPSInProgressModal';
-
-export default GPSInProgressModal;
diff --git a/src/components/GPSInProgressModal/index.tsx b/src/components/GPSInProgressModal/index.tsx
deleted file mode 100644
index 5975cb3aea35..000000000000
--- a/src/components/GPSInProgressModal/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// GPS is not available on web
-function GPSInProgressModal() {
-    return null;
-}
-
-GPSInProgressModal.displayName = 'GPSInProgressModal';
-
-export default GPSInProgressModal;
diff --git a/src/components/GPSTripStateChecker/index.tsx b/src/components/GPSTripStateChecker/index.tsx
deleted file mode 100644
index ecf6bf5420ad..000000000000
--- a/src/components/GPSTripStateChecker/index.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-function GPSTripStateChecker() {
-    return null;
-}
-
-GPSTripStateChecker.displayName = 'GPSTripStateChecker';
-
-export default GPSTripStateChecker;
diff --git a/src/components/GpsDraftDetailsRefSync.tsx b/src/components/GpsDraftDetailsRefSync.tsx
new file mode 100644
index 000000000000..f24d1c68cfd8
--- /dev/null
+++ b/src/components/GpsDraftDetailsRefSync.tsx
@@ -0,0 +1,29 @@
+import useOnyx from '@hooks/useOnyx';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type GpsDraftDetails from '@src/types/onyx/GpsDraftDetails';
+
+import type {RefObject} from 'react';
+
+import {useEffect} from 'react';
+
+type GpsDraftDetailsRefSyncProps = {
+    gpsDraftDetailsRef: RefObject<GpsDraftDetails | undefined>;
+};
+
+/**
+ * Keeps the latest GPS draft details in a ref without re-rendering the parent.
+ * Mount only while copilot leave + active GPS trip (e.g. require-2FA overlay).
+ */
+function GpsDraftDetailsRefSync({gpsDraftDetailsRef}: GpsDraftDetailsRefSyncProps) {
+    const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
+
+    useEffect(() => {
+        // eslint-disable-next-line no-param-reassign -- ref sync intentionally mutates .current for the parent overlay
+        gpsDraftDetailsRef.current = gpsDraftDetails;
+    }, [gpsDraftDetails, gpsDraftDetailsRef]);
+
+    return null;
+}
+
+export default GpsDraftDetailsRefSync;
diff --git a/src/components/GrowlNotification/GrowlNotificationContent.tsx b/src/components/GrowlNotification/GrowlNotificationContent.tsx
index 89951c9af8bb..bbc7ab9907c6 100644
--- a/src/components/GrowlNotification/GrowlNotificationContent.tsx
+++ b/src/components/GrowlNotification/GrowlNotificationContent.tsx
@@ -22,6 +22,7 @@ import {useSharedValue, withSpring} from 'react-native-reanimated';
 import {scheduleOnRN} from 'react-native-worklets';
 
 import GrowlNotificationContainer from './GrowlNotificationContainer';
+import GrowlNotificationPortal from './GrowlNotificationPortal';
 
 const INACTIVE_OFFSET = CONST.GROWL.OFFSCREEN_OFFSET;
 const INACTIVE_POSITION_Y = -INACTIVE_OFFSET;
@@ -130,51 +131,53 @@ function GrowlNotificationContent({bodyText, type, duration, action, nonce, onDi
         .onStart(triggerDismiss);
 
     return (
-        <View style={styles.growlNotificationWrapper}>
-            <GrowlNotificationContainer
-                progress={progress}
-                inactiveY={inactiveY}
-                useBottomPosition={useBottomPosition}
-            >
-                <GestureDetector gesture={flingGesture}>
-                    <View style={[styles.growlNotificationBox, action ? styles.growlNotificationBoxWithAction : styles.growlNotificationBoxWithoutAction]}>
-                        {/* The dismiss target covers only the icon + text; the action Button is a sibling
-                            (not nested inside a pressable) so it stays independently focusable for screen
-                            readers and its press can't bubble into a dismiss. */}
-                        <PressableWithoutFeedback
-                            accessibilityLabel={bodyText}
-                            sentryLabel="GrowlNotification-Dismiss"
-                            onPress={triggerDismiss}
-                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap3]}
-                        >
-                            <Icon
-                                src={types[type].icon}
-                                fill={types[type].iconColor}
-                            />
-                            <Text style={styles.growlNotificationText}>{bodyText}</Text>
-                        </PressableWithoutFeedback>
-                        {!!action && (
-                            <Button
-                                accessibilityLabel={action.label}
-                                sentryLabel="GrowlNotification-Action"
-                                onPress={() => {
-                                    if (isActionPressedRef.current) {
-                                        return;
-                                    }
-                                    isActionPressedRef.current = true;
-                                    triggerDismiss();
-                                    action.onPress();
-                                }}
-                                innerStyles={styles.bgTransparent}
-                                hoverStyles={styles.growlNotificationActionHovered}
+        <GrowlNotificationPortal>
+            <View style={styles.growlNotificationWrapper}>
+                <GrowlNotificationContainer
+                    progress={progress}
+                    inactiveY={inactiveY}
+                    useBottomPosition={useBottomPosition}
+                >
+                    <GestureDetector gesture={flingGesture}>
+                        <View style={[styles.growlNotificationBox, action ? styles.growlNotificationBoxWithAction : styles.growlNotificationBoxWithoutAction]}>
+                            {/* The dismiss target covers only the icon + text; the action Button is a sibling
+                                (not nested inside a pressable) so it stays independently focusable for screen
+                                readers and its press can't bubble into a dismiss. */}
+                            <PressableWithoutFeedback
+                                accessibilityLabel={bodyText}
+                                sentryLabel="GrowlNotification-Dismiss"
+                                onPress={triggerDismiss}
+                                style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap3]}
                             >
-                                <Button.Text style={styles.growlNotificationActionText}>{action.label}</Button.Text>
-                            </Button>
-                        )}
-                    </View>
-                </GestureDetector>
-            </GrowlNotificationContainer>
-        </View>
+                                <Icon
+                                    src={types[type].icon}
+                                    fill={types[type].iconColor}
+                                />
+                                <Text style={styles.growlNotificationText}>{bodyText}</Text>
+                            </PressableWithoutFeedback>
+                            {!!action && (
+                                <Button
+                                    accessibilityLabel={action.label}
+                                    sentryLabel="GrowlNotification-Action"
+                                    onPress={() => {
+                                        if (isActionPressedRef.current) {
+                                            return;
+                                        }
+                                        isActionPressedRef.current = true;
+                                        triggerDismiss();
+                                        action.onPress();
+                                    }}
+                                    innerStyles={styles.bgTransparent}
+                                    hoverStyles={styles.growlNotificationActionHovered}
+                                >
+                                    <Button.Text style={styles.growlNotificationActionText}>{action.label}</Button.Text>
+                                </Button>
+                            )}
+                        </View>
+                    </GestureDetector>
+                </GrowlNotificationContainer>
+            </View>
+        </GrowlNotificationPortal>
     );
 }
 
diff --git a/src/components/GrowlNotification/GrowlNotificationPortal/index.native.tsx b/src/components/GrowlNotification/GrowlNotificationPortal/index.native.tsx
new file mode 100644
index 000000000000..1878c9c379c1
--- /dev/null
+++ b/src/components/GrowlNotification/GrowlNotificationPortal/index.native.tsx
@@ -0,0 +1,8 @@
+import type React from 'react';
+
+/** Native has no shared DOM stacking context to escape, so growls render where they are mounted. */
+function GrowlNotificationPortal({children}: React.PropsWithChildren) {
+    return children;
+}
+
+export default GrowlNotificationPortal;
diff --git a/src/components/GrowlNotification/GrowlNotificationPortal/index.tsx b/src/components/GrowlNotification/GrowlNotificationPortal/index.tsx
new file mode 100644
index 000000000000..535fb208d6d4
--- /dev/null
+++ b/src/components/GrowlNotification/GrowlNotificationPortal/index.tsx
@@ -0,0 +1,13 @@
+import type React from 'react';
+
+import {createPortal} from 'react-dom';
+
+/**
+ * Renders growls at the document root. Inside the app's own stacking context they are covered by overlays that
+ * portal to the body themselves, such as the Side Panel, no matter how high their z-index is.
+ */
+function GrowlNotificationPortal({children}: React.PropsWithChildren) {
+    return createPortal(children, document.body);
+}
+
+export default GrowlNotificationPortal;
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx
index e10288e35496..c404b6ac6a0c 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ConciergeLinkRenderer.tsx
@@ -4,6 +4,7 @@ import Text from '@components/Text';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useEnterKeyHandler from '@hooks/useEnterKeyHandler';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {navigateToConciergeChat as navigateToConciergeChatAction} from '@userActions/Report';
@@ -35,6 +36,7 @@ function ConciergeLinkRenderer({tnode, style}: ConciergeLinkRendererProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const {onPress: onPressFromProps} = useRendererProps<ConciergeLinkRenderersProps, 'concierge-link'>('concierge-link') ?? {};
 
@@ -43,7 +45,7 @@ function ConciergeLinkRenderer({tnode, style}: ConciergeLinkRendererProps) {
      */
     const navigateToConciergeChat = () => {
         onPressFromProps?.();
-        navigateToConciergeChatAction({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+        navigateToConciergeChatAction({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
     };
 
     // Define link style based on context
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx
index 04dc6f955f11..a104930fc5a0 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VictoryChartRenderer/components/VictoryChartExpandModal.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
 import Modal from '@components/Modal';
 
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
@@ -74,14 +74,11 @@ function VictoryChartExpandModal({isVisible, onClose}: VictoryChartExpandModalPr
             {/* GestureHandlerRootView is required for gestures inside an Android modal (separate native window),
                 and painting appBG here avoids the unpainted modal base flashing through on dark themes */}
             <GestureHandlerRootView style={[styles.flex1, StyleUtils.getBackgroundColorStyle(theme.appBG)]}>
-                <HeaderWithBackButton
-                    title={translate('common.details')}
-                    shouldShowBorderBottom
-                    shouldShowBackButton={shouldUseNarrowLayout}
-                    shouldShowCloseButton={!shouldUseNarrowLayout}
-                    onBackButtonPress={onClose}
-                    onCloseButtonPress={onClose}
-                />
+                <Header style={styles.borderBottom}>
+                    {shouldUseNarrowLayout && <Header.BackButton onPress={onClose} />}
+                    <Header.Title title={translate('common.details')} />
+                    <Header.Right>{!shouldUseNarrowLayout && <Header.CloseButton onPress={onClose} />}</Header.Right>
+                </Header>
                 <View style={[styles.flex1, styles.ph5]}>
                     <View
                         style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter]}
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
new file mode 100644
index 000000000000..0808ffc2134d
--- /dev/null
+++ b/src/components/Header/Header.tsx
@@ -0,0 +1,47 @@
+import useContentHeaderHeight from '@hooks/useContentHeaderHeight';
+import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {ReactNode} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+
+import {Keyboard, View} from 'react-native';
+
+import HeaderContext from './context/HeaderContext';
+
+/** Bar-level configuration for the composed `<Header>` (content lives in the child blocks). */
+type HeaderProps = {
+    /** The composed content of the header: primitive blocks and the `Header.Right` zone. */
+    children: ReactNode;
+
+    shouldSkipFocusAfterTransition?: boolean;
+
+    /** Additional styles to add to the outer header bar. */
+    style?: StyleProp<ViewStyle>;
+};
+
+/** Composed counterpart of `HeaderWithBackButton`. Content is composed from primitive blocks and the `Header.Right` zone (see the barrel for a full example). */
+function Header({children, shouldSkipFocusAfterTransition = false, style}: HeaderProps) {
+    const isInLandscapeMode = useIsInLandscapeMode();
+    const {contentHeaderHeightStyle} = useContentHeaderHeight();
+    const styles = useThemeStyles();
+
+    return (
+        <View
+            style={[styles.headerBar, contentHeaderHeightStyle, style]}
+            onTouchStart={isInLandscapeMode ? () => Keyboard.dismiss() : undefined}
+        >
+            <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.justifyContentBetween, styles.overflowHidden, styles.mr3]}>
+                <HeaderContext
+                    value={{
+                        shouldSkipFocusAfterTransition,
+                    }}
+                >
+                    {children}
+                </HeaderContext>
+            </View>
+        </View>
+    );
+}
+
+export default Header;
diff --git a/src/components/Header/composed/HeaderWithBackButtonAndTitle.tsx b/src/components/Header/composed/HeaderWithBackButtonAndTitle.tsx
new file mode 100644
index 000000000000..fbbe86365962
--- /dev/null
+++ b/src/components/Header/composed/HeaderWithBackButtonAndTitle.tsx
@@ -0,0 +1,36 @@
+/**
+ * Narrow preset over `<Header>` for the common back-button-plus-title case, so call-sites that need
+ * nothing else don't have to compose the primitives by hand.
+ */
+import Header from '@components/Header/Header';
+import HeaderRight from '@components/Header/layout/HeaderRight';
+import HeaderBackButton from '@components/Header/primitives/HeaderBackButton';
+import HeaderTitle from '@components/Header/primitives/HeaderTitle';
+
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+
+import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+
+type HeaderWithBackButtonAndTitleProps = Partial<ChildrenProps> & {
+    title?: string;
+    subtitle?: string;
+    style?: StyleProp<ViewStyle>;
+    titleStyles?: StyleProp<TextStyle>;
+    onBackButtonPress?: () => void;
+};
+
+function HeaderWithBackButtonAndTitle({children, onBackButtonPress, title = '', subtitle = '', titleStyles, style}: HeaderWithBackButtonAndTitleProps) {
+    return (
+        <Header style={style}>
+            <HeaderBackButton onPress={onBackButtonPress} />
+            <HeaderTitle
+                title={title}
+                titleStyles={titleStyles}
+                subtitle={subtitle}
+            />
+            <HeaderRight>{children}</HeaderRight>
+        </Header>
+    );
+}
+
+export default HeaderWithBackButtonAndTitle;
diff --git a/src/components/Header/context/HeaderContext.tsx b/src/components/Header/context/HeaderContext.tsx
new file mode 100644
index 000000000000..be8334ee933a
--- /dev/null
+++ b/src/components/Header/context/HeaderContext.tsx
@@ -0,0 +1,14 @@
+import {createContext, useContext} from 'react';
+
+type HeaderContextValue = {
+    shouldSkipFocusAfterTransition: boolean;
+};
+
+const HeaderContext = createContext<HeaderContextValue>({shouldSkipFocusAfterTransition: false});
+
+function useHeaderContext(): HeaderContextValue {
+    return useContext(HeaderContext);
+}
+
+export default HeaderContext;
+export {useHeaderContext};
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
new file mode 100644
index 000000000000..75db3214df85
--- /dev/null
+++ b/src/components/Header/index.tsx
@@ -0,0 +1,73 @@
+/**
+ * Header – composed counterpart of the legacy `HeaderWithBackButton`.
+ *
+ * Blocks are composed as children, left to right in this order:
+ * - `Header.BackButton` (optional)
+ * - `Header.Icon` (optional) — mutually exclusive with `Header.AvatarWithDisplayName`
+ * - `Header.Title` or `Header.AvatarWithDisplayName` — pick one, not both
+ * - `Header.Right`, wrapping the trailing zone:
+ *   - `Header.Actions` for custom children and/or `Header.DownloadButton`
+ *   - `Header.ThreeDotsMenu` (or a single `Header.IconButton` for a one-off action)
+ *   - `Header.CloseButton`
+ *
+ * @example
+ * ```tsx
+ * import Header from '@components/Header';
+ *
+ * <Header>
+ *   <Header.BackButton onPress={goBack} />
+ *   <Header.Icon src={icon} />
+ *   <Header.Title title={title} />
+ *   <Header.Right>
+ *     <Header.Actions>
+ *       <ResetLink />
+ *       <Header.DownloadButton onPress={onDownload} />
+ *     </Header.Actions>
+ *     <Header.ThreeDotsMenu items={menuItems} />
+ *     <Header.CloseButton onPress={onClose} />
+ *   </Header.Right>
+ * </Header>
+ * ```
+ *
+ * Report-header variant, swapping `Header.Title` for `Header.AvatarWithDisplayName` and
+ * `Header.ThreeDotsMenu` for a single one-off `Header.IconButton`:
+ * ```tsx
+ * <Header>
+ *   <Header.BackButton onPress={goBack} />
+ *   <Header.AvatarWithDisplayName report={report} />
+ *   <Header.Right>
+ *     <Header.IconButton onPress={onPress} iconSrc={icon} tooltipText={text} />
+ *   </Header.Right>
+ * </Header>
+ * ```
+ */
+import HeaderComponent from './Header';
+import HeaderActions from './layout/HeaderActions';
+import HeaderRight from './layout/HeaderRight';
+import HeaderAvatarWithDisplayName from './primitives/HeaderAvatarWithDisplayName';
+import HeaderBackButton from './primitives/HeaderBackButton';
+import HeaderCloseButton from './primitives/HeaderCloseButton';
+import HeaderDownloadButton from './primitives/HeaderDownloadButton';
+import HeaderIcon from './primitives/HeaderIcon';
+import HeaderIconButton from './primitives/HeaderIconButton';
+import HeaderThreeDotsMenu from './primitives/HeaderThreeDotsMenu';
+import HeaderTitle from './primitives/HeaderTitle';
+
+function HeaderBase(props: React.ComponentProps<typeof HeaderComponent>) {
+    return <HeaderComponent {...props} />;
+}
+
+const Header = Object.assign(HeaderBase, {
+    Actions: HeaderActions,
+    Right: HeaderRight,
+    AvatarWithDisplayName: HeaderAvatarWithDisplayName,
+    BackButton: HeaderBackButton,
+    CloseButton: HeaderCloseButton,
+    DownloadButton: HeaderDownloadButton,
+    Icon: HeaderIcon,
+    IconButton: HeaderIconButton,
+    ThreeDotsMenu: HeaderThreeDotsMenu,
+    Title: HeaderTitle,
+});
+
+export default Header;
diff --git a/src/components/HeaderWithBackButtonComposed/layout/HeaderActions.tsx b/src/components/Header/layout/HeaderActions.tsx
similarity index 100%
rename from src/components/HeaderWithBackButtonComposed/layout/HeaderActions.tsx
rename to src/components/Header/layout/HeaderActions.tsx
diff --git a/src/components/HeaderWithBackButtonComposed/layout/HeaderRight.tsx b/src/components/Header/layout/HeaderRight.tsx
similarity index 100%
rename from src/components/HeaderWithBackButtonComposed/layout/HeaderRight.tsx
rename to src/components/Header/layout/HeaderRight.tsx
diff --git a/src/components/Header/primitives/HeaderAvatarWithDisplayName.tsx b/src/components/Header/primitives/HeaderAvatarWithDisplayName.tsx
new file mode 100644
index 000000000000..5220c0b87400
--- /dev/null
+++ b/src/components/Header/primitives/HeaderAvatarWithDisplayName.tsx
@@ -0,0 +1,12 @@
+import type {AvatarWithDisplayNameProps} from '@components/AvatarWithDisplayName';
+import AvatarWithDisplayName from '@components/AvatarWithDisplayName';
+
+import useDialogLabelRegistration from '@hooks/useDialogLabelRegistration';
+
+function HeaderAvatarWithDisplayName(props: AvatarWithDisplayNameProps) {
+    useDialogLabelRegistration(props.report?.reportName ?? '');
+
+    return <AvatarWithDisplayName {...props} />;
+}
+
+export default HeaderAvatarWithDisplayName;
diff --git a/src/components/HeaderWithBackButtonComposed/primitives/HeaderBackButton.tsx b/src/components/Header/primitives/HeaderBackButton.tsx
similarity index 84%
rename from src/components/HeaderWithBackButtonComposed/primitives/HeaderBackButton.tsx
rename to src/components/Header/primitives/HeaderBackButton.tsx
index ea1a722d1c8c..0ebe7b3fc654 100644
--- a/src/components/HeaderWithBackButtonComposed/primitives/HeaderBackButton.tsx
+++ b/src/components/Header/primitives/HeaderBackButton.tsx
@@ -1,3 +1,5 @@
+import {useHeaderContext} from '@components/Header/context/HeaderContext';
+
 import useInitialFocusRef from '@hooks/useInitialFocusRef';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -17,15 +19,13 @@ type HeaderBackButtonProps = {
 
     /** Optional fill color for the icon. */
     iconFill?: string;
-
-    /** Whether to skip focus of the back button after the RHP transition (screen reader). */
-    shouldSkipFocusAfterTransition?: boolean;
 };
 
-function HeaderBackButton({onPress = () => Navigation.goBack(), iconFill, shouldSkipFocusAfterTransition = false}: HeaderBackButtonProps) {
+function HeaderBackButton({onPress = () => Navigation.goBack(), iconFill}: HeaderBackButtonProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['BackArrow']);
+    const {shouldSkipFocusAfterTransition} = useHeaderContext();
     const setBackButtonRef = useInitialFocusRef({shouldSkip: shouldSkipFocusAfterTransition});
 
     return (
@@ -40,7 +40,7 @@ function HeaderBackButton({onPress = () => Navigation.goBack(), iconFill, should
             }}
             iconSrc={icons.BackArrow}
             iconFill={iconFill}
-            // Header makes the space for this button with the padding, so we need to add negative margin to fill the space
+            // Header makes the space for this button with the padding, so we need to add negative margin to fill the space - instead of reducing the padding from pl5 to pl2
             style={styles.mln3}
             id={CONST.BACK_BUTTON_NATIVE_ID}
             sentryLabel={CONST.SENTRY_LABEL.HEADER.BACK_BUTTON}
diff --git a/src/components/HeaderWithBackButtonComposed/primitives/HeaderCloseButton.tsx b/src/components/Header/primitives/HeaderCloseButton.tsx
similarity index 81%
rename from src/components/HeaderWithBackButtonComposed/primitives/HeaderCloseButton.tsx
rename to src/components/Header/primitives/HeaderCloseButton.tsx
index 4c7eeb25b9a1..133abcce2725 100644
--- a/src/components/HeaderWithBackButtonComposed/primitives/HeaderCloseButton.tsx
+++ b/src/components/Header/primitives/HeaderCloseButton.tsx
@@ -1,13 +1,15 @@
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 
+import Navigation from '@libs/Navigation/Navigation';
+
 import CONST from '@src/CONST';
 
 import HeaderIconButton from './HeaderIconButton';
 
 type HeaderCloseButtonProps = {
     /** Method to trigger when pressing the close button of the header. */
-    onPress: () => void;
+    onPress?: () => void;
 
     /** The fill color for the close icon. */
     iconFill?: string;
@@ -16,7 +18,7 @@ type HeaderCloseButtonProps = {
 /**
  * A tooltip-wrapped close icon button.
  */
-function HeaderCloseButton({onPress, iconFill}: HeaderCloseButtonProps) {
+function HeaderCloseButton({onPress = () => Navigation.dismissModal(), iconFill}: HeaderCloseButtonProps) {
     const {translate} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['Close']);
 
diff --git a/src/components/HeaderWithBackButtonComposed/primitives/HeaderDownloadButton.tsx b/src/components/Header/primitives/HeaderDownloadButton.tsx
similarity index 100%
rename from src/components/HeaderWithBackButtonComposed/primitives/HeaderDownloadButton.tsx
rename to src/components/Header/primitives/HeaderDownloadButton.tsx
diff --git a/src/components/HeaderWithBackButtonComposed/primitives/HeaderIcon.tsx b/src/components/Header/primitives/HeaderIcon.tsx
similarity index 100%
rename from src/components/HeaderWithBackButtonComposed/primitives/HeaderIcon.tsx
rename to src/components/Header/primitives/HeaderIcon.tsx
diff --git a/src/components/HeaderWithBackButtonComposed/primitives/HeaderIconButton.tsx b/src/components/Header/primitives/HeaderIconButton.tsx
similarity index 100%
rename from src/components/HeaderWithBackButtonComposed/primitives/HeaderIconButton.tsx
rename to src/components/Header/primitives/HeaderIconButton.tsx
diff --git a/src/components/HeaderWithBackButtonComposed/primitives/HeaderThreeDotsMenu.tsx b/src/components/Header/primitives/HeaderThreeDotsMenu.tsx
similarity index 97%
rename from src/components/HeaderWithBackButtonComposed/primitives/HeaderThreeDotsMenu.tsx
rename to src/components/Header/primitives/HeaderThreeDotsMenu.tsx
index a3d82e53c119..7d8bfdfa5d1c 100644
--- a/src/components/HeaderWithBackButtonComposed/primitives/HeaderThreeDotsMenu.tsx
+++ b/src/components/Header/primitives/HeaderThreeDotsMenu.tsx
@@ -42,4 +42,3 @@ function HeaderThreeDotsMenu({items, onIconPress = () => {}, shouldOverlay = fal
 }
 
 export default HeaderThreeDotsMenu;
-export {DEFAULT_ANCHOR_ALIGNMENT};
diff --git a/src/components/Header/primitives/HeaderTitle.tsx b/src/components/Header/primitives/HeaderTitle.tsx
new file mode 100644
index 000000000000..0a5510d08f2b
--- /dev/null
+++ b/src/components/Header/primitives/HeaderTitle.tsx
@@ -0,0 +1,35 @@
+import {useHeaderContext} from '@components/Header/context/HeaderContext';
+import HeaderTitleComponent from '@components/HeaderTitle';
+
+import type {StyleProp, TextStyle} from 'react-native';
+
+type HeaderTitleProps = {
+    title?: string;
+    subtitle?: string;
+    subtitleLink?: string;
+    titleStyles?: StyleProp<TextStyle>;
+};
+
+function HeaderTitle({title, subtitle, titleStyles, subtitleLink}: HeaderTitleProps) {
+    const {shouldSkipFocusAfterTransition} = useHeaderContext();
+
+    return (
+        <HeaderTitleComponent
+            dialogLabel={title}
+            shouldSkipFocusAfterTransition={shouldSkipFocusAfterTransition}
+        >
+            {!!title && (
+                <HeaderTitleComponent.Text
+                    numberOfLines={1}
+                    style={[titleStyles]}
+                >
+                    {title}
+                </HeaderTitleComponent.Text>
+            )}
+            {!!subtitle && <HeaderTitleComponent.Subtitle>{subtitle}</HeaderTitleComponent.Subtitle>}
+            {!!subtitleLink && <HeaderTitleComponent.SubtitleLink>{subtitleLink}</HeaderTitleComponent.SubtitleLink>}
+        </HeaderTitleComponent>
+    );
+}
+
+export default HeaderTitle;
diff --git a/src/components/HeaderWithBackButtonComposed/HeaderWithBackButton.tsx b/src/components/HeaderWithBackButtonComposed/HeaderWithBackButton.tsx
deleted file mode 100644
index 6f7504e307c6..000000000000
--- a/src/components/HeaderWithBackButtonComposed/HeaderWithBackButton.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-import AvatarFromIcon from '@components/Avatar/AvatarFromIcon';
-import AvatarWithDisplayName from '@components/AvatarWithDisplayName';
-import type HeaderWithBackButtonProps from '@components/HeaderWithBackButton/types';
-import SearchButton from '@components/Search/SearchRouter/SearchButton';
-import SidePanelButton from '@components/SidePanel/SidePanelButton';
-
-import useDialogLabelRegistration from '@hooks/useDialogLabelRegistration';
-import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import Navigation from '@libs/Navigation/Navigation';
-
-import CONST from '@src/CONST';
-
-import type {SvgProps} from 'react-native-svg';
-
-import {Keyboard, View} from 'react-native';
-
-import HeaderActions from './layout/HeaderActions';
-import HeaderRight from './layout/HeaderRight';
-import HeaderBackButton from './primitives/HeaderBackButton';
-import HeaderCloseButton from './primitives/HeaderCloseButton';
-import HeaderDownloadButton from './primitives/HeaderDownloadButton';
-import HeaderIcon from './primitives/HeaderIcon';
-import HeaderIconButton from './primitives/HeaderIconButton';
-import HeaderThreeDotsMenu, {DEFAULT_ANCHOR_ALIGNMENT} from './primitives/HeaderThreeDotsMenu';
-import HeaderTitle from './primitives/HeaderTitle';
-import useHeaderStyles from './styles/useHeaderStyles';
-
-type HeaderProps = Omit<
-    HeaderWithBackButtonProps,
-    | 'shouldDisableThreeDotsButton'
-    | 'threeDotsMenuIcon'
-    | 'threeDotsMenuIconFill'
-    | 'singleExecution'
-    | 'shouldNavigateToTopMostReport'
-    | 'shouldOverlay'
-    | 'numberOfTitleLines'
-    | 'parentReport'
-    | 'shouldShowRotateButton'
-    | 'onRotateButtonPress'
-    | 'isRotating'
-    | 'shouldShowPinButton'
->;
-
-/**
- * Temporary shape wired to the legacy `HeaderWithBackButton` prop API, assembled from the primitives
- * in `./primitives` and `./zones`. Its purpose is to make it visible, block by block, which composed
- * piece replaces which part of the legacy render and to prove each one does so correctly, and in
- * doing so, to pressure-test the primitives' own APIs so they compose with as little wrapper overhead
- * as possible.
- *
- * Not the target shape: the next PR migrates callers away from this prop list to composing `<Header>`
- * directly from `Header.Actions`/`Header.Right` and block children.
- */
-function HeaderWithBackButton({
-    icon,
-    iconFill,
-    iconWidth,
-    iconHeight,
-    iconStyles,
-    onBackButtonPress = () => Navigation.goBack(),
-    onCloseButtonPress = () => Navigation.dismissModal(),
-    onDownloadButtonPress = () => {},
-    onThreeDotsButtonPress = () => {},
-    report,
-    policyAvatar,
-    policyAvatarSize = CONST.AVATAR_SIZE.DEFAULT,
-    shouldShowReportAvatarWithDisplay = false,
-    shouldDisplayStatus,
-    shouldShowBackButton = true,
-    shouldShowBorderBottom = false,
-    shouldShowCloseButton = false,
-    shouldShowDownloadButton = false,
-    isDownloading = false,
-    shouldSetModalVisibility = true,
-    shouldShowThreeDotsButton = false,
-    shouldUseHeadlineHeader = false,
-    stepCounter,
-    subtitle = '',
-    title = '',
-    titleColor,
-    titleStyles,
-    threeDotsAnchorAlignment = DEFAULT_ANCHOR_ALIGNMENT,
-    threeDotsMenuItems = [],
-    shouldEnableDetailPageNavigation = false,
-    children = null,
-    shouldOverlayDots = false,
-    shouldDisplayHelpButton = false,
-    shouldDisplaySearchRouter = false,
-    style,
-    subTitleLink = '',
-    shouldMinimizeMenuButton = false,
-    openParentReportInCurrentTab = false,
-    shouldSkipFocusAfterTransition = false,
-}: HeaderProps) {
-    // Avatar-header routes skip Header, so register the dialog label here.
-    useDialogLabelRegistration(shouldShowReportAvatarWithDisplay ? (report?.reportName ?? '') : '');
-
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const isInLandscapeMode = useIsInLandscapeMode();
-    const {containerStyle, innerRowStyle} = useHeaderStyles({shouldShowBorderBottom, style});
-
-    const threeDotsMenuFirstItem = threeDotsMenuItems.at(0);
-    const threeDotMenuTooltipsSection = (
-        <>
-            {shouldShowThreeDotsButton && threeDotsMenuItems.length === 1 && shouldMinimizeMenuButton && !!threeDotsMenuFirstItem && (
-                <HeaderIconButton
-                    tooltipText={threeDotsMenuFirstItem.text}
-                    onPress={threeDotsMenuFirstItem.onSelected}
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- PopoverMenuItem.icon is typed as a generic component; header menu items always pass an SVG icon component.
-                    iconSrc={threeDotsMenuFirstItem.icon as React.FC<SvgProps>}
-                    sentryLabel={threeDotsMenuFirstItem.sentryLabel}
-                />
-            )}
-            {shouldShowThreeDotsButton && !(threeDotsMenuItems.length === 1 && shouldMinimizeMenuButton) && (
-                <HeaderThreeDotsMenu
-                    items={threeDotsMenuItems}
-                    onIconPress={onThreeDotsButtonPress}
-                    shouldOverlay={shouldOverlayDots}
-                    anchorAlignment={threeDotsAnchorAlignment}
-                    shouldSetModalVisibility={shouldSetModalVisibility}
-                />
-            )}
-            {shouldShowCloseButton && (
-                <HeaderCloseButton
-                    iconFill={iconFill}
-                    onPress={onCloseButtonPress}
-                />
-            )}
-        </>
-    );
-
-    return (
-        <View
-            style={containerStyle}
-            onTouchStart={isInLandscapeMode ? () => Keyboard.dismiss() : undefined}
-        >
-            <View style={innerRowStyle}>
-                {shouldShowBackButton && (
-                    <HeaderBackButton
-                        onPress={onBackButtonPress}
-                        iconFill={iconFill}
-                        shouldSkipFocusAfterTransition={shouldSkipFocusAfterTransition}
-                    />
-                )}
-                {!!icon && (
-                    <HeaderIcon
-                        src={icon}
-                        width={iconWidth}
-                        height={iconHeight}
-                        style={iconStyles}
-                        iconFill={iconFill}
-                    />
-                )}
-                {!!policyAvatar && (
-                    <AvatarFromIcon
-                        icon={policyAvatar}
-                        containerStyles={[StyleUtils.getWidthAndHeightStyle(StyleUtils.getAvatarSize(policyAvatarSize)), styles.mr3]}
-                        size={policyAvatarSize}
-                    />
-                )}
-                {shouldShowReportAvatarWithDisplay ? (
-                    <AvatarWithDisplayName
-                        report={report}
-                        shouldDisplayStatus={shouldDisplayStatus}
-                        shouldEnableDetailPageNavigation={shouldEnableDetailPageNavigation}
-                        openParentReportInCurrentTab={openParentReportInCurrentTab}
-                    />
-                ) : (
-                    <HeaderTitle
-                        title={title}
-                        subtitle={subtitle}
-                        stepCounter={stepCounter}
-                        titleColor={titleColor}
-                        titleStyles={titleStyles}
-                        subTitleLink={subTitleLink}
-                        shouldSkipFocusAfterTransition={shouldSkipFocusAfterTransition}
-                        shouldUseHeadlineHeader={shouldUseHeadlineHeader}
-                    />
-                )}
-                <HeaderRight>
-                    <HeaderActions>
-                        {children}
-                        {shouldShowDownloadButton && (
-                            <HeaderDownloadButton
-                                onPress={onDownloadButtonPress}
-                                isLoading={isDownloading}
-                                iconFill={iconFill}
-                            />
-                        )}
-                    </HeaderActions>
-                    {threeDotMenuTooltipsSection}
-                    {shouldDisplaySearchRouter && <SearchButton />}
-                    {shouldDisplayHelpButton && <SidePanelButton />}
-                </HeaderRight>
-            </View>
-        </View>
-    );
-}
-
-export default HeaderWithBackButton;
diff --git a/src/components/HeaderWithBackButtonComposed/index.tsx b/src/components/HeaderWithBackButtonComposed/index.tsx
deleted file mode 100644
index 1d75016570d1..000000000000
--- a/src/components/HeaderWithBackButtonComposed/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import HeaderWithBackButtonComponent from './HeaderWithBackButton';
-
-function HeaderWithBackButtonBase(props: React.ComponentProps<typeof HeaderWithBackButtonComponent>) {
-    return <HeaderWithBackButtonComponent {...props} />;
-}
-
-const HeaderWithBackButtonComposed = Object.assign(HeaderWithBackButtonBase, {});
-
-export default HeaderWithBackButtonComposed;
diff --git a/src/components/HeaderWithBackButtonComposed/primitives/HeaderTitle.tsx b/src/components/HeaderWithBackButtonComposed/primitives/HeaderTitle.tsx
deleted file mode 100644
index 5d568ade636c..000000000000
--- a/src/components/HeaderWithBackButtonComposed/primitives/HeaderTitle.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import HeaderTitleComponent from '@components/HeaderTitle';
-
-import useLocalize from '@hooks/useLocalize';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import type {StepCounterParams} from '@src/languages/params';
-
-import type {StyleProp, TextStyle} from 'react-native';
-
-type HeaderTitleProps = {
-    /** Title of the header. */
-    title: string;
-
-    /** Subtitle of the header. */
-    subtitle?: string;
-
-    titleColor?: string;
-    titleStyles?: StyleProp<TextStyle>;
-
-    /** Data to display a step counter in the header. When set, it replaces the subtitle. */
-    stepCounter?: StepCounterParams;
-
-    /** The URL link associated with the subtitle, if available. */
-    subTitleLink?: string;
-
-    /** Whether to skip focus of the first interactive element after the RHP transition (screen reader). */
-    shouldSkipFocusAfterTransition?: boolean;
-
-    /** Whether to use the taller headline style bar with the larger title font. */
-    shouldUseHeadlineHeader: boolean;
-};
-
-function HeaderTitle({title, subtitle = '', titleColor, titleStyles, stepCounter, subTitleLink = '', shouldSkipFocusAfterTransition = false, shouldUseHeadlineHeader}: HeaderTitleProps) {
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const {translate} = useLocalize();
-
-    const resolvedSubtitle = stepCounter ? translate('stepCounter', stepCounter.step, stepCounter.total, stepCounter.text) : subtitle;
-
-    return (
-        <HeaderTitleComponent
-            dialogLabel={title}
-            shouldSkipFocusAfterTransition={shouldSkipFocusAfterTransition}
-        >
-            {!!title && (
-                <HeaderTitleComponent.Text
-                    numberOfLines={1}
-                    style={[titleColor ? StyleUtils.getTextColorStyle(titleColor) : {}, shouldUseHeadlineHeader && styles.textHeadlineH2, titleStyles]}
-                >
-                    {title}
-                </HeaderTitleComponent.Text>
-            )}
-            {!!resolvedSubtitle && <HeaderTitleComponent.Subtitle>{resolvedSubtitle}</HeaderTitleComponent.Subtitle>}
-            {!!subTitleLink && <HeaderTitleComponent.SubtitleLink>{subTitleLink}</HeaderTitleComponent.SubtitleLink>}
-        </HeaderTitleComponent>
-    );
-}
-
-export default HeaderTitle;
diff --git a/src/components/HeaderWithBackButtonComposed/styles/useHeaderStyles.ts b/src/components/HeaderWithBackButtonComposed/styles/useHeaderStyles.ts
deleted file mode 100644
index ed3b8cdf4c9a..000000000000
--- a/src/components/HeaderWithBackButtonComposed/styles/useHeaderStyles.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import useContentHeaderHeight from '@hooks/useContentHeaderHeight';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import type {StyleProp, ViewStyle} from 'react-native';
-
-type ContainerStyleParams = {
-    /** Whether we should show a border on the bottom of the bar. */
-    shouldShowBorderBottom?: boolean;
-
-    /** Additional styles to add to the outer bar. */
-    style?: StyleProp<ViewStyle>;
-};
-
-/** Composed styles for the Header bar + zones. */
-function useHeaderStyles({shouldShowBorderBottom = false, style}: ContainerStyleParams = {}) {
-    const styles = useThemeStyles();
-    const {contentHeaderHeightStyle} = useContentHeaderHeight();
-
-    /** Outer header bar. */
-    const containerStyle: StyleProp<ViewStyle> = [styles.headerBar, contentHeaderHeightStyle, shouldShowBorderBottom && styles.borderBottom, style];
-
-    /** Inner flex row that lays out the zones. */
-    const innerRowStyle: StyleProp<ViewStyle> = [styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.justifyContentBetween, styles.overflowHidden, styles.mr3];
-
-    return {containerStyle, innerRowStyle};
-}
-
-export default useHeaderStyles;
diff --git a/src/components/Icon/BusinessCentralSquare.tsx b/src/components/Icon/BusinessCentralSquare.tsx
new file mode 100644
index 000000000000..f52360be85fb
--- /dev/null
+++ b/src/components/Icon/BusinessCentralSquare.tsx
@@ -0,0 +1,296 @@
+import type {SvgProps} from 'react-native-svg';
+
+import React, {useId} from 'react';
+import Svg, {Defs, G, LinearGradient, Path, RadialGradient, Stop} from 'react-native-svg';
+
+// Static SVGs reuse gradient IDs on web. When another copy is hidden, the browser can resolve this icon's gradients
+// to that copy and not draw them. This component gives each render its own gradient IDs.
+function BusinessCentralSquare(props: SvgProps) {
+    const id = useId();
+    return (
+        <Svg
+            width={40}
+            height={40}
+            fill="none"
+            viewBox="0 0 40 40"
+            {...props}
+        >
+            <Path
+                fill="#1e304f"
+                d="M0 0h40v40H0z"
+            />
+            <G transform="translate(6 6) scale(.29167)">
+                <Path
+                    fill={`url(#${id}-topFill)`}
+                    d="M34 34c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"
+                />
+                <Path
+                    fill={`url(#${id}-topShade)`}
+                    d="M34 34c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"
+                />
+                <Path
+                    fill={`url(#${id}-topEdge)`}
+                    d="M34 34c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"
+                />
+                <Path
+                    fill={`url(#${id}-bottomFill)`}
+                    d="M62 62c-7.732-7.732-20.268-7.732-28 0s-7.732 20.268 0 28 20.268 7.732 28 0 7.732-20.268 0-28"
+                />
+                <Path
+                    fill={`url(#${id}-bottomEdge)`}
+                    d="M62 62c-7.732-7.732-20.268-7.732-28 0s-7.732 20.268 0 28 20.268 7.732 28 0 7.732-20.268 0-28"
+                />
+                <Path
+                    fill={`url(#${id}-bottomShade)`}
+                    d="M62 62c-7.732-7.732-20.268-7.732-28 0s-7.732 20.268 0 28 20.268 7.732 28 0 7.732-20.268 0-28"
+                />
+                <Path
+                    fill={`url(#${id}-centerFill)`}
+                    d="M34 62c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"
+                />
+                <Path
+                    fill={`url(#${id}-centerShadeRight)`}
+                    d="M34 62c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"
+                />
+                <Path
+                    fill={`url(#${id}-centerShadeLeft)`}
+                    d="M34 62c7.732 7.732 20.268 7.732 28 0s7.732-20.268 0-28-20.268-7.732-28 0-7.732 20.268 0 28"
+                />
+                <Path
+                    fill={`url(#${id}-leftFill)`}
+                    d="M6 34 34 6c-7.732 7.732-7.732 20.268 0 28s7.732 20.268 0 28-20.268 7.732-28 0-7.732-20.268 0-28"
+                />
+                <Path
+                    fill={`url(#${id}-leftShade)`}
+                    d="M6 34 34 6c-7.732 7.732-7.732 20.268 0 28s7.732 20.268 0 28-20.268 7.732-28 0-7.732-20.268 0-28"
+                />
+                <Path
+                    fill={`url(#${id}-rightFill)`}
+                    d="M90 62 62 90c7.732-7.732 7.732-20.268 0-28s-7.732-20.268 0-28 20.268-7.732 28 0 7.732 20.268 0 28"
+                />
+                <Defs>
+                    <LinearGradient
+                        id={`${id}-topFill`}
+                        x1="30"
+                        x2="67"
+                        y1="9.5"
+                        y2="25"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop stopColor="#0c74a1" />
+                        <Stop
+                            offset=".468"
+                            stopColor="#1384b1"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#16bbda"
+                        />
+                    </LinearGradient>
+                    <LinearGradient
+                        id={`${id}-topEdge`}
+                        x1="49"
+                        x2="26.5"
+                        y1="14"
+                        y2="24"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop
+                            stopColor="#1384b1"
+                            stopOpacity="0"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#004695"
+                        />
+                    </LinearGradient>
+                    <LinearGradient
+                        id={`${id}-bottomFill`}
+                        x1="68.5"
+                        x2="29"
+                        y1="79.5"
+                        y2="71"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop stopColor="#06517b" />
+                        <Stop
+                            offset=".509"
+                            stopColor="#09638e"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#0c74a1"
+                        />
+                    </LinearGradient>
+                    <LinearGradient
+                        id={`${id}-bottomEdge`}
+                        x1="53"
+                        x2="69.5"
+                        y1="76"
+                        y2="72"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop
+                            stopColor="#09638e"
+                            stopOpacity="0"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#003580"
+                        />
+                    </LinearGradient>
+                    <LinearGradient
+                        id={`${id}-centerFill`}
+                        x1="44.5"
+                        x2="45"
+                        y1="29.5"
+                        y2="68.5"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop stopColor="#43e5ca" />
+                        <Stop
+                            offset=".372"
+                            stopColor="#26cfe8"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#1384b1"
+                        />
+                    </LinearGradient>
+                    <LinearGradient
+                        id={`${id}-leftFill`}
+                        x1="14.5"
+                        x2="43.5"
+                        y1="26"
+                        y2="55"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop stopColor="#b6f6c7" />
+                        <Stop
+                            offset=".278"
+                            stopColor="#43e5ca"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#26cfe8"
+                        />
+                    </LinearGradient>
+                    <LinearGradient
+                        id={`${id}-rightFill`}
+                        x1="63"
+                        x2="92.5"
+                        y1="30"
+                        y2="59.5"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop stopColor="#9ff2e4" />
+                        <Stop
+                            offset=".266"
+                            stopColor="#2bdabe"
+                        />
+                        <Stop
+                            offset=".621"
+                            stopColor="#16bbda"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#1384b1"
+                        />
+                    </LinearGradient>
+                    <RadialGradient
+                        id={`${id}-topShade`}
+                        cx="0"
+                        cy="0"
+                        r="1"
+                        gradientTransform="rotate(-90 48 0) scale(29.5)"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop
+                            offset=".456"
+                            stopColor="#0057aa"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#1384b1"
+                            stopOpacity="0"
+                        />
+                    </RadialGradient>
+                    <RadialGradient
+                        id={`${id}-bottomShade`}
+                        cx="0"
+                        cy="0"
+                        r="1"
+                        gradientTransform="rotate(90 0 48) scale(36)"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop
+                            offset=".423"
+                            stopColor="#003580"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#09638e"
+                            stopOpacity="0"
+                        />
+                    </RadialGradient>
+                    <RadialGradient
+                        id={`${id}-centerShadeRight`}
+                        cx="0"
+                        cy="0"
+                        r="1"
+                        gradientTransform="matrix(0 32 -32 0 76 48)"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop
+                            offset=".4"
+                            stopColor="#09638e"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#119fc5"
+                            stopOpacity="0"
+                        />
+                    </RadialGradient>
+                    <RadialGradient
+                        id={`${id}-centerShadeLeft`}
+                        cx="0"
+                        cy="0"
+                        r="1"
+                        gradientTransform="matrix(0 34 -34 0 20 48)"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop
+                            offset=".4"
+                            stopColor="#09638e"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#119fc5"
+                            stopOpacity="0"
+                        />
+                    </RadialGradient>
+                    <RadialGradient
+                        id={`${id}-leftShade`}
+                        cx="0"
+                        cy="0"
+                        r="1"
+                        gradientTransform="matrix(18.50004 40.5 -40.76334 18.62033 11.5 26)"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <Stop
+                            offset=".585"
+                            stopColor="#2bdabe"
+                            stopOpacity="0"
+                        />
+                        <Stop
+                            offset="1"
+                            stopColor="#119fc5"
+                        />
+                    </RadialGradient>
+                </Defs>
+            </G>
+        </Svg>
+    );
+}
+
+export default BusinessCentralSquare;
diff --git a/src/components/Icon/chunks/expensify-icons.chunk.ts b/src/components/Icon/chunks/expensify-icons.chunk.ts
index e9c4bd7dd34b..dbb862ca5000 100644
--- a/src/components/Icon/chunks/expensify-icons.chunk.ts
+++ b/src/components/Icon/chunks/expensify-icons.chunk.ts
@@ -138,7 +138,6 @@ import ImageCropSquareMask from '@assets/images/image-crop-square-mask.svg';
 import Inbox from '@assets/images/inbox.svg';
 import Info from '@assets/images/info.svg';
 import BillComSquare from '@assets/images/integrationicons/bill-com-icon-square.svg';
-import BusinessCentralSquare from '@assets/images/integrationicons/business-central-icon-square.svg';
 import CampfireSquare from '@assets/images/integrationicons/campfire-icon-square.svg';
 import CertiniaSquare from '@assets/images/integrationicons/certinia-icon-square.svg';
 import ChatGPTSquare from '@assets/images/integrationicons/chatgpt-icon-square.svg';
@@ -296,8 +295,9 @@ import Wrench from '@assets/images/wrench.svg';
 import Clear from '@assets/images/x-circle.svg';
 import Zoom from '@assets/images/zoom.svg';
 
-// These icons are React components because they have
+// These icons are React components. BusinessCentralSquare needs gradient ids unique to each rendered copy, and the map icons have
 // drop shadow that is NOT handled by babel-plugin-transform-react-native-svg
+import BusinessCentralSquare from '@components/Icon/BusinessCentralSquare';
 import MapCurrentLocation from '@components/MapView/Icons/MapCurrentLocation';
 import MapCurrentLocationPuck from '@components/MapView/Icons/MapCurrentLocationPuck';
 import MapStartWaypoint from '@components/MapView/Icons/MapStartWaypoint';
diff --git a/src/components/Icon/chunks/illustrations.chunk.ts b/src/components/Icon/chunks/illustrations.chunk.ts
index dde691ee6d16..f4a70159c5be 100644
--- a/src/components/Icon/chunks/illustrations.chunk.ts
+++ b/src/components/Icon/chunks/illustrations.chunk.ts
@@ -132,6 +132,7 @@ import CardReaderAlt from '@assets/images/simple-illustrations/simple-illustrati
 import Chair from '@assets/images/simple-illustrations/simple-illustration__chair.svg';
 import Chalkboard from '@assets/images/simple-illustrations/simple-illustration__chalkboard.svg';
 import Chart from '@assets/images/simple-illustrations/simple-illustration__chart.svg';
+import ChartSync from '@assets/images/simple-illustrations/simple-illustration__chartsync.svg';
 import ChatBubbles from '@assets/images/simple-illustrations/simple-illustration__chatbubbles.svg';
 import CheckboxText from '@assets/images/simple-illustrations/simple-illustration__checkboxtext.svg';
 import CheckmarkCircle from '@assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg';
@@ -180,6 +181,7 @@ import MagnifyingGlassReceipt from '@assets/images/simple-illustrations/simple-i
 import Mailbox from '@assets/images/simple-illustrations/simple-illustration__mailbox.svg';
 import ExpensifyMobileApp from '@assets/images/simple-illustrations/simple-illustration__mobileapp.svg';
 import MoneyReceipts from '@assets/images/simple-illustrations/simple-illustration__money-receipts.svg';
+import MoneyBadge from '@assets/images/simple-illustrations/simple-illustration__moneybadge.svg';
 import MoneyIntoWallet from '@assets/images/simple-illustrations/simple-illustration__moneyintowallet.svg';
 import MoneyWings from '@assets/images/simple-illustrations/simple-illustration__moneywings.svg';
 import MonitorSyncNo from '@assets/images/simple-illustrations/simple-illustration__monitorsync-no.svg';
@@ -358,6 +360,7 @@ const Illustrations = {
     CreditCardsNew,
     FolderOpen,
     FolderSync,
+    ChartSync,
     HandCard,
     Hashtag,
     InvoiceBlue,
@@ -365,6 +368,7 @@ const Illustrations = {
     MagnifyingGlassMoney,
     MagnifyingGlassReceipt,
     MoneyReceipts,
+    MoneyBadge,
     MoneyWings,
     MoneyIntoWallet,
     MonitorSyncNo,
diff --git a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
index 54113abbebe4..e90e1e05fb5a 100644
--- a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
@@ -171,6 +171,7 @@ function OptionRowLHNData({
         movedToReport,
         currentUserAccountID,
         reportAttributesDerived,
+        visibleReportActionsData,
         policyTags,
         currentUserLogin: login ?? '',
         isTrackIntentUser,
diff --git a/src/components/MenuItem/index.ts b/src/components/MenuItem/index.ts
index e34a3b1563a6..112024d6c702 100644
--- a/src/components/MenuItem/index.ts
+++ b/src/components/MenuItem/index.ts
@@ -36,10 +36,12 @@ import MenuItemDescription from './leaves/content/MenuItemDescription';
 import MenuItemFieldName from './leaves/content/MenuItemFieldName';
 import MenuItemFieldNamePlaceholder from './leaves/content/MenuItemFieldNamePlaceholder';
 import MenuItemFieldValue from './leaves/content/MenuItemFieldValue';
+import MenuItemFieldValueHTML from './leaves/content/MenuItemFieldValueHTML';
 import MenuItemLabel from './leaves/content/MenuItemLabel';
 import MenuItemTitle from './leaves/content/MenuItemTitle';
+import MenuItemHelpText from './leaves/helpText/MenuItemHelpText';
+import MenuItemHelpTextHTML from './leaves/helpText/MenuItemHelpTextHTML';
 import MenuItemIcon from './leaves/leading/MenuItemIcon';
-import MenuItemHelpText from './leaves/MenuItemHelpText';
 import MenuItemBrickRoadIndicator from './leaves/trailing/icons/MenuItemBrickRoadIndicator';
 import MenuItemChevron from './leaves/trailing/icons/MenuItemChevron';
 import MenuItemDownCaret from './leaves/trailing/icons/MenuItemDownCaret';
@@ -62,6 +64,7 @@ const MenuItem = Object.assign(LegacyMenuItem, {
     FieldName: MenuItemFieldName,
     FieldNamePlaceholder: MenuItemFieldNamePlaceholder,
     FieldValue: MenuItemFieldValue,
+    FieldValueHTML: MenuItemFieldValueHTML,
     BrickRoadIndicator: MenuItemBrickRoadIndicator,
     Chevron: MenuItemChevron,
     DownCaret: MenuItemDownCaret,
@@ -70,6 +73,7 @@ const MenuItem = Object.assign(LegacyMenuItem, {
     Copy: MenuItemCopy,
     ExternalLink: MenuItemExternalLink,
     HelpText: MenuItemHelpText,
+    HelpTextHTML: MenuItemHelpTextHTML,
 });
 
 export default MenuItem;
diff --git a/src/components/MenuItem/layout/MenuItemRoot.tsx b/src/components/MenuItem/layout/MenuItemRoot.tsx
index d9e72e4d4bf7..cf521d34a7cf 100644
--- a/src/components/MenuItem/layout/MenuItemRoot.tsx
+++ b/src/components/MenuItem/layout/MenuItemRoot.tsx
@@ -21,7 +21,7 @@ import type WithSentryLabel from '@src/types/utils/SentryLabel';
 import type WithTestID from '@src/types/utils/TestID';
 
 import type {ComponentRef, PropsWithChildren} from 'react';
-import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
+import type {AccessibilityState, GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 
 import React, {useRef} from 'react';
 import {View} from 'react-native';
@@ -46,9 +46,12 @@ type MenuItemRootProps = PropsWithChildren &
          * before the hover/press background so the row keeps its interaction feedback.
          */
         style?: StyleProp<ViewStyle>;
+
+        /** Accessibility state for the row, e.g. `{expanded}`. Lands on the pressable, which is what a screen reader focuses. */
+        accessibilityState?: AccessibilityState;
     };
 
-function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testID, accessibilityLabel, style}: MenuItemRootProps) {
+function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testID, accessibilityLabel, style, accessibilityState}: MenuItemRootProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const pressableRef = useRef<ComponentRef<typeof View>>(null);
@@ -110,6 +113,7 @@ function MenuItemRoot({children, onPress, isDisabled = false, sentryLabel, testI
                         role={isInteractive ? CONST.ROLE.BUTTON : undefined}
                         accessibilityLabel={accessibilityLabel ?? derivedAccessibilityLabel}
                         accessibilityHint={accessibilityHint}
+                        accessibilityState={accessibilityState}
                         accessible
                         tabIndex={isInteractive ? 0 : -1}
                         sentryLabel={sentryLabel}
diff --git a/src/components/MenuItem/leaves/MenuItemHelpText.tsx b/src/components/MenuItem/leaves/MenuItemHelpText.tsx
deleted file mode 100644
index b21419c0ed30..000000000000
--- a/src/components/MenuItem/leaves/MenuItemHelpText.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import FormHelpMessage from '@components/FormHelpMessage';
-
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import type {ReactNode} from 'react';
-
-import React from 'react';
-
-type MenuItemHelpTextProps = {
-    /** Error or hint text to render under the row. Nothing renders when it is empty */
-    message?: string | ReactNode;
-
-    /** Whether the text reads as an error (red) instead of a hint (muted) */
-    isError?: boolean;
-};
-
-/** The trailing help line of a `MenuItem.Root`, rendered under `MenuItem.Row` and inside the row's press target */
-function MenuItemHelpText({message, isError = false}: MenuItemHelpTextProps) {
-    const styles = useThemeStyles();
-
-    return (
-        <FormHelpMessage
-            isError={isError}
-            shouldShowRedDotIndicator={false}
-            message={message}
-            style={styles.menuItemError}
-        />
-    );
-}
-
-export default MenuItemHelpText;
diff --git a/src/components/MenuItem/leaves/content/MenuItemFieldValueHTML.tsx b/src/components/MenuItem/leaves/content/MenuItemFieldValueHTML.tsx
new file mode 100644
index 000000000000..06b5dde71a56
--- /dev/null
+++ b/src/components/MenuItem/leaves/content/MenuItemFieldValueHTML.tsx
@@ -0,0 +1,42 @@
+import {useMenuItemAccessibilityLabel} from '@components/MenuItem/MenuItemAccessibilityContext';
+import RenderHTML from '@components/RenderHTML';
+import Text from '@components/Text';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import convertToLTR from '@libs/convertToLTR';
+import Parser from '@libs/Parser';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type MenuItemFieldValueHTMLProps = {
+    /** HTML the field holds. Markdown has to be turned into HTML by the caller first, e.g. with `Parser.replace` */
+    children: string;
+
+    /** Cuts the rendered text down to this many characters, closing any tags left open */
+    characterLimit?: number;
+};
+
+/**
+ * Value a field holds, given as HTML. A value with no markup renders as plain text, with its entities decoded,
+ * so it is safe to pass values that are only sometimes HTML.
+ */
+function MenuItemFieldValueHTML({children, characterLimit}: MenuItemFieldValueHTMLProps) {
+    const styles = useThemeStyles();
+
+    // The row builds its label from text, so screen readers hear the content rather than the markup
+    useMenuItemAccessibilityLabel('bottom', Parser.htmlToText(children));
+
+    // Truncation needs the value wrapped in a tag, since truncateHTML returns nothing for markup-free input
+    const wrappedHTML = `<comment>${children}</comment>`;
+    const html = characterLimit ? Parser.truncateHTML(wrappedHTML, characterLimit, {ellipsis: '...'}) : wrappedHTML;
+
+    return (
+        <View style={[styles.renderHTMLTitle, styles.textAlignLeft]}>
+            {Parser.isHTML(children) ? <RenderHTML html={html} /> : <Text style={styles.webViewStyles.baseFontStyle}>{convertToLTR(Parser.htmlToText(html))}</Text>}
+        </View>
+    );
+}
+
+export default MenuItemFieldValueHTML;
diff --git a/src/components/MenuItem/leaves/helpText/BaseMenuItemHelpText.tsx b/src/components/MenuItem/leaves/helpText/BaseMenuItemHelpText.tsx
new file mode 100644
index 000000000000..e7ad90213e78
--- /dev/null
+++ b/src/components/MenuItem/leaves/helpText/BaseMenuItemHelpText.tsx
@@ -0,0 +1,21 @@
+import FormHelpMessage from '@components/FormHelpMessage';
+
+import React from 'react';
+
+import type {BaseMenuItemHelpTextProps} from './types';
+
+/** Base of the help line leaves */
+function BaseMenuItemHelpText({message, children, isError = false, style}: BaseMenuItemHelpTextProps) {
+    return (
+        <FormHelpMessage
+            isError={isError}
+            shouldShowRedDotIndicator={false}
+            message={message}
+            style={style}
+        >
+            {children}
+        </FormHelpMessage>
+    );
+}
+
+export default BaseMenuItemHelpText;
diff --git a/src/components/MenuItem/leaves/helpText/MenuItemHelpText.tsx b/src/components/MenuItem/leaves/helpText/MenuItemHelpText.tsx
new file mode 100644
index 000000000000..f8adf00ad2b3
--- /dev/null
+++ b/src/components/MenuItem/leaves/helpText/MenuItemHelpText.tsx
@@ -0,0 +1,22 @@
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+
+import type {MenuItemHelpTextProps} from './types';
+
+import BaseMenuItemHelpText from './BaseMenuItemHelpText';
+
+/** The help line of a `MenuItem.Root`, rendered under `MenuItem.Row` and inside the row's press target */
+function MenuItemHelpText({message, isError = false}: MenuItemHelpTextProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <BaseMenuItemHelpText
+            isError={isError}
+            message={message}
+            style={styles.menuItemError}
+        />
+    );
+}
+
+export default MenuItemHelpText;
diff --git a/src/components/MenuItem/leaves/helpText/MenuItemHelpTextHTML.tsx b/src/components/MenuItem/leaves/helpText/MenuItemHelpTextHTML.tsx
new file mode 100644
index 000000000000..c4b9daacd792
--- /dev/null
+++ b/src/components/MenuItem/leaves/helpText/MenuItemHelpTextHTML.tsx
@@ -0,0 +1,29 @@
+import RenderHTML from '@components/RenderHTML';
+
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import React from 'react';
+
+import type {MenuItemHelpTextHTMLProps} from './types';
+
+import BaseMenuItemHelpText from './BaseMenuItemHelpText';
+
+/**
+ * An error or hint given as HTML, rendered after a `MenuItem.Root` so its links stay pressable
+ * on their own instead of being swallowed by the row's press target.
+ */
+function MenuItemHelpTextHTML({children, isError = false}: MenuItemHelpTextHTMLProps) {
+    const styles = useThemeStyles();
+    const textTag = isError ? 'alert-text' : 'muted-text-label';
+
+    return (
+        <BaseMenuItemHelpText
+            isError={isError}
+            style={[styles.mt0, styles.mb0, styles.ph5, styles.pb5]}
+        >
+            <RenderHTML html={`<comment><${textTag}>${children}</${textTag}></comment>`} />
+        </BaseMenuItemHelpText>
+    );
+}
+
+export default MenuItemHelpTextHTML;
diff --git a/src/components/MenuItem/leaves/helpText/types.ts b/src/components/MenuItem/leaves/helpText/types.ts
new file mode 100644
index 000000000000..29ef14a9be37
--- /dev/null
+++ b/src/components/MenuItem/leaves/helpText/types.ts
@@ -0,0 +1,34 @@
+import type {ReactNode} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+
+/** Props shared by the help line leaves */
+type MenuItemHelpTextSharedProps = {
+    /** Whether the line reads as an error (red) instead of a hint (muted) */
+    isError?: boolean;
+};
+
+/** Props of the plain text help line */
+type MenuItemHelpTextProps = MenuItemHelpTextSharedProps & {
+    /** Error or hint text to render under the row. Nothing renders when it is empty */
+    message?: string | ReactNode;
+};
+
+/** Props of the HTML help line */
+type MenuItemHelpTextHTMLProps = MenuItemHelpTextSharedProps & {
+    /** HTML of the error or hint. Markdown has to be turned into HTML by the caller first, e.g. with `Parser.replace` */
+    children: string;
+};
+
+/** Props of the base both help line leaves render through */
+type BaseMenuItemHelpTextProps = MenuItemHelpTextSharedProps & {
+    /** Text of the line. Kept apart from `children` so errors given as text still get announced */
+    message?: string | ReactNode;
+
+    /** Content of the line, rendered instead of `message` */
+    children?: ReactNode;
+
+    /** Spacing of the line, which depends on where the leaf sits */
+    style?: StyleProp<ViewStyle>;
+};
+
+export type {BaseMenuItemHelpTextProps, MenuItemHelpTextHTMLProps, MenuItemHelpTextProps};
diff --git a/src/components/MenuItem/presets/MenuItemField.tsx b/src/components/MenuItem/presets/MenuItemField.tsx
index 83022c2bccc3..889eeb5c9d75 100644
--- a/src/components/MenuItem/presets/MenuItemField.tsx
+++ b/src/components/MenuItem/presets/MenuItemField.tsx
@@ -8,9 +8,11 @@ import MenuItemFieldNamePlaceholder from '@components/MenuItem/leaves/content/Me
 import MenuItemFieldValue from '@components/MenuItem/leaves/content/MenuItemFieldValue';
 import MenuItemChevron from '@components/MenuItem/leaves/trailing/icons/MenuItemChevron';
 
+import hasRenderableChildren from '@libs/hasRenderableChildren';
+
 import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
-import type {PropsWithChildren} from 'react';
+import type {PropsWithChildren, ReactNode} from 'react';
 
 import React from 'react';
 
@@ -27,6 +29,33 @@ type MenuItemFieldRowProps = PropsWithChildren<{
 
 type MenuItemFieldProps = Omit<MenuItemRootProps, 'accessibilityLabel'> & Omit<MenuItemFieldRowProps, 'children'>;
 
+type MenuItemFieldContentProps = {
+    /** Name of the field */
+    name: string;
+
+    /** The value leaf, e.g. `MenuItem.FieldValue` or `MenuItem.FieldValueHTML`. Leave it out for a field not filled in yet */
+    children?: ReactNode;
+};
+
+/**
+ * The content cell of a field: its name over its value, or the name alone standing in for a missing value.
+ * Reach for it when the value needs a leaf other than `MenuItem.FieldValue`.
+ */
+function MenuItemFieldContent({name, children}: MenuItemFieldContentProps) {
+    return (
+        <MenuItemContent>
+            {hasRenderableChildren(children) ? (
+                <>
+                    <MenuItemFieldName>{name}</MenuItemFieldName>
+                    {children}
+                </>
+            ) : (
+                <MenuItemFieldNamePlaceholder>{name}</MenuItemFieldNamePlaceholder>
+            )}
+        </MenuItemContent>
+    );
+}
+
 /**
  * The line a field preset draws, without a `MenuItem.Root` of its own. Reach for it over the
  * `MenuItemField` preset when the row needs siblings inside the same `Root` (an error or a hint
@@ -35,17 +64,8 @@ type MenuItemFieldProps = Omit<MenuItemRootProps, 'accessibilityLabel'> & Omit<M
 function MenuItemFieldRow({name, value, numberOfLinesValue, children}: MenuItemFieldRowProps) {
     return (
         <MenuItemRow>
-            <MenuItemContent>
-                {value ? (
-                    <>
-                        <MenuItemFieldName>{name}</MenuItemFieldName>
-                        <MenuItemFieldValue numberOfLines={numberOfLinesValue}>{value}</MenuItemFieldValue>
-                    </>
-                ) : (
-                    <MenuItemFieldNamePlaceholder>{name}</MenuItemFieldNamePlaceholder>
-                )}
-            </MenuItemContent>
-            {!!children && <MenuItemTrailing>{children}</MenuItemTrailing>}
+            <MenuItemFieldContent name={name}>{!!value && <MenuItemFieldValue numberOfLines={numberOfLinesValue}>{value}</MenuItemFieldValue>}</MenuItemFieldContent>
+            {hasRenderableChildren(children) && <MenuItemTrailing>{children}</MenuItemTrailing>}
         </MenuItemRow>
     );
 }
@@ -67,17 +87,13 @@ function MenuItemFieldPreset({name, value, numberOfLinesValue, children, onPress
                 value={value}
                 numberOfLinesValue={numberOfLinesValue}
             >
-                {(!!children || !!onPress) && (
-                    <>
-                        {children}
-                        {!!onPress && <MenuItemChevron />}
-                    </>
-                )}
+                {children}
+                {!!onPress && <MenuItemChevron />}
             </MenuItemFieldRow>
         </MenuItemRoot>
     );
 }
 
-const MenuItemField = Object.assign(MenuItemFieldPreset, {Row: MenuItemFieldRow});
+const MenuItemField = Object.assign(MenuItemFieldPreset, {Row: MenuItemFieldRow, Content: MenuItemFieldContent});
 
 export default MenuItemField;
diff --git a/src/components/MenuItem/presets/MenuItemFieldHTML.tsx b/src/components/MenuItem/presets/MenuItemFieldHTML.tsx
new file mode 100644
index 000000000000..83fbfdb0acf9
--- /dev/null
+++ b/src/components/MenuItem/presets/MenuItemFieldHTML.tsx
@@ -0,0 +1,55 @@
+import MenuItemRoot from '@components/MenuItem/layout/MenuItemRoot';
+import type {MenuItemRootProps} from '@components/MenuItem/layout/MenuItemRoot';
+import MenuItemRow from '@components/MenuItem/layout/MenuItemRow';
+import MenuItemTrailing from '@components/MenuItem/layout/MenuItemTrailing';
+import MenuItemFieldValueHTML from '@components/MenuItem/leaves/content/MenuItemFieldValueHTML';
+import MenuItemChevron from '@components/MenuItem/leaves/trailing/icons/MenuItemChevron';
+
+import hasRenderableChildren from '@libs/hasRenderableChildren';
+
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
+import type {PropsWithChildren} from 'react';
+
+import React from 'react';
+
+import MenuItemField from './MenuItemField';
+
+type MenuItemFieldHTMLProps = Omit<MenuItemRootProps, 'accessibilityLabel'> &
+    PropsWithChildren<{
+        /** Name of the field */
+        name: string;
+
+        /** HTML the field holds. Markdown has to be turned into HTML by the caller first, e.g. with `Parser.replace` */
+        value?: string;
+
+        /** Cuts the rendered value down to this many characters, closing any tags left open */
+        characterLimit?: number;
+    }>;
+
+/**
+ * Field preset with its value given as HTML: a field name plus its rendered value. With no `value` the name takes over the row.
+ * `children` land in the trailing cell, next to the chevron.
+ */
+function MenuItemFieldHTML({name, value, characterLimit, children, onPress, isDisabled = false, sentryLabel, testID}: MenuItemFieldHTMLProps) {
+    return (
+        <MenuItemRoot
+            onPress={onPress ? callFunctionIfActionIsAllowed(onPress) : undefined}
+            isDisabled={isDisabled}
+            sentryLabel={sentryLabel}
+            testID={testID}
+        >
+            <MenuItemRow>
+                <MenuItemField.Content name={name}>{!!value && <MenuItemFieldValueHTML characterLimit={characterLimit}>{value}</MenuItemFieldValueHTML>}</MenuItemField.Content>
+                {(hasRenderableChildren(children) || !!onPress) && (
+                    <MenuItemTrailing>
+                        {children}
+                        {!!onPress && <MenuItemChevron />}
+                    </MenuItemTrailing>
+                )}
+            </MenuItemRow>
+        </MenuItemRoot>
+    );
+}
+
+export default MenuItemFieldHTML;
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index a10ad657c78c..86ece35927cb 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -21,6 +21,8 @@ import NarrowPaneContext from '@libs/Navigation/AppNavigator/Navigators/NarrowPa
 import Overlay from '@libs/Navigation/AppNavigator/Navigators/Overlay';
 import Navigation from '@libs/Navigation/Navigation';
 
+import variables from '@styles/variables';
+
 import {areAllModalsHidden, closeTop, onModalDidClose, setCloseModal, setModalCovering, setModalVisibility, willAlertModalBecomeVisible} from '@userActions/Modal';
 
 import CONST from '@src/CONST';
@@ -248,6 +250,11 @@ function BaseModal({
         setModalHeight(e.nativeEvent.layout.height);
     };
 
+    const {isInNarrowPane} = useContext(NarrowPaneContext);
+
+    // A right docked modal opened from inside the RHP sits on the RHP's own card, so it must not dim it or add a second shadow.
+    const isStackedOnRHP = type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED && !isSmallScreenWidth && (isInNarrowPane || isInNarrowPaneModal) && !shouldKeepRightDockedBackdropInNarrowPane;
+
     const {
         modalStyle,
         modalContainerStyle,
@@ -276,6 +283,7 @@ function BaseModal({
         },
         enableEdgeToEdgeBottomSafeAreaPadding,
         shouldDisplayBelowModals,
+        isStackedOnRHP,
     });
 
     // When the `enableEdgeToEdgeBottomSafeAreaPadding` prop is explicitly set, we enable edge-to-edge mode.
@@ -292,16 +300,14 @@ function BaseModal({
     });
     const modalPaddingStyles = shouldUseModalPaddingStyle ? paddings : {paddingLeft: paddings.paddingLeft, paddingRight: paddings.paddingRight};
 
-    const {isInNarrowPane} = useContext(NarrowPaneContext);
-
-    const shouldSuppressRightDockedBackdrop =
-        type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED && !isSmallScreenWidth && (isInNarrowPane || isInNarrowPaneModal) && !shouldKeepRightDockedBackdropInNarrowPane;
     const isFullWidthNarrowSheet =
         (type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED || type === CONST.MODAL.MODAL_TYPE.CENTERED_SWIPEABLE_TO_RIGHT) && isSmallScreenWidth && !shouldKeepRightDockedBackdropInNarrowPane;
+    // A right docked sheet floats like the RHP on wide web, so it dims the page as lightly as the RHP does.
+    const rightDockedBackdropOpacity = type === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED && !isSmallScreenWidth ? variables.rhpOverlayOpacity : undefined;
     const backdropOpacityAdjusted =
-        !shouldShowBackdrop && (hideBackdrop || shouldSuppressRightDockedBackdrop || isFullWidthNarrowSheet) // full-width narrow sheets (RHP-like) shouldn't dim a backdrop behind them
+        !shouldShowBackdrop && (hideBackdrop || isStackedOnRHP || isFullWidthNarrowSheet) // full-width narrow sheets (RHP-like) shouldn't dim a backdrop behind them
             ? 0
-            : backdropOpacity;
+            : (backdropOpacity ?? rightDockedBackdropOpacity);
 
     const dragArea = type === CONST.MODAL.MODAL_TYPE.CENTERED || type === CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE ? undefined : false;
 
diff --git a/src/components/Modal/ReanimatedModal/Backdrop/index.web.tsx b/src/components/Modal/ReanimatedModal/Backdrop/index.web.tsx
index 6a3c86405d81..18e2eb82e55d 100644
--- a/src/components/Modal/ReanimatedModal/Backdrop/index.web.tsx
+++ b/src/components/Modal/ReanimatedModal/Backdrop/index.web.tsx
@@ -29,7 +29,7 @@ function Backdrop({
         if (!backdropOpacity) {
             return;
         }
-        const FadeIn = new Keyframe(getModalInAnimation('fadeIn'));
+        const FadeIn = new Keyframe(getModalInAnimation('fadeIn', backdropOpacity));
         return FadeIn.duration(animationInTiming).reduceMotion(ReduceMotion.Never);
     }, [animationInTiming, backdropOpacity]);
 
@@ -37,7 +37,7 @@ function Backdrop({
         if (!backdropOpacity) {
             return;
         }
-        const FadeOut = new Keyframe(getModalOutAnimation('fadeOut'));
+        const FadeOut = new Keyframe(getModalOutAnimation('fadeOut', backdropOpacity));
         return FadeOut.duration(animationOutTiming).reduceMotion(ReduceMotion.Never);
     }, [animationOutTiming, backdropOpacity]);
 
diff --git a/src/components/Modal/ReanimatedModal/utils.ts b/src/components/Modal/ReanimatedModal/utils.ts
index c3758ed9a46b..02c26315b917 100644
--- a/src/components/Modal/ReanimatedModal/utils.ts
+++ b/src/components/Modal/ReanimatedModal/utils.ts
@@ -11,7 +11,7 @@ import type {AnimationIn, AnimationOut} from './types';
 
 const easing = Easing.bezier(0.76, 0.0, 0.24, 1.0).factory();
 
-function getModalInAnimation(animationType: AnimationIn): ValidKeyframeProps {
+function getModalInAnimation(animationType: AnimationIn, fadeOpacity: number = variables.overlayOpacity): ValidKeyframeProps {
     switch (animationType) {
         case 'slideInRight':
             return {
@@ -33,7 +33,7 @@ function getModalInAnimation(animationType: AnimationIn): ValidKeyframeProps {
             return {
                 from: {opacity: 0},
                 to: {
-                    opacity: variables.overlayOpacity,
+                    opacity: fadeOpacity,
                     easing,
                 },
             };
@@ -69,7 +69,7 @@ function getModalInAnimationStyle(animationType: AnimationIn): (progress: number
     }
 }
 
-function getModalOutAnimation(animationType: AnimationOut): ValidKeyframeProps {
+function getModalOutAnimation(animationType: AnimationOut, fadeOpacity: number = variables.overlayOpacity): ValidKeyframeProps {
     switch (animationType) {
         case 'slideOutRight':
             return {
@@ -89,7 +89,7 @@ function getModalOutAnimation(animationType: AnimationOut): ValidKeyframeProps {
             };
         case 'fadeOut':
             return {
-                from: {opacity: variables.overlayOpacity},
+                from: {opacity: fadeOpacity},
                 to: {
                     opacity: 0,
                     easing,
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index ae0b2ffaf4a1..84c1bbdc682d 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1,5 +1,7 @@
+import useCarouselTransactionIDs from '@hooks/useCarouselTransactionIDs';
 import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
+import useMoneyReportHeaderMoreContentVisibility from '@hooks/useMoneyReportHeaderMoreContentVisibility';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useReportPrimaryAction from '@hooks/useReportPrimaryAction';
@@ -9,16 +11,21 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViolationsForReport';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportsSplitNavigatorParamList, RightModalNavigatorParamList} from '@libs/Navigation/types';
+import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
 
 import {useIsFocused, useRoute} from '@react-navigation/native';
-import React, {useEffect} from 'react';
+import React, {useCallback, useEffect} from 'react';
 import {View} from 'react-native';
 
 import HeaderLoadingBar from './HeaderLoadingBar';
@@ -26,6 +33,8 @@ import HeaderWithBackButton from './HeaderWithBackButton';
 import MoneyReportHeaderActions from './MoneyReportHeaderActions';
 import MoneyReportHeaderModals from './MoneyReportHeaderModals';
 import MoneyReportHeaderMoreContent from './MoneyReportHeaderMoreContent';
+import MoneyRequestReportNavigation from './MoneyRequestReportView/MoneyRequestReportNavigation';
+import MoneyRequestReportTransactionsNavigation from './MoneyRequestReportView/MoneyRequestReportTransactionsNavigation';
 import {PaymentAnimationsProvider} from './PaymentAnimationsContext';
 import {useSearchSelectionActions} from './Search/SearchContext';
 
@@ -75,15 +84,49 @@ function MoneyReportHeaderContent({reportID: reportIDProp, shouldDisplayBackButt
 
     const transactions = Object.values(reportTransactions);
 
+    // The same filtered list MoneyRequestReportTransactionsNavigation renders from, so the two agree on whether
+    // there is an expense carousel to show. Gating on the raw Onyx list let this pick the expense branch while the
+    // carousel found nothing to page through, leaving the user with neither set of arrows.
+    const {transactionIDs: activeTransactionIDs} = useCarouselTransactionIDs();
+
+    const singleTransactionID = transactions.length === 1 ? transactions.at(0)?.transactionID : undefined;
+
+    const threadParentReportActionID = moneyRequestReport?.parentReportActionID;
+    const threadTransactionIDSelector = useCallback(
+        (parentReportActions: OnyxEntry<OnyxTypes.ReportActions>) => {
+            const parentReportAction = threadParentReportActionID ? parentReportActions?.[threadParentReportActionID] : undefined;
+            return isMoneyRequestAction(parentReportAction) ? getOriginalMessage(parentReportAction)?.IOUTransactionID : undefined;
+        },
+        [threadParentReportActionID],
+    );
+    const [threadTransactionID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(moneyRequestReport?.parentReportID)}`, {selector: threadTransactionIDSelector});
+
+    const anchorTransactionIDFromRoute = route.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT ? route.params.anchorTransactionID : undefined;
+    const routeAnchorTransactionID = anchorTransactionIDFromRoute && activeTransactionIDs.includes(anchorTransactionIDFromRoute) ? anchorTransactionIDFromRoute : undefined;
+    const carouselAnchorTransactionID = route.name === SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT ? undefined : (singleTransactionID ?? threadTransactionID ?? routeAnchorTransactionID);
+    const shouldShowTransactionNavigation =
+        route.name !== SCREENS.REPORT && !!carouselAnchorTransactionID && activeTransactionIDs.length > 1 && activeTransactionIDs.includes(carouselAnchorTransactionID);
+
     const styles = useThemeStyles();
 
     const {isWideRHPDisplayedOnWideLayout, isSuperWideRHPDisplayedOnWideLayout, shouldUseNarrowLayout: shouldUseNarrowLayoutOnWideRHP} = useResponsiveLayoutOnWideRHP();
 
     const shouldShowHeaderButtonsInHeaderRow = isInLandscapeMode || !shouldDisplayNarrowVersion || isWideRHPDisplayedOnWideLayout || isSuperWideRHPDisplayedOnWideLayout;
+
     const isReportInRHP = route.name !== SCREENS.REPORT;
-    const shouldDisplaySearchRouter = !isReportInRHP || isSmallScreenWidth;
     const isReportInSearch = route.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT || route.name === SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT;
 
+    // The report-level arrows page through search results, so they are search-only; the expense carousel takes
+    // precedence wherever this report is anchored to one.
+    const shouldShowReportNavigation = !shouldShowTransactionNavigation && isReportInSearch;
+
+    const {statusBarType, shouldShowNextStep, hasStatusOrNextStep} = useMoneyReportHeaderMoreContentVisibility(reportIDProp);
+    const shouldRenderActionsInHeaderRow = shouldShowHeaderButtonsInHeaderRow && !hasStatusOrNextStep;
+    // A narrow header has room for one control beside the title, and prev/next wins it: the arrows are the only way
+    // to reach this expense's siblings, whereas the search router is still one back-press away on the screen the
+    // user came from. Where no arrows are rendered the magnifier keeps its place, as it did before.
+    const shouldDisplaySearchRouter = !isReportInRHP || (isSmallScreenWidth && !shouldShowTransactionNavigation && !shouldShowReportNavigation);
+
     const backTo = (route.params as {backTo?: Route} | undefined)?.backTo;
 
     const primaryAction = useReportPrimaryAction(reportIDProp);
@@ -138,14 +181,29 @@ function MoneyReportHeaderContent({reportID: reportIDProp, shouldDisplayBackButt
                 shouldEnableDetailPageNavigation
                 openParentReportInCurrentTab
             >
-                {shouldShowHeaderButtonsInHeaderRow && (
-                    <MoneyReportHeaderActions
-                        reportID={reportIDProp}
-                        primaryAction={primaryAction}
-                        isReportInSearch={isReportInSearch}
-                        backTo={backTo}
-                    />
-                )}
+                <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3]}>
+                    {shouldRenderActionsInHeaderRow && (
+                        <MoneyReportHeaderActions
+                            reportID={reportIDProp}
+                            primaryAction={primaryAction}
+                            isReportInSearch={isReportInSearch}
+                            backTo={backTo}
+                        />
+                    )}
+                    {shouldShowTransactionNavigation && !!carouselAnchorTransactionID ? (
+                        <MoneyRequestReportTransactionsNavigation
+                            currentTransactionID={carouselAnchorTransactionID}
+                            shouldDisplayNarrowVersion={!shouldShowHeaderButtonsInHeaderRow}
+                        />
+                    ) : (
+                        shouldShowReportNavigation && (
+                            <MoneyRequestReportNavigation
+                                reportID={reportIDProp}
+                                shouldDisplayNarrowVersion={!shouldShowHeaderButtonsInHeaderRow}
+                            />
+                        )
+                    )}
+                </View>
             </HeaderWithBackButton>
             {!shouldShowHeaderButtonsInHeaderRow && (
                 <MoneyReportHeaderActions
@@ -155,7 +213,14 @@ function MoneyReportHeaderContent({reportID: reportIDProp, shouldDisplayBackButt
                     backTo={backTo}
                 />
             )}
-            <MoneyReportHeaderMoreContent reportID={reportIDProp} />
+            <MoneyReportHeaderMoreContent
+                reportID={reportIDProp}
+                primaryAction={primaryAction}
+                backTo={backTo}
+                statusBarType={statusBarType}
+                shouldShowNextStep={shouldShowNextStep}
+                shouldRenderActionsInRow={shouldShowHeaderButtonsInHeaderRow && !shouldRenderActionsInHeaderRow}
+            />
             <HeaderLoadingBar />
         </View>
     );
diff --git a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
index 923a5f07e5e5..9ee62eade7e4 100644
--- a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
+++ b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSecondaryActions.tsx
@@ -87,6 +87,8 @@ type MoneyReportHeaderSecondaryActionsProps = {
     isReportInSearch?: boolean;
     backTo?: Route;
     dropdownMenuRef?: React.RefObject<ButtonWithDropdownMenuRef>;
+    /** Disables the "More" dropdown, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
 const MORE_MENU_SUBMIT_TO_POPOVER_ANCHOR_ALIGNMENT = {
@@ -94,7 +96,7 @@ const MORE_MENU_SUBMIT_TO_POPOVER_ANCHOR_ALIGNMENT = {
     vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
 };
 
-function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isReportInSearch, backTo, dropdownMenuRef}: MoneyReportHeaderSecondaryActionsProps) {
+function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isReportInSearch, backTo, dropdownMenuRef, isDisabled}: MoneyReportHeaderSecondaryActionsProps) {
     const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, startApprovedAnimation, startSubmittingAnimation} = usePaymentAnimationsContext();
     const {openHoldMenu, openPDFDownload, openHoldEducational, openRejectModal} = useMoneyReportHeaderModals();
 
@@ -130,6 +132,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const [invoiceReceiverPolicy] = useOnyx(
         `${ONYXKEYS.COLLECTION.POLICY}${chatReport?.invoiceReceiver && 'policyID' in chatReport.invoiceReceiver ? chatReport.invoiceReceiver.policyID : undefined}`,
         {},
@@ -405,6 +408,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
               isChatReportArchived,
               isOffline,
               rules,
+              cardList,
           })
         : [];
 
@@ -489,6 +493,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
             primaryAction={primaryAction}
             applicableSecondaryActions={applicableSecondaryActions}
             dropdownMenuRef={dropdownMenuRef}
+            isDisabled={isDisabled}
             onOptionsMenuHide={handleOptionsMenuHide}
             ref={kycWallRef}
             shouldPutHeaderTextAfterBackButton
@@ -496,7 +501,7 @@ function MoneyReportHeaderSecondaryActionsInner({reportID, primaryAction, isRepo
     );
 }
 
-function MoneyReportHeaderSecondaryActionsPlaceholder({primaryAction}: {primaryAction: ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | ''}) {
+function MoneyReportHeaderSecondaryActionsPlaceholder({primaryAction, isDisabled}: {primaryAction: ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | ''; isDisabled?: boolean}) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
@@ -512,6 +517,7 @@ function MoneyReportHeaderSecondaryActionsPlaceholder({primaryAction}: {primaryA
                 size={CONST.BUTTON_SIZE.MEDIUM}
                 innerStyles={innerStyles}
                 style={shouldTakeRemainingWidth ? styles.w100 : undefined}
+                isDisabled={isDisabled}
                 onPress={() => {}}
             >
                 <Button.Text>{translate('common.more')}</Button.Text>
@@ -521,7 +527,7 @@ function MoneyReportHeaderSecondaryActionsPlaceholder({primaryAction}: {primaryA
     );
 }
 
-function MoneyReportHeaderSecondaryActions({reportID, primaryAction, isReportInSearch, backTo, dropdownMenuRef}: MoneyReportHeaderSecondaryActionsProps) {
+function MoneyReportHeaderSecondaryActions({reportID, primaryAction, isReportInSearch, backTo, dropdownMenuRef, isDisabled}: MoneyReportHeaderSecondaryActionsProps) {
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout, isMediumScreenWidth, isInLandscapeMode} = useResponsiveLayout();
     const shouldTakeRemainingWidth = (shouldUseNarrowLayout || isMediumScreenWidth) && !primaryAction && !isInLandscapeMode;
@@ -533,7 +539,12 @@ function MoneyReportHeaderSecondaryActions({reportID, primaryAction, isReportInS
             anchorAlignment={MORE_MENU_SUBMIT_TO_POPOVER_ANCHOR_ALIGNMENT}
         >
             <NavigationDeferredMount
-                placeholder={<MoneyReportHeaderSecondaryActionsPlaceholder primaryAction={primaryAction} />}
+                placeholder={
+                    <MoneyReportHeaderSecondaryActionsPlaceholder
+                        primaryAction={primaryAction}
+                        isDisabled={isDisabled}
+                    />
+                }
                 // RHPReportScreen remounts this tree on setParams arrow-nav without firing a transition,
                 // so we must not wait for one — see https://github.com/Expensify/App/issues/88931.
                 waitForUpcomingTransition={false}
@@ -544,6 +555,7 @@ function MoneyReportHeaderSecondaryActions({reportID, primaryAction, isReportInS
                     isReportInSearch={isReportInSearch}
                     backTo={backTo}
                     dropdownMenuRef={dropdownMenuRef}
+                    isDisabled={isDisabled}
                 />
             </NavigationDeferredMount>
         </ReportSubmitToPopoverAnchor>
diff --git a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx
index 57beb62e0202..312e84d68a57 100644
--- a/src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx
+++ b/src/components/MoneyReportHeaderActions/MoneyReportHeaderSelectionDropdown.tsx
@@ -26,7 +26,7 @@ import useTransactionsAndViolationsForReport from '@hooks/useTransactionsAndViol
 import useTransactionThreadReport from '@hooks/useTransactionThreadReport';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import {getTotalAmountForIOUReportPreviewButton} from '@libs/MoneyRequestReportUtils';
+import {getTotalAmountForIOUReportPreviewButton, isEveryReportTransactionSelected} from '@libs/MoneyRequestReportUtils';
 import {getSecondaryReportActions} from '@libs/ReportSecondaryActionUtils';
 import {hasUpdatedTotal, shouldShowMarkAsDone} from '@libs/ReportUtils';
 import shouldPopoverUseScrollView from '@libs/shouldPopoverUseScrollView';
@@ -78,6 +78,7 @@ function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportIn
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const [reportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${getNonEmptyStringOnyxID(moneyRequestReport?.reportID)}`);
     const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION);
     const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
@@ -172,6 +173,7 @@ function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportIn
               isChatReportArchived,
               isOffline,
               rules,
+              cardList,
           })
         : [];
 
@@ -198,7 +200,7 @@ function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportIn
     const isPayable = hasPayAction && canIOUBePaid;
 
     const totalAmount = getTotalAmountForIOUReportPreviewButton(moneyRequestReport, policy, CONST.REPORT.PRIMARY_ACTIONS.PAY, nonPendingDeleteTransactions, convertToDisplayString);
-    const allExpensesSelected = selectedTransactionIDs.length > 0 && selectedTransactionIDs.length === nonPendingDeleteTransactions.length;
+    const allExpensesSelected = isEveryReportTransactionSelected(nonPendingDeleteTransactions, selectedTransactionIDs);
 
     // Shared payment hook
     const {handleWorkspaceSelected, onSelectionModePaymentSelect, selectionModeKYCSuccess, paymentSubMenuItems, hasPayInSelectionMode, kycWallRef} = useSelectionModePayment({
@@ -262,7 +264,7 @@ function MoneyReportHeaderSelectionDropdown({reportID, primaryAction, isReportIn
     const submitButtonText = shouldShowMarkAsDoneCopy ? translate('common.markAsDone') : translate('common.submit');
     const approveButtonText = shouldShowMarkAsDoneCopy ? translate('common.markAsDone') : translate('iou.approve');
 
-    const selectionModeReportLevelActions: Array<DropdownOption<string> & Pick<PopoverMenuItem, 'backButtonText' | 'rightIcon' | 'subMenuHeaderText'>> = [
+    const selectionModeReportLevelActions: Array<DropdownOption<string> & Pick<PopoverMenuItem, 'rightIcon'>> = [
         ...(hasSubmitAction && !shouldBlockSubmit
             ? [
                   {
diff --git a/src/components/MoneyReportHeaderActions/index.tsx b/src/components/MoneyReportHeaderActions/index.tsx
index b65bf814f237..dd23a7573b59 100644
--- a/src/components/MoneyReportHeaderActions/index.tsx
+++ b/src/components/MoneyReportHeaderActions/index.tsx
@@ -64,11 +64,14 @@ function MoneyReportHeaderActions({reportID, primaryAction, isReportInSearch, ba
         clearSelectedTransactions(true);
     }, [transactionThreadReportID]); // eslint-disable-line react-hooks/exhaustive-deps
 
+    // Report-level actions must not be usable while expenses are selected, otherwise they get mixed up with the bulk expense actions.
+    const shouldDisableReportActions = hasSelectedTransactions && !isTransactionThread;
+
     const narrowedPrimaryAction = narrowPrimaryAction(primaryAction);
 
-    // A wide layout acts on the selection through the bulk action bar floating over the list instead, which leaves the
-    // report's own actions in the header while a selection is being built up.
-    if (hasSelectedTransactions && !isTransactionThread && shouldUseNarrowLayoutOnWideRHP) {
+    // A wide layout acts on the selection through the bulk action bar floating over the list instead, so the report's own
+    // actions stay in the header but are disabled while a selection is being built up.
+    if (shouldDisableReportActions && shouldUseNarrowLayoutOnWideRHP) {
         return (
             <View style={shouldDisplayNarrowMoreButton ? undefined : [styles.dFlex, styles.w100, styles.ph5, styles.pb3]}>
                 <MoneyReportHeaderSelectionDropdown
@@ -90,6 +93,7 @@ function MoneyReportHeaderActions({reportID, primaryAction, isReportInSearch, ba
                         chatReportID={chatReport?.reportID}
                         primaryAction={primaryAction}
                         onExportModalOpen={() => triggerExportOrConfirm(CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION)}
+                        isDisabled={shouldDisableReportActions}
                     />
                 </View>
             )}
@@ -99,6 +103,7 @@ function MoneyReportHeaderActions({reportID, primaryAction, isReportInSearch, ba
                 isReportInSearch={isReportInSearch}
                 backTo={backTo}
                 dropdownMenuRef={dropdownMenuRef}
+                isDisabled={shouldDisableReportActions}
             />
         </View>
     );
diff --git a/src/components/MoneyReportHeaderActions/types.ts b/src/components/MoneyReportHeaderActions/types.ts
index 57f4c3c02297..a5310078b942 100644
--- a/src/components/MoneyReportHeaderActions/types.ts
+++ b/src/components/MoneyReportHeaderActions/types.ts
@@ -6,7 +6,7 @@ import type {Route} from '@src/ROUTES';
 
 import type {ValueOf} from 'type-fest';
 
-type SecondaryActionEntry = DropdownOption<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> & Pick<PopoverMenuItem, 'backButtonText' | 'rightIcon' | 'subMenuHeaderText'>;
+type SecondaryActionEntry = DropdownOption<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> & Pick<PopoverMenuItem, 'rightIcon'>;
 
 type MoneyReportHeaderActionsProps = {
     reportID: string | undefined;
diff --git a/src/components/MoneyReportHeaderKYCDropdown.tsx b/src/components/MoneyReportHeaderKYCDropdown.tsx
index 42bf33cd382e..697cd19a137c 100644
--- a/src/components/MoneyReportHeaderKYCDropdown.tsx
+++ b/src/components/MoneyReportHeaderKYCDropdown.tsx
@@ -46,6 +46,9 @@ type MoneyReportHeaderKYCDropdownProps = Omit<KYCWallProps, 'children' | 'enable
 
     /** Callback fired when the dropdown menu hides */
     onOptionsMenuHide?: () => void;
+
+    /** Disables the "More" dropdown, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
 function MoneyReportHeaderKYCDropdown({
@@ -60,6 +63,7 @@ function MoneyReportHeaderKYCDropdown({
     shouldShowSuccessStyle,
     dropdownMenuRef,
     onOptionsMenuHide,
+    isDisabled,
     ref,
     headerText = '',
     shouldPutHeaderTextAfterBackButton = false,
@@ -108,6 +112,7 @@ function MoneyReportHeaderKYCDropdown({
                     }}
                     buttonRef={buttonRef}
                     shouldAlwaysShowDropdownMenu
+                    isDisabled={isDisabled}
                     shouldPopoverUseScrollView={shouldPopoverUseScrollView(applicableSecondaryActions)}
                     customText={customText ?? translate('common.more')}
                     options={applicableSecondaryActions}
diff --git a/src/components/MoneyReportHeaderMoreContent.tsx b/src/components/MoneyReportHeaderMoreContent.tsx
index b8a5494fa99e..61be77fbf67e 100644
--- a/src/components/MoneyReportHeaderMoreContent.tsx
+++ b/src/components/MoneyReportHeaderMoreContent.tsx
@@ -1,17 +1,12 @@
-import useMoneyReportHeaderStatusBar from '@hooks/useMoneyReportHeaderStatusBar';
 import useOnyx from '@hooks/useOnyx';
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useResponsiveLayoutOnWideRHP from '@hooks/useResponsiveLayoutOnWideRHP';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportsSplitNavigatorParamList, RightModalNavigatorParamList} from '@libs/Navigation/types';
-import {isGroupPolicy} from '@libs/PolicyUtils';
-import {isInvoiceReport as isInvoiceReportUtil} from '@libs/ReportUtils';
 
 import type CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 
@@ -22,20 +17,37 @@ import {useRoute} from '@react-navigation/native';
 import React from 'react';
 import {View} from 'react-native';
 
+import type {MoneyReportHeaderActionsProps} from './MoneyReportHeaderActions/types';
+
+import MoneyReportHeaderActions from './MoneyReportHeaderActions';
 import MoneyReportHeaderNextStep from './MoneyReportHeaderNextStep';
 import MoneyReportHeaderStatusBarSection from './MoneyReportHeaderStatusBarSection';
 import {useMoneyReportTransactionThread} from './MoneyReportTransactionThreadContext';
-import MoneyRequestReportNavigation from './MoneyRequestReportView/MoneyRequestReportNavigation';
 
 type MoneyReportHeaderMoreContentProps = {
     reportID: string | undefined;
+
+    /** The report's primary action, forwarded to the actions row */
+    primaryAction: MoneyReportHeaderActionsProps['primaryAction'];
+
+    /** Route to navigate back to */
+    backTo: Route | undefined;
+
+    /** Which status bar to render, resolved by the header via useMoneyReportHeaderMoreContentVisibility */
+    statusBarType: ValueOf<typeof CONST.REPORT.STATUS_BAR_TYPE> | undefined;
+
+    /** Whether the next step bar should be rendered, resolved alongside `statusBarType` */
+    shouldShowNextStep: boolean;
+
+    /** Whether the report actions belong at the end of this row. The header renders them itself when this row is empty. */
+    shouldRenderActionsInRow: boolean;
 };
 
 /**
- * Cheap visibility gate — fetches minimal data to decide whether the more-content section
- * should render at all, avoiding expensive hooks in the body when nothing is shown.
+ * Cheap visibility gate that decides whether the more-content section should render at all,
+ * avoiding expensive hooks in the body when nothing is shown.
  */
-function MoneyReportHeaderMoreContent({reportID}: MoneyReportHeaderMoreContentProps) {
+function MoneyReportHeaderMoreContent({reportID, primaryAction, backTo, statusBarType, shouldShowNextStep, shouldRenderActionsInRow}: MoneyReportHeaderMoreContentProps) {
     const route = useRoute<
         | PlatformStackRouteProp<ReportsSplitNavigatorParamList, typeof SCREENS.REPORT>
         | PlatformStackRouteProp<RightModalNavigatorParamList, typeof SCREENS.RIGHT_MODAL.EXPENSE_REPORT>
@@ -45,13 +57,9 @@ function MoneyReportHeaderMoreContent({reportID}: MoneyReportHeaderMoreContentPr
     const isReportInSearch = route.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT || route.name === SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT;
 
     const [moneyRequestReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(moneyRequestReport?.policyID)}`);
-    const {shouldShowStatusBar, statusBarType} = useMoneyReportHeaderStatusBar(reportID, moneyRequestReport?.chatReportID);
-
-    const isInvoiceReport = isInvoiceReportUtil(moneyRequestReport);
-    const shouldShowNextStep = isGroupPolicy(policy) && !isInvoiceReport && !shouldShowStatusBar;
 
-    const shouldShowMoreContent = shouldShowNextStep || !!statusBarType || isReportInSearch;
+    const hasStatusOrNextStep = shouldShowNextStep || !!statusBarType;
+    const shouldShowMoreContent = hasStatusOrNextStep || shouldRenderActionsInRow;
 
     if (!shouldShowMoreContent) {
         return null;
@@ -63,6 +71,9 @@ function MoneyReportHeaderMoreContent({reportID}: MoneyReportHeaderMoreContentPr
             statusBarType={statusBarType}
             isReportInSearch={isReportInSearch}
             shouldShowNextStep={shouldShowNextStep}
+            primaryAction={primaryAction}
+            backTo={backTo}
+            shouldRenderActionsInRow={shouldRenderActionsInRow}
         />
     );
 }
@@ -72,14 +83,21 @@ type MoneyReportHeaderMoreContentBodyProps = {
     statusBarType: ValueOf<typeof CONST.REPORT.STATUS_BAR_TYPE> | undefined;
     isReportInSearch: boolean;
     shouldShowNextStep: boolean;
+    primaryAction: MoneyReportHeaderActionsProps['primaryAction'];
+    backTo: Route | undefined;
+    shouldRenderActionsInRow: boolean;
 };
 
-function MoneyReportHeaderMoreContentBody({moneyRequestReport, statusBarType, isReportInSearch, shouldShowNextStep}: MoneyReportHeaderMoreContentBodyProps) {
+function MoneyReportHeaderMoreContentBody({
+    moneyRequestReport,
+    statusBarType,
+    isReportInSearch,
+    shouldShowNextStep,
+    primaryAction,
+    backTo,
+    shouldRenderActionsInRow,
+}: MoneyReportHeaderMoreContentBodyProps) {
     const styles = useThemeStyles();
-    const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
-    const shouldDisplayNarrowVersion = shouldUseNarrowLayout || isMediumScreenWidth;
-    const {isWideRHPDisplayedOnWideLayout, isSuperWideRHPDisplayedOnWideLayout} = useResponsiveLayoutOnWideRHP();
-    const shouldDisplayNarrowMoreButton = !shouldDisplayNarrowVersion || isWideRHPDisplayedOnWideLayout || isSuperWideRHPDisplayedOnWideLayout;
 
     const reportID = moneyRequestReport?.reportID;
     const {iouTransactionID} = useMoneyReportTransactionThread();
@@ -94,10 +112,12 @@ function MoneyReportHeaderMoreContentBody({moneyRequestReport, statusBarType, is
                     iouTransactionID={iouTransactionID}
                 />
             </View>
-            {isReportInSearch && (
-                <MoneyRequestReportNavigation
+            {shouldRenderActionsInRow && (
+                <MoneyReportHeaderActions
                     reportID={reportID}
-                    shouldDisplayNarrowVersion={!shouldDisplayNarrowMoreButton}
+                    primaryAction={primaryAction}
+                    isReportInSearch={isReportInSearch}
+                    backTo={backTo}
                 />
             )}
         </View>
diff --git a/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx
index 5df69c204bf5..60d0c0df6c0b 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/ApprovePrimaryAction.tsx
@@ -23,9 +23,11 @@ import useConfirmApproval from './useConfirmApproval';
 type ApprovePrimaryActionProps = {
     reportID: string | undefined;
     chatReportID: string | undefined;
+    /** Disables the Approve button, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
-function ApprovePrimaryAction({reportID, chatReportID}: ApprovePrimaryActionProps) {
+function ApprovePrimaryAction({reportID, chatReportID, isDisabled}: ApprovePrimaryActionProps) {
     const {isPaidAnimationRunning, startApprovedAnimation} = usePaymentAnimationsContext();
     const currentUserDetails = useCurrentUserPersonalDetails();
     const currentUserAccountID = currentUserDetails.accountID;
@@ -93,7 +95,7 @@ function ApprovePrimaryAction({reportID, chatReportID}: ApprovePrimaryActionProp
             moneyRequestReport={iouReport}
             transactions={transactions}
             shouldShowPayButton={shouldShowPayButton}
-            isDisabled={isBlockSubmitDueToPreventSelfApproval}
+            isDisabled={!!isBlockSubmitDueToPreventSelfApproval || isDisabled}
         />
     );
 }
diff --git a/src/components/MoneyReportHeaderPrimaryAction/ExportPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/ExportPrimaryAction.tsx
index a4e126caed06..bf3475eba444 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/ExportPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/ExportPrimaryAction.tsx
@@ -20,9 +20,11 @@ import React from 'react';
 type ExportPrimaryActionProps = {
     reportID: string | undefined;
     onExportModalOpen: () => void;
+    /** Disables the Export button, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
-function ExportPrimaryAction({reportID, onExportModalOpen}: ExportPrimaryActionProps) {
+function ExportPrimaryAction({reportID, onExportModalOpen, isDisabled}: ExportPrimaryActionProps) {
     const {translate} = useLocalize();
     const [moneyRequestReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(moneyRequestReport?.policyID)}`);
@@ -36,6 +38,7 @@ function ExportPrimaryAction({reportID, onExportModalOpen}: ExportPrimaryActionP
     return (
         <Button
             variant={CONST.BUTTON_VARIANT.SUCCESS}
+            isDisabled={isDisabled}
             onPress={() => {
                 if (!connectedIntegration || !moneyRequestReport) {
                     return;
diff --git a/src/components/MoneyReportHeaderPrimaryAction/MarkAsCashPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/MarkAsCashPrimaryAction.tsx
index 41b7eb93b16e..e88d836998b2 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/MarkAsCashPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/MarkAsCashPrimaryAction.tsx
@@ -13,7 +13,7 @@ import type {SimpleActionProps} from './types';
 
 import useTransactionThreadData from './useTransactionThreadData';
 
-function MarkAsCashPrimaryAction({reportID, chatReportID}: SimpleActionProps) {
+function MarkAsCashPrimaryAction({reportID, chatReportID, isDisabled}: SimpleActionProps) {
     const {translate} = useLocalize();
     const {requestParentReportAction, iouTransactionID, transactionThreadReport} = useTransactionThreadData(reportID, chatReportID);
     const transactionViolations = useTransactionViolations(iouTransactionID);
@@ -21,6 +21,7 @@ function MarkAsCashPrimaryAction({reportID, chatReportID}: SimpleActionProps) {
     return (
         <Button
             variant={CONST.BUTTON_VARIANT.SUCCESS}
+            isDisabled={isDisabled}
             onPress={() => {
                 if (!requestParentReportAction || !iouTransactionID || !transactionThreadReport?.reportID) {
                     return;
diff --git a/src/components/MoneyReportHeaderPrimaryAction/MarkAsResolvedPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/MarkAsResolvedPrimaryAction.tsx
index 19569f976fce..a4f3386c5899 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/MarkAsResolvedPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/MarkAsResolvedPrimaryAction.tsx
@@ -17,7 +17,7 @@ import type {SimpleActionProps} from './types';
 
 import useTransactionThreadData from './useTransactionThreadData';
 
-function MarkAsResolvedPrimaryAction({reportID, chatReportID}: SimpleActionProps) {
+function MarkAsResolvedPrimaryAction({reportID, chatReportID, isDisabled}: SimpleActionProps) {
     const {translate} = useLocalize();
     const {transaction, transactionThreadReport} = useTransactionThreadData(reportID, chatReportID);
     const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${getNonEmptyStringOnyxID(transaction?.transactionID)}`);
@@ -27,6 +27,7 @@ function MarkAsResolvedPrimaryAction({reportID, chatReportID}: SimpleActionProps
     return (
         <Button
             variant={CONST.BUTTON_VARIANT.SUCCESS}
+            isDisabled={isDisabled}
             onPress={() => {
                 if (!transaction?.transactionID) {
                     return;
diff --git a/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx
index fd28f6b48785..ed9781207320 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/PayPrimaryAction.tsx
@@ -44,9 +44,11 @@ import useTransactionThreadData from './useTransactionThreadData';
 type PayPrimaryActionProps = {
     reportID: string | undefined;
     chatReportID: string | undefined;
+    /** Disables the Pay button, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
-function PayPrimaryAction({reportID, chatReportID}: PayPrimaryActionProps) {
+function PayPrimaryAction({reportID, chatReportID, isDisabled}: PayPrimaryActionProps) {
     const {isBetaEnabled} = usePermissions();
     const {isPaidAnimationRunning, isApprovedAnimationRunning, stopAnimation, startAnimation} = usePaymentAnimationsContext();
     const {isOffline} = useNetwork();
@@ -217,7 +219,7 @@ function PayPrimaryAction({reportID, chatReportID}: PayPrimaryActionProps) {
             onPress={confirmPayment}
             enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
             shouldHidePaymentOptions={!shouldShowPayButton}
-            isDisabled={isOffline && !canAllowSettlement}
+            isDisabled={(isOffline && !canAllowSettlement) || isDisabled}
             isLoading={!isOffline && !canAllowSettlement}
         />
     );
diff --git a/src/components/MoneyReportHeaderPrimaryAction/RemoveHoldPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/RemoveHoldPrimaryAction.tsx
index fa9e8a7517d4..cdb7b9d141be 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/RemoveHoldPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/RemoveHoldPrimaryAction.tsx
@@ -22,7 +22,7 @@ import type {SimpleActionProps} from './types';
 
 import useTransactionThreadData from './useTransactionThreadData';
 
-function RemoveHoldPrimaryAction({reportID, chatReportID}: SimpleActionProps) {
+function RemoveHoldPrimaryAction({reportID, chatReportID, isDisabled}: SimpleActionProps) {
     const {translate} = useLocalize();
     const {isDelegateAccessRestricted} = useDelegateNoAccessState();
     const {showDelegateNoAccessModal} = useDelegateNoAccessActions();
@@ -41,6 +41,7 @@ function RemoveHoldPrimaryAction({reportID, chatReportID}: SimpleActionProps) {
     return (
         <Button
             variant={CONST.BUTTON_VARIANT.SUCCESS}
+            isDisabled={isDisabled}
             onPress={() => {
                 if (isDelegateAccessRestricted) {
                     showDelegateNoAccessModal();
diff --git a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx
index 0aeb5c260a71..2fd52bebdaad 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx
@@ -26,7 +26,7 @@ import type {SimpleActionProps} from './types';
 
 import useTransactionThreadData from './useTransactionThreadData';
 
-function ReviewDuplicatesPrimaryAction({reportID, chatReportID}: SimpleActionProps) {
+function ReviewDuplicatesPrimaryAction({reportID, chatReportID, isDisabled}: SimpleActionProps) {
     const {translate} = useLocalize();
     const {accountID, email} = useCurrentUserPersonalDetails();
     const personalDetails = usePersonalDetails();
@@ -61,6 +61,7 @@ function ReviewDuplicatesPrimaryAction({reportID, chatReportID}: SimpleActionPro
     return (
         <Button
             variant={CONST.BUTTON_VARIANT.SUCCESS}
+            isDisabled={isDisabled}
             onPress={() => {
                 const threadID =
                     transactionThreadReportID ??
diff --git a/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx
index e59f094995fd..405d131d7508 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/SubmitPrimaryAction.tsx
@@ -50,11 +50,13 @@ const ANCHOR_ALIGNMENT = {
 
 type SubmitPrimaryActionProps = {
     reportID: string | undefined;
+    /** Disables the Submit button, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
 type SubmissionMethod = ValueOf<typeof CONST.REPORT.SUBMISSION_METHOD>;
 
-function SubmitPrimaryAction({reportID}: SubmitPrimaryActionProps) {
+function SubmitPrimaryAction({reportID, isDisabled}: SubmitPrimaryActionProps) {
     const {startSubmittingAnimation} = usePaymentAnimationsContext();
 
     return (
@@ -63,12 +65,15 @@ function SubmitPrimaryAction({reportID}: SubmitPrimaryActionProps) {
             onSubmitSuccess={startSubmittingAnimation}
             anchorAlignment={ANCHOR_ALIGNMENT}
         >
-            <SubmitPrimaryActionContent reportID={reportID} />
+            <SubmitPrimaryActionContent
+                reportID={reportID}
+                isDisabled={isDisabled}
+            />
         </ReportSubmitToPopoverAnchor>
     );
 }
 
-function SubmitPrimaryActionContent({reportID}: SubmitPrimaryActionProps) {
+function SubmitPrimaryActionContent({reportID, isDisabled}: SubmitPrimaryActionProps) {
     const {isSubmittingAnimationRunning, stopAnimation, startSubmittingAnimation} = usePaymentAnimationsContext();
     const {translate} = useLocalize();
     const {getCurrencyDecimals} = useCurrencyListActions();
@@ -251,7 +256,7 @@ function SubmitPrimaryActionContent({reportID}: SubmitPrimaryActionProps) {
                 variant={CONST.BUTTON_VARIANT.SUCCESS}
                 shouldAlwaysShowDropdownMenu
                 pressOnEnter
-                isDisabled={shouldBlockSubmit}
+                isDisabled={shouldBlockSubmit || isDisabled}
                 options={submitOptions}
                 defaultSelectedIndex={defaultSelectedIndex}
                 onPress={(event, value) => {
@@ -270,7 +275,7 @@ function SubmitPrimaryActionContent({reportID}: SubmitPrimaryActionProps) {
             onPress={() => handleSubmit()}
             isSubmittingAnimationRunning={isSubmittingAnimationRunning}
             onAnimationFinish={stopAnimation}
-            isDisabled={shouldBlockSubmit}
+            isDisabled={shouldBlockSubmit || isDisabled}
             isDEWSubmission={isDEWSubmission}
             reportID={reportID}
         />
diff --git a/src/components/MoneyReportHeaderPrimaryAction/index.tsx b/src/components/MoneyReportHeaderPrimaryAction/index.tsx
index 6ed447668d5f..50b672c2d7fe 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/index.tsx
+++ b/src/components/MoneyReportHeaderPrimaryAction/index.tsx
@@ -13,13 +13,18 @@ import RemoveHoldPrimaryAction from './RemoveHoldPrimaryAction';
 import ReviewDuplicatesPrimaryAction from './ReviewDuplicatesPrimaryAction';
 import SubmitPrimaryAction from './SubmitPrimaryAction';
 
-function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction, onExportModalOpen}: MoneyReportHeaderPrimaryActionProps) {
+function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction, onExportModalOpen, isDisabled}: MoneyReportHeaderPrimaryActionProps) {
     if (!primaryAction) {
         return null;
     }
 
     if (primaryAction === CONST.REPORT.PRIMARY_ACTIONS.SUBMIT) {
-        return <SubmitPrimaryAction reportID={reportID} />;
+        return (
+            <SubmitPrimaryAction
+                reportID={reportID}
+                isDisabled={isDisabled}
+            />
+        );
     }
 
     if (primaryAction === CONST.REPORT.PRIMARY_ACTIONS.APPROVE) {
@@ -27,6 +32,7 @@ function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction,
             <ApprovePrimaryAction
                 reportID={reportID}
                 chatReportID={chatReportID}
+                isDisabled={isDisabled}
             />
         );
     }
@@ -36,6 +42,7 @@ function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction,
             <PayPrimaryAction
                 reportID={reportID}
                 chatReportID={chatReportID}
+                isDisabled={isDisabled}
             />
         );
     }
@@ -45,6 +52,7 @@ function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction,
             <ExportPrimaryAction
                 reportID={reportID}
                 onExportModalOpen={onExportModalOpen}
+                isDisabled={isDisabled}
             />
         );
     }
@@ -54,6 +62,7 @@ function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction,
             <RemoveHoldPrimaryAction
                 reportID={reportID}
                 chatReportID={chatReportID}
+                isDisabled={isDisabled}
             />
         );
     }
@@ -63,6 +72,7 @@ function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction,
             <MarkAsCashPrimaryAction
                 reportID={reportID}
                 chatReportID={chatReportID}
+                isDisabled={isDisabled}
             />
         );
     }
@@ -72,6 +82,7 @@ function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction,
             <MarkAsResolvedPrimaryAction
                 reportID={reportID}
                 chatReportID={chatReportID}
+                isDisabled={isDisabled}
             />
         );
     }
@@ -81,6 +92,7 @@ function MoneyReportHeaderPrimaryAction({reportID, chatReportID, primaryAction,
             <ReviewDuplicatesPrimaryAction
                 reportID={reportID}
                 chatReportID={chatReportID}
+                isDisabled={isDisabled}
             />
         );
     }
diff --git a/src/components/MoneyReportHeaderPrimaryAction/types.ts b/src/components/MoneyReportHeaderPrimaryAction/types.ts
index eb383fb72708..3f05a5b98730 100644
--- a/src/components/MoneyReportHeaderPrimaryAction/types.ts
+++ b/src/components/MoneyReportHeaderPrimaryAction/types.ts
@@ -7,11 +7,17 @@ type MoneyReportHeaderPrimaryActionProps = {
     chatReportID: string | undefined;
     primaryAction: ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | ValueOf<typeof CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS> | '';
     onExportModalOpen: () => void;
+
+    /** Whether the primary action is disabled, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
 type SimpleActionProps = {
     reportID: string | undefined;
     chatReportID: string | undefined;
+
+    /** Whether the primary action is disabled, e.g. while expenses are selected */
+    isDisabled?: boolean;
 };
 
 export type {MoneyReportHeaderPrimaryActionProps, SimpleActionProps};
diff --git a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationAmount.ts b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationAmount.ts
index 9f859306112a..7d9e594eddff 100644
--- a/src/components/MoneyRequestConfirmationList/hooks/useConfirmationAmount.ts
+++ b/src/components/MoneyRequestConfirmationList/hooks/useConfirmationAmount.ts
@@ -3,7 +3,7 @@ import useLocalize from '@hooks/useLocalize';
 
 import {computePerDiemExpenseAmount} from '@libs/actions/IOU/PerDiem';
 import type {getAttendees} from '@libs/TransactionUtils';
-import {isScanning, isScanRequest as isScanRequestUtil} from '@libs/TransactionUtils';
+import {isFailedScanAmountPlaceholder, isScanning, isScanRequest as isScanRequestUtil} from '@libs/TransactionUtils';
 
 import type * as OnyxTypes from '@src/types/onyx';
 
@@ -90,6 +90,8 @@ function useConfirmationAmount({
         formattedAmount = '';
     } else if (isScanning(transaction)) {
         formattedAmount = translate('iou.receiptStatusTitle');
+    } else if (isFailedScanAmountPlaceholder(transaction)) {
+        formattedAmount = '';
     }
 
     const attendeeCount = iouAttendees?.length && iouAttendees.length > 0 ? iouAttendees.length : 1;
diff --git a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx
index 1a4d7352ecd9..e0eb50f74320 100644
--- a/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/AmountField.tsx
@@ -104,12 +104,15 @@ function AmountField({
     // blank) can't show a phantom required error under a field that is deliberately empty.
     const shouldShowAmountRequiredError = formError === 'common.error.fieldRequired' && isConfirmationAmountMissing(transactionSlice, canEnterScanFieldsManually);
     const shouldShowAmountInvalidError = formError === 'common.error.invalidAmount';
+    const shouldShowAmountMissingError = shouldDisplayFieldError && amountIsMissing;
 
     let amountFieldErrorText = '';
     if (shouldShowAmountInvalidError) {
         amountFieldErrorText = translate('common.error.invalidAmount');
     } else if (shouldShowAmountRequiredError) {
         amountFieldErrorText = translate('common.error.fieldRequired');
+    } else if (shouldShowAmountMissingError) {
+        amountFieldErrorText = translate('common.error.enterAmount');
     }
 
     const effectiveCurrency = isDistanceRequest ? distanceRateCurrency : (iouCurrencyCode ?? CONST.CURRENCY.USD);
@@ -119,7 +122,11 @@ function AmountField({
     // real value. This avoids showing "$0.00" as a pre-filled default. The Scan flow behaves the same way: its amount
     // belongs to the receipt, so the field is empty until the user chooses to enter one instead of waiting for
     // SmartScan. Per diem, distance and time flows populate the amount programmatically and never set isAmountSet.
-    const shouldShowEmptyAmount = !transactionSlice?.isAmountSet && (transactionSlice?.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL || canEnterScanFieldsManually);
+    // A failed-scan placeholder amount is blanked here too, matching every other amount display, so this inline
+    // input doesn't retain the original "$0.00 with no error" bug.
+    const shouldShowEmptyAmount =
+        (!transactionSlice?.isAmountSet && (transactionSlice?.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL || canEnterScanFieldsManually)) ||
+        !!transactionSlice?.isFailedScanAmountPlaceholder;
     const transactionAmount = shouldShowEmptyAmount ? '' : convertToFrontendAmountAsString(amount, decimals);
     // The hint says SmartScan will fill this in. It goes once the user takes the field over, by focusing it or by
     // entering any of the three fields.
@@ -286,7 +293,7 @@ function AmountField({
         if (isInlineAmountInvalid && shouldDisplayFieldError) {
             setFormError('common.error.invalidAmount');
         } else if (!isInlineAmountInvalid) {
-            clearFormErrors(['common.error.invalidAmount']);
+            clearFormErrors(isEditingSplitBill && parsedAmount !== 0 ? ['common.error.invalidAmount', 'iou.error.invalidAmount'] : ['common.error.invalidAmount']);
         }
 
         buildAndSaveSplitShares(parsedAmount, effectiveCurrency);
diff --git a/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx b/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
index 2be6932dc2fc..4c369b8a9eec 100644
--- a/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/CategoryField.tsx
@@ -1,16 +1,22 @@
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import usePermissions from '@hooks/usePermissions';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getDecodedLeafCategoryName} from '@libs/CategoryUtils';
+import {getDecodedLeafCategoryName, isCategoryMissing} from '@libs/CategoryUtils';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
+import {hasEnabledOptions} from '@libs/OptionsListUtils';
 
 import CONST from '@src/CONST';
 import type {IOUAction, IOUType} from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 
@@ -18,11 +24,14 @@ import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
 
-import ExpenseFieldRow from './ExpenseFieldRow';
+import CategoryFieldDropdown from './CategoryFieldDropdown';
+import ExpenseFieldDropdown from './ExpenseFieldDropdown';
 import {useExpenseFormLayout} from './ExpenseFormLayoutContext';
 import {categoryStateSelector} from './selectors';
 import useTransactionSelector from './useTransactionSelector';
 
+const hasEnabledCategoriesSelector = (policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>) => hasEnabledOptions(Object.values(policyCategories ?? {}));
+
 type CategoryFieldProps = {
     isCategoryRequired: boolean;
     didConfirm: boolean;
@@ -53,19 +62,26 @@ function CategoryField({
     shouldSelectPolicy,
 }: CategoryFieldProps) {
     const {shouldUseDropdownRows} = useExpenseFormLayout();
+    const {isEditingSplitBill} = useConfirmationFields();
+    const {isBetaEnabled} = usePermissions();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['Sparkles']);
 
     const categoryState = useTransactionSelector(transactionID, categoryStateSelector);
+    const [hasEnabledCategories = false] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(policy?.id)}`, {selector: hasEnabledCategoriesSelector});
 
     const shouldDisplayCategoryError = formError === 'violations.categoryOutOfPolicy';
     const iouCategory = categoryState?.category ?? '';
     const willAutoFill = categoryState?.willAutoFill ?? false;
     const isAutoFillFromReceipt = categoryState?.isAutoFillFromReceipt ?? false;
     const decodedCategoryName = getDecodedLeafCategoryName(iouCategory);
+    // The list marks and clears by the stored category name, not by the leaf name the row shows.
+    const selectedCategory = isCategoryMissing(iouCategory) ? '' : iouCategory;
 
-    const shouldPromiseAutomaticCategory = willAutoFill && (isAutoFillFromReceipt || !isCategoryRequired);
+    // The workspace setting defaults to on. Turning it off means nothing will pick a category, so the row must not promise one.
+    const isAutoCategorizationEnabled = policy?.autoCategorizeNewExpenses !== false;
+    const shouldPromiseAutomaticCategory = isAutoCategorizationEnabled && willAutoFill && (isAutoFillFromReceipt || !isCategoryRequired);
 
     const getCategoryRightLabelIcon = () => (shouldPromiseAutomaticCategory ? icons.Sparkles : undefined);
     const getCategoryRightLabel = () => {
@@ -133,9 +149,14 @@ function CategoryField({
         }
     };
 
+    const canSaveFromThisForm = action !== CONST.IOU.ACTION.EDIT || isEditingSplitBill;
+    const canUseAnchoredFieldDropdowns = isBetaEnabled(CONST.BETAS.ANCHORED_FIELD_DROPDOWNS);
+    const shouldOpenInDropdown =
+        canUseAnchoredFieldDropdowns && !!transactionID && !!policy && !shouldNavigateToUpgradePath && !shouldSelectPolicy && hasEnabledCategories && canSaveFromThisForm;
+
     if (shouldUseDropdownRows) {
         return (
-            <ExpenseFieldRow
+            <ExpenseFieldDropdown
                 name={translate('common.category')}
                 value={decodedCategoryName}
                 numberOfLinesValue={2}
@@ -144,9 +165,20 @@ function CategoryField({
                 // On a scan, `Automatic` describes the category Concierge picked, so it has to outlive the field
                 // being filled in. On a manual expense it only promises a category for a field that is still
                 // empty, so there it goes the moment the field holds one, the same way `Required` does.
-                shouldKeepRightLabelWhenFilled={willAutoFill && isAutoFillFromReceipt}
+                shouldKeepRightLabelWhenFilled={shouldPromiseAutomaticCategory && isAutoFillFromReceipt}
                 errorText={shouldDisplayCategoryError ? translate(formError as TranslationPaths) : ''}
                 onPress={openCategoryPage}
+                shouldOpenInDropdown={shouldOpenInDropdown && !isReadOnly && !didConfirm}
+                renderDropdown={(dropdownProps) =>
+                    !!transactionID && (
+                        <CategoryFieldDropdown
+                            {...dropdownProps}
+                            transactionID={transactionID}
+                            policy={policy}
+                            selectedCategory={selectedCategory}
+                        />
+                    )
+                }
                 isDisabled={didConfirm}
                 isInteractive={!isReadOnly}
                 sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.CATEGORY_FIELD}
diff --git a/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx b/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
new file mode 100644
index 000000000000..ab74261457b9
--- /dev/null
+++ b/src/components/MoneyRequestConfirmationList/sections/CategoryFieldDropdown.tsx
@@ -0,0 +1,71 @@
+import CategoryPickerModal from '@components/CategoryPicker/CategoryPickerModal';
+import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
+import type {ListItem} from '@components/SelectionList/types';
+
+import useOnyx from '@hooks/useOnyx';
+import useUpdateTransactionCategory from '@hooks/useUpdateTransactionCategory';
+
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import React from 'react';
+
+import type {ExpenseFieldDropdownRenderProps} from './ExpenseFieldDropdown';
+
+type CategoryFieldDropdownProps = ExpenseFieldDropdownRenderProps & {
+    /** ID of the expense the picked category is written to */
+    transactionID: string;
+
+    /** Policy the categories belong to */
+    policy: OnyxEntry<OnyxTypes.Policy>;
+
+    /** Category the expense already holds, so the list can mark it */
+    selectedCategory: string;
+};
+
+/**
+ * The category list, in the container anchored to the expense form's category row. Mounted only once the row is
+ * opened, keeping its Onyx subscriptions off the form's first render, and saves through the same hook the
+ * full-page selector uses so both leave the expense in the same state.
+ */
+function CategoryFieldDropdown({transactionID, policy, selectedCategory, onClose, ...popoverProps}: CategoryFieldDropdownProps) {
+    const {reportID, isEditingSplitBill, action} = useConfirmationFields();
+
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
+    const [draftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(policy?.id)}`);
+
+    const {updateCategory} = useUpdateTransactionCategory({
+        transactionID,
+        transaction: draftTransaction ?? transaction,
+        report,
+        policy,
+        policyCategories,
+        isEditing: action === CONST.IOU.ACTION.EDIT,
+        isEditingSplit: isEditingSplitBill,
+    });
+
+    const handleSelected = (item: ListItem) => {
+        // `CategoryPickerModal` hands back an empty item when the selected category is tapped again, clearing it.
+        updateCategory(item.searchText ?? '');
+    };
+
+    return (
+        <CategoryPickerModal
+            {...popoverProps}
+            onClose={onClose}
+            shouldFitContentHeight
+            policyID={policy?.id}
+            selectedCategory={selectedCategory}
+            onSelected={handleSelected}
+        />
+    );
+}
+
+export default CategoryFieldDropdown;
diff --git a/src/components/MoneyRequestConfirmationList/sections/DateField.tsx b/src/components/MoneyRequestConfirmationList/sections/DateField.tsx
index ac6eda9e88dd..86bd69fc6a79 100644
--- a/src/components/MoneyRequestConfirmationList/sections/DateField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/DateField.tsx
@@ -1,5 +1,6 @@
 import DatePicker from '@components/DatePicker';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
@@ -181,19 +182,23 @@ function DateField({shouldDisplayFieldError, didConfirm, isReadOnly, formError,
     }
 
     return (
-        <MenuItemWithTopDescription
-            shouldShowRightIcon={!isReadOnly}
-            title={readOnlyDate}
-            description={translate('common.date')}
-            style={[styles.moneyRequestMenuItem]}
-            titleStyle={styles.flex1}
-            onPress={openDatePage}
-            disabled={didConfirm}
-            interactive={!isReadOnly}
-            brickRoadIndicator={shouldDisplayFieldError && createdMissing ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-            errorText={dateErrorText}
+        <MenuItem.Root
+            isDisabled={didConfirm}
             sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.DATE_FIELD}
-        />
+        >
+            <MenuItemField.Row
+                name={translate('common.date')}
+                value={readOnlyDate}
+            >
+                {shouldDisplayFieldError && createdMissing && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+            </MenuItemField.Row>
+            {!!dateErrorText && (
+                <MenuItem.HelpText
+                    isError
+                    message={dateErrorText}
+                />
+            )}
+        </MenuItem.Root>
     );
 }
 
diff --git a/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx b/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx
index 0f257e7f4e34..c5dfd6718207 100644
--- a/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/DescriptionField.tsx
@@ -1,5 +1,6 @@
 import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 import {ShowContextMenuActionsContext, ShowContextMenuStateContext} from '@components/ShowContextMenuContext';
 import TextInput from '@components/TextInput';
@@ -119,21 +120,14 @@ function DescriptionField({isDescriptionRequired, policy}: DescriptionFieldProps
             sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.DESCRIPTION_FIELD}
         />
     ) : (
-        <MenuItemWithTopDescription
-            shouldShowRightIcon={!isReadOnly}
-            shouldParseTitle
-            excludedMarkdownRules={!policy ? ['reportMentions'] : []}
-            title={iouComment}
-            description={translate('common.description')}
-            onPress={openDescriptionPage}
-            style={[styles.moneyRequestMenuItem]}
-            titleStyle={styles.flex1}
-            disabled={didConfirm}
-            interactive={!isReadOnly}
-            numberOfLinesTitle={2}
-            rightLabel={isDescriptionRequired ? translate('common.required') : ''}
+        <MenuItemFieldHTML
+            name={translate('common.description')}
+            value={iouComment ? Parser.replace(iouComment, {disabledRules: !policy ? ['reportMentions'] : []}) : undefined}
+            isDisabled={didConfirm}
             sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.DESCRIPTION_FIELD}
-        />
+        >
+            {!iouComment && isDescriptionRequired && <MenuItem.RightLabel>{translate('common.required')}</MenuItem.RightLabel>}
+        </MenuItemFieldHTML>
     );
 
     return (
diff --git a/src/components/MoneyRequestConfirmationList/sections/DistanceField.tsx b/src/components/MoneyRequestConfirmationList/sections/DistanceField.tsx
index cae3e272d0ba..87f4c8154a7f 100644
--- a/src/components/MoneyRequestConfirmationList/sections/DistanceField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/DistanceField.tsx
@@ -1,13 +1,15 @@
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 
 import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
 
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import CONST from '@src/CONST';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {Unit} from '@src/types/onyx/Policy';
@@ -27,7 +29,6 @@ type DistanceFieldProps = {
 
 function DistanceField({hasRoute, distance, unit, customUnit}: DistanceFieldProps) {
     const {shouldUseDropdownRows} = useExpenseFormLayout();
-    const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {action, iouType, transactionID, reportID, reportActionID, isReadOnly, didConfirm, isManualDistanceRequest, isOdometerDistanceRequest, isGPSDistanceRequest} =
         useConfirmationFields();
@@ -73,18 +74,19 @@ function DistanceField({hasRoute, distance, unit, customUnit}: DistanceFieldProp
     }
 
     return (
-        <MenuItemWithTopDescription
-            shouldShowRightIcon={isDistanceInteractive}
-            title={displayTitle}
-            description={distanceToDisplayDescription}
-            hintText={distanceToDisplayHintText}
-            style={[styles.moneyRequestMenuItem]}
-            titleStyle={styles.flex1}
-            onPress={openDistancePage}
-            disabled={didConfirm}
-            interactive={isDistanceInteractive}
+        <MenuItem.Root
+            onPress={isDistanceInteractive ? callFunctionIfActionIsAllowed(openDistancePage) : undefined}
+            isDisabled={didConfirm}
             sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.DISTANCE_FIELD}
-        />
+        >
+            <MenuItemField.Row
+                name={distanceToDisplayDescription}
+                value={displayTitle}
+            >
+                {isDistanceInteractive && <MenuItem.Chevron />}
+            </MenuItemField.Row>
+            {!!distanceToDisplayHintText && <MenuItem.HelpText message={distanceToDisplayHintText} />}
+        </MenuItem.Root>
     );
 }
 
diff --git a/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown.tsx b/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown.tsx
new file mode 100644
index 000000000000..702258694444
--- /dev/null
+++ b/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown.tsx
@@ -0,0 +1,183 @@
+import useContentHeaderHeight from '@hooks/useContentHeaderHeight';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+
+import getSelectionListPopoverContentHeight from '@libs/getSelectionListPopoverContentHeight';
+
+import CONST from '@src/CONST';
+import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
+
+import type {ComponentRef, ReactNode} from 'react';
+import type {View} from 'react-native';
+
+import React, {useRef, useState} from 'react';
+
+import type {ExpenseFieldRowProps} from './ExpenseFieldRow';
+
+import ExpenseFieldRow from './ExpenseFieldRow';
+
+/** Gap between the row and the container it opens */
+const CONTAINER_GAP = 4;
+
+/** How many options the container shows before the list starts scrolling */
+const MAX_VISIBLE_OPTIONS = 4;
+
+/** Tallest the container may be. One option shorter than `CONST.POPOVER_DROPDOWN_MAX_HEIGHT`, since a row in an RHP shares its panel. */
+const MAX_CONTAINER_HEIGHT = getSelectionListPopoverContentHeight({optionCount: MAX_VISIBLE_OPTIONS});
+
+/** The container's border, which sits outside the height it is given */
+const CONTAINER_BORDER = 2;
+
+/** Least room a side needs to be worth opening into. Below this the row falls back to its full-page selector. */
+const MIN_USABLE_HEIGHT = getSelectionListPopoverContentHeight({optionCount: 1});
+
+const ANCHOR_ALIGNMENT_BELOW: AnchorAlignment = {
+    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+};
+
+const ANCHOR_ALIGNMENT_ABOVE: AnchorAlignment = {
+    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+};
+
+/** Where and how big the container is, measured off the row each time it opens */
+type DropdownLayout = {
+    horizontal: number;
+    vertical: number;
+    width: number;
+    height: number;
+    shouldOpenAbove: boolean;
+};
+
+type ExpenseFieldDropdownRenderProps = {
+    /** Whether the container is open */
+    isVisible: boolean;
+
+    /** Dismisses the container */
+    onClose: () => void;
+
+    /** Where the container is pinned, in window coordinates */
+    anchorPosition: {horizontal: number; vertical: number};
+
+    /** Which corner of the container `anchorPosition` names */
+    anchorAlignment: AnchorAlignment;
+
+    /** False once the container opens above the row, where it is positioned from its bottom edge instead */
+    shouldMeasureAnchorPositionFromTop: boolean;
+
+    /** Always false: the side is chosen here, and letting the pop-over flip again lands it on the row. */
+    shouldSwitchPositionIfOverflow: false;
+
+    /** Width of the row, which the container matches on a wide layout */
+    popoverWidth: number;
+
+    /** Tallest the container may be without running off the viewport */
+    popoverHeight: number;
+};
+
+type ExpenseFieldDropdownProps = Omit<ExpenseFieldRowProps, 'onPress' | 'anchorRef' | 'isExpanded'> & {
+    /** Renders the field's list. Only called once the row has been pressed, so an untouched field costs the form nothing. */
+    renderDropdown: (props: ExpenseFieldDropdownRenderProps) => ReactNode;
+
+    /** Whether the list opens in the container. A field that can't answer in place falls back to `onPress`. */
+    shouldOpenInDropdown: boolean;
+
+    /** Opens the field's full-page selector, for every case `shouldOpenInDropdown` rules out */
+    onPress: () => void;
+};
+
+/**
+ * An expense form field whose list opens in a container anchored to the row, rather than on its own page.
+ *
+ * `PopoverWithMeasuredContent` makes it a pop-over on a wide layout and a bottom sheet on a narrow one. The
+ * pop-over matches the row's width and opens below it, or above when there isn't room, capped so it is never
+ * clipped. Knows nothing about any particular field: each passes its own list in through `renderDropdown`.
+ */
+function ExpenseFieldDropdown({renderDropdown, shouldOpenInDropdown, onPress, ...rowProps}: ExpenseFieldDropdownProps) {
+    const {windowHeight} = useWindowDimensions();
+    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth -- must match PopoverWithMeasuredContent's dock decision, which is on isSmallScreenWidth
+    const {isSmallScreenWidth} = useResponsiveLayout();
+    const {contentHeaderHeight} = useContentHeaderHeight();
+    const {top: safeAreaTop} = useSafeAreaInsets();
+    const anchorRef = useRef<ComponentRef<typeof View> | null>(null);
+    const [isVisible, setIsVisible] = useState(false);
+    const [hasEverOpened, setHasEverOpened] = useState(false);
+    const [layout, setLayout] = useState<DropdownLayout>({
+        horizontal: 0,
+        vertical: 0,
+        width: CONST.POPOVER_DROPDOWN_WIDTH,
+        height: CONST.POPOVER_DROPDOWN_MAX_HEIGHT,
+        shouldOpenAbove: false,
+    });
+
+    const closeDropdown = () => setIsVisible(false);
+
+    const openDropdown = () => {
+        if (isSmallScreenWidth) {
+            setHasEverOpened(true);
+            setIsVisible(true);
+            return;
+        }
+
+        anchorRef.current?.measureInWindow((x, y, width, height) => {
+            const spaceBelow = windowHeight - (y + height + CONTAINER_GAP);
+            const spaceAbove = y - CONTAINER_GAP - (safeAreaTop + contentHeaderHeight);
+            const shouldOpenAbove = spaceBelow < MAX_CONTAINER_HEIGHT && spaceAbove > spaceBelow;
+            const availableHeight = (shouldOpenAbove ? spaceAbove : spaceBelow) - CONTAINER_BORDER;
+
+            if (availableHeight < MIN_USABLE_HEIGHT) {
+                onPress();
+                return;
+            }
+
+            setLayout({
+                horizontal: x,
+                vertical: shouldOpenAbove ? y - CONTAINER_GAP : y + height + CONTAINER_GAP,
+                width,
+                height: Math.min(MAX_CONTAINER_HEIGHT, availableHeight),
+                shouldOpenAbove,
+            });
+            setHasEverOpened(true);
+            setIsVisible(true);
+        });
+    };
+
+    const handlePress = () => {
+        if (!shouldOpenInDropdown) {
+            onPress();
+            return;
+        }
+        if (isVisible) {
+            closeDropdown();
+            return;
+        }
+        openDropdown();
+    };
+
+    return (
+        <>
+            <ExpenseFieldRow
+                {...rowProps}
+                anchorRef={shouldOpenInDropdown ? anchorRef : undefined}
+                isExpanded={shouldOpenInDropdown ? isVisible : undefined}
+                onPress={handlePress}
+            />
+            {hasEverOpened &&
+                renderDropdown({
+                    isVisible,
+                    onClose: closeDropdown,
+                    anchorPosition: {horizontal: layout.horizontal, vertical: layout.vertical},
+                    anchorAlignment: layout.shouldOpenAbove ? ANCHOR_ALIGNMENT_ABOVE : ANCHOR_ALIGNMENT_BELOW,
+                    shouldMeasureAnchorPositionFromTop: !layout.shouldOpenAbove,
+                    shouldSwitchPositionIfOverflow: false,
+                    popoverWidth: isSmallScreenWidth ? CONST.POPOVER_DROPDOWN_WIDTH : layout.width,
+                    popoverHeight: isSmallScreenWidth ? CONST.POPOVER_DROPDOWN_MAX_HEIGHT : layout.height,
+                })}
+        </>
+    );
+}
+
+export default ExpenseFieldDropdown;
+export type {ExpenseFieldDropdownRenderProps};
diff --git a/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldRow.tsx b/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldRow.tsx
index 4280f983d1e4..fb7e6129ccf0 100644
--- a/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldRow.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/ExpenseFieldRow.tsx
@@ -11,7 +11,7 @@ import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
 import type IconAsset from '@src/types/utils/IconAsset';
 
-import type {ReactNode} from 'react';
+import type {ComponentRef, ReactNode, RefObject} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import type {AnimatedStyle} from 'react-native-reanimated';
 
@@ -56,9 +56,15 @@ type ExpenseFieldRowProps = {
     /** Explanatory message rendered below the row, e.g. the commuter mileage a distance row has already deducted */
     hintText?: string;
 
-    /** Opens the field's selector. The caret is cosmetic: the row opens the same page the push row opened */
+    /** Opens the field's list, either in the container anchored to this row or on its own page */
     onPress: () => void;
 
+    /** Measured to place the container a dropdown field opens. Sits on the bordered box, not the outer wrapper, so the container lines up with the border. */
+    anchorRef?: RefObject<ComponentRef<typeof View> | null>;
+
+    /** Whether the row's list is open. Reported to assistive technology. */
+    isExpanded?: boolean;
+
     /** Whether the row is pressed-through but visibly inert (e.g. while the expense is being confirmed) */
     isDisabled?: boolean;
 
@@ -100,6 +106,8 @@ function ExpenseFieldRow({
     errorText = '',
     hintText = '',
     onPress,
+    anchorRef,
+    isExpanded,
     isDisabled = false,
     isInteractive = true,
     backgroundStyle,
@@ -168,24 +176,29 @@ function ExpenseFieldRow({
         </>
     );
 
+    const borderedBox = (
+        <Animated.View style={[styles.moneyRequestFieldRowFill, backgroundStyle]}>
+            <MenuItem.Root
+                style={[styles.moneyRequestFieldRow, !isInteractive && styles.moneyRequestFieldRowDisabled, !!errorText && styles.borderColorDanger]}
+                // A locked field has nothing to open, so it is handed no press handler at all: `MenuItem.Root`
+                // reads that as a non-interactive row and drops the button role and the focus stop with it.
+                // Otherwise the press is guarded like every other `MenuItem` preset, so an anonymous user gets
+                // the sign-in prompt rather than the field's selector.
+                onPress={isInteractive ? callFunctionIfActionIsAllowed(onPress) : undefined}
+                isDisabled={isDisabled}
+                accessibilityLabel={accessibilityLabel}
+                accessibilityState={isExpanded === undefined ? undefined : {expanded: isExpanded}}
+                sentryLabel={sentryLabel}
+                testID={testID}
+            >
+                {row}
+            </MenuItem.Root>
+        </Animated.View>
+    );
+
     return (
         <View style={[styles.mh4, styles.mv2]}>
-            <Animated.View style={[styles.moneyRequestFieldRowFill, backgroundStyle]}>
-                <MenuItem.Root
-                    style={[styles.moneyRequestFieldRow, !isInteractive && styles.moneyRequestFieldRowDisabled, !!errorText && styles.borderColorDanger]}
-                    // A locked field has nothing to open, so it is handed no press handler at all: `MenuItem.Root`
-                    // reads that as a non-interactive row and drops the button role and the focus stop with it.
-                    // Otherwise the press is guarded like every other `MenuItem` preset, so an anonymous user gets
-                    // the sign-in prompt rather than the field's selector.
-                    onPress={isInteractive ? callFunctionIfActionIsAllowed(onPress) : undefined}
-                    isDisabled={isDisabled}
-                    accessibilityLabel={accessibilityLabel}
-                    sentryLabel={sentryLabel}
-                    testID={testID}
-                >
-                    {row}
-                </MenuItem.Root>
-            </Animated.View>
+            {anchorRef ? <View ref={anchorRef}>{borderedBox}</View> : borderedBox}
             {messages}
         </View>
     );
diff --git a/src/components/MoneyRequestConfirmationList/sections/ExpenseFormLayoutContext.ts b/src/components/MoneyRequestConfirmationList/sections/ExpenseFormLayoutContext.ts
index 6d75b4de0269..f50335ea9672 100644
--- a/src/components/MoneyRequestConfirmationList/sections/ExpenseFormLayoutContext.ts
+++ b/src/components/MoneyRequestConfirmationList/sections/ExpenseFormLayoutContext.ts
@@ -2,15 +2,10 @@ import type {ReactNode} from 'react';
 
 import {createContext, useContext} from 'react';
 
-/**
- * How the confirmation form presents its fields. The footer variant that wants a presentation provides it, so a
- * field reads the decision straight off the context instead of being handed it by every component that sits
- * between it and the footer.
- */
 type ExpenseFormLayoutContextValue = {
     /**
      * Whether a selectable field renders as one of the form's bordered rows with a down caret, instead of as a
-     * borderless push row. Only the manual expense form asks for the bordered treatment.
+     * borderless push row. Every create-expense form asks for the bordered treatment.
      */
     shouldUseDropdownRows: boolean;
 
@@ -22,15 +17,8 @@ type ExpenseFormLayoutContextValue = {
     amountTrailingAction?: ReactNode;
 };
 
-/** Push rows and no trailing action: what a footer that asks for nothing renders. */
 const defaultExpenseFormLayout: ExpenseFormLayoutContextValue = {shouldUseDropdownRows: false};
 
-/**
- * The bordered-row presentation, shared by every footer that wants it and nothing more. A module-level constant
- * rather than a literal per render, so providing it never re-renders the whole field tree for a new identity. The
- * footers that also offer the compact add-receipt button build their own value through `useAddReceiptLayout`,
- * since they fill the amount field's trailing slot as well.
- */
 const dropdownRowsExpenseFormLayout: ExpenseFormLayoutContextValue = {shouldUseDropdownRows: true};
 
 const ExpenseFormLayoutContext = createContext<ExpenseFormLayoutContextValue>(defaultExpenseFormLayout);
diff --git a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx
index 16d9baa6877e..9be8538f77b9 100644
--- a/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/MerchantField.tsx
@@ -1,4 +1,5 @@
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 import TextInput from '@components/TextInput';
 
@@ -9,8 +10,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearMoneyRequestMerchant, setMoneyRequestMerchant} from '@libs/actions/IOU/MoneyRequest';
 import {isConfirmationMerchantMissing} from '@libs/MoneyRequestUtils';
-import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
-import Navigation from '@libs/Navigation/Navigation';
 import {hasAnyManuallyEnteredScanField} from '@libs/TransactionUtils';
 import {isUntypedPlaceholderMerchant, isValidInputLength} from '@libs/ValidationUtils';
 
@@ -18,7 +17,6 @@ import {setDraftSplitTransaction} from '@userActions/IOU/Split';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import React, {useState} from 'react';
 import {View} from 'react-native';
@@ -34,7 +32,7 @@ type MerchantFieldProps = {
 };
 
 function MerchantField({isMerchantRequired, shouldDisplayFieldError, formError}: MerchantFieldProps) {
-    const {action, iouType, transactionID, reportID, reportActionID, isReadOnly, didConfirm, isEditingSplitBill, canEnterScanFieldsManually} = useConfirmationFields();
+    const {transactionID, isReadOnly, didConfirm, isEditingSplitBill, canEnterScanFieldsManually} = useConfirmationFields();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
@@ -146,28 +144,30 @@ function MerchantField({isMerchantRequired, shouldDisplayFieldError, formError}:
         );
     }
 
+    // The row hides the label once it has a value, and an error replaces it
+    const shouldShowRequiredLabel = !displayMerchantValue && !!isMerchantRequired && !shouldDisplayMerchantError;
+
+    // Only read-only confirmations reach this row, so it never navigates
     return (
-        <MenuItemWithTopDescription
-            shouldShowRightIcon={!isReadOnly}
-            title={displayMerchantValue}
-            description={translate('common.merchant')}
-            style={[styles.moneyRequestMenuItem]}
-            titleStyle={styles.flex1}
-            onPress={() => {
-                if (!transactionID) {
-                    return;
-                }
-
-                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(action, iouType, transactionID, reportID, reportActionID)));
-            }}
-            disabled={didConfirm}
-            interactive={!isReadOnly}
-            brickRoadIndicator={shouldDisplayMerchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-            errorText={shouldDisplayMerchantError ? translate('common.error.fieldRequired') : ''}
-            rightLabel={isMerchantRequired && !shouldDisplayMerchantError ? translate('common.required') : ''}
-            numberOfLinesTitle={2}
+        <MenuItem.Root
+            isDisabled={didConfirm}
             sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.MERCHANT_FIELD}
-        />
+        >
+            <MenuItemField.Row
+                name={translate('common.merchant')}
+                value={displayMerchantValue}
+                numberOfLinesValue={2}
+            >
+                {shouldDisplayMerchantError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                {shouldShowRequiredLabel && <MenuItem.RightLabel>{translate('common.required')}</MenuItem.RightLabel>}
+            </MenuItemField.Row>
+            {shouldDisplayMerchantError && (
+                <MenuItem.HelpText
+                    isError
+                    message={translate('common.error.fieldRequired')}
+                />
+            )}
+        </MenuItem.Root>
     );
 }
 
diff --git a/src/components/MoneyRequestConfirmationList/sections/PerDiemFields.tsx b/src/components/MoneyRequestConfirmationList/sections/PerDiemFields.tsx
index 531e28430210..3e0d07fdd798 100644
--- a/src/components/MoneyRequestConfirmationList/sections/PerDiemFields.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/PerDiemFields.tsx
@@ -1,6 +1,4 @@
 import Badge from '@components/Badge';
-import MenuItemField from '@components/MenuItem/presets/MenuItemField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -20,6 +18,8 @@ import type {OnyxEntry} from 'react-native-onyx';
 import React from 'react';
 import {View} from 'react-native';
 
+import ExpenseFieldRow from './ExpenseFieldRow';
+
 type PerDiemFieldsProps = {
     perDiemCustomUnit: CustomUnit | undefined;
     transaction: OnyxEntry<OnyxTypes.Transaction>;
@@ -39,23 +39,19 @@ function PerDiemFields({perDiemCustomUnit, transaction, isReadOnly, didConfirm,
     const shouldDisplaySubrateError = (shouldDisplayFieldError || formError === 'iou.error.invalidSubrateLength') && (subRates.length === 0 || (subRates.length === 1 && !subRates.at(0)));
 
     const subRateFields = subRates.map((field, index) => (
-        <MenuItemWithTopDescription
+        <ExpenseFieldRow
             key={`${translate('common.subrate')}${field?.key ?? index}`}
-            shouldShowRightIcon={!isReadOnly}
-            title={getSubratesForDisplay(field, translate('iou.qty'))}
-            description={translate('common.subrate')}
-            style={[styles.moneyRequestMenuItem]}
-            titleStyle={styles.flex1}
+            name={translate('common.subrate')}
+            value={getSubratesForDisplay(field, translate('iou.qty'))}
+            errorText={index === 0 && shouldDisplaySubrateError ? translate('common.error.fieldRequired') : ''}
             onPress={() => {
                 if (!transactionID) {
                     return;
                 }
                 Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_SUBRATE_EDIT.getRoute(index)));
             }}
-            disabled={didConfirm}
-            interactive={!isReadOnly}
-            brickRoadIndicator={index === 0 && shouldDisplaySubrateError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-            errorText={index === 0 && shouldDisplaySubrateError ? translate('common.error.fieldRequired') : ''}
+            isDisabled={didConfirm}
+            isInteractive={!isReadOnly}
             sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.SUBRATE_FIELD}
         />
     ));
@@ -96,44 +92,37 @@ function PerDiemFields({perDiemCustomUnit, transaction, isReadOnly, didConfirm,
 
     return (
         <>
-            <MenuItemField
-                value={getDestinationForDisplay(perDiemCustomUnit, transaction)}
+            <ExpenseFieldRow
                 name={translate('common.destination')}
-                onPress={
-                    !isReadOnly
-                        ? () => {
-                              if (!transactionID) {
-                                  return;
-                              }
-                              Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DESTINATION_EDIT.path));
-                          }
-                        : undefined
-                }
+                value={getDestinationForDisplay(perDiemCustomUnit, transaction)}
+                onPress={() => {
+                    if (!transactionID) {
+                        return;
+                    }
+                    Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DESTINATION_EDIT.path));
+                }}
                 isDisabled={didConfirm}
+                isInteractive={!isReadOnly}
                 sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.DESTINATION_FIELD}
             />
-            <View style={styles.dividerLine} />
-            <MenuItemField
-                value={getTimeForDisplay(transaction, dateFnsLocale)}
+            <ExpenseFieldRow
                 name={translate('iou.time')}
-                onPress={
-                    !isReadOnly
-                        ? () => {
-                              if (!transactionID) {
-                                  return;
-                              }
-                              Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TIME_EDIT.path));
-                          }
-                        : undefined
-                }
-                isDisabled={didConfirm}
+                value={getTimeForDisplay(transaction, dateFnsLocale)}
                 numberOfLinesValue={2}
+                onPress={() => {
+                    if (!transactionID) {
+                        return;
+                    }
+                    Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TIME_EDIT.path));
+                }}
+                isDisabled={didConfirm}
+                isInteractive={!isReadOnly}
                 sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.TIME_FIELD}
             />
-            <View style={[styles.flexRow, styles.gap1, styles.justifyContentStart, styles.mh3, styles.flexWrap, styles.pt1]}>{badgeElements}</View>
-            <View style={styles.dividerLine} />
+
+            {badgeElements.length > 0 && <View style={[styles.flexRow, styles.gap1, styles.justifyContentStart, styles.mh4, styles.flexWrap]}>{badgeElements}</View>}
+
             {subRateFields}
-            <View style={styles.dividerLine} />
         </>
     );
 }
diff --git a/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx b/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx
index 76dfb69b8b35..941d0e3a8331 100644
--- a/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/ReportField.tsx
@@ -1,10 +1,9 @@
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useOutstandingReports from '@hooks/useOutstandingReports';
 import {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
-import useThemeStyles from '@hooks/useThemeStyles';
 
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -45,7 +44,6 @@ type ReportFieldProps = {
 
 function ReportField({selectedParticipants, iouType, reportID, reportActionID, action, transactionID, isPerDiemRequest, isPolicyExpenseChat}: ReportFieldProps) {
     const {shouldUseDropdownRows} = useExpenseFormLayout();
-    const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
 
     const policyID = selectedParticipants?.at(0)?.policyID;
@@ -141,16 +139,12 @@ function ReportField({selectedParticipants, iouType, reportID, reportActionID, a
     }
 
     return (
-        <MenuItemWithTopDescription
-            shouldShowRightIcon={shouldReportBeEditable}
-            title={reportName}
-            description={translate('common.report')}
-            style={[styles.moneyRequestMenuItem]}
-            titleStyle={styles.flex1}
-            onPress={openReportPage}
-            interactive={shouldReportBeEditable}
-            shouldRenderAsHTML
+        <MenuItemFieldHTML
+            name={translate('common.report')}
+            value={reportName}
+            onPress={shouldReportBeEditable ? openReportPage : undefined}
             sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.REPORT_FIELD}
+            testID="menu-item-Report"
         />
     );
 }
diff --git a/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx b/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx
index b1a805afef1f..4763147e3f5c 100644
--- a/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx
+++ b/src/components/MoneyRequestConfirmationList/sections/TaxFields.tsx
@@ -1,5 +1,5 @@
+import MenuItem from '@components/MenuItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {useConfirmationFields} from '@components/MoneyRequestConfirmationFields/context';
 import NumberWithSymbolForm from '@components/NumberWithSymbolForm';
 import type {NumberWithSymbolFormRef} from '@components/NumberWithSymbolForm';
@@ -17,6 +17,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {getCalculatedTaxAmount, getTaxAmount, getTaxRateTitle} from '@libs/TransactionUtils';
 
 import {setDraftSplitTransaction} from '@userActions/IOU/Split';
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
 import CONST from '@src/CONST';
 import type {IOUAction, IOUType} from '@src/CONST';
@@ -191,21 +192,27 @@ function TaxFields({policy, policyForMovingExpenses, iouCurrencyCode, canModifyT
                     sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.TAX_RATE_FIELD}
                 />
             ) : (
-                <MenuItemWithTopDescription
+                <MenuItem.Root
                     key={`${taxRates?.name}_rate`}
-                    pressableTestID={`${taxRates?.name}_rate`}
-                    shouldShowRightIcon={canModifyTaxFields}
-                    title={taxRateTitle}
-                    description={taxRates?.name}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={openTaxRatePage}
-                    disabled={didConfirm}
-                    interactive={canModifyTaxFields}
-                    brickRoadIndicator={shouldDisplayTaxRateError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                    errorText={shouldDisplayTaxRateError ? translate(formError as TranslationPaths) : ''}
+                    testID={`${taxRates?.name}_rate`}
+                    onPress={canModifyTaxFields ? callFunctionIfActionIsAllowed(openTaxRatePage) : undefined}
+                    isDisabled={didConfirm}
                     sentryLabel={CONST.SENTRY_LABEL.REQUEST_CONFIRMATION_LIST.TAX_RATE_FIELD}
-                />
+                >
+                    <MenuItemField.Row
+                        name={taxRates?.name ?? ''}
+                        value={taxRateTitle}
+                    >
+                        {shouldDisplayTaxRateError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                        {canModifyTaxFields && <MenuItem.Chevron />}
+                    </MenuItemField.Row>
+                    {shouldDisplayTaxRateError && (
+                        <MenuItem.HelpText
+                            isError
+                            message={translate(formError as TranslationPaths)}
+                        />
+                    )}
+                </MenuItem.Root>
             )}
             {canModifyTaxFields ? (
                 <View style={[styles.mh4, styles.mv2]}>
diff --git a/src/components/MoneyRequestConfirmationList/sections/selectors.ts b/src/components/MoneyRequestConfirmationList/sections/selectors.ts
index 49faa541e382..cac073eb44ba 100644
--- a/src/components/MoneyRequestConfirmationList/sections/selectors.ts
+++ b/src/components/MoneyRequestConfirmationList/sections/selectors.ts
@@ -8,6 +8,7 @@ import {
     hasReceipt,
     isAmountMissing,
     isCreatedMissing,
+    isFailedScanAmountPlaceholder,
     isMerchantMissing,
     isScanRequest,
     willFieldBeAutomaticallyFilled,
@@ -178,6 +179,7 @@ type AmountSlice = {
     comment: {type: NonNullable<Transaction['comment']>['type']; customUnit: NonNullable<Transaction['comment']>['customUnit']} | undefined;
     isAmountMissing: boolean;
     isAmountSet: Transaction['isAmountSet'];
+    isFailedScanAmountPlaceholder: boolean;
     taxCode: Transaction['taxCode'];
     // The Scan confirmation's amount / merchant / date are all-or-nothing, so the amount field reads the other two.
     isMerchantSet: boolean;
@@ -198,6 +200,7 @@ const amountSliceSelector = (t: OnyxEntry<Transaction>): AmountSlice | undefined
         comment: t.comment ? {type: t.comment.type, customUnit: t.comment.customUnit} : undefined,
         isAmountMissing: isAmountMissing(t),
         isAmountSet: t.isAmountSet,
+        isFailedScanAmountPlaceholder: isFailedScanAmountPlaceholder(t),
         taxCode: t.taxCode,
         isMerchantSet: t.isMerchantSet ?? false,
         isCreatedSet: t.isCreatedSet ?? false,
diff --git a/src/components/MoneyRequestConfirmationListFooter/variants/PerDiemFooter.tsx b/src/components/MoneyRequestConfirmationListFooter/variants/PerDiemFooter.tsx
index d2df0c9469e8..730036be5927 100644
--- a/src/components/MoneyRequestConfirmationListFooter/variants/PerDiemFooter.tsx
+++ b/src/components/MoneyRequestConfirmationListFooter/variants/PerDiemFooter.tsx
@@ -1,35 +1,44 @@
 import DescriptionField from '@components/MoneyRequestConfirmationList/sections/DescriptionField';
+import ExpenseFormLayoutContext, {dropdownRowsExpenseFormLayout} from '@components/MoneyRequestConfirmationList/sections/ExpenseFormLayoutContext';
 import ConfirmationFieldList from '@components/MoneyRequestConfirmationListFooter/ConfirmationFieldList';
 import PerDiemSection from '@components/MoneyRequestConfirmationListFooter/sections/PerDiemSection';
 import type {PerDiemFooterProps} from '@components/MoneyRequestConfirmationListFooter/types';
 
+import useThemeStyles from '@hooks/useThemeStyles';
+
 import React from 'react';
 import {View} from 'react-native';
 
 function PerDiemFooter({policy, policyTags, selectedParticipants, amountDisplay, requiredFlags, visibilityFlags, errorState, toggleHandlers = {}}: PerDiemFooterProps) {
+    const styles = useThemeStyles();
+
     return (
-        <View>
-            <PerDiemSection
-                policy={policy}
-                shouldDisplayFieldError={errorState.shouldDisplayFieldError}
-                formError={errorState.formError}
-            />
-            <ConfirmationFieldList
-                policy={policy}
-                policyTags={policyTags}
-                selectedParticipants={selectedParticipants}
-                amountDisplay={amountDisplay}
-                requiredFlags={requiredFlags}
-                visibilityFlags={visibilityFlags}
-                errorState={errorState}
-                toggleHandlers={toggleHandlers}
-            >
-                <DescriptionField
+        <ExpenseFormLayoutContext.Provider value={dropdownRowsExpenseFormLayout}>
+            <View>
+                {visibilityFlags.hasParticipantSection && <View style={[styles.dividerLine, styles.mv2]} />}
+
+                <PerDiemSection
                     policy={policy}
-                    isDescriptionRequired={requiredFlags.isDescriptionRequired}
+                    shouldDisplayFieldError={errorState.shouldDisplayFieldError}
+                    formError={errorState.formError}
                 />
-            </ConfirmationFieldList>
-        </View>
+                <ConfirmationFieldList
+                    policy={policy}
+                    policyTags={policyTags}
+                    selectedParticipants={selectedParticipants}
+                    amountDisplay={amountDisplay}
+                    requiredFlags={requiredFlags}
+                    visibilityFlags={visibilityFlags}
+                    errorState={errorState}
+                    toggleHandlers={toggleHandlers}
+                >
+                    <DescriptionField
+                        policy={policy}
+                        isDescriptionRequired={requiredFlags.isDescriptionRequired}
+                    />
+                </ConfirmationFieldList>
+            </View>
+        </ExpenseFormLayoutContext.Provider>
     );
 }
 
diff --git a/src/components/MoneyRequestConfirmationListFooter/variants/ScanFooter.tsx b/src/components/MoneyRequestConfirmationListFooter/variants/ScanFooter.tsx
index 97eaaf846c9d..fbc69a7d4394 100644
--- a/src/components/MoneyRequestConfirmationListFooter/variants/ScanFooter.tsx
+++ b/src/components/MoneyRequestConfirmationListFooter/variants/ScanFooter.tsx
@@ -1,3 +1,4 @@
+import ExpenseFormLayoutContext, {dropdownRowsExpenseFormLayout} from '@components/MoneyRequestConfirmationList/sections/ExpenseFormLayoutContext';
 import ConfirmationFieldList from '@components/MoneyRequestConfirmationListFooter/ConfirmationFieldList';
 import ManualDetailsFields from '@components/MoneyRequestConfirmationListFooter/fieldGroups/detailsFields/ManualDetailsFields';
 import ReceiptSection from '@components/MoneyRequestConfirmationListFooter/sections/ReceiptSection';
@@ -29,33 +30,35 @@ function ScanFooter({
     const {showMoreFields, setShowMoreFields} = compactControls;
 
     return (
-        <View style={isCompactMode ? styles.flex1 : undefined}>
-            <ReceiptSection
-                policy={policy}
-                showMoreFields={showMoreFields}
-                {...receiptOptions}
-            />
+        <ExpenseFormLayoutContext.Provider value={dropdownRowsExpenseFormLayout}>
+            <View style={isCompactMode ? styles.flex1 : undefined}>
+                <ReceiptSection
+                    policy={policy}
+                    showMoreFields={showMoreFields}
+                    {...receiptOptions}
+                />
 
-            <ConfirmationFieldList
-                policy={policy}
-                policyTags={policyTags}
-                selectedParticipants={selectedParticipants}
-                amountDisplay={amountDisplay}
-                requiredFlags={requiredFlags}
-                visibilityFlags={visibilityFlags}
-                errorState={errorState}
-                toggleHandlers={toggleHandlers}
-                compactState={{isCompactMode, setShowMoreFields}}
-            >
-                <ManualDetailsFields
+                <ConfirmationFieldList
                     policy={policy}
+                    policyTags={policyTags}
+                    selectedParticipants={selectedParticipants}
                     amountDisplay={amountDisplay}
                     requiredFlags={requiredFlags}
+                    visibilityFlags={visibilityFlags}
                     errorState={errorState}
-                    isParticipantPickerVisible={visibilityFlags.isParticipantPickerVisible}
-                />
-            </ConfirmationFieldList>
-        </View>
+                    toggleHandlers={toggleHandlers}
+                    compactState={{isCompactMode, setShowMoreFields}}
+                >
+                    <ManualDetailsFields
+                        policy={policy}
+                        amountDisplay={amountDisplay}
+                        requiredFlags={requiredFlags}
+                        errorState={errorState}
+                        isParticipantPickerVisible={visibilityFlags.isParticipantPickerVisible}
+                    />
+                </ConfirmationFieldList>
+            </View>
+        </ExpenseFormLayoutContext.Provider>
     );
 }
 
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 785e0a7fba3c..1512eb5f643e 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -67,7 +67,7 @@ function MoneyRequestHeader({reportID: reportIDProp, onBackButtonPress}: MoneyRe
 
     // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use a correct layout for the hold expense modal https://github.com/Expensify/App/pull/47990#issuecomment-2362382026
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
-    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
+    const {shouldUseNarrowLayout, isSmallScreenWidth, isMediumScreenWidth, isInLandscapeMode} = useResponsiveLayout();
     const route = useRoute<
         | PlatformStackRouteProp<ReportsSplitNavigatorParamList, typeof SCREENS.REPORT>
         | PlatformStackRouteProp<RightModalNavigatorParamList, typeof SCREENS.RIGHT_MODAL.SEARCH_REPORT>
@@ -101,8 +101,17 @@ function MoneyRequestHeader({reportID: reportIDProp, onBackButtonPress}: MoneyRe
     const isReportInRHP = route.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT;
     const isFromReviewDuplicates = !!route.params.backTo && /\/duplicates\/review\/[^/]+$/.test(route.params.backTo.replaceAll(/\?.*/g, ''));
     const shouldDisplayTransactionNavigation = !!(reportID && isReportInRHP);
+    // `transaction` is resolved through this thread's parent report action, which isn't necessarily loaded yet on
+    // a cold open (e.g. opening an expense from the Spend page right after clearing the cache). The route carries
+    // the expense the screen was opened for, so fall back to it rather than hiding the carousel until data lands.
+    const anchorTransactionIDFromRoute = route.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT ? route.params.anchorTransactionID : undefined;
+    const carouselTransactionID = transaction?.transactionID ?? anchorTransactionIDFromRoute;
     const shouldOpenParentReportInCurrentTab = !isSelfDM(parentReport);
     const shouldDisplayButtonsInSeparateLine = useShouldDisplayButtonsInSeparateLine() && (wideRHPRouteKeys.length === 0 || isSmallScreenWidth);
+    // Only the carousel counter reads this, and MoneyReportHeader counts tablet-portrait as cramped for the same
+    // counter. The two have to agree: derived from different breakpoints, the counter was hidden on a report and
+    // shown on its own expense thread at one window size, popping into existence as the user stepped inward.
+    const shouldDisplayNarrowVersion = shouldDisplayButtonsInSeparateLine || (isMediumScreenWidth && !isInLandscapeMode);
 
     const getStatusIcon: (src: IconAsset) => ReactNode = (src) => (
         <Icon
@@ -179,16 +188,17 @@ function MoneyRequestHeader({reportID: reportIDProp, onBackButtonPress}: MoneyRe
                 shouldEnableDetailPageNavigation
                 openParentReportInCurrentTab={shouldOpenParentReportInCurrentTab}
             >
-                {!shouldDisplayButtonsInSeparateLine && (
+                {!shouldDisplayButtonsInSeparateLine && !statusBarProps && (
                     <MoneyRequestHeaderActions
                         reportID={reportID}
                         onBackButtonPress={onBackButtonPress}
                     />
                 )}
-                {shouldDisplayTransactionNavigation && !!transaction && (
+                {shouldDisplayTransactionNavigation && !!carouselTransactionID && (
                     <MoneyRequestReportTransactionsNavigation
-                        currentTransactionID={transaction.transactionID}
+                        currentTransactionID={carouselTransactionID}
                         isFromReviewDuplicates={isFromReviewDuplicates}
+                        shouldDisplayNarrowVersion={shouldDisplayNarrowVersion}
                     />
                 )}
             </HeaderWithBackButton>
@@ -199,11 +209,19 @@ function MoneyRequestHeader({reportID: reportIDProp, onBackButtonPress}: MoneyRe
                 />
             )}
             {!!statusBarProps && (
-                <View style={[styles.ph5, styles.pb3]}>
-                    <MoneyRequestHeaderStatusBar
-                        icon={statusBarProps.icon}
-                        description={statusBarProps.description}
-                    />
+                <View style={[styles.flexRow, styles.gap2, styles.justifyContentStart, styles.flexNoWrap, styles.ph5, styles.pb3]}>
+                    <View style={[styles.flexShrink1, styles.flexGrow1, styles.mnw0, styles.flexWrap, styles.justifyContentCenter]}>
+                        <MoneyRequestHeaderStatusBar
+                            icon={statusBarProps.icon}
+                            description={statusBarProps.description}
+                        />
+                    </View>
+                    {!shouldDisplayButtonsInSeparateLine && (
+                        <MoneyRequestHeaderActions
+                            reportID={reportID}
+                            onBackButtonPress={onBackButtonPress}
+                        />
+                    )}
                 </View>
             )}
             <HeaderLoadingBar />
diff --git a/src/components/MoneyRequestHeaderSecondaryActions.tsx b/src/components/MoneyRequestHeaderSecondaryActions.tsx
index 4e945dca469a..aa3527947c50 100644
--- a/src/components/MoneyRequestHeaderSecondaryActions.tsx
+++ b/src/components/MoneyRequestHeaderSecondaryActions.tsx
@@ -167,6 +167,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
     const [transactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector});
     const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
 
     // NVP subscriptions
     const [policyRecentlyUsedCurrencies] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES);
@@ -376,6 +377,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
             grandParentReport,
             hasWorkspaceToSubmitTo,
             rules,
+            cardList,
         });
     })();
 
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupByButton.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupByButton.tsx
index bd06fbe7c532..2178379a268d 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupByButton.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupByButton.tsx
@@ -57,6 +57,7 @@ function MoneyRequestReportGroupByButton({currentSelection, onSelect}: MoneyRequ
         text: item.text,
         keyForList: item.value,
         isSelected: item.value === currentSelection,
+        itemStyle: shouldUseNarrowLayout ? undefined : styles.optionRowCompact,
     }));
 
     const groupByPopoverComponent = (props: {closeOverlay: () => void}) => (
@@ -81,7 +82,7 @@ function MoneyRequestReportGroupByButton({currentSelection, onSelect}: MoneyRequ
                         onSelect(item.keyForList);
                         props.closeOverlay();
                     }}
-                    style={{contentContainerStyle: [styles.pb0], listItemWrapperStyle: shouldUseNarrowLayout ? undefined : styles.optionRowCompact}}
+                    style={{contentContainerStyle: [styles.pb0]}}
                 />
             </View>
         </View>
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportNavigation.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportNavigation.tsx
index d3506a09dd0f..bc7c4220eaec 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportNavigation.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportNavigation.tsx
@@ -3,6 +3,7 @@ import {useSearchResultsContext} from '@components/Search/SearchContext';
 import Text from '@components/Text';
 
 import useFilterPendingDeleteReports from '@hooks/useFilterPendingDeleteReports';
+import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useSearchSections from '@hooks/useSearchSections';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -21,6 +22,7 @@ import type LastSearchParams from '@src/types/onyx/ReportNavigation';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
+import {useIsFocused} from '@react-navigation/native';
 import React, {startTransition, useEffect, useState} from 'react';
 import {View} from 'react-native';
 
@@ -53,6 +55,13 @@ const selectQueryHash = (lastSearchQuery: OnyxEntry<LastSearchParams>): number |
 
 const searchLoadingSelector = (snapshot: OnyxEntry<SearchResults>): boolean => !!snapshot?.search?.isLoading;
 
+/**
+ * Search sections can yield entries that aren't openable reports. An unreported (self-DM) expense is grouped under
+ * the "0" placeholder rather than a real report, so paging onto it lands the user on an empty report. It also
+ * inflates the "x of y" counter with a report the Reports list never showed them.
+ */
+const isNavigableReportID = (reportID: string | undefined): reportID is string => !!reportID && reportID !== CONST.REPORT.UNREPORTED_REPORT_ID;
+
 const isSameReportList = (a: Array<string | undefined>, b: Array<string | undefined> | null): boolean => {
     if (a === b) {
         return true;
@@ -105,7 +114,8 @@ function MoneyRequestReportNavigationStandalone({onReportsChange}: MoneyRequestR
     useEffect(() => {
         // Guard by content, not reference: useSearchSections rebuilds allReports via filter/map each
         // render, so an identity check would refire this update every render and loop.
-        onReportsChange((previousReports) => (isSameReportList(allReports, previousReports) ? previousReports : allReports));
+        const navigableReports = allReports.filter(isNavigableReportID);
+        onReportsChange((previousReports) => (isSameReportList(navigableReports, previousReports) ? previousReports : navigableReports));
     }, [allReports, onReportsChange]);
 
     return null;
@@ -113,6 +123,8 @@ function MoneyRequestReportNavigationStandalone({onReportsChange}: MoneyRequestR
 
 function MoneyRequestReportNavigationContent({reportID, shouldDisplayNarrowVersion, contextReports}: MoneyRequestReportNavigationContentProps) {
     const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const isFocused = useIsFocused();
 
     // Lightweight subscriptions only: the current search query and its loading flag. These never mount
     // the heavy useSearchSections subscription set, so the fast context path stays cheap.
@@ -151,7 +163,7 @@ function MoneyRequestReportNavigationContent({reportID, shouldDisplayNarrowVersi
     const shouldDisplayNavigationArrows = effectiveAllReports.length > 1 && currentIndex !== -1 && !!lastSearchQuery?.queryJSON;
 
     useEffect(() => {
-        if (!lastSearchQuery?.queryJSON) {
+        if (!isFocused || !lastSearchQuery?.queryJSON) {
             return;
         }
 
@@ -181,7 +193,7 @@ function MoneyRequestReportNavigationContent({reportID, shouldDisplayNarrowVersi
             ...lastSearchQuery,
             previousLengthOfResults: effectiveAllReports.length,
         });
-    }, [currentIndex, allReportsCount, effectiveAllReports.length, lastSearchQuery?.queryJSON, lastSearchQuery]);
+    }, [isFocused, currentIndex, allReportsCount, effectiveAllReports.length, lastSearchQuery?.queryJSON, lastSearchQuery]);
 
     const goToReportId = (reportId?: string) => {
         if (!reportId) {
@@ -242,7 +254,11 @@ function MoneyRequestReportNavigationContent({reportID, shouldDisplayNarrowVersi
             {!shouldUseContextReports && <MoneyRequestReportNavigationStandalone onReportsChange={setStandaloneReports} />}
             {shouldDisplayNavigationArrows && (
                 <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
-                    {!shouldDisplayNarrowVersion && <Text style={styles.mutedTextLabel}>{`${currentIndex + 1} of ${allReportsCount}`}</Text>}
+                    {!shouldDisplayNarrowVersion && (
+                        <Text style={[styles.mutedTextLabel, styles.textAlignRight, styles.tabularNums]}>
+                            {translate('common.currentOfTotal', {current: currentIndex + 1, total: allReportsCount})}
+                        </Text>
+                    )}
                     <PrevNextButtons
                         isPrevButtonDisabled={hidePrevButton}
                         isNextButtonDisabled={hideNextButton}
@@ -268,7 +284,7 @@ function MoneyRequestReportNavigation({reportID, shouldDisplayNarrowVersion}: Mo
     // subscription is deferred to the standalone child rendered by the content component, which mounts
     // it only on the slow path (pagination/loading or no context list).
     const {sortedReportIDs} = useSearchResultsContext();
-    const contextReports = useFilterPendingDeleteReports(sortedReportIDs);
+    const contextReports = useFilterPendingDeleteReports(sortedReportIDs).filter(isNavigableReportID);
 
     const isLiveGuardSatisfied = isExpenseReportSearch && snapshotGuard.hasMultiple && snapshotGuard.includesReport;
 
@@ -299,3 +315,4 @@ function MoneyRequestReportNavigation({reportID, shouldDisplayNarrowVersion}: Mo
 }
 
 export default MoneyRequestReportNavigation;
+export {isNavigableReportID};
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTableHeaderRow.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTableHeaderRow.tsx
index d36e6fc79b24..7285090e7b2b 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTableHeaderRow.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTableHeaderRow.tsx
@@ -1,6 +1,6 @@
 import Checkbox from '@components/Checkbox';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
+import {useSearchSelectionContext} from '@components/Search/SearchContext';
 import type {SearchColumnType, SearchSortBy, SortOrder, TableColumnSize} from '@components/Search/types';
 import Text from '@components/Text';
 
@@ -12,11 +12,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {SortableColumnName} from '@libs/ReportUtils';
 import {hasFlexColumn} from '@libs/SearchUIUtils';
-import {isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
 
-import type * as OnyxTypes from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 
 import React from 'react';
@@ -25,8 +23,11 @@ import {View} from 'react-native';
 import MoneyRequestReportTableHeader from './MoneyRequestReportTableHeader';
 
 type MoneyRequestReportTableHeaderRowProps = {
-    /** List of transactions belonging to one report */
-    transactions: OnyxTypes.Transaction[];
+    /** IDs of the rows Select All selects. The checkbox's checked state comes from the same list, so the two cannot disagree */
+    selectableTransactionIDs: string[];
+
+    /** Called when the Select All checkbox is pressed. The list decides whether to select every selectable row or clear the selection */
+    onToggleAll: () => void;
 
     /** The report's offline pending action, shown as feedback on the whole row */
     pendingAction: PendingAction | undefined;
@@ -63,7 +64,8 @@ type MoneyRequestReportTableHeaderRowProps = {
  * The transaction table's header row: the select-all checkbox plus the sortable column headers.
  */
 function MoneyRequestReportTableHeaderRow({
-    transactions,
+    selectableTransactionIDs,
+    onToggleAll,
     pendingAction,
     columns,
     sortBy,
@@ -81,10 +83,10 @@ function MoneyRequestReportTableHeaderRow({
     const {isMediumScreenWidth} = useResponsiveLayout();
     const {shouldUseNarrowLayout} = useResponsiveLayoutOnWideRHP();
     const {selectedTransactionIDs} = useSearchSelectionContext();
-    const {setSelectedTransactions, clearSelectedTransactions} = useSearchSelectionActions();
+    const selectedTransactionIDSet = new Set(selectedTransactionIDs);
+    const isSelectAllChecked = selectableTransactionIDs.length > 0 && selectableTransactionIDs.every((transactionID) => selectedTransactionIDSet.has(transactionID));
 
     const isDesktopTableLayout = !shouldUseNarrowLayout;
-    const transactionsWithoutPendingDelete = transactions.filter((t) => !isTransactionPendingDelete(t));
 
     return (
         <OfflineWithFeedback pendingAction={pendingAction}>
@@ -111,16 +113,10 @@ function MoneyRequestReportTableHeaderRow({
                     ]}
                 >
                     <Checkbox
-                        onPress={() => {
-                            if (selectedTransactionIDs.length !== 0) {
-                                clearSelectedTransactions(true);
-                            } else {
-                                setSelectedTransactions(transactionsWithoutPendingDelete.map((t) => t.transactionID));
-                            }
-                        }}
+                        onPress={onToggleAll}
                         accessibilityLabel={translate('accessibilityHints.selectAllTransactions')}
-                        isIndeterminate={selectedTransactionIDs.length > 0 && selectedTransactionIDs.length !== transactionsWithoutPendingDelete.length}
-                        isChecked={selectedTransactionIDs.length > 0 && selectedTransactionIDs.length === transactionsWithoutPendingDelete.length}
+                        isIndeterminate={selectedTransactionIDs.length > 0 && !isSelectAllChecked}
+                        isChecked={isSelectAllChecked}
                         containerStyle={isDesktopTableLayout && styles.m0}
                         style={isDesktopTableLayout && styles.mr3}
                     />
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
index a08814fc6fa5..5e80f1dacc39 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx
@@ -1,9 +1,9 @@
+import {useEditingCellState} from '@components/EditableCell';
 import ErrorMessageRow from '@components/ErrorMessageRow';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import type {SearchColumnType, TableColumnSize} from '@components/Search/types';
 import TransactionItemRow from '@components/TransactionItemRow';
-import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -15,9 +15,10 @@ import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
 
 import ControlSelection from '@libs/ControlSelection';
 import canUseTouchScreen from '@libs/DeviceCapabilities/canUseTouchScreen';
-import {getLatestErrorField, getLatestErrorMessageField} from '@libs/ErrorUtils';
+import {getLatestErrorMessageField} from '@libs/ErrorUtils';
+import {getTransactionRejectErrorKey, isSelectableReportTransaction} from '@libs/MoneyRequestReportUtils';
 import {hasFlexColumn} from '@libs/SearchUIUtils';
-import {getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils';
+import {getTransactionPendingAction} from '@libs/TransactionUtils';
 
 import variables from '@styles/variables';
 
@@ -56,7 +57,7 @@ type MoneyRequestReportTransactionItemProps = {
     isSelectionModeEnabled: boolean;
 
     /** Callback function triggered upon pressing a transaction checkbox. */
-    toggleTransaction: (transactionID: string) => void;
+    toggleTransaction: (transactionID: string, shiftKey?: boolean) => void;
 
     /** Callback function triggered upon pressing a transaction. */
     handleOnPress: (transactionID: string) => void;
@@ -144,7 +145,6 @@ function MoneyRequestReportTransactionItemBody({
     } else if (shouldUseMediumNarrowLayout) {
         transactionRowStyle = [styles.p3, styles.pv2, styles.noBorderRadius];
     }
-    const isPendingDelete = isTransactionPendingDelete(transaction);
     const pendingAction = getTransactionPendingAction(transaction);
 
     // `Transaction.errors` also carries receipt errors, which are objects rendered by their own save/delete UI, so
@@ -153,11 +153,10 @@ function MoneyRequestReportTransactionItemBody({
         Object.entries(transaction.errors ?? {}).filter((entry): entry is [string, string | null] => typeof entry[1] === 'string' || entry[1] === null),
     );
 
-    // The backend reports a reject against an expense it has already moved under its own `reject` field rather than
-    // the generic `errors`, so both have to be read to show the message.
-    const rejectErrorKey = Object.keys(getLatestErrorField(transaction, 'reject')).at(0);
-    const hasRejectError = !!rejectErrorKey;
+    const rejectErrorKey = getTransactionRejectErrorKey(transaction);
     const rejectError: TranslationKeyErrors = rejectErrorKey ? {[rejectErrorKey]: {translationKey: 'iou.rejectReport.couldNotRejectExpense'}} : {};
+    // Same check Select All and shift+click ranges use, so this checkbox is disabled exactly for the rows they skip.
+    const isSelectable = isSelectableReportTransaction(transaction);
 
     // A reject error is terminal for this row, so it replaces any other message rather than stacking with it.
     const transactionErrors: Errors | TranslationKeyErrors = rejectErrorKey ? rejectError : getLatestErrorMessageField({errors: messageErrors});
@@ -227,7 +226,7 @@ function MoneyRequestReportTransactionItemBody({
                         ? [StyleUtils.getSearchTableRowPressableStyle(false, isSelected), isLastItem && styles.tableBottomRadius, lastRowBorderStyle]
                         : styles.noBorderRadius,
                 ]}
-                hoverStyle={[!isPendingDelete && !hasRejectError && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
+                hoverStyle={[isSelectable && !shouldDisableHoverStyle && styles.hoveredComponentBG, isSelected && styles.activeComponentBG]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                 onMouseDown={handleMouseDown}
                 onHoverIn={handleHoverIn}
@@ -241,7 +240,7 @@ function MoneyRequestReportTransactionItemBody({
                 onLongPress={() => {
                     handleLongPress(transaction.transactionID);
                 }}
-                disabled={isPendingDelete || hasRejectError}
+                disabled={!isSelectable}
                 wrapperStyle={[animatedHighlightStyle, styles.userSelectNone, shouldUseNarrowLayout && [StyleUtils.getSelectedBorderBottomStyle(isSelected), lastRowBorderStyle]]}
             >
                 {({hovered}) => (
@@ -264,7 +263,7 @@ function MoneyRequestReportTransactionItemBody({
                             shouldShowCheckbox={!!isSelectionModeEnabled || !isSmallScreenWidth}
                             onCheckboxPress={toggleTransaction}
                             columns={columns}
-                            isDisabled={isPendingDelete || hasRejectError}
+                            isDisabled={!isSelectable}
                             style={[transactionRowStyle, hasTransactionErrors && styles.offlineFeedbackPending]}
                             onButtonPress={() => {
                                 handleOnPress(transaction.transactionID);
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
index 6106774283ca..e68460b18b8b 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
@@ -1,12 +1,9 @@
 import LinkButton from '@components/Button/composed/LinkButton';
 import type FlatListRefType from '@components/FlashList/types';
-import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
 
 import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
-import useHandleSelectionMode from '@hooks/useHandleSelectionMode';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
-import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
 import useNavigateToTransactionThread from '@hooks/useNavigateToTransactionThread';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -15,28 +12,22 @@ import useResponsiveLayoutOnWideRHP from '@hooks/useResponsiveLayoutOnWideRHP';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {navigationRef} from '@libs/Navigation/Navigation';
+import {CAROUSEL_SOURCE} from '@libs/actions/TransactionThreadNavigation';
 import {getMoneyRequestSpendBreakdown, getReportOfflinePendingActionAndErrors, isExpenseReport, isIOUReport} from '@libs/ReportUtils';
-import {getPendingSubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
-import {getTransactionPendingAction, isTransactionPendingDelete} from '@libs/TransactionUtils';
+import {getTransactionPendingAction} from '@libs/TransactionUtils';
 
-import isReportOpenInSuperWideRHP from '@navigation/helpers/isReportOpenInSuperWideRHP';
 import Navigation from '@navigation/Navigation';
 
 import CONST from '@src/CONST';
-import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {StableReport} from '@src/selectors/Report';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import type {ViewableItemsChanged} from '@src/types/utils/ReactNativeCompat';
 
 import type {LayoutChangeEvent, NativeScrollEvent, NativeSyntheticEvent, StyleProp, ViewStyle} from 'react-native';
 
-import {useFocusEffect} from '@react-navigation/native';
-import isEmpty from 'lodash/isEmpty';
-import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {useRef} from 'react';
 import {View} from 'react-native';
 
 import type {MoneyRequestReportTransactionLongPressModalHandle} from './MoneyRequestReportTransactionLongPressModal';
@@ -55,7 +46,9 @@ import useMoneyRequestReportActiveTransactionIDs from './useMoneyRequestReportAc
 import useMoneyRequestReportColumns from './useMoneyRequestReportColumns';
 import useMoneyRequestReportGroupedTransactions from './useMoneyRequestReportGroupedTransactions';
 import useMoneyRequestReportLayout from './useMoneyRequestReportLayout';
+import useMoneyRequestReportPendingExpense from './useMoneyRequestReportPendingExpense';
 import useMoneyRequestReportSortedTransactions, {EMPTY_VIOLATIONS} from './useMoneyRequestReportSortedTransactions';
+import useMoneyRequestReportTransactionSelection from './useMoneyRequestReportTransactionSelection';
 
 /**
  * Bundle of data + JSX nodes the parent needs to render the unified list around the transaction-list state.
@@ -171,6 +164,9 @@ type MoneyRequestReportTransactionListProps = {
     listFooterComponent?: React.ReactElement;
 };
 
+/**
+ * Renders the money-request report's transactions section and composes the unified list around it.
+ */
 function MoneyRequestReportTransactionList({
     report,
     transactions,
@@ -210,95 +206,13 @@ function MoneyRequestReportTransactionList({
     const {shouldUseNarrowLayout} = useResponsiveLayoutOnWideRHP();
     const navigateToTransactionThread = useNavigateToTransactionThread();
     const longPressModalRef = useRef<MoneyRequestReportTransactionLongPressModalHandle>(null);
-    const {reportPendingAction} = getReportOfflinePendingActionAndErrors(report);
     const {isOffline} = useNetwork();
-
-    const {totalDisplaySpend} = getMoneyRequestSpendBreakdown(report);
     const [nonPersonalAndWorkspaceCards] = useOnyx(ONYXKEYS.DERIVED.NON_PERSONAL_AND_WORKSPACE_CARD_LIST);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
     const [policyTagLists] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`);
 
-    const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report);
-
-    const hasPendingAction = useMemo(() => {
-        return hasPendingDeletionTransaction || transactions.some(getTransactionPendingAction);
-    }, [hasPendingDeletionTransaction, transactions]);
-
-    const {selectedTransactionIDs} = useSearchSelectionContext();
-    const {setSelectedTransactions, clearSelectedTransactions} = useSearchSelectionActions();
-    useHandleSelectionMode(selectedTransactionIDs);
-    const isMobileSelectionModeEnabled = useMobileSelectionMode();
-
-    const toggleTransaction = useCallback(
-        (transactionID: string) => {
-            let newSelectedTransactionIDs = selectedTransactionIDs;
-            if (selectedTransactionIDs.includes(transactionID)) {
-                newSelectedTransactionIDs = selectedTransactionIDs.filter((t) => t !== transactionID);
-            } else {
-                newSelectedTransactionIDs = [...selectedTransactionIDs, transactionID];
-            }
-            setSelectedTransactions(newSelectedTransactionIDs);
-        },
-        [setSelectedTransactions, selectedTransactionIDs],
-    );
-
-    const isTransactionSelected = useCallback((transactionID: string) => selectedTransactionIDs.includes(transactionID), [selectedTransactionIDs]);
-
-    useFocusEffect(
-        useCallback(() => {
-            return () => {
-                if (navigationRef?.getRootState()?.routes.at(-1)?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
-                    return;
-                }
-                clearSelectedTransactions(true);
-            };
-        }, [clearSelectedTransactions]),
-    );
-
     const reportID = report?.reportID;
-
-    // Skeleton placeholder for super-wide RHP: shown while the deferred write is pending
-    // and dismissed when the optimistic transaction appears. If the deferred write is delayed
-    // (up to 5s safety timeout), the skeleton may linger - this is acceptable as a visual
-    // hint that the expense is being processed. The transaction count comparison is a
-    // heuristic; simultaneous add+remove is rare enough not to warrant a dedicated signal.
-    const [showPendingExpensePlaceholder, setShowPendingExpensePlaceholder] = useState(false);
-    const transactionCountWhenSkeletonShown = useRef<number | null>(null);
-
-    const hasOptimisticNewTransaction = useMemo(() => transactions.some((t) => getTransactionPendingAction(t) === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD), [transactions]);
-
-    useFocusEffect(
-        useCallback(() => {
-            if (!showPendingExpensePlaceholder) {
-                const pending = getPendingSubmitFollowUpAction();
-                const hasPendingSubmit =
-                    pending?.followUpAction === CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.DISMISS_MODAL_ONLY &&
-                    pending?.reportID === reportID &&
-                    isReportOpenInSuperWideRHP(navigationRef.getRootState());
-
-                if (!hasPendingSubmit || hasOptimisticNewTransaction) {
-                    return;
-                }
-
-                transactionCountWhenSkeletonShown.current = transactions.length;
-                setShowPendingExpensePlaceholder(true);
-                return;
-            }
-
-            if (!hasOptimisticNewTransaction && (transactionCountWhenSkeletonShown.current === null || transactions.length <= transactionCountWhenSkeletonShown.current)) {
-                return;
-            }
-
-            transactionCountWhenSkeletonShown.current = null;
-            setShowPendingExpensePlaceholder(false);
-        }, [showPendingExpensePlaceholder, reportID, transactions.length, hasOptimisticNewTransaction]),
-    );
-
-    useEffect(() => {
-        clearSelectedTransactions(true);
-        // We don't want to run the effect on change of clearSelectedTransactions since it can cause an infinite loop.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [reportID]);
+    const showPendingExpensePlaceholder = useMoneyRequestReportPendingExpense(reportID, transactions);
 
     const {sortBy, sortOrder, onSortPress, sortedTransactions, resolvedTransactions, highlightedTransactionIDs, transactionThreadReportIDByTransactionID, violationsByTransactionID} =
         useMoneyRequestReportSortedTransactions({
@@ -311,12 +225,10 @@ function MoneyRequestReportTransactionList({
             policyTagLists,
         });
 
-    const {columnsToShow, dateColumnSize, postedColumnSize, amountColumnSize, taxAmountColumnSize, minTableWidth, shouldScrollHorizontally, isExpenseReportViewFromIOUReport} =
-        useMoneyRequestReportColumns({report, policy, transactions, reportActions});
-
+    const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report);
     const {currentSelection, currentGroupBy, shouldGroupTransactions, selectLayout} = useMoneyRequestReportLayout(shouldShowGroupedTransactions);
 
-    const {groupedTransactions, listItems, visualOrderTransactionIDs, lastTransactionID} = useMoneyRequestReportGroupedTransactions({
+    const {groupedTransactions, listItems, visualOrderTransactions, visualOrderTransactionIDs, lastTransactionID} = useMoneyRequestReportGroupedTransactions({
         reportCurrency: report.currency ?? '',
         sortedTransactions,
         resolvedTransactions,
@@ -324,106 +236,68 @@ function MoneyRequestReportTransactionList({
         shouldGroupTransactions,
         isOffline,
     });
-    useMoneyRequestReportActiveTransactionIDs(visualOrderTransactionIDs);
-
-    const groupSelectionState = useMemo(() => {
-        const state = new Map<string, {isSelected: boolean; isIndeterminate: boolean; isDisabled: boolean; pendingAction?: PendingAction}>();
+    useMoneyRequestReportActiveTransactionIDs(visualOrderTransactionIDs, report?.reportID);
 
-        for (const group of groupedTransactions) {
-            const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID);
-            const groupPendingAction = group.transactions.some((t) => getTransactionPendingAction(t)) ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : undefined;
-
-            if (groupTransactionIDs.length === 0) {
-                state.set(group.groupKey, {isSelected: false, isIndeterminate: false, isDisabled: true, pendingAction: groupPendingAction});
-                continue;
-            }
+    const {isMobileSelectionModeEnabled, toggleTransaction, isTransactionSelected, groupSelectionState, toggleGroupSelection, selectableTransactionIDs, toggleAll} =
+        useMoneyRequestReportTransactionSelection({
+            reportID,
+            groupedTransactions,
+            visualOrderTransactions,
+        });
 
-            const selectedCount = groupTransactionIDs.filter((id) => selectedTransactionIDs.includes(id)).length;
-            state.set(group.groupKey, {
-                isSelected: selectedCount === groupTransactionIDs.length,
-                isIndeterminate: selectedCount > 0 && selectedCount < groupTransactionIDs.length,
-                isDisabled: false,
-                pendingAction: groupPendingAction,
-            });
-        }
+    const {columnsToShow, dateColumnSize, postedColumnSize, amountColumnSize, taxAmountColumnSize, minTableWidth, shouldScrollHorizontally, isExpenseReportViewFromIOUReport} =
+        useMoneyRequestReportColumns({report, policy, transactions, reportActions});
 
-        return state;
-    }, [groupedTransactions, selectedTransactionIDs]);
-
-    const toggleGroupSelection = useCallback(
-        (groupKey: string) => {
-            const group = groupedTransactions.find((g) => g.groupKey === groupKey);
-            if (!group) {
-                return;
-            }
-            const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID);
-            const anySelected = groupTransactionIDs.some((id) => selectedTransactionIDs.includes(id));
-
-            let newSelectedTransactionIDs = selectedTransactionIDs;
-            if (anySelected) {
-                newSelectedTransactionIDs = selectedTransactionIDs.filter((id) => !groupTransactionIDs.includes(id));
-            } else {
-                newSelectedTransactionIDs = [...selectedTransactionIDs, ...groupTransactionIDs];
-            }
-            setSelectedTransactions(newSelectedTransactionIDs);
-        },
-        [groupedTransactions, selectedTransactionIDs, setSelectedTransactions],
-    );
+    const {reportPendingAction} = getReportOfflinePendingActionAndErrors(report);
+    const {totalDisplaySpend} = getMoneyRequestSpendBreakdown(report);
+    const hasPendingAction = hasPendingDeletionTransaction || transactions.some(getTransactionPendingAction);
+    // `.length === 0` instead of lodash isEmpty: the compiler must treat an external call as possibly
+    // mutating its argument, which extends the array's mutable range and blocks memoization downstream.
+    const isEmptyTransactions = transactions.length === 0;
 
     /**
      * Navigate to the transaction thread for a transaction, creating one optimistically if it doesn't yet exist.
      */
-    const navigateToTransaction = useCallback(
-        (activeTransactionID: string) => {
-            navigateToTransactionThread({
-                transactionID: activeTransactionID,
-                reportActions,
-                report,
-                transaction: sortedTransactions.find((t) => t.transactionID === activeTransactionID),
-                siblingTransactionIDs: visualOrderTransactionIDs,
-            });
-        },
-        [navigateToTransactionThread, reportActions, sortedTransactions, report, visualOrderTransactionIDs],
-    );
+    const navigateToTransaction = (activeTransactionID: string) => {
+        navigateToTransactionThread({
+            transactionID: activeTransactionID,
+            reportActions,
+            report,
+            transaction: sortedTransactions.find((t) => t.transactionID === activeTransactionID),
+            siblingTransactionIDs: visualOrderTransactionIDs,
+            // Not `carouselSource`: this list unmounts behind the expense it just opened, and its teardown must
+            // not clear the carousel it seeded for that expense.
+            carouselSource: CAROUSEL_SOURCE.reportRow(report?.reportID),
+        });
+    };
 
-    const isEmptyTransactions = isEmpty(transactions);
-
-    const handleLongPress = useCallback(
-        (transactionID: string) => {
-            if (!isSmallScreenWidth) {
-                return;
-            }
-            if (isMobileSelectionModeEnabled) {
-                toggleTransaction(transactionID);
-                return;
-            }
-            longPressModalRef.current?.show(transactionID);
-        },
-        [isSmallScreenWidth, isMobileSelectionModeEnabled, toggleTransaction],
-    );
+    const handleLongPress = (transactionID: string) => {
+        if (!isSmallScreenWidth) {
+            return;
+        }
+        if (isMobileSelectionModeEnabled) {
+            toggleTransaction(transactionID);
+            return;
+        }
+        longPressModalRef.current?.show(transactionID);
+    };
 
-    const handleOnPress = useCallback(
-        (transactionID: string) => {
-            if (isMobileSelectionModeEnabled) {
-                toggleTransaction(transactionID);
-                return;
-            }
+    const handleOnPress = (transactionID: string) => {
+        if (isMobileSelectionModeEnabled) {
+            toggleTransaction(transactionID);
+            return;
+        }
 
-            navigateToTransaction(transactionID);
-        },
-        [isMobileSelectionModeEnabled, toggleTransaction, navigateToTransaction],
-    );
+        navigateToTransaction(transactionID);
+    };
 
-    const handleArrowRightPress = useCallback(
-        (transactionID: string) => {
-            navigateToTransaction(transactionID);
-        },
-        [navigateToTransaction],
-    );
+    const handleArrowRightPress = (transactionID: string) => {
+        navigateToTransaction(transactionID);
+    };
 
-    const openColumnsPage = useCallback(() => {
+    const openColumnsPage = () => {
         Navigation.navigate(ROUTES.REPORT_SETTINGS_COLUMNS.getRoute(report.reportID));
-    }, [report.reportID]);
+    };
 
     const renderTransactionListItem = (item: TransactionListItemData, position: {isFirst: boolean; isLast: boolean}) => {
         const narrowSectionWrapperStyle = shouldUseNarrowLayout
@@ -538,7 +412,8 @@ function MoneyRequestReportTransactionList({
     const tableColumnHeader =
         isEmptyTransactions || shouldUseNarrowLayout ? null : (
             <MoneyRequestReportTableHeaderRow
-                transactions={transactions}
+                selectableTransactionIDs={selectableTransactionIDs}
+                onToggleAll={toggleAll}
                 pendingAction={reportPendingAction}
                 columns={columnsToShow}
                 sortBy={sortBy}
@@ -608,7 +483,7 @@ function MoneyRequestReportTransactionList({
     );
 }
 
-export default memo(MoneyRequestReportTransactionList);
+export default MoneyRequestReportTransactionList;
 export type {TransactionWithOptionalHighlight} from './useMoneyRequestReportSortedTransactions';
 export type {TransactionListItemData} from './useMoneyRequestReportGroupedTransactions';
 export type {MoneyRequestReportTransactionListController};
diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation.tsx
index c1ca42771c85..b32101cdbb08 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation.tsx
@@ -1,119 +1,206 @@
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import PrevNextButtons from '@components/PrevNextButtons';
+import Text from '@components/Text';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
+import useCarouselTransactionIDs from '@hooks/useCarouselTransactionIDs';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
 
-import {createTransactionThreadReport, openReport, setOptimisticTransactionThread} from '@libs/actions/Report';
+import {openReport, setOptimisticTransactionThread} from '@libs/actions/Report';
 import {clearActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import type {RightModalNavigatorParamList} from '@libs/Navigation/types';
-import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
+import {getExpenseCreationTransactionID} from '@libs/ReportActionsUtils';
+import {findSelfDMReportID, isOneTransactionReport} from '@libs/ReportUtils';
+import type {TransactionThreadNavigationDescriptor} from '@libs/TransactionThreadNavigationUtils';
 import {getReportIDToOpenForExpense} from '@libs/TransactionThreadNavigationUtils';
 
 import Navigation from '@navigation/Navigation';
 import navigationRef from '@navigation/navigationRef';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import getEmptyArray from '@src/types/utils/getEmptyArray';
 
 import type {GestureResponderEvent} from 'react-native';
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {findFocusedRoute, useIsFocused} from '@react-navigation/native';
 import {guidedSetupAndTourStatusSelector} from '@selectors/Onboarding';
 import React, {startTransition, useCallback, useEffect, useMemo, useRef} from 'react';
+import {View} from 'react-native';
+
+const CAROUSEL_PRESERVING_SCREENS = [
+    SCREENS.RIGHT_MODAL.SEARCH_REPORT,
+    SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT,
+    SCREENS.RIGHT_MODAL.EXPENSE_REPORT,
+    SCREENS.TRANSACTION_DUPLICATE.DYNAMIC_REVIEW,
+] as const;
 
 type MoneyRequestReportRHPNavigationButtonsProps = {
     currentTransactionID: string;
     isFromReviewDuplicates?: boolean;
+    shouldDisplayNarrowVersion?: boolean;
+};
+
+type PrevNextParentReportActions = {
+    prevParentReportAction: OnyxTypes.ReportAction | undefined;
+    nextParentReportAction: OnyxTypes.ReportAction | undefined;
+};
+
+/**
+ * Only the prev/next parent actions are ever read, so resolve them while scanning instead of collecting every money
+ * request action on the parent reports (fast-equals compares the resulting collection on every Onyx update).
+ */
+const collectParentReportActions = (
+    reportActions: OnyxEntry<OnyxTypes.ReportActions>,
+    prevTransactionID: string | undefined,
+    nextTransactionID: string | undefined,
+    parentActions: PrevNextParentReportActions,
+) => {
+    for (const action of Object.values(reportActions ?? {})) {
+        const transactionID = getExpenseCreationTransactionID(action);
+        if (!transactionID) {
+            continue;
+        }
+        if (transactionID === prevTransactionID && !parentActions.prevParentReportAction) {
+            // eslint-disable-next-line no-param-reassign -- intentionally mutates the shared accumulator so callers can resolve both actions in a single pass across multiple report-action sources
+            parentActions.prevParentReportAction = action;
+        }
+        if (transactionID === nextTransactionID && !parentActions.nextParentReportAction) {
+            // eslint-disable-next-line no-param-reassign -- intentionally mutates the shared accumulator so callers can resolve both actions in a single pass across multiple report-action sources
+            parentActions.nextParentReportAction = action;
+        }
+    }
 };
 
-function MoneyRequestReportTransactionsNavigation({currentTransactionID, isFromReviewDuplicates}: MoneyRequestReportRHPNavigationButtonsProps) {
-    const [transactionIDsList = getEmptyArray<string>()] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
+function MoneyRequestReportTransactionsNavigation({currentTransactionID, isFromReviewDuplicates, shouldDisplayNarrowVersion}: MoneyRequestReportRHPNavigationButtonsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    // Shared with the header, which uses the same filtered list to decide whether to render this carousel at all.
+    const {transactionIDs: transactionIDsList, snapshot} = useCarouselTransactionIDs();
+    // Snapshot-backed flows (e.g. Home "Recently added") seed a descriptor per sibling so the carousel can
+    // resolve (and lazily create) each sibling's thread on demand even when the sibling isn't in the live collection.
     const [siblingDescriptorsByTransactionID] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS);
+    const {markReportRHPWidth} = useWideRHPActions();
+    // Values required to create a transaction thread on the fly when paging onto an expense that has no thread yet.
+    const {accountID, email} = useCurrentUserPersonalDetails();
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
     const personalDetails = usePersonalDetails();
 
-    const {email: currentUserEmail, accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
-    const {markReportRHPWidth} = useWideRHPActions();
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
 
+    const currentTransactionIndex = transactionIDsList.findIndex((id) => id === currentTransactionID);
+
+    // A press made before the sibling's parent action has loaded is parked here and replayed once it arrives.
     const pendingSiblingRef = useRef<{transactionID: string; originRoute: string} | null>(null);
 
     const {prevTransactionID, nextTransactionID} = useMemo(() => {
-        if (!transactionIDsList || transactionIDsList.length < 2) {
+        if (transactionIDsList.length < 2 || currentTransactionIndex === -1) {
             return {prevTransactionID: undefined, nextTransactionID: undefined};
         }
 
-        const currentTransactionIndex = transactionIDsList.findIndex((id) => id === currentTransactionID);
-
-        const prevID = currentTransactionIndex > 0 ? transactionIDsList.at(currentTransactionIndex - 1) : undefined;
-        const nextID = transactionIDsList.at(currentTransactionIndex + 1);
-
         return {
-            prevTransactionID: prevID,
-            nextTransactionID: nextID,
+            prevTransactionID: currentTransactionIndex > 0 ? transactionIDsList.at(currentTransactionIndex - 1) : undefined,
+            nextTransactionID: transactionIDsList.at(currentTransactionIndex + 1),
         };
-    }, [currentTransactionID, transactionIDsList]);
+    }, [currentTransactionIndex, transactionIDsList]);
 
     const prevNextTransactionsSelector = useCallback(
         (allTransactions: OnyxCollection<OnyxTypes.Transaction>) =>
-            [currentTransactionID, prevTransactionID, nextTransactionID].map((transactionID) => allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]),
-        [currentTransactionID, nextTransactionID, prevTransactionID],
+            [currentTransactionID, prevTransactionID, nextTransactionID].map((transactionID) => {
+                const key = `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}` as const;
+                return allTransactions?.[key] ?? snapshot?.data?.[key];
+            }),
+        [currentTransactionID, nextTransactionID, prevTransactionID, snapshot],
     );
 
     const [[currentTransaction, prevTransaction, nextTransaction] = getEmptyArray<OnyxTypes.Transaction>()] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
         selector: prevNextTransactionsSelector,
     });
 
+    const prevTransactionReportID = prevTransaction?.reportID;
+    const nextTransactionReportID = nextTransaction?.reportID;
+
     // Only the prev/next parent actions are ever read, so resolve them inside the selector instead of returning
     // a Map of every money request action on the three parent reports (fast-equals compares Maps in O(n^2)).
     const parentReportActionsSelector = useCallback(
         (allReportActions: OnyxCollection<OnyxTypes.ReportActions>) => {
-            let prevParentReportAction: OnyxTypes.ReportAction | undefined;
-            let nextParentReportAction: OnyxTypes.ReportAction | undefined;
+            // An unreported (self-DM) sibling's IOU action lives in the self-DM, since report "0" holds no actions
+            // of its own. Looking it up there is the only way such a sibling resolves from live data at all.
+            const isPrevUnreported = prevTransactionReportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+            const isNextUnreported = nextTransactionReportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+            const selfDMReportID = isPrevUnreported || isNextUnreported ? findSelfDMReportID() : undefined;
+            const prevActionsReportID = isPrevUnreported ? selfDMReportID : prevTransactionReportID;
+            const nextActionsReportID = isNextUnreported ? selfDMReportID : nextTransactionReportID;
+            // Whether the sibling's parent report has any actions at all, which is what separates "not fetched yet"
+            // from "fetched, but this expense has no creation action". Only the former is worth waiting for.
+            const hasPrevParentReportActions = !!Object.keys(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${prevActionsReportID}`] ?? {}).length;
+            const hasNextParentReportActions = !!Object.keys(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${nextActionsReportID}`] ?? {}).length;
+            const parentActions: PrevNextParentReportActions = {prevParentReportAction: undefined, nextParentReportAction: undefined};
             if (!prevTransactionID && !nextTransactionID) {
-                return {prevParentReportAction, nextParentReportAction};
+                return {...parentActions, hasPrevParentReportActions, hasNextParentReportActions};
             }
-            const parentReportIDs = new Set([currentTransaction?.reportID, prevTransaction?.reportID, nextTransaction?.reportID]);
+            const parentReportIDs = new Set([currentTransaction?.reportID, prevActionsReportID, nextActionsReportID]);
             for (const parentReportID of parentReportIDs) {
-                for (const action of Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? {})) {
-                    const transactionID = isMoneyRequestAction(action) ? getOriginalMessage(action)?.IOUTransactionID : undefined;
-                    if (!transactionID) {
-                        continue;
-                    }
-                    if (transactionID === prevTransactionID) {
-                        prevParentReportAction = action;
-                    }
-                    if (transactionID === nextTransactionID) {
-                        nextParentReportAction = action;
-                    }
-                }
+                const key = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}` as const;
+                collectParentReportActions(allReportActions?.[key], prevTransactionID, nextTransactionID, parentActions);
             }
-            return {prevParentReportAction, nextParentReportAction};
+            return {...parentActions, hasPrevParentReportActions, hasNextParentReportActions};
         },
-        [currentTransaction?.reportID, nextTransaction?.reportID, nextTransactionID, prevTransaction?.reportID, prevTransactionID],
+        [currentTransaction?.reportID, nextTransactionReportID, nextTransactionID, prevTransactionReportID, prevTransactionID],
     );
 
-    const [parentReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {
+    const [reportedParentReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {
         selector: parentReportActionsSelector,
     });
 
-    const prevParentReportAction = parentReportActions?.prevParentReportAction;
-    const nextParentReportAction = parentReportActions?.nextParentReportAction;
-
-    const [prevParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${prevTransaction?.reportID}`);
-    const [nextParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${nextTransaction?.reportID}`);
-    const [prevThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${prevParentReportAction?.childReportID}`);
-    const [nextThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${nextParentReportAction?.childReportID}`);
+    // The live pass above resolves a sibling from its parent report's actions (the self-DM's, for an unreported
+    // one), so it only finds what has already been fetched into Onyx. Scanning the snapshot's report actions is
+    // what resolves a sibling whose parent actions were never loaded in this session.
+    const snapshotData = snapshot?.data;
+    const snapshotParentReportActions = useMemo(() => {
+        const parentActions: PrevNextParentReportActions = {prevParentReportAction: undefined, nextParentReportAction: undefined};
+        if (snapshotData && (prevTransactionID ?? nextTransactionID)) {
+            for (const [key, reportActionsForReport] of Object.entries(snapshotData)) {
+                if (key.startsWith(ONYXKEYS.COLLECTION.REPORT_ACTIONS)) {
+                    collectParentReportActions(reportActionsForReport as OnyxTypes.ReportActions, prevTransactionID, nextTransactionID, parentActions);
+                }
+            }
+        }
+        return parentActions;
+    }, [nextTransactionID, prevTransactionID, snapshotData]);
+
+    // Live report actions win over the snapshot: the snapshot only fills in siblings the live pass couldn't resolve
+    // (i.e. unreported ones). A search snapshot is a point-in-time copy, so for a reported transaction it can hold an
+    // older copy of the same IOU action, for example one still missing the childReportID of a thread that has since
+    // been created. Letting that stale copy win would make prev/next believe the sibling has no thread and create a
+    // duplicate one instead of navigating to the existing thread.
+    const prevParentReportAction = reportedParentReportActions?.prevParentReportAction ?? snapshotParentReportActions.prevParentReportAction;
+    const nextParentReportAction = reportedParentReportActions?.nextParentReportAction ?? snapshotParentReportActions.nextParentReportAction;
+
+    const prevParentReportID = prevParentReportAction?.reportID ?? prevTransaction?.reportID;
+    const nextParentReportID = nextParentReportAction?.reportID ?? nextTransaction?.reportID;
+
+    const [livePrevThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${prevParentReportAction?.childReportID}`);
+    const [liveNextThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${nextParentReportAction?.childReportID}`);
+    const [livePrevTransactionParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${prevParentReportID}`);
+    const [liveNextTransactionParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${nextParentReportID}`);
+
+    // Fall back to the search snapshot for reports that aren't in the live collection yet.
+    const prevThreadReport = livePrevThreadReport ?? snapshot?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${prevParentReportAction?.childReportID}`];
+    const nextThreadReport = liveNextThreadReport ?? snapshot?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${nextParentReportAction?.childReportID}`];
+    const prevTransactionParentReport = livePrevTransactionParentReport ?? snapshot?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${prevParentReportID}`];
+    const nextTransactionParentReport = liveNextTransactionParentReport ?? snapshot?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${nextParentReportID}`];
 
     /**
      * We clear the sibling transactionThreadIDs when unmounting this component
@@ -122,7 +209,7 @@ function MoneyRequestReportTransactionsNavigation({currentTransactionID, isFromR
     useEffect(() => {
         return () => {
             const focusedRoute = findFocusedRoute(navigationRef.getRootState());
-            if (focusedRoute?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT || focusedRoute?.name === SCREENS.TRANSACTION_DUPLICATE.DYNAMIC_REVIEW) {
+            if (focusedRoute?.name && (CAROUSEL_PRESERVING_SCREENS as readonly string[]).includes(focusedRoute.name)) {
                 return;
             }
             clearActiveTransactionIDs();
@@ -130,176 +217,196 @@ function MoneyRequestReportTransactionsNavigation({currentTransactionID, isFromR
     }, []);
 
     const stageSiblingPress = (transactionID: string | undefined, parentReportID: string | undefined) => {
-        // Offline there is no fetch to wait for, so the caller builds the thread optimistically instead.
-        if (!transactionID || !parentReportID || isOffline) {
+        // Offline there is no fetch to wait for, so the caller resolves the sibling with what it already has.
+        // Report "0" isn't a report that can be fetched either, so an unreported sibling never waits.
+        if (!transactionID || !parentReportID || parentReportID === CONST.REPORT.UNREPORTED_REPORT_ID || isOffline) {
             return false;
         }
         pendingSiblingRef.current = {transactionID, originRoute: Navigation.getActiveRoute()};
         // Always true here: we are fetching this report's actions, so it must not overwrite its cached name.
-        openReport({reportID: parentReportID, introSelected, conciergeChat, currentUserAccountID, hasReportActions: true});
+        openReport({reportID: parentReportID, introSelected, conciergeChat, currentUserAccountID: accountID, hasReportActions: true});
         return true;
     };
 
-    const onNext = (e: GestureResponderEvent | KeyboardEvent | undefined) => {
-        e?.preventDefault();
-
+    const getBackTo = () => {
         let backTo = Navigation.getActiveRoute();
         if (isFromReviewDuplicates) {
             const currentRoute = navigationRef.getCurrentRoute();
             const params = currentRoute?.params as RightModalNavigatorParamList[typeof SCREENS.RIGHT_MODAL.SEARCH_REPORT] | undefined;
             backTo = params?.backTo ?? backTo;
         }
+        return backTo;
+    };
+
+    const resolveContext = {
+        introSelected,
+        conciergeChat,
+        currentUserEmail: email,
+        currentUserAccountID: accountID,
+        personalDetails,
+        isSelfTourViewed: guidedSetupAndTourStatus?.isSelfTourViewed,
+        hasCompletedGuidedSetupFlow: guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow,
+    };
+
+    /**
+     * Resolves which report shows a sibling expense, creating its transaction thread only when one doesn't exist.
+     *
+     * Both directions run through here so they can't drift apart: an earlier version resolved "next" and "previous"
+     * with two near-identical copies of this logic, and stepping forward then back could land on a different screen
+     * than the one the user started on.
+     */
+    const resolveSiblingReportID = (
+        siblingTransactionID: string | undefined,
+        siblingTransaction: OnyxTypes.Transaction | undefined,
+        siblingParentReportAction: OnyxTypes.ReportAction | undefined,
+        siblingParentReport: OnyxEntry<OnyxTypes.Report>,
+        siblingThreadReport: OnyxEntry<OnyxTypes.Report>,
+    ): string | undefined => {
+        if (!siblingTransactionID) {
+            return undefined;
+        }
+
+        const isReported = !!siblingTransaction?.reportID && siblingTransaction.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID;
+
+        // A report holding a single expense *is* that expense's view, so open it directly rather than its thread.
+        // Home's "Review expenses" entry point applies the same rule, so stepping back returns the user to the
+        // screen they came from.
+        if (isReported && isOneTransactionReport(siblingParentReport)) {
+            return siblingTransaction?.reportID;
+        }
 
         // Snapshot-backed flows (e.g. Home "Recently added") seed a descriptor per sibling because the sibling
         // transactions may be absent from the main Onyx collections. Resolve the target sibling lazily here so
         // we only ever create a thread for the expense the user actually navigates to, then let OpenReport
         // hydrate it on arrival.
-        const nextDescriptor = nextTransactionID ? siblingDescriptorsByTransactionID?.[nextTransactionID] : undefined;
-        if (nextDescriptor) {
-            requestAnimationFrame(() => {
-                const nextReportID = getReportIDToOpenForExpense(nextDescriptor, {
-                    introSelected,
-                    conciergeChat,
-                    isSelfTourViewed: guidedSetupAndTourStatus?.isSelfTourViewed,
-                    hasCompletedGuidedSetupFlow: guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow,
-                    currentUserEmail,
-                    currentUserAccountID,
-                    personalDetails,
-                });
-                markReportRHPWidth(nextReportID, 'wide');
-                requestAnimationFrame(() =>
-                    startTransition(() =>
-                        Navigation.setParams({
-                            reportID: nextReportID,
-                            reportActionID: undefined,
-                            backTo,
-                        }),
-                    ),
-                );
-            });
-            return;
+        const descriptor: TransactionThreadNavigationDescriptor | undefined = siblingDescriptorsByTransactionID?.[siblingTransactionID];
+        if (descriptor) {
+            return getReportIDToOpenForExpense(descriptor, resolveContext);
         }
 
-        // A thread created before the parent action loads would have no parent, so wait for the fetch.
-        if (!nextParentReportAction && stageSiblingPress(nextTransactionID, nextTransaction?.reportID)) {
-            return;
+        const threadReportID = siblingParentReportAction?.childReportID;
+        if (threadReportID) {
+            if (!siblingThreadReport) {
+                // The thread exists server-side but hasn't been fetched, so materialize it before navigating.
+                setOptimisticTransactionThread(threadReportID, siblingParentReport?.reportID, siblingParentReportAction?.reportActionID, siblingParentReport?.policyID);
+            }
+            return threadReportID;
         }
 
-        const nextThreadReportID = nextParentReportAction?.childReportID;
-        const navigationParams = {
-            reportID: nextThreadReportID,
-            reportActionID: undefined,
-            backTo,
-        };
+        if (!siblingTransaction) {
+            return undefined;
+        }
 
-        requestAnimationFrame(() => {
-            if (nextThreadReportID) {
-                markReportRHPWidth(nextThreadReportID, 'wide');
-            }
-            // We know that the next thread report exists, it just wasn't fetched to Onyx yet, so we set it optimistically.
-            if (!nextThreadReport && nextThreadReportID) {
-                setOptimisticTransactionThread(nextThreadReportID, nextParentReport?.reportID, nextParentReportAction?.reportActionID, nextParentReport?.policyID);
-            }
-            // The transaction thread doesn't exist yet, so we should create it
-            if (!nextThreadReportID) {
-                const transactionThreadReport = createTransactionThreadReport({
-                    introSelected,
-                    conciergeChat,
-                    isSelfTourViewed: guidedSetupAndTourStatus?.isSelfTourViewed,
-                    hasCompletedGuidedSetupFlow: guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow,
-                    currentUserLogin: currentUserEmail ?? '',
-                    currentUserAccountID,
-                    iouReport: nextParentReport,
-                    iouReportAction: nextParentReportAction,
-                    transaction: nextTransaction,
-                    personalDetails,
-                });
-                navigationParams.reportID = transactionThreadReport?.reportID;
-            }
-            // Wait for the next frame to ensure Onyx has processed the optimistic data updates from setOptimisticTransactionThread or createTransactionThreadReport before navigating
-            requestAnimationFrame(() => startTransition(() => Navigation.setParams(navigationParams)));
-        });
+        // No thread yet. The shared resolver creates one, including for an unreported (self-DM) expense, whose IOU
+        // action lives in the self-DM rather than under report "0". Those used to fall through with no target at
+        // all and dump the user in their self-DM.
+        return getReportIDToOpenForExpense(
+            {
+                reportID: siblingTransaction.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID,
+                transaction: siblingTransaction,
+                reportAction: siblingParentReportAction,
+                report: siblingParentReport ?? undefined,
+            },
+            resolveContext,
+        );
     };
 
-    const onPrevious = (e: GestureResponderEvent | KeyboardEvent | undefined) => {
-        e?.preventDefault();
-
-        let backTo = Navigation.getActiveRoute();
-        if (isFromReviewDuplicates) {
-            const currentRoute = navigationRef.getCurrentRoute();
-            const params = currentRoute?.params as RightModalNavigatorParamList[typeof SCREENS.RIGHT_MODAL.SEARCH_REPORT] | undefined;
-            backTo = params?.backTo ?? backTo;
+    /**
+     * Whether a press on a sibling's arrow can land anywhere, without the side effects `resolveSiblingReportID`
+     * has (it creates threads). Every resolution path there needs the sibling to be known from at least one of
+     * a descriptor, an existing thread on its parent action, or its transaction.
+     *
+     * The arrows used to be disabled from list *position* alone, with resolvability consulted only inside the
+     * handler, which bailed silently - an enabled arrow whose press did nothing, with no spinner and no error.
+     */
+    const canResolveSibling = (
+        siblingTransactionID: string | undefined,
+        siblingTransaction: OnyxTypes.Transaction | undefined,
+        siblingParentReportAction: OnyxTypes.ReportAction | undefined,
+    ) => {
+        if (!siblingTransactionID) {
+            return false;
         }
+        // An existing thread or a descriptor resolves on its own, with nothing else needed.
+        if (!!siblingParentReportAction?.childReportID || !!siblingDescriptorsByTransactionID?.[siblingTransactionID]) {
+            return true;
+        }
+        // Everything else is resolved from the transaction: it is what a thread gets created from.
+        if (!siblingTransaction) {
+            return false;
+        }
+        // A reported expense can always fall back on its own report, and its parent's actions can still be fetched
+        // to find (or create) its thread. An unreported one has neither: report "0" isn't a report to open or to
+        // fetch actions from, and its IOU action lives in the self-DM. Unless that action is already resolved -
+        // from the self-DM, the search snapshot or a descriptor - a press would have nowhere to go, so don't offer
+        // an arrow that can't move.
+        return siblingTransaction.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID || !!siblingParentReportAction;
+    };
 
-        // See onNext: resolve the target sibling lazily from its descriptor when present.
-        const prevDescriptor = prevTransactionID ? siblingDescriptorsByTransactionID?.[prevTransactionID] : undefined;
-        if (prevDescriptor) {
-            requestAnimationFrame(() => {
-                const prevReportID = getReportIDToOpenForExpense(prevDescriptor, {
-                    introSelected,
-                    conciergeChat,
-                    isSelfTourViewed: guidedSetupAndTourStatus?.isSelfTourViewed,
-                    hasCompletedGuidedSetupFlow: guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow,
-                    currentUserEmail,
-                    currentUserAccountID,
-                    personalDetails,
-                });
-                markReportRHPWidth(prevReportID, 'wide');
-                requestAnimationFrame(() =>
-                    startTransition(() =>
-                        Navigation.setParams({
-                            reportID: prevReportID,
-                            reportActionID: undefined,
-                            backTo,
-                        }),
-                    ),
-                );
-            });
+    const navigateToSibling = (
+        e: GestureResponderEvent | KeyboardEvent | undefined,
+        siblingTransactionID: string | undefined,
+        siblingTransaction: OnyxTypes.Transaction | undefined,
+        siblingParentReportAction: OnyxTypes.ReportAction | undefined,
+        siblingParentReport: OnyxEntry<OnyxTypes.Report>,
+        siblingThreadReport: OnyxEntry<OnyxTypes.Report>,
+        hasSiblingParentReportActions: boolean,
+    ) => {
+        e?.preventDefault();
+        const backTo = getBackTo();
+
+        // A thread created before the parent action loads would have no parent, so wait for the fetch - but only
+        // when there is a fetch that could produce it. A parent report whose actions are already loaded won't grow
+        // a creation action by being re-fetched, a descriptor-backed sibling carries its own resolution, and a
+        // one-transaction report is opened directly; all three fall through to the resolver instead of waiting.
+        const hasDescriptor = !!siblingTransactionID && !!siblingDescriptorsByTransactionID?.[siblingTransactionID];
+        const isSingleExpenseReport = !!siblingTransaction?.reportID && siblingTransaction.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID && isOneTransactionReport(siblingParentReport);
+        if (
+            !siblingParentReportAction &&
+            !hasSiblingParentReportActions &&
+            !hasDescriptor &&
+            !isSingleExpenseReport &&
+            stageSiblingPress(siblingTransactionID, siblingTransaction?.reportID)
+        ) {
             return;
         }
 
-        // A thread created before the parent action loads would have no parent, so wait for the fetch.
-        if (!prevParentReportAction && stageSiblingPress(prevTransactionID, prevTransaction?.reportID)) {
+        const targetReportID = resolveSiblingReportID(siblingTransactionID, siblingTransaction, siblingParentReportAction, siblingParentReport, siblingThreadReport);
+
+        // Report "0" is the unreported placeholder, not a report that can be opened. Navigating to it lands the user
+        // on their self-DM (or a "not here" page), so stay put instead.
+        if (!siblingTransactionID || !targetReportID || targetReportID === CONST.REPORT.UNREPORTED_REPORT_ID) {
             return;
         }
 
-        const prevThreadReportID = prevParentReportAction?.childReportID;
-        const navigationParams = {
-            reportID: prevThreadReportID,
-            reportActionID: undefined,
-            backTo,
-        };
-
-        requestAnimationFrame(() => {
-            if (prevThreadReportID) {
-                markReportRHPWidth(prevThreadReportID, 'wide');
-            }
-            // We know that the previous thread report exists, it just wasn't fetched to Onyx yet, so we set it optimistically.
-            if (!prevThreadReport && prevThreadReportID) {
-                setOptimisticTransactionThread(prevThreadReportID, prevParentReport?.reportID, prevParentReportAction?.reportActionID, prevParentReport?.policyID);
-            }
-            // The transaction thread doesn't exist yet, so we should create it
-            if (!prevThreadReportID) {
-                const transactionThreadReport = createTransactionThreadReport({
-                    introSelected,
-                    conciergeChat,
-                    isSelfTourViewed: guidedSetupAndTourStatus?.isSelfTourViewed,
-                    hasCompletedGuidedSetupFlow: guidedSetupAndTourStatus?.hasCompletedGuidedSetupFlow,
-                    currentUserLogin: currentUserEmail ?? '',
-                    currentUserAccountID,
-                    iouReport: prevParentReport,
-                    iouReportAction: prevParentReportAction,
-                    transaction: prevTransaction,
-                    personalDetails,
-                });
-                navigationParams.reportID = transactionThreadReport?.reportID;
-            }
-            // Wait for the next frame to ensure Onyx has processed the optimistic data updates from setOptimisticTransactionThread or createTransactionThreadReport before navigating
-            requestAnimationFrame(() => startTransition(() => Navigation.setParams(navigationParams)));
-        });
+        markReportRHPWidth(targetReportID, 'wide');
+        // Wait for the next frame to ensure Onyx has processed any optimistic thread data before navigating
+        requestAnimationFrame(() => startTransition(() => Navigation.setParams({reportID: targetReportID, reportActionID: undefined, anchorTransactionID: siblingTransactionID, backTo})));
     };
 
-    // Replays a staged press once its parent action arrives, but only if the user is still where they pressed —
+    const onNext = (e: GestureResponderEvent | KeyboardEvent | undefined) =>
+        navigateToSibling(
+            e,
+            nextTransactionID,
+            nextTransaction,
+            nextParentReportAction,
+            nextTransactionParentReport,
+            nextThreadReport,
+            !!reportedParentReportActions?.hasNextParentReportActions,
+        );
+
+    const onPrevious = (e: GestureResponderEvent | KeyboardEvent | undefined) =>
+        navigateToSibling(
+            e,
+            prevTransactionID,
+            prevTransaction,
+            prevParentReportAction,
+            prevTransactionParentReport,
+            prevThreadReport,
+            !!reportedParentReportActions?.hasPrevParentReportActions,
+        );
+
+    // Replays a staged press once its parent action arrives, but only if the user is still where they pressed -
     // this screen stays mounted under a pushed RHP, and resuming from there would yank them out with a stale backTo.
     useEffect(() => {
         const pending = pendingSiblingRef.current;
@@ -322,17 +429,27 @@ function MoneyRequestReportTransactionsNavigation({currentTransactionID, isFromR
         // eslint-disable-next-line react-hooks/exhaustive-deps -- onNext/onPrevious are rebuilt every render, so listing them would defeat the dependency list
     }, [isFocused, nextTransactionID, nextParentReportAction, prevTransactionID, prevParentReportAction]);
 
-    if (transactionIDsList.length < 2) {
+    // Two entries are the minimum for there to be anything to page between, and an anchor that isn't in the list
+    // means this expense doesn't belong to the active carousel at all. The list belongs to a screen the user has
+    // since left. Showing arrows then would step to an unrelated expense.
+    if (transactionIDsList.length < 2 || currentTransactionIndex === -1) {
         return;
     }
 
     return (
-        <PrevNextButtons
-            isPrevButtonDisabled={!prevTransactionID}
-            isNextButtonDisabled={!nextTransactionID}
-            onNext={onNext}
-            onPrevious={onPrevious}
-        />
+        <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
+            {!shouldDisplayNarrowVersion && (
+                <Text style={[styles.mutedTextLabel, styles.textAlignRight, styles.tabularNums]}>
+                    {translate('common.currentOfTotal', {current: currentTransactionIndex + 1, total: transactionIDsList.length})}
+                </Text>
+            )}
+            <PrevNextButtons
+                isPrevButtonDisabled={!canResolveSibling(prevTransactionID, prevTransaction, prevParentReportAction)}
+                isNextButtonDisabled={!canResolveSibling(nextTransactionID, nextTransaction, nextParentReportAction)}
+                onNext={onNext}
+                onPrevious={onPrevious}
+            />
+        </View>
     );
 }
 
diff --git a/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx b/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx
index 19016c643d32..326535b4fdac 100644
--- a/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx
+++ b/src/components/MoneyRequestReportView/SelectionToolbar/index.tsx
@@ -23,6 +23,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {dismissRejectUseExplanation} from '@libs/actions/IOU/RejectMoneyRequest';
 import {queueExportSearchWithTemplate} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import {isEveryReportTransactionSelected, isSelectableReportTransaction} from '@libs/MoneyRequestReportUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportsSplitNavigatorParamList, RightModalNavigatorParamList} from '@libs/Navigation/types';
@@ -96,6 +97,8 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
     const [rejectModalAction, setRejectModalAction] = useState<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT_BULK> | null>(null);
 
     const transactionsWithoutPendingDelete = transactions.filter((t) => !isTransactionPendingDelete(t));
+    // Select All skips rejected expenses as well as ones being deleted, since their checkboxes are disabled. The list header and group headers use the same filter.
+    const selectableTransactions = transactions.filter(isSelectableReportTransaction);
 
     const beginExportWithTemplate = (templateName: string, templateType: string, transactionIDList: string[], exportName: string) => {
         if (isOffline) {
@@ -244,7 +247,8 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
     };
 
     const {reportPendingAction} = getReportOfflinePendingActionAndErrors(report);
-    const isSelectAllChecked = selectedTransactionIDs.length > 0 && selectedTransactionIDs.length === transactionsWithoutPendingDelete.length;
+    // Same check that decides whether Submit, Approve and Pay are offered, so the checkbox reads fully checked exactly when they are.
+    const isSelectAllChecked = isEveryReportTransactionSelected(transactions, selectedTransactionIDs);
 
     return (
         <>
@@ -281,9 +285,9 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
 
                         <SelectAllCheckbox
                             isSelectAllChecked={isSelectAllChecked}
-                            isIndeterminate={selectedTransactionIDs.length > 0 && selectedTransactionIDs.length !== transactionsWithoutPendingDelete.length}
+                            isIndeterminate={selectedTransactionIDs.length > 0 && !isSelectAllChecked}
                             hasAnySelected={selectedTransactionIDs.length > 0}
-                            onSelectAll={() => setSelectedTransactions(transactionsWithoutPendingDelete.map((t) => t.transactionID))}
+                            onSelectAll={() => setSelectedTransactions(selectableTransactions.map((t) => t.transactionID))}
                             onClearAll={() => clearSelectedTransactions(true)}
                         />
                     </View>
diff --git a/src/components/MoneyRequestReportView/useMoneyRequestReportActiveTransactionIDs.ts b/src/components/MoneyRequestReportView/useMoneyRequestReportActiveTransactionIDs.ts
index 02abfe48df34..2201ff67b620 100644
--- a/src/components/MoneyRequestReportView/useMoneyRequestReportActiveTransactionIDs.ts
+++ b/src/components/MoneyRequestReportView/useMoneyRequestReportActiveTransactionIDs.ts
@@ -1,50 +1,62 @@
-import {clearActiveTransactionIDs, getActiveTransactionIDs, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import {CAROUSEL_SOURCE, clearActiveTransactionIDsForSource, getActiveTransactionIDs, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import {navigationRef} from '@libs/Navigation/Navigation';
 
 import SCREENS from '@src/SCREENS';
 
 import {findFocusedRoute} from '@react-navigation/native';
-import {useEffect} from 'react';
+import {useEffect, useRef} from 'react';
 
 /**
  * When this report is open in the super-wide RHP, seeds the transaction-thread carousel with the
  * transaction IDs in the order the user sees them, and clears them again on unmount.
  */
-function useMoneyRequestReportActiveTransactionIDs(visualOrderTransactionIDs: string[]) {
-    // Primitive proxy for visualOrderTransactionIDs used as the effect dependency below.
-    // Other callers (e.g. TransactionDuplicateReview.onPreviewPressed) can write to the same
-    // Onyx key with a different ordering. Using the raw array reference would cause the effect
-    // to re-fire on every referential change and overwrite those IDs. The joined string ensures
-    // the effect only re-fires when the actual content changes.
+function useMoneyRequestReportActiveTransactionIDs(visualOrderTransactionIDs: string[], reportID: string | undefined) {
     const visualOrderTransactionIDsKey = visualOrderTransactionIDs.join(',');
 
+    const carouselSource = CAROUSEL_SOURCE.report(reportID);
+    const hasSeededCarouselRef = useRef(false);
+
     useEffect(() => {
         const focusedRoute = findFocusedRoute(navigationRef.getRootState());
         if (focusedRoute?.name !== SCREENS.RIGHT_MODAL.SEARCH_REPORT) {
             return;
         }
-        // Don't take over a snapshot-backed carousel (identified by its sibling descriptors, e.g. the Home
-        // "Recently added" flow) that belongs to the transaction thread sitting underneath this report.
-        // Overwriting and then clearing it would drop that carousel when the user navigates back. Row presses
-        // still seed the correct siblings lazily via useNavigateToTransactionThread.
-        const {ids: activeIDs, descriptors: activeDescriptors} = getActiveTransactionIDs();
+
+        const {ids: activeIDs, descriptors: activeDescriptors, source: activeSource} = getActiveTransactionIDs();
         if (activeDescriptors) {
             return;
         }
+
+        if (visualOrderTransactionIDs.length === 0 || (visualOrderTransactionIDs.length < 2 && activeSource !== carouselSource)) {
+            return;
+        }
+
         // A report preview press seeds these arrows in the carousel's order, which can differ from this list's order.
         // Keep that seed while it still covers exactly these rows, and re-seed only when the rows themselves change.
-        if (activeIDs && activeIDs.length === visualOrderTransactionIDs.length) {
+        // A carousel this list already owns is exempt: sorting a column moves the rows the arrows walk without
+        // changing which rows they are, and freezing the seed at the order it was first written in would leave
+        // "next" jumping to a row that is no longer below the current one on screen.
+        if (activeSource !== carouselSource && activeIDs && activeIDs.length === visualOrderTransactionIDs.length) {
             const activeIDSet = new Set(activeIDs);
             if (visualOrderTransactionIDs.every((transactionID) => activeIDSet.has(transactionID))) {
                 return;
             }
         }
-        setActiveTransactionIDs(visualOrderTransactionIDs);
+
+        setActiveTransactionIDs(visualOrderTransactionIDs, {source: carouselSource});
+        hasSeededCarouselRef.current = true;
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- visualOrderTransactionIDsKey is an order-sensitive proxy for the array
+    }, [visualOrderTransactionIDsKey, carouselSource]);
+
+    useEffect(() => {
         return () => {
-            clearActiveTransactionIDs();
+            if (!hasSeededCarouselRef.current) {
+                return;
+            }
+            hasSeededCarouselRef.current = false;
+            clearActiveTransactionIDsForSource(carouselSource);
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- visualOrderTransactionIDsKey is a primitive proxy for the array to avoid re-firing on referential-only changes
-    }, [visualOrderTransactionIDsKey]);
+    }, [carouselSource]);
 }
 
 export default useMoneyRequestReportActiveTransactionIDs;
diff --git a/src/components/MoneyRequestReportView/useMoneyRequestReportGroupedTransactions.ts b/src/components/MoneyRequestReportView/useMoneyRequestReportGroupedTransactions.ts
index 4dc2567908e1..c29780d6189f 100644
--- a/src/components/MoneyRequestReportView/useMoneyRequestReportGroupedTransactions.ts
+++ b/src/components/MoneyRequestReportView/useMoneyRequestReportGroupedTransactions.ts
@@ -37,6 +37,9 @@ type UseMoneyRequestReportGroupedTransactionsResult = {
     /** Flat list of section headers + transactions in render order */
     listItems: TransactionListItemData[];
 
+    /** Every transaction in the order the user sees it, rows on their way out included, which is what a shift+click range spans */
+    visualOrderTransactions: OnyxTypes.Transaction[];
+
     /** Transaction IDs in the exact order the user sees them, used to seed the transaction-thread carousel */
     visualOrderTransactionIDs: string[];
 
@@ -73,8 +76,8 @@ function useMoneyRequestReportGroupedTransactions({
             ? sortedTransactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID)
             : groupedTransactions.flatMap((group) => group.transactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID));
 
-    const allTransactions = shouldGroupTransactions ? groupedTransactions.flatMap((group) => group.transactions) : resolvedTransactions;
-    const visibleTransactions = allTransactions.filter((t) => isOffline || !isTransactionPendingDelete(t));
+    const visualOrderTransactions = shouldGroupTransactions ? groupedTransactions.flatMap((group) => group.transactions) : resolvedTransactions;
+    const visibleTransactions = visualOrderTransactions.filter((t) => isOffline || !isTransactionPendingDelete(t));
     const lastTransactionID = visibleTransactions.at(-1)?.transactionID;
 
     const listItems: TransactionListItemData[] = [];
@@ -94,6 +97,7 @@ function useMoneyRequestReportGroupedTransactions({
     return {
         groupedTransactions,
         listItems,
+        visualOrderTransactions,
         visualOrderTransactionIDs,
         lastTransactionID,
     };
diff --git a/src/components/MoneyRequestReportView/useMoneyRequestReportPendingExpense.ts b/src/components/MoneyRequestReportView/useMoneyRequestReportPendingExpense.ts
new file mode 100644
index 000000000000..296814137c26
--- /dev/null
+++ b/src/components/MoneyRequestReportView/useMoneyRequestReportPendingExpense.ts
@@ -0,0 +1,55 @@
+import {navigationRef} from '@libs/Navigation/Navigation';
+import {getPendingSubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
+import {getTransactionPendingAction} from '@libs/TransactionUtils';
+
+import isReportOpenInSuperWideRHP from '@navigation/helpers/isReportOpenInSuperWideRHP';
+
+import CONST from '@src/CONST';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import {useFocusEffect} from '@react-navigation/native';
+import {useRef, useState} from 'react';
+
+/**
+ * Skeleton placeholder for super-wide RHP: shown while the deferred write is pending
+ * and dismissed when the optimistic transaction appears. If the deferred write is delayed
+ * (up to 5s safety timeout), the skeleton may linger - this is acceptable as a visual
+ * hint that the expense is being processed. The transaction count comparison is a
+ * heuristic. Simultaneous add+remove is rare enough not to warrant a dedicated signal.
+ */
+function useMoneyRequestReportPendingExpense(reportID: string | undefined, transactions: OnyxTypes.Transaction[]): boolean {
+    const [showPendingExpensePlaceholder, setShowPendingExpensePlaceholder] = useState(false);
+    const transactionCountWhenSkeletonShown = useRef<number | null>(null);
+
+    const hasOptimisticNewTransaction = transactions.some((t) => getTransactionPendingAction(t) === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+    const transactionCount = transactions.length;
+
+    useFocusEffect(() => {
+        if (!showPendingExpensePlaceholder) {
+            const pending = getPendingSubmitFollowUpAction();
+            const hasPendingSubmit =
+                pending?.followUpAction === CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.DISMISS_MODAL_ONLY &&
+                pending?.reportID === reportID &&
+                isReportOpenInSuperWideRHP(navigationRef.getRootState());
+
+            if (!hasPendingSubmit || hasOptimisticNewTransaction) {
+                return;
+            }
+
+            transactionCountWhenSkeletonShown.current = transactionCount;
+            setShowPendingExpensePlaceholder(true);
+            return;
+        }
+
+        if (!hasOptimisticNewTransaction && (transactionCountWhenSkeletonShown.current === null || transactionCount <= transactionCountWhenSkeletonShown.current)) {
+            return;
+        }
+
+        transactionCountWhenSkeletonShown.current = null;
+        setShowPendingExpensePlaceholder(false);
+    });
+
+    return showPendingExpensePlaceholder;
+}
+
+export default useMoneyRequestReportPendingExpense;
diff --git a/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts b/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
index f0e315d2b062..a8e996a9d037 100644
--- a/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
+++ b/src/components/MoneyRequestReportView/useMoneyRequestReportScroll.ts
@@ -224,12 +224,13 @@ function useMoneyRequestReportScroll({
     const onNewActionEvent = useEffectEvent((isFromCurrentUser: boolean, reportAction?: OnyxTypes.ReportAction) => {
         TransitionTracker.runAfterTransitions({
             callback: () => {
-                setIsFloatingMessageCounterVisible(false);
                 // If a new comment is added from the current user, scroll to the bottom, otherwise leave the user position unchanged
                 if (!isFromCurrentUser || reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT) {
                     return;
                 }
 
+                setIsFloatingMessageCounterVisible(false);
+
                 // Delay so the just-sent item has landed in the data before we jump
                 const index = visibleReportActions.findIndex((item) => item.reportActionID === reportAction?.reportActionID);
                 if (index !== -1) {
diff --git a/src/components/MoneyRequestReportView/useMoneyRequestReportTransactionSelection.ts b/src/components/MoneyRequestReportView/useMoneyRequestReportTransactionSelection.ts
new file mode 100644
index 000000000000..eb215be34b74
--- /dev/null
+++ b/src/components/MoneyRequestReportView/useMoneyRequestReportTransactionSelection.ts
@@ -0,0 +1,139 @@
+import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
+
+import useHandleSelectionMode from '@hooks/useHandleSelectionMode';
+import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
+
+import {isSelectableReportTransaction} from '@libs/MoneyRequestReportUtils';
+import {navigationRef} from '@libs/Navigation/Navigation';
+import {getTransactionPendingAction} from '@libs/TransactionUtils';
+
+import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
+
+import {useFocusEffect} from '@react-navigation/native';
+import {useEffect} from 'react';
+
+import useReportTransactionShiftRange from './useReportTransactionShiftRange';
+
+type GroupSelectionState = {
+    isSelected: boolean;
+    isIndeterminate: boolean;
+    isDisabled: boolean;
+    pendingAction?: PendingAction;
+};
+
+type UseMoneyRequestReportTransactionSelectionParams = {
+    /** ID of the report the transactions belong to. Selection is cleared when it changes. */
+    reportID: string | undefined;
+
+    /** Transactions bucketed by the current group-by attribute. Empty when grouping is off. */
+    groupedTransactions: OnyxTypes.GroupedTransactions[];
+
+    /** Every transaction in the order the list renders it, grouped or not, which is the order a shift+click range spans */
+    visualOrderTransactions: OnyxTypes.Transaction[];
+};
+
+type UseMoneyRequestReportTransactionSelectionResult = {
+    /** Whether mobile selection mode is enabled */
+    isMobileSelectionModeEnabled: boolean;
+
+    /** Adds or removes a single transaction from the selection, or extends a range when the click carried Shift */
+    toggleTransaction: (transactionID: string, shiftKey?: boolean) => void;
+
+    /** Whether a transaction is currently selected */
+    isTransactionSelected: (transactionID: string) => boolean;
+
+    /** groupKey → checkbox state of the group's section header */
+    groupSelectionState: Map<string, GroupSelectionState>;
+
+    /** Selects or deselects all selectable transactions of a group */
+    toggleGroupSelection: (groupKey: string) => void;
+
+    /** The transactions Select All writes, in list order */
+    selectableTransactionIDs: string[];
+
+    /** Selects every selectable transaction, or clears the selection when anything is already selected */
+    toggleAll: () => void;
+};
+
+/**
+ * Owns the transaction-selection concern of the money-request report view: single/group/all toggles, the
+ * per-group checkbox state, and clearing the selection when the user leaves the screen or switches reports.
+ */
+function useMoneyRequestReportTransactionSelection({
+    reportID,
+    groupedTransactions,
+    visualOrderTransactions,
+}: UseMoneyRequestReportTransactionSelectionParams): UseMoneyRequestReportTransactionSelectionResult {
+    const {selectedTransactionIDs} = useSearchSelectionContext();
+    const {setSelectedTransactions, clearSelectedTransactions} = useSearchSelectionActions();
+    useHandleSelectionMode(selectedTransactionIDs);
+    const isMobileSelectionModeEnabled = useMobileSelectionMode();
+
+    useFocusEffect(() => {
+        return () => {
+            if (navigationRef?.getRootState()?.routes.at(-1)?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
+                return;
+            }
+            clearSelectedTransactions(true);
+        };
+    });
+
+    useEffect(() => {
+        clearSelectedTransactions(true);
+    }, [reportID, clearSelectedTransactions]);
+
+    const {toggleTransaction, toggleGroup, toggleAll} = useReportTransactionShiftRange({
+        reportID,
+        transactions: visualOrderTransactions,
+        selectedTransactionIDs,
+        setSelectedTransactions,
+        clearSelectedTransactions,
+    });
+
+    const isTransactionSelected = (transactionID: string) => selectedTransactionIDs.includes(transactionID);
+
+    // Narrower than the rows the list renders: a rejected expense still renders and opens, but no checkbox can hold it.
+    const selectableTransactionIDs = visualOrderTransactions.filter(isSelectableReportTransaction).map((transaction) => transaction.transactionID);
+
+    const groupSelectionState = new Map<string, GroupSelectionState>();
+    for (const group of groupedTransactions) {
+        const groupTransactionIDs = group.transactions.filter(isSelectableReportTransaction).map((t) => t.transactionID);
+        const groupPendingAction = group.transactions.some((t) => getTransactionPendingAction(t)) ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : undefined;
+
+        if (groupTransactionIDs.length === 0) {
+            groupSelectionState.set(group.groupKey, {isSelected: false, isIndeterminate: false, isDisabled: true, pendingAction: groupPendingAction});
+            continue;
+        }
+
+        const selectedCount = groupTransactionIDs.filter((id) => selectedTransactionIDs.includes(id)).length;
+        groupSelectionState.set(group.groupKey, {
+            isSelected: selectedCount === groupTransactionIDs.length,
+            isIndeterminate: selectedCount > 0 && selectedCount < groupTransactionIDs.length,
+            isDisabled: false,
+            pendingAction: groupPendingAction,
+        });
+    }
+
+    const toggleGroupSelection = (groupKey: string) => {
+        const group = groupedTransactions.find((g) => g.groupKey === groupKey);
+        if (!group) {
+            return;
+        }
+        toggleGroup(group.transactions.filter(isSelectableReportTransaction).map((t) => t.transactionID));
+    };
+
+    return {
+        isMobileSelectionModeEnabled,
+        toggleTransaction,
+        isTransactionSelected,
+        groupSelectionState,
+        toggleGroupSelection,
+        selectableTransactionIDs,
+        toggleAll: () => toggleAll(selectableTransactionIDs),
+    };
+}
+
+export default useMoneyRequestReportTransactionSelection;
diff --git a/src/components/MoneyRequestReportView/useReportTransactionShiftRange.ts b/src/components/MoneyRequestReportView/useReportTransactionShiftRange.ts
new file mode 100644
index 000000000000..678766ec67be
--- /dev/null
+++ b/src/components/MoneyRequestReportView/useReportTransactionShiftRange.ts
@@ -0,0 +1,126 @@
+/**
+ * Handles the report list's selection clicks. Each click updates the selection and the shift+click range session together,
+ * because a selection change the session never sees is one a later shift+click cannot narrow.
+ */
+import useShiftRangeSelection from '@hooks/useShiftRangeSelection';
+
+import {isSelectableReportTransaction} from '@libs/MoneyRequestReportUtils';
+import {applyShiftRangeBatchToKeySet} from '@libs/shiftRangeSelection';
+
+import type * as OnyxTypes from '@src/types/onyx';
+
+import {useEffect, useRef} from 'react';
+
+type ReportTransactionShiftRangeParams = {
+    /** This is used to drop the range session when the report changes, since the list is reused for the next report rather than remounted */
+    reportID: string | undefined;
+
+    /** In the order they render, which is the order a range spans */
+    transactions: OnyxTypes.Transaction[];
+
+    selectedTransactionIDs: string[];
+
+    setSelectedTransactions: (transactionIDs: string[]) => void;
+
+    /** Used by a second Select All press to clear the selection, which has its own action rather than writing an empty list */
+    clearSelectedTransactions: (shouldClearIDs: true) => void;
+};
+
+type ReportTransactionShiftRange = {
+    /** Extends a range when the click carried Shift, and toggles the one row otherwise */
+    toggleTransaction: (transactionID: string, shiftKey?: boolean) => void;
+
+    /** Toggles a whole group, and records it as the block the next shift+click may narrow */
+    toggleGroup: (groupTransactionIDs: string[]) => void;
+
+    /** Selects every selectable row, or clears the selection if anything is already selected */
+    toggleAll: (selectableTransactionIDs: string[]) => void;
+};
+
+function useReportTransactionShiftRange({
+    reportID,
+    transactions,
+    selectedTransactionIDs,
+    setSelectedTransactions,
+    clearSelectedTransactions,
+}: ReportTransactionShiftRangeParams): ReportTransactionShiftRange {
+    // The engine asks this per row while resolving an anchor, so the lookup has to be constant time.
+    const selectedTransactionIDsSet = new Set(selectedTransactionIDs);
+    const transactionsByID = new Map(transactions.map((transaction) => [transaction.transactionID, transaction]));
+
+    // The last list this hook wrote. If the selection is a different list, something else changed it.
+    const lastWrittenSelectionRef = useRef<string[] | null>(null);
+    const writeSelection = (transactionIDs: string[]) => {
+        lastWrittenSelectionRef.current = transactionIDs;
+        setSelectedTransactions(transactionIDs);
+    };
+
+    const rangeApi = useShiftRangeSelection<OnyxTypes.Transaction>({
+        items: transactions,
+        getItemKey: (transaction) => transaction.transactionID ?? null,
+        isItemSelected: (transaction) => selectedTransactionIDsSet.has(transaction.transactionID),
+        // The rows the checkbox disables, so a range cannot check what a click cannot.
+        isDisabledItem: (transaction) => !isSelectableReportTransaction(transaction),
+        onApplyRange: (batch) => writeSelection(applyShiftRangeBatchToKeySet(batch, selectedTransactionIDs, (transaction) => transaction.transactionID)),
+    });
+
+    useEffect(() => {
+        rangeApi.clearAnchor();
+    }, [reportID, rangeApi]);
+
+    // A selection the session did not write is one it cannot narrow, since the rows it painted are no longer what the list shows.
+    const endSessionIfSelectionCameFromElsewhere = () => {
+        if (lastWrittenSelectionRef.current === selectedTransactionIDs) {
+            return;
+        }
+        lastWrittenSelectionRef.current = selectedTransactionIDs;
+        rangeApi.clearAnchor();
+    };
+
+    const toggleTransaction = (transactionID: string, shiftKey?: boolean) => {
+        endSessionIfSelectionCameFromElsewhere();
+        const item = transactionsByID.get(transactionID);
+        if (item && rangeApi.applyShiftClick(item, shiftKey)) {
+            return;
+        }
+        writeSelection(selectedTransactionIDsSet.has(transactionID) ? selectedTransactionIDs.filter((id) => id !== transactionID) : [...selectedTransactionIDs, transactionID]);
+        if (item) {
+            rangeApi.notifyAnchor(item);
+        }
+    };
+
+    const toggleGroup = (groupTransactionIDs: string[]) => {
+        endSessionIfSelectionCameFromElsewhere();
+        // A group with no row to act on writes nothing and seeds nothing, so the session it would replace is still the truth.
+        if (groupTransactionIDs.length === 0) {
+            return;
+        }
+        const groupTransactionIDSet = new Set(groupTransactionIDs);
+        const anySelected = groupTransactionIDs.some((id) => selectedTransactionIDsSet.has(id));
+        writeSelection(anySelected ? selectedTransactionIDs.filter((id) => !groupTransactionIDSet.has(id)) : [...selectedTransactionIDs, ...groupTransactionIDs]);
+        if (anySelected) {
+            // Deselecting paints no block, so reset instead of leaving a stale span to collapse.
+            rangeApi.clearAnchor();
+            return;
+        }
+        // Just this block: seeding the whole selection would span unrelated rows and deselect them.
+        rangeApi.seedRangeFromSelection(groupTransactionIDs);
+    };
+
+    const toggleAll = (selectableTransactionIDs: string[]) => {
+        endSessionIfSelectionCameFromElsewhere();
+        if (selectedTransactionIDs.length !== 0) {
+            clearSelectedTransactions(true);
+            lastWrittenSelectionRef.current = null;
+            rangeApi.clearAnchor();
+            return;
+        }
+        writeSelection(selectableTransactionIDs);
+        // A full-list block, so the next shift+click collapses the selection onto the span it lands in.
+        rangeApi.seedFullRange();
+    };
+
+    return {toggleTransaction, toggleGroup, toggleAll};
+}
+
+export default useReportTransactionShiftRange;
diff --git a/src/components/MultiGestureCanvas/usePanGesture.ts b/src/components/MultiGestureCanvas/usePanGesture.ts
index e4dab5092a6d..9b1f5695cb7d 100644
--- a/src/components/MultiGestureCanvas/usePanGesture.ts
+++ b/src/components/MultiGestureCanvas/usePanGesture.ts
@@ -1,6 +1,6 @@
 import {isMobile} from '@libs/Browser';
 
-import type {PanGesture} from 'react-native-gesture-handler';
+import type {LegacyPanGesture} from 'react-native-gesture-handler';
 
 import {useCallback} from 'react';
 import {Dimensions} from 'react-native';
@@ -52,7 +52,7 @@ const usePanGesture = ({
     isSwipingDownToClose,
     shouldDisableSwipeDownToClose,
     onSwipeDown,
-}: UsePanGestureProps): PanGesture => {
+}: UsePanGestureProps): LegacyPanGesture => {
     // The content size after fitting it to the canvas and zooming
     const zoomedContentWidth = useDerivedValue(() => contentSize.width * totalScale.get(), [contentSize.width]);
     const zoomedContentHeight = useDerivedValue(() => contentSize.height * totalScale.get(), [contentSize.height]);
diff --git a/src/components/MultiGestureCanvas/usePinchGesture.ts b/src/components/MultiGestureCanvas/usePinchGesture.ts
index b55fea09d09f..f2877fd3bd13 100644
--- a/src/components/MultiGestureCanvas/usePinchGesture.ts
+++ b/src/components/MultiGestureCanvas/usePinchGesture.ts
@@ -1,4 +1,4 @@
-import type {PinchGesture} from 'react-native-gesture-handler';
+import type {LegacyPinchGesture} from 'react-native-gesture-handler';
 
 import {useCallback, useEffect, useState} from 'react';
 import {Gesture} from 'react-native-gesture-handler';
@@ -38,7 +38,7 @@ const usePinchGesture = ({
     isTransformGestureActive,
     stopAnimation,
     onScaleChanged,
-}: UsePinchGestureProps): PinchGesture => {
+}: UsePinchGestureProps): LegacyPinchGesture => {
     // The current pinch gesture event scale
     const currentPinchScale = useSharedValue(1);
 
diff --git a/src/components/MultiGestureCanvas/useTapGestures.ts b/src/components/MultiGestureCanvas/useTapGestures.ts
index 1d2ab7aa3fc4..ebc3b64cabee 100644
--- a/src/components/MultiGestureCanvas/useTapGestures.ts
+++ b/src/components/MultiGestureCanvas/useTapGestures.ts
@@ -1,4 +1,4 @@
-import type {TapGesture} from 'react-native-gesture-handler';
+import type {LegacyTapGesture} from 'react-native-gesture-handler';
 
 import {useCallback, useMemo} from 'react';
 import {Gesture} from 'react-native-gesture-handler';
@@ -45,7 +45,7 @@ const useTapGestures = ({
     isTransformGestureActive,
     onScaleChanged,
     onTap,
-}: UseTapGesturesProps): {singleTapGesture: TapGesture; doubleTapGesture: TapGesture} => {
+}: UseTapGesturesProps): {singleTapGesture: LegacyTapGesture; doubleTapGesture: LegacyTapGesture} => {
     // The content size after scaling it with minimum scale to fit the content into the canvas
     const scaledContentWidth = useMemo(() => contentSize.width * minContentScale, [contentSize.width, minContentScale]);
     const scaledContentHeight = useMemo(() => contentSize.height * minContentScale, [contentSize.height, minContentScale]);
diff --git a/src/components/OnyxListItemProvider.tsx b/src/components/OnyxListItemProvider.tsx
index 251b40fb114e..85be7dabd604 100644
--- a/src/components/OnyxListItemProvider.tsx
+++ b/src/components/OnyxListItemProvider.tsx
@@ -11,7 +11,7 @@ import createOnyxContext from './createOnyxContext';
  * Set up any providers for individual keys. This should only be used in cases where many components will subscribe to
  * the same key (e.g. FlatList renderItem components)
  */
-const [PersonalDetailsProvider, , usePersonalDetails] = createOnyxContext(ONYXKEYS.PERSONAL_DETAILS_LIST);
+const [PersonalDetailsProvider, PersonalDetailsContext, usePersonalDetails] = createOnyxContext(ONYXKEYS.PERSONAL_DETAILS_LIST);
 const [BlockedFromConciergeProvider, , useBlockedFromConcierge] = createOnyxContext(ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE);
 const [BetasProvider, BetasContext] = createOnyxContext(ONYXKEYS.BETAS);
 const [BetaConfigurationProvider, BetaConfigurationContext] = createOnyxContext(ONYXKEYS.BETA_CONFIGURATION);
@@ -52,6 +52,7 @@ export default OnyxListItemProvider;
 
 export {
     usePersonalDetails,
+    PersonalDetailsContext,
     BetasContext,
     BetaConfigurationContext,
     BetaOverridesContext,
diff --git a/src/components/PDFView/index.native.tsx b/src/components/PDFView/index.native.tsx
index d700c066f1cc..00f8ed400016 100644
--- a/src/components/PDFView/index.native.tsx
+++ b/src/components/PDFView/index.native.tsx
@@ -25,6 +25,7 @@ import PDF from 'react-native-pdf';
 
 import type {PDFViewNativeProps} from './types';
 
+import isAllowedPDFLink from './isAllowedPDFLink';
 import PDFPasswordForm from './PDFPasswordForm';
 
 /**
@@ -139,6 +140,10 @@ function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused
      */
     const handlePressLink = useCallback(
         (url: string) => {
+            if (!isAllowedPDFLink(url)) {
+                return;
+            }
+
             if (isTravelLink(url) && activePolicyID) {
                 const postLoginPath = getRelativeUrl(url);
                 openTravelDotLink(activePolicyID, postLoginPath);
diff --git a/src/components/PDFView/isAllowedPDFLink.ts b/src/components/PDFView/isAllowedPDFLink.ts
new file mode 100644
index 000000000000..70072742e88a
--- /dev/null
+++ b/src/components/PDFView/isAllowedPDFLink.ts
@@ -0,0 +1,24 @@
+import prefixes from '@libs/Navigation/linkingConfig/prefixes';
+
+import 'react-native-url-polyfill/auto';
+
+const appLinkHostnames = new Set(prefixes.filter((prefix) => prefix.startsWith('https://')).map((prefix) => new URL(prefix).hostname.toLowerCase()));
+
+/**
+ * PDF annotations are untrusted and must not launch custom schemes or navigate back into the app.
+ */
+function isAllowedPDFLink(url: string): boolean {
+    try {
+        const {protocol, hostname} = new URL(url);
+        const normalizedProtocol = protocol.toLowerCase();
+        if (normalizedProtocol !== 'https:' && normalizedProtocol !== 'http:') {
+            return false;
+        }
+
+        return !appLinkHostnames.has(hostname.toLowerCase().replace(/\.$/, ''));
+    } catch {
+        return false;
+    }
+}
+
+export default isAllowedPDFLink;
diff --git a/src/components/Pressable/GenericPressable/types.ts b/src/components/Pressable/GenericPressable/types.ts
index 2f34a669a62e..dad830ba0afc 100644
--- a/src/components/Pressable/GenericPressable/types.ts
+++ b/src/components/Pressable/GenericPressable/types.ts
@@ -1,12 +1,13 @@
+import type {AccessibilityFocusTarget} from '@libs/Accessibility/moveAccessibilityFocus/types';
 import type {ForwardedFSClassProps} from '@libs/Fullstory/types';
 import type {Shortcut} from '@libs/KeyboardShortcut';
 
 import type CONST from '@src/CONST';
 import type WithSentryLabel from '@src/types/utils/SentryLabel';
 
-import type {ComponentRef, ForwardedRef, RefObject} from 'react';
+import type {ComponentRef, ForwardedRef} from 'react';
 // eslint-disable-next-line no-restricted-imports
-import type {GestureResponderEvent, HostComponent, PressableStateCallbackType, PressableProps as RNPressableProps, Text as RNText, StyleProp, View, ViewStyle} from 'react-native';
+import type {GestureResponderEvent, PressableStateCallbackType, PressableProps as RNPressableProps, Text as RNText, StyleProp, View, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
 type StylePropWithFunction = StyleProp<ViewStyle> | ((state: PressableStateCallbackType) => StyleProp<ViewStyle>);
@@ -117,7 +118,7 @@ type PressableProps = RNPressableProps &
         /**
          * Specifies which component should be focused after interacting with this component
          */
-        nextFocusRef?: ComponentRef<HostComponent<unknown>> & RefObject<HTMLOrSVGElement>;
+        nextFocusRef?: AccessibilityFocusTarget;
 
         /**
          * Specifies the accessibility label for the component
diff --git a/src/components/QRShare/index.tsx b/src/components/QRShare/index.tsx
index 6e4205ce0282..f8d259c026c8 100644
--- a/src/components/QRShare/index.tsx
+++ b/src/components/QRShare/index.tsx
@@ -43,7 +43,7 @@ function QRShare({
     const theme = useTheme();
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
     const {windowWidth, windowHeight} = useWindowDimensions();
-    const qrCodeContainerWidth = shouldUseNarrowLayout ? windowWidth : variables.sideBarWidth;
+    const qrCodeContainerWidth = shouldUseNarrowLayout ? windowWidth : variables.rhpWidth;
     const icons = useMemoizedLazyExpensifyIcons(['ExpensifyWordmark']);
 
     const landscapeQrCodeSize = isInLandscapeMode ? Math.min(QR_CODE_LANDSCAPE_SIZE_RATIO * windowHeight, MAX_QR_CODE_LANDSCAPE_SIZE) : undefined;
diff --git a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
index 8e47eee2fe3e..c4a1e95bc1c5 100644
--- a/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReceiptView.tsx
@@ -43,6 +43,7 @@ import Log from '@libs/Log';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import {isGroupPolicyByType} from '@libs/PolicyUtils';
+import ReceiptStorage from '@libs/ReceiptStorage';
 import retryReceiptUpload, {canBuildRetryPayload} from '@libs/ReceiptUploadRetryHandler';
 import type {ReceiptRetryContext} from '@libs/ReceiptUploadRetryHandler/types';
 import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
@@ -237,7 +238,7 @@ function MoneyRequestReceiptView({
         }
     }, [isLoading, hoverBind]);
 
-    const displayedReceiptSource = transaction?.receipt?.localSource ?? transaction?.receipt?.source;
+    const displayedReceiptSource = ReceiptStorage.resolve(transaction?.receipt?.localSource) ?? transaction?.receipt?.source;
     const prevDisplayedReceiptSource = usePrevious(displayedReceiptSource);
 
     useEffect(() => {
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/ReportPreviewActionButton.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/ReportPreviewActionButton.tsx
index 8485c1d56799..ec9e1ca7ea41 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/ReportPreviewActionButton.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/ReportPreviewActionButton.tsx
@@ -24,6 +24,7 @@ function ReportPreviewActionButton() {
 
     const viewButton = (
         <Button
+            style={styles.flex1}
             onPress={openReportFromPreview}
             sentryLabel={CONST.SENTRY_LABEL.REPORT_PREVIEW.VIEW_BUTTON}
         >
diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/index.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/index.tsx
index 9e21cc804c92..59c937384b99 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/index.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/index.tsx
@@ -14,7 +14,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionViolations from '@hooks/useTransactionViolations';
 
 import {createTransactionThreadReport, openReport, setOptimisticTransactionThread} from '@libs/actions/Report';
-import {clearActiveTransactionIDs, getActiveTransactionIDs, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import {CAROUSEL_SOURCE, clearActiveTransactionIDsForSource, getActiveTransactionIDs, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {
     getAllReportActions,
@@ -283,19 +283,23 @@ function MoneyRequestReportPreview({
                 .filter((pressedTransaction) => !isTransactionPendingDelete(pressedTransaction))
                 .map((pressedTransaction) => pressedTransaction.transactionID);
 
+            // This press owns the carousel it seeds. Without a source the list was unowned, so no screen could
+            // release it and every other writer was free to overwrite it while the expense was still open.
+            const carouselSource = CAROUSEL_SOURCE.reportPreview(iouReportID);
+
             if (isSmallScreenWidth && iouReportID) {
                 const {wasPressedFromReport, backTo} = resolvePressOrigin(routeAtPress, `r/${iouReportID}`);
                 const reportRoute = ROUTES.REPORT_WITH_ID.getRoute(iouReportID, undefined, undefined, backTo);
                 if (!wasPressedFromReport) {
                     Navigation.navigate(reportRoute);
                 }
-                setActiveTransactionIDs(openableTransactionIDs);
+                setActiveTransactionIDs(openableTransactionIDs, {source: carouselSource});
                 Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: childReportID, backTo: reportRoute}));
                 return;
             }
 
             if (isSmallScreenWidth) {
-                setActiveTransactionIDs(openableTransactionIDs);
+                setActiveTransactionIDs(openableTransactionIDs, {source: carouselSource});
                 Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: childReportID, backTo: routeAtPress}));
                 return;
             }
@@ -307,7 +311,7 @@ function MoneyRequestReportPreview({
                 if (!wasPressedFromReport) {
                     Navigation.navigate(reportRoute);
                 }
-                const seeded = setActiveTransactionIDs(openableTransactionIDs);
+                const seeded = setActiveTransactionIDs(openableTransactionIDs, {source: carouselSource});
                 markReportRHPWidth(childReportID, 'wide');
                 const release = () => {
                     unmarkReportRHPWidth(childReportID);
@@ -317,7 +321,7 @@ function MoneyRequestReportPreview({
                         if (getActiveTransactionIDs().ids !== openableTransactionIDs) {
                             return;
                         }
-                        clearActiveTransactionIDs();
+                        clearActiveTransactionIDsForSource(carouselSource);
                     });
                 };
                 const timer = setTimeout(() => {
@@ -332,7 +336,7 @@ function MoneyRequestReportPreview({
                 return;
             }
 
-            setActiveTransactionIDs(openableTransactionIDs).then(() => {
+            setActiveTransactionIDs(openableTransactionIDs, {source: carouselSource}).then(() => {
                 markReportRHPWidth(childReportID, 'wide');
                 Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: childReportID, backTo: routeAtPress}));
             });
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 2cb8aa59a367..3fff41e1f9d3 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1,6 +1,7 @@
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import HighlightableMenuItemWithTopDescription from '@components/HighlightableMenuItemWithTopDescription';
 import Icon from '@components/Icon';
+import MenuItem from '@components/MenuItem';
 import MenuItemAction from '@components/MenuItem/presets/MenuItemAction';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
@@ -121,6 +122,7 @@ import {
     isDistanceRequest as isDistanceRequestTransactionUtils,
     isDistanceTypeRequest,
     isExpenseUnreported as isExpenseUnreportedTransactionUtils,
+    isFailedScanAmountPlaceholder,
     isGPSDistanceRequest as isGPSDistanceRequestTransactionUtils,
     isManagedCardTransaction as isManagedCardTransactionTransactionUtils,
     isManualDistanceRequest as isManualDistanceRequestTransactionUtils,
@@ -141,6 +143,8 @@ import AnimatedEmptyStateBackground from '@pages/inbox/report/AnimatedEmptyState
 
 import variables from '@styles/variables';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -347,6 +351,8 @@ function MoneyRequestView({
     const isOdometerDistanceRequest = isOdometerDistanceRequestTransactionUtils(transaction);
     const isMapDistanceRequest = isMapDistanceRequestTransactionUtils(transaction) || isDistanceTypeRequest(transaction);
     const isTransactionScanning = isScanning(updatedTransaction ?? transaction);
+    const isSettled = isSettledReportUtils(moneyRequestReport);
+    const hasFailedScanAmountPlaceholder = isFailedScanAmountPlaceholder(updatedTransaction ?? transaction, isSettled);
     const hasRoute = hasRouteTransactionUtils(transactionBackup ?? transaction, isDistanceRequest);
 
     const rawActualAttendees = isFromMergeTransaction && updatedTransaction ? updatedTransaction.comment?.attendees : transactionAttendees;
@@ -389,7 +395,6 @@ function MoneyRequestView({
     const actualTransactionDate = isFromMergeTransaction && updatedTransaction ? getFormattedCreated(updatedTransaction) : transactionDate;
     const fallbackTaxRateTitle = transaction?.taxValue;
 
-    const isSettled = isSettledReportUtils(moneyRequestReport);
     const isCancelled = moneyRequestReport?.isCancelledIOU;
     const isChatReportArchived = useReportIsArchived(moneyRequestReport?.chatReportID);
     const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
@@ -664,6 +669,8 @@ function MoneyRequestView({
     if (isTransactionScanning) {
         merchantTitle = translate('iou.receiptStatusTitle');
         amountTitle = translate('iou.receiptStatusTitle');
+    } else if (hasFailedScanAmountPlaceholder) {
+        amountTitle = '';
     }
 
     const updatedTransactionDescription = getDescription(updatedTransaction) || undefined;
@@ -829,6 +836,10 @@ function MoneyRequestView({
                 isError: transactionDate === '',
                 translationPath: canEditDate ? 'common.error.enterDate' : 'common.error.missingDate',
             },
+            amount: {
+                isError: !isSettled && !isCancelled && hasFailedScanAmountPlaceholder,
+                translationPath: canEditAmount ? 'common.error.enterAmount' : 'common.error.missingAmount',
+            },
         };
 
         const {isError, translationPath} = fieldChecks[field] ?? {};
@@ -877,6 +888,8 @@ function MoneyRequestView({
         return '';
     };
 
+    const dateError = getErrorForField('date');
+
     const showTaxDisabledAlert = () => {
         showConfirmModal({
             title: translate('iou.taxDisabledAlert.title'),
@@ -1020,103 +1033,133 @@ function MoneyRequestView({
     const distanceRequestFields = (
         <>
             <OfflineWithFeedback pendingAction={getPendingFieldAction('waypoints') ?? getPendingFieldAction('merchant')}>
-                <MenuItemWithTopDescription
-                    description={distanceToDisplayDescription}
-                    title={distanceToDisplay}
-                    hintText={distanceToDisplayHintText}
-                    numberOfLinesTitle={2}
-                    interactive={canEditDistance}
-                    shouldShowRightIcon={canEditDistance}
-                    titleStyle={styles.flex1}
-                    onPress={() => {
-                        if (!transaction?.transactionID || !transactionThreadReport?.reportID) {
-                            return;
-                        }
-
-                        if (isOdometerDistanceRequest) {
-                            Navigation.navigate(
-                                ROUTES.MONEY_REQUEST_STEP_DISTANCE_ODOMETER.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport.reportID),
-                            );
-                            return;
-                        }
-
-                        if (isManualDistanceRequest) {
-                            Navigation.navigate(
-                                createDynamicRoute(
-                                    DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_MANUAL.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport.reportID),
-                                ),
-                            );
-                            return;
-                        }
-
-                        Navigation.navigate(
-                            createDynamicRoute(
-                                DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport.reportID),
-                            ),
-                        );
-                    }}
-                    brickRoadIndicator={getErrorForField('waypoints') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                    errorText={getErrorForField('waypoints')}
-                    copyValue={distanceCopyValue}
-                    copyable={!!distanceCopyValue}
-                />
+                <MenuItem.Root
+                    onPress={
+                        canEditDistance
+                            ? callFunctionIfActionIsAllowed(() => {
+                                  if (!transaction?.transactionID || !transactionThreadReport?.reportID) {
+                                      return;
+                                  }
+
+                                  if (isOdometerDistanceRequest) {
+                                      Navigation.navigate(
+                                          ROUTES.MONEY_REQUEST_STEP_DISTANCE_ODOMETER.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport.reportID),
+                                      );
+                                      return;
+                                  }
+
+                                  if (isManualDistanceRequest) {
+                                      Navigation.navigate(
+                                          createDynamicRoute(
+                                              DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_MANUAL.getRoute(
+                                                  CONST.IOU.ACTION.EDIT,
+                                                  iouType,
+                                                  transaction.transactionID,
+                                                  transactionThreadReport.reportID,
+                                              ),
+                                          ),
+                                      );
+                                      return;
+                                  }
+
+                                  Navigation.navigate(
+                                      createDynamicRoute(
+                                          DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport.reportID),
+                                      ),
+                                  );
+                              })
+                            : undefined
+                    }
+                >
+                    <MenuItemField.Row
+                        name={distanceToDisplayDescription}
+                        value={distanceToDisplay}
+                        numberOfLinesValue={2}
+                    >
+                        {!!getErrorForField('waypoints') && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                        {canEditDistance && <MenuItem.Chevron />}
+                        {!!distanceCopyValue && <MenuItem.Copy value={distanceCopyValue} />}
+                    </MenuItemField.Row>
+                    {!!getErrorForField('waypoints') && (
+                        <MenuItem.HelpText
+                            isError
+                            message={getErrorForField('waypoints')}
+                        />
+                    )}
+                    {!!distanceToDisplayHintText && <MenuItem.HelpText message={distanceToDisplayHintText} />}
+                </MenuItem.Root>
             </OfflineWithFeedback>
             <OfflineWithFeedback pendingAction={getPendingFieldAction('customUnitRateID')}>
-                <MenuItemWithTopDescription
-                    description={translate('common.rate')}
-                    title={rateToDisplay}
-                    numberOfLinesTitle={2}
-                    interactive={canEditDistanceRate}
-                    shouldShowRightIcon={canEditDistanceRate}
-                    titleStyle={styles.flex1}
-                    onPress={() => {
-                        if (!transaction?.transactionID || !transactionThreadReport?.reportID) {
-                            return;
-                        }
-
-                        if (isTrackExpense) {
-                            if (shouldNavigateToUpgradePath && transactionThreadReport) {
-                                Navigation.navigate(
-                                    createDynamicRoute(
-                                        DYNAMIC_ROUTES.MONEY_REQUEST_UPGRADE.getRoute({
-                                            action: CONST.IOU.ACTION.EDIT,
-                                            iouType,
-                                            transactionID: transaction.transactionID,
-                                            reportID: transactionThreadReport?.reportID,
-                                            upgradePath: CONST.UPGRADE_PATHS.DISTANCE_RATES,
-                                        }),
-                                    ),
-                                );
-                                return;
-                            }
-                            if (!policy && shouldSelectPolicy) {
-                                Navigation.navigate(
-                                    ROUTES.SET_DEFAULT_WORKSPACE.getRoute(
-                                        createDynamicRoute(
-                                            DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(
-                                                CONST.IOU.ACTION.EDIT,
-                                                iouType,
-                                                transaction.transactionID,
-                                                transactionThreadReport?.reportID,
-                                            ),
-                                        ),
-                                    ),
-                                );
-                                return;
-                            }
-                        }
-
-                        Navigation.navigate(
-                            createDynamicRoute(
-                                DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport.reportID),
-                            ),
-                        );
-                    }}
-                    brickRoadIndicator={getErrorForField('customUnitRateID') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                    errorText={getErrorForField('customUnitRateID')}
-                    copyValue={distanceRateCopyValue}
-                    copyable={!!distanceRateCopyValue}
-                />
+                <MenuItem.Root
+                    onPress={
+                        canEditDistanceRate
+                            ? callFunctionIfActionIsAllowed(() => {
+                                  if (!transaction?.transactionID || !transactionThreadReport?.reportID) {
+                                      return;
+                                  }
+
+                                  if (isTrackExpense) {
+                                      if (shouldNavigateToUpgradePath && transactionThreadReport) {
+                                          Navigation.navigate(
+                                              createDynamicRoute(
+                                                  DYNAMIC_ROUTES.MONEY_REQUEST_UPGRADE.getRoute({
+                                                      action: CONST.IOU.ACTION.EDIT,
+                                                      iouType,
+                                                      transactionID: transaction.transactionID,
+                                                      reportID: transactionThreadReport?.reportID,
+                                                      upgradePath: CONST.UPGRADE_PATHS.DISTANCE_RATES,
+                                                  }),
+                                              ),
+                                          );
+                                          return;
+                                      }
+                                      if (!policy && shouldSelectPolicy) {
+                                          Navigation.navigate(
+                                              ROUTES.SET_DEFAULT_WORKSPACE.getRoute(
+                                                  createDynamicRoute(
+                                                      DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(
+                                                          CONST.IOU.ACTION.EDIT,
+                                                          iouType,
+                                                          transaction.transactionID,
+                                                          transactionThreadReport?.reportID,
+                                                      ),
+                                                  ),
+                                              ),
+                                          );
+                                          return;
+                                      }
+                                  }
+
+                                  Navigation.navigate(
+                                      createDynamicRoute(
+                                          DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(
+                                              CONST.IOU.ACTION.EDIT,
+                                              iouType,
+                                              transaction.transactionID,
+                                              transactionThreadReport.reportID,
+                                          ),
+                                      ),
+                                  );
+                              })
+                            : undefined
+                    }
+                >
+                    <MenuItemField.Row
+                        name={translate('common.rate')}
+                        value={rateToDisplay}
+                        numberOfLinesValue={2}
+                    >
+                        {!!getErrorForField('customUnitRateID') && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                        {canEditDistanceRate && <MenuItem.Chevron />}
+                        {!!distanceRateCopyValue && <MenuItem.Copy value={distanceRateCopyValue} />}
+                    </MenuItemField.Row>
+                    {!!getErrorForField('customUnitRateID') && (
+                        <MenuItem.HelpText
+                            isError
+                            message={getErrorForField('customUnitRateID')}
+                        />
+                    )}
+                </MenuItem.Root>
             </OfflineWithFeedback>
         </>
     );
@@ -1200,7 +1243,8 @@ function MoneyRequestView({
     const reportNameToDisplay = isFromMergeTransaction ? (updatedTransaction?.reportName ?? translate('common.none')) : getReportName(parentReport, parentReportDerivedName);
     const shouldShowReport = !!parentReportID || (isFromMergeTransaction && !!reportNameToDisplay);
     const reportCopyValue = !canEditReport && reportNameToDisplay !== translate('common.none') ? reportNameToDisplay : undefined;
-    const shouldShowCategoryAnalyzing = isCategoryBeingAnalyzed(transaction, transactionReport);
+    const shouldShowCategoryAnalyzing = isCategoryBeingAnalyzed(updatedTransaction ?? transaction, transactionReport, policy);
+
     // In this case we want to use this value. The shouldUseNarrowLayout will always be true as this case is handled when we display ReportScreen in RHP.
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
@@ -1345,188 +1389,244 @@ function MoneyRequestView({
                     </OfflineWithFeedback>
                 )}
                 <OfflineWithFeedback pendingAction={getPendingFieldAction('created')}>
-                    <MenuItemWithTopDescription
-                        description={dateDescription}
-                        title={actualTransactionDate}
-                        numberOfLinesTitle={2}
-                        interactive={canEditDate}
-                        shouldShowRightIcon={canEditDate}
-                        titleStyle={styles.flex1}
-                        onPress={() => {
-                            Navigation.navigate(
-                                createDynamicRoute(
-                                    DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID),
-                                ),
-                            );
-                        }}
-                        brickRoadIndicator={getErrorForField('date') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                        errorText={getErrorForField('date')}
-                        copyValue={dateCopyValue}
-                        copyable={!!dateCopyValue}
-                    />
+                    <MenuItem.Root
+                        onPress={
+                            canEditDate
+                                ? callFunctionIfActionIsAllowed(() => {
+                                      Navigation.navigate(
+                                          createDynamicRoute(
+                                              DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID),
+                                          ),
+                                      );
+                                  })
+                                : undefined
+                        }
+                    >
+                        <MenuItemField.Row
+                            name={dateDescription}
+                            value={actualTransactionDate}
+                            numberOfLinesValue={2}
+                        >
+                            {!!dateError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                            {canEditDate && <MenuItem.Chevron />}
+                            {!!dateCopyValue && <MenuItem.Copy value={dateCopyValue} />}
+                        </MenuItemField.Row>
+                        {!!dateError && (
+                            <MenuItem.HelpText
+                                isError
+                                message={dateError}
+                            />
+                        )}
+                    </MenuItem.Root>
                 </OfflineWithFeedback>
                 {!!shouldShowCategory && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('category')}>
-                        <MenuItemWithTopDescription
-                            description={translate('common.category')}
-                            title={shouldShowCategoryAnalyzing ? translate('common.analyzing') : decodedCategoryName}
-                            numberOfLinesTitle={2}
-                            interactive={canEdit}
-                            shouldShowRightIcon={canEdit}
-                            titleStyle={styles.flex1}
-                            onPress={() => {
-                                if (shouldShowCategoryDisabledAlert) {
-                                    showCategoryDisabledAlert();
-                                    return;
-                                }
-
-                                if (shouldNavigateToUpgradePath && transactionThreadReport) {
-                                    Navigation.navigate(
-                                        createDynamicRoute(
-                                            DYNAMIC_ROUTES.MONEY_REQUEST_UPGRADE.getRoute({
-                                                action: CONST.IOU.ACTION.EDIT,
-                                                iouType,
-                                                transactionID: transaction.transactionID,
-                                                reportID: transactionThreadReport?.reportID,
-                                                upgradePath: CONST.UPGRADE_PATHS.CATEGORIES,
-                                                upgradeBackTo: createDynamicRoute(
-                                                    DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute({
-                                                        action: CONST.IOU.ACTION.EDIT,
-                                                        iouType,
-                                                        transactionID: transaction.transactionID,
-                                                        reportID: transactionThreadReport?.reportID,
-                                                    }),
-                                                ),
-                                            }),
-                                        ),
-                                    );
-                                } else if (!policy && shouldSelectPolicy) {
-                                    Navigation.navigate(
-                                        ROUTES.SET_DEFAULT_WORKSPACE.getRoute(
-                                            createDynamicRoute(
-                                                DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute({
-                                                    action: CONST.IOU.ACTION.EDIT,
-                                                    iouType,
-                                                    transactionID: transaction.transactionID,
-                                                    reportID: transactionThreadReport?.reportID,
-                                                }),
-                                            ),
-                                        ),
-                                    );
-                                } else {
-                                    Navigation.navigate(
-                                        createDynamicRoute(
-                                            DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute({
-                                                action: CONST.IOU.ACTION.EDIT,
-                                                iouType,
-                                                transactionID: transaction.transactionID,
-                                                reportID: transactionThreadReport?.reportID,
-                                            }),
-                                        ),
-                                    );
-                                }
-                            }}
-                            brickRoadIndicator={getErrorForField('category') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            errorText={getErrorForField('category')}
-                            copyValue={categoryCopyValue}
-                            copyable={!!categoryCopyValue}
-                        />
+                        <MenuItem.Root
+                            onPress={
+                                canEdit
+                                    ? callFunctionIfActionIsAllowed(() => {
+                                          if (shouldShowCategoryDisabledAlert) {
+                                              showCategoryDisabledAlert();
+                                              return;
+                                          }
+
+                                          if (shouldNavigateToUpgradePath && transactionThreadReport) {
+                                              Navigation.navigate(
+                                                  createDynamicRoute(
+                                                      DYNAMIC_ROUTES.MONEY_REQUEST_UPGRADE.getRoute({
+                                                          action: CONST.IOU.ACTION.EDIT,
+                                                          iouType,
+                                                          transactionID: transaction.transactionID,
+                                                          reportID: transactionThreadReport?.reportID,
+                                                          upgradePath: CONST.UPGRADE_PATHS.CATEGORIES,
+                                                          upgradeBackTo: createDynamicRoute(
+                                                              DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute({
+                                                                  action: CONST.IOU.ACTION.EDIT,
+                                                                  iouType,
+                                                                  transactionID: transaction.transactionID,
+                                                                  reportID: transactionThreadReport?.reportID,
+                                                              }),
+                                                          ),
+                                                      }),
+                                                  ),
+                                              );
+                                          } else if (!policy && shouldSelectPolicy) {
+                                              Navigation.navigate(
+                                                  ROUTES.SET_DEFAULT_WORKSPACE.getRoute(
+                                                      createDynamicRoute(
+                                                          DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute({
+                                                              action: CONST.IOU.ACTION.EDIT,
+                                                              iouType,
+                                                              transactionID: transaction.transactionID,
+                                                              reportID: transactionThreadReport?.reportID,
+                                                          }),
+                                                      ),
+                                                  ),
+                                              );
+                                          } else {
+                                              Navigation.navigate(
+                                                  createDynamicRoute(
+                                                      DYNAMIC_ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute({
+                                                          action: CONST.IOU.ACTION.EDIT,
+                                                          iouType,
+                                                          transactionID: transaction.transactionID,
+                                                          reportID: transactionThreadReport?.reportID,
+                                                      }),
+                                                  ),
+                                              );
+                                          }
+                                      })
+                                    : undefined
+                            }
+                        >
+                            <MenuItemField.Row
+                                name={translate('common.category')}
+                                value={shouldShowCategoryAnalyzing ? translate('common.analyzing') : decodedCategoryName}
+                                numberOfLinesValue={2}
+                            >
+                                {!!getErrorForField('category') && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                                {canEdit && <MenuItem.Chevron />}
+                                {!!categoryCopyValue && <MenuItem.Copy value={categoryCopyValue} />}
+                            </MenuItemField.Row>
+                            {!!getErrorForField('category') && (
+                                <MenuItem.HelpText
+                                    isError
+                                    message={getErrorForField('category')}
+                                />
+                            )}
+                        </MenuItem.Root>
                     </OfflineWithFeedback>
                 )}
                 {shouldShowVendor && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('vendor')}>
-                        <MenuItemWithTopDescription
-                            description={vendorFieldLabel}
-                            title={transactionVendorName}
-                            numberOfLinesTitle={2}
-                            interactive={canEdit}
-                            shouldShowRightIcon={canEdit}
-                            titleStyle={styles.flex1}
-                            onPress={() => {
-                                if (!transactionThreadReport?.reportID) {
-                                    return;
-                                }
-                                Navigation.navigate(
-                                    ROUTES.MONEY_REQUEST_STEP_VENDOR.getRoute(
-                                        CONST.IOU.ACTION.EDIT,
-                                        iouType,
-                                        transaction.transactionID,
-                                        transactionThreadReport.reportID,
-                                        getReportRHPActiveRoute(),
-                                    ),
-                                );
-                            }}
-                            brickRoadIndicator={getErrorForField('vendor') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            errorText={getErrorForField('vendor')}
-                        />
+                        <MenuItem.Root
+                            onPress={
+                                canEdit
+                                    ? callFunctionIfActionIsAllowed(() => {
+                                          if (!transactionThreadReport?.reportID) {
+                                              return;
+                                          }
+                                          Navigation.navigate(
+                                              ROUTES.MONEY_REQUEST_STEP_VENDOR.getRoute(
+                                                  CONST.IOU.ACTION.EDIT,
+                                                  iouType,
+                                                  transaction.transactionID,
+                                                  transactionThreadReport.reportID,
+                                                  getReportRHPActiveRoute(),
+                                              ),
+                                          );
+                                      })
+                                    : undefined
+                            }
+                        >
+                            <MenuItemField.Row
+                                name={vendorFieldLabel}
+                                value={transactionVendorName}
+                                numberOfLinesValue={2}
+                            >
+                                {!!getErrorForField('vendor') && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                                {canEdit && <MenuItem.Chevron />}
+                            </MenuItemField.Row>
+                            {!!getErrorForField('vendor') && (
+                                <MenuItem.HelpText
+                                    isError
+                                    message={getErrorForField('vendor')}
+                                />
+                            )}
+                        </MenuItem.Root>
                     </OfflineWithFeedback>
                 )}
                 {shouldShowTag && tagList}
                 {!!shouldShowCard && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('cardID')}>
-                        <MenuItemWithTopDescription
-                            description={translate('iou.card')}
-                            title={cardCopyValue}
-                            numberOfLinesTitle={2}
-                            titleStyle={styles.flex1}
-                            interactive={false}
-                            copyValue={cardCopyValue}
-                            copyable={!!cardCopyValue}
-                        />
+                        <MenuItem.Root>
+                            <MenuItemField.Row
+                                name={translate('iou.card')}
+                                value={cardCopyValue}
+                                numberOfLinesValue={2}
+                            >
+                                {!!cardCopyValue && <MenuItem.Copy value={cardCopyValue} />}
+                            </MenuItemField.Row>
+                        </MenuItem.Root>
                     </OfflineWithFeedback>
                 )}
                 {shouldShowTax && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('taxCode')}>
-                        <MenuItemWithTopDescription
-                            title={taxRateValue}
-                            description={taxRatesDescription ?? translate('common.tax')}
-                            numberOfLinesTitle={2}
-                            interactive={canEditTaxFields}
-                            shouldShowRightIcon={canEditTaxFields}
-                            titleStyle={styles.flex1}
-                            onPress={() => {
-                                if (shouldShowTaxDisabledAlert) {
-                                    showTaxDisabledAlert();
-                                    return;
-                                }
-
-                                Navigation.navigate(
-                                    createDynamicRoute(
-                                        DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID),
-                                    ),
-                                );
-                            }}
-                            brickRoadIndicator={getErrorForField('tax') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            errorText={getErrorForField('tax')}
-                            copyValue={taxRateCopyValue}
-                            copyable={!!taxRateCopyValue}
-                        />
+                        <MenuItem.Root
+                            onPress={
+                                canEditTaxFields
+                                    ? callFunctionIfActionIsAllowed(() => {
+                                          if (shouldShowTaxDisabledAlert) {
+                                              showTaxDisabledAlert();
+                                              return;
+                                          }
+
+                                          Navigation.navigate(
+                                              createDynamicRoute(
+                                                  DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(
+                                                      CONST.IOU.ACTION.EDIT,
+                                                      iouType,
+                                                      transaction.transactionID,
+                                                      transactionThreadReport?.reportID,
+                                                  ),
+                                              ),
+                                          );
+                                      })
+                                    : undefined
+                            }
+                        >
+                            <MenuItemField.Row
+                                name={taxRatesDescription ?? translate('common.tax')}
+                                value={taxRateValue}
+                                numberOfLinesValue={2}
+                            >
+                                {!!getErrorForField('tax') && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                                {canEditTaxFields && <MenuItem.Chevron />}
+                                {!!taxRateCopyValue && <MenuItem.Copy value={taxRateCopyValue} />}
+                            </MenuItemField.Row>
+                            {!!getErrorForField('tax') && (
+                                <MenuItem.HelpText
+                                    isError
+                                    message={getErrorForField('tax')}
+                                />
+                            )}
+                        </MenuItem.Root>
                     </OfflineWithFeedback>
                 )}
                 {shouldShowTax && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('taxAmount')}>
-                        <MenuItemWithTopDescription
-                            title={taxAmountTitle}
-                            description={taxAmountDescription}
-                            numberOfLinesTitle={2}
-                            interactive={canEditTaxFields}
-                            shouldShowRightIcon={canEditTaxFields}
-                            titleStyle={styles.flex1}
-                            onPress={() => {
-                                if (shouldShowTaxDisabledAlert) {
-                                    showTaxDisabledAlert();
-                                    return;
-                                }
-
-                                Navigation.navigate(
-                                    createDynamicRoute(
-                                        DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport?.reportID),
-                                    ),
-                                );
-                            }}
-                            copyValue={taxAmountCopyValue}
-                            copyable={!!taxAmountCopyValue}
-                        />
+                        <MenuItem.Root
+                            onPress={
+                                canEditTaxFields
+                                    ? callFunctionIfActionIsAllowed(() => {
+                                          if (shouldShowTaxDisabledAlert) {
+                                              showTaxDisabledAlert();
+                                              return;
+                                          }
+
+                                          Navigation.navigate(
+                                              createDynamicRoute(
+                                                  DYNAMIC_ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(
+                                                      CONST.IOU.ACTION.EDIT,
+                                                      iouType,
+                                                      transaction.transactionID,
+                                                      transactionThreadReport?.reportID,
+                                                  ),
+                                              ),
+                                          );
+                                      })
+                                    : undefined
+                            }
+                        >
+                            <MenuItemField.Row
+                                name={taxAmountDescription}
+                                value={taxAmountTitle}
+                                numberOfLinesValue={2}
+                            >
+                                {canEditTaxFields && <MenuItem.Chevron />}
+                                {!!taxAmountCopyValue && <MenuItem.Copy value={taxAmountCopyValue} />}
+                            </MenuItemField.Row>
+                        </MenuItem.Root>
                     </OfflineWithFeedback>
                 )}
                 {shouldShowAttendees && (
diff --git a/src/components/ReportActionItem/ReportActionItemImage.tsx b/src/components/ReportActionItem/ReportActionItemImage.tsx
index 8e73d9a89a98..97bf88d70d18 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.tsx
+++ b/src/components/ReportActionItem/ReportActionItemImage.tsx
@@ -208,6 +208,8 @@ function ReportActionItemImage({
             shouldUseThumbnailImage: shouldUseThumbnailImage ?? true,
             isAuthTokenRequired: false,
             source: shouldUseThumbnailImage ? (effectiveThumbnail ?? effectiveImage ?? '') : originalImageSource,
+            fallbackIcon: icons.Receipt,
+            fallbackIconSize: isSingleImage ? variables.iconSizeSuperLarge : variables.iconSizeExtraLarge,
 
             // If the image is full height, use initial position to make sure it will grow properly to fill the container
             shouldUseInitialObjectPosition: isMapDistanceRequest && !shouldUseFullHeight,
diff --git a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx
index 552cddbf92c7..0725e858804c 100644
--- a/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx
+++ b/src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx
@@ -390,7 +390,7 @@ function TransactionPreviewContent({
                                         />
                                         <Text
                                             numberOfLines={1}
-                                            style={[isDeleted && styles.lineThrough, styles.textMicroSupporting, styles.pre, styles.flexShrink1, {color: theme.danger}]}
+                                            style={[isDeleted && styles.lineThrough, styles.textMicroSupporting, styles.pre, styles.flexShrink1, {color: theme.textError}]}
                                         >
                                             {RBRMessage}
                                         </Text>
diff --git a/src/components/ScaledDistanceEReceipt.tsx b/src/components/ScaledDistanceEReceipt.tsx
new file mode 100644
index 000000000000..7e2b2e67ae5d
--- /dev/null
+++ b/src/components/ScaledDistanceEReceipt.tsx
@@ -0,0 +1,66 @@
+import useStyleUtils from '@hooks/useStyleUtils';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import variables from '@styles/variables';
+
+import type {Transaction} from '@src/types/onyx';
+
+import type {LayoutChangeEvent} from 'react-native';
+
+import React, {useState} from 'react';
+import {View} from 'react-native';
+
+import DistanceEReceiptPanel from './DistanceEReceiptPanel';
+
+// The card lays out at a fixed width and the map inside it is a 1024px thumbnail, so past roughly three times
+// that width the map is the first thing to blur. Text keeps scaling cleanly either way.
+const MAX_SCALE = 3;
+
+type ScaledDistanceEReceiptProps = {
+    /** The transaction for the distance expense */
+    transaction: Transaction;
+};
+
+/**
+ * Draws the distance e-receipt at the size of whatever space it is given. The card itself is laid out at a fixed
+ * width, so on a full screen it would otherwise sit small in the middle, and a card taller than the screen would
+ * run off the bottom. Scaling covers both.
+ */
+function ScaledDistanceEReceipt({transaction}: ScaledDistanceEReceiptProps) {
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const [boxWidth, setBoxWidth] = useState(0);
+    const [boxHeight, setBoxHeight] = useState(0);
+    const [cardHeight, setCardHeight] = useState(0);
+
+    // Falls back to the card's own size until the first layout, so a platform that never reports one still
+    // renders a readable receipt rather than nothing.
+    const scale = boxWidth && boxHeight && cardHeight ? Math.min(boxWidth / variables.eReceiptHoverCardWidth, boxHeight / cardHeight, MAX_SCALE) : 1;
+
+    const onBoxLayout = (event: LayoutChangeEvent) => {
+        setBoxWidth(event.nativeEvent.layout.width);
+        setBoxHeight(event.nativeEvent.layout.height);
+    };
+
+    const onCardLayout = (event: LayoutChangeEvent) => {
+        setCardHeight(event.nativeEvent.layout.height);
+    };
+
+    return (
+        <View
+            style={[styles.flex1, styles.w100, styles.justifyContentCenter, styles.alignItemsCenter, styles.overflowHidden]}
+            onLayout={onBoxLayout}
+            testID="scaled-distance-e-receipt"
+        >
+            <View
+                style={[StyleUtils.getWidthStyle(variables.eReceiptHoverCardWidth), StyleUtils.getTransformScaleStyle(scale)]}
+                onLayout={onCardLayout}
+                testID="scaled-distance-e-receipt-card"
+            >
+                <DistanceEReceiptPanel transaction={transaction} />
+            </View>
+        </View>
+    );
+}
+
+export default ScaledDistanceEReceipt;
diff --git a/src/components/Search/ChartOfflineState.tsx b/src/components/Search/ChartOfflineState.tsx
new file mode 100644
index 000000000000..1a964b122139
--- /dev/null
+++ b/src/components/Search/ChartOfflineState.tsx
@@ -0,0 +1,34 @@
+import BlockingView from '@components/BlockingViews/BlockingView';
+import {CHART_CONTENT_MIN_HEIGHT} from '@components/Charts/VictoryTheme';
+
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import variables from '@styles/variables';
+
+import React from 'react';
+
+/** Stands in for a chart that has no data stored and can't fetch any while offline. */
+function ChartOfflineState() {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const icons = useMemoizedLazyExpensifyIcons(['OfflineCloud']);
+
+    return (
+        <BlockingView
+            icon={icons.OfflineCloud}
+            iconColor={theme.offline}
+            iconWidth={variables.iconSizeUltraLarge}
+            title={translate('common.youAppearToBeOffline')}
+            titleStyles={[styles.mt0, styles.mb2]}
+            subtitle={translate('common.thisFeatureRequiresInternet')}
+            subtitleStyle={styles.textSupporting}
+            containerStyle={[{minHeight: CHART_CONTENT_MIN_HEIGHT}, styles.gap5]}
+        />
+    );
+}
+
+export default ChartOfflineState;
diff --git a/src/components/Search/ChatSearchView.tsx b/src/components/Search/ChatSearchView.tsx
index 04a7f719d6ea..6452607b8508 100644
--- a/src/components/Search/ChatSearchView.tsx
+++ b/src/components/Search/ChatSearchView.tsx
@@ -4,7 +4,7 @@ import CONST from '@src/CONST';
 
 import type {NativeSyntheticEvent} from 'react-native';
 
-import React, {useImperativeHandle} from 'react';
+import React from 'react';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {CommonSearchViewProps} from './searchViewProps';
@@ -51,7 +51,6 @@ function ChatSearchView({
     onViewableItemsChanged,
     contentContainerStyle,
     containerStyle,
-    ref,
 }: ChatSearchViewProps) {
     const {type} = queryJSON;
 
@@ -67,9 +66,6 @@ function ChatSearchView({
     const selectedItemsLength = data.reduce((acc, item) => acc + (item.keyForList && selectedTransactions[item.keyForList]?.isSelected ? 1 : 0), 0);
     const totalItems = data.filter((item) => !isRowDeleted(item)).length;
 
-    // Flat data maps 1:1 to the rendered list, so highlight-scroll-to-index is the same as scroll-to-data-index.
-    useImperativeHandle(ref, () => ({scrollToIndex: scrollToListIndex}), [scrollToListIndex]);
-
     const renderItem = (item: SearchListItem, index: number, isItemFocused: boolean, onFocus?: (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void) => (
         // Chat rows never animate their exit (only grouped expenses do), so the wrapper just preserves the overflow clip.
         <AnimatedExitRow
diff --git a/src/components/Search/ExpenseFlatSearchView.tsx b/src/components/Search/ExpenseFlatSearchView.tsx
index d148b8e1599e..5a5612e25f3d 100644
--- a/src/components/Search/ExpenseFlatSearchView.tsx
+++ b/src/components/Search/ExpenseFlatSearchView.tsx
@@ -4,7 +4,7 @@ import CONST from '@src/CONST';
 
 import type {NativeSyntheticEvent} from 'react-native';
 
-import React, {useImperativeHandle} from 'react';
+import React from 'react';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {CommonSearchViewProps, TransactionViewExtras} from './searchViewProps';
@@ -29,11 +29,10 @@ const isRowDeleted = (item: SearchListItem) => item.pendingAction === CONST.RED_
  * `toggle`/`toggleAll`/`selectedTransactions`). The shared list state and interactions come from
  * `useSearchListViewState`, and the surrounding chrome (horizontal scroll, header bar, long-press menu)
  * from `SearchListViewLayout`; this view only owns the flat-expense specifics: the `TransactionListItem`
- * renderer, single-pass visibility/selection counts, and the highlight-scroll imperative handle.
- * `TransactionListItem` is the only row renderer here and rows always animate, so the
- * group/sticky/chat/task branches of `SearchList` do not apply. Keyboard navigation is inherited from
- * `BaseSearchList`; the post-create highlight stays in the router (the snapshot stamps
- * `shouldAnimateInHighlight`, and `newTransactions` flows into `extraData`).
+ * renderer and single-pass visibility/selection counts.
+ * `TransactionListItem` is the only row renderer here, so the group/sticky/chat/task branches of
+ * `SearchList` do not apply. Keyboard navigation is inherited from `BaseSearchList`; `newTransactions`
+ * flows into `extraData` so the list re-renders when a freshly-created expense lands.
  */
 function ExpenseFlatSearchView({
     queryJSON,
@@ -59,7 +58,6 @@ function ExpenseFlatSearchView({
     onViewableItemsChanged,
     contentContainerStyle,
     containerStyle,
-    ref,
 }: ExpenseFlatSearchViewProps) {
     const {type} = queryJSON;
 
@@ -93,9 +91,6 @@ function ExpenseFlatSearchView({
     const selectedItemsLength = data.reduce((acc, item) => acc + (item.keyForList && selectedTransactions[item.keyForList]?.isSelected ? 1 : 0), 0);
     const totalItems = data.filter((item) => !isRowDeleted(item)).length;
 
-    // Flat data maps 1:1 to the rendered list, so highlight-scroll-to-index is the same as scroll-to-data-index.
-    useImperativeHandle(ref, () => ({scrollToIndex: scrollToListIndex}), [scrollToListIndex]);
-
     const renderItem = (item: SearchListItem, index: number, isItemFocused: boolean, onFocus?: (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void) => {
         const isDisabled = isRowDeleted(item);
         // Only expense row exits animate; invoice and trip transaction lists do not (matches the legacy per-type gate).
diff --git a/src/components/Search/ExpenseGroupedSearchView.tsx b/src/components/Search/ExpenseGroupedSearchView.tsx
index 3f36466241a2..7a0b1ebfe4c4 100644
--- a/src/components/Search/ExpenseGroupedSearchView.tsx
+++ b/src/components/Search/ExpenseGroupedSearchView.tsx
@@ -18,12 +18,13 @@ import type {Transaction} from '@src/types/onyx';
 
 import type {NativeSyntheticEvent} from 'react-native';
 
-import React, {useImperativeHandle, useState} from 'react';
+import React, {useState} from 'react';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {CommonSearchViewProps, TransactionViewExtras} from './searchViewProps';
 import type {SearchQueryJSON, SelectedTransactions} from './types';
 
+import {NO_OPEN_GROUPS} from './hooks/useOpenGroupsRegistry';
 import useSearchListViewState from './hooks/useSearchListViewState';
 import AnimatedExitRow from './primitives/AnimatedExitRow';
 import SelectionTopBar from './primitives/SelectionTopBar';
@@ -33,6 +34,7 @@ import GroupHeader from './SearchList/ListItem/GroupHeader';
 import shouldCollapseExpandedGroupAfterPendingDelete from './SearchList/ListItem/shouldCollapseExpandedGroupAfterPendingDelete';
 import TransactionGroupListItem from './SearchList/ListItem/TransactionGroupListItem';
 import {isGroupChildrenContainerItem, isGroupHeaderItem} from './SearchList/ListItem/types';
+import useOpenGroupsForShiftRange from './SearchList/ListItem/useOpenGroupsForShiftRange';
 import SearchListViewLayout from './SearchListViewLayout';
 
 type ExpenseGroupedSearchViewProps = CommonSearchViewProps & TransactionViewExtras;
@@ -91,8 +93,7 @@ function buildNewTransactionIDMap(data: SearchListItem[], newTransactions: Trans
  * `useSearchListViewState`, and the surrounding chrome from `SearchListViewLayout`. This view owns the group
  * machinery: on wide web it splits each group into a sticky `GroupHeader` plus an expandable
  * `GroupChildrenContainer` (`shouldSplitGroups`); otherwise each group renders through `TransactionGroupListItem`.
- * Selection counts are report-aware (flattened over child transactions plus empty groups), and the scroll
- * handle remaps the router's data index to the split-list index.
+ * Selection counts are report-aware (flattened over child transactions plus empty groups).
  */
 function ExpenseGroupedSearchView({
     queryJSON,
@@ -116,7 +117,6 @@ function ExpenseGroupedSearchView({
     onViewableItemsChanged,
     contentContainerStyle,
     containerStyle,
-    ref,
 }: ExpenseGroupedSearchViewProps) {
     const {type, groupBy} = queryJSON;
     const {isLargeScreenWidth} = useResponsiveLayout();
@@ -174,6 +174,9 @@ function ExpenseGroupedSearchView({
         }
     }
 
+    // Only the split layout renders children as their own rows.
+    useOpenGroupsForShiftRange(shouldSplit ? expandedGroups : NO_OPEN_GROUPS);
+
     const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {selector: columnsSelector});
 
     const {
@@ -211,26 +214,6 @@ function ExpenseGroupedSearchView({
     const firstVisibleIndex = listData.findIndex(isItemVisible);
     const lastVisibleIndex = listData.findLastIndex(isItemVisible);
 
-    // The router highlights by source-data index; remap it to the split-list index before scrolling.
-    useImperativeHandle(
-        ref,
-        () => ({
-            scrollToIndex: (index: number, animated = true) => {
-                if (!shouldSplit) {
-                    scrollToListIndex(index, animated);
-                    return;
-                }
-                const item = data.at(index);
-                if (!item) {
-                    return;
-                }
-                const splitIndex = item.keyForList ? listData.findIndex((listItem) => listItem.keyForList === `header_${item.keyForList}`) : -1;
-                scrollToListIndex(splitIndex !== -1 ? splitIndex : index, animated);
-            },
-        }),
-        [data, listData, shouldSplit, scrollToListIndex],
-    );
-
     const getItemType = (item: SearchListItem) => {
         if (!shouldSplit) {
             return undefined;
diff --git a/src/components/Search/ExpenseReportSearchView.tsx b/src/components/Search/ExpenseReportSearchView.tsx
index 8c314f4eae4a..b735fa27e1ff 100644
--- a/src/components/Search/ExpenseReportSearchView.tsx
+++ b/src/components/Search/ExpenseReportSearchView.tsx
@@ -6,7 +6,7 @@ import CONST from '@src/CONST';
 
 import type {NativeSyntheticEvent} from 'react-native';
 
-import React, {useImperativeHandle} from 'react';
+import React from 'react';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {CommonSearchViewProps} from './searchViewProps';
@@ -57,7 +57,6 @@ function ExpenseReportSearchView({
     onViewableItemsChanged,
     contentContainerStyle,
     containerStyle,
-    ref,
 }: ExpenseReportSearchViewProps) {
     const {type} = queryJSON;
 
@@ -94,9 +93,6 @@ function ExpenseReportSearchView({
         emptyReports.reduce((acc, item) => acc + (isRowSelected(item.keyForList, selectedTransactions) ? 1 : 0), 0);
     const totalItems = flattenedTransactions.filter((item) => !isRowDeleted(item)).length + emptyReports.filter((item) => !isRowDeleted(item)).length;
 
-    // Report data maps 1:1 to the rendered list, so highlight-scroll-to-index is the same as scroll-to-data-index.
-    useImperativeHandle(ref, () => ({scrollToIndex: scrollToListIndex}), [scrollToListIndex]);
-
     const renderItem = (item: SearchListItem, index: number, isItemFocused: boolean, onFocus?: (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void) => (
         // Report rows never animate their exit (only grouped expenses do), so the wrapper just preserves the overflow clip.
         <AnimatedExitRow
diff --git a/src/components/Search/FilterComponents/ExportedToSelector.tsx b/src/components/Search/FilterComponents/ExportedToSelector.tsx
index e5f10f3a40ea..8df80a2dec46 100644
--- a/src/components/Search/FilterComponents/ExportedToSelector.tsx
+++ b/src/components/Search/FilterComponents/ExportedToSelector.tsx
@@ -54,7 +54,7 @@ function ExportedToSelector({value = [], policyID, selectionListTextInputStyle,
     const connectedIntegrationNames = getConnectedIntegrationNamesForPolicies(policies, policyID);
 
     const policiesToLoadTemplatesFrom = getAllPolicyValues(policyID, ONYXKEYS.COLLECTION.POLICY, policies);
-    const {combinedExportTemplates: deduplicatedExportTemplates} = useCombinedExportTemplates(policiesToLoadTemplatesFrom);
+    const exportTemplates = useCombinedExportTemplates(policiesToLoadTemplatesFrom);
 
     const integrationConnectionNames = CONST.POLICY.CONNECTIONS.ACCOUNTING_CONNECTION_NAMES;
 
@@ -101,8 +101,8 @@ function ExportedToSelector({value = [], policyID, selectionListTextInputStyle,
 
         const standardAndIntegrationCustomTemplatePickerItems = [];
 
-        for (const template of deduplicatedExportTemplates) {
-            if (!template.templateName || integrationConnectionNamesSet.has(template.templateName) || template.type === CONST.EXPORT_TEMPLATE_TYPES.IN_APP) {
+        for (const template of exportTemplates) {
+            if (!template.templateName || integrationConnectionNamesSet.has(template.templateName)) {
                 continue;
             }
 
diff --git a/src/components/Search/FilterComponents/InSelector.tsx b/src/components/Search/FilterComponents/InSelector.tsx
index 7fbf46c30e37..60ce54597539 100644
--- a/src/components/Search/FilterComponents/InSelector.tsx
+++ b/src/components/Search/FilterComponents/InSelector.tsx
@@ -1,3 +1,4 @@
+import {useActivePolicyContext} from '@components/ActivePolicyProvider';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import type {SearchFilterCommonProps} from '@components/Search/types';
 import InviteMemberListItem from '@components/SelectionList/ListItem/InviteMemberListItem';
@@ -45,13 +46,17 @@ const defaultListOptions = {
 };
 
 function getSelectedOptionData(option: Option & Pick<OptionData, 'reportID'>): OptionData {
-    return {...option, isSelected: true, keyForList: option.keyForList ?? option.reportID};
+    return {
+        ...option,
+        isSelected: true,
+        keyForList: option.keyForList ?? option.reportID,
+    };
 }
 
 function InSelector({value = [], selectionListTextInputStyle, selectionListStyle, autoFocus, ready = true, footer, onChange}: InSelectorProps) {
     const {translate, dateFnsLocale} = useLocalize();
     const shouldFooterBeInsideList = useShouldFooterBeInsideList();
-    const {convertToDisplayString} = useCurrencyListActions();
+    const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const personalDetails = usePersonalDetails();
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const {options, isLoading, getReportByID} = useFilteredOptions({
@@ -63,10 +68,16 @@ function InSelector({value = [], selectionListTextInputStyle, selectionListStyle
 
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
-    const [loginList] = useOnyx(ONYXKEYS.LOGINS, {selector: expensifyLoginsSelector});
+    const [loginList] = useOnyx(ONYXKEYS.LOGINS, {
+        selector: expensifyLoginsSelector,
+    });
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const {activePolicyID} = useActivePolicyContext();
+
     const sortedReportActionsData = useSortedReportActionsData();
     const sortedActions = sortedReportActionsData?.sortedActions;
+    const transactionThreadIDs = sortedReportActionsData?.transactionThreadIDs;
+    const lastActions = sortedReportActionsData?.lastActions;
 
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const currentUserAccountID = currentUserPersonalDetails.accountID;
@@ -91,16 +102,20 @@ function InSelector({value = [], selectionListTextInputStyle, selectionListStyle
                 createOptionFromReport({
                     dateFnsLocale,
                     convertToDisplayString,
+                    convertToDisplayStringWithoutCurrency,
                     report: {...reportData, reportID: id},
                     personalDetails,
                     privateIsArchived,
                     rules,
                     policy: reportPolicy,
                     sortedActions,
+                    transactionThreadIDs,
+                    lastActions,
+                    currentUserAccountID,
+                    currentUserLogin: currentUserEmail,
                     conciergeReportID,
                     reportAttributesDerived,
                     isTrackIntentUser,
-                    currentUserAccountID,
                 }),
             ),
             isSelected,
@@ -114,6 +129,7 @@ function InSelector({value = [], selectionListTextInputStyle, selectionListStyle
             {
                 dateFnsLocale,
                 convertToDisplayString,
+                convertToDisplayStringWithoutCurrency,
                 isReportArchived,
                 personalDetails,
                 policy,
@@ -121,6 +137,7 @@ function InSelector({value = [], selectionListTextInputStyle, selectionListStyle
                 policyTags: reportPolicyTags,
                 conciergeReportID,
                 isTrackIntentUser,
+                translate,
                 currentUserAccountID,
                 rules,
             },
@@ -141,6 +158,7 @@ function InSelector({value = [], selectionListTextInputStyle, selectionListStyle
             : getSearchOptions({
                   dateFnsLocale,
                   convertToDisplayString,
+                  convertToDisplayStringWithoutCurrency,
                   options,
                   draftComments,
                   // This list never had the beta, it used to pass no betas at all, so it stays off on purpose
@@ -153,6 +171,7 @@ function InSelector({value = [], selectionListTextInputStyle, selectionListStyle
                   personalDetails,
                   policyCollection: allPolicies,
                   sortedActions,
+                  currentUserLogin: currentUserEmail,
                   conciergeReportID,
                   isTrackIntentUser,
                   translate,
@@ -160,23 +179,25 @@ function InSelector({value = [], selectionListTextInputStyle, selectionListStyle
                   rules,
               }).options;
 
-    const chatOptions = filterAndOrderOptions(
-        defaultOptions,
-        cleanSearchTerm,
+    const chatOptions = filterAndOrderOptions({
+        options: defaultOptions,
+        searchInputValue: cleanSearchTerm,
         countryCode,
         loginList,
         currentUserEmail,
         currentUserAccountID,
         personalDetails,
-        {
+        config: {
             dateFnsLocale,
             convertToDisplayString,
             selectedOptions,
             excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
             currentUserAccountID,
         },
+        translate,
         rules,
-    );
+        activePolicyID,
+    });
 
     const sections: SelectionListSections = [];
 
diff --git a/src/components/Search/FilterComponents/ListFilterContent.tsx b/src/components/Search/FilterComponents/ListFilterContent.tsx
index b6c51e39154e..8fdc72e27eee 100644
--- a/src/components/Search/FilterComponents/ListFilterContent.tsx
+++ b/src/components/Search/FilterComponents/ListFilterContent.tsx
@@ -34,6 +34,7 @@ import TagSelector from './TagSelector';
 import TaxRateSelector from './TaxRateSelector';
 import TypeSelector from './TypeSelector';
 import UserSelector from './UserSelector';
+import VendorSelector from './VendorSelector';
 import WorkspaceSelector from './WorkspaceSelector';
 
 type FilterKeys = Exclude<SearchFilter['key'], SearchDateFilterKeys | SearchAmountFilterKeys | SearchTextFilterKeys | typeof CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_FIELD>;
@@ -194,6 +195,7 @@ function ListFilterContent({
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE:
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED_TO:
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG:
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR:
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY: {
             const Component = {
                 [CONST.SEARCH.SYNTAX_FILTER_KEYS.FEED]: FeedSelector,
@@ -203,6 +205,7 @@ function ListFilterContent({
                 [CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE]: TaxRateSelector,
                 [CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED_TO]: ExportedToSelector,
                 [CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG]: TagSelector,
+                [CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR]: VendorSelector,
                 [CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY]: CategorySelector,
             }[baseFilterKey];
             content = (
diff --git a/src/components/Search/FilterComponents/SingleSelect.tsx b/src/components/Search/FilterComponents/SingleSelect.tsx
index cc1e8cfd602b..8db195bff577 100644
--- a/src/components/Search/FilterComponents/SingleSelect.tsx
+++ b/src/components/Search/FilterComponents/SingleSelect.tsx
@@ -83,6 +83,7 @@ function SingleSelectImpl({
     // on the list length, so it only pins once the list is long enough to require scrolling.
     const initialSelectedValues = useInitialValue(() => (value ? [value.value] : []));
     const orderedItems = moveInitialSelectionToTop(items, initialSelectedValues);
+    const rowHeight = itemHeight ?? variables.optionRowHeightCompact;
 
     const {options, noResultsFound} = (() => {
         if (isSearchable) {
@@ -93,6 +94,7 @@ function SingleSelectImpl({
                     text: item.text,
                     keyForList: item.value,
                     isSelected: selectedItem?.value === item.value,
+                    itemStyle: {minHeight: rowHeight},
                 }));
             const isEmpty = allOptions.length === 0;
             return {
@@ -106,6 +108,7 @@ function SingleSelectImpl({
                 text: item.text,
                 keyForList: item.value,
                 isSelected: item.value === selectedItem?.value,
+                itemStyle: {minHeight: rowHeight},
             })),
             noResultsFound: false,
         };
@@ -142,7 +145,7 @@ function SingleSelectImpl({
             hasHeader={hasHeader}
             hasTitle={hasTitle}
             isSearchable={isSearchable}
-            itemHeight={itemHeight ?? variables.optionRowHeightCompact}
+            itemHeight={rowHeight}
             extraHeight={headerHeight}
             shouldUseFixedPopoverHeight={shouldUseFixedPopoverHeight}
         >
@@ -153,11 +156,7 @@ function SingleSelectImpl({
                     ListItem={SingleSelectListItem}
                     onSelectRow={updateSelectedItem}
                     textInputOptions={textInputOptions}
-                    style={{
-                        contentContainerStyle: [styles.pb0],
-                        ...selectionListStyle,
-                        listItemWrapperStyle: [{minHeight: itemHeight ?? variables.optionRowHeightCompact}, selectionListStyle?.listItemWrapperStyle],
-                    }}
+                    style={{contentContainerStyle: [styles.pb0], ...selectionListStyle}}
                     shouldUpdateFocusedIndex
                     initiallyFocusedItemKey={isSearchable ? value?.value : undefined}
                     shouldShowLoadingPlaceholder={!noResultsFound}
diff --git a/src/components/Search/FilterComponents/VendorSelector.tsx b/src/components/Search/FilterComponents/VendorSelector.tsx
new file mode 100644
index 000000000000..84fc959dd390
--- /dev/null
+++ b/src/components/Search/FilterComponents/VendorSelector.tsx
@@ -0,0 +1,98 @@
+import ActivityIndicator from '@components/ActivityIndicator';
+import type {Filter, SearchFilterCommonProps} from '@components/Search/types';
+
+import useLoadSearchVendorData from '@hooks/useLoadSearchVendorData';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import usePermissions from '@hooks/usePermissions';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {getVendorFeaturePolicyIDs} from '@libs/PolicyUtils';
+import {getAllPolicyValues, sortOptionsWithEmptyValue} from '@libs/SearchQueryUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, PolicyVendors} from '@src/types/onyx';
+import {getEmptyObject} from '@src/types/utils/EmptyObject';
+
+import type {OnyxCollection} from 'react-native-onyx';
+
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+
+import MultiSelect from './MultiSelect';
+
+type VendorSelectorProps = SearchFilterCommonProps<string[] | undefined> & {
+    policyID: Filter | undefined;
+};
+
+function VendorSelector({value = [], policyID, selectionListTextInputStyle, selectionListStyle, autoFocus, footer, onChange}: VendorSelectorProps) {
+    const {translate, localeCompare} = useLocalize();
+    const {isBetaEnabled} = usePermissions();
+    const isVendorMatchingBetaEnabled = isBetaEnabled(CONST.BETAS.VENDOR_MATCHING);
+    const {isLoadingInitialVendors} = useLoadSearchVendorData({shouldRefresh: true});
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const vendorFeaturePolicyIDsSelector = useCallback(
+        (allPolicies: OnyxCollection<Policy>) => getVendorFeaturePolicyIDs(allPolicies, isVendorMatchingBetaEnabled),
+        [isVendorMatchingBetaEnabled],
+    );
+    const [vendorFeaturePolicyIDs] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: vendorFeaturePolicyIDsSelector});
+    const [allPolicyVendors = getEmptyObject<NonNullable<OnyxCollection<PolicyVendors>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY_VENDORS);
+
+    const noVendorLabel = translate('search.noVendor');
+    const selectedVendorItems = value.map((vendor) => {
+        if (vendor === CONST.SEARCH.VENDOR_EMPTY_VALUE) {
+            return {text: noVendorLabel, value: vendor};
+        }
+        return {text: vendor, value: vendor};
+    });
+
+    // Vendor lists are only offered for the workspaces where the vendor feature is on, so stale lists left behind by a
+    // disconnected integration never surface in the picker.
+    const eligiblePolicyIDs = new Set(vendorFeaturePolicyIDs);
+    const eligiblePolicyVendors: OnyxCollection<PolicyVendors> = Object.fromEntries(
+        Object.entries(allPolicyVendors).filter(([key]) => eligiblePolicyIDs.has(key.replace(ONYXKEYS.COLLECTION.POLICY_VENDORS, ''))),
+    );
+
+    const vendorItems = [{text: noVendorLabel, value: CONST.SEARCH.VENDOR_EMPTY_VALUE as string}];
+    const uniqueVendorNames = new Set<string>(
+        getAllPolicyValues(policyID?.value?.length ? policyID : undefined, ONYXKEYS.COLLECTION.POLICY_VENDORS, eligiblePolicyVendors).flatMap((policyVendors) =>
+            Object.values(policyVendors ?? {}).map((vendor) => vendor.name),
+        ),
+    );
+    vendorItems.push(
+        ...Array.from(uniqueVendorNames)
+            .filter(Boolean)
+            .map((vendorName) => ({text: vendorName, value: vendorName}))
+            .toSorted((a, b) => sortOptionsWithEmptyValue(a.text, b.text, localeCompare)),
+    );
+
+    if (isLoadingInitialVendors) {
+        return (
+            <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsCenter]}>
+                <ActivityIndicator
+                    color={theme.spinner}
+                    size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                    style={[styles.pl3]}
+                />
+            </View>
+        );
+    }
+
+    return (
+        <MultiSelect
+            value={selectedVendorItems}
+            items={vendorItems}
+            isSearchable={vendorItems.length >= CONST.STANDARD_LIST_ITEM_LIMIT}
+            autoFocus={autoFocus}
+            selectionListTextInputStyle={selectionListTextInputStyle}
+            selectionListStyle={selectionListStyle}
+            footer={footer}
+            onChange={(vendors) => onChange(vendors.map((vendor) => vendor.value))}
+        />
+    );
+}
+
+export default VendorSelector;
diff --git a/src/components/Search/SearchAutocompleteList.tsx b/src/components/Search/SearchAutocompleteList.tsx
index 74b99a1dd83a..413871add079 100644
--- a/src/components/Search/SearchAutocompleteList.tsx
+++ b/src/components/Search/SearchAutocompleteList.tsx
@@ -1,8 +1,9 @@
+import {useActivePolicyContext} from '@components/ActivePolicyProvider';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import BareUserListItem from '@components/SelectionList/ListItem/BareUserListItem';
-import type {ListItem as NewListItem, UserListItemProps} from '@components/SelectionList/ListItem/types';
+import type {ListItem as NewListItem, ListItemProps} from '@components/SelectionList/ListItem/types';
 import SelectionListWithSections from '@components/SelectionList/SelectionListWithSections';
 import type {Section, SelectionListWithSectionsHandle} from '@components/SelectionList/SelectionListWithSections/types';
 
@@ -48,7 +49,7 @@ import type {OnyxCollection} from 'react-native-onyx';
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import React, {useEffect, useMemo, useRef, useState} from 'react';
 
-import type {SearchQueryItem, SearchQueryListItemProps} from './SearchList/ListItem/SearchQueryListItem';
+import type {SearchQueryItem} from './SearchList/ListItem/SearchQueryListItem';
 import type {SubstitutionMap} from './SearchRouter/getQueryWithSubstitutions';
 import type {UserFriendlyKey} from './types';
 
@@ -127,22 +128,38 @@ const setPerformanceTimersEnd = () => {
     endSpan(CONST.TELEMETRY.SPAN_OPEN_SEARCH_ROUTER);
 };
 
-function isSearchQueryListItem(listItem: UserListItemProps<AutocompleteListItem> | SearchQueryListItemProps): listItem is SearchQueryListItemProps {
-    return isSearchQueryItem(listItem.item);
-}
-
 function getAutocompleteDisplayText(filterKey: UserFriendlyKey, value: string) {
     return `${filterKey}:${value}`;
 }
 
-function SearchRouterItem(props: UserListItemProps<AutocompleteListItem> | SearchQueryListItemProps) {
+function SearchRouterItem({
+    item,
+    isFocused,
+    showTooltip,
+    isDisabled,
+    onSelectRow,
+    onDismissError,
+    shouldPreventEnterKeySubmit,
+    onFocus,
+    shouldSyncFocus,
+    shouldDisableHoverStyle,
+}: ListItemProps<AutocompleteListItem>) {
     const styles = useThemeStyles();
 
-    if (isSearchQueryListItem(props)) {
-        return <SearchQueryListItem {...props} />;
+    if (isSearchQueryItem(item)) {
+        return (
+            <SearchQueryListItem
+                item={item}
+                isFocused={isFocused}
+                showTooltip={showTooltip}
+                onSelectRow={onSelectRow}
+                onFocus={onFocus}
+                shouldSyncFocus={shouldSyncFocus}
+                shouldDisableHoverStyle={shouldDisableHoverStyle}
+            />
+        );
     }
 
-    const {item, isFocused, showTooltip, isDisabled, onSelectRow, onDismissError, shouldPreventEnterKeySubmit, onFocus, shouldSyncFocus, wrapperStyle} = props;
     const fsClass = FS.getChatFSClass((item as SearchOption<Report> | undefined)?.item);
 
     return (
@@ -156,7 +173,7 @@ function SearchRouterItem(props: UserListItemProps<AutocompleteListItem> | Searc
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
             onFocus={onFocus}
             shouldSyncFocus={shouldSyncFocus}
-            wrapperStyle={wrapperStyle}
+            wrapperStyle={[styles.pr0, styles.pl0]}
             pressableStyle={[styles.br2, styles.ph3]}
             forwardedFSClass={fsClass}
             shouldHighlightSelectedItem
@@ -179,7 +196,7 @@ function SearchAutocompleteList({
 }: SearchAutocompleteListProps) {
     const styles = useThemeStyles();
     const {translate, localeCompare, formatPhoneNumber, dateFnsLocale} = useLocalize();
-    const {convertToDisplayString} = useCurrencyListActions();
+    const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const contentContainerStyle = useBottomSafeSafeAreaPaddingStyle({
         addOfflineIndicatorBottomSafeAreaPadding: true,
@@ -193,11 +210,17 @@ function SearchAutocompleteList({
     const [draftComments] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT);
     const [recentSearches, recentSearchesMetadata] = useOnyx(ONYXKEYS.RECENT_SEARCHES);
     const [countryCode] = useOnyx(ONYXKEYS.COUNTRY_CODE);
-    const [loginList] = useOnyx(ONYXKEYS.LOGINS, {selector: expensifyLoginsSelector});
+    const [loginList] = useOnyx(ONYXKEYS.LOGINS, {
+        selector: expensifyLoginsSelector,
+    });
     const [policies = getEmptyObject<NonNullable<OnyxCollection<Policy>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
     const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS);
+    const {activePolicyID} = useActivePolicyContext();
     const sortedReportActionsData = useSortedReportActionsData();
     const sortedActions = sortedReportActionsData?.sortedActions;
+    const transactionThreadIDs = sortedReportActionsData?.transactionThreadIDs;
+    const lastActions = sortedReportActionsData?.lastActions;
     const personalDetails = usePersonalDetails();
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [personalAndWorkspaceCards] = useOnyx(ONYXKEYS.DERIVED.PERSONAL_AND_WORKSPACE_CARD_LIST);
@@ -205,6 +228,7 @@ function SearchAutocompleteList({
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const allCards = personalAndWorkspaceCards ?? CONST.EMPTY_OBJECT;
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [searchResultReportIDs] = useOnyx(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
     const effectiveInputQueryValue = inputQueryValue ?? autocompleteQueryValue;
     const hasEffectiveInputQuery = effectiveInputQueryValue.trim() !== '';
@@ -260,6 +284,7 @@ function SearchAutocompleteList({
         return getSearchOptions({
             dateFnsLocale,
             convertToDisplayString,
+            convertToDisplayStringWithoutCurrency,
             options: listOptions,
             draftComments,
             isDefaultRoomsBetaEnabled,
@@ -279,8 +304,15 @@ function SearchAutocompleteList({
             currentUserEmail,
             policyCollection: policies,
             personalDetails,
+            reportAttributesDerived: reportAttributes,
             sortedActions,
+            transactionThreadIDs,
+            lastActions,
+            currentUserLogin: currentUserEmail,
+            localeCompare,
+            formatPhoneNumber,
             conciergeReportID,
+            allPolicyTags,
             isTrackIntentUser,
             translate,
             getReportByID,
@@ -297,14 +329,87 @@ function SearchAutocompleteList({
         currentUserAccountID,
         currentUserEmail,
         policies,
+        allPolicyTags,
         personalDetails,
+        reportAttributes,
         sortedActions,
+        transactionThreadIDs,
+        lastActions,
+        localeCompare,
+        formatPhoneNumber,
         conciergeReportID,
         isTrackIntentUser,
         translate,
         getReportByID,
         dateFnsLocale,
         convertToDisplayString,
+        convertToDisplayStringWithoutCurrency,
+        rules,
+    ]);
+
+    // Deduped once and read everywhere the order is needed, so a repeated reportID ranks at its first position.
+    const orderedSearchResultReportIDs = useMemo<string[]>(() => (searchResultReportIDs?.length ? [...new Set(searchResultReportIDs)] : []), [searchResultReportIDs]);
+
+    const serverReportsOptions = useMemo(() => {
+        if (!hasActiveSearchResults || listOptions === null || orderedSearchResultReportIDs.length === 0) {
+            return CONST.EMPTY_ARRAY;
+        }
+
+        const orderedReportIDs = orderedSearchResultReportIDs.slice(0, CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS);
+        const reportIDs = new Set(orderedReportIDs);
+        const options = getSearchOptions({
+            dateFnsLocale,
+            convertToDisplayString,
+            options: {reports: listOptions.reports.filter((option) => reportIDs.has(option.reportID)), personalDetails: []},
+            draftComments,
+            isDefaultRoomsBetaEnabled,
+            isUsedInChatFinder: true,
+            includeReadOnly: true,
+            // Auth's ID list is the filter here. Re-running the client matcher would drop the reports Auth matched on
+            // criteria the client doesn't check (e.g. you own it) — the rows this pass exists to surface.
+            searchQuery: '',
+            maxResults: orderedReportIDs.length,
+            includeUserToInvite: false,
+            includeRecentReports: true,
+            includeCurrentUser: false,
+            countryCode,
+            shouldShowGBR: false,
+            shouldUnreadBeBold: true,
+            loginList,
+            visibleReportActionsData,
+            currentUserAccountID,
+            currentUserEmail,
+            policyCollection: policies,
+            personalDetails,
+            sortedActions,
+            conciergeReportID,
+            isTrackIntentUser,
+            translate,
+            getReportByID,
+            rules,
+        }).options;
+        const optionsByReportID = new Map(options.recentReports.map((option) => [option.reportID, option]));
+        return orderedReportIDs.map((reportID) => optionsByReportID.get(reportID)).filter((option): option is OptionData => !!option && !option.isSelfDM);
+    }, [
+        hasActiveSearchResults,
+        listOptions,
+        orderedSearchResultReportIDs,
+        dateFnsLocale,
+        convertToDisplayString,
+        draftComments,
+        isDefaultRoomsBetaEnabled,
+        countryCode,
+        loginList,
+        visibleReportActionsData,
+        currentUserAccountID,
+        currentUserEmail,
+        policies,
+        personalDetails,
+        sortedActions,
+        conciergeReportID,
+        isTrackIntentUser,
+        translate,
+        getReportByID,
         rules,
     ]);
 
@@ -360,6 +465,7 @@ function SearchAutocompleteList({
         loginList,
         policies,
         visibleReportActionsData,
+        reportAttributesDerived: reportAttributes,
         currentUserAccountID,
         currentUserEmail,
         personalDetails,
@@ -420,16 +526,18 @@ function SearchAutocompleteList({
         expensifyIcons.History,
     ]);
 
-    const recentReportsOptions = useMemo(() => {
+    // The client's own matches, before Auth's order is merged in. Kept separate so the frozen rank below can snapshot
+    // the client's order: snapshotting the merged list would bake the previous query's server order into "Recent chats".
+    const localReportsOptions = useMemo<OptionData[]>(() => {
         if (!hasActiveSearchResults) {
-            return searchOptions.recentReports;
+            return [];
         }
 
         // searchOptions/autocompleteQueryValue are debounced. For a query -> query change this still returns the
         // previous query's matches during the debounce window (rows stay visible, preserving focus/Enter/arrow keys).
-        // For the empty -> query transition hasActiveSearchResults is false until the debounced query lands, so this
-        // returns recent chats instead of unfiltered rows, avoiding the stale-then-filtered reflow.
-        const orderedOptions = combineOrderingOfReportsAndPersonalDetails(searchOptions, autocompleteQueryValue, {
+        // For the empty -> query transition hasActiveSearchResults is false until the debounced query lands, so
+        // recentReportsOptions falls back to recent chats instead of unfiltered rows, avoiding the reflow.
+        const orderedOptions = combineOrderingOfReportsAndPersonalDetails(searchOptions, autocompleteQueryValue, activePolicyID, {
             sortByReportTypeInSearch: true,
             preferChatRoomsOverThreads: true,
         });
@@ -439,16 +547,47 @@ function SearchAutocompleteList({
             reportOptions.push(searchOptions.userToInvite);
         }
 
-        return reportOptions.slice(0, 20);
-    }, [autocompleteQueryValue, hasActiveSearchResults, searchOptions]);
+        return reportOptions;
+    }, [autocompleteQueryValue, activePolicyID, hasActiveSearchResults, searchOptions]);
 
-    // Locked rank map (stable key -> originalIndex) capturing the order of locally-known
-    // results at the moment the query changes. Recomputed only when the query changes, so server
-    // reports merged into Onyx later do not shift the rows already visible in the top section.
+    const recentReportsOptions = useMemo(() => {
+        if (!hasActiveSearchResults) {
+            return searchOptions.recentReports.slice(0, CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS);
+        }
+
+        const reportOptions: OptionData[] = [...localReportsOptions];
+
+        if (orderedSearchResultReportIDs.length > 0) {
+            const matchedReportIDs = new Set(reportOptions.map((option) => option.reportID).filter(Boolean));
+            reportOptions.push(...serverReportsOptions.filter((option) => !matchedReportIDs.has(option.reportID)));
+
+            const rankByReportID = new Map(orderedSearchResultReportIDs.map((reportID, index) => [reportID, index]));
+            const rankOf = (option: OptionData) => {
+                if (option.isSelfDM) {
+                    return -1;
+                }
+                return option.reportID === undefined ? Number.MAX_SAFE_INTEGER : (rankByReportID.get(option.reportID) ?? Number.MAX_SAFE_INTEGER);
+            };
+            reportOptions.sort((a, b) => rankOf(a) - rankOf(b));
+        }
+
+        // Preserve locally matched rows first. Auth orders only the remaining slots, so a server response cannot
+        // remove chats, contacts, or invite options that were already visible locally. The combined list remains capped at 20.
+        if (orderedSearchResultReportIDs.length > 0) {
+            return reportOptions;
+        }
+        return reportOptions.slice(0, CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS);
+    }, [hasActiveSearchResults, localReportsOptions, orderedSearchResultReportIDs, searchOptions, serverReportsOptions]);
+
+    // Locked rank map (stable key -> originalIndex) capturing the order of the client's own matches at the moment the
+    // query settled, so reports merged into Onyx later do not shift the rows already visible in the top section.
     const [frozenLocalRank, setFrozenLocalRank] = useState<ReadonlyMap<string, number>>(EMPTY_RANK_MAP);
+    // Whether the snapshot above came from a non-empty list. Testing frozenLocalRank.size would re-snapshot every
+    // render when no option yields a stable rank key.
+    const [hasFrozenLocalRank, setHasFrozenLocalRank] = useState(false);
     const [prevAutocompleteQuery, setPrevAutocompleteQuery] = useState(autocompleteQueryValue);
 
-    const buildRankMap = (options: OptionData[]): Map<string, number> => {
+    const buildRankMap = (options: readonly OptionData[]): Map<string, number> => {
         const rank = new Map<string, number>();
         for (const [index, option] of options.entries()) {
             const key = getStableRankKey(option);
@@ -461,14 +600,13 @@ function SearchAutocompleteList({
 
     if (prevAutocompleteQuery !== autocompleteQueryValue) {
         setPrevAutocompleteQuery(autocompleteQueryValue);
-        if (autocompleteQueryValue.trim() === '') {
-            setFrozenLocalRank(EMPTY_RANK_MAP);
-        } else {
-            setFrozenLocalRank(buildRankMap(recentReportsOptions));
-        }
-    } else if (autocompleteQueryValue.trim() !== '' && frozenLocalRank.size === 0 && recentReportsOptions.length > 0) {
-        // Options hydrated after the rank was snapshotted as empty — recompute.
-        setFrozenLocalRank(buildRankMap(recentReportsOptions));
+        setFrozenLocalRank(hasActiveSearchResults ? buildRankMap(localReportsOptions) : EMPTY_RANK_MAP);
+        setHasFrozenLocalRank(hasActiveSearchResults && localReportsOptions.length > 0);
+    } else if (hasActiveSearchResults && !hasFrozenLocalRank && localReportsOptions.length > 0) {
+        // Options can hydrate after the query settled (cold start), leaving the snapshot empty. Safe to rebuild
+        // whether or not Auth has answered, since this list never holds Auth's order.
+        setFrozenLocalRank(buildRankMap(localReportsOptions));
+        setHasFrozenLocalRank(true);
     }
 
     // Callers that pass a distinct inputQueryValue (e.g. SearchRouter) already debounce autocompleteQueryValue
@@ -490,7 +628,12 @@ function SearchAutocompleteList({
     );
 
     useEffect(() => {
-        if (!handleSearch || !autocompleteQueryWithoutFilters) {
+        if (!handleSearch) {
+            return;
+        }
+
+        if (!autocompleteQueryWithoutFilters) {
+            handleSearch('');
             return;
         }
 
@@ -565,12 +708,13 @@ function SearchAutocompleteList({
                 });
             }
         } else {
-            // Active search: split rows into local (frozen order) and server sections.
+            // Active search uses one shared 20-row budget: preserve locally matched rows first, then fill remaining
+            // slots with Auth-ranked server results. Auth orders the server section; it does not evict local rows.
             const localRows: AutocompleteListItem[] = [];
             const serverRows: AutocompleteListItem[] = [];
             for (const item of nextStyledRecentReports) {
                 const stableKey = getStableRankKey(item);
-                if (stableKey && frozenLocalRank.has(stableKey)) {
+                if (item.isSelfDM || (stableKey && frozenLocalRank.has(stableKey))) {
                     localRows.push(item);
                 } else {
                     serverRows.push(item);
@@ -578,7 +722,12 @@ function SearchAutocompleteList({
             }
             // Sort the local section by the rank captured at query-change time so it cannot
             // reorder when the API returns.
-            localRows.sort((a, b) => (frozenLocalRank.get(getStableRankKey(a) ?? '') ?? 0) - (frozenLocalRank.get(getStableRankKey(b) ?? '') ?? 0));
+            localRows.sort((a, b) => {
+                if (a.isSelfDM !== b.isSelfDM) {
+                    return a.isSelfDM ? -1 : 1;
+                }
+                return (frozenLocalRank.get(getStableRankKey(a) ?? '') ?? 0) - (frozenLocalRank.get(getStableRankKey(b) ?? '') ?? 0);
+            });
 
             if (localRows.length > 0 || !isLoadingOptions) {
                 pushSection({title: translate('search.recentChats'), data: localRows, sectionIndex: sectionIndex++});
@@ -593,10 +742,11 @@ function SearchAutocompleteList({
                 });
             }
 
-            if (serverRows.length > 0) {
+            const remainingServerRows = serverRows.slice(0, Math.max(CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS - localRows.length, 0));
+            if (remainingServerRows.length > 0) {
                 pushSection({
                     title: translate('search.serverResults'),
-                    data: serverRows,
+                    data: remainingServerRows,
                     sectionIndex: sectionIndex++,
                 });
             }
@@ -799,7 +949,6 @@ function SearchAutocompleteList({
                 containerStyle: [styles.mh100],
                 listStyle: styles.overscrollBehaviorContain,
                 contentContainerStyle,
-                listItemWrapperStyle: [styles.pr0, styles.pl0],
                 sectionTitleStyles: styles.mhn2,
             }}
             shouldSingleExecuteRowSelect
@@ -825,5 +974,4 @@ function SearchAutocompleteList({
 SearchAutocompleteList.displayName = 'SearchAutocompleteList';
 
 export default React.memo(SearchAutocompleteList);
-export {SearchRouterItem};
 export type {GetAdditionalSectionsCallback, SearchAutocompleteListProps};
diff --git a/src/components/Search/SearchChartView.tsx b/src/components/Search/SearchChartView.tsx
index 19fb329ee797..eccf2fed8d88 100644
--- a/src/components/Search/SearchChartView.tsx
+++ b/src/components/Search/SearchChartView.tsx
@@ -23,7 +23,7 @@ import CHART_GROUP_BY_CONFIG from './chartGroupByConfig';
 import {useSearchQueryContext} from './SearchContext';
 
 type SearchChartViewProps = {
-    queryJSON: Readonly<SearchQueryJSON>;
+    queryJSON: Readonly<SearchQueryJSON> | undefined;
 
     /** The view type (bar, etc.) */
     view: ChartView;
@@ -62,7 +62,7 @@ function SearchChartView({queryJSON, view, groupBy, data, isLoading, color, rend
 
     const handleItemPress = (index: number) => {
         const item = rows.at(index)?.item;
-        if (!item) {
+        if (!item || !queryJSON) {
             return;
         }
 
diff --git a/src/components/Search/SearchContext.tsx b/src/components/Search/SearchContext.tsx
index 5413e5218741..ed4612cacf61 100644
--- a/src/components/Search/SearchContext.tsx
+++ b/src/components/Search/SearchContext.tsx
@@ -7,7 +7,9 @@ import {
     SearchResultsContext,
     SearchRowSelectionActionsContext,
     SearchSelectionActionsContext,
+    SearchSelectionClearGenerationContext,
     SearchSelectionContext,
+    SearchShiftRangeGroupsContext,
 } from './SearchContextDefinitions';
 
 // Lightweight public surface for search contexts.
@@ -43,6 +45,14 @@ function useSearchRowSelectionActions() {
     return useContext(SearchRowSelectionActionsContext);
 }
 
+function useSearchShiftRangeGroups() {
+    return useContext(SearchShiftRangeGroupsContext);
+}
+
+function useSelectionClearGeneration() {
+    return useContext(SearchSelectionClearGenerationContext);
+}
+
 export {
     SearchQueryContext,
     SearchQueryActionsContext,
@@ -57,4 +67,6 @@ export {
     useSearchSelectionContext,
     useSearchSelectionActions,
     useSearchRowSelectionActions,
+    useSearchShiftRangeGroups,
+    useSelectionClearGeneration,
 };
diff --git a/src/components/Search/SearchContextDefinitions.ts b/src/components/Search/SearchContextDefinitions.ts
index 04eec0def1ec..da0373d7a13c 100644
--- a/src/components/Search/SearchContextDefinitions.ts
+++ b/src/components/Search/SearchContextDefinitions.ts
@@ -14,6 +14,7 @@ import type {
     SearchRowSelectionActionsValue,
     SearchSelectionActionsValue,
     SearchSelectionContextValue,
+    SearchShiftRangeGroupsActions,
 } from './types';
 
 // This file holds the bare React.createContext() calls so they can be imported by `@hooks/useOnyx`
@@ -67,6 +68,9 @@ const defaultSearchSelectionContext: SearchSelectionContextValue = {
 
 const defaultSearchSelectionActions: SearchSelectionActionsValue = {
     setSelectedTransactions: () => {},
+    getSelectedTransactions: () => defaultSearchSelectionContext.selectedTransactions,
+    getExcludedTransactions: () => defaultSearchSelectionContext.excludedTransactions,
+    getAreAllMatchingItemsSelected: () => defaultSearchSelectionContext.areAllMatchingItemsSelected,
     applySelection: () => {},
     setSelectedReports: () => {},
     setCurrentSelectedTransactionReportID: () => {},
@@ -80,6 +84,12 @@ const defaultRowSelectionActions: SearchRowSelectionActionsValue = {
     toggleAll: () => {},
 };
 
+const defaultSearchShiftRangeGroupsActions: SearchShiftRangeGroupsActions = {
+    addGroupToRange: () => {},
+    removeGroupFromRange: () => {},
+    registryGeneration: undefined,
+};
+
 const SearchQueryContext = React.createContext<SearchQueryContextValue>(defaultSearchQueryContext);
 const SearchQueryActionsContext = React.createContext<SearchQueryActionsValue>(defaultSearchQueryActions);
 const SearchResultsContext = React.createContext<SearchResultsContextValue>(defaultSearchResultsContext);
@@ -87,6 +97,9 @@ const SearchResultsActionsContext = React.createContext<SearchResultsActionsValu
 const SearchSelectionContext = React.createContext<SearchSelectionContextValue>(defaultSearchSelectionContext);
 const SearchSelectionActionsContext = React.createContext<SearchSelectionActionsValue>(defaultSearchSelectionActions);
 const SearchRowSelectionActionsContext = React.createContext<SearchRowSelectionActionsValue>(defaultRowSelectionActions);
+const SearchShiftRangeGroupsContext = React.createContext<SearchShiftRangeGroupsActions>(defaultSearchShiftRangeGroupsActions);
+/** Incremented whenever a clear empties the Search selection, so the shift+click range session knows to reset */
+const SearchSelectionClearGenerationContext = React.createContext(0);
 
 export {
     EMPTY_TRANSACTIONS_BY_REPORT_ID,
@@ -97,4 +110,6 @@ export {
     SearchSelectionContext,
     SearchSelectionActionsContext,
     SearchRowSelectionActionsContext,
+    SearchShiftRangeGroupsContext,
+    SearchSelectionClearGenerationContext,
 };
diff --git a/src/components/Search/SearchList/BaseSearchList/index.tsx b/src/components/Search/SearchList/BaseSearchList/index.tsx
index 1fbb0c477c13..3fcad84abb92 100644
--- a/src/components/Search/SearchList/BaseSearchList/index.tsx
+++ b/src/components/Search/SearchList/BaseSearchList/index.tsx
@@ -1,6 +1,6 @@
+import {useEditingCellState} from '@components/EditableCell';
 import type {SearchListItem} from '@components/Search/SearchList/ListItem/types';
 import type {ExtendedTargetedEvent} from '@components/SelectionList/ListItem/types';
-import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
diff --git a/src/components/Search/SearchList/ListItem/ChatListItem.tsx b/src/components/Search/SearchList/ListItem/ChatListItem.tsx
index fe67d2535a80..9dc18079eead 100644
--- a/src/components/Search/SearchList/ListItem/ChatListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/ChatListItem.tsx
@@ -1,9 +1,9 @@
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import ListItemComposed from '@components/SelectionList/ListItemComposed';
-import useListItemHighlight from '@components/SelectionList/ListItemComposed/hooks/useListItemHighlight';
 import type {ListItem} from '@components/SelectionList/types';
 
 import useOnyx from '@hooks/useOnyx';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import FS from '@libs/Fullstory';
@@ -39,11 +39,18 @@ function ChatListItem<TItem extends ListItem>({
     const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportActionItem?.childReportID}`);
     const [chatReportStable] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportStable?.chatReportID)}`, {selector: getStableReportSelector});
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
     const {isSelected} = useRowSelection(item.keyForList);
-    const {pressableStyle, pressableWrapperStyle} = useListItemHighlight({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected,
-    });
+    const pressableStyle = [
+        styles.selectionListPressableItemWrapper,
+        styles.p0,
+        styles.textAlignLeft,
+        styles.overflowHidden,
+        // Background is applied on the parent wrapper, so keep this transparent
+        styles.bgTransparent,
+        isSelected && styles.activeComponentBG,
+        styles.mh0,
+    ];
 
     const fsClass = FS.getChatFSClass(reportStable);
 
@@ -52,7 +59,7 @@ function ChatListItem<TItem extends ListItem>({
     return (
         <ListItemComposed
             item={item}
-            pressableStyle={[pressableStyle, styles.p0, styles.textAlignLeft, styles.overflowHidden, item.cursorStyle]}
+            pressableStyle={pressableStyle}
             containerStyle={styles.mb2}
             isFocused={isFocused}
             isDisabled={isDisabled}
@@ -63,7 +70,7 @@ function ChatListItem<TItem extends ListItem>({
             onDismissError={onDismissError}
             onFocus={onFocus}
             shouldSyncFocus={shouldSyncFocus}
-            pressableWrapperStyle={pressableWrapperStyle}
+            pressableWrapperStyle={[styles.mh5, StyleUtils.getSearchRowBackgroundStyle(isSelected), styles.br2]}
             hoverStyle={isSelected && styles.activeComponentBG}
         >
             <View
diff --git a/src/components/Search/SearchList/ListItem/DateCell.tsx b/src/components/Search/SearchList/ListItem/DateCell.tsx
index 3a1ecd79ae16..bb970f435afe 100644
--- a/src/components/Search/SearchList/ListItem/DateCell.tsx
+++ b/src/components/Search/SearchList/ListItem/DateCell.tsx
@@ -1,7 +1,7 @@
 import DatePickerModal from '@components/DatePicker/DatePickerModal';
+import {EditableCell, usePopoverEditState} from '@components/EditableCell';
+import type {EditableProps} from '@components/EditableCell/types';
 import TextWithTooltip from '@components/TextWithTooltip';
-import {EditableCell, usePopoverEditState} from '@components/TransactionItemRow/EditableCell';
-import type {EditableProps} from '@components/TransactionItemRow/EditableCell/types';
 
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
index c51671bb5f5b..9cc00e330b80 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx
@@ -22,7 +22,6 @@ import useOnyx from '@hooks/useOnyx';
 import {useReportPaymentContext} from '@hooks/usePaymentContext';
 import {useAllPersonalDetailsWithoutSnapshots} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -370,16 +369,16 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
         shouldShowMarkAsDoneCopy,
     ]);
 
-    const handleSelectionButtonPress = useCallback(() => {
-        onSelectionButtonPress?.(reportItem as unknown as TItem);
-    }, [onSelectionButtonPress, reportItem]);
+    const handleSelectionButtonPress = (shiftKey?: boolean) => {
+        onSelectionButtonPress?.(item, undefined, shiftKey);
+    };
 
     const listItemPressableStyle = useMemo(
         () => [
             styles.selectionListPressableItemWrapper,
             isLargeScreenWidth && styles.pv3,
             isLargeScreenWidth && styles.ph3,
-            // Removing background style because they are added to the parent OpacityView via animatedHighlightStyle
+            // Background is applied on the parent wrapper, so keep this transparent
             styles.bgTransparent,
             isSelected && styles.activeComponentBG,
             styles.mh0,
@@ -391,17 +390,6 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
         [styles, isSelected, isLargeScreenWidth, isFirstItem, isLastItem, isPendingDelete, StyleUtils],
     );
 
-    // The animated style is applied inline, so the `borderRadius: 0` it carries wins over the static
-    // `tableTopRadius`/`tableBottomRadius` below and squares off the list's outer corners. Skip it for the first
-    // and last rows only, so every other row keeps its existing (already square) behavior.
-    const shouldApplyAnimatedBorderRadius = !isLargeScreenWidth && !isFirstItem && !isLastItem;
-    const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected,
-        borderRadius: 0,
-        shouldApplyOtherStyles: shouldApplyAnimatedBorderRadius,
-    });
-
     const shouldShowViolationDescription = isOpenExpenseReport(reportItem) || isProcessingReport(reportItem);
 
     // Show violation description if either:
@@ -437,7 +425,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
                         width={12}
                         height={12}
                     />
-                    <Text style={[isLargeScreenWidth ? styles.textMicro : styles.mutedNormalTextLabel, styles.textDanger]}>{translate('iou.rejectReport.rejectedReportMessage')}</Text>
+                    <Text style={[isLargeScreenWidth ? styles.textMicro : styles.mutedNormalTextLabel, {color: theme.textError}]}>{translate('iou.rejectReport.rejectedReportMessage')}</Text>
                 </View>
             );
         }
@@ -453,7 +441,7 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
                     width={12}
                     height={12}
                 />
-                <Text style={[isLargeScreenWidth ? styles.textMicro : styles.mutedNormalTextLabel, styles.textDanger]}>
+                <Text style={[isLargeScreenWidth ? styles.textMicro : styles.mutedNormalTextLabel, {color: theme.textError}]}>
                     {translate('reportViolations.reportContainsExpensesWithViolations')}
                 </Text>
             </View>
@@ -468,10 +456,10 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
         styles.mr1,
         styles.textMicro,
         styles.mutedNormalTextLabel,
-        styles.textDanger,
         isLargeScreenWidth,
         expensifyIcons.DotIndicator,
         theme.danger,
+        theme.textError,
         translate,
     ]);
 
@@ -498,7 +486,8 @@ function ExpenseReportListItemInner<TItem extends ListItem>({
             hoverStyle={isSelected && styles.activeComponentBG}
             pressableWrapperStyle={[
                 styles.mh5,
-                animatedHighlightStyle,
+                StyleUtils.getSearchRowBackgroundStyle(isSelected),
+                !isLargeScreenWidth && styles.br0,
                 isPendingDelete && styles.cursorDisabled,
                 isLargeScreenWidth && isLastItem && [styles.tableBottomRadius, styles.overflowHidden],
                 !isLargeScreenWidth && isFirstItem && styles.tableTopRadius,
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
index fc6e0dac7211..7338dea15fac 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowNarrow.tsx
@@ -6,6 +6,8 @@ import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
+
 import CONST from '@src/CONST';
 
 import React from 'react';
@@ -24,7 +26,7 @@ function ExpenseReportListItemRowNarrow({item, onCheckboxPress = () => {}, canSe
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3, styles.pt3, styles.cursorPointer]}>
             {!!canSelectMultiple && (
                 <Checkbox
-                    onPress={onCheckboxPress}
+                    onPress={(event) => onCheckboxPress(getShiftKeyFromEvent(event))}
                     isChecked={isSelectAllChecked}
                     isIndeterminate={isIndeterminate}
                     containerStyle={styles.m0}
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
index 5695dd3de32c..b31183b44ef8 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/ExpenseReportListItemRowWide.tsx
@@ -18,6 +18,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import getBase62ReportID from '@libs/getBase62ReportID';
+import {getShiftKeyFromEvent} from '@libs/shiftRangeSelection';
 
 import variables from '@styles/variables';
 
@@ -302,7 +303,7 @@ function ExpenseReportListItemRowWide({
             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap3]}>
                 {!!canSelectMultiple && (
                     <Checkbox
-                        onPress={onCheckboxPress}
+                        onPress={(event) => onCheckboxPress(getShiftKeyFromEvent(event))}
                         isChecked={isSelectAllChecked}
                         isIndeterminate={isIndeterminate}
                         containerStyle={styles.m0}
diff --git a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/types.ts b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/types.ts
index 11e87e0776b6..4fbc13b9c723 100644
--- a/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/types.ts
+++ b/src/components/Search/SearchList/ListItem/ExpenseReportListItemRow/types.ts
@@ -8,7 +8,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 type ExpenseReportListItemRowNarrowProps = {
     item: ExpenseReportListItemType;
     canSelectMultiple?: boolean;
-    onCheckboxPress?: () => void;
+    onCheckboxPress?: (shiftKey?: boolean) => void;
     isSelectAllChecked?: boolean;
     isIndeterminate?: boolean;
     isDisabledCheckbox?: boolean;
diff --git a/src/components/Search/SearchList/ListItem/GroupChildrenContainer.tsx b/src/components/Search/SearchList/ListItem/GroupChildrenContainer.tsx
index 44346f9d630b..047b9d8000ec 100644
--- a/src/components/Search/SearchList/ListItem/GroupChildrenContainer.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupChildrenContainer.tsx
@@ -1,5 +1,5 @@
 import useExpandCollapseAnimation from '@hooks/useExpandCollapseAnimation';
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import React from 'react';
@@ -33,6 +33,7 @@ function GroupChildrenContainer({
     newTransactionID,
 }: GroupChildrenContainerProps) {
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
     const hasBorder = !isFirstItem;
     const {isRendered, animatedStyle, onLayout} = useExpandCollapseAnimation(isExpanded, isExpanded && hasBorder, item.keyForList);
     const isContentVisible = isExpanded || isRendered;
@@ -41,19 +42,13 @@ function GroupChildrenContainer({
     // Only the rows this container holds decide its background, so a group still waiting for its first page is not painted as selected.
     const isSelected = !!item.isSelected || (item.transactions.length > 0 && isSelectAllChecked);
 
-    const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected,
-        shouldApplyOtherStyles: false,
-    });
-
     // Rendering null in FlashList can cause heavy first-render work; use an empty placeholder instead (LHN pattern).
     if (!isExpanded && !isRendered) {
         return <View />;
     }
 
     return (
-        <Animated.View style={[styles.mh5, animatedHighlightStyle, isLastItem && [styles.tableBottomRadius, styles.overflowHidden], hasBorder && styles.tableBorder]}>
+        <View style={[styles.mh5, StyleUtils.getSearchRowBackgroundStyle(isSelected), isLastItem && [styles.tableBottomRadius, styles.overflowHidden], hasBorder && styles.tableBorder]}>
             <Animated.View style={animatedStyle}>
                 {isContentVisible ? (
                     <Animated.View
@@ -77,7 +72,7 @@ function GroupChildrenContainer({
                     </Animated.View>
                 ) : null}
             </Animated.View>
-        </Animated.View>
+        </View>
     );
 }
 
diff --git a/src/components/Search/SearchList/ListItem/GroupHeader.tsx b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
index a30dadc0bdb1..752b5036841b 100644
--- a/src/components/Search/SearchList/ListItem/GroupHeader.tsx
+++ b/src/components/Search/SearchList/ListItem/GroupHeader.tsx
@@ -13,7 +13,6 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useOnyx from '@hooks/useOnyx';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
@@ -189,12 +188,6 @@ function GroupHeader({
         keyForList: item.groupKeyForList,
     });
 
-    const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected: isItemSelected,
-        shouldApplyOtherStyles: false,
-    });
-
     const handleSelectionButtonPress = () => {
         onCheckboxPress(withOriginalKey(item), isExpenseReportType ? undefined : groupItem.transactions);
     };
@@ -401,7 +394,7 @@ function GroupHeader({
                 ]}
                 wrapperStyle={[
                     styles.mh5,
-                    animatedHighlightStyle,
+                    StyleUtils.getSearchRowBackgroundStyle(!!isItemSelected),
                     styles.userSelectNone,
                     isLargeScreenWidth
                         ? [StyleUtils.getSearchTableGroupRowBorderStyle(isFirstItem, isLastItemCollapsed, isItemSelected), isLastItemCollapsed && styles.overflowHidden]
diff --git a/src/components/Search/SearchList/ListItem/SearchMergeReportsListItem.tsx b/src/components/Search/SearchList/ListItem/SearchMergeReportsListItem.tsx
index 823f752bfc6c..5ff69a3eedca 100644
--- a/src/components/Search/SearchList/ListItem/SearchMergeReportsListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/SearchMergeReportsListItem.tsx
@@ -1,7 +1,6 @@
 import RadioButton from '@components/RadioButton';
-import type {ListItemProps} from '@components/SelectionList/ListItem/types';
+import type {ListItem, ListItemProps} from '@components/SelectionList/ListItem/types';
 import ListItemComposed from '@components/SelectionList/ListItemComposed';
-import type {ListItem} from '@components/SelectionList/types';
 
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
diff --git a/src/components/Search/SearchList/ListItem/SearchQueryListItem.tsx b/src/components/Search/SearchList/ListItem/SearchQueryListItem.tsx
index 52fa5c29a8a3..6c116afae905 100644
--- a/src/components/Search/SearchList/ListItem/SearchQueryListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/SearchQueryListItem.tsx
@@ -56,7 +56,7 @@ function SearchQueryListItem({item, isFocused, showTooltip, onSelectRow, onFocus
     return (
         <ListItemComposed
             item={item}
-            pressableStyle={[styles.searchQueryListItemStyle, item.isSelected && styles.activeComponentBG, item.cursorStyle]}
+            pressableStyle={[styles.searchQueryListItemStyle, item.isSelected && styles.activeComponentBG]}
             isFocused={isFocused}
             onSelectRow={onSelectRow}
             onFocus={onFocus}
@@ -91,4 +91,4 @@ function SearchQueryListItem({item, isFocused, showTooltip, onSelectRow, onFocus
 
 export default SearchQueryListItem;
 export {isSearchQueryItem};
-export type {SearchQueryItem, SearchQueryListItemProps};
+export type {SearchQueryItem};
diff --git a/src/components/Search/SearchList/ListItem/TaskListItem.tsx b/src/components/Search/SearchList/ListItem/TaskListItem.tsx
index 90e38325d43f..bda6e047162f 100644
--- a/src/components/Search/SearchList/ListItem/TaskListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TaskListItem.tsx
@@ -4,10 +4,13 @@ import type {ListItem} from '@components/SelectionList/types';
 
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import FS from '@libs/Fullstory';
 
+import variables from '@styles/variables';
+
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ReportAttributesDerivedValue} from '@src/types/onyx';
 
@@ -18,7 +21,6 @@ import {View} from 'react-native';
 
 import type {TaskListItemProps, TaskListItemType} from './types';
 
-import useSearchTableItemHighlight from './hooks/useSearchTableItemHighlight';
 import TaskListItemRow from './TaskListItemRow';
 
 /**
@@ -47,15 +49,21 @@ function TaskListItem<TItem extends ListItem>({
     const liveTaskItem: TaskListItemType =
         liveParentReportAttributeName && liveParentReportAttributeName !== taskItem.parentReportName ? {...taskItem, parentReportName: liveParentReportAttributeName} : taskItem;
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
 
     const {isLargeScreenWidth} = useResponsiveLayout();
     const {isSelected} = useRowSelection(item.keyForList);
 
-    const {pressableStyle, pressableWrapperStyle} = useSearchTableItemHighlight({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected,
-        isLastItem: !!isLastItem,
-    });
+    const listItemPressableStyle = [
+        styles.selectionListPressableItemWrapper,
+        styles.pv3,
+        styles.ph3,
+        // Background is applied on the parent wrapper, so keep this transparent
+        styles.bgTransparent,
+        isSelected && styles.activeComponentBG,
+        styles.mh0,
+        isLargeScreenWidth && StyleUtils.getSearchTableRowPressableStyle(!!isLastItem, isSelected, {vertical: variables.tableRowPaddingVertical}),
+    ];
 
     const listItemWrapperStyle = [
         styles.flex1,
@@ -68,7 +76,7 @@ function TaskListItem<TItem extends ListItem>({
     return (
         <ListItemComposed
             item={item}
-            pressableStyle={pressableStyle}
+            pressableStyle={listItemPressableStyle}
             containerStyle={!isLargeScreenWidth && styles.mb2}
             isFocused={isFocused}
             isDisabled={isDisabled}
@@ -79,7 +87,12 @@ function TaskListItem<TItem extends ListItem>({
             onLongPressRow={onLongPressRow}
             shouldSyncFocus={shouldSyncFocus}
             hoverStyle={isSelected && styles.activeComponentBG}
-            pressableWrapperStyle={pressableWrapperStyle}
+            pressableWrapperStyle={[
+                styles.mh5,
+                StyleUtils.getSearchRowBackgroundStyle(isSelected),
+                !isLargeScreenWidth && styles.br2,
+                isLargeScreenWidth && isLastItem && [styles.tableBottomRadius, styles.overflowHidden],
+            ]}
         >
             <View
                 style={listItemWrapperStyle}
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
index f6fa2e295b47..a320342b65f3 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListExpanded.tsx
@@ -13,6 +13,7 @@ import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useIsVendorColumnAvailable from '@hooks/useIsVendorColumnAvailable';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -35,7 +36,7 @@ import {createAndOpenSearchTransactionThread, getColumnsToShow, getGroupColumnWi
 import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import type {TransactionPreviewData} from '@userActions/Search';
-import {setActiveTransactionIDs} from '@userActions/TransactionThreadNavigation';
+import {CAROUSEL_SOURCE, setActiveTransactionIDs} from '@userActions/TransactionThreadNavigation';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -94,6 +95,7 @@ function TransactionGroupListExpandedImpl({
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasCompletedGuidedSetupFlowSelector});
+    const delegateAccountID = useDelegateAccountID();
     const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {selector: columnsSelector});
     const isVendorColumnAvailable = useIsVendorColumnAvailable();
     const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
@@ -222,11 +224,12 @@ function TransactionGroupListExpandedImpl({
                         personalDetails,
                         isSelfTourViewed,
                         hasCompletedGuidedSetupFlow,
+                        delegateAccountID,
                         IOUTransactionID: transactionItem?.reportAction?.childReportID,
                         shouldNavigate: false,
                     });
                     if (targetReportID) {
-                        openInternalRouteInNewTab(ROUTES.SEARCH_REPORT.getRoute({reportID: targetReportID, backTo}), event);
+                        openInternalRouteInNewTab(ROUTES.SEARCH_REPORT.getRoute({reportID: targetReportID, backTo, anchorTransactionID: transactionItem.transactionID}), event);
                     }
                     return;
                 }
@@ -241,12 +244,13 @@ function TransactionGroupListExpandedImpl({
                     personalDetails,
                     isSelfTourViewed,
                     hasCompletedGuidedSetupFlow,
+                    delegateAccountID,
                     IOUTransactionID: transactionItem?.reportAction?.childReportID,
                 });
                 return;
             }
             markReportRHPWidth(reportID, 'wide');
-            const route = ROUTES.SEARCH_REPORT.getRoute({reportID, backTo});
+            const route = ROUTES.SEARCH_REPORT.getRoute({reportID, backTo, anchorTransactionID: transactionItem.transactionID});
             if (openInternalRouteInNewTab(route, event)) {
                 return;
             }
@@ -265,13 +269,14 @@ function TransactionGroupListExpandedImpl({
 
         // When opening the transaction thread in RHP we need to find every other ID for the rest of transactions
         // to display prev/next arrows in RHP for navigation
+        const carouselOptions = {source: CAROUSEL_SOURCE.search(transactionsQueryJSON?.hash), snapshotHash: transactionsQueryJSON?.hash};
         if (isModifiedMousePress(event)) {
-            setActiveTransactionIDs(siblingTransactionIDs);
+            setActiveTransactionIDs(siblingTransactionIDs, carouselOptions);
             navigateToTransactionThread();
             return;
         }
 
-        setActiveTransactionIDs(siblingTransactionIDs).then(navigateToTransactionThread);
+        setActiveTransactionIDs(siblingTransactionIDs, carouselOptions).then(navigateToTransactionThread);
     };
 
     const onShowMoreButtonPress = () => {
@@ -377,7 +382,7 @@ function TransactionGroupListExpandedImpl({
                                     shouldUseNarrowLayout={!isLargeScreenWidth}
                                     shouldShowCheckbox={!!canSelectMultiple}
                                     checkboxSentryLabel={CONST.SENTRY_LABEL.SEARCH.EXPANDED_TRANSACTION_ROW_CHECKBOX}
-                                    onCheckboxPress={() => onSelectionButtonPress?.(transaction as ListItem)}
+                                    onCheckboxPress={(_transactionID, shiftKey) => onSelectionButtonPress?.(transaction as ListItem, undefined, shiftKey)}
                                     columns={currentColumns}
                                     onButtonPress={(event) => handleButtonPress(transaction, event)}
                                     style={[styles.noBorderRadius, isLargeScreenWidth ? [styles.p3, styles.pv2, styles.tableRowHeight] : styles.p4, styles.flex1]}
diff --git a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
index 1e17f785ecce..71f23fa30c3b 100644
--- a/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx
@@ -10,7 +10,6 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
@@ -69,6 +68,7 @@ import shouldCollapseExpandedGroupAfterPendingDelete from './shouldCollapseExpan
 import TagListItemHeader from './TagListItemHeader';
 import TransactionGroupListExpandedItem from './TransactionGroupListExpanded';
 import useGroupChildren from './useGroupChildren';
+import useGroupOpenForShiftRange from './useGroupOpenForShiftRange';
 import useLiveRowCapabilities from './useLiveRowCapabilities';
 import WeekListItemHeader from './WeekListItemHeader';
 import WithdrawalIDListItemHeader from './WithdrawalIDListItemHeader';
@@ -143,6 +143,10 @@ function TransactionGroupListItemImpl({
 
     const [transactionsVisibleLimit, setTransactionsVisibleLimit] = useState(CONST.TRANSACTION.RESULTS_PAGE_SIZE as number);
     const [isExpanded, setIsExpanded] = useState(false);
+
+    // Expense-report rows are already part of the list, so only group-by views need this.
+    useGroupOpenForShiftRange(groupItem.keyForList, isExpanded && !isExpenseReportType);
+
     const {transactions, isSelectAllChecked, isIndeterminate} = useGroupChildren({
         groupKey: groupItem.keyForList,
         groupTransactions: groupItem.transactions,
@@ -202,12 +206,6 @@ function TransactionGroupListItemImpl({
     const {isSelected: liveRowSelected} = useRowSelection(item?.keyForList);
     const isItemSelected = isSelectAllChecked || (liveRowSelected && (isExpenseReportType || transactionsWithoutPendingDelete.length === 0));
 
-    const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected: isItemSelected,
-        shouldApplyOtherStyles: false,
-    });
-
     const pressableStyle = [
         styles.transactionGroupListItemStyle,
         isLargeScreenWidth && {
@@ -296,8 +294,9 @@ function TransactionGroupListItemImpl({
         onLongPressRow?.(transaction as ListItem);
     };
 
-    const handleSelectionButtonPress = (val: ListItem) => {
-        onSelectionButtonPress?.(val, isExpenseReportType ? undefined : transactions);
+    // Group headers never send shiftKey, so only an expanded child row can start a range from here.
+    const handleSelectionButtonPress = (val: ListItem, _itemTransactions?: TransactionListItemType[], shiftKey?: boolean) => {
+        onSelectionButtonPress?.(val, isExpenseReportType ? undefined : transactions, shiftKey);
     };
 
     const onExpandIconPress = () => {
@@ -560,7 +559,7 @@ function TransactionGroupListItemImpl({
                 onFocus={onFocus}
                 wrapperStyle={[
                     styles.mh5,
-                    animatedHighlightStyle,
+                    StyleUtils.getSearchRowBackgroundStyle(!!isItemSelected),
                     styles.userSelectNone,
                     isLargeScreenWidth
                         ? [StyleUtils.getSearchTableGroupRowBorderStyle(isFirstItem, isLastItem, isItemSelected), isLastItem && styles.overflowHidden]
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
index aaaeae2ce8f1..2b2357434f20 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemNarrow.tsx
@@ -6,20 +6,17 @@ import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
 import TransactionItemRow from '@components/TransactionItemRow';
 
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import durationHighlightItem from '@libs/Navigation/helpers/getDurationHighlightItem';
-
 import CONST from '@src/CONST';
 
 import type {ComponentRef} from 'react';
 import type {View} from 'react-native';
 
-import React, {useEffect, useRef, useState} from 'react';
+import React, {useRef} from 'react';
 
 import type {TransactionListItemNarrowProps} from './types';
 
@@ -80,45 +77,6 @@ function TransactionListItemNarrow<TItem extends ListItem>({
         {...styles.flexColumn, ...styles.alignItemsStretch},
     ];
 
-    // The animated style is applied inline, so the `borderRadius: 0` it carries wins over the static
-    // `tableTopRadius`/`tableBottomRadius` on the wrapper below. Skip it for the first and last rows only,
-    // so every other row keeps its existing (already square) behavior.
-    const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected,
-        borderRadius: 0,
-        shouldApplyOtherStyles: !isFirstItem && !isLastItem,
-    });
-
-    // The highlight animation is applied to the row wrapper, which sits behind this pressable. A focused
-    // row paints an opaque background on the pressable itself, which would cover the highlight - so after
-    // splitting an expense the newly-created row that receives focus never appears highlighted. Suppress
-    // the opaque focus background for the full highlight animation so the highlight shows. shouldAnimateInHighlight
-    // only stays true for the brief queue window, so latch it for durationHighlightItem.
-    const shouldAnimateInHighlight = !!item?.shouldAnimateInHighlight;
-
-    // Initialize from the prop so a row that mounts already flagged (the split/search highlight case this
-    // fixes) latches immediately - otherwise the render-time guard below never fires on first mount.
-    const [isHighlighting, setIsHighlighting] = useState(shouldAnimateInHighlight);
-    const [wasAnimatingHighlight, setWasAnimatingHighlight] = useState(shouldAnimateInHighlight);
-
-    // Start the latch during render (React's "storing information from previous renders" pattern) to avoid
-    // calling setState synchronously inside an effect. The effect below only clears it via an async timer.
-    if (shouldAnimateInHighlight !== wasAnimatingHighlight) {
-        setWasAnimatingHighlight(shouldAnimateInHighlight);
-        if (shouldAnimateInHighlight) {
-            setIsHighlighting(true);
-        }
-    }
-    useEffect(() => {
-        if (!isHighlighting) {
-            return;
-        }
-        const timer = setTimeout(() => setIsHighlighting(false), durationHighlightItem);
-        return () => clearTimeout(timer);
-    }, [isHighlighting]);
-    const shouldShowFocusBackground = !!isFocused && !isHighlighting;
-
     return (
         <OfflineWithFeedback pendingAction={item.pendingAction}>
             <PressableWithFeedback
@@ -135,14 +93,14 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                 sentryLabel={CONST.SENTRY_LABEL.SEARCH.TRANSACTION_LIST_ITEM}
                 style={[
                     pressableStyle,
-                    shouldShowFocusBackground && StyleUtils.getItemBackgroundColorStyle(isSelected, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
+                    isFocused && StyleUtils.getItemBackgroundColorStyle(isSelected, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
                     isDeletedTransaction && styles.cursorDefault,
                 ]}
                 onFocus={onFocus}
                 wrapperStyle={[
                     styles.mh5,
                     styles.flex1,
-                    animatedHighlightStyle,
+                    StyleUtils.getSearchRowBackgroundStyle(isSelected),
                     styles.userSelectNone,
                     isFirstItem && styles.tableTopRadius,
                     isLastItem && styles.tableBottomRadius,
@@ -164,7 +122,7 @@ function TransactionListItemNarrow<TItem extends ListItem>({
                             policy={transactionItem.policy}
                             shouldShowTooltip={showTooltip}
                             onButtonPress={handleActionButtonPress}
-                            onCheckboxPress={() => onCheckboxPress?.(item)}
+                            onCheckboxPress={(_transactionID, shiftKey) => onCheckboxPress?.(item, undefined, shiftKey)}
                             shouldUseNarrowLayout
                             isLargeScreenWidth={false}
                             columns={columns}
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
index 3eb26efe2487..ee40ba62f5d5 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/TransactionListItemWide.tsx
@@ -1,12 +1,11 @@
+import {useEditingCellState} from '@components/EditableCell';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import {useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {ListItem} from '@components/SelectionList/types';
 import TransactionItemRow from '@components/TransactionItemRow';
-import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
@@ -144,13 +143,6 @@ function TransactionListItemWide<TItem extends ListItem>({
         },
     ];
 
-    const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight: item?.shouldAnimateInHighlight ?? false,
-        isSelected,
-        borderRadius: 0,
-        shouldApplyOtherStyles: false,
-    });
-
     return (
         <OfflineWithFeedback pendingAction={item.pendingAction}>
             <PressableWithFeedback
@@ -173,7 +165,13 @@ function TransactionListItemWide<TItem extends ListItem>({
                     isDeletedTransaction && styles.cursorDefault,
                 ]}
                 onFocus={onFocus}
-                wrapperStyle={[styles.mh5, styles.flex1, animatedHighlightStyle, styles.userSelectNone, isLastItem && [styles.tableBottomRadius, styles.overflowHidden]]}
+                wrapperStyle={[
+                    styles.mh5,
+                    styles.flex1,
+                    StyleUtils.getSearchRowBackgroundStyle(isSelected),
+                    styles.userSelectNone,
+                    isLastItem && [styles.tableBottomRadius, styles.overflowHidden],
+                ]}
             >
                 {({hovered}) => (
                     <TransactionItemRow
@@ -185,7 +183,7 @@ function TransactionListItemWide<TItem extends ListItem>({
                         policyTagLists={policyTagLists}
                         shouldShowTooltip={showTooltip}
                         onButtonPress={handleActionButtonPress}
-                        onCheckboxPress={() => onCheckboxPress?.(item)}
+                        onCheckboxPress={(_transactionID, shiftKey) => onCheckboxPress?.(item, undefined, shiftKey)}
                         shouldUseNarrowLayout={false}
                         shouldUseFullHeightEditableCellHoverTarget
                         shouldSkipDeferRBR
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/types.ts b/src/components/Search/SearchList/ListItem/TransactionListItem/types.ts
index e4d366afb82a..ea6c44d9cfbd 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/types.ts
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/types.ts
@@ -1,3 +1,4 @@
+import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import type {SearchColumnType} from '@components/Search/types';
 import type {ListItemFocusEventHandler} from '@components/SelectionList/ListItem/types';
 import type {ListItem} from '@components/SelectionList/types';
@@ -15,7 +16,7 @@ type TransactionListItemSharedProps<TItem extends ListItem> = {
     isDisabled?: boolean | null;
     canSelectMultiple?: boolean;
     onSelectRow: (item: TItem, transactionPreviewData?: TransactionPreviewData, event?: ModifiedMouseEvent) => void;
-    onCheckboxPress?: (item: TItem) => void;
+    onCheckboxPress?: (item: TItem, itemTransactions?: TransactionListItemType[], shiftKey?: boolean) => void;
     onFocus?: ListItemFocusEventHandler;
     onLongPressRow?: (item: TItem) => void;
     shouldSyncFocus?: boolean;
diff --git a/src/components/Search/SearchList/ListItem/hooks/useSearchTableItemHighlight.ts b/src/components/Search/SearchList/ListItem/hooks/useSearchTableItemHighlight.ts
deleted file mode 100644
index 26a299c6f5d5..000000000000
--- a/src/components/Search/SearchList/ListItem/hooks/useSearchTableItemHighlight.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import variables from '@styles/variables';
-
-type UseSearchTableItemHighlightParams = {
-    /** Whether the row should play the highlight animation */
-    shouldHighlight?: boolean;
-
-    /** Whether the row is currently selected */
-    isSelected?: boolean;
-
-    /** Whether this is the last row in the table (affects bottom radius) */
-    isLastItem?: boolean;
-};
-
-/**
- * Highlight animation plus the pressable styles a search-table row needs: row paddings, bottom radius on the last wide row.
- * `isSelected` is not forwarded to the animation: selection is painted on the pressable, not the animated wrapper.
- */
-function useSearchTableItemHighlight({shouldHighlight = false, isSelected = false, isLastItem = false}: UseSearchTableItemHighlightParams = {}) {
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const {isLargeScreenWidth} = useResponsiveLayout();
-
-    const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight,
-        borderRadius: StyleUtils.getSearchTableHighlightBorderRadius(isLargeScreenWidth),
-        shouldApplyOtherStyles: !isLargeScreenWidth,
-    });
-
-    return {
-        animatedHighlightStyle,
-        pressableStyle: [
-            styles.selectionListPressableItemWrapper,
-            styles.pv3,
-            styles.ph3,
-            styles.bgTransparent,
-            isSelected && styles.activeComponentBG,
-            styles.mh0,
-            isLargeScreenWidth &&
-                StyleUtils.getSearchTableRowPressableStyle(isLastItem, isSelected, {
-                    vertical: variables.tableRowPaddingVertical,
-                }),
-        ],
-        pressableWrapperStyle: [styles.mh5, animatedHighlightStyle, isLargeScreenWidth && isLastItem && [styles.tableBottomRadius, styles.overflowHidden]],
-    };
-}
-
-export default useSearchTableItemHighlight;
diff --git a/src/components/Search/SearchList/ListItem/types.ts b/src/components/Search/SearchList/ListItem/types.ts
index 9c23075d11ee..c8505eaa33e8 100644
--- a/src/components/Search/SearchList/ListItem/types.ts
+++ b/src/components/Search/SearchList/ListItem/types.ts
@@ -55,6 +55,8 @@ type SearchListActionProps = {
 
 type ChatListItemProps<TItem extends ListItem> = ListItemProps<TItem> & {
     report?: Report;
+    /** Called on long press of the row (opens the hold menu) */
+    onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
 };
 
 type ExpenseReportListItemProps<TItem extends ListItem> = ListItemProps<TItem> &
@@ -62,6 +64,9 @@ type ExpenseReportListItemProps<TItem extends ListItem> = ListItemProps<TItem> &
         /** The visible columns for the report */
         columns?: SearchColumnType[];
 
+        /** Called on long press of the row (opens the hold menu) */
+        onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
+
         /** Whether the item's action is loading */
         isLoading?: boolean;
     };
@@ -347,6 +352,9 @@ type TaskListItemProps<TItem extends ListItem> = ListItemProps<TItem> & {
     /** Whether the item's action is loading */
     isLoading?: boolean;
 
+    /** Called on long press of the row (opens the hold menu) */
+    onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
+
     allReports?: OnyxCollection<Report>;
 };
 
@@ -482,6 +490,8 @@ type TransactionListItemProps<TItem extends ListItem> = ListItemProps<TItem> &
         /** Whether the item's action is loading */
         isLoading?: boolean;
         columns?: SearchColumnType[];
+        /** Called on long press of the row (opens the hold menu) */
+        onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
         /** Non-personal and workspace cards for company card display */
         nonPersonalAndWorkspaceCards?: CardList;
         /** All policies' tag lists, drilled from the list level so each row can resolve its policy's tags without an Onyx subscription per row */
@@ -491,6 +501,8 @@ type TransactionListItemProps<TItem extends ListItem> = ListItemProps<TItem> &
 
 type TransactionGroupListItemProps<TItem extends ListItem> = ListItemProps<TItem> &
     SearchListActionProps & {
+        /** Called on long press of the row (opens the hold menu) */
+        onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
         groupBy?: SearchGroupBy;
         searchType?: SearchDataTypes;
         accountID?: number;
@@ -503,8 +515,10 @@ type TransactionGroupListItemProps<TItem extends ListItem> = ListItemProps<TItem
 
 type TransactionGroupListExpandedProps<TItem extends ListItem> = Pick<
     TransactionGroupListItemProps<TItem>,
-    'showTooltip' | 'canSelectMultiple' | 'onSelectionButtonPress' | 'columns' | 'groupBy' | 'accountID' | 'isOffline' | 'onSelectRow' | 'nonPersonalAndWorkspaceCards' | 'onUndelete'
+    'showTooltip' | 'canSelectMultiple' | 'onSelectionButtonPress' | 'columns' | 'groupBy' | 'accountID' | 'onSelectRow' | 'nonPersonalAndWorkspaceCards' | 'onUndelete'
 > & {
+    /** Whether the network is offline */
+    isOffline?: boolean;
     violations?: Record<string, TransactionViolations | undefined> | undefined;
     transactions: TransactionListItemType[];
     transactionsVisibleLimit: number;
@@ -566,7 +580,7 @@ type GroupChildrenContentProps = {
     columns?: SearchColumnType[];
     canSelectMultiple: boolean;
     onSelectRow: (item: SearchListItem, transactionPreviewData?: TransactionPreviewData, event?: ModifiedMouseEvent) => void;
-    onCheckboxPress: (item: SearchListItem, itemTransactions?: TransactionListItemType[]) => void;
+    onCheckboxPress: (item: SearchListItem, itemTransactions?: TransactionListItemType[], shiftKey?: boolean) => void;
     onLongPressRow?: (item: SearchListItem, itemTransactions?: TransactionListItemType[]) => void;
     nonPersonalAndWorkspaceCards?: CardList;
     onUndelete?: (transaction: Transaction) => void;
diff --git a/src/components/Search/SearchList/ListItem/useGroupOpenForShiftRange.ts b/src/components/Search/SearchList/ListItem/useGroupOpenForShiftRange.ts
new file mode 100644
index 000000000000..1f7a2ac38c41
--- /dev/null
+++ b/src/components/Search/SearchList/ListItem/useGroupOpenForShiftRange.ts
@@ -0,0 +1,18 @@
+import {useSearchShiftRangeGroups} from '@components/Search/SearchContext';
+
+import {useEffect} from 'react';
+
+/** For a row that owns its own expanded state, so the group closes with it. */
+function useGroupOpenForShiftRange(groupKey: string, isOpen: boolean) {
+    const {addGroupToRange, removeGroupFromRange, registryGeneration} = useSearchShiftRangeGroups();
+    // `registryGeneration` is a dependency and nothing else: the registry drops openness with the search, and this puts it back.
+    useEffect(() => {
+        if (!isOpen) {
+            return;
+        }
+        addGroupToRange(groupKey);
+        return () => removeGroupFromRange(groupKey);
+    }, [groupKey, isOpen, addGroupToRange, removeGroupFromRange, registryGeneration]);
+}
+
+export default useGroupOpenForShiftRange;
diff --git a/src/components/Search/SearchList/ListItem/useOpenGroupsForShiftRange.ts b/src/components/Search/SearchList/ListItem/useOpenGroupsForShiftRange.ts
new file mode 100644
index 000000000000..7d8d5004a53b
--- /dev/null
+++ b/src/components/Search/SearchList/ListItem/useOpenGroupsForShiftRange.ts
@@ -0,0 +1,43 @@
+import {NO_OPEN_GROUPS} from '@components/Search/hooks/useOpenGroupsRegistry';
+import {useSearchShiftRangeGroups} from '@components/Search/SearchContext';
+
+import {useEffect, useRef} from 'react';
+
+/** For a view that owns the expanded state on behalf of rows it may recycle. */
+function useOpenGroupsForShiftRange(openGroupKeys: ReadonlySet<string>) {
+    const {addGroupToRange, removeGroupFromRange, registryGeneration} = useSearchShiftRangeGroups();
+
+    // The keys this hook opened, so expanding one group does not close and reopen every other one.
+    const openedKeysRef = useRef<ReadonlySet<string>>(NO_OPEN_GROUPS);
+    const seenGenerationRef = useRef(registryGeneration);
+
+    useEffect(() => {
+        // Anything opened under the previous search is already gone from the registry, so the diff below reopens it.
+        const opened = seenGenerationRef.current === registryGeneration ? openedKeysRef.current : NO_OPEN_GROUPS;
+        seenGenerationRef.current = registryGeneration;
+
+        for (const key of opened) {
+            if (!openGroupKeys.has(key)) {
+                removeGroupFromRange(key);
+            }
+        }
+        for (const key of openGroupKeys) {
+            if (!opened.has(key)) {
+                addGroupToRange(key);
+            }
+        }
+        openedKeysRef.current = openGroupKeys;
+    }, [openGroupKeys, addGroupToRange, removeGroupFromRange, registryGeneration]);
+
+    useEffect(
+        () => () => {
+            for (const key of openedKeysRef.current) {
+                removeGroupFromRange(key);
+            }
+            openedKeysRef.current = NO_OPEN_GROUPS;
+        },
+        [removeGroupFromRange],
+    );
+}
+
+export default useOpenGroupsForShiftRange;
diff --git a/src/components/Search/SearchRouter/SearchRouter.tsx b/src/components/Search/SearchRouter/SearchRouter.tsx
index 61415dab7fb5..5f1274b7b073 100644
--- a/src/components/Search/SearchRouter/SearchRouter.tsx
+++ b/src/components/Search/SearchRouter/SearchRouter.tsx
@@ -91,7 +91,7 @@ function searchForReportsAndUsersInServer(searchInput: string) {
 
 function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDisplayed, ref}: SearchRouterProps) {
     const {translate, formatPhoneNumber, dateFnsLocale} = useLocalize();
-    const {convertToDisplayString} = useCurrencyListActions();
+    const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {setShouldResetSearchQuery, getSearchKeyForQuery} = useSearchQueryActions();
@@ -109,6 +109,8 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
     const personalDetails = usePersonalDetails();
     const sortedReportActionsData = useSortedReportActionsData();
     const sortedActions = sortedReportActionsData?.sortedActions;
+    const transactionThreadIDs = sortedReportActionsData?.transactionThreadIDs;
+    const lastActions = sortedReportActionsData?.lastActions;
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {windowHeight} = useWindowDimensions();
     const listRef = useRef<SelectionListWithSectionsHandle>(null);
@@ -237,19 +239,23 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
                 const option = createOptionFromReport({
                     dateFnsLocale,
                     convertToDisplayString,
+                    convertToDisplayStringWithoutCurrency,
                     report: contextualReport,
                     personalDetails,
                     privateIsArchived: contextualReportNVP,
                     rules,
                     policy: contextualReportPolicy,
                     sortedActions,
+                    transactionThreadIDs,
+                    lastActions,
+                    currentUserAccountID,
+                    currentUserLogin: currentUserPersonalDetails.login,
                     conciergeReportID,
                     reportAttributesDerived: reportAttributes,
                     config: {
                         showPersonalDetails: isOneOnOneChat(contextualReport),
                     },
                     isTrackIntentUser,
-                    currentUserAccountID,
                 });
                 reportForContextualSearch = option;
             }
@@ -292,7 +298,6 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
                             singleIcon: expensifyIcons.MagnifyingGlass,
                             searchQuery: reportQueryValue,
                             autocompleteID,
-                            itemStyle: styles.activeComponentBG,
                             keyForList: 'contextualSearch',
                             searchItemType: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.CONTEXTUAL_SUGGESTION,
                             roomType,
@@ -311,10 +316,12 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
             isSearchRouterScreen,
             translate,
             expensifyIcons.MagnifyingGlass,
-            styles.activeComponentBG,
             contextualReport,
             personalDetails,
             sortedActions,
+            transactionThreadIDs,
+            lastActions,
+            currentUserPersonalDetails.login,
             contextualReportNVP,
             contextualReportPolicy,
             reportAttributes,
@@ -322,6 +329,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
             dateFnsLocale,
             currentUserAccountID,
             convertToDisplayString,
+            convertToDisplayStringWithoutCurrency,
             rules,
         ],
     );
@@ -332,7 +340,6 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
                   text: textInputValue,
                   singleIcon: expensifyIcons.MagnifyingGlass,
                   searchQuery: textInputValue,
-                  itemStyle: styles.activeComponentBG,
                   keyForList: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.FIND_ITEM,
                   searchItemType: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.SEARCH,
               },
@@ -343,7 +350,6 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
                             singleIcon: expensifyIcons.ConciergeAvatar,
                             shouldIconApplyFill: false,
                             searchQuery: textInputValue,
-                            itemStyle: styles.activeComponentBG,
                             keyForList: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.ASK_CONCIERGE,
                             searchItemType: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.ASK_CONCIERGE,
                         },
diff --git a/src/components/Search/SearchRouter/SearchRouterOptionsWarmer.tsx b/src/components/Search/SearchRouter/SearchRouterOptionsWarmer.tsx
index 3c23065c061f..6318b0bca6ba 100644
--- a/src/components/Search/SearchRouter/SearchRouterOptionsWarmer.tsx
+++ b/src/components/Search/SearchRouter/SearchRouterOptionsWarmer.tsx
@@ -37,11 +37,13 @@ function SearchRouterOptionsWarmer({onDone}: SearchRouterOptionsWarmerProps) {
     const [personalDetails] = useAllPersonalDetails();
     const reportAttributes = useReportAttributes();
     const sortedReportActionsData = useSortedReportActionsData();
+    const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
+    const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS);
 
     const churnVersionRef = useRef(0);
     useEffect(() => {
         churnVersionRef.current += 1;
-    }, [reports, policies, personalDetails, reportAttributes, sortedReportActionsData]);
+    }, [reports, policies, personalDetails, reportAttributes, sortedReportActionsData, allPolicyTags, visibleReportActionsData]);
 
     useEffect(() => {
         let attempts = 0;
diff --git a/src/components/Search/SearchSelectionProvider.tsx b/src/components/Search/SearchSelectionProvider.tsx
index c88109f07626..ac54602ea271 100644
--- a/src/components/Search/SearchSelectionProvider.tsx
+++ b/src/components/Search/SearchSelectionProvider.tsx
@@ -1,12 +1,12 @@
 import CONST from '@src/CONST';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-import React, {useEffect, useRef, useState} from 'react';
+import React, {useEffect, useLayoutEffect, useRef, useState} from 'react';
 
 import type {SearchData, SearchSelectionActionsValue, SearchSelectionContextValue, SelectedReports, SelectedTransactions} from './types';
 
 import {useSearchQueryContext, useSearchSelectionActions, useSearchSelectionContext} from './SearchContext';
-import {SearchSelectionActionsContext, SearchSelectionContext} from './SearchContextDefinitions';
+import {SearchSelectionActionsContext, SearchSelectionClearGenerationContext, SearchSelectionContext} from './SearchContextDefinitions';
 import {deriveSelectedReports, isRowChecked} from './selectionBuilders';
 
 type SearchSelectionProviderProps = {
@@ -21,6 +21,7 @@ type SelectionState = {
     currentSelectedTransactionReportID: string | undefined;
     shouldTurnOffSelectionMode: boolean;
     areAllMatchingItemsSelected: boolean;
+    clearGeneration: number;
 };
 
 const defaultSelectionState: SelectionState = {
@@ -31,6 +32,7 @@ const defaultSelectionState: SelectionState = {
     currentSelectedTransactionReportID: undefined,
     shouldTurnOffSelectionMode: false,
     areAllMatchingItemsSelected: false,
+    clearGeneration: 0,
 };
 
 // Owns selection state + pure setters only; the write actions (toggle/toggleAll) live in SearchWriteActionsProvider.
@@ -38,21 +40,64 @@ function SearchSelectionProvider({children}: SearchSelectionProviderProps) {
     const {currentSearchHash, currentSearchQueryJSON} = useSearchQueryContext();
     const supportsAllMatchingExclusions = currentSearchQueryJSON?.type === CONST.SEARCH.DATA_TYPES.EXPENSE || currentSearchQueryJSON?.type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT;
 
-    const areTransactionsEmpty = useRef(true);
     const [selectionState, setSelectionState] = useState<SelectionState>(defaultSelectionState);
 
-    const currentSearchHashRef = useRef(currentSearchHash);
+    const [{actions: selectionActionsValue, syncSelection, syncSearchHash}] = useState(() => createSelectionActions(setSelectionState, currentSearchHash));
+
+    // The whole selection is synced as one object, so a handler never reads parts of it from different renders.
+    useLayoutEffect(() => {
+        syncSelection(selectionState);
+    });
+
+    // A passive effect, so it runs after the page's own passive effect has cleared the selection against the old hash.
     useEffect(() => {
-        currentSearchHashRef.current = currentSearchHash;
-    }, [currentSearchHash]);
+        syncSearchHash(currentSearchHash);
+    }, [currentSearchHash, syncSearchHash]);
+
+    const hasSelectedTransactions =
+        (supportsAllMatchingExclusions && selectionState.areAllMatchingItemsSelected) ||
+        selectionState.selectedTransactionIDs.length > 0 ||
+        Object.values(selectionState.selectedTransactions).some((t) => t.isSelected);
+
+    const {clearGeneration, ...selection} = selectionState;
+    const selectionValue: SearchSelectionContextValue = {
+        ...selection,
+        hasSelectedTransactions,
+    };
+
+    return (
+        <SearchSelectionContext value={selectionValue}>
+            <SearchSelectionActionsContext value={selectionActionsValue}>
+                <SearchSelectionClearGenerationContext value={clearGeneration}>{children}</SearchSelectionClearGenerationContext>
+            </SearchSelectionActionsContext>
+        </SearchSelectionContext>
+    );
+}
+
+type SelectionActions = {
+    /** The context value, stable for the provider's lifetime */
+    actions: SearchSelectionActionsValue;
+
+    /** Pushes the latest render's values in, from the provider's layout effect */
+    syncSelection: (selectionState: SelectionState) => void;
+
+    /** Separate from the selection, since the two are synced in different effects */
+    syncSearchHash: (currentSearchHash: number) => void;
+};
+
+/** Built once per provider, so a consumer may list any of these in an effect's dependencies. */
+function createSelectionActions(setSelectionState: React.Dispatch<React.SetStateAction<SelectionState>>, initialSearchHash: number): SelectionActions {
+    let latestSelectionState = defaultSelectionState;
+    // Starts at the current hash rather than undefined, because a child's layout effect runs before the sync below and may already clear against it.
+    let latestSearchHash = initialSearchHash;
+    let isTransactionIDListEmpty = true;
 
     const setSelectedTransactions: SearchSelectionActionsValue['setSelectedTransactions'] = (transactionIDs, data) => {
         if (transactionIDs instanceof Array) {
-            if (!transactionIDs.length && areTransactionsEmpty.current) {
-                areTransactionsEmpty.current = true;
+            if (!transactionIDs.length && isTransactionIDListEmpty) {
                 return;
             }
-            areTransactionsEmpty.current = false;
+            isTransactionIDListEmpty = false;
             setSelectionState((prevState) => ({
                 ...prevState,
                 selectedTransactionIDs: transactionIDs,
@@ -86,7 +131,10 @@ function SearchSelectionProvider({children}: SearchSelectionProviderProps) {
     // preserve an all-matching selection and record their removed entries as explicit exclusions.
     const applySelection: SearchSelectionActionsValue['applySelection'] = (updater, options) => {
         setSelectionState((prevState) => {
-            const selectedTransactions = updater(prevState.selectedTransactions);
+            const selectedTransactions = updater(prevState.selectedTransactions, {
+                excludedTransactions: prevState.excludedTransactions,
+                areAllMatchingItemsSelected: prevState.areAllMatchingItemsSelected,
+            });
             const reconciledExcludedTransactions = options?.reconciledExcludedTransactions;
             if (selectedTransactions === prevState.selectedTransactions && (!reconciledExcludedTransactions || reconciledExcludedTransactions === prevState.excludedTransactions)) {
                 return prevState;
@@ -171,11 +219,12 @@ function SearchSelectionProvider({children}: SearchSelectionProviderProps) {
 
     const clearSelectedTransactions: SearchSelectionActionsValue['clearSelectedTransactions'] = (searchHashOrClearIDsFlag, shouldTurnOffSelectionMode = false) => {
         if (typeof searchHashOrClearIDsFlag === 'boolean') {
-            setSelectedTransactions([]);
+            // No clear-counter bump: this empties the report list's ID selection, and the counter only tells Search that its own selection was cleared.
+            setSelectionState((prevState) => (prevState.selectedTransactionIDs.length === 0 ? prevState : {...prevState, selectedTransactionIDs: []}));
             return;
         }
 
-        if (searchHashOrClearIDsFlag === currentSearchHashRef.current) {
+        if (searchHashOrClearIDsFlag === latestSearchHash) {
             return;
         }
 
@@ -196,6 +245,7 @@ function SearchSelectionProvider({children}: SearchSelectionProviderProps) {
                 excludedTransactions: {},
                 selectedReports: [],
                 areAllMatchingItemsSelected: false,
+                clearGeneration: prevState.clearGeneration + 1,
             };
         });
     };
@@ -237,31 +287,26 @@ function SearchSelectionProvider({children}: SearchSelectionProviderProps) {
         });
     };
 
-    const hasSelectedTransactions =
-        (supportsAllMatchingExclusions && selectionState.areAllMatchingItemsSelected) ||
-        selectionState.selectedTransactionIDs.length > 0 ||
-        Object.values(selectionState.selectedTransactions).some((t) => t.isSelected);
-
-    const selectionValue: SearchSelectionContextValue = {
-        ...selectionState,
-        hasSelectedTransactions,
-    };
-
-    const selectionActionsValue: SearchSelectionActionsValue = {
-        setSelectedTransactions,
-        applySelection,
-        setSelectedReports,
-        setCurrentSelectedTransactionReportID,
-        clearSelectedTransactions,
-        removeTransaction,
-        selectAllMatchingItems,
+    return {
+        actions: {
+            setSelectedTransactions,
+            applySelection,
+            getSelectedTransactions: () => latestSelectionState.selectedTransactions,
+            getExcludedTransactions: () => latestSelectionState.excludedTransactions,
+            getAreAllMatchingItemsSelected: () => latestSelectionState.areAllMatchingItemsSelected,
+            setSelectedReports,
+            setCurrentSelectedTransactionReportID,
+            clearSelectedTransactions,
+            removeTransaction,
+            selectAllMatchingItems,
+        },
+        syncSelection: (selectionState) => {
+            latestSelectionState = selectionState;
+        },
+        syncSearchHash: (currentSearchHash) => {
+            latestSearchHash = currentSearchHash;
+        },
     };
-
-    return (
-        <SearchSelectionContext value={selectionValue}>
-            <SearchSelectionActionsContext value={selectionActionsValue}>{children}</SearchSelectionActionsContext>
-        </SearchSelectionContext>
-    );
 }
 
 /**
diff --git a/src/components/Search/SearchStaticList.tsx b/src/components/Search/SearchStaticList.tsx
index 188e63a8c3f5..71ba1ee2501a 100644
--- a/src/components/Search/SearchStaticList.tsx
+++ b/src/components/Search/SearchStaticList.tsx
@@ -6,6 +6,7 @@ import StatusBadge from '@components/StatusBadge';
 import TransactionItemRow from '@components/TransactionItemRow';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
+import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -85,6 +86,7 @@ function SearchStaticList({
     const email = session?.email;
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasCompletedGuidedSetupFlowSelector});
+    const delegateAccountID = useDelegateAccountID();
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
 
@@ -153,6 +155,7 @@ function SearchStaticList({
                 personalDetails,
                 isSelfTourViewed,
                 hasCompletedGuidedSetupFlow,
+                delegateAccountID,
                 IOUTransactionID: item.reportAction?.childReportID,
                 shouldNavigate: shouldOpenTransactionThread,
             });
diff --git a/src/components/Search/SearchWriteActionsProvider.tsx b/src/components/Search/SearchWriteActionsProvider.tsx
index 056c301b6435..7c282c7b0605 100644
--- a/src/components/Search/SearchWriteActionsProvider.tsx
+++ b/src/components/Search/SearchWriteActionsProvider.tsx
@@ -3,10 +3,20 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSelfDMReport from '@hooks/useSelfDMReport';
+import useShiftRangeSelection from '@hooks/useShiftRangeSelection';
 
 import {turnOffMobileSelectionMode, turnOnMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import {canRejectReportAction} from '@libs/ReportUtils';
-import {isGroupedItemArray, isReportActionListItemType, isTaskListItemType, isTransactionListItemType} from '@libs/SearchUIUtils';
+import {
+    isGroupedItemArray,
+    isReportActionListItemType,
+    isReportEntry,
+    isTaskListItemType,
+    isTransactionEntry,
+    isTransactionGroupListItemType,
+    isTransactionListItemType,
+} from '@libs/SearchUIUtils';
+import type {ShiftRangeBatch} from '@libs/shiftRangeSelection';
 import {isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
@@ -19,19 +29,26 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {useIsFocused} from '@react-navigation/native';
 import {deepEqual} from 'fast-equals';
-import React, {useEffect} from 'react';
+import React, {useEffect, useLayoutEffect, useRef} from 'react';
 
+import type {SearchListItem, TransactionListItemType} from './SearchList/ListItem/types';
 import type {SearchData, SearchRowSelectionActionsValue, SelectedTransactionInfo, SelectedTransactions} from './types';
 
-import {useSearchSelectionActions, useSearchSelectionContext} from './SearchContext';
-import {SearchRowSelectionActionsContext} from './SearchContextDefinitions';
+import useOpenGroupsRegistry from './hooks/useOpenGroupsRegistry';
+import {useSearchSelectionActions, useSearchSelectionContext, useSelectionClearGeneration} from './SearchContext';
+import {SearchRowSelectionActionsContext, SearchShiftRangeGroupsContext} from './SearchContextDefinitions';
 import {useSyncSelectedReports} from './SearchSelectionProvider';
 import {
+    applyShiftRangeBatchToSelection,
+    buildShiftRangeSource,
     getSearchGroupCount,
     getSearchGroupCountByKey,
+    isGroupSelected,
+    isRowChecked,
     mapEmptyReportToSelectedEntry,
     mapTransactionItemToSelectedEntry,
     prepareTransactionsList,
+    spellOutGroupSelection,
     stampGroupCoverageFlags,
 } from './selectionBuilders';
 
@@ -39,12 +56,18 @@ type SearchWriteActionsProviderProps = {
     /** The currently displayed (filtered, grouped) rows. Screen-derived; the provider cannot recompute it. */
     filteredData: SearchData;
 
+    /** In on-screen order, which `filteredData` is not. The grouped view additionally drops rows being deleted while online, which `isDisabledItem` keeps out of a range anyway */
+    renderedData: SearchListItem[];
+
     /** Keeps "select all matching" in lock-step: select-all unchecks once the selection no longer covers every item. */
     totalSelectableItemsCount: number;
 
     /** The raw search snapshot, read for denormalized transaction/report lookups. */
     searchResults: SearchResults | undefined;
 
+    /** Everything scoped to one search is keyed on it */
+    searchHash: number;
+
     /** The live TRANSACTION collection, subscribed by `<Search>` and passed down. */
     transactions: OnyxCollection<Transaction>;
 
@@ -155,6 +178,7 @@ function useReconcileSelectionWithData({
         const newTransactionList: SelectedTransactions = {};
         const inferredExcludedTransactions: SelectedTransactions = {};
         const liveSelectionEntries = new Map<string, SelectedTransactionInfo>();
+        const presentGroupKeys = new Set<string>();
         const nonEmptyReportKeys = new Set<string>();
         const excludedReportKeys = new Set(
             isExpenseReportType
@@ -170,6 +194,10 @@ function useReconcileSelectionWithData({
                 }
 
                 const reportKey = transactionGroup.keyForList;
+                // Only groups carrying no rows: a row missing from a group that has them is gone for real.
+                if (reportKey && !isExpenseReportType && transactionGroup.transactions.length === 0 && transactionGroup.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+                    presentGroupKeys.add(reportKey);
+                }
                 if (shouldReconcileExcludedTransactions && reportKey && transactionGroup.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
                     const [, groupSelection] = mapEmptyReportToSelectedEntry(transactionGroup);
                     liveSelectionEntries.set(reportKey, groupSelection);
@@ -217,8 +245,11 @@ function useReconcileSelectionWithData({
                     // source report's exclusion with it.
                     const directExclusionBelongsToCurrentReport = !isExpenseReportType || !reportKey || !directExclusion?.reportID || directExclusion.reportID === reportKey;
                     const isDirectlyExcluded = !!directExclusion && directExclusionBelongsToCurrentReport;
-                    const isExcluded = isParentGroupExcluded || isDirectlyExcluded;
                     const isSelected = listKey in selectedTransactions || transactionItem.transactionID in selectedTransactions;
+                    // A row picked on its own outranks an exclusion covering the group it sits in, so re-checking one child
+                    // of an excluded group holds. A report is not a group in that sense: an expense moving into an excluded
+                    // report takes its destination's state, which is the same rule the source-report check above states.
+                    const isExcluded = (isExpenseReportType || !isSelected) && (isParentGroupExcluded || isDirectlyExcluded);
 
                     // Include transaction if: already individually selected, part of select-all, or group-level propagation (expense report / empty group expanded)
                     const shouldInclude = !isExcluded && (isSelected || areAllMatchingItemsSelected || propagateSelectionToAllRows);
@@ -234,7 +265,6 @@ function useReconcileSelectionWithData({
                     const itemParentReport = searchResultsData?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.report?.parentReportID}`] as OnyxEntry<Report>;
                     const previousSelection = selectedTransactions[listKey] ?? selectedTransactions[transactionItem.transactionID];
 
-                    // The overrides below are what reconcile computes differently from a toggle — keep them.
                     const [, baseEntry] = mapTransactionItemToSelectedEntry({
                         item: transactionItem,
                         itemTransaction,
@@ -348,6 +378,23 @@ function useReconcileSelectionWithData({
             }
         }
 
+        // A lazy group's children never reach `filteredData`, so the group's presence is what keeps them.
+        if (areItemsGrouped) {
+            for (const [key, selectedTransaction] of Object.entries(selectedTransactions)) {
+                const parentGroupKey = selectedTransaction.groupKey;
+                if (
+                    !parentGroupKey ||
+                    Object.hasOwn(newTransactionList, key) ||
+                    Object.hasOwn(excludedTransactions, key) ||
+                    Object.hasOwn(excludedTransactions, parentGroupKey) ||
+                    !presentGroupKeys.has(parentGroupKey)
+                ) {
+                    continue;
+                }
+                newTransactionList[key] = liveSelectionEntries.get(key) ?? selectedTransaction;
+            }
+        }
+
         let reconciledExcludedTransactions = excludedTransactions;
         if (shouldReconcileExcludedTransactions && areAllMatchingItemsSelected && !isEmptyObject(excludedTransactions)) {
             const nextExcludedTransactions: SelectedTransactions = {...inferredExcludedTransactions};
@@ -471,8 +518,10 @@ function useSyncMobileSelectionModeWithScreenSize({
 // `selectedTransactions`, so dispatching one re-renders neither this provider's stable children nor the rows.
 function SearchWriteActionsProvider({
     filteredData,
+    renderedData,
     totalSelectableItemsCount,
     searchResults,
+    searchHash,
     transactions,
     isMobileSelectionModeEnabled,
     type,
@@ -488,93 +537,255 @@ function SearchWriteActionsProvider({
     const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
     const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
-    const {applySelection} = useSearchSelectionActions();
+    const {applySelection, getSelectedTransactions, getExcludedTransactions, getAreAllMatchingItemsSelected} = useSearchSelectionActions();
+
+    const {openGroupKeys, shiftRangeGroupsActions} = useOpenGroupsRegistry(searchHash);
+
+    // Read at the gesture: closing over it would give every row a new `toggle` each time a group opens.
+    const groupKeyByChildKeyRef = useRef<ReadonlyMap<string, string>>(new Map());
+    const childrenByGroupKeyRef = useRef<ReadonlyMap<string, TransactionListItemType[]>>(new Map());
 
     const searchResultsData = searchResults?.data;
     const currentUserEmail = email ?? '';
     const currentUserLogin = login ?? '';
     const shouldPreserveAllMatchingSelection = type === CONST.SEARCH.DATA_TYPES.EXPENSE || isExpenseReportType;
 
-    const toggle: SearchRowSelectionActionsValue['toggle'] = (item, itemTransactions) => {
+    // Live Onyx first: the hold and split flags read the optimistic row, and the snapshot only refreshes when the search returns.
+    const readTransaction = (transactionID: string | undefined): OnyxEntry<Transaction> => {
+        if (!transactionID) {
+            return undefined;
+        }
+        const key = `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+        return isTransactionEntry(key) ? (transactions?.[key] ?? searchResultsData?.[key]) : undefined;
+    };
+
+    const resolveTransactionRefs = (item: TransactionListItemType) => {
+        const itemTransaction = readTransaction(item.transactionID);
+        const parentReportID = item.report?.parentReportID;
+        const parentReportKey = `${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`;
+        return {
+            itemTransaction,
+            originalItemTransaction: readTransaction(itemTransaction?.comment?.originalTransactionID),
+            parentReport: parentReportID && isReportEntry(parentReportKey) ? searchResultsData?.[parentReportKey] : undefined,
+        };
+    };
+
+    const buildSelectedEntry = (item: TransactionListItemType) => {
+        const {itemTransaction, originalItemTransaction, parentReport} = resolveTransactionRefs(item);
+        return mapTransactionItemToSelectedEntry({
+            item,
+            itemTransaction,
+            originalItemTransaction,
+            currentUserLogin: currentUserEmail,
+            currentUserAccountID: accountID,
+            reportNameValuePairs,
+            outstandingReportsByPolicyID,
+            selfDMReport,
+            allowNegativeAmount: true,
+            parentReport,
+            rules,
+        });
+    };
+
+    const commitOptions = {
+        totalSelectableItemsCount,
+        shouldPreserveAllMatchingSelection,
+        shouldClearAllMatchingSelectionWhenEmpty: isOffline || searchResults?.search?.hasMoreResults === false,
+    };
+
+    // Expense-report rows are the selectable unit, so only group-by rows are headers whose children flatten in.
+    const hasValidGroupBy = areItemsGrouped && !isExpenseReportType;
+    const {items: flattenedShiftRangeItems, childrenByGroupKey, groupKeyByChildKey} = buildShiftRangeSource(renderedData, openGroupKeys, hasValidGroupBy);
+    useLayoutEffect(() => {
+        groupKeyByChildKeyRef.current = groupKeyByChildKey;
+        childrenByGroupKeyRef.current = childrenByGroupKey;
+    }, [groupKeyByChildKey, childrenByGroupKey]);
+
+    const isShiftRangeHeaderItem = (item: SearchData[number]) => isTransactionGroupListItemType(item) && hasValidGroupBy;
+
+    const getGroupCount = (groupKey: string) =>
+        getSearchGroupCount(isGroupedItemArray(filteredData) ? filteredData.find((group) => group.keyForList === groupKey) : undefined) ??
+        getSearchGroupCountByKey(searchResultsData, groupKey);
+
+    // Read when the click happens, like the refs they come from, and passed to the writers, which cannot read Onyx or the rows themselves.
+    const readGroupLookups = () => ({
+        groupKeyByChildKey: groupKeyByChildKeyRef.current,
+        childrenByGroupKey: childrenByGroupKeyRef.current,
+        buildSelectedEntry,
+        getGroupCount,
+    });
+
+    // Called from a click, the defaults read the current selection. A state updater passes the values from its own update instead.
+    const groupSelectionParams = (
+        groupKey: string | undefined,
+        groupChildren: TransactionListItemType[],
+        selectedTransactions = getSelectedTransactions(),
+        excludedTransactions = getExcludedTransactions(),
+        areAllMatchingItemsSelected = getAreAllMatchingItemsSelected(),
+    ) => ({
+        groupKey,
+        children: groupChildren,
+        selectedTransactions,
+        excludedTransactions,
+        areAllMatchingItemsSelected,
+    });
+
+    const applyShiftRangeBatch = (batch: ShiftRangeBatch<SearchData[number]>) => {
+        // Read at the gesture, not in the updater: the batch has to land on the rows the range was computed from.
+        const lookups = readGroupLookups();
+        applySelection((selectedTransactions, {areAllMatchingItemsSelected}) => applyShiftRangeBatchToSelection(batch, selectedTransactions, areAllMatchingItemsSelected, lookups), {
+            ...commitOptions,
+            data: filteredData,
+        });
+    };
+
+    // The same predicate the checkbox renders from, so a range reaches exactly the rows the user sees checked.
+    const isRowVisiblyChecked = (item: SearchData[number]) => {
+        const selectedTransactions = getSelectedTransactions();
+        const excludedTransactions = getExcludedTransactions();
+        const areAllMatchingItemsSelected = getAreAllMatchingItemsSelected();
+        if (isTransactionGroupListItemType(item)) {
+            return isGroupSelected(groupSelectionParams(item.keyForList, item.transactions, selectedTransactions, excludedTransactions, areAllMatchingItemsSelected));
+        }
+        if (!item.keyForList) {
+            return false;
+        }
+        return isRowChecked({
+            rowKey: item.keyForList,
+            parentGroupKey: groupKeyByChildKeyRef.current.get(item.keyForList),
+            selectedTransactions,
+            excludedTransactions,
+            areAllMatchingItemsSelected,
+        });
+    };
+
+    // A row checked through a group header belongs to that block, so a range may take it back.
+    const isRowHandPicked = (item: SearchData[number]) => {
+        const selectedTransactions = getSelectedTransactions();
+        const entry = item.keyForList ? selectedTransactions[item.keyForList] : undefined;
+        // A report row is the row the user clicked, so any selected child makes it hand-picked. So does its own entry, which is where the click lands until its rows arrive to carry one.
+        if (isTransactionGroupListItemType(item)) {
+            return !!entry?.isSelected || item.transactions.some((transaction) => selectedTransactions[transaction.keyForList]?.isSelected);
+        }
+        return !!entry?.isSelected && !entry.isSelectedViaGroup;
+    };
+
+    const rangeApi = useShiftRangeSelection<SearchData[number]>({
+        items: flattenedShiftRangeItems,
+        getItemKey: (item) => item.keyForList,
+        isItemSelected: isRowVisiblyChecked,
+        isItemProtected: isRowHandPicked,
+        isDisabledItem: (item) => (isTransactionListItemType(item) ? isTransactionPendingDelete(item) : item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE),
+        onApplyRange: applyShiftRangeBatch,
+        isHeaderItem: isShiftRangeHeaderItem,
+    });
+
+    // The session belongs to one search and one selection, so a new query or a clear from outside the list ends it.
+    const selectionClearGeneration = useSelectionClearGeneration();
+    useEffect(() => {
+        rangeApi.clearAnchor();
+    }, [searchHash, selectionClearGeneration, rangeApi]);
+
+    const seedGroup = (groupKey: string) => rangeApi.seedRangeFromSelection((childKey) => groupKeyByChildKeyRef.current.get(childKey) === groupKey);
+
+    const toggle: SearchRowSelectionActionsValue['toggle'] = (item, itemTransactions, shiftKey) => {
         if (isReportActionListItemType(item) || isTaskListItemType(item)) {
             return;
         }
 
+        // The hook rejects headers as range targets, so shift+click on one falls through to the group toggle.
+        if (rangeApi.applyShiftClick(item, shiftKey)) {
+            return;
+        }
+
+        // One children source for the seed and the selection, so a group can't seed a different block than it selects.
+        const groupTransactions = isTransactionGroupListItemType(item) ? (itemTransactions ?? item.transactions ?? []) : [];
+
+        if (isShiftRangeHeaderItem(item)) {
+            // What the press below writes: an unloaded group unless it is being deleted, a loaded one only for the rows it can still select.
+            const willSelectRows =
+                groupTransactions.length === 0
+                    ? item.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
+                    : groupTransactions.some((transactionItem) => !isTransactionPendingDelete(transactionItem));
+            if (isGroupSelected(groupSelectionParams(item.keyForList, groupTransactions))) {
+                // Deselecting paints no block, so reset instead of leaving a stale span to collapse.
+                rangeApi.clearAnchor();
+            } else if (willSelectRows) {
+                // Just this block: seeding the whole selection would span unrelated rows and deselect them.
+                seedGroup(item.keyForList);
+            }
+        } else {
+            // Seed the anchor so a later shift+click continues from here. The hook ignores rows a range can't reach.
+            rangeApi.notifyAnchor(item);
+        }
+
         if (isTransactionListItemType(item)) {
             if (!item.keyForList || isTransactionPendingDelete(item)) {
                 return;
             }
-            applySelection(
-                (selectedTransactions) => {
-                    const itemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${item.transactionID}`] as OnyxEntry<Transaction>;
-                    const originalItemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`];
-                    const itemParentReport = searchResultsData?.[`${ONYXKEYS.COLLECTION.REPORT}${item.report?.parentReportID}`] as OnyxEntry<Report>;
-                    const updatedTransactions = prepareTransactionsList({
-                        item,
-                        itemTransaction,
-                        originalItemTransaction,
-                        selectedTransactions,
-                        currentUserLogin: currentUserEmail,
-                        currentUserAccountID: accountID,
-                        reportNameValuePairs,
-                        outstandingReportsByPolicyID,
-                        selfDMReport,
-                        parentReport: itemParentReport,
-                        rules,
-                    });
+            const lookups = readGroupLookups();
+            applySelection((selectedTransactions, {areAllMatchingItemsSelected}) => {
+                const {itemTransaction, originalItemTransaction, parentReport: itemParentReport} = resolveTransactionRefs(item);
+                const baseSelection = spellOutGroupSelection(selectedTransactions, item.keyForList, areAllMatchingItemsSelected, lookups);
+                const updatedTransactions = prepareTransactionsList({
+                    item,
+                    itemTransaction,
+                    originalItemTransaction,
+                    selectedTransactions: baseSelection,
+                    currentUserLogin: currentUserEmail,
+                    currentUserAccountID: accountID,
+                    reportNameValuePairs,
+                    outstandingReportsByPolicyID,
+                    selfDMReport,
+                    parentReport: itemParentReport,
+                    rules,
+                });
 
-                    if (areItemsGrouped && isGroupedItemArray(filteredData)) {
-                        const parentGroupFromChildren = filteredData.find((group) => group.transactions.some((transaction) => transaction.keyForList === item.keyForList));
-                        const groupKey = selectedTransactions[item.keyForList]?.groupKey ?? item.selectionGroupKey ?? parentGroupFromChildren?.keyForList;
-                        const parentGroup = (groupKey ? filteredData.find((group) => group.keyForList === groupKey) : undefined) ?? parentGroupFromChildren;
-                        const loadedChildren = itemTransactions ?? parentGroup?.transactions ?? [];
-
-                        if (groupKey) {
-                            // Toggling one expense makes this group a partial selection, so export the remaining expenses individually.
-                            for (const [key, transaction] of Object.entries(updatedTransactions)) {
-                                if (transaction.groupKey === groupKey && transaction.isSelectedViaGroup) {
-                                    updatedTransactions[key] = {...transaction, isSelectedViaGroup: false};
-                                }
-                            }
+                if (areItemsGrouped && isGroupedItemArray(filteredData)) {
+                    const findGroupCarryingItem = () => filteredData.find((group) => group.transactions.some((transaction) => transaction.keyForList === item.keyForList));
+                    const groupKey =
+                        baseSelection[item.keyForList]?.groupKey ?? lookups.groupKeyByChildKey.get(item.keyForList) ?? item.selectionGroupKey ?? findGroupCarryingItem()?.keyForList;
+                    const parentGroup = (groupKey ? filteredData.find((group) => group.keyForList === groupKey) : undefined) ?? findGroupCarryingItem();
+                    const loadedChildren = itemTransactions ?? parentGroup?.transactions ?? [];
 
-                            // Selecting every child individually is still a whole-group selection for delete, so stamp
-                            // the parent key on siblings that were picked one by one and had no group key yet.
-                            for (const child of loadedChildren) {
-                                if (!child.keyForList || !updatedTransactions[child.keyForList]) {
-                                    continue;
-                                }
-                                updatedTransactions[child.keyForList] = {...updatedTransactions[child.keyForList], groupKey};
-                            }
-                            if (updatedTransactions[item.keyForList]) {
-                                updatedTransactions[item.keyForList] = {...updatedTransactions[item.keyForList], groupKey};
+                    if (groupKey) {
+                        // Toggling one expense makes this group a partial selection, so export the remaining expenses individually.
+                        for (const [key, transaction] of Object.entries(updatedTransactions)) {
+                            if (transaction.groupKey === groupKey && transaction.isSelectedViaGroup) {
+                                updatedTransactions[key] = {...transaction, isSelectedViaGroup: false};
                             }
                         }
 
-                        return stampGroupCoverageFlags({
-                            selectedTransactions: updatedTransactions,
-                            groupKey,
-                            groupCount: getSearchGroupCount(parentGroup) ?? getSearchGroupCountByKey(searchResultsData, groupKey),
-                            loadedChildrenCount: loadedChildren.length,
-                            loadedSelectableCount: loadedChildren.filter((transaction) => !isTransactionPendingDelete(transaction)).length,
-                        });
+                        // Selecting every child individually is still a whole-group selection for delete, so stamp
+                        // the parent key on siblings that were picked one by one and had no group key yet.
+                        for (const child of loadedChildren) {
+                            if (!child.keyForList || !updatedTransactions[child.keyForList]) {
+                                continue;
+                            }
+                            updatedTransactions[child.keyForList] = {...updatedTransactions[child.keyForList], groupKey};
+                        }
+                        if (updatedTransactions[item.keyForList]) {
+                            updatedTransactions[item.keyForList] = {...updatedTransactions[item.keyForList], groupKey};
+                        }
                     }
 
-                    return updatedTransactions;
-                },
-                {
-                    totalSelectableItemsCount,
-                    shouldPreserveAllMatchingSelection,
-                    shouldClearAllMatchingSelectionWhenEmpty: isOffline || searchResults?.search?.hasMoreResults === false,
-                },
-            );
+                    return stampGroupCoverageFlags({
+                        selectedTransactions: updatedTransactions,
+                        groupKey,
+                        groupCount: getSearchGroupCount(parentGroup) ?? getSearchGroupCountByKey(searchResultsData, groupKey),
+                        loadedChildrenCount: loadedChildren.length,
+                        loadedSelectableCount: loadedChildren.filter((transaction) => !isTransactionPendingDelete(transaction)).length,
+                    });
+                }
+
+                return updatedTransactions;
+            }, commitOptions);
             return;
         }
 
-        const currentTransactions = itemTransactions ?? item.transactions;
-
         applySelection(
-            (selectedTransactions) => {
-                if (currentTransactions.length === 0 && item.keyForList) {
+            (selectedTransactions, {excludedTransactions, areAllMatchingItemsSelected}) => {
+                if (groupTransactions.length === 0 && item.keyForList) {
                     const reportKey = item.keyForList;
 
                     if (item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
@@ -594,69 +805,69 @@ function SearchWriteActionsProvider({
                 // A group selected before its children were fetched is stored under the group key. Once the children load,
                 // deselecting has to clear that entry too, otherwise the group stays selected with no way to deselect it.
                 const groupKey = item.keyForList;
-                const isGroupKeySelected = !!(groupKey && selectedTransactions[groupKey]?.isSelected);
 
-                if (isGroupKeySelected || currentTransactions.some((transaction) => selectedTransactions[transaction.keyForList]?.isSelected)) {
+                if (isGroupSelected(groupSelectionParams(groupKey, groupTransactions, selectedTransactions, excludedTransactions, areAllMatchingItemsSelected))) {
                     const reducedSelectedTransactions: SelectedTransactions = {...selectedTransactions};
                     if (groupKey) {
                         delete reducedSelectedTransactions[groupKey];
                     }
-                    for (const transaction of currentTransactions) {
+                    for (const transaction of groupTransactions) {
                         delete reducedSelectedTransactions[transaction.keyForList];
                     }
                     return reducedSelectedTransactions;
                 }
 
-                const selectableTransactions = currentTransactions.filter((transaction) => !isTransactionPendingDelete(transaction));
-                const selectedViaGroup = {
-                    ...selectedTransactions,
-                    ...Object.fromEntries(
-                        selectableTransactions.map((transactionItem) => {
-                            const itemTransaction = (searchResultsData?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionItem.transactionID}`] ??
-                                transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionItem.transactionID}`]) as OnyxEntry<Transaction>;
-                            const originalItemTransaction =
-                                searchResultsData?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`] ??
-                                transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`];
-                            const itemParentReport = searchResultsData?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.report?.parentReportID}`] as OnyxEntry<Report>;
-                            const [key, entry] = mapTransactionItemToSelectedEntry({
-                                item: transactionItem,
-                                itemTransaction,
-                                originalItemTransaction,
-                                currentUserLogin: currentUserEmail,
-                                currentUserAccountID: accountID,
-                                reportNameValuePairs,
-                                outstandingReportsByPolicyID,
-                                selfDMReport,
-                                allowNegativeAmount: true,
-                                parentReport: itemParentReport,
-                                rules,
-                            });
-                            return [key, {...entry, groupKey: item.keyForList, isSelectedViaGroup: !!item.keyForList}];
-                        }),
-                    ),
-                };
-
+                const selectableTransactions = groupTransactions.filter((transactionItem) => !isTransactionPendingDelete(transactionItem));
+                if (selectableTransactions.length === 0) {
+                    // Nothing under it can be checked, so the press clears whatever it still holds. Leaving any of it counts rows the checkbox does not show, and no checkbox is left to uncheck them.
+                    const staleKeys: string[] = [];
+                    for (const key of [groupKey, ...groupTransactions.map((transactionItem) => transactionItem.keyForList)]) {
+                        if (key && selectedTransactions[key]) {
+                            staleKeys.push(key);
+                        }
+                    }
+                    if (staleKeys.length === 0) {
+                        // Same map, not an equal one: the commit bails on identity, so this must not re-render every row.
+                        return selectedTransactions;
+                    }
+                    const withoutStaleKeys = {...selectedTransactions};
+                    for (const key of staleKeys) {
+                        delete withoutStaleKeys[key];
+                    }
+                    return withoutStaleKeys;
+                }
                 return stampGroupCoverageFlags({
-                    selectedTransactions: selectedViaGroup,
-                    groupKey: item.keyForList,
-                    groupCount: getSearchGroupCount(item) ?? getSearchGroupCountByKey(searchResultsData, item.keyForList),
-                    loadedChildrenCount: currentTransactions.length,
+                    selectedTransactions: {
+                        ...selectedTransactions,
+                        ...Object.fromEntries(
+                            selectableTransactions.map((transactionItem) => {
+                                const [key, entry] = buildSelectedEntry(transactionItem);
+                                return [key, {...entry, groupKey: item.keyForList, isSelectedViaGroup: !!item.keyForList}];
+                            }),
+                        ),
+                    },
+                    groupKey,
+                    groupCount: getSearchGroupCount(item) ?? getSearchGroupCountByKey(searchResultsData, groupKey),
+                    loadedChildrenCount: groupTransactions.length,
                     loadedSelectableCount: selectableTransactions.length,
                 });
+                // A report row's own selection is derived from `selectedReports`, so this one commit has to re-derive it.
             },
-            {
-                ...(isExpenseReportType ? {data: filteredData} : {}),
-                totalSelectableItemsCount,
-                shouldPreserveAllMatchingSelection,
-                shouldClearAllMatchingSelectionWhenEmpty: isOffline || searchResults?.search?.hasMoreResults === false,
-            },
+            {...commitOptions, ...(isExpenseReportType ? {data: filteredData} : {})},
         );
     };
 
     const toggleAll: SearchRowSelectionActionsValue['toggleAll'] = () => {
+        // Read once, so the session and the selection cannot act on two different answers.
+        const isClearing = Object.keys(getSelectedTransactions()).length > 0;
+        if (isClearing) {
+            rangeApi.clearAnchor();
+        } else {
+            rangeApi.seedFullRange();
+        }
         applySelection(
-            (selectedTransactions) => {
-                if (Object.keys(selectedTransactions).length > 0) {
+            () => {
+                if (isClearing) {
                     return {};
                 }
 
@@ -671,22 +882,7 @@ function SearchWriteActionsProvider({
                         const entries: Array<[string, SelectedTransactionInfo]> = [];
                         const selectableTransactions = item.transactions.filter((transactionItem) => !isTransactionPendingDelete(transactionItem));
                         for (const transactionItem of selectableTransactions) {
-                            const itemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionItem.transactionID}`] as OnyxEntry<Transaction>;
-                            const originalItemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`];
-                            const itemParentReport = searchResultsData?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.report?.parentReportID}`] as OnyxEntry<Report>;
-                            const [key, entry] = mapTransactionItemToSelectedEntry({
-                                item: transactionItem,
-                                itemTransaction,
-                                originalItemTransaction,
-                                currentUserLogin: currentUserEmail,
-                                currentUserAccountID: accountID,
-                                reportNameValuePairs,
-                                outstandingReportsByPolicyID,
-                                selfDMReport,
-                                allowNegativeAmount: true,
-                                parentReport: itemParentReport,
-                                rules,
-                            });
+                            const [key, entry] = buildSelectedEntry(transactionItem);
                             entries.push([key, {...entry, groupKey: item.keyForList, isSelectedViaGroup: !!item.keyForList}]);
                         }
                         return Object.entries(
@@ -711,24 +907,7 @@ function SearchWriteActionsProvider({
                     if (isTransactionPendingDelete(transactionItem)) {
                         continue;
                     }
-                    const itemTransaction = searchResultsData?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionItem.transactionID}`] as OnyxEntry<Transaction>;
-                    const originalItemTransaction = searchResultsData?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${itemTransaction?.comment?.originalTransactionID}`];
-                    const itemParentReport = searchResultsData?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionItem.report?.parentReportID}`] as OnyxEntry<Report>;
-                    entries.push(
-                        mapTransactionItemToSelectedEntry({
-                            item: transactionItem,
-                            itemTransaction,
-                            originalItemTransaction,
-                            currentUserLogin: currentUserEmail,
-                            currentUserAccountID: accountID,
-                            reportNameValuePairs,
-                            outstandingReportsByPolicyID,
-                            selfDMReport,
-                            allowNegativeAmount: true,
-                            parentReport: itemParentReport,
-                            rules,
-                        }),
-                    );
+                    entries.push(buildSelectedEntry(transactionItem));
                 }
                 return Object.fromEntries(entries);
             },
@@ -758,7 +937,11 @@ function SearchWriteActionsProvider({
 
     const rowSelectionActionsValue: SearchRowSelectionActionsValue = {toggle, toggleAll};
 
-    return <SearchRowSelectionActionsContext value={rowSelectionActionsValue}>{children}</SearchRowSelectionActionsContext>;
+    return (
+        <SearchRowSelectionActionsContext value={rowSelectionActionsValue}>
+            <SearchShiftRangeGroupsContext value={shiftRangeGroupsActions}>{children}</SearchShiftRangeGroupsContext>
+        </SearchRowSelectionActionsContext>
+    );
 }
 
 export default SearchWriteActionsProvider;
diff --git a/src/components/Search/TaskSearchView.tsx b/src/components/Search/TaskSearchView.tsx
index 845bed020086..ab74fbeaa108 100644
--- a/src/components/Search/TaskSearchView.tsx
+++ b/src/components/Search/TaskSearchView.tsx
@@ -4,7 +4,7 @@ import CONST from '@src/CONST';
 
 import type {NativeSyntheticEvent} from 'react-native';
 
-import React, {useImperativeHandle} from 'react';
+import React from 'react';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {CommonSearchViewProps} from './searchViewProps';
@@ -50,7 +50,6 @@ function TaskSearchView({
     onViewableItemsChanged,
     contentContainerStyle,
     containerStyle,
-    ref,
 }: TaskSearchViewProps) {
     const {type} = queryJSON;
 
@@ -64,9 +63,6 @@ function TaskSearchView({
     const selectedItemsLength = data.reduce((acc, item) => acc + (item.keyForList && selectedTransactions[item.keyForList]?.isSelected ? 1 : 0), 0);
     const totalItems = data.filter((item) => !isRowDeleted(item)).length;
 
-    // Flat data maps 1:1 to the rendered list, so highlight-scroll-to-index is the same as scroll-to-data-index.
-    useImperativeHandle(ref, () => ({scrollToIndex: scrollToListIndex}), [scrollToListIndex]);
-
     const renderItem = (item: SearchListItem, index: number, isItemFocused: boolean, onFocus?: (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void) => (
         // Task rows never animate their exit (only grouped expenses do), so the wrapper just preserves the overflow clip.
         <AnimatedExitRow
diff --git a/src/components/Search/hooks/useFilterUserValue.tsx b/src/components/Search/hooks/useFilterUserValue.tsx
index f0720bb2d34d..83aa670a3c61 100644
--- a/src/components/Search/hooks/useFilterUserValue.tsx
+++ b/src/components/Search/hooks/useFilterUserValue.tsx
@@ -1,10 +1,9 @@
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import type {SearchFilter} from '@libs/SearchUIUtils';
 
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalDetailsList} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
@@ -26,7 +25,7 @@ function useFilterUserValue(accountIDs: SearchFilter['value']): string {
         );
     };
 
-    const [displayNames] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: filterUserSelector});
+    const [displayNames] = useAllPersonalDetails(filterUserSelector);
     return displayNames?.join(', ') ?? '';
 }
 
diff --git a/src/components/Search/hooks/useGroupedItems.ts b/src/components/Search/hooks/useGroupedItems.ts
index 2494ec600430..977460020820 100644
--- a/src/components/Search/hooks/useGroupedItems.ts
+++ b/src/components/Search/hooks/useGroupedItems.ts
@@ -22,6 +22,7 @@ function getGroupedAccountIDs(data: SearchResults['data'] = {}): number[] {
 /**
  * Turns a search snapshot into the sorted rows a chart plots, grouped and ordered the way the query asks for.
  * Returns nothing until the snapshot holds data, which is what a caller reads as "not loaded yet".
+ * Caps the rows to the query's limit, since the backend may return more rows than the chart shows.
  */
 function useGroupedItems(searchResults: OnyxEntry<SearchResults>, queryJSON: Readonly<SearchQueryJSON> | undefined): GroupedItem[] | undefined {
     const {translate, localeCompare, formatPhoneNumber, dateFnsLocale} = useLocalize();
@@ -61,7 +62,9 @@ function useGroupedItems(searchResults: OnyxEntry<SearchResults>, queryJSON: Rea
               )
             : undefined;
 
-    return sortedSections && isGroupedItemArray(sortedSections) ? sortedSections : undefined;
+    const limitedSections = sortedSections && queryJSON?.limit ? sortedSections.slice(0, queryJSON.limit) : sortedSections;
+
+    return limitedSections && isGroupedItemArray(limitedSections) ? limitedSections : undefined;
 }
 
 export default useGroupedItems;
diff --git a/src/components/Search/hooks/useOpenGroupsRegistry.ts b/src/components/Search/hooks/useOpenGroupsRegistry.ts
new file mode 100644
index 000000000000..e69ae4e89a48
--- /dev/null
+++ b/src/components/Search/hooks/useOpenGroupsRegistry.ts
@@ -0,0 +1,63 @@
+/**
+ * Which groups a shift+click range may reach into. Whoever owns a group's expanded state owns that answer, which is
+ * the one thing the rows cannot tell the provider. Scoped to one search, so a group left open across a query change
+ * cannot range over the previous results.
+ */
+import type {SearchShiftRangeGroupsActions} from '@components/Search/types';
+
+import {useState} from 'react';
+
+const NO_OPEN_GROUPS: ReadonlySet<string> = new Set();
+const NO_OPEN_GROUP_COUNTS: ReadonlyMap<string, number> = new Map();
+
+/** Anything that can answer whether a group is open: a set of keys going in, the registry's counts coming back */
+type OpenGroupKeys = {has: (groupKey: string) => boolean};
+
+type OpenGroupsRegistry = {
+    /** The groups currently rendering their children as rows */
+    openGroupKeys: OpenGroupKeys;
+
+    shiftRangeGroupsActions: SearchShiftRangeGroupsActions;
+};
+
+function useOpenGroupsRegistry(searchHash: number): OpenGroupsRegistry {
+    // Counted, so the first of two owners to clean up does not close the group for the other.
+    const [openGroupCounts, setOpenGroupCounts] = useState<ReadonlyMap<string, number>>(NO_OPEN_GROUP_COUNTS);
+
+    const [registryHash, setRegistryHash] = useState(searchHash);
+    if (registryHash !== searchHash) {
+        setRegistryHash(searchHash);
+        setOpenGroupCounts(NO_OPEN_GROUP_COUNTS);
+    }
+
+    // Built once (by construction, not by React Compiler) so the subscribing effects can't loop.
+    const [methods] = useState<Omit<SearchShiftRangeGroupsActions, 'registryGeneration'>>(() => ({
+        addGroupToRange: (groupKey) =>
+            setOpenGroupCounts((prev) => {
+                const next = new Map(prev);
+                next.set(groupKey, (prev.get(groupKey) ?? 0) + 1);
+                return next;
+            }),
+        removeGroupFromRange: (groupKey) =>
+            setOpenGroupCounts((prev) => {
+                const count = prev.get(groupKey);
+                if (count === undefined) {
+                    return prev;
+                }
+                const next = new Map(prev);
+                if (count > 1) {
+                    next.set(groupKey, count - 1);
+                } else {
+                    next.delete(groupKey);
+                }
+                return next;
+            }),
+    }));
+
+    // Only the container changes when the registry is dropped. The methods keep their identity, so subscribers stay put.
+    return {openGroupKeys: openGroupCounts, shiftRangeGroupsActions: {...methods, registryGeneration: registryHash}};
+}
+
+export default useOpenGroupsRegistry;
+export {NO_OPEN_GROUPS};
+export type {OpenGroupKeys};
diff --git a/src/components/Search/hooks/useOptimisticSearchTracking.ts b/src/components/Search/hooks/useOptimisticSearchTracking.ts
index 1d943f079f94..3ab112d6e706 100644
--- a/src/components/Search/hooks/useOptimisticSearchTracking.ts
+++ b/src/components/Search/hooks/useOptimisticSearchTracking.ts
@@ -43,7 +43,7 @@ function useOptimisticSearchTracking({searchResults, queryJSON, transactions, re
     const {type} = queryJSON;
 
     const hasPendingWriteOnMount = hasPendingSearchWrite();
-    const initialWatchKey = getSearchWriteWatchKey();
+    const initialWatchKey = hasPendingWriteOnMount ? getSearchWriteWatchKey() : undefined;
 
     const mutableRef = useRef<TrackingMutableState>({
         hasPendingWriteOnMount,
diff --git a/src/components/Search/hooks/useSearchColumnsToShow.ts b/src/components/Search/hooks/useSearchColumnsToShow.ts
new file mode 100644
index 000000000000..72ad560b39b2
--- /dev/null
+++ b/src/components/Search/hooks/useSearchColumnsToShow.ts
@@ -0,0 +1,53 @@
+import {useSearchQueryContext} from '@components/Search/SearchContext';
+import type {SearchColumnType, SearchQueryJSON} from '@components/Search/types';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useIsVendorColumnAvailable from '@hooks/useIsVendorColumnAvailable';
+import useOnyx from '@hooks/useOnyx';
+import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
+
+import {isDefaultExpensesQuery, queryHasViolationFilter} from '@libs/SearchQueryUtils';
+import {getColumnsToShow, getValidGroupBy} from '@libs/SearchUIUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {columnsSelector} from '@src/selectors/AdvancedSearchFiltersForm';
+import type SearchResults from '@src/types/onyx/SearchResults';
+
+import useSearchDataType from './useSearchDataType';
+
+const EMPTY_COLUMNS: SearchColumnType[] = [];
+
+/**
+ * The columns the Search table renders for a query and its snapshot.
+ *
+ * Both the table and the Edit columns picker read this, so the picker's seed can never drift from what is
+ * on screen.
+ */
+function useSearchColumnsToShow(queryJSON: Readonly<SearchQueryJSON> | undefined, searchResults: SearchResults | undefined): SearchColumnType[] {
+    const {accountID} = useCurrentUserPersonalDetails();
+    const {currentSearchKey} = useSearchQueryContext();
+    const {policyForMovingExpensesID} = usePolicyForMovingExpenses();
+    const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {selector: columnsSelector});
+    const isVendorColumnAvailable = useIsVendorColumnAvailable();
+    const searchDataType = useSearchDataType(searchResults);
+
+    if (!searchResults?.data) {
+        return EMPTY_COLUMNS;
+    }
+
+    return getColumnsToShow({
+        currentAccountID: accountID,
+        data: searchResults.data,
+        visibleColumns,
+        type: searchDataType,
+        groupBy: getValidGroupBy(queryJSON?.groupBy),
+        shouldUseStrictDefaultExpenseColumns: currentSearchKey === CONST.SEARCH.SEARCH_KEYS.EXPENSES && !!queryJSON && isDefaultExpensesQuery(queryJSON),
+        fallbackPolicyID: policyForMovingExpensesID,
+        sortBy: queryJSON?.sortBy,
+        shouldShowViolationsColumn: queryHasViolationFilter(queryJSON),
+        isVendorColumnAvailable,
+    });
+}
+
+export default useSearchColumnsToShow;
diff --git a/src/components/Search/hooks/useSearchDataType.ts b/src/components/Search/hooks/useSearchDataType.ts
new file mode 100644
index 000000000000..3984375c4a2e
--- /dev/null
+++ b/src/components/Search/hooks/useSearchDataType.ts
@@ -0,0 +1,21 @@
+import {useSearchResultsContext} from '@components/Search/SearchContext';
+
+import CONST from '@src/CONST';
+import type SearchResults from '@src/types/onyx/SearchResults';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+
+/**
+ * The data type of the snapshot that is actually on screen, which is not always the type the query asks
+ * for: on a main to-do search the provider swaps the snapshot out for live Onyx data, so the snapshot's
+ * own `search.type` is not authoritative and the type is forced to EXPENSE_REPORT.
+ *
+ * Anything that derives columns from snapshot data needs this rather than the query or the
+ * advanced-filters form type, so that the type and the data it is paired with always agree.
+ */
+function useSearchDataType(searchResults: SearchResults | undefined): SearchDataTypes | undefined {
+    const {shouldUseLiveData} = useSearchResultsContext();
+
+    return shouldUseLiveData ? CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT : searchResults?.search?.type;
+}
+
+export default useSearchDataType;
diff --git a/src/components/Search/hooks/useSearchListViewState.ts b/src/components/Search/hooks/useSearchListViewState.ts
index d135ea73eafc..3b978242cde6 100644
--- a/src/components/Search/hooks/useSearchListViewState.ts
+++ b/src/components/Search/hooks/useSearchListViewState.ts
@@ -1,8 +1,8 @@
+import {useEditingCellState} from '@components/EditableCell';
 import useRowLongPressMenu from '@components/Search/primitives/useRowLongPressMenu';
 import useScrollRestoration from '@components/Search/primitives/useScrollRestoration';
 import {useSearchRowSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
 import type {SearchListItem} from '@components/Search/SearchList/ListItem/types';
-import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
 
 import useKeyboardState from '@hooks/useKeyboardState';
 import useNetwork from '@hooks/useNetwork';
diff --git a/src/components/Search/hooks/useSearchSnapshot.ts b/src/components/Search/hooks/useSearchSnapshot.ts
index b3eec433969d..e889874c1b1d 100644
--- a/src/components/Search/hooks/useSearchSnapshot.ts
+++ b/src/components/Search/hooks/useSearchSnapshot.ts
@@ -1,11 +1,10 @@
 import {useSearchQueryContext, useSearchResultsContext} from '@components/Search/SearchContext';
-import type {ReportActionListItemType, SearchListItem, TransactionGroupListItemType, TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
+import type {SearchListItem, TransactionGroupListItemType, TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import type {SearchColumnType, SearchData, SearchQueryJSON, SelectedTransactions} from '@components/Search/types';
 
 import useActionLoadingReportIDs from '@hooks/useActionLoadingReportIDs';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import useIsVendorColumnAvailable from '@hooks/useIsVendorColumnAvailable';
 import useLocalize from '@hooks/useLocalize';
 import useMultipleSnapshots from '@hooks/useMultipleSnapshots';
 import useNetwork from '@hooks/useNetwork';
@@ -14,13 +13,11 @@ import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import useReportAttributes from '@hooks/useReportAttributes';
 
-import {isDefaultExpensesQuery, queryHasViolationFilter} from '@libs/SearchQueryUtils';
-import {getColumnsToShow, getSections, getSortedSections, getSortedTransactionData, getValidGroupBy, isSearchDataLoaded, isTransactionGroupListItemType} from '@libs/SearchUIUtils';
+import {getSections, getSortedSections, getSortedTransactionData, getValidGroupBy, isSearchDataLoaded, isTransactionGroupListItemType} from '@libs/SearchUIUtils';
 import {shouldShowAttendees} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {columnsSelector} from '@src/selectors/AdvancedSearchFiltersForm';
 import type {PolicyCategories, PolicyTagLists} from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 
@@ -30,6 +27,7 @@ import {useMemo} from 'react';
 
 import useLiveFilteredReportActions from './useLiveFilteredReportActions';
 import useOptimisticSearchTracking from './useOptimisticSearchTracking';
+import useSearchColumnsToShow from './useSearchColumnsToShow';
 import useStableOptimisticSortedData from './useStableOptimisticSortedData';
 
 type OptimisticTrackingReturn = ReturnType<typeof useOptimisticSearchTracking>;
@@ -78,10 +76,8 @@ type UseSearchSnapshotParams = {
     queryJSON: Readonly<SearchQueryJSON>;
     /** The current search snapshot, owned by the ancestor and passed in. */
     searchResults: SearchResults | undefined;
-    /** Keys flagged for the post-create highlight animation. */
-    newSearchResultKeys: Set<string> | null | undefined;
     /** Full TRANSACTION + REPORT_ACTIONS collections used by the optimistic-row tracking. Threaded in from
-     *  the parent (which already subscribes to them for the highlight hook) so we don't open duplicate
+     *  the parent (which already subscribes to them for the refetch hook) so we don't open duplicate
      *  full-collection reads. */
     transactions: OptimisticTrackingParams['transactions'];
     reportActions: OptimisticTrackingParams['reportActions'];
@@ -93,11 +89,10 @@ type UseSearchSnapshotParams = {
 };
 
 const EMPTY_DATA: SearchListItem[] = [];
-const EMPTY_COLUMNS: SearchColumnType[] = [];
 const EMPTY_HASHES: string[] = [];
 const EMPTY_GROUP_ITEMS: TransactionGroupListItemType[] = [];
 
-/** How many leading rows the cap keeps: `rowLimit` rows on screen, stretched down to the last ticked or highlighted row. */
+/** How many leading rows the cap keeps: `rowLimit` rows on screen, stretched down to the last ticked row. */
 function getRowLimitEnd(rows: SearchListItem[], rowLimit: number, selectedTransactions: SelectedTransactions | undefined, isOffline: boolean): number {
     const isKeySelected = (key: string | undefined) => !!key && !!selectedTransactions?.[key]?.isSelected;
     let shownRowCount = 0;
@@ -109,7 +104,7 @@ function getRowLimitEnd(rows: SearchListItem[], rowLimit: number, selectedTransa
         }
         shownRowCount += 1;
         const isRowSelected = isKeySelected(row.keyForList) || (isTransactionGroupListItemType(row) && row.transactions.some((transaction) => isKeySelected(transaction.keyForList)));
-        if (shownRowCount <= rowLimit || !!row.shouldAnimateInHighlight || isRowSelected) {
+        if (shownRowCount <= rowLimit || isRowSelected) {
             end = index + 1;
         }
     }
@@ -122,19 +117,11 @@ const hashToString = (queryHash?: number) => (queryHash || queryHash === 0 ? Str
  * Single data layer for the Search screen.
  *
  * Owns the live inputs `getSections` needs for sort/group correctness, runs the deferral-gated
- * sort/group/paginate projection, stamps the post-create highlight, enriches grouped views with their
- * per-group sub-snapshots, and absorbs the optimistic-row resilience. Returns the sorted rows plus the
- * list-level meta and the optimistic-tracking carriers that `<Search>` consumes.
+ * sort/group/paginate projection, enriches grouped views with their per-group sub-snapshots, and absorbs
+ * the optimistic-row resilience. Returns the sorted rows plus the list-level meta and the
+ * optimistic-tracking carriers that `<Search>` consumes.
  */
-function useSearchSnapshot({
-    queryJSON,
-    searchResults,
-    newSearchResultKeys,
-    transactions,
-    reportActions,
-    visibleRowLimit,
-    selectedTransactions,
-}: UseSearchSnapshotParams): SearchSnapshotResult {
+function useSearchSnapshot({queryJSON, searchResults, transactions, reportActions, visibleRowLimit, selectedTransactions}: UseSearchSnapshotParams): SearchSnapshotResult {
     const {type, sortBy, sortOrder, hash, groupBy} = queryJSON;
 
     const {isOffline} = useNetwork();
@@ -159,8 +146,6 @@ function useSearchSnapshot({
     const [policyCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES);
     const [policyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
     const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
-    const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {selector: columnsSelector});
-    const isVendorColumnAvailable = useIsVendorColumnAvailable();
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
 
     // Inject an optimistically-created transaction the server has not indexed yet so its row mounts
@@ -199,7 +184,6 @@ function useSearchSnapshot({
     // There's a race condition in Onyx which makes it return data from the previous Search, so in
     // addition to checking that the data is loaded we also check that the snapshot matches the query.
     const isDataLoaded = shouldUseLiveData || isSearchDataLoaded(searchResults, queryJSON);
-    const searchDataType = shouldUseLiveData ? CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT : searchResults?.search?.type;
 
     // Mirror the legacy `<Search>` gate: skip the heavy projection while deferring, before data is
     // loaded, or for the invalid group-by-on-chat/task combo. Drives every stage below.
@@ -356,8 +340,8 @@ function useSearchSnapshot({
         exportReportActions,
     ]);
 
-    // Stage 3: sort the (enriched) data, then stamp the post-create highlight on each row. getSortedSections
-    // accepts the full section union; our SearchListItem[] is a compatible subset of that input.
+    // Stage 3: sort the (enriched) data. getSortedSections accepts the full section union; our
+    // SearchListItem[] is a compatible subset of that input.
     const chartData = useMemo<SearchListItem[]>(() => {
         if (!shouldComputeSections) {
             return EMPTY_DATA;
@@ -368,47 +352,13 @@ function useSearchSnapshot({
             policyTags,
             fallbackPolicyID: policyForMovingExpensesID,
         }).map((item) => {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- chat variant rows are report actions
-            const reportActionID = (item as ReportActionListItemType).reportActionID;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- non-chat variant rows carry a transactionID
-            const transactionID = (item as TransactionListItemType).transactionID;
-            const baseKey = isChat ? `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportActionID}` : `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
-
-            const isBaseKeyMatch = !!newSearchResultKeys?.has(baseKey);
-
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- group rows expose nested transactions
-            const groupTransactionsForHighlight = (item as TransactionGroupListItemType)?.transactions;
-            const isAnyTransactionMatch =
-                !isChat &&
-                groupTransactionsForHighlight?.some((transaction) => {
-                    const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`;
-                    return !!newSearchResultKeys?.has(transactionKey);
-                });
-
-            const shouldAnimateInHighlight = isBaseKeyMatch || isAnyTransactionMatch;
-
-            if (item.shouldAnimateInHighlight === shouldAnimateInHighlight && item.hash === hash) {
+            if (item.hash === hash) {
                 return item;
             }
 
-            return {...item, shouldAnimateInHighlight, hash};
+            return {...item, hash};
         });
-    }, [
-        shouldComputeSections,
-        type,
-        filteredData,
-        localeCompare,
-        translate,
-        sortBy,
-        sortOrder,
-        validGroupBy,
-        policyCategories,
-        policyTags,
-        policyForMovingExpensesID,
-        isChat,
-        newSearchResultKeys,
-        hash,
-    ]);
+    }, [shouldComputeSections, type, filteredData, localeCompare, translate, sortBy, sortOrder, validGroupBy, policyCategories, policyTags, policyForMovingExpensesID, hash]);
 
     // Keep the optimistic row visible across a snapshot-replacement gap for up to
     // OPTIMISTIC_ROLLBACK_GRACE_MS until the new snapshot picks it up or the grace expires.
@@ -417,23 +367,7 @@ function useSearchSnapshot({
     // Not memoized: unlike the data chain above, `columns` is not part of the render loop, and its
     // reference is already stabilized downstream by `columnsToShow` in <Search> (which preserves the
     // previous array when contents are equal). The compiler leaves this fresh per render, which is fine.
-    const columns = ((): SearchColumnType[] => {
-        if (!searchResults?.data) {
-            return EMPTY_COLUMNS;
-        }
-        return getColumnsToShow({
-            currentAccountID: accountID,
-            data: searchResults.data,
-            visibleColumns,
-            type: searchDataType,
-            groupBy: validGroupBy,
-            shouldUseStrictDefaultExpenseColumns: currentSearchKey === CONST.SEARCH.SEARCH_KEYS.EXPENSES && isDefaultExpensesQuery(queryJSON),
-            fallbackPolicyID: policyForMovingExpensesID,
-            sortBy: queryJSON.sortBy,
-            shouldShowViolationsColumn: queryHasViolationFilter(queryJSON),
-            isVendorColumnAvailable,
-        });
-    })();
+    const columns = useSearchColumnsToShow(queryJSON, searchResults);
 
     // Non-grouped views are always fully loaded; grouped views require every group's sub-snapshot to
     // report no further results.
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index ce966c3da468..aec4f8946e52 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -1,13 +1,13 @@
 import FullPageErrorView from '@components/BlockingViews/FullPageErrorView';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
-import type {SelectionListHandle} from '@components/SelectionList/types';
 import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 import {useWideRHPActions} from '@components/WideRHPContextProvider';
 
 import useActionLoadingReportIDs from '@hooks/useActionLoadingReportIDs';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import type {ActionHandledType} from '@hooks/useHoldMenuSubmit';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -16,7 +16,7 @@ import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import usePrevious from '@hooks/usePrevious';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSaveSortedReportIDs from '@hooks/useSaveSortedReportIDs';
-import useSearchHighlightAndScroll from '@hooks/useSearchHighlightAndScroll';
+import useSearchAutoRefetch from '@hooks/useSearchAutoRefetch';
 import useSearchShouldCalculateTotals, {getSearchRequestOffsetForMissingAllMatchingCount} from '@hooks/useSearchShouldCalculateTotals';
 import useStableArrayReference from '@hooks/useStableArrayReference';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -25,6 +25,13 @@ import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import {saveLastSearchParams} from '@libs/actions/ReportNavigation';
 import type {TransactionPreviewData} from '@libs/actions/Search';
 import {consumePageRequestedSearch, setOptimisticDataForTransactionThreadPreview} from '@libs/actions/Search';
+import {
+    CAROUSEL_SOURCE,
+    clearActiveTransactionIDsForSource,
+    disownActiveTransactionIDs,
+    setActiveTransactionIDs,
+    shouldRefreshActiveTransactionIDs,
+} from '@libs/actions/TransactionThreadNavigation';
 import Log from '@libs/Log';
 import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import openInternalRouteInNewTab, {isModifiedMousePress} from '@libs/Navigation/helpers/openInternalRouteInNewTab';
@@ -63,7 +70,7 @@ import {
     getNavigateToReportsSpans,
 } from '@libs/telemetry/navigateToReportsSpans';
 import {cancelSubmitFollowUpActionSpan, getPendingSubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
-import {isTransactionPendingDelete, shouldShowAttendees} from '@libs/TransactionUtils';
+import {isDeletedTransaction, isTransactionPendingDelete, shouldShowAttendees} from '@libs/TransactionUtils';
 
 import Navigation, {navigationRef} from '@navigation/Navigation';
 import type {SearchFullscreenNavigatorParamList} from '@navigation/types';
@@ -244,7 +251,7 @@ function Search({
     const previousReportActions = usePrevious(reportActions);
     const {translate} = useLocalize();
     const {getCurrencyDecimals} = useCurrencyListActions();
-    const searchListRef = useRef<SelectionListHandle<SearchListItem> | null>(null);
+    const delegateAccountID = useDelegateAccountID();
 
     const savedSearchSelector = useCallback(
         (searches: OnyxEntry<SaveSearch>) => {
@@ -273,7 +280,7 @@ function Search({
         clearSelectedTransactions();
     }, [validGroupBy, prevValidGroupBy, clearSelectedTransactions]);
 
-    const {newSearchResultKeys, handleSelectionListScroll, newTransactions, hasQueuedHighlights} = useSearchHighlightAndScroll({
+    const {newTransactions} = useSearchAutoRefetch({
         searchResults,
         transactions,
         previousTransactions,
@@ -283,7 +290,6 @@ function Search({
         shouldCalculateTotals,
         reportActions,
         previousReportActions,
-        shouldUseLiveData,
     });
 
     const {
@@ -307,23 +313,12 @@ function Search({
     } = useSearchSnapshot({
         queryJSON,
         searchResults,
-        newSearchResultKeys,
         transactions,
         reportActions,
         visibleRowLimit: shouldUseLiveData ? liveRowLimit : undefined,
         selectedTransactions,
     });
 
-    // Mirror `hasQueuedHighlights` into a ref so the post-create-flow `useFocusEffect`
-    // (which has empty deps) can read the latest value without re-creating its callback.
-    // Used to skip the deferral that would otherwise hide the freshly-added row from
-    // FlashList during the RHP dismiss transition, which would prevent the highlight
-    // animation from ever firing on it.
-    const hasQueuedHighlightsRef = useRef(hasQueuedHighlights);
-    useEffect(() => {
-        hasQueuedHighlightsRef.current = hasQueuedHighlights;
-    }, [hasQueuedHighlights]);
-
     // There's a race condition in Onyx which makes it return data from the previous Search, so in addition to checking that the data is loaded
     // we also need to check that the searchResults matches the type and status of the current search
     const isDataLoaded = shouldUseLiveData || isSearchDataLoaded(searchResults, queryJSON);
@@ -383,14 +378,6 @@ function Search({
                 return;
             }
 
-            // If the highlight hook already queued rows for the post-create animation,
-            // skip the skeleton-during-transition defer. Otherwise FlashList stays empty
-            // for ~1s while the RHP dismiss transition runs, the row never mounts inside
-            // the 300ms highlight window, and `useAnimatedHighlightStyle` never fires.
-            if (hasQueuedHighlightsRef.current) {
-                return;
-            }
-
             // Show skeleton while the RHP dismiss animation plays. The transition
             // hasn't started yet when useFocusEffect fires (it begins after paint),
             // so waitForUpcomingTransition defers until the animation actually ends.
@@ -411,8 +398,8 @@ function Search({
     // so we never fall through to the empty-state check with stale zero-length data.
     const isDeferringHeavyWork = !isOffline && shouldDeferHeavySearchWork;
     const isSearchLoadingWithNoResults = isSearchPending(searchResults) && Array.isArray(searchResults?.data) && searchResults.data.length === 0;
-    // Every write of `errors` stores the response code next to them, so a reload keeps the classification
-    // that component state would have lost. `null` means no response has been recorded for this query yet.
+    // The response code is persisted next to the errors it explains, so a reload keeps the classification
+    // that component state would have lost. `null` means the code for these errors has not been stored yet.
     const responseStatusCode = searchResults?.search?.responseJsonCode ?? null;
     const hasUnresolvedErrors = hasErrors && responseStatusCode === null;
     const isWaitingForInitialData = !shouldUseLiveData && !isOffline && (!isDataLoaded || isSearchLoadingWithNoResults || hasUnresolvedErrors || isCardFeedsLoading);
@@ -509,6 +496,7 @@ function Search({
             shouldCalculateTotals,
             prevReportsLength: filteredDataLength,
             isLoading: !!searchResults?.search?.isLoading,
+            shouldSaveRecentSearch: searchRequestOffset === 0 && !shouldUseLiveData,
         });
 
         // We don't need to run the effect on change of isFocused.
@@ -619,6 +607,39 @@ function Search({
         }, 0);
     }, [areItemsGrouped, filteredData]);
 
+    const carouselSiblingTransactionIDs = useMemo(
+        () =>
+            (filteredData as SearchListItem[])
+                .filter(
+                    (t): t is TransactionListItemType => !!t && isTransactionListItemType(t) && t.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !isDeletedTransaction(t),
+                )
+                .map((t) => t.transactionID),
+        [filteredData],
+    );
+
+    // This search results list owns the carousel it seeds. Drilling into a report hands ownership over to that
+    // report's own list; the refresh effect below then leaves the carousel alone until the user comes back out.
+    const carouselSource = CAROUSEL_SOURCE.search(hash);
+    const hasSeededCarouselRef = useRef(false);
+
+    // Hands this list's expenses to the carousel for the expense the user is opening in *this* tab.
+    //
+    // It is called at each in-tab navigation rather than once at the top of `onSelectRow`, because a Cmd/Ctrl+click
+    // opens a background tab without navigating here: seeding up front rewrote the carousel of whatever was already
+    // open in the RHP, which then paged through unrelated Spend results. Releasing is scoped to this source for the
+    // same reason - the unscoped clear used to wipe a carousel another screen owned.
+    const seedCarouselForOpenedExpense = useCallback(() => {
+        if (carouselSiblingTransactionIDs.length > 1) {
+            setActiveTransactionIDs(carouselSiblingTransactionIDs, {source: carouselSource, snapshotHash: hash});
+            // Mark the seed so the release effect below knows this instance owns a carousel. Without it an instance
+            // that only ever seeded from a row press skipped its own cleanup and stranded `search:<hash>` behind.
+            hasSeededCarouselRef.current = true;
+            return;
+        }
+        clearActiveTransactionIDsForSource(carouselSource);
+        hasSeededCarouselRef.current = false;
+    }, [carouselSiblingTransactionIDs, carouselSource, hash]);
+
     const onSelectRow = useCallback(
         (item: SearchListItem, transactionPreviewData?: TransactionPreviewData, event?: ModifiedMouseEvent) => {
             if (item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
@@ -627,11 +648,17 @@ function Search({
 
             const isTransactionItem = isTransactionListItemType(item);
             const backTo = Navigation.getActiveRoute();
+
             // If we're trying to open a transaction without a transaction thread, let's create the thread and navigate the user
             if (isTransactionItem && !item?.reportAction?.childReportID) {
                 // If the report is unreported (self DM), we want to open the track expense thread instead of a report with an ID of 0
                 const shouldOpenTransactionThread = !isOneTransactionReport(item.report) || item.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
                 const shouldOpenTransactionThreadInNewTab = shouldOpenTransactionThread && isModifiedMousePress(event);
+                // When opening an expense from the Spend page (flat transaction list), populate the carousel
+                // with all sibling transactions so prev/next navigation works in the RHP transaction view.
+                if (shouldOpenTransactionThread && !shouldOpenTransactionThreadInNewTab) {
+                    seedCarouselForOpenedExpense();
+                }
                 const targetReportID = createAndOpenSearchTransactionThread({
                     conciergeChat,
                     getCurrencyDecimals,
@@ -643,11 +670,12 @@ function Search({
                     personalDetails,
                     isSelfTourViewed,
                     hasCompletedGuidedSetupFlow,
+                    delegateAccountID,
                     IOUTransactionID: item?.reportAction?.childReportID,
                     shouldNavigate: shouldOpenTransactionThread && !shouldOpenTransactionThreadInNewTab,
                 });
                 if (shouldOpenTransactionThreadInNewTab && targetReportID) {
-                    openInternalRouteInNewTab(ROUTES.SEARCH_REPORT.getRoute({reportID: targetReportID, backTo}), event);
+                    openInternalRouteInNewTab(ROUTES.SEARCH_REPORT.getRoute({reportID: targetReportID, backTo, anchorTransactionID: item.transactionID}), event);
                 }
                 if (shouldOpenTransactionThread) {
                     return;
@@ -706,12 +734,19 @@ function Search({
                             personalDetails,
                             isSelfTourViewed,
                             hasCompletedGuidedSetupFlow,
+                            delegateAccountID,
                             IOUTransactionID: firstTransaction?.reportAction?.childReportID,
                             transactionPreviewData,
                             shouldNavigate: false,
                         });
                     } else {
-                        setOptimisticDataForTransactionThreadPreview(firstTransaction, transactionPreviewData, getCurrencyDecimals, firstTransaction?.reportAction?.childReportID);
+                        setOptimisticDataForTransactionThreadPreview(
+                            firstTransaction,
+                            transactionPreviewData,
+                            getCurrencyDecimals,
+                            delegateAccountID,
+                            firstTransaction?.reportAction?.childReportID,
+                        );
                     }
                 }
 
@@ -773,13 +808,16 @@ function Search({
             markReportRHPWidth(reportID, 'wide');
 
             if (isTransactionItem && transactionPreviewData) {
-                setOptimisticDataForTransactionThreadPreview(transactionItem, transactionPreviewData, getCurrencyDecimals, transactionItem?.reportAction?.childReportID);
+                setOptimisticDataForTransactionThreadPreview(transactionItem, transactionPreviewData, getCurrencyDecimals, delegateAccountID, transactionItem?.reportAction?.childReportID);
             }
 
-            const route = ROUTES.SEARCH_REPORT.getRoute({reportID, backTo});
+            const route = ROUTES.SEARCH_REPORT.getRoute({reportID, backTo, anchorTransactionID: isTransactionItem ? transactionItem.transactionID : undefined});
             if (openInternalRouteInNewTab(route, event)) {
                 return;
             }
+            if (isTransactionItem) {
+                seedCarouselForOpenedExpense();
+            }
             requestAnimationFrame(() => Navigation.navigate(route));
         },
         [
@@ -796,11 +834,81 @@ function Search({
             offset,
             searchResults?.search?.hasMoreResults,
             currentSearchKey,
+            seedCarouselForOpenedExpense,
             getCurrencyDecimals,
             conciergeChat,
+            delegateAccountID,
         ],
     );
 
+    const carouselSiblingsKey = carouselSiblingTransactionIDs.join(',');
+    const [activeCarouselTransactionIDs] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
+
+    // This list stays mounted behind the RHP, so it keeps the carousel in step with the results (an expense
+    // deleted from the list has to leave the carousel too). The active IDs are a dependency, not just a guard, so
+    // that it re-runs and stands down when another screen takes ownership - see TransactionThreadNavigation.ts.
+    useEffect(() => {
+        if (shouldShowLoadingState) {
+            return;
+        }
+        // The release below clears the carousel on the way out, which flips the active IDs and re-runs this effect.
+        // Without this guard that re-run would immediately re-seed the carousel the user just left behind.
+        if (!isSearchTopmostFullScreenRoute()) {
+            return;
+        }
+        if (!shouldRefreshActiveTransactionIDs(carouselSource, carouselSiblingTransactionIDs)) {
+            return;
+        }
+        setActiveTransactionIDs(carouselSiblingTransactionIDs, {source: carouselSource, snapshotHash: hash});
+        hasSeededCarouselRef.current = true;
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- carouselSiblingsKey is an order-sensitive proxy for the array, which is rebuilt on every search data change
+    }, [carouselSiblingsKey, activeCarouselTransactionIDs, carouselSource, hash, shouldShowLoadingState, isFocused]);
+
+    // The effect above seeds the carousel with no row press, so this list has to release it when the user leaves
+    // for another tab - otherwise the Spend page's expenses page on inside any one-transaction report opened later.
+    //
+    // Blur, not unmount: the Spend tab uses `freezeOnBlur` without `unmountOnBlur`, so leaving it for the Inbox
+    // never unmounts this component. Hence `isFocused` as a dependency. Opening the RHP over Search also blurs it,
+    // so the release stands down while Search is still the topmost full-screen route, which also keeps a re-sort
+    // from stripping the arrows of an expense open in the RHP.
+    //
+    // Teardown is deliberately separate from the seeding effect: folding it in would run the cleanup on every
+    // re-seed, and a run that then bailed at one of the guards would leave the carousel cleared.
+    useEffect(() => {
+        return () => {
+            if (!hasSeededCarouselRef.current) {
+                return;
+            }
+            if (isSearchTopmostFullScreenRoute()) {
+                return;
+            }
+            hasSeededCarouselRef.current = false;
+            clearActiveTransactionIDsForSource(carouselSource);
+        };
+    }, [carouselSource, isFocused]);
+
+    // An unmounting instance always gives up ownership, even while Search is still the topmost full-screen route.
+    // This page is keyed by the query hash, so sorting, filtering or switching Spend tabs unmounts this instance
+    // and mounts a new one under `search:<newHash>`. The blur-time release above stands down in that moment
+    // (Search is still topmost), which left `search:<oldHash>` owning the carousel with no mounted screen able to
+    // refresh or release it, so the replacement list could never seed and the stale one kept driving the arrows.
+    //
+    // It hands ownership over rather than clearing: the expense open in the RHP keeps its arrows while the new
+    // results load, instead of losing them for the duration - and for good, when the new results no longer hold
+    // that expense. The header already drops the arrows on its own once the open expense isn't in the list.
+    //
+    // `carouselSource` is constant for an instance's lifetime (the hash is its React key), so this runs on
+    // unmount only.
+    useEffect(() => {
+        return () => {
+            if (!hasSeededCarouselRef.current) {
+                return;
+            }
+            hasSeededCarouselRef.current = false;
+            disownActiveTransactionIDs(carouselSource);
+        };
+    }, [carouselSource]);
+
     // getColumnsToShow allocates a fresh array on every call; preserve the previous reference
     // when contents are equal so downstream consumers don't re-render on Onyx snapshot churn
     // (e.g. opening a report bumps searchResults.data) that doesn't actually change the columns.
@@ -1002,9 +1110,8 @@ function Search({
 
     const onLayout = useCallback(() => {
         onLayoutBase();
-        handleSelectionListScroll(stableSortedData, searchListRef.current);
         onContentReady?.();
-    }, [onLayoutBase, handleSelectionListScroll, stableSortedData, onContentReady]);
+    }, [onLayoutBase, onContentReady]);
 
     // Must be a ref, not state: cancelNavigationSpans is called during render
     // (inside conditional returns), so using setState would trigger infinite re-renders.
@@ -1170,6 +1277,8 @@ function Search({
         return <View onLayout={onDeferredLayout} />;
     }
 
+    const listContainerStyle = shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3;
+
     // This is a performance optimization for the submit-expense->search path only.
     // The SearchPage skeleton (useSearchLoadingState) doesn't cover this case because
     // Search must mount for its onLayout to flush the deferred CreateMoneyRequest API write, which would block the JS thread causing a slowdown on post expense creation navigation
@@ -1178,7 +1287,7 @@ function Search({
             <SearchRowSkeleton
                 shouldAnimate
                 onLayout={onSkeletonLayout}
-                containerStyle={shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3}
+                containerStyle={listContainerStyle}
             />
         );
     }
@@ -1189,6 +1298,15 @@ function Search({
         return <FullPageOfflineBlockingView>{null}</FullPageOfflineBlockingView>;
     }
 
+    if (hasUnresolvedErrors) {
+        return (
+            <SearchRowSkeleton
+                shouldAnimate
+                containerStyle={listContainerStyle}
+            />
+        );
+    }
+
     if (hasErrors) {
         cancelNavigationSpans();
         const retrySearch = () => {
@@ -1202,9 +1320,11 @@ function Search({
                 shouldCalculateTotals: shouldCalculateTotalsOnRetry,
                 prevReportsLength: filteredDataLength,
                 isLoading: !!searchResults?.search?.isLoading,
+                // Must match the page-level request this retry triggers, or search() re-sends the query as an upgrade.
+                shouldSaveRecentSearch: true,
             });
         };
-        // failureData stores NO_RESPONSE when the request never got a server answer, so only the results' freshness is in
+        // search() stores NO_RESPONSE when the request never got a server answer, so only the results' freshness is in
         // doubt and the refresh copy fits. Any code the server did return marks a real failure and keeps the error copy,
         // and an invalid query gets no button because re-sending it cannot succeed.
         let failureKind: ValueOf<typeof CONST.SEARCH.FAILURE_KIND> = CONST.SEARCH.FAILURE_KIND.FAILED;
@@ -1236,7 +1356,7 @@ function Search({
             },
         } as const;
         return (
-            <View style={[shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3, styles.flex1]}>
+            <View style={[listContainerStyle, styles.flex1]}>
                 <FullPageErrorView
                     shouldShow
                     containerStyle={styles.searchBlockingErrorViewContainer}
@@ -1260,7 +1380,7 @@ function Search({
     ) {
         cancelNavigationSpans();
         return (
-            <View style={[styles.flex1, isInLandscapeMode ? undefined : [shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3]]}>
+            <View style={[styles.flex1, isInLandscapeMode ? undefined : [listContainerStyle]]}>
                 <EmptySearchView
                     similarSearchHash={similarSearchHash}
                     type={type}
@@ -1307,7 +1427,7 @@ function Search({
                     onLayout={onLayoutChart}
                     scrollEventThrottle={CONST.TIMING.MIN_SMOOTH_SCROLL_EVENT_THROTTLE}
                 >
-                    <View style={[shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!hasFilterBars) : styles.mt3, styles.mh4, styles.mb4, styles.flex1]}>
+                    <View style={[listContainerStyle, styles.mh4, styles.mb4, styles.flex1]}>
                         <SearchChartWrapper
                             title={chartTitle}
                             groupBy={validGroupBy}
@@ -1387,7 +1507,6 @@ function Search({
     };
 
     const commonViewProps: CommonSearchViewProps = {
-        ref: searchListRef,
         queryJSON,
         data: stableSortedData,
         columns: columnsToShow,
@@ -1441,8 +1560,10 @@ function Search({
         <SearchScopeProvider>
             <SearchWriteActionsProvider
                 filteredData={filteredData}
+                renderedData={stableSortedData}
                 totalSelectableItemsCount={totalSelectableItemsCount}
                 searchResults={searchResults}
+                searchHash={hash}
                 transactions={transactions}
                 isMobileSelectionModeEnabled={isMobileSelectionModeEnabled}
                 type={type}
diff --git a/src/components/Search/searchViewProps.ts b/src/components/Search/searchViewProps.ts
index 5893f3202faf..6a5fd8d8e8de 100644
--- a/src/components/Search/searchViewProps.ts
+++ b/src/components/Search/searchViewProps.ts
@@ -6,18 +6,12 @@ import type {GetReportTableColumnStylesParams} from '@styles/utils';
 import type {CardList, PolicyCategories, PolicyTagLists, Transaction} from '@src/types/onyx';
 
 import type React from 'react';
-import type {ForwardedRef} from 'react';
 import type {NativeScrollEvent, NativeSyntheticEvent, StyleProp, ViewStyle} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
 
 import type {SearchListItem} from './SearchList/ListItem/types';
 import type {SearchColumnType, SearchQueryJSON} from './types';
 
-/** Imperative handle the router uses for highlight-driven scrolling. */
-type SearchListHandle = {
-    scrollToIndex: (index: number, animated?: boolean) => void;
-};
-
 /**
  * Props shared by every dedicated Search view. The router (`<Search>`) builds these once and spreads
  * them into whichever view renders; each view narrows to its own extras on top of this shape.
@@ -56,7 +50,7 @@ type CommonSearchViewProps = {
     /** Whether everything has been loaded (gates the fully-checked select-all state). */
     hasLoadedAllTransactions?: boolean;
 
-    /** Rows flagged for the post-create highlight animation (feeds BaseSearchList extraData). */
+    /** Newly-added transactions (feeds BaseSearchList extraData and the grouped-view child-snapshot refetch). */
     newTransactions: Transaction[];
 
     /** The navigation handler for a row tap (owned by the router). */
@@ -77,9 +71,6 @@ type CommonSearchViewProps = {
 
     contentContainerStyle: StyleProp<ViewStyle>;
     containerStyle: StyleProp<ViewStyle>;
-
-    /** Imperative handle for highlight-driven scrolling, set by the router. */
-    ref?: ForwardedRef<SearchListHandle>;
 };
 
 /** Extra props specific to the transaction views (expense/invoice/trip): attendee tracking and card rendering. */
diff --git a/src/components/Search/selectionBuilders.ts b/src/components/Search/selectionBuilders.ts
index c963dea615b6..2438c60de9df 100644
--- a/src/components/Search/selectionBuilders.ts
+++ b/src/components/Search/selectionBuilders.ts
@@ -1,6 +1,7 @@
 import {isSplitAction} from '@libs/ReportSecondaryActionUtils';
 import {canEditFieldOfMoneyRequest, canHoldUnholdReportAction, canRejectReportAction, getReimbursableTotal, isMoneyRequestReport, isOneTransactionReport} from '@libs/ReportUtils';
-import {isGroupEntry, isTransactionListItemType, isTransactionReportGroupListItemType} from '@libs/SearchUIUtils';
+import {isGroupedItemArray, isGroupEntry, isTransactionGroupListItemType, isTransactionListItemType, isTransactionReportGroupListItemType} from '@libs/SearchUIUtils';
+import type {ShiftRangeBatch} from '@libs/shiftRangeSelection';
 import {getOriginalTransactionWithSplitInfo, hasValidModifiedAmount, isExpenseUnreported, isOnHold, isTransactionPendingDelete} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
@@ -9,7 +10,10 @@ import type {SearchGroupBase, SearchResultDataType} from '@src/types/onyx/Search
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
-import type {TransactionGroupListItemType, TransactionListItemType, TransactionReportGroupListItemType} from './SearchList/ListItem/types';
+import {deepEqual} from 'fast-equals';
+
+import type {OpenGroupKeys} from './hooks/useOpenGroupsRegistry';
+import type {SearchListItem, TransactionGroupListItemType, TransactionListItemType, TransactionReportGroupListItemType} from './SearchList/ListItem/types';
 import type {SearchData, SelectedReports, SelectedTransactionInfo, SelectedTransactions} from './types';
 
 /**
@@ -416,6 +420,12 @@ type GroupSelectionParams = {
     areAllMatchingItemsSelected: boolean;
 };
 
+/** Whether clicking a group's checkbox means "deselect": true once any row under it reads as checked. */
+function isGroupSelected(params: GroupSelectionParams): boolean {
+    const {isSelectAllChecked, isIndeterminate} = getGroupCheckboxState(params);
+    return isSelectAllChecked || isIndeterminate;
+}
+
 /** What a group's checkbox shows: fully checked, and whether only some of its rows are. Rows being deleted count for neither. */
 function getGroupCheckboxState({groupKey, children, selectedTransactions, excludedTransactions, areAllMatchingItemsSelected}: GroupSelectionParams): {
     isSelectAllChecked: boolean;
@@ -472,11 +482,256 @@ function isRowChecked({rowKey, parentGroupKey, selectedTransactions, excludedTra
     return areAllMatchingItemsSelected || !!(parentGroupKey && selectedTransactions[parentGroupKey]?.isSelected);
 }
 
+/** Openness is the gate, not the rows: a closed group still carries the ones it loaded. */
+function resolveGroupChildren(group: TransactionGroupListItemType, openGroupKeys: OpenGroupKeys): TransactionListItemType[] {
+    return openGroupKeys.has(group.keyForList) ? group.transactions : [];
+}
+
+type ShiftRangeSource = {
+    /** Each group header followed by the rows it carries, in visual order */
+    items: SearchListItem[];
+
+    childrenByGroupKey: Map<string, TransactionListItemType[]>;
+
+    /** So a child's selection is stored and removed under the right parent */
+    groupKeyByChildKey: Map<string, string>;
+};
+
+/** One pass, so what a range spans and who owns each row cannot disagree. Flattens only in group-by views. */
+function buildShiftRangeSource(sortedData: SearchListItem[], openGroupKeys: OpenGroupKeys, groupsAreHeaders: boolean): ShiftRangeSource {
+    const childrenByGroupKey = new Map<string, TransactionListItemType[]>();
+    const groupKeyByChildKey = new Map<string, string>();
+    if (!groupsAreHeaders || !isGroupedItemArray(sortedData)) {
+        return {items: sortedData, childrenByGroupKey, groupKeyByChildKey};
+    }
+
+    const items: SearchListItem[] = [];
+    for (const group of sortedData) {
+        items.push(group);
+        if (!group.keyForList) {
+            continue;
+        }
+        const children = resolveGroupChildren(group, openGroupKeys);
+        childrenByGroupKey.set(group.keyForList, children);
+        for (const child of children) {
+            items.push(child);
+            if (child.keyForList) {
+                groupKeyByChildKey.set(child.keyForList, group.keyForList);
+            }
+        }
+    }
+    return {items, childrenByGroupKey, groupKeyByChildKey};
+}
+
+type GroupLookups = {
+    /** The group a child row belongs to, so its selection is stored and removed under the right parent */
+    groupKeyByChildKey: ReadonlyMap<string, string>;
+
+    /** Each group's rows as the range sees them */
+    childrenByGroupKey: ReadonlyMap<string, TransactionListItemType[]>;
+
+    /** Supplied by the provider, which is what reads Onyx for a row's action flags */
+    buildSelectedEntry: (item: TransactionListItemType) => [string, SelectedTransactionInfo];
+
+    /** The group's total on the server, which can be more than the rows it has loaded */
+    getGroupCount: (groupKey: string) => number | undefined;
+};
+
+/** Undefined under select-all-matching, where the group is selected without its rows being known. */
+function resolveGroupBlock(selection: SelectedTransactions, childKey: string, areAllMatchingItemsSelected: boolean, lookups: GroupLookups) {
+    const groupKey = lookups.groupKeyByChildKey.get(childKey);
+    if (!groupKey || areAllMatchingItemsSelected || !selection[groupKey]?.isSelected) {
+        return undefined;
+    }
+    return {groupKey, loaded: lookups.childrenByGroupKey.get(groupKey) ?? []};
+}
+
+/** A group selected before its children loaded lives under its own key, so dropping one child means writing it out first. */
+function spellOutGroupSelection(selection: SelectedTransactions, childKey: string, areAllMatchingItemsSelected: boolean, lookups: GroupLookups): SelectedTransactions {
+    const block = resolveGroupBlock(selection, childKey, areAllMatchingItemsSelected, lookups);
+    // Counted the same way the loop writes, so writing out can never delete the entry and put nothing back.
+    const selectable = block?.loaded.filter((child) => !isTransactionPendingDelete(child)) ?? [];
+    if (!block || selectable.length === 0) {
+        return selection;
+    }
+    const {groupKey} = block;
+    const spelledOut: SelectedTransactions = {...selection};
+    delete spelledOut[groupKey];
+    for (const child of selectable) {
+        const [key, info] = lookups.buildSelectedEntry(child);
+        // No `isSelectedViaGroup`: the caller is about to drop one of these, so the group stops being a whole-group selection.
+        spelledOut[key] = {...info, groupKey};
+    }
+    return spelledOut;
+}
+
+/** What a shift+click range writes: the rows it covers selected, the rows it gave back dropped, and the same map back when neither happened. */
+function applyShiftRangeBatchToSelection(
+    batch: ShiftRangeBatch<SearchListItem>,
+    selection: SelectedTransactions,
+    areAllMatchingItemsSelected: boolean,
+    lookups: GroupLookups,
+): SelectedTransactions {
+    let updated: SelectedTransactions = {...selection};
+    // Returning the given map unchanged is what lets the commit bail on identity rather than re-render every row.
+    let hasWritten = false;
+    // Whole wins over partial, since that is the gesture a header click makes.
+    const partialGroupKeys = new Set<string>();
+    const wholeGroupKeys = new Set<string>();
+    // Every group written under, with the rows it has loaded, so its coverage can be recounted once the batch is in.
+    const touchedGroups = new Map<string, TransactionListItemType[]>();
+    const touchGroup = (groupKey: string, loadedRows: TransactionListItemType[]) => {
+        if (touchedGroups.has(groupKey)) {
+            return;
+        }
+        touchedGroups.set(groupKey, loadedRows);
+    };
+
+    const dropKey = (key: string) => {
+        if (!Object.hasOwn(updated, key)) {
+            return;
+        }
+        delete updated[key];
+        hasWritten = true;
+    };
+
+    // `blockGroupKey` is set only when a whole group row joins the range, which is what makes its children narrowable later.
+    const addTransaction = (transaction: TransactionListItemType, blockGroupKey: string | undefined) => {
+        if (!transaction.keyForList || isTransactionPendingDelete(transaction)) {
+            return;
+        }
+        updated = spellOutGroupSelection(updated, transaction.keyForList, areAllMatchingItemsSelected, lookups);
+        const [key, info] = lookups.buildSelectedEntry(transaction);
+        const parentGroupKey = blockGroupKey ?? lookups.groupKeyByChildKey.get(transaction.keyForList);
+        // A row the range only re-covers keeps its group claim. Only a row the range gives back makes the group partial.
+        const isAlreadySelectedViaGroup = !!parentGroupKey && updated[key]?.groupKey === parentGroupKey && !!updated[key]?.isSelectedViaGroup;
+        if (parentGroupKey) {
+            if (blockGroupKey) {
+                wholeGroupKeys.add(parentGroupKey);
+            } else if (!isAlreadySelectedViaGroup) {
+                partialGroupKeys.add(parentGroupKey);
+            }
+            touchGroup(parentGroupKey, lookups.childrenByGroupKey.get(parentGroupKey) ?? []);
+        }
+        const entry = parentGroupKey ? {...info, groupKey: parentGroupKey, isSelectedViaGroup: !!blockGroupKey || isAlreadySelectedViaGroup} : info;
+        // Re-covering a row is not a write, and coverage is recounted after the batch, so it is left out of the comparison.
+        if (deepEqual({...updated[key], isEntireGroupSelected: undefined}, {...entry, isEntireGroupSelected: undefined})) {
+            return;
+        }
+        updated[key] = entry;
+        hasWritten = true;
+    };
+
+    const removeRow = (row: SearchListItem) => {
+        if (isTransactionListItemType(row) || (isTransactionReportGroupListItemType(row) && row.transactions.length === 0)) {
+            if (row.keyForList) {
+                const parentGroupKey = lookups.groupKeyByChildKey.get(row.keyForList);
+                if (parentGroupKey) {
+                    partialGroupKeys.add(parentGroupKey);
+                    touchGroup(parentGroupKey, lookups.childrenByGroupKey.get(parentGroupKey) ?? []);
+                }
+                updated = spellOutGroupSelection(updated, row.keyForList, areAllMatchingItemsSelected, lookups);
+                dropKey(row.keyForList);
+            }
+            return;
+        }
+        if (isTransactionGroupListItemType(row)) {
+            // A group can hold an entry under its own key as well as under its children's.
+            if (row.keyForList) {
+                dropKey(row.keyForList);
+            }
+            for (const child of row.transactions ?? []) {
+                if (child.keyForList) {
+                    dropKey(child.keyForList);
+                }
+            }
+        }
+    };
+
+    const addRow = (row: SearchListItem) => {
+        if (isTransactionListItemType(row)) {
+            addTransaction(row, undefined);
+            return;
+        }
+        if (isTransactionReportGroupListItemType(row) && row.transactions.length === 0) {
+            if (row.keyForList && row.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+                const [key, info] = mapEmptyReportToSelectedEntry(row);
+                if (!deepEqual(updated[key], info)) {
+                    updated[key] = info;
+                    hasWritten = true;
+                }
+            }
+            return;
+        }
+        if (isTransactionGroupListItemType(row)) {
+            const selectable = (row.transactions ?? []).filter((child) => !isTransactionPendingDelete(child));
+            if (selectable.length === 0) {
+                return;
+            }
+            // The children carry the selection from here, so the group's own key would count it twice.
+            if (row.keyForList) {
+                dropKey(row.keyForList);
+                touchedGroups.set(row.keyForList, row.transactions ?? []);
+            }
+            for (const child of selectable) {
+                addTransaction(child, row.keyForList);
+            }
+        }
+    };
+
+    for (const row of batch.toDeselect) {
+        removeRow(row);
+    }
+    for (const row of batch.toSelect) {
+        addRow(row);
+    }
+
+    // Rows left behind must stop claiming the group covers them, or an export sends a whole-group filter.
+    for (const [key, transaction] of Object.entries(updated)) {
+        if (transaction.isSelectedViaGroup && transaction.groupKey && partialGroupKeys.has(transaction.groupKey) && !wholeGroupKeys.has(transaction.groupKey)) {
+            updated[key] = {...transaction, isSelectedViaGroup: false};
+            hasWritten = true;
+        }
+    }
+
+    // Delete takes a whole group on this flag, so each group the range wrote under is recounted, in one pass over the selection rather than one per group.
+    const selectedCountByGroupKey = new Map<string, number>();
+    for (const [key, transaction] of Object.entries(updated)) {
+        if (key === transaction.groupKey || !transaction.groupKey || !touchedGroups.has(transaction.groupKey)) {
+            continue;
+        }
+        selectedCountByGroupKey.set(transaction.groupKey, (selectedCountByGroupKey.get(transaction.groupKey) ?? 0) + 1);
+    }
+
+    const coverageByGroupKey = new Map<string, boolean>();
+    for (const [groupKey, loadedRows] of touchedGroups) {
+        const loadedSelectableCount = loadedRows.filter((child) => !isTransactionPendingDelete(child)).length;
+        const remainingGroupCount = getRemainingSearchGroupCount(lookups.getGroupCount(groupKey), loadedRows.length, loadedSelectableCount);
+        coverageByGroupKey.set(groupKey, isSelectionCoveringEntireGroup(remainingGroupCount, selectedCountByGroupKey.get(groupKey) ?? 0, loadedSelectableCount));
+    }
+
+    for (const [key, transaction] of Object.entries(updated)) {
+        const groupKey = touchedGroups.has(key) ? key : transaction.groupKey;
+        const isEntireGroupSelected = groupKey ? coverageByGroupKey.get(groupKey) : undefined;
+        if (isEntireGroupSelected === undefined || !groupKey || (transaction.groupKey === groupKey && transaction.isEntireGroupSelected === isEntireGroupSelected)) {
+            continue;
+        }
+        updated[key] = {...transaction, groupKey, isEntireGroupSelected};
+        hasWritten = true;
+    }
+
+    return hasWritten ? updated : selection;
+}
+
 export {
     mapTransactionItemToSelectedEntry,
     mapEmptyReportToSelectedEntry,
     prepareTransactionsList,
     deriveSelectedReports,
+    buildShiftRangeSource,
+    applyShiftRangeBatchToSelection,
+    spellOutGroupSelection,
+    isGroupSelected,
     getGroupCheckboxState,
     isRowChecked,
     getSearchGroupCount,
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index bb7cc54c8a8f..1dc2fa805803 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -240,6 +240,12 @@ type SearchSelectionContextValue = {
     areAllMatchingItemsSelected: boolean;
 };
 
+/** The exclusions and the select-all-matching flag from the same state update as the selection map, so an updater never combines a new map with stale values */
+type PreviousSelectionSlices = {
+    excludedTransactions: SelectedTransactions;
+    areAllMatchingItemsSelected: boolean;
+};
+
 type SearchSelectionActionsValue = {
     /**
      * If you want to set `selectedTransactionIDs`, pass an array as the first argument, object/record otherwise.
@@ -260,7 +266,7 @@ type SearchSelectionActionsValue = {
      * `reconciledExcludedTransactions` refreshes or prunes exclusions when the underlying search data changes.
      */
     applySelection: (
-        updater: (previousSelectedTransactions: SelectedTransactions) => SelectedTransactions,
+        updater: (previousSelectedTransactions: SelectedTransactions, previousSelection: PreviousSelectionSlices) => SelectedTransactions,
         options?: {
             data?: SearchData;
             totalSelectableItemsCount?: number;
@@ -269,6 +275,10 @@ type SearchSelectionActionsValue = {
             reconciledExcludedTransactions?: SelectedTransactions;
         },
     ) => void;
+    /** Read on demand without subscribing, so a handler can anchor from the live selection without re-rendering every row */
+    getSelectedTransactions: () => SelectedTransactions;
+    getExcludedTransactions: () => SelectedTransactions;
+    getAreAllMatchingItemsSelected: () => boolean;
     setSelectedReports: (reports: SelectedReports[]) => void;
     setCurrentSelectedTransactionReportID: (reportID: string | undefined) => void;
     /** If you want to clear `selectedTransactionIDs`, pass `true` as the first argument */
@@ -290,12 +300,20 @@ type SearchData = TransactionListItemType[] | TransactionGroupListItemType[] | R
  * never re-renders consumers that only need to dispatch.
  */
 type SearchRowSelectionActionsValue = {
-    /** Toggle selection of a single transaction row or a group (report / grouped rows). */
-    toggle: (item: SearchListItem, itemTransactions?: TransactionListItemType[]) => void;
+    /** Toggle selection of a single transaction row or a group (report / grouped rows). `shiftKey` extends a range. */
+    toggle: (item: SearchListItem, itemTransactions?: TransactionListItemType[], shiftKey?: boolean) => void;
     /** Toggle selection of all currently selectable items. */
     toggleAll: () => void;
 };
 
+/** Lets whoever owns a group's expanded state say whether a shift+click range may reach the rows it renders. */
+type SearchShiftRangeGroupsActions = {
+    addGroupToRange: (groupKey: string) => void;
+    removeGroupFromRange: (groupKey: string) => void;
+    /** Changes when the registry is dropped for a new search, so a group left open across the change reopens */
+    registryGeneration: number | undefined;
+};
+
 /** Composed value of all three Search state contexts. Kept as a union for callers that need the full bag shape (e.g. test fixtures, action `searchContext` payloads). */
 type SearchStateContextValue = SearchQueryContextValue & SearchResultsContextValue & SearchSelectionContextValue;
 
@@ -434,6 +452,7 @@ type SearchParams = {
     prevReportsLength?: number;
     shouldCalculateTotals: boolean;
     isLoading: boolean;
+    shouldSaveRecentSearch?: boolean;
 };
 
 type BankAccountMenuItem = {
@@ -506,6 +525,7 @@ export type {
     SearchSelectionActionsValue,
     SearchData,
     SearchRowSelectionActionsValue,
+    SearchShiftRangeGroupsActions,
     ASTNode,
     QueryFilter,
     Filter,
@@ -523,6 +543,7 @@ export type {
     TableColumnSize,
     SearchGroupBy,
     SearchView,
+    SearchCompareMode,
     ChartView,
     SingularSearchStatus,
     SearchDatePreset,
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index f1b437a2d83e..dab269ee44fb 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -51,7 +51,6 @@ function BaseSelectionListImpl({
     initiallyFocusedItemKey,
     onSelectRow,
     onSelectAll,
-    onLongPressRow,
     onSelectionButtonPress,
     onScrollBeginDrag,
     onDismissError,
@@ -72,7 +71,7 @@ function BaseSelectionListImpl({
     isDisabled = false,
     isSmallScreenWidth,
     isLoadingNewOptions,
-    isRowMultilineSupported = false,
+    titleNumberOfLines,
     addBottomSafeAreaPadding,
     shouldShowListEmptyContent = true,
     shouldShowLoadingPlaceholder,
@@ -96,7 +95,6 @@ function BaseSelectionListImpl({
     shouldPreventDefaultFocusOnSelectRow = false,
     shouldShowTextInput: shouldShowTextInputProp,
     shouldClearInputOnSelect = false,
-    shouldHighlightSelectedItem,
     shouldDisableHoverStyle = false,
     selectionButtonPosition,
     setShouldDisableHoverStyle = () => {},
@@ -130,8 +128,7 @@ function BaseSelectionListImpl({
 
     const dataDetails = useMemo<DataDetailsType<ListItem>>(() => {
         const {disabledIndexes, disabledArrowKeyIndexes, selectedOptions, disabledSelectedIndexes} = data.reduce(
-            (acc: {disabledIndexes: number[]; disabledArrowKeyIndexes: number[]; selectedOptions: ListItem[]; disabledSelectedIndexes: number[]}, item: ListItem, index: number) => {
-                const idx = item.index ?? index;
+            (acc: {disabledIndexes: number[]; disabledArrowKeyIndexes: number[]; selectedOptions: ListItem[]; disabledSelectedIndexes: number[]}, item: ListItem, idx: number) => {
                 const itemIsSelected = isItemSelected(item);
                 const isItemDisabled = isDisabled || (!!item?.isDisabled && !itemIsSelected);
                 const isEffectivelyDisabled = isItemDisabled || !!item?.isDisabledCheckbox;
@@ -319,19 +316,12 @@ function BaseSelectionListImpl({
                 isDisabled={isItemDisabled}
                 canSelectMultiple={canSelectMultiple}
                 onDismissError={onDismissError}
-                onLongPressRow={onLongPressRow}
                 onSelectionButtonPress={onSelectionButtonPress}
                 shouldSingleExecuteRowSelect={shouldSingleExecuteRowSelect}
-                isMultilineSupported={isRowMultilineSupported}
-                isAlternateTextMultilineSupported={(alternateNumberOfSupportedLines ?? 0) > 1}
+                titleNumberOfLines={titleNumberOfLines}
                 alternateTextNumberOfLines={alternateNumberOfSupportedLines}
                 shouldIgnoreFocus={shouldIgnoreFocus}
-                titleStyles={style?.listItemTitleStyles}
-                wrapperStyle={style?.listItemWrapperStyle}
-                titleContainerStyles={style?.listItemTitleContainerStyles}
-                errorRowStyles={style?.listItemErrorRowStyles}
                 singleExecution={singleExecution}
-                shouldHighlightSelectedItem={shouldHighlightSelectedItem}
                 shouldSyncFocus={!isTextInputFocusedRef.current && isKeyboardNavigating}
                 shouldDisableHoverStyle={shouldDisableHoverStyle}
                 isFirstItem={index === 0}
diff --git a/src/components/SelectionList/ListItem/BareUserListItem.tsx b/src/components/SelectionList/ListItem/BareUserListItem.tsx
index ac80d10c159f..f6e0d394680e 100644
--- a/src/components/SelectionList/ListItem/BareUserListItem.tsx
+++ b/src/components/SelectionList/ListItem/BareUserListItem.tsx
@@ -3,7 +3,7 @@ import shouldShowRBRIndicator from '@components/SelectionList/utils/shouldShowRB
 
 import React from 'react';
 
-import type {ListItem, UserListItemProps} from './types';
+import type {BareUserListItemProps, ListItem} from './types';
 
 import UserListItemContent from './UserListItemContent';
 
@@ -30,7 +30,7 @@ function BareUserListItem<TItem extends ListItem>({
     forwardedFSClass,
     shouldDisableHoverStyle,
     shouldHighlightSelectedItem,
-}: UserListItemProps<TItem>) {
+}: BareUserListItemProps<TItem>) {
     // Disable accessible grouping when a right-side button is visible, so VoiceOver can focus it independently.
     const shouldDisableAccessibleGrouping = !!item.actionElement;
 
@@ -51,7 +51,7 @@ function BareUserListItem<TItem extends ListItem>({
             shouldDisableHoverStyle={shouldDisableHoverStyle}
             shouldHighlightSelectedItem={shouldHighlightSelectedItem}
         >
-            <ListItemComposed.Row style={wrapperStyle}>
+            <ListItemComposed.Row style={[wrapperStyle, item.itemStyle]}>
                 <UserListItemContent
                     item={item}
                     forwardedFSClass={forwardedFSClass}
diff --git a/src/components/SelectionList/ListItem/BaseSelectListItem.tsx b/src/components/SelectionList/ListItem/BaseSelectListItem.tsx
deleted file mode 100644
index ebe712fda57e..000000000000
--- a/src/components/SelectionList/ListItem/BaseSelectListItem.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import ListItemComposed from '@components/SelectionList/ListItemComposed';
-
-import useStyleUtils from '@hooks/useStyleUtils';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import variables from '@styles/variables';
-
-import CONST from '@src/CONST';
-
-import React from 'react';
-import {View} from 'react-native';
-
-import type {ListItem, ListItemProps} from './types';
-
-import SelectableListItem from './SelectableListItem';
-
-/**
- * A text-only row with a title and optional subtitle. Serves as the base for SingleSelectListItem and MultiSelectListItem.
- * The text column is preceded by `item.leftElement`, or by a compact avatar of the item's first icon when there is none.
- */
-function BaseSelectListItem<TItem extends ListItem>({
-    item,
-    isFocused,
-    showTooltip,
-    isDisabled,
-    onSelectRow,
-    onDismissError,
-    shouldPreventEnterKeySubmit,
-    isMultilineSupported = false,
-    isAlternateTextMultilineSupported = false,
-    alternateTextNumberOfLines = 2,
-    titleNumberOfLines = 2,
-    canSelectMultiple,
-    onFocus,
-    shouldSyncFocus,
-    wrapperStyle,
-    titleStyles,
-    shouldHighlightSelectedItem,
-    isFocusVisible,
-    accessibilityRole,
-    selectionButtonPosition,
-}: ListItemProps<TItem>) {
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const icon = item.icons?.at(0);
-    const fullTitle = isMultilineSupported ? item.text?.trimStart() : item.text;
-    const indentsLength = (item.text?.length ?? 0) - (fullTitle?.length ?? 0);
-    const paddingLeft = Math.floor(indentsLength / CONST.INDENTS.length) * styles.ml3.marginLeft;
-    const alternateTextMaxWidth = variables.sideBarWidth - styles.ph5.paddingHorizontal * 2 - styles.ml3.marginLeft - variables.iconSizeNormal;
-
-    // The primitives default to single-line styles.pre; multiline rows override it with preWrap and the indent padding.
-    const titleStyle = [
-        isMultilineSupported && styles.preWrap,
-        item.alternateText || item.alternateTextComponent ? styles.mb1 : null,
-        isDisabled && styles.colorMuted,
-        isMultilineSupported ? StyleUtils.getPaddingLeft(paddingLeft) : null,
-        titleStyles,
-        item.titleStyles,
-    ];
-    const subtitleStyle = [
-        isAlternateTextMultilineSupported && styles.preWrap,
-        isAlternateTextMultilineSupported ? StyleUtils.getMaximumWidth(alternateTextMaxWidth) : null,
-        isMultilineSupported ? StyleUtils.getPaddingLeft(paddingLeft) : null,
-    ];
-
-    return (
-        <SelectableListItem
-            item={item}
-            wrapperStyle={[styles.flex1, styles.justifyContentBetween, styles.sidebarLinkInner, styles.userSelectNone, styles.optionRow, wrapperStyle]}
-            isFocused={isFocused}
-            isFocusVisible={isFocusVisible}
-            isDisabled={isDisabled}
-            showTooltip={showTooltip}
-            onSelectRow={onSelectRow}
-            onDismissError={onDismissError}
-            shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
-            canSelectMultiple={canSelectMultiple}
-            onFocus={onFocus}
-            shouldSyncFocus={shouldSyncFocus}
-            shouldHighlightSelectedItem={shouldHighlightSelectedItem}
-            accessibilityRole={accessibilityRole}
-            selectionButtonPosition={selectionButtonPosition}
-        >
-            <>
-                {item.leftElement ??
-                    (icon ? (
-                        <ListItemComposed.CompactAvatar
-                            icon={icon}
-                            style={styles.mr3}
-                        />
-                    ) : undefined)}
-                <View style={[styles.flex1, styles.alignItemsStart, !!item.rightElement && styles.pr3]}>
-                    <ListItemComposed.Title
-                        text={fullTitle ?? ''}
-                        style={titleStyle}
-                        numberOfLines={isMultilineSupported ? titleNumberOfLines : 1}
-                    />
-
-                    {!!item.alternateTextComponent && item.alternateTextComponent}
-                    {!item.alternateTextComponent && !!item.alternateText && (
-                        <ListItemComposed.Subtitle
-                            text={item.alternateText}
-                            style={subtitleStyle}
-                            numberOfLines={isAlternateTextMultilineSupported ? alternateTextNumberOfLines : 1}
-                        />
-                    )}
-                </View>
-                {!!item.rightElement && item.rightElement}
-            </>
-        </SelectableListItem>
-    );
-}
-
-export default BaseSelectListItem;
diff --git a/src/components/SelectionList/ListItem/InviteMemberListItem.tsx b/src/components/SelectionList/ListItem/InviteMemberListItem.tsx
index f7b63bb24d4b..7a2c5f1f774f 100644
--- a/src/components/SelectionList/ListItem/InviteMemberListItem.tsx
+++ b/src/components/SelectionList/ListItem/InviteMemberListItem.tsx
@@ -9,7 +9,7 @@ import {Str} from 'expensify-common';
 import React from 'react';
 import {View} from 'react-native';
 
-import type {InviteMemberListItemProps, ListItem} from './types';
+import type {ListItem, ListItemProps} from './types';
 
 /**
  * A user row with avatar, name, and subtitle used for person selection and invitation. Adds
@@ -29,9 +29,8 @@ function InviteMemberListItem<TItem extends ListItem>({
     onDismissError,
     onFocus,
     shouldSyncFocus,
-    wrapperStyle,
-    isMultilineSupported,
-}: InviteMemberListItemProps<TItem>) {
+    titleNumberOfLines = 1,
+}: ListItemProps<TItem>) {
     const styles = useThemeStyles();
     const {formatPhoneNumber} = useLocalize();
 
@@ -58,7 +57,7 @@ function InviteMemberListItem<TItem extends ListItem>({
         >
             <ListItemComposed.Row
                 testID={item.text}
-                style={wrapperStyle}
+                style={item.itemStyle}
             >
                 <View style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}>
                     {(!!item.reportID || !!accountID || !!item.text || !!item.alternateText) &&
@@ -78,12 +77,12 @@ function InviteMemberListItem<TItem extends ListItem>({
                             <TextWithTooltip
                                 shouldShowTooltip={shouldShowTooltip}
                                 text={Str.isSMSLogin(item.text ?? '') ? formatPhoneNumber(item.text ?? '') : (item.text ?? '')}
-                                numberOfLines={isMultilineSupported ? 2 : 1}
+                                numberOfLines={titleNumberOfLines}
                                 style={[
                                     styles.optionDisplayName,
                                     styles.sidebarLinkText,
                                     item.isBold !== false && styles.sidebarLinkTextBold,
-                                    isMultilineSupported ? styles.preWrap : styles.pre,
+                                    titleNumberOfLines > 1 ? styles.preWrap : styles.pre,
                                     item.alternateText ? styles.mb1 : null,
                                 ]}
                             />
diff --git a/src/components/SelectionList/ListItem/ListItemRenderer.tsx b/src/components/SelectionList/ListItem/ListItemRenderer.tsx
index b5bf99322719..d67288dc68f5 100644
--- a/src/components/SelectionList/ListItem/ListItemRenderer.tsx
+++ b/src/components/SelectionList/ListItem/ListItemRenderer.tsx
@@ -1,25 +1,24 @@
-import type {SelectionListProps} from '@components/SelectionList/types';
-
 import type useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
 import type useSingleExecution from '@hooks/useSingleExecution';
 
 import {isMobileChrome} from '@libs/Browser';
-import {isTransactionGroupListItemType} from '@libs/SearchUIUtils';
 
 import type {NativeSyntheticEvent} from 'react-native';
 
 import React from 'react';
 
-import type {ExtendedTargetedEvent, ListItem, ListItemProps} from './types';
+import type {ExtendedTargetedEvent, ListItem, ListItemComponent, ListItemProps} from './types';
 
-type ListItemRendererProps<TItem extends ListItem> = Omit<ListItemProps<TItem>, 'onSelectRow'> &
-    Pick<SelectionListProps<TItem>, 'ListItem' | 'shouldIgnoreFocus' | 'shouldSingleExecuteRowSelect'> & {
-        index: number;
-        normalizedIndex?: number;
-        selectRow: (item: TItem, indexToFocus?: number) => void;
-        setFocusedIndex: ReturnType<typeof useArrowKeyFocusManager>[1];
-        singleExecution: ReturnType<typeof useSingleExecution>['singleExecution'];
-    };
+type ListItemRendererProps<TItem extends ListItem> = Omit<ListItemProps<TItem>, 'onSelectRow'> & {
+    ListItem: ListItemComponent<TItem>;
+    index: number;
+    normalizedIndex?: number;
+    shouldIgnoreFocus?: boolean;
+    shouldSingleExecuteRowSelect?: boolean;
+    selectRow: (item: TItem, indexToFocus?: number) => void;
+    setFocusedIndex: ReturnType<typeof useArrowKeyFocusManager>[1];
+    singleExecution: ReturnType<typeof useSingleExecution>['singleExecution'];
+};
 
 function ListItemRenderer<TItem extends ListItem>({
     ListItem,
@@ -30,48 +29,31 @@ function ListItemRenderer<TItem extends ListItem>({
     isDisabled,
     showTooltip,
     canSelectMultiple,
-    onLongPressRow,
     shouldSingleExecuteRowSelect,
     selectRow,
     onSelectionButtonPress,
     onDismissError,
-    isMultilineSupported,
-    isAlternateTextMultilineSupported,
+    titleNumberOfLines,
     alternateTextNumberOfLines,
     shouldIgnoreFocus,
     setFocusedIndex,
     shouldSyncFocus,
-    titleNumberOfLines,
-    wrapperStyle,
-    titleStyles,
     singleExecution,
-    titleContainerStyles,
-    shouldHighlightSelectedItem,
     isFocusVisible,
     shouldDisableHoverStyle,
     selectionButtonPosition,
-    errorRowStyles,
     isFirstItem,
     isLastItem,
     shouldPreventEnterKeySubmit = true,
 }: ListItemRendererProps<TItem>) {
-    const handleOnSelectionButtonPress = () => {
-        if (isTransactionGroupListItemType(item)) {
-            return onSelectionButtonPress;
-        }
-        return onSelectionButtonPress ? () => onSelectionButtonPress(item) : undefined;
-    };
-
     return (
         <>
             <ListItem
                 item={item}
-                index={index}
                 isFocused={isFocused}
                 isDisabled={isDisabled}
                 showTooltip={showTooltip}
                 canSelectMultiple={canSelectMultiple}
-                onLongPressRow={onLongPressRow}
                 onSelectRow={() => {
                     if (shouldSingleExecuteRowSelect) {
                         singleExecution(() => selectRow(item, index))();
@@ -79,13 +61,11 @@ function ListItemRenderer<TItem extends ListItem>({
                         selectRow(item, index);
                     }
                 }}
-                onSelectionButtonPress={handleOnSelectionButtonPress()}
+                onSelectionButtonPress={onSelectionButtonPress ? () => onSelectionButtonPress(item) : undefined}
                 onDismissError={() => onDismissError?.(item)}
                 shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
-                isMultilineSupported={isMultilineSupported}
-                isAlternateTextMultilineSupported={isAlternateTextMultilineSupported}
-                alternateTextNumberOfLines={alternateTextNumberOfLines}
                 titleNumberOfLines={titleNumberOfLines}
+                alternateTextNumberOfLines={alternateTextNumberOfLines}
                 onFocus={(event: NativeSyntheticEvent<ExtendedTargetedEvent>) => {
                     if (shouldIgnoreFocus || isDisabled) {
                         return;
@@ -97,11 +77,6 @@ function ListItemRenderer<TItem extends ListItem>({
                     setFocusedIndex(normalizedIndex ?? index);
                 }}
                 shouldSyncFocus={shouldSyncFocus}
-                wrapperStyle={wrapperStyle}
-                titleStyles={titleStyles}
-                titleContainerStyles={titleContainerStyles}
-                errorRowStyles={errorRowStyles}
-                shouldHighlightSelectedItem={shouldHighlightSelectedItem}
                 isFocusVisible={isFocusVisible}
                 shouldDisableHoverStyle={shouldDisableHoverStyle}
                 selectionButtonPosition={selectionButtonPosition}
diff --git a/src/components/SelectionList/ListItem/MultiSelectListItem.tsx b/src/components/SelectionList/ListItem/MultiSelectListItem.tsx
index 3aa59d6efeb8..2598c3c7d533 100644
--- a/src/components/SelectionList/ListItem/MultiSelectListItem.tsx
+++ b/src/components/SelectionList/ListItem/MultiSelectListItem.tsx
@@ -6,7 +6,7 @@ import React from 'react';
 
 import type {ListItem, ListItemProps} from './types';
 
-import BaseSelectListItem from './BaseSelectListItem';
+import SingleSelectListItem from './SingleSelectListItem';
 
 /**
  * A compact row with a checkbox and optional avatar, used in multi-choice picker lists
@@ -21,42 +21,31 @@ function MultiSelectListItem<TItem extends ListItem>({
     onSelectRow,
     onDismissError,
     shouldPreventEnterKeySubmit,
-    isMultilineSupported = false,
-    isAlternateTextMultilineSupported = false,
-    alternateTextNumberOfLines = 2,
     onFocus,
     shouldSyncFocus,
-    wrapperStyle,
-    titleStyles,
-    shouldHighlightSelectedItem,
     titleNumberOfLines,
+    alternateTextNumberOfLines,
 }: ListItemProps<TItem>) {
     const styles = useThemeStyles();
     const icon = item.icons?.at(0);
 
-    const computedWrapperStyle = [icon ? [styles.pv0, styles.mnh13] : styles.optionRowCompact, wrapperStyle];
-
     return (
-        <BaseSelectListItem
+        <SingleSelectListItem
             item={item}
             isFocused={isFocused}
             isFocusVisible={isFocusVisible}
             showTooltip={showTooltip}
             isDisabled={isDisabled}
             canSelectMultiple
-            onSelectRow={onSelectRow}
             accessibilityRole={CONST.ROLE.CHECKBOX}
+            onSelectRow={onSelectRow}
             onDismissError={onDismissError}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
-            isMultilineSupported={isMultilineSupported}
-            isAlternateTextMultilineSupported={isAlternateTextMultilineSupported}
-            alternateTextNumberOfLines={alternateTextNumberOfLines}
             onFocus={onFocus}
             shouldSyncFocus={shouldSyncFocus}
-            wrapperStyle={computedWrapperStyle}
-            titleStyles={titleStyles}
-            shouldHighlightSelectedItem={shouldHighlightSelectedItem}
+            wrapperStyle={icon ? [styles.pv0, styles.mnh13] : styles.optionRowCompact}
             titleNumberOfLines={titleNumberOfLines}
+            alternateTextNumberOfLines={alternateTextNumberOfLines}
         />
     );
 }
diff --git a/src/components/SelectionList/ListItem/SelectableListItem.tsx b/src/components/SelectionList/ListItem/SelectableListItem.tsx
index bd4b5029acb4..168860b0c2d4 100644
--- a/src/components/SelectionList/ListItem/SelectableListItem.tsx
+++ b/src/components/SelectionList/ListItem/SelectableListItem.tsx
@@ -22,26 +22,14 @@ function SelectableListItem<TItem extends ListItem>({
     isDisabled = false,
     children,
     isFocused,
-    isSelected,
     showTooltip,
     wrapperStyle,
-    forwardedFSClass,
-    pressableStyle,
-    pressableWrapperStyle,
     shouldPreventEnterKeySubmit,
     onDismissError,
-    errorRowStyles,
     isFocusVisible,
     shouldSyncFocus,
     onFocus,
-    hoverStyle,
-    onLongPressRow,
-    shouldHighlightSelectedItem,
-    shouldDisableHoverStyle,
-    accessible,
-    accessibilityLabel,
     accessibilityRole,
-    shouldUseOptionRole,
 }: SelectableListItemProps<TItem>) {
     const selectionButton = !item.shouldHideSelectionButton && (
         <ListItemComposed.SelectionButton
@@ -60,31 +48,17 @@ function SelectableListItem<TItem extends ListItem>({
             isDisabled={isDisabled}
             canSelectMultiple={canSelectMultiple}
             isFocused={isFocused}
-            isSelected={isSelected}
-            pressableStyle={pressableStyle}
-            pressableWrapperStyle={pressableWrapperStyle}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
             onDismissError={onDismissError}
-            errorRowStyles={errorRowStyles}
             isFocusVisible={isFocusVisible}
             shouldSyncFocus={shouldSyncFocus}
             onFocus={onFocus}
-            hoverStyle={hoverStyle}
-            onLongPressRow={onLongPressRow}
-            shouldHighlightSelectedItem={shouldHighlightSelectedItem}
-            shouldDisableHoverStyle={shouldDisableHoverStyle}
-            accessible={accessible}
-            accessibilityLabel={accessibilityLabel}
             accessibilityRole={accessibilityRole}
-            shouldUseOptionRole={shouldUseOptionRole}
         >
-            <View
-                style={wrapperStyle}
-                fsClass={forwardedFSClass}
-            >
+            <View style={wrapperStyle}>
                 {selectionButtonPosition === CONST.SELECTION_BUTTON_POSITION.LEFT && selectionButton}
                 {children}
-                {shouldShowRBRIndicator(item, isSelected) && <ListItemComposed.RBRIndicator item={item} />}
+                {shouldShowRBRIndicator(item) && <ListItemComposed.RBRIndicator item={item} />}
                 {selectionButtonPosition === CONST.SELECTION_BUTTON_POSITION.RIGHT && selectionButton}
                 {item.actionElement}
             </View>
diff --git a/src/components/SelectionList/ListItem/SingleSelectListItem.tsx b/src/components/SelectionList/ListItem/SingleSelectListItem.tsx
index 2cd01511b1dc..4d3932a69e9b 100644
--- a/src/components/SelectionList/ListItem/SingleSelectListItem.tsx
+++ b/src/components/SelectionList/ListItem/SingleSelectListItem.tsx
@@ -1,55 +1,103 @@
+import ListItemComposed from '@components/SelectionList/ListItemComposed';
+
+import useStyleUtils from '@hooks/useStyleUtils';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import CONST from '@src/CONST';
+
 import React from 'react';
+import {View} from 'react-native';
 
 import type {ListItem, SingleSelectListItemProps} from './types';
 
-import BaseSelectListItem from './BaseSelectListItem';
+import SelectableListItem from './SelectableListItem';
 
 /**
- * A standard row with an optional (but default) radio button, used in single-choice picker lists
- * (e.g. language, theme, timezone).
- * Use in place of the removed RadioListItem.
+ * A standard text row with a title, optional subtitle and an optional (but default) radio button, used in
+ * single-choice picker lists (e.g. language, theme, timezone). Also the base of MultiSelectListItem.
+ * The text column is preceded by `item.leftElement`, or by a compact avatar of the item's first icon when there is none.
  */
 function SingleSelectListItem<TItem extends ListItem>({
     item,
     isFocused,
+    isFocusVisible,
     showTooltip,
     isDisabled,
+    canSelectMultiple,
+    accessibilityRole,
     onSelectRow,
     onDismissError,
     shouldPreventEnterKeySubmit,
-    isMultilineSupported = false,
-    isAlternateTextMultilineSupported = false,
-    alternateTextNumberOfLines = 2,
     onFocus,
     shouldSyncFocus,
-    wrapperStyle,
-    titleStyles,
-    shouldHighlightSelectedItem,
-    isFocusVisible,
     selectionButtonPosition,
-    titleNumberOfLines,
+    wrapperStyle,
+    titleNumberOfLines = 1,
+    alternateTextNumberOfLines = 1,
 }: SingleSelectListItemProps<TItem>) {
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const icon = item.icons?.at(0);
+    const isTitleMultiline = titleNumberOfLines > 1;
+    const isAlternateTextMultiline = alternateTextNumberOfLines > 1;
+    const fullTitle = isTitleMultiline ? item.text?.trimStart() : item.text;
+    const indentsLength = (item.text?.length ?? 0) - (fullTitle?.length ?? 0);
+    const paddingLeft = Math.floor(indentsLength / CONST.INDENTS.length) * styles.ml3.marginLeft;
+
+    // The primitives default to single-line styles.pre; multiline rows override it with preWrap and the indent padding.
+    const titleStyle = [
+        isTitleMultiline && styles.preWrap,
+        item.alternateText || item.alternateTextComponent ? styles.mb1 : null,
+        isDisabled && styles.colorMuted,
+        isTitleMultiline ? StyleUtils.getPaddingLeft(paddingLeft) : null,
+        item.titleStyles,
+    ];
+    const subtitleStyle = [isAlternateTextMultiline && styles.preWrap, isTitleMultiline ? StyleUtils.getPaddingLeft(paddingLeft) : null];
+
     return (
-        <BaseSelectListItem
+        <SelectableListItem
             item={item}
+            wrapperStyle={[styles.flex1, styles.justifyContentBetween, styles.sidebarLinkInner, styles.userSelectNone, styles.optionRow, wrapperStyle, item.itemStyle]}
             isFocused={isFocused}
-            showTooltip={showTooltip}
+            isFocusVisible={isFocusVisible}
             isDisabled={isDisabled}
+            showTooltip={showTooltip}
             onSelectRow={onSelectRow}
             onDismissError={onDismissError}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
-            isMultilineSupported={isMultilineSupported}
-            isAlternateTextMultilineSupported={isAlternateTextMultilineSupported}
-            alternateTextNumberOfLines={alternateTextNumberOfLines}
+            canSelectMultiple={canSelectMultiple}
             onFocus={onFocus}
             shouldSyncFocus={shouldSyncFocus}
-            wrapperStyle={wrapperStyle}
-            titleStyles={titleStyles}
-            shouldHighlightSelectedItem={shouldHighlightSelectedItem}
-            isFocusVisible={isFocusVisible}
+            accessibilityRole={accessibilityRole}
             selectionButtonPosition={selectionButtonPosition}
-            titleNumberOfLines={titleNumberOfLines}
-        />
+        >
+            <>
+                {item.leftElement ??
+                    (icon ? (
+                        <ListItemComposed.CompactAvatar
+                            icon={icon}
+                            style={styles.mr3}
+                        />
+                    ) : undefined)}
+                <View style={[styles.flex1, styles.alignItemsStart, !!item.rightElement && styles.pr3]}>
+                    <ListItemComposed.Title
+                        text={fullTitle ?? ''}
+                        style={titleStyle}
+                        numberOfLines={titleNumberOfLines}
+                    />
+
+                    {!!item.alternateTextComponent && item.alternateTextComponent}
+                    {!item.alternateTextComponent && !!item.alternateText && (
+                        <ListItemComposed.Subtitle
+                            text={item.alternateText}
+                            style={subtitleStyle}
+                            numberOfLines={alternateTextNumberOfLines}
+                        />
+                    )}
+                </View>
+                {!!item.rightElement && item.rightElement}
+            </>
+        </SelectableListItem>
     );
 }
 
diff --git a/src/components/SelectionList/ListItem/SpendCategorySelectorListItem.tsx b/src/components/SelectionList/ListItem/SpendCategorySelectorListItem.tsx
deleted file mode 100644
index 50a43a7dda1c..000000000000
--- a/src/components/SelectionList/ListItem/SpendCategorySelectorListItem.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
-import ListItemComposed from '@components/SelectionList/ListItemComposed';
-
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import {getDecodedCategoryName} from '@libs/CategoryUtils';
-
-import React from 'react';
-
-import type {ListItem, ListItemProps} from './types';
-
-/**
- * A menu-item row showing a category name under a spend group label. Used in workspace
- * categories settings to map categories to spend groups.
- */
-function SpendCategorySelectorListItem<TItem extends ListItem>({item, onSelectRow, isFocused}: ListItemProps<TItem>) {
-    const styles = useThemeStyles();
-    const {groupID, categoryID: category} = item;
-
-    if (!groupID) {
-        return;
-    }
-
-    return (
-        <ListItemComposed
-            item={item}
-            pressableStyle={styles.mt2}
-            onSelectRow={onSelectRow}
-            isFocused={isFocused}
-            shouldShowTooltip
-        >
-            <MenuItemWithTopDescription
-                shouldShowRightIcon
-                title={getDecodedCategoryName(category ?? '')}
-                description={groupID[0].toUpperCase() + groupID.slice(1)}
-                descriptionTextStyle={styles.textNormal}
-                wrapperStyle={styles.ph5}
-                onPress={() => onSelectRow(item)}
-                focused={isFocused}
-            />
-        </ListItemComposed>
-    );
-}
-
-export default SpendCategorySelectorListItem;
diff --git a/src/components/SelectionList/ListItem/SpendRuleListItem.tsx b/src/components/SelectionList/ListItem/SpendRuleListItem.tsx
index f9bff2e86df2..77a2ad7737fe 100644
--- a/src/components/SelectionList/ListItem/SpendRuleListItem.tsx
+++ b/src/components/SelectionList/ListItem/SpendRuleListItem.tsx
@@ -11,14 +11,12 @@ import CONST from '@src/CONST';
 import React from 'react';
 import {View} from 'react-native';
 
-import type {ListItem, ListItemProps, SpendRuleListItemType} from './types';
+import type {ListItemProps, SpendRuleListItemType} from './types';
 
-function SpendRuleListItem<TItem extends ListItem>({item, onSelectRow}: ListItemProps<TItem>) {
+function SpendRuleListItem<TItem extends SpendRuleListItemType>({item, onSelectRow}: ListItemProps<TItem>) {
     const styles = useThemeStyles();
     const {getMinimumWidth} = useStyleUtils();
 
-    const cardRule = item as unknown as SpendRuleListItemType;
-
     return (
         <ListItemComposed
             item={item}
@@ -31,10 +29,10 @@ function SpendRuleListItem<TItem extends ListItem>({item, onSelectRow}: ListItem
                         numberOfLines={2}
                         style={[styles.textLabelSupporting, styles.fontSizeLabel]}
                     >
-                        {cardRule.summary}
+                        {item.summary}
                     </Text>
 
-                    {cardRule.summaryParts.map((part) => (
+                    {item.summaryParts.map((part) => (
                         <View
                             key={part.text}
                             style={[styles.flexRow, styles.gap2, styles.alignItemsStart, styles.mb2]}
diff --git a/src/components/SelectionList/ListItem/SplitListItem.tsx b/src/components/SelectionList/ListItem/SplitListItem.tsx
index 62ab0ed01845..a6c7cb9806bd 100644
--- a/src/components/SelectionList/ListItem/SplitListItem.tsx
+++ b/src/components/SelectionList/ListItem/SplitListItem.tsx
@@ -22,7 +22,7 @@ import CONST from '@src/CONST';
 import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
 
-import type {ListItem, ListItemProps, SplitListItemType} from './types';
+import type {ListItemProps, SplitListItemType} from './types';
 
 import SplitAmountDisplay from './SplitListItem/SplitAmountDisplay';
 import SplitListItemInput from './SplitListItem/SplitListItemInput';
@@ -31,25 +31,14 @@ import SplitListItemInput from './SplitListItem/SplitListItemInput';
  * A rich row showing merchant, date, category/tags, and an editable amount or percentage input.
  * Used in split expense flows to allocate amounts across participants.
  */
-function SplitListItem<TItem extends ListItem>({
-    item,
-    isFocused,
-    showTooltip,
-    isDisabled,
-    onSelectRow,
-    shouldPreventEnterKeySubmit,
-    onFocus,
-    onInputFocus,
-    onInputBlur,
-}: ListItemProps<TItem>) {
-    const splitItem = item as unknown as SplitListItemType;
+function SplitListItem<TItem extends SplitListItemType>({item, isFocused, showTooltip, isDisabled, onSelectRow, shouldPreventEnterKeySubmit, onFocus}: ListItemProps<TItem>) {
     const icons = useMemoizedLazyExpensifyIcons(['ArrowRight', 'Folder', 'Tag']);
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
 
-    const formattedOriginalAmount = convertToDisplayStringWithoutCurrency(splitItem.originalAmount, splitItem.currency);
+    const formattedOriginalAmount = convertToDisplayStringWithoutCurrency(item.originalAmount, item.currency);
 
     const onSplitExpenseValueChange = useCallback(
         (value: string) => {
@@ -58,47 +47,47 @@ function SplitListItem<TItem extends ListItem>({
             if (Number.isNaN(numericValue)) {
                 return;
             }
-            splitItem.onSplitExpenseValueChange(splitItem.transactionID, numericValue, splitItem.mode);
+            item.onSplitExpenseValueChange(item.transactionID, numericValue, item.mode);
         },
-        [splitItem],
+        [item],
     );
 
     const {inputCallbackRef: autoFocusCallbackRef} = useAutoFocusInput();
 
     // Animated highlight style for selected item
     const animatedHighlightStyle = useRowHighlightAnimation({
-        shouldHighlight: splitItem.isSelected ?? false,
-        isSelected: splitItem.isSelected,
+        shouldHighlight: item.isSelected ?? false,
+        isSelected: item.isSelected,
         skipInitialFade: true,
         itemEnterDelay: 0,
     });
 
-    const isBottomVisible = !!splitItem.category || !!splitItem.tags?.at(0);
+    const isBottomVisible = !!item.category || !!item.tags?.at(0);
 
     const contentWidth = (formattedOriginalAmount.length + 1) * CONST.CHARACTER_WIDTH;
     const [percentageDraft, setPercentageDraft] = useState<string | undefined>();
     const focusHandler = useCallback(() => {
-        onInputFocus?.(item);
-    }, [onInputFocus, item]);
+        item.onInputFocus?.(item);
+    }, [item]);
 
     // Only connect the auto-focus ref to the selected item so useAutoFocusInput's useFocusEffect
     // cleanup can cancel any pending focus task when the screen starts closing, preventing
     // the focused input from interfering with the close animation.
     const inputCallbackRef: (ref: BaseTextInputRef | null) => void = (ref) => {
-        if (!splitItem.isSelected || !splitItem.isEditable) {
+        if (!item.isSelected || !item.isEditable) {
             return;
         }
         (autoFocusCallbackRef as unknown as (ref: BaseTextInputRef | null) => void)(ref);
     };
 
-    const isPercentageMode = splitItem.mode === CONST.TAB.SPLIT.PERCENTAGE;
+    const isPercentageMode = item.mode === CONST.TAB.SPLIT.PERCENTAGE;
 
     // Build accessibility label for the grouped text content (date, merchant, category, tags)
     const textContentAccessibilityLabel = [
-        splitItem.headerText,
-        splitItem.merchant,
-        splitItem.category ? getDecodedFullCategoryName(splitItem.category) : undefined,
-        splitItem.tags?.at(0) ? getCommaSeparatedTagNameWithSanitizedColons(splitItem.tags.at(0) ?? '') : undefined,
+        item.headerText,
+        item.merchant,
+        item.category ? getDecodedFullCategoryName(item.category) : undefined,
+        item.tags?.at(0) ? getCommaSeparatedTagNameWithSanitizedColons(item.tags.at(0) ?? '') : undefined,
     ]
         .filter(Boolean)
         .join(', ');
@@ -115,27 +104,27 @@ function SplitListItem<TItem extends ListItem>({
             onSelectRow={onSelectRow}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
             onFocus={onFocus}
-            accessible={!splitItem.isEditable}
+            accessible={!item.isEditable}
         >
             <View style={[styles.flexRow, styles.containerWithSpaceBetween, styles.p3]}>
                 <View
                     style={styles.flex1}
-                    accessible={splitItem.isEditable}
+                    accessible={item.isEditable}
                     accessibilityLabel={textContentAccessibilityLabel}
-                    aria-label={splitItem.isEditable ? textContentAccessibilityLabel : undefined}
-                    tabIndex={splitItem.isEditable ? 0 : undefined}
-                    role={splitItem.isEditable ? CONST.ROLE.SUMMARY : undefined}
+                    aria-label={item.isEditable ? textContentAccessibilityLabel : undefined}
+                    tabIndex={item.isEditable ? 0 : undefined}
+                    role={item.isEditable ? CONST.ROLE.SUMMARY : undefined}
                 >
                     <View
                         style={[styles.containerWithSpaceBetween, !isBottomVisible && styles.justifyContentCenter]}
-                        aria-hidden={splitItem.isEditable ? true : undefined}
+                        aria-hidden={item.isEditable ? true : undefined}
                     >
                         <View style={[styles.minHeight5, styles.justifyContentCenter]}>
                             <Text
                                 numberOfLines={1}
                                 style={[styles.textMicroSupporting, styles.pre, styles.flexShrink1]}
                             >
-                                {splitItem.headerText}
+                                {item.headerText}
                             </Text>
                         </View>
                         <View style={[styles.minHeight5, styles.justifyContentCenter]}>
@@ -144,12 +133,12 @@ function SplitListItem<TItem extends ListItem>({
                                     style={styles.flexShrink1}
                                     numberOfLines={1}
                                 >
-                                    {splitItem.merchant}
+                                    {item.merchant}
                                 </Text>
                                 {isPercentageMode && (
                                     <SplitAmountDisplay
                                         shouldRemoveSpacing
-                                        splitItem={splitItem}
+                                        splitItem={item}
                                     />
                                 )}
                             </View>
@@ -158,10 +147,10 @@ function SplitListItem<TItem extends ListItem>({
                     {isBottomVisible && (
                         <View
                             style={styles.splitItemBottomContent}
-                            aria-hidden={splitItem.isEditable ? true : undefined}
+                            aria-hidden={item.isEditable ? true : undefined}
                         >
-                            {!!splitItem.category && (
-                                <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.pr1, styles.flexShrink1, !!splitItem.tags?.at(0) && styles.mw50]}>
+                            {!!item.category && (
+                                <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.pr1, styles.flexShrink1, !!item.tags?.at(0) && styles.mw50]}>
                                     <Icon
                                         src={icons.Folder}
                                         height={variables.iconSizeExtraSmall}
@@ -172,12 +161,12 @@ function SplitListItem<TItem extends ListItem>({
                                         numberOfLines={1}
                                         style={[styles.textMicroSupporting, styles.pre, styles.flexShrink1]}
                                     >
-                                        {getDecodedFullCategoryName(splitItem.category)}
+                                        {getDecodedFullCategoryName(item.category)}
                                     </Text>
                                 </View>
                             )}
-                            {!!splitItem.tags?.at(0) && (
-                                <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.pl1, !!splitItem.category && styles.mw50]}>
+                            {!!item.tags?.at(0) && (
+                                <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.pl1, !!item.category && styles.mw50]}>
                                     <Icon
                                         src={icons.Tag}
                                         height={variables.iconSizeExtraSmall}
@@ -188,7 +177,7 @@ function SplitListItem<TItem extends ListItem>({
                                         numberOfLines={1}
                                         style={[styles.textMicroSupporting, styles.pre, styles.flexShrink1]}
                                     >
-                                        {getCommaSeparatedTagNameWithSanitizedColons(splitItem.tags?.at(0) ?? '')}
+                                        {getCommaSeparatedTagNameWithSanitizedColons(item.tags?.at(0) ?? '')}
                                     </Text>
                                 </View>
                             )}
@@ -199,19 +188,18 @@ function SplitListItem<TItem extends ListItem>({
                     <View style={styles.justifyContentCenter}>
                         <SplitListItemInput
                             isPercentageMode={isPercentageMode}
-                            splitItem={splitItem}
+                            splitItem={item}
                             contentWidth={contentWidth}
                             formattedOriginalAmount={formattedOriginalAmount}
                             percentageDraft={percentageDraft}
                             onSplitExpenseValueChange={onSplitExpenseValueChange}
                             setPercentageDraft={setPercentageDraft}
                             focusHandler={focusHandler}
-                            onInputBlur={onInputBlur}
                             inputCallbackRef={inputCallbackRef}
                         />
                     </View>
                     <View style={styles.popoverMenuIcon}>
-                        {!splitItem.isEditable ? null : (
+                        {!item.isEditable ? null : (
                             <PressableWithFeedback
                                 onPress={() => onSelectRow(item)}
                                 accessibilityLabel={translate('common.edit')}
diff --git a/src/components/SelectionList/ListItem/SplitListItem/SplitAmountInput.tsx b/src/components/SelectionList/ListItem/SplitListItem/SplitAmountInput.tsx
index 54f028ffd0ad..cb94d2b9ba4f 100644
--- a/src/components/SelectionList/ListItem/SplitListItem/SplitAmountInput.tsx
+++ b/src/components/SelectionList/ListItem/SplitListItem/SplitAmountInput.tsx
@@ -9,8 +9,6 @@ import {convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
 
 import CONST from '@src/CONST';
 
-import type {BlurEvent} from 'react-native';
-
 import React from 'react';
 
 import SplitAmountDisplay from './SplitAmountDisplay';
@@ -25,13 +23,11 @@ type SplitAmountInputProps = {
     onSplitExpenseValueChange: (value: string) => void;
     /** Callback invoked when the input receives focus. */
     focusHandler: () => void;
-    /** Callback invoked when the input loses focus. */
-    onInputBlur: ((e: BlurEvent) => void) | undefined;
     /** Callback ref for accessing the underlying text input. */
     inputCallbackRef: (ref: BaseTextInputRef | null) => void;
 };
 
-function SplitAmountInput({splitItem, formattedOriginalAmount, contentWidth, onSplitExpenseValueChange, focusHandler, onInputBlur, inputCallbackRef}: SplitAmountInputProps) {
+function SplitAmountInput({splitItem, formattedOriginalAmount, contentWidth, onSplitExpenseValueChange, focusHandler, inputCallbackRef}: SplitAmountInputProps) {
     const styles = useThemeStyles();
     const {getCurrencyDecimals} = useCurrencyListActions();
 
@@ -68,7 +64,6 @@ function SplitAmountInput({splitItem, formattedOriginalAmount, contentWidth, onS
                 shouldUseDefaultLineHeightForPrefix={false}
                 shouldWrapInputInContainer={false}
                 onFocus={focusHandler}
-                onBlur={onInputBlur}
                 keyboardType={CONST.KEYBOARD_TYPE.NUMBERS_AND_PUNCTUATION}
                 allowNegativeInput
             />
diff --git a/src/components/SelectionList/ListItem/SplitListItem/SplitListItemInput.tsx b/src/components/SelectionList/ListItem/SplitListItem/SplitListItemInput.tsx
index 1de0c0d8aee8..9441b9ba96f0 100644
--- a/src/components/SelectionList/ListItem/SplitListItem/SplitListItemInput.tsx
+++ b/src/components/SelectionList/ListItem/SplitListItem/SplitListItemInput.tsx
@@ -1,8 +1,6 @@
 import type {SplitListItemType} from '@components/SelectionList/ListItem/types';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
-import type {BlurEvent} from 'react-native';
-
 import React from 'react';
 
 import SplitAmountInput from './SplitAmountInput';
@@ -24,8 +22,6 @@ type SplitListItemInputProps = {
     setPercentageDraft: React.Dispatch<React.SetStateAction<string | undefined>>;
     /** Callback invoked when the input receives focus. */
     focusHandler: () => void;
-    /** Callback invoked when the input loses focus. */
-    onInputBlur: ((e: BlurEvent) => void) | undefined;
     /** Callback ref for accessing the underlying text input. */
     inputCallbackRef: (ref: BaseTextInputRef | null) => void;
 };
@@ -39,7 +35,6 @@ function SplitListItemInput({
     onSplitExpenseValueChange,
     setPercentageDraft,
     focusHandler,
-    onInputBlur,
     inputCallbackRef,
 }: SplitListItemInputProps) {
     if (isPercentageMode) {
@@ -51,7 +46,6 @@ function SplitListItemInput({
                 onSplitExpenseValueChange={onSplitExpenseValueChange}
                 setPercentageDraft={setPercentageDraft}
                 focusHandler={focusHandler}
-                onInputBlur={onInputBlur}
             />
         );
     }
@@ -62,7 +56,6 @@ function SplitListItemInput({
             formattedOriginalAmount={formattedOriginalAmount}
             onSplitExpenseValueChange={onSplitExpenseValueChange}
             focusHandler={focusHandler}
-            onInputBlur={onInputBlur}
             inputCallbackRef={inputCallbackRef}
         />
     );
diff --git a/src/components/SelectionList/ListItem/SplitListItem/SplitPercentageInput.tsx b/src/components/SelectionList/ListItem/SplitListItem/SplitPercentageInput.tsx
index b03d61f67ea7..59eec9779c27 100644
--- a/src/components/SelectionList/ListItem/SplitListItem/SplitPercentageInput.tsx
+++ b/src/components/SelectionList/ListItem/SplitListItem/SplitPercentageInput.tsx
@@ -6,8 +6,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import CONST from '@src/CONST';
 
-import type {BlurEvent} from 'react-native';
-
 import React from 'react';
 
 import SplitPercentageDisplay from './SplitPercentageDisplay';
@@ -24,11 +22,9 @@ type SplitPercentageInputProps = {
     setPercentageDraft: React.Dispatch<React.SetStateAction<string | undefined>>;
     /** Callback invoked when the input receives focus. */
     focusHandler: () => void;
-    /** Callback invoked when the input loses focus. */
-    onInputBlur: ((e: BlurEvent) => void) | undefined;
 };
 
-function SplitPercentageInput({splitItem, contentWidth, percentageDraft, onSplitExpenseValueChange, setPercentageDraft, focusHandler, onInputBlur}: SplitPercentageInputProps) {
+function SplitPercentageInput({splitItem, contentWidth, percentageDraft, onSplitExpenseValueChange, setPercentageDraft, focusHandler}: SplitPercentageInputProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
 
@@ -46,12 +42,7 @@ function SplitPercentageInput({splitItem, contentWidth, percentageDraft, onSplit
                 containerStyles={[styles.optionRowPercentInputContainer, styles.ml3]}
                 inputStyle={[styles.optionRowPercentInput, styles.lineHeightUndefined]}
                 onFocus={focusHandler}
-                onBlur={(event) => {
-                    setPercentageDraft(undefined);
-                    if (onInputBlur) {
-                        onInputBlur(event);
-                    }
-                }}
+                onBlur={() => setPercentageDraft(undefined)}
                 allowExceedingHundred
                 allowDecimal
                 allowNegative
diff --git a/src/components/SelectionList/ListItem/TravelDomainListItem.tsx b/src/components/SelectionList/ListItem/TravelDomainListItem.tsx
deleted file mode 100644
index 0c318fbb5ae6..000000000000
--- a/src/components/SelectionList/ListItem/TravelDomainListItem.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import Badge from '@components/Badge';
-import ListItemComposed from '@components/SelectionList/ListItemComposed';
-
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import CONST from '@src/CONST';
-
-import React from 'react';
-
-import type {ListItem, SelectableListItemProps} from './types';
-
-import SelectableListItem from './SelectableListItem';
-
-type TravelDomainListItemProps<TItem extends ListItem> = SelectableListItemProps<
-    TItem & {
-        /** Value of the domain */
-        value?: string;
-
-        /** Should display tag 'Recommended' */
-        isRecommended?: boolean;
-    }
->;
-
-/**
- * A text row with a left-side checkbox and an optional "Recommended" badge. Used in the
- * travel domain selector for choosing booking domains.
- */
-function TravelDomainListItem<TItem extends ListItem>({
-    item,
-    isFocused,
-    isFocusVisible,
-    showTooltip,
-    isDisabled,
-    canSelectMultiple,
-    onSelectRow,
-    onSelectionButtonPress,
-    onFocus,
-    shouldSyncFocus,
-    selectionButtonPosition = CONST.SELECTION_BUTTON_POSITION.LEFT,
-}: TravelDomainListItemProps<TItem>) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const showRecommendedTag = item.isRecommended ?? false;
-    // The bold heading style is the primitive's default; non-bold items reset the weight and color.
-    const titleStyle = [styles.flex1, item.isBold === false && [styles.fontWeightNormal, styles.textSupporting]];
-
-    return (
-        <SelectableListItem
-            item={item}
-            wrapperStyle={[styles.flex1, styles.sidebarLinkInner, styles.userSelectNone, styles.optionRow]}
-            isFocused={isFocused}
-            isFocusVisible={isFocusVisible}
-            isDisabled={isDisabled}
-            showTooltip={showTooltip}
-            canSelectMultiple={canSelectMultiple}
-            onSelectRow={onSelectRow}
-            onSelectionButtonPress={onSelectionButtonPress}
-            onFocus={onFocus}
-            shouldSyncFocus={shouldSyncFocus}
-            selectionButtonPosition={selectionButtonPosition}
-        >
-            <>
-                <ListItemComposed.Title
-                    text={item.text ?? ''}
-                    style={titleStyle}
-                />
-                {showRecommendedTag && <Badge text={translate('travel.domainSelector.recommended')} />}
-            </>
-        </SelectableListItem>
-    );
-}
-
-export default TravelDomainListItem;
diff --git a/src/components/SelectionList/ListItem/UserListItem.tsx b/src/components/SelectionList/ListItem/UserListItem.tsx
index fdf8c45d2a20..ebda5b74028d 100644
--- a/src/components/SelectionList/ListItem/UserListItem.tsx
+++ b/src/components/SelectionList/ListItem/UserListItem.tsx
@@ -5,7 +5,7 @@ import CONST from '@src/CONST';
 
 import React from 'react';
 
-import type {ListItem, UserListItemProps} from './types';
+import type {ListItem, ListItemProps} from './types';
 
 import UserListItemContent from './UserListItemContent';
 
@@ -26,13 +26,9 @@ function UserListItem<TItem extends ListItem>({
     shouldPreventEnterKeySubmit,
     onFocus,
     shouldSyncFocus,
-    wrapperStyle,
-    pressableStyle,
-    forwardedFSClass,
     shouldDisableHoverStyle,
-    shouldHighlightSelectedItem,
     selectionButtonPosition = CONST.SELECTION_BUTTON_POSITION.RIGHT,
-}: UserListItemProps<TItem>) {
+}: ListItemProps<TItem>) {
     // Disable accessible grouping when a right-side button is visible, so VoiceOver can focus it independently.
     const shouldDisableAccessibleGrouping = !!item.actionElement && !canSelectMultiple;
 
@@ -56,19 +52,14 @@ function UserListItem<TItem extends ListItem>({
             onSelectRow={onSelectRow}
             onDismissError={onDismissError}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
-            pressableStyle={pressableStyle}
             onFocus={onFocus}
             shouldSyncFocus={shouldSyncFocus}
             accessible={shouldDisableAccessibleGrouping ? false : undefined}
             shouldDisableHoverStyle={shouldDisableHoverStyle}
-            shouldHighlightSelectedItem={shouldHighlightSelectedItem}
         >
-            <ListItemComposed.Row style={wrapperStyle}>
+            <ListItemComposed.Row style={item.itemStyle}>
                 {selectionButtonPosition === CONST.SELECTION_BUTTON_POSITION.LEFT && selectionButton}
-                <UserListItemContent
-                    item={item}
-                    forwardedFSClass={forwardedFSClass}
-                />
+                <UserListItemContent item={item} />
                 {shouldShowRBRIndicator(item) && <ListItemComposed.RBRIndicator item={item} />}
                 {selectionButtonPosition === CONST.SELECTION_BUTTON_POSITION.RIGHT && selectionButton}
                 {item.actionElement}
diff --git a/src/components/SelectionList/ListItem/UserSelectionListItem.tsx b/src/components/SelectionList/ListItem/UserSelectionListItem.tsx
index 99153a4d77b0..71c651b205c0 100644
--- a/src/components/SelectionList/ListItem/UserSelectionListItem.tsx
+++ b/src/components/SelectionList/ListItem/UserSelectionListItem.tsx
@@ -33,8 +33,6 @@ function UserSelectionListItem<TItem extends ListItem>({
     shouldPreventEnterKeySubmit,
     onFocus,
     shouldSyncFocus,
-    wrapperStyle,
-    pressableStyle,
 }: ListItemProps<TItem>) {
     const styles = useThemeStyles();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
@@ -56,7 +54,7 @@ function UserSelectionListItem<TItem extends ListItem>({
     return (
         <SelectableListItem
             item={item}
-            wrapperStyle={[styles.flex1, styles.sidebarLinkInner, styles.userSelectNone, wrapperStyle]}
+            wrapperStyle={[styles.flex1, styles.sidebarLinkInner, styles.userSelectNone, item.itemStyle]}
             isFocused={isFocused}
             isFocusVisible={isFocusVisible}
             isDisabled={isDisabled}
@@ -66,7 +64,6 @@ function UserSelectionListItem<TItem extends ListItem>({
             onSelectionButtonPress={onSelectionButtonPress}
             onDismissError={onDismissError}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
-            pressableStyle={pressableStyle}
             onFocus={onFocus}
             shouldSyncFocus={shouldSyncFocus}
         >
diff --git a/src/components/SelectionList/ListItem/types.ts b/src/components/SelectionList/ListItem/types.ts
index 31b064d9276e..7fa31da33c90 100644
--- a/src/components/SelectionList/ListItem/types.ts
+++ b/src/components/SelectionList/ListItem/types.ts
@@ -1,4 +1,3 @@
-import type {HoldMenuCallback} from '@components/Search';
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 
 import type {TransactionPreviewData} from '@libs/actions/Search';
@@ -7,15 +6,12 @@ import type {ModifiedMouseEvent} from '@libs/Navigation/helpers/openInternalRout
 import type {SpendRuleSummaryPart} from '@libs/SpendRulesUtils';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 
-// eslint-disable-next-line no-restricted-imports
-import type CursorStyles from '@styles/utils/cursor/types';
-
 import type CONST from '@src/CONST';
 import type {SplitExpense} from '@src/types/onyx/IOU';
 import type {Errors, Icon, PendingAction} from '@src/types/onyx/OnyxCommon';
 
-import type {PropsWithChildren, ReactNode} from 'react';
-import type {BlurEvent, NativeSyntheticEvent, Role, StyleProp, TargetedEvent, TextStyle, ViewStyle} from 'react-native';
+import type {ComponentType, PropsWithChildren, ReactNode} from 'react';
+import type {NativeSyntheticEvent, Role, StyleProp, TargetedEvent, TextStyle, ViewStyle} from 'react-native';
 import type {AnimatedStyle} from 'react-native-reanimated';
 import type {ValueOf} from 'type-fest';
 
@@ -26,9 +22,6 @@ type ListItem<K extends string | number = string> = {
     /** Custom node rendered in place of the alternate text (e.g. a description containing an inline link). Takes precedence over `alternateText` when set. */
     alternateTextComponent?: ReactNode;
 
-    /** Whether to force hide the alternate text even if it exists */
-    shouldHideAlternateText?: boolean;
-
     /** Accessibility label for screen readers */
     accessibilityLabel?: string;
 
@@ -75,29 +68,11 @@ type ListItem<K extends string | number = string> = {
 
     invitedSecondaryLogin?: string;
 
-    /** Represents the index of the section it came from  */
-    sectionIndex?: number;
-
-    /** Represents the index of the option within the section it came from */
-    index?: number;
-
     reportID?: string;
     policyID?: string;
-    groupID?: string;
-    categoryID?: string;
-    shouldShowSubscript?: boolean | null;
-
-    /** Whether to wrap long text up to 2 lines */
-    isMultilineSupported?: boolean;
-
-    /** Whether to wrap the alternate text up to 2 lines */
-    isAlternateTextMultilineSupported?: boolean;
 
     searchText?: string | null;
 
-    /** What text to show inside the badge (if none present the badge will be omitted) */
-    badgeText?: string;
-
     brickRoadIndicator?: BrickRoad | '' | null;
 
     /** Element to render below the ListItem */
@@ -106,15 +81,13 @@ type ListItem<K extends string | number = string> = {
     /** Whether item pressable wrapper should be focusable */
     tabIndex?: 0 | -1;
 
-    /** The style to override the cursor appearance */
-    cursorStyle?: CursorStyles[keyof CursorStyles];
-
     /** Determines whether the newly added item should animate in / highlight */
     shouldAnimateInHighlight?: boolean;
 
-    /** The style to override the default appearance */
+    /** Style merged onto the row content wrapper after the variant's own row styles */
     itemStyle?: StyleProp<ViewStyle>;
 
+    /** Style merged onto the title after the variant's own title styles */
     titleStyles?: StyleProp<TextStyle>;
 
     /** Boolean whether to display the right icon */
@@ -127,10 +100,31 @@ type ListItem<K extends string | number = string> = {
     lang?: string;
 };
 
-type CommonListItemProps<TItem extends ListItem> = {
+type ListItemFocusEventHandler = (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void;
+
+type ExtendedTargetedEvent = TargetedEvent & {
+    /** Provides information about the input device responsible for the event, or null if triggered programmatically, available in some browsers */
+    sourceCapabilities?: {
+        /** A boolean value that indicates whether the device dispatches touch events. */
+        firesTouchEvents: boolean;
+    };
+};
+
+/** Props every SelectionList row receives from the list (via ListItemRenderer) or from a direct render outside a list. */
+type ListItemProps<TItem extends ListItem> = {
+    /** The list item data */
+    item: TItem;
+
     /** Whether this item is focused (for arrow key controls) */
     isFocused?: boolean;
 
+    /**
+     * Whether the focus indicator should be visually shown.
+     * Pass explicitly to decouple the visual highlight from logical focus,
+     * e.g. to suppress the initial highlight until the user starts keyboard navigation.
+     */
+    isFocusVisible?: boolean;
+
     isDisabled?: boolean | null;
     showTooltip: boolean;
 
@@ -138,121 +132,130 @@ type CommonListItemProps<TItem extends ListItem> = {
     canSelectMultiple?: boolean;
 
     onSelectRow: (item: TItem, transactionPreviewData?: TransactionPreviewData, event?: ModifiedMouseEvent) => void;
+    onSelectionButtonPress?: (item: TItem, itemTransactions?: TransactionListItemType[], shiftKey?: boolean) => void;
     onDismissError?: (item: TItem) => void;
-    pressableStyle?: StyleProp<ViewStyle>;
-    pressableWrapperStyle?: StyleProp<AnimatedStyle<ViewStyle>>;
-    wrapperStyle?: StyleProp<ViewStyle>;
+    onFocus?: ListItemFocusEventHandler;
 
-    /** Style of the offline-feedback content container that wraps the pressable and its error row */
-    containerStyle?: StyleProp<ViewStyle>;
-    errorRowStyles?: StyleProp<ViewStyle>;
+    /**
+     * Whether the focus on the element should be synchronized. For example it should be set to false when the text input above list items is currently focused.
+     * When we type something into the text input, the first element found is focused, in this situation we should not synchronize the focus on the element because we will lose the focus from the text input.
+     */
+    shouldSyncFocus?: boolean;
 
-    /** Whether to wrap long text up to 2 lines */
-    isMultilineSupported?: boolean;
+    /** Prevent the submission of the list item when enter key is pressed */
+    shouldPreventEnterKeySubmit?: boolean;
+
+    /** Which side of the row to render the selection button on */
+    selectionButtonPosition?: ValueOf<typeof CONST.SELECTION_BUTTON_POSITION>;
 
-    /** Whether to wrap the alternate text up to 2 lines */
-    isAlternateTextMultilineSupported?: boolean;
+    /** Maximum number of title lines. Values above 1 also enable wrapping and leading-indent handling. Defaults to 1 */
+    titleNumberOfLines?: number;
 
+    /** Maximum number of alternate text lines. Values above 1 enable wrapping. Defaults to 1 */
     alternateTextNumberOfLines?: number;
 
-    /** Number of lines to show for title text when multiline is supported */
-    titleNumberOfLines?: number;
+    shouldDisableHoverStyle?: boolean;
 
+    /** Whether this is the last item in the list (for border radius on desktop) */
+    isLastItem?: boolean;
+
+    /** Whether this is the first item in the list (for border styling on desktop) */
+    isFirstItem?: boolean;
+};
+
+/** Any component that renders one SelectionList row for items of type TItem */
+type ListItemComponent<TItem extends ListItem> = ComponentType<ListItemProps<TItem>>;
+
+/** Props of the ListItem pressable root. Row content comes as children and reads hover/focus/tooltip state from ListItemContext */
+type ListItemPressableProps<TItem extends ListItem> = PropsWithChildren<{
+    item: TItem;
+    onSelectRow: (item: TItem, transactionPreviewData?: TransactionPreviewData, event?: ModifiedMouseEvent) => void;
+    onDismissError?: (item: TItem) => void;
+    onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
     onFocus?: ListItemFocusEventHandler;
+    isDisabled?: boolean | null;
+    isFocused?: boolean;
+
+    /** Whether the focus indicator should be visually shown. Defaults to `isFocused` */
+    isFocusVisible?: boolean;
+
+    /** Overrides the row's selected state (aria-selected, highlight). Defaults to `item.isSelected`; pass it when selection isn't stored on the item itself. */
+    isSelected?: boolean;
+
+    /** Whether to use the Checkbox (multiple selection) instead of the Checkmark (single selection) */
+    canSelectMultiple?: boolean;
+
+    /** Whether content inside the row should show tooltips */
+    shouldShowTooltip: boolean;
+    shouldPreventEnterKeySubmit?: boolean;
+    shouldSyncFocus?: boolean;
+    shouldHighlightSelectedItem?: boolean;
+    shouldDisableHoverStyle?: boolean;
+    pressableStyle?: StyleProp<ViewStyle>;
+    pressableWrapperStyle?: StyleProp<AnimatedStyle<ViewStyle>>;
+
+    /** Style of the offline-feedback content container that wraps the pressable and its error row */
+    containerStyle?: StyleProp<ViewStyle>;
+    hoverStyle?: StyleProp<ViewStyle>;
 
     /**
-     * Whether the focus indicator should be visually shown.
-     * Pass explicitly to decouple the visual highlight from logical focus,
-     * e.g. to suppress the initial highlight until the user starts keyboard navigation.
+     * Whether the pressable should be accessible as a single element.
+     * When false, allows child elements (like TextInput) to be independently focusable by screen readers.
      */
-    isFocusVisible?: boolean;
+    accessible?: boolean;
 
-    onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
+    /** Overrides the row's screen-reader name. Defaults to the item's derived label when omitted. */
+    accessibilityLabel?: string;
 
     /** Accessibility role for the list item (e.g. 'checkbox' for multi-select options so screen readers announce checked state) */
     accessibilityRole?: Role;
 
     /** When `false`, a single-select row stays a `button` instead of becoming a listbox `option`. */
     shouldUseOptionRole?: boolean;
+}>;
 
-    /** Overrides the row's selected state (aria-selected, highlight). Defaults to `item.isSelected`; pass it when selection isn't stored on the item itself. */
-    isSelected?: boolean;
-};
-
-type ListItemFocusEventHandler = (event: NativeSyntheticEvent<ExtendedTargetedEvent>) => void;
-
-type ExtendedTargetedEvent = TargetedEvent & {
-    /** Provides information about the input device responsible for the event, or null if triggered programmatically, available in some browsers */
-    sourceCapabilities?: {
-        /** A boolean value that indicates whether the device dispatches touch events. */
-        firesTouchEvents: boolean;
-    };
-};
-
-type ListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
-    /** The section list item */
+/** Props for SelectableListItem, which extends the composed ListItem pressable with selection button support. */
+type SelectableListItemProps<TItem extends ListItem> = PropsWithChildren<{
     item: TItem;
+    onSelectRow: (item: TItem, transactionPreviewData?: TransactionPreviewData, event?: ModifiedMouseEvent) => void;
 
-    onSelectionButtonPress?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
-
-    /** Which side of the row to render the selection button on */
-    selectionButtonPosition?: ValueOf<typeof CONST.SELECTION_BUTTON_POSITION>;
-
-    style?: StyleProp<TextStyle>;
-    isHovered?: boolean;
+    /** Callback to fire when the selection button is pressed */
+    onSelectionButtonPress?: (item: TItem, itemTransactions?: TransactionListItemType[], shiftKey?: boolean) => void;
+    onDismissError?: (item: TItem) => void;
+    onFocus?: ListItemFocusEventHandler;
+    isDisabled?: boolean | null;
+    isFocused?: boolean;
+    isFocusVisible?: boolean;
+    canSelectMultiple?: boolean;
 
-    /** Prevent the submission of the list item when enter key is pressed */
+    /** Whether text in the row should show tooltips on overflow (forwarded to the pressable as shouldShowTooltip) */
+    showTooltip: boolean;
     shouldPreventEnterKeySubmit?: boolean;
-
-    /**
-     * Whether the focus on the element should be synchronized. For example it should be set to false when the text input above list items is currently focused.
-     * When we type something into the text input, the first element found is focused, in this situation we should not synchronize the focus on the element because we will lose the focus from the text input.
-     */
     shouldSyncFocus?: boolean;
 
-    titleStyles?: StyleProp<TextStyle>;
-    titleContainerStyles?: StyleProp<ViewStyle>;
-    shouldHighlightSelectedItem?: boolean;
-    index?: number;
-    onInputFocus?: (item: TItem) => void;
-    onInputBlur?: (e: BlurEvent) => void;
-    onHoldMenuOpen?: HoldMenuCallback;
-    shouldDisableHoverStyle?: boolean;
+    /** Style of the row View that lays out the selection button, children, and the item's action element */
+    wrapperStyle?: StyleProp<ViewStyle>;
+    selectionButtonPosition?: ValueOf<typeof CONST.SELECTION_BUTTON_POSITION>;
 
-    /** Whether the network is offline */
-    isOffline?: boolean;
+    /** Accessibility role for the list item (e.g. 'checkbox' for multi-select options so screen readers announce checked state) */
+    accessibilityRole?: Role;
+}>;
 
-    /** Whether this is the last item in the list (for border radius on desktop) */
-    isLastItem?: boolean;
+type SingleSelectListItemProps<TItem extends ListItem> = ListItemProps<TItem> & {
+    /** Accessibility role for the list item (e.g. 'checkbox' for multi-select options so screen readers announce checked state) */
+    accessibilityRole?: Role;
 
-    /** Whether this is the first item in the list (for border styling on desktop) */
-    isFirstItem?: boolean;
+    /** Style of the row content wrapper, merged after the variant's own row styles and before `item.itemStyle` */
+    wrapperStyle?: StyleProp<ViewStyle>;
 };
 
-/** Props of the ListItem pressable root. Row content comes as children and reads hover/focus/tooltip state from ListItemContext */
-type ListItemPressableProps<TItem extends ListItem> = PropsWithChildren<
-    Omit<CommonListItemProps<TItem>, 'showTooltip' | 'wrapperStyle' | 'isMultilineSupported' | 'isAlternateTextMultilineSupported' | 'alternateTextNumberOfLines' | 'titleNumberOfLines'> & {
-        item: TItem;
-
-        /** Whether content inside the row should show tooltips */
-        shouldShowTooltip: boolean;
-
-        /** Overrides the row's screen-reader name. Defaults to the item's derived label when omitted. */
-        accessibilityLabel?: string;
-        shouldPreventEnterKeySubmit?: boolean;
-        errorRowStyles?: StyleProp<ViewStyle>;
-        shouldSyncFocus?: boolean;
-        hoverStyle?: StyleProp<ViewStyle>;
+type BareUserListItemProps<TItem extends ListItem> = ListItemProps<TItem> &
+    ForwardedFSClassProps & {
+        /** Style of the row content wrapper, merged before `item.itemStyle` */
+        wrapperStyle?: StyleProp<ViewStyle>;
+        pressableStyle?: StyleProp<ViewStyle>;
         shouldHighlightSelectedItem?: boolean;
-        shouldDisableHoverStyle?: boolean;
-
-        /**
-         * Whether the pressable should be accessible as a single element.
-         * When false, allows child elements (like TextInput) to be independently focusable by screen readers.
-         */
-        accessible?: boolean;
-    }
->;
+    };
 
 type SpendRuleListItemType = ListItem & {
     /** The action for this rule */
@@ -267,21 +270,6 @@ type SpendRuleListItemType = ListItem & {
     searchTokens: string[];
 };
 
-/** Props for SelectableListItem, which extends the composed ListItem pressable with selection button support. */
-type SelectableListItemProps<TItem extends ListItem> = Omit<ListItemPressableProps<TItem>, 'containerStyle' | 'shouldShowTooltip'> &
-    ForwardedFSClassProps & {
-        /** Whether text in the row should show tooltips on overflow (forwarded to the pressable as shouldShowTooltip) */
-        showTooltip: boolean;
-
-        /** Style of the row View that lays out the selection button, children, and the item's action element */
-        wrapperStyle?: StyleProp<ViewStyle>;
-
-        /** Callback to fire when the selection button is pressed */
-        onSelectionButtonPress?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
-
-        selectionButtonPosition?: ValueOf<typeof CONST.SELECTION_BUTTON_POSITION>;
-    };
-
 type SplitListItemType = ListItem &
     SplitExpense & {
         headerText: string;
@@ -314,15 +302,10 @@ type SplitListItemType = ListItem &
          */
         onSplitExpenseValueChange: (transactionID: string, value: number, mode: ValueOf<typeof CONST.TAB.SPLIT>) => void;
 
+        /** Called when the row's amount/percentage input gains focus, so the list can scroll it into view */
         onInputFocus?: (item: SplitListItemType) => void;
     };
 
-type SingleSelectListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
-
-type UserListItemProps<TItem extends ListItem> = ListItemProps<TItem> & ForwardedFSClassProps;
-
-type InviteMemberListItemProps<TItem extends ListItem> = UserListItemProps<TItem>;
-
 type WorkspaceListItemType = {
     text: string;
     policyID?: string;
@@ -336,12 +319,12 @@ export type {
     ListItemPressableProps,
     ExtendedTargetedEvent,
     ListItem,
+    ListItemComponent,
     ListItemProps,
     ListItemFocusEventHandler,
     SelectableListItemProps,
     SingleSelectListItemProps,
-    UserListItemProps,
-    InviteMemberListItemProps,
+    BareUserListItemProps,
     SplitListItemType,
     WorkspaceListItemType,
 };
diff --git a/src/components/SelectionList/ListItemComposed/ListItemPressable.tsx b/src/components/SelectionList/ListItemComposed/ListItemPressable.tsx
index 565cf4cd1199..56b079b0104a 100644
--- a/src/components/SelectionList/ListItemComposed/ListItemPressable.tsx
+++ b/src/components/SelectionList/ListItemComposed/ListItemPressable.tsx
@@ -36,7 +36,6 @@ function ListItemPressable<TItem extends ListItem>({
     canSelectMultiple = false,
     onSelectRow,
     onDismissError = () => {},
-    errorRowStyles,
     children,
     isFocused,
     isFocusVisible = isFocused,
@@ -113,7 +112,7 @@ function ListItemPressable<TItem extends ListItem>({
             onClose={() => onDismissError(item)}
             pendingAction={item.pendingAction}
             errors={item.errors}
-            errorRowStyles={[styles.mh5, errorRowStyles]}
+            errorRowStyles={styles.mh5}
             contentContainerStyle={containerStyle}
         >
             <PressableWithFeedback
diff --git a/src/components/SelectionList/ListItemComposed/hooks/useListItemHighlight.ts b/src/components/SelectionList/ListItemComposed/hooks/useListItemHighlight.ts
deleted file mode 100644
index c8b293ee938a..000000000000
--- a/src/components/SelectionList/ListItemComposed/hooks/useListItemHighlight.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import useRowHighlightAnimation from '@hooks/useRowHighlightAnimation';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-type UseListItemHighlightParams = {
-    /** Whether the row should play the highlight animation */
-    shouldHighlight?: boolean;
-
-    /** Whether the row is currently selected */
-    isSelected?: boolean;
-};
-
-/**
- * Highlight animation plus the pressable styles that let it show through.
- * `isSelected` is not forwarded to the animation: selection is painted on the pressable, not the animated wrapper.
- */
-function useListItemHighlight({shouldHighlight = false, isSelected = false}: UseListItemHighlightParams = {}) {
-    const styles = useThemeStyles();
-
-    const animatedHighlightStyle = useRowHighlightAnimation({shouldHighlight, borderRadius: styles.selectionListPressableItemWrapper.borderRadius});
-
-    return {
-        animatedHighlightStyle,
-        pressableStyle: [styles.selectionListPressableItemWrapper, styles.mh0, styles.bgTransparent, isSelected && styles.activeComponentBG],
-        pressableWrapperStyle: [styles.mh5, animatedHighlightStyle],
-    };
-}
-
-export default useListItemHighlight;
diff --git a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
index 910bbb8e35a4..5d360090ab17 100644
--- a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
+++ b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx
@@ -87,9 +87,7 @@ function BaseSelectionListWithSectionsImpl({
     shouldSingleExecuteRowSelect = false,
     shouldPreventDefaultFocusOnSelectRow = false,
     shouldPreventAutoScrollOnSelect = false,
-    isRowMultilineSupported = false,
     titleNumberOfLines,
-    shouldHighlightSelectedItem,
     shouldDisableHoverStyle,
     selectionButtonPosition,
     shouldFooterBeInsideList = false,
@@ -319,11 +317,7 @@ function BaseSelectionListWithSectionsImpl({
                         singleExecution={singleExecution}
                         shouldSyncFocus={!isTextInputFocusedRef.current && isKeyboardNavigating}
                         shouldIgnoreFocus={shouldIgnoreFocus}
-                        wrapperStyle={style?.listItemWrapperStyle}
-                        titleStyles={style?.listItemTitleStyles}
-                        isMultilineSupported={isRowMultilineSupported}
                         titleNumberOfLines={titleNumberOfLines}
-                        shouldHighlightSelectedItem={shouldHighlightSelectedItem}
                         shouldDisableHoverStyle={shouldDisableHoverStyle}
                         selectionButtonPosition={selectionButtonPosition}
                         shouldPreventEnterKeySubmit={!disableKeyboardShortcuts}
diff --git a/src/components/SelectionList/SelectionListWithSections/types.ts b/src/components/SelectionList/SelectionListWithSections/types.ts
index 4f90b0f3d1db..f89012a01848 100644
--- a/src/components/SelectionList/SelectionListWithSections/types.ts
+++ b/src/components/SelectionList/SelectionListWithSections/types.ts
@@ -39,12 +39,6 @@ type SelectionListWithSectionsProps<TItem extends ListItem> = BaseSelectionListP
     /** Whether to prevent auto-scrolling to the first index when selecting an item in multi-select mode */
     shouldPreventAutoScrollOnSelect?: boolean;
 
-    /** Whether to wrap long text in rows */
-    isRowMultilineSupported?: boolean;
-
-    /** Number of lines to show for title text when multiline is supported */
-    titleNumberOfLines?: number;
-
     /**
      * Passed straight to the underlying list. Defaults to `always`, which a list whose own text input drives its
      * rows needs: a row press has to land while that input still holds focus. A list whose rows are inputs of their
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index d8910a404829..a0e01b4bc049 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -1,5 +1,3 @@
-import type {SearchRouterItem} from '@components/Search/SearchAutocompleteList';
-import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
 import type CONST from '@src/CONST';
@@ -9,38 +7,16 @@ import type {Ref} from 'react';
 import type {GestureResponderEvent, InputModeOptions, StyleProp, TextStyle, ViewStyle} from 'react-native';
 import type {ValueOf} from 'type-fest';
 
-import type BareUserListItem from './ListItem/BareUserListItem';
-import type InviteMemberListItem from './ListItem/InviteMemberListItem';
-import type MultiSelectListItem from './ListItem/MultiSelectListItem';
-import type SingleSelectListItem from './ListItem/SingleSelectListItem';
-import type SingleSelectWithAvatarListItem from './ListItem/SingleSelectWithAvatarListItem';
-import type SpendCategorySelectorListItem from './ListItem/SpendCategorySelectorListItem';
-import type SplitListItem from './ListItem/SplitListItem';
-import type TravelDomainListItem from './ListItem/TravelDomainListItem';
-import type {ListItem} from './ListItem/types';
-import type UserListItem from './ListItem/UserListItem';
-import type UserSelectionListItem from './ListItem/UserSelectionListItem';
+import type {ListItem, ListItemComponent} from './ListItem/types';
 import type {SelectionListWithSectionsHandle, SelectionListWithSectionsProps} from './SelectionListWithSections/types';
 
-type ValidListItem =
-    | typeof InviteMemberListItem
-    | typeof MultiSelectListItem
-    | typeof SearchRouterItem
-    | typeof SingleSelectListItem
-    | typeof SingleSelectWithAvatarListItem
-    | typeof SpendCategorySelectorListItem
-    | typeof SplitListItem
-    | typeof TravelDomainListItem
-    | typeof BareUserListItem
-    | typeof UserListItem
-    | typeof UserSelectionListItem;
-
 /**
  * Base props shared between SelectionList and SelectionListWithSections.
  * Contains common configuration for list behavior, styling, and callbacks.
  */
 type BaseSelectionListProps<TItem extends ListItem> = {
-    ListItem: ValidListItem;
+    /** Component rendering each row. `NoInfer` keeps the row component from widening `TItem`, which is inferred from `data`/`sections` */
+    ListItem: ListItemComponent<NoInfer<TItem>>;
     initiallyFocusedItemKey?: string;
     onSelectRow: (item: TItem) => void;
     canSelectMultiple?: boolean;
@@ -53,7 +29,6 @@ type BaseSelectionListProps<TItem extends ListItem> = {
     shouldShowLoadingPlaceholder?: boolean;
     shouldShowTooltips?: boolean;
     customListHeaderContent?: React.JSX.Element | null;
-    onSelectionButtonPress?: (item: TItem) => void;
     onDismissError?: (item: TItem) => void;
     shouldPreventDefaultFocusOnSelectRow?: boolean;
 
@@ -118,7 +93,8 @@ type BaseSelectionListProps<TItem extends ListItem> = {
     /** Which side of the row to render the selection button on */
     selectionButtonPosition?: ValueOf<typeof CONST.SELECTION_BUTTON_POSITION>;
 
-    shouldHighlightSelectedItem?: boolean;
+    /** Maximum number of title lines per row. Values above 1 enable wrapping */
+    titleNumberOfLines?: number;
 };
 
 /**
@@ -134,7 +110,7 @@ type SelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> &
         /** Called when "Select All" button is pressed */
         onSelectAll?: () => void;
 
-        onLongPressRow?: (item: TItem, itemTransactions?: TransactionListItemType[]) => void;
+        onSelectionButtonPress?: (item: TItem) => void;
 
         /** Custom header content to render instead of the default select all header */
         customListHeader?: React.ReactNode;
@@ -153,9 +129,6 @@ type SelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> &
         /** Whether the layout is narrow */
         isSmallScreenWidth?: boolean;
 
-        /** Whether to wrap long text */
-        isRowMultilineSupported?: boolean;
-
         /** Whether to show the vertical scroll indicator */
         showScrollIndicator?: boolean;
 
@@ -178,15 +151,11 @@ type SelectionListStyle = {
     listFooterContentStyle?: StyleProp<ViewStyle>;
 
     containerStyle?: StyleProp<ViewStyle>;
-    listItemTitleStyles?: StyleProp<TextStyle>;
-    listItemWrapperStyle?: StyleProp<ViewStyle>;
     listHeaderWrapperStyle?: StyleProp<ViewStyle>;
 
     /** Styles for the default "Select all" label in the list header (merged after textStrong) */
     listHeaderSelectAllTextStyle?: StyleProp<TextStyle>;
 
-    listItemTitleContainerStyles?: StyleProp<ViewStyle>;
-    listItemErrorRowStyles?: StyleProp<ViewStyle>;
     sectionTitleStyles?: StyleProp<TextStyle>;
 };
 
diff --git a/src/components/SelectionList/utils/shouldShowRBRIndicator.ts b/src/components/SelectionList/utils/shouldShowRBRIndicator.ts
index 668d2ae9d3c8..e945e19d9545 100644
--- a/src/components/SelectionList/utils/shouldShowRBRIndicator.ts
+++ b/src/components/SelectionList/utils/shouldShowRBRIndicator.ts
@@ -1,10 +1,8 @@
 import type {ListItem} from '@components/SelectionList/ListItem/types';
 
-import isListItemSelected from './isListItemSelected';
-
 /** Whether a row should show its brick road indicator. */
-function shouldShowRBRIndicator<TItem extends ListItem>(item: TItem, isSelected?: boolean): boolean {
-    return !!item.brickRoadIndicator && (!isListItemSelected(item, isSelected) || !!item.canShowSeveralIndicators);
+function shouldShowRBRIndicator<TItem extends ListItem>(item: TItem): boolean {
+    return !!item.brickRoadIndicator && (!item.isSelected || !!item.canShowSeveralIndicators);
 }
 
 export default shouldShowRBRIndicator;
diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
index e515155a63a0..f582c57facb4 100644
--- a/src/components/SelectionScreen.tsx
+++ b/src/components/SelectionScreen.tsx
@@ -16,7 +16,7 @@ import type {StyleProp, ViewStyle} from 'react-native';
 import isEmpty from 'lodash/isEmpty';
 import React from 'react';
 
-import type SingleSelectWithAvatarListItem from './SelectionList/ListItem/SingleSelectWithAvatarListItem';
+import type {ListItemComponent} from './SelectionList/ListItem/types';
 import type {ConfirmButtonOptions, ListItem} from './SelectionList/types';
 
 import ErrorMessageRow from './ErrorMessageRow';
@@ -48,9 +48,7 @@ type SelectionScreenProps<T = string> = {
     data: Array<SelectorType<T>>;
 
     /** Renderer for every item in the list. Defaults to SingleSelectListItem. */
-    ListItem?: typeof SingleSelectListItem | typeof SingleSelectWithAvatarListItem;
-
-    listItemWrapperStyle?: StyleProp<ViewStyle>;
+    ListItem?: ListItemComponent<SelectorType<T>>;
 
     /** Item `keyForList` to focus initially */
     initiallyFocusedOptionKey?: string | undefined;
@@ -90,8 +88,8 @@ type SelectionScreenProps<T = string> = {
 
     shouldShowTextInput?: boolean;
 
-    /** Whether to allow each row's title to wrap onto multiple lines instead of truncating */
-    isRowMultilineSupported?: boolean;
+    /** Maximum number of title lines per row. Values above 1 let the title wrap instead of truncating */
+    titleNumberOfLines?: number;
 
     textInputOptions?: {
         /** Label for the text input */
@@ -120,7 +118,6 @@ function SelectionScreen<T = string>({
     listFooterContent,
     data,
     ListItem = SingleSelectListItem,
-    listItemWrapperStyle,
     initiallyFocusedOptionKey,
     onSelectRow,
     onBackButtonPress,
@@ -138,7 +135,7 @@ function SelectionScreen<T = string>({
     shouldShowTextInput,
     textInputOptions,
     shouldUpdateFocusedIndex = false,
-    isRowMultilineSupported = false,
+    titleNumberOfLines,
     confirmButtonOptions,
 }: SelectionScreenProps<T>) {
     const {translate} = useLocalize();
@@ -181,11 +178,10 @@ function SelectionScreen<T = string>({
                         shouldShowListEmptyContent={shouldShowListEmptyContent}
                         shouldShowTextInput={shouldShowTextInput}
                         listFooterContent={listFooterContent}
-                        style={{listItemWrapperStyle}}
                         shouldSingleExecuteRowSelect={shouldSingleExecuteRowSelect}
                         shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
                         alternateNumberOfSupportedLines={2}
-                        isRowMultilineSupported={isRowMultilineSupported}
+                        titleNumberOfLines={titleNumberOfLines}
                         addBottomSafeAreaPadding
                         confirmButtonOptions={confirmButtonOptions}
                     >
diff --git a/src/components/SettlementButton/index.tsx b/src/components/SettlementButton/index.tsx
index 9ba745cf70c2..eb50e9824e1d 100644
--- a/src/components/SettlementButton/index.tsx
+++ b/src/components/SettlementButton/index.tsx
@@ -19,6 +19,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useVerifyAccountAndResume from '@hooks/useVerifyAccountAndResume';
@@ -123,6 +124,7 @@ function SettlementButton({
     const paymentMethods = useSettlementButtonPaymentMethods(hasActivatedWallet, translate);
     const [lastPaymentMethods] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD);
     const [personalPolicyID] = useOnyx(ONYXKEYS.PERSONAL_POLICY_ID);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
 
@@ -206,7 +208,7 @@ function SettlementButton({
                         return;
                     }
                     pressLockedBankAccount(policy?.achAccount?.bankAccountID, translate, conciergeReportID, delegateAccountID, initiatingBankAccountUnlock);
-                    navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed});
+                    navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails});
                 });
             }
             return true;
diff --git a/src/components/SidePanel/SidePanelButton/SidePanelButtonBase.tsx b/src/components/SidePanel/SidePanelButton/SidePanelButtonBase.tsx
index 0dbd33e39ca7..7284c0b1d847 100644
--- a/src/components/SidePanel/SidePanelButton/SidePanelButtonBase.tsx
+++ b/src/components/SidePanel/SidePanelButton/SidePanelButtonBase.tsx
@@ -32,6 +32,7 @@ function SidePanelButtonBase({style}: SidePanelButtonProps) {
             <PressableWithoutFeedback
                 sentryLabel={CONST.SENTRY_LABEL.SIDE_PANEL.HELP}
                 accessibilityLabel={translate('common.help')}
+                role={CONST.ROLE.BUTTON}
                 style={[styles.flexRow, styles.touchableButtonImage, style]}
                 onPress={openSidePanel}
             >
diff --git a/src/components/SidePanel/SidePanelButton/index.native.tsx b/src/components/SidePanel/SidePanelButton/index.native.tsx
index dbca39cda2a4..f6fc09d089b5 100644
--- a/src/components/SidePanel/SidePanelButton/index.native.tsx
+++ b/src/components/SidePanel/SidePanelButton/index.native.tsx
@@ -6,6 +6,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useSidePanelState from '@hooks/useSidePanelState';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -32,6 +33,7 @@ function SidePanelButton({style}: SidePanelButtonProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
 
     if (shouldHideHelpButton) {
         return null;
@@ -42,6 +44,7 @@ function SidePanelButton({style}: SidePanelButtonProps) {
             <PressableWithoutFeedback
                 sentryLabel={CONST.SENTRY_LABEL.SIDE_PANEL.HELP}
                 accessibilityLabel={translate('common.help')}
+                role={CONST.ROLE.BUTTON}
                 style={[styles.flexRow, styles.touchableButtonImage, style]}
                 onPress={() => {
                     // Capture the report the user is viewing (still topmost at press time) so Concierge can act on it
@@ -53,6 +56,7 @@ function SidePanelButton({style}: SidePanelButtonProps) {
                         introSelected,
                         currentUserAccountID,
                         isSelfTourViewed,
+                        conciergePersonalDetails,
                         sourceReportID: sourceReportID && sourceReportID !== conciergeReportID ? sourceReportID : undefined,
                     });
                 }}
diff --git a/src/components/SpendRules/configuration/SpendRuleMerchantsBase.tsx b/src/components/SpendRules/configuration/SpendRuleMerchantsBase.tsx
index baa7a522e030..2746dc55f625 100644
--- a/src/components/SpendRules/configuration/SpendRuleMerchantsBase.tsx
+++ b/src/components/SpendRules/configuration/SpendRuleMerchantsBase.tsx
@@ -1,7 +1,7 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import MenuItem from '@components/MenuItem';
+import MenuItemAction from '@components/MenuItem/presets/MenuItemAction';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -82,12 +82,9 @@ function SpendRuleMerchantsBase({policyID, action, merchants, getEditMerchantRou
                     onBackButtonPress={goBack}
                 />
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
-                    <MenuItem
+                    <MenuItemAction
                         title={translate('workspace.rules.spendRules.addMerchant')}
                         icon={expensifyIcons.Plus}
-                        iconHeight={20}
-                        iconWidth={20}
-                        titleStyle={styles.textStrong}
                         onPress={addMerchant}
                     />
                     {merchants.length > 0 ? (
diff --git a/src/components/SplashScreenHider/index.native.tsx b/src/components/SplashScreenHider/index.native.tsx
index 2caadc579680..a2125a16bb68 100644
--- a/src/components/SplashScreenHider/index.native.tsx
+++ b/src/components/SplashScreenHider/index.native.tsx
@@ -2,6 +2,7 @@ import Logo from '@assets/images/new-expensify-dark.svg';
 
 import ImageSVG from '@components/ImageSVG';
 
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import BootSplash from '@libs/BootSplash';
@@ -17,6 +18,7 @@ import type {SplashScreenHiderProps, SplashScreenHiderReturnType} from './types'
 
 function SplashScreenHider({onHide, shouldHideSplash}: SplashScreenHiderProps): SplashScreenHiderReturnType {
     const styles = useThemeStyles();
+    const {left, right} = useSafeAreaInsets();
     const logoSizeRatio = BootSplash.logoSizeRatio || 1;
 
     const opacity = useSharedValue(1);
@@ -67,7 +69,7 @@ function SplashScreenHider({onHide, shouldHideSplash}: SplashScreenHiderProps):
     }, [shouldHideSplash, hide]);
 
     return (
-        <Reanimated.View style={[StyleSheet.absoluteFill, styles.splashScreenHider, opacityStyle]}>
+        <Reanimated.View style={[StyleSheet.absoluteFill, styles.getSplashScreenHiderPosition(left, right), styles.splashScreenHider, opacityStyle]}>
             <Reanimated.View style={scaleStyle}>
                 <ImageSVG
                     contentFit="fill"
diff --git a/src/components/Switch.tsx b/src/components/Switch.tsx
index 9fd7f341813a..4f45b6fae04c 100644
--- a/src/components/Switch.tsx
+++ b/src/components/Switch.tsx
@@ -101,13 +101,14 @@ function Switch({isOn, onToggle, accessibilityLabel, disabled, pending = false,
         backgroundColor: interpolateColor(offsetX.get(), [OFFSET_X.OFF, OFFSET_X.ON], [theme.icon, theme.success]),
     }));
 
-    // Enhance accessibility label to include locked state when disabled
+    // Announce the locked state whenever the switch is disabled or shows the lock icon (e.g. a pressable switch that routes to an upgrade)
+    const isLocked = !!disabled || !!showLockIcon;
     const enhancedAccessibilityLabel = useMemo(() => {
-        if (disabled) {
+        if (isLocked) {
             return `${accessibilityLabel}, ${translate('common.locked')}`;
         }
         return accessibilityLabel;
-    }, [accessibilityLabel, disabled, translate]);
+    }, [accessibilityLabel, isLocked, translate]);
 
     return (
         <PressableWithFeedback
diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index 9d790e4dcefb..cb269dc824d5 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -28,7 +28,7 @@ import type {TableContextValue} from './TableContext';
 import type {TableHeaderProps} from './TableHeader';
 import type {TableData, TableHandle, TableMethods, TableProps, TableRow} from './types';
 
-import {getDataVisibleIndices, getListIndex, getTableListMetadata} from './buildTableListData';
+import {getDataVisibleIndices, getListIndex, getTableListMetadata, rendersColumnHeader} from './buildTableListData';
 import useFiltering from './middlewares/filtering';
 import useHighlighting from './middlewares/highlight';
 import useSearching from './middlewares/searching';
@@ -427,16 +427,22 @@ function Table<DataType extends TableData, ColumnKey extends string = string, Fi
 
         return !isTableHeaderElement(child) && !(React.isValidElement(child) && (child.type === TableEmptyState || child.type === TableNoResultsState));
     });
-    const shouldRenderStickyHeader = processedData.length > 0 && !!tableHeaderElement && hasPageHeader && !(shouldUseNarrowTableLayout && !title);
+    const hasColumnHeaderElement = !!tableHeaderElement;
+    const hasRows = processedData.length > 0;
+    const isColumnHeaderHiddenInNarrowLayout = shouldUseNarrowTableLayout && !title;
+    const areColumnsScrollable = !!dynamicScrollWidth;
 
     const tableListMetadata = useMemo(
         () =>
             getTableListMetadata({
                 listHeaderElement,
                 listHeaderComponent: listProps.ListHeaderComponent,
-                shouldRenderStickyHeader,
+                hasColumnHeaderElement,
+                hasRows,
+                isColumnHeaderHiddenInNarrowLayout,
+                areColumnsScrollable,
             }),
-        [listHeaderElement, listProps.ListHeaderComponent, shouldRenderStickyHeader],
+        [listHeaderElement, listProps.ListHeaderComponent, hasColumnHeaderElement, hasRows, isColumnHeaderHiddenInNarrowLayout, areColumnsScrollable],
     );
     /**
      * Exposes table control methods through the ref.
@@ -503,6 +509,8 @@ function Table<DataType extends TableData, ColumnKey extends string = string, Fi
         originalDataLength,
         columns,
         dynamicGridTemplateColumns,
+        scrollWidth: dynamicScrollWidth,
+        tableWidth,
         filterConfig: filters,
         activeFilters: currentFilters,
         activeSorting,
@@ -543,7 +551,10 @@ function Table<DataType extends TableData, ColumnKey extends string = string, Fi
                 columnCount={semanticColumnCount}
                 rendersBodyWhenEmpty={rendersBodyWhenEmpty}
                 shouldUseDynamicColumns={shouldUseDynamicColumns}
-                scrollWidth={dynamicScrollWidth}
+                hasHeaderRow={rendersColumnHeader(tableListMetadata)}
+                // Only tables without a page header scroll here. With one, an ancestor scroller would drag the
+                // in-list filter bar sideways, so their list scrolls horizontally itself (see `TableBody`).
+                scrollWidth={hasPageHeader ? undefined : dynamicScrollWidth}
                 onLayout={isDynamicSizingEnabled ? handleTableLayout : undefined}
             >
                 {renderedChildren}
diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 3063c70a6920..a8c853942eda 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -5,6 +5,7 @@ import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddi
 import useDebouncedAccessibilityAnnouncement from '@hooks/useDebouncedAccessibilityAnnouncement';
 import useLocalize from '@hooks/useLocalize';
 import useScrollEnabled from '@hooks/useScrollEnabled';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {ListRenderItemInfo, ViewToken} from '@shopify/flash-list';
@@ -17,7 +18,16 @@ import {StyleSheet, View} from 'react-native';
 import type {TableData} from '.';
 import type {TableListMetadata} from './buildTableListData';
 
-import {buildTableListData, getAdjustedStickyHeaderIndices, getDataIndex, getListIndex, getSyntheticRowKind} from './buildTableListData';
+import {
+    buildTableListData,
+    getAdjustedStickyHeaderIndices,
+    getDataIndex,
+    getListIndex,
+    getSyntheticRowKind,
+    rendersColumnHeader,
+    rendersColumnHeaderAsStickyRow,
+    rendersColumnHeaderInListHeader,
+} from './buildTableListData';
 import {getRowGroupAccessibilityProps, getTableContainerAccessibilityProps, getVirtualizedRowSemanticID, shouldUseTableSemantics} from './tableAccessibility';
 import {TableRowSemanticIDContext, useTableContext} from './TableContext';
 
@@ -34,6 +44,37 @@ type TableBodyListProps = TableBodyProps & {
     emptyMessage: string;
 };
 
+type ColumnScrollOverrideProps = Record<string, unknown> & {
+    dataSet?: Record<string, unknown>;
+    style?: StyleProp<ViewStyle>;
+};
+
+/**
+ * Hands the horizontal axis to the list's scroller and marks it for the page-header hover rule in `web/index.html`,
+ * keeping whatever `overrideProps` the consumer passed.
+ */
+function getColumnScrollOverrideProps(overflowXAutoStyle: ViewStyle, overrideProps: ColumnScrollOverrideProps = {}) {
+    return {
+        ...overrideProps,
+        dataSet: {...overrideProps.dataSet, tableColumnScroller: true},
+        style: [overrideProps.style, overflowXAutoStyle],
+    };
+}
+
+/**
+ * Pins the page header to the scroller's left edge so it stays put while the columns move under it. Held at the
+ * measured table width: a box spanning the scroll range has nothing to pin within, and a percentage resolves to it.
+ */
+const columnScrollPageHeaderStyle = {position: 'sticky', left: 0} as ViewStyle;
+
+/**
+ * Sticks the shared list-header box at minus the page header's height, so exactly that much scrolls off and leaves the
+ * column header flush against the scroller. `zIndex` lifts it above the rows, which paint later in tree order.
+ */
+function getColumnScrollListHeaderStyle(pageHeaderHeight: number): ViewStyle {
+    return {position: 'sticky', top: -pageHeaderHeight, zIndex: 1} as ViewStyle;
+}
+
 type ViewabilityInfo = {
     viewableItems: Array<ViewToken<TableData>>;
     changed: Array<ViewToken<TableData>>;
@@ -97,10 +138,13 @@ function doesBodyRenderWhenEmpty(listProps: {ListEmptyComponent?: unknown; ListH
  */
 function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ...props}: TableBodyListProps) {
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
     const scrollEnabled = useScrollEnabled();
     const [isListLoaded, setIsListLoaded] = useState(false);
     const [hasActivatedStickyHeader, setHasActivatedStickyHeader] = useState(false);
     const [activeStickyHeaderIndex, setActiveStickyHeaderIndex] = useState(-1);
+    // The page header is consumer content, so its height is only known after layout. `0` keeps the list header unstuck.
+    const [pageHeaderHeight, setPageHeaderHeight] = useState(0);
     const {
         processedData: filteredAndSortedData,
         listProps,
@@ -117,6 +161,8 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
         noResultsStateElement,
         tableListMetadata,
         isEmptyResult,
+        scrollWidth,
+        tableWidth,
     } = useTableContext<TableData>();
     const {
         ListEmptyComponent,
@@ -124,6 +170,7 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
         ListFooterComponent,
         ListFooterComponentStyle,
         ListHeaderComponent,
+        ListHeaderComponentStyle,
         contentContainerStyle: listContentContainerStyle,
         getItemType,
         initialScrollIndex,
@@ -135,6 +182,7 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
         onStartReached,
         onViewableItemsChanged,
         overrideItemLayout,
+        overrideProps,
         renderItem,
         stickyHeaderIndices,
         viewabilityConfigCallbackPairs,
@@ -153,21 +201,27 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
     const contentMinHeight = flattenedContentContainerStyle?.minHeight;
     const {paddingBottom: tableBodyBottomPadding} = StyleSheet.flatten(tableBodyContentContainerStyle) ?? {};
 
-    const shouldRenderStickyHeader = tableListMetadata.shouldRenderStickyHeader;
+    const shouldRenderColumnHeaderAsStickyRow = rendersColumnHeaderAsStickyRow(tableListMetadata);
+    const shouldRenderColumnHeaderInListHeader = rendersColumnHeaderInListHeader(tableListMetadata);
     const hasRows = filteredAndSortedData.length > 0;
     const shouldRenderFlashList = hasRows || (tableListMetadata.hasPageHeader && isEmptyResult);
+
+    // Columns wider than the table, so this list's scroller takes the horizontal axis (see `getColumnScrollOverrideProps`).
+    // Only tables keeping their filter bar in the list scroll here. The rest are scrolled by an ancestor (see
+    // `TableSemanticContainer`). Web-only: native can't measure text, so it never content-sizes columns.
+    const isColumnScrollEnabled = !!scrollWidth && tableListMetadata.hasPageHeader && hasRows;
     const isTableSemanticsEnabled = shouldUseTableSemantics(shouldUseNarrowTableLayout);
     const shouldApplyPageHeaderTable = isTableSemanticsEnabled && tableListMetadata.hasPageHeader && hasRows;
     const shouldApplyBodyRowGroup = isTableSemanticsEnabled && !tableListMetadata.hasPageHeader;
-    const semanticTableHasHeader = !tableListMetadata.hasPageHeader || tableListMetadata.shouldRenderStickyHeader;
+    const semanticTableHasHeader = rendersColumnHeader(tableListMetadata);
     const semanticColumnCount = columns.length + (selectionEnabled ? 1 : 0);
     const tableBodyAccessibilityProps = tableListMetadata.hasPageHeader
         ? getTableContainerAccessibilityProps(shouldApplyPageHeaderTable, title, filteredAndSortedData.length, semanticColumnCount, semanticTableHasHeader)
         : getRowGroupAccessibilityProps(shouldApplyBodyRowGroup);
-    const currentListState = {shouldRenderFlashList, shouldRenderStickyHeader};
+    const currentListState = {shouldRenderFlashList, shouldRenderColumnHeaderAsStickyRow};
     const [previousListState, setPreviousListState] = useState(currentListState);
     const shouldResetListLoad = previousListState.shouldRenderFlashList !== shouldRenderFlashList;
-    const shouldResetStickyHeader = previousListState.shouldRenderStickyHeader !== shouldRenderStickyHeader;
+    const shouldResetStickyHeader = previousListState.shouldRenderColumnHeaderAsStickyRow !== shouldRenderColumnHeaderAsStickyRow;
 
     if (shouldResetListLoad || shouldResetStickyHeader) {
         setPreviousListState(currentListState);
@@ -183,13 +237,13 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
     }
 
     useEffect(() => {
-        if (!hasRows || !tableListMetadata.shouldRenderStickyHeader || !isListLoaded || hasActivatedStickyHeader) {
+        if (!hasRows || !shouldRenderColumnHeaderAsStickyRow || !isListLoaded || hasActivatedStickyHeader) {
             return;
         }
 
         const frame = requestAnimationFrame(() => setHasActivatedStickyHeader(true));
         return () => cancelAnimationFrame(frame);
-    }, [hasActivatedStickyHeader, hasRows, isListLoaded, tableListMetadata.shouldRenderStickyHeader]);
+    }, [hasActivatedStickyHeader, hasRows, isListLoaded, shouldRenderColumnHeaderAsStickyRow]);
 
     const handleChangeStickyIndex: NonNullable<typeof onChangeStickyIndex> = useCallback(
         (current, previous) => {
@@ -239,12 +293,29 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
     };
 
     const pageHeaderElement = tableListMetadata.hasPageHeader ? (
-        <View>
+        <View
+            style={isColumnScrollEnabled && [columnScrollPageHeaderStyle, tableWidth > 0 && StyleUtils.getWidthStyle(tableWidth)]}
+            // Measured unconditionally, so the height is known by the time the columns overflow and need it.
+            onLayout={(event) => setPageHeaderHeight(event.nativeEvent.layout.height)}
+            // Pairs with the scroller's marker so a stylesheet rule can suspend the columns on hover (see `web/index.html`).
+            dataSet={{tablePageHeader: true}}
+        >
             {renderListComponent(ListHeaderComponent)}
             {listHeaderElement}
         </View>
     ) : null;
 
+    // While the columns scroll the column header sits here rather than in FlashList's sticky-row overlay, so the
+    // scroller carries it sideways. Also one copy instead of the overlay's two, so no duplicate to hide from readers.
+    const listHeaderContent = shouldRenderColumnHeaderInListHeader ? (
+        <>
+            {pageHeaderElement}
+            {tableHeaderElement}
+        </>
+    ) : (
+        pageHeaderElement
+    );
+
     const EmptyResultComponent = (
         <View style={[styles.ph5, styles.pt3, styles.pb5]}>
             <Text
@@ -310,7 +381,7 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
     // A truly empty table still uses the standalone centered layout above.
     const listData = buildTableListData<TableData>(filteredAndSortedData, tableListMetadata);
     const adjustedStickyHeaderIndices = getAdjustedStickyHeaderIndices(tableListMetadata, stickyHeaderIndices);
-    const canRenderStickyHeader = !tableListMetadata.shouldRenderStickyHeader || (isListLoaded && hasActivatedStickyHeader);
+    const canRenderStickyHeader = !shouldRenderColumnHeaderAsStickyRow || (isListLoaded && hasActivatedStickyHeader);
     const isTableHeaderSticky = activeStickyHeaderIndex === tableListMetadata.stickyTableHeaderIndex;
     const shouldRenderEmptyStateInList = !hasRows && tableListMetadata.hasPageHeader;
 
@@ -387,7 +458,12 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
                 style={[styles.flex1, styles.mnh0]}
                 showsVerticalScrollIndicator={false}
                 maintainVisibleContentPosition={{disabled: true}}
-                ListHeaderComponent={pageHeaderElement}
+                ListHeaderComponent={listHeaderContent}
+                ListHeaderComponentStyle={[
+                    ListHeaderComponentStyle,
+                    // An unmeasured page header leaves nothing to offset the stack by, and 0 would pin it instead.
+                    pageHeaderHeight > 0 && shouldRenderColumnHeaderInListHeader && getColumnScrollListHeaderStyle(pageHeaderHeight),
+                ]}
                 ListEmptyComponent={shouldRenderEmptyStateInList ? emptyStateContent : ListEmptyComponent}
                 ListEmptyComponentStyle={[ListEmptyComponentStyle, shouldRenderEmptyStateInList && styles.flexGrow1, shouldRenderEmptyStateInList && styles.justifyContentCenter]}
                 ListFooterComponent={ListFooterComponent}
@@ -399,6 +475,8 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
                     listContentContainerStyle,
                     tableBodyContentContainerStyle,
                     contentContainerStyle,
+                    // Absolutely positioned rows don't widen the scroller's content, so hold the scroll extent open.
+                    isColumnScrollEnabled && StyleUtils.getMinimumWidth(scrollWidth),
                     shouldRenderEmptyStateInList && styles.flexGrow1,
                     shouldUseNarrowTableLayout &&
                         typeof contentMinHeight === 'number' &&
@@ -422,6 +500,7 @@ function TableBodyList({contentContainerStyle, emptyMessage, onLayout, style, ..
                 }}
                 {...restListProps}
                 scrollEnabled={scrollEnabled}
+                overrideProps={isColumnScrollEnabled ? getColumnScrollOverrideProps(styles.overflowXAuto, overrideProps) : overrideProps}
             />
         </View>
     );
diff --git a/src/components/Table/TableContext.tsx b/src/components/Table/TableContext.tsx
index 63d55d217baf..dece4d66469e 100644
--- a/src/components/Table/TableContext.tsx
+++ b/src/components/Table/TableContext.tsx
@@ -73,6 +73,12 @@ type TableContextValue<DataType extends TableData, ColumnKey extends string = st
      */
     dynamicGridTemplateColumns: string[] | undefined;
 
+    /** The width the rows need when the columns don't fit, which makes the list scroll horizontally too. `undefined` means they fit. */
+    scrollWidth: number | undefined;
+
+    /** Measured width of the area the table lays out into. Content-sized columns only. `0` until the first layout. */
+    tableWidth: number;
+
     /** Filter configuration for dropdown filters. */
     filterConfig: FilterConfig<FilterKey> | undefined;
 
@@ -132,6 +138,8 @@ const defaultTableContextValue: TableContextValue<TableData, string> = {
     originalDataLength: 0,
     columns: [],
     dynamicGridTemplateColumns: undefined,
+    scrollWidth: undefined,
+    tableWidth: 0,
     activeFilters: {},
     activeSorting: {
         columnKey: undefined,
@@ -148,7 +156,7 @@ const defaultTableContextValue: TableContextValue<TableData, string> = {
     hasSearchString: false,
     tableListMetadata: {
         hasPageHeader: false,
-        shouldRenderStickyHeader: false,
+        columnHeaderPlacement: CONST.TABLES.COLUMN_HEADER_PLACEMENT.NONE,
         syntheticRowsBeforeData: 0,
         stickyTableHeaderIndex: 0,
         listDataRowOffset: 0,
diff --git a/src/components/Table/TableHeader.tsx b/src/components/Table/TableHeader.tsx
index 2294cde0ca13..a6dee01b20e8 100644
--- a/src/components/Table/TableHeader.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -6,6 +6,7 @@ import Text from '@components/Text';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -20,6 +21,7 @@ import {StyleSheet, View} from 'react-native';
 
 import type {TableColumn, TableData} from './types';
 
+import {rendersColumnHeaderInListHeader} from './buildTableListData';
 import getGridTemplateColumns from './getGridTemplateColumns';
 import {getColumnHeaderAccessibilityProps, getRowAccessibilityProps, shouldUseTableSemantics} from './tableAccessibility';
 import {useTableContext} from './TableContext';
@@ -67,6 +69,7 @@ type TableHeaderProps = ViewProps & {
 function TableHeader<DataType extends TableData, ColumnKey extends string = string>({style, isStickyListHeader = false, isAccessibilityHidden = false, ...props}: TableHeaderProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
@@ -81,6 +84,8 @@ function TableHeader<DataType extends TableData, ColumnKey extends string = stri
         isMobileSelectionEnabled,
         shouldEnableSelectionInNarrowPaneModal,
         dynamicGridTemplateColumns,
+        scrollWidth,
+        tableListMetadata,
     } = useTableContext<DataType, ColumnKey>();
     // Tables inside a narrow pane modal (RHP) opt into keying the header checkbox off the real screen size, since
     // shouldUseNarrowLayout is always true in an RHP. Other tables keep the original behavior. Visual padding below still uses shouldUseNarrowLayout.
@@ -203,6 +208,13 @@ function TableHeader<DataType extends TableData, ColumnKey extends string = stri
         </View>
     );
 
+    // Sits in the list header rather than FlashList's sticky-row overlay, so the scroller carries it sideways with the
+    // columns. Needs an explicit width because the list header stretches to the scrolled content, which would leave the
+    // background and bottom border short of the columns. That background is what the rows scroll under once it's stuck.
+    if (rendersColumnHeaderInListHeader(tableListMetadata) && !!scrollWidth) {
+        return <View style={[styles.appBG, StyleUtils.getWidthStyle(scrollWidth)]}>{header}</View>;
+    }
+
     if (!isStickyListHeader) {
         return header;
     }
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 768002e2bfc9..0a18271c735d 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -1,4 +1,5 @@
 import Checkbox from '@components/Checkbox';
+import {useEditingCellState} from '@components/EditableCell';
 import ErrorMessageRow from '@components/ErrorMessageRow';
 import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -19,10 +20,11 @@ import CONST from '@src/CONST';
 
 import type {GestureResponderEvent, PressableStateCallbackType, ViewStyle} from 'react-native';
 
-import React from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import Animated from 'react-native-reanimated';
 
+import {rendersColumnHeader} from './buildTableListData';
 import getGridTemplateColumns from './getGridTemplateColumns';
 import {assignCellColumnIndexes, getCellAccessibilityProps, getRowAccessibilityProps, shouldUseTableSemantics} from './tableAccessibility';
 import {useTableContext, useTableRowSemanticID} from './TableContext';
@@ -62,6 +64,8 @@ export default function TableRow({
     sentryLabel,
     interactive,
     onPress,
+    onPressIn,
+    onHoverIn,
     offlineWithFeedback,
     checkboxReplacementElement,
     rowFooter,
@@ -92,7 +96,24 @@ export default function TableRow({
         shouldFooterRenderAsLastRow,
     } = useTableContext();
     const semanticRowID = useTableRowSemanticID();
-    const semanticTableHasHeader = !tableListMetadata.hasPageHeader || tableListMetadata.shouldRenderStickyHeader;
+
+    // Inline cell editing shares this app-global state. While any cell is being edited, a row press is the click that
+    // dismisses the editor rather than a navigation intent, so navigation must be suppressed for that tap.
+    const {isEditingCell, wasRecentlyEditingCell} = useEditingCellState();
+    const wasEditingOnMouseDownRef = useRef(false);
+    const [shouldDisableHoverStyle, setShouldDisableHoverStyle] = useState(false);
+
+    // Saving an inline edit can unmount the cell Hoverable without firing onHoverOut, which leaves hoveredComponentBG stuck.
+    // Disable hover until the next intentional hover. Same workaround as spend transaction rows.
+    // See: https://github.com/Expensify/App/pull/83127#issuecomment-4114490080
+    useEffect(() => {
+        if (!wasRecentlyEditingCell) {
+            return;
+        }
+        queueMicrotask(() => setShouldDisableHoverStyle(true));
+    }, [wasRecentlyEditingCell]);
+
+    const semanticTableHasHeader = rendersColumnHeader(tableListMetadata);
     const isAccessibilityHidden = semanticRowID === null || ariaHidden === true;
     const inertProps = isAccessibilityHidden ? {inert: true} : {};
 
@@ -176,7 +197,7 @@ export default function TableRow({
     ];
 
     const tableRowPressableHoverStyle = (() => {
-        if (isDisabled || !interactive) {
+        if (isDisabled || !interactive || shouldDisableHoverStyle) {
             return undefined;
         }
         if (item.selected) {
@@ -185,9 +206,14 @@ export default function TableRow({
         return styles.hoveredComponentBG;
     })();
 
+    const enableHoverStyle: PressableWithFeedbackProps['onHoverIn'] = (event) => {
+        setShouldDisableHoverStyle(false);
+        onHoverIn?.(event);
+    };
+
     const renderChildren = (state: PressableStateCallbackType) => {
         if (typeof children === 'function') {
-            return children(state);
+            return children({...state, hovered: !!state.hovered && !shouldDisableHoverStyle});
         }
 
         return children;
@@ -205,7 +231,9 @@ export default function TableRow({
     const renderSelectionCheckbox = () => {
         const checkbox = checkboxReplacementElement ?? (
             <Checkbox
-                shouldStopMouseDownPropagation
+                // While editing, let mousedown reach the row so it can snapshot the dismiss tap
+                // and skip preventDefault. Spend checkboxes do the same.
+                shouldStopMouseDownPropagation={!isEditingCell}
                 containerStyle={styles.m0}
                 style={styles.flex1}
                 isChecked={!!item.selected}
@@ -229,6 +257,18 @@ export default function TableRow({
     };
 
     const handleRowPress = (event?: GestureResponderEvent | KeyboardEvent | undefined) => {
+        // Consume the tap that dismissed an editing cell. A second tap will activate the row.
+        // We check the ref rather than isEditingCell because blur fires before onPress and resets the state.
+        if (wasEditingOnMouseDownRef.current) {
+            wasEditingOnMouseDownRef.current = false;
+            return;
+        }
+
+        // react-native-web fires onPress on Space for role="button" elements. Suppress it while a cell is being edited.
+        if (isEditingCell) {
+            return;
+        }
+
         if (isDisabled || !interactive) {
             return;
         }
@@ -255,6 +295,18 @@ export default function TableRow({
         tableMethods.setMobileSelectionModalRowKey(item.keyForList);
     };
 
+    // Snapshot at pointer down because blur clears isEditingCell before onPress.
+    // Overwrite so a press that never reaches onPress (popover dismiss) cannot stick.
+    const captureEditingOnMouseDown = () => {
+        wasEditingOnMouseDownRef.current = isEditingCell;
+    };
+
+    // Native never fires onMouseDown. On web, keep a flag already set by mousedown if
+    // blur cleared isEditingCell between the two events.
+    const captureEditingOnPressIn = () => {
+        wasEditingOnMouseDownRef.current = wasEditingOnMouseDownRef.current || isEditingCell;
+    };
+
     return (
         <OfflineWithFeedback
             {...offlineWithFeedback}
@@ -270,29 +322,30 @@ export default function TableRow({
                 interactive={interactive}
                 disabled={isDisabled}
                 hoverStyle={tableRowPressableHoverStyle}
+                onHoverIn={enableHoverStyle}
                 pressDimmingValue={!interactive ? undefined : 1}
                 role={interactive ? CONST.ROLE.BUTTON : CONST.ROLE.PRESENTATION}
                 {...getRowAccessibilityProps(isTableSemanticsEnabled, rowIndex, false, semanticTableHasHeader)}
                 onMouseDown={(e) => {
-                    const target = e?.target;
+                    captureEditingOnMouseDown();
 
-                    if (!(target instanceof HTMLElement)) {
-                        e.preventDefault();
-                        return;
-                    }
+                    const target = e?.target;
 
-                    if (target.tagName === CONST.ELEMENT_NAME.INPUT) {
+                    // Inputs must receive the mousedown so they can take focus.
+                    if (target instanceof HTMLElement && target.tagName === CONST.ELEMENT_NAME.INPUT) {
                         return;
                     }
 
-                    if (target.closest('[role="switch"]') || target.closest('[role="checkbox"]')) {
+                    // Keep the filter bar focused. While an inline editor is open, let the browser blur it so the value saves.
+                    if (!isEditingCell) {
                         e.preventDefault();
-                        return;
                     }
-
-                    e.preventDefault();
                 }}
                 onPress={(event) => handleRowPress(event)}
+                onPressIn={(event) => {
+                    captureEditingOnPressIn();
+                    onPressIn?.(event);
+                }}
                 onLongPress={handleRowLongPress}
                 {...props}
                 {...inertProps}
diff --git a/src/components/Table/TableSemanticContainer.tsx b/src/components/Table/TableSemanticContainer.tsx
index c9486b7594ec..ac67d5af0713 100644
--- a/src/components/Table/TableSemanticContainer.tsx
+++ b/src/components/Table/TableSemanticContainer.tsx
@@ -27,6 +27,9 @@ type TableSemanticContainerProps = {
     /** Number of columns, including the leading selection column when present. */
     columnCount: number;
 
+    /** Whether the table exposes a column-header row, which `aria-rowcount` has to count alongside the data rows. */
+    hasHeaderRow: boolean;
+
     /**
      * Whether `TableBody` still renders content while an inline-semantic table is empty (e.g. an empty-state or list
      * header is supplied). Its `role="rowgroup"` then needs the enclosing `role="table"` wrapper.
@@ -43,8 +46,9 @@ type TableSemanticContainerProps = {
     shouldUseDynamicColumns: boolean;
 
     /**
-     * The width the rows need when the columns are too wide to fit. Set only in that case, and it makes the header/body
-     * run scroll horizontally as one, so the header stays aligned with the rows it labels.
+     * The width the rows need when the columns don't fit, which scrolls the header/body run horizontally as one so the
+     * header stays aligned with its rows. Set only for tables whose filter bar isn't in the list. The others are
+     * scrolled by the list itself (see `TableBody`).
      */
     scrollWidth: number | undefined;
 
@@ -65,8 +69,23 @@ type TableSemanticContainerProps = {
  * (filter bar, empty states, …) outside the ARIA table. When neither layout handling nor semantics are needed, the
  * children render as-is to avoid an extra layout node. Header and body are contiguous in every table, so grouping the
  * consecutive run keeps a single table container while preserving child order.
+ *
+ * Columns that don't fit are scrolled here by wrapping that run in a horizontal scroller, which carries header and
+ * rows as one. Tables with an in-list filter bar can't use it, because the scroller would drag that bar sideways too,
+ * so their list takes the horizontal axis itself (see `TableBody`).
  */
-function TableSemanticContainer({isEnabled, title, rowCount, columnCount, rendersBodyWhenEmpty, shouldUseDynamicColumns, scrollWidth, onLayout, children}: TableSemanticContainerProps) {
+function TableSemanticContainer({
+    isEnabled,
+    title,
+    rowCount,
+    columnCount,
+    rendersBodyWhenEmpty,
+    shouldUseDynamicColumns,
+    hasHeaderRow,
+    scrollWidth,
+    onLayout,
+    children,
+}: TableSemanticContainerProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
 
@@ -102,7 +121,7 @@ function TableSemanticContainer({isEnabled, title, rowCount, columnCount, render
                 // it doesn't. Either way the measured node keeps the table's own width rather than growing with the
                 // content, so measuring it can't feed back into the widths it produced.
                 onLayout={scrollWidth ? undefined : onLayout}
-                {...getTableContainerAccessibilityProps(isEnabled, title, rowCount, columnCount)}
+                {...getTableContainerAccessibilityProps(isEnabled, title, rowCount, columnCount, hasHeaderRow)}
             >
                 {rowGroup}
             </View>
diff --git a/src/components/Table/buildTableListData.ts b/src/components/Table/buildTableListData.ts
index 5739bf15fd45..142218eead98 100644
--- a/src/components/Table/buildTableListData.ts
+++ b/src/components/Table/buildTableListData.ts
@@ -1,4 +1,7 @@
+import CONST from '@src/CONST';
+
 import type React from 'react';
+import type {ValueOf} from 'type-fest';
 
 import type {SharedListProps, TableData, TableRow} from './types';
 
@@ -6,27 +9,84 @@ const TABLE_HEADER_KEY = '__table_header__';
 
 type SyntheticRowKind = 'tableHeader' | 'data';
 
+type ColumnHeaderPlacement = ValueOf<typeof CONST.TABLES.COLUMN_HEADER_PLACEMENT>;
+
 type TableListMetadata = {
     hasPageHeader: boolean;
-    shouldRenderStickyHeader: boolean;
+    columnHeaderPlacement: ColumnHeaderPlacement;
     syntheticRowsBeforeData: number;
     stickyTableHeaderIndex: number;
     listDataRowOffset: number;
 };
 
-type TableListMetadataParams<DataType extends TableData> = {
+type ColumnHeaderPlacementParams = {
+    /** Whether the consumer passed a `Table.Header` child. Without one the table has no column header anywhere. */
+    hasColumnHeaderElement: boolean;
+
+    hasPageHeader: boolean;
+
+    hasRows: boolean;
+
+    /** Narrow layouts drop the column header unless the table has a title for it to sit under. */
+    isColumnHeaderHiddenInNarrowLayout: boolean;
+
+    /**
+     * Whether the columns are wider than the table and so have to scroll. FlashList's sticky-row overlay can't follow
+     * them, so the column header moves into the list header instead (see `TableBody`).
+     */
+    areColumnsScrollable: boolean;
+};
+
+type TableListMetadataParams<DataType extends TableData> = Omit<ColumnHeaderPlacementParams, 'hasPageHeader'> & {
     listHeaderElement?: React.ReactNode;
     listHeaderComponent?: SharedListProps<DataType>['ListHeaderComponent'];
-    shouldRenderStickyHeader: boolean;
 };
 
-function getTableListMetadata<DataType extends TableData>({listHeaderElement, listHeaderComponent, shouldRenderStickyHeader}: TableListMetadataParams<DataType>): TableListMetadata {
+function getColumnHeaderPlacement({
+    hasColumnHeaderElement,
+    hasPageHeader,
+    hasRows,
+    isColumnHeaderHiddenInNarrowLayout,
+    areColumnsScrollable,
+}: ColumnHeaderPlacementParams): ColumnHeaderPlacement {
+    if (!hasColumnHeaderElement) {
+        return CONST.TABLES.COLUMN_HEADER_PLACEMENT.NONE;
+    }
+
+    if (!hasRows || isColumnHeaderHiddenInNarrowLayout) {
+        return CONST.TABLES.COLUMN_HEADER_PLACEMENT.NONE;
+    }
+
+    // A table without a page header keeps the column header as a plain child of the table container, so the list is
+    // never the one placing it and the rest of the rules below don't apply.
+    if (!hasPageHeader) {
+        return CONST.TABLES.COLUMN_HEADER_PLACEMENT.OUTSIDE_LIST;
+    }
+
+    return areColumnsScrollable ? CONST.TABLES.COLUMN_HEADER_PLACEMENT.LIST_HEADER : CONST.TABLES.COLUMN_HEADER_PLACEMENT.STICKY_ROW;
+}
+
+/** Whether the table has a column header at all, wherever it ends up. Drives `aria-rowindex`/`aria-rowcount`. */
+function rendersColumnHeader(metadata: TableListMetadata): boolean {
+    return metadata.columnHeaderPlacement !== CONST.TABLES.COLUMN_HEADER_PLACEMENT.NONE;
+}
+
+function rendersColumnHeaderAsStickyRow(metadata: TableListMetadata): boolean {
+    return metadata.columnHeaderPlacement === CONST.TABLES.COLUMN_HEADER_PLACEMENT.STICKY_ROW;
+}
+
+function rendersColumnHeaderInListHeader(metadata: TableListMetadata): boolean {
+    return metadata.columnHeaderPlacement === CONST.TABLES.COLUMN_HEADER_PLACEMENT.LIST_HEADER;
+}
+
+function getTableListMetadata<DataType extends TableData>({listHeaderElement, listHeaderComponent, ...placementParams}: TableListMetadataParams<DataType>): TableListMetadata {
     const hasPageHeader = !!listHeaderComponent || !!listHeaderElement;
-    const syntheticRowsBeforeData = shouldRenderStickyHeader ? 1 : 0;
+    const columnHeaderPlacement = getColumnHeaderPlacement({...placementParams, hasPageHeader});
+    const syntheticRowsBeforeData = columnHeaderPlacement === CONST.TABLES.COLUMN_HEADER_PLACEMENT.STICKY_ROW ? 1 : 0;
 
     return {
         hasPageHeader,
-        shouldRenderStickyHeader,
+        columnHeaderPlacement,
         syntheticRowsBeforeData,
         stickyTableHeaderIndex: 0,
         listDataRowOffset: syntheticRowsBeforeData,
@@ -40,11 +100,11 @@ function createSyntheticRow<DataType extends TableData>(keyForList: string): Dat
 }
 
 function buildTableListData<DataType extends TableData>(data: Array<TableRow<DataType>>, metadata: TableListMetadata): DataType[] {
-    return [...(metadata.shouldRenderStickyHeader ? [createSyntheticRow<DataType>(TABLE_HEADER_KEY)] : []), ...data];
+    return [...(rendersColumnHeaderAsStickyRow(metadata) ? [createSyntheticRow<DataType>(TABLE_HEADER_KEY)] : []), ...data];
 }
 
 function getSyntheticRowKind(index: number, metadata: TableListMetadata): SyntheticRowKind {
-    if (metadata.shouldRenderStickyHeader && index === metadata.stickyTableHeaderIndex) {
+    if (rendersColumnHeaderAsStickyRow(metadata) && index === metadata.stickyTableHeaderIndex) {
         return 'tableHeader';
     }
 
@@ -71,12 +131,23 @@ function getDataVisibleIndices({startIndex, endIndex}: {startIndex: number; endI
 }
 
 function getAdjustedStickyHeaderIndices(metadata: TableListMetadata, stickyHeaderIndices: SharedListProps<TableData>['stickyHeaderIndices']) {
-    if (metadata.shouldRenderStickyHeader) {
+    if (rendersColumnHeaderAsStickyRow(metadata)) {
         return [metadata.stickyTableHeaderIndex];
     }
 
     return stickyHeaderIndices;
 }
 
-export {buildTableListData, getAdjustedStickyHeaderIndices, getDataIndex, getDataVisibleIndices, getListIndex, getSyntheticRowKind, getTableListMetadata};
+export {
+    buildTableListData,
+    getAdjustedStickyHeaderIndices,
+    getDataIndex,
+    getDataVisibleIndices,
+    getListIndex,
+    getSyntheticRowKind,
+    getTableListMetadata,
+    rendersColumnHeader,
+    rendersColumnHeaderAsStickyRow,
+    rendersColumnHeaderInListHeader,
+};
 export type {TableListMetadata};
diff --git a/src/components/Tables/WorkspaceCategoriesTable/WorkspaceCategoriesTableRow.tsx b/src/components/Tables/WorkspaceCategoriesTable/WorkspaceCategoriesTableRow.tsx
index 5add15fae021..fb566039228b 100644
--- a/src/components/Tables/WorkspaceCategoriesTable/WorkspaceCategoriesTableRow.tsx
+++ b/src/components/Tables/WorkspaceCategoriesTable/WorkspaceCategoriesTableRow.tsx
@@ -1,4 +1,5 @@
 import UserAvatar from '@components/Avatar/UserAvatar';
+import {InlineTextEditCell} from '@components/EditableCell';
 import Icon from '@components/Icon';
 import Switch from '@components/Switch';
 import Table from '@components/Table';
@@ -68,10 +69,11 @@ export default function WorkspaceCategoriesTableRow({rowIndex, shouldUseNarrowTa
                         style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}
                         {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                     >
-                        <TextWithTooltip
-                            shouldShowTooltip
-                            numberOfLines={1}
-                            text={item.name}
+                        <InlineTextEditCell
+                            value={item.name}
+                            accessibilityLabel={translate('common.name')}
+                            canEdit={item.canEditName && !item.disabled}
+                            onSave={item.onRenameName}
                         />
                     </View>
 
diff --git a/src/components/Tables/WorkspaceCategoriesTable/index.tsx b/src/components/Tables/WorkspaceCategoriesTable/index.tsx
index 87916ad93e01..11866db6ef6d 100644
--- a/src/components/Tables/WorkspaceCategoriesTable/index.tsx
+++ b/src/components/Tables/WorkspaceCategoriesTable/index.tsx
@@ -32,9 +32,11 @@ type WorkspaceCategoryTableRowData = TableData & {
     errors?: OnyxCommon.Errors;
     pendingAction?: OnyxCommon.PendingAction;
     isLocked: boolean;
+    canEditName: boolean;
     action: () => void;
     dismissError: () => void;
     onToggleEnabled: (enabled: boolean) => void;
+    onRenameName: (newName: string) => void;
 };
 
 type WorkspaceCategoriesTableProps = {
@@ -71,6 +73,10 @@ export default function WorkspaceCategoriesTable({
             key: 'name',
             label: translate('common.name'),
             sortable: true,
+            styling: {
+                // editableCellHeader matches the padded name cell so the label and value share an edge.
+                containerStyles: [styles.editableCellHeader],
+            },
         },
         ...(shouldShowGLCodeColumn
             ? [
diff --git a/src/components/Tables/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableRow.tsx b/src/components/Tables/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableRow.tsx
index 4c98a84e0edb..37f31ddc3b21 100644
--- a/src/components/Tables/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableRow.tsx
+++ b/src/components/Tables/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableRow.tsx
@@ -1,5 +1,6 @@
 import AccountAvatarWithCardFeed from '@components/Avatar/connected/AccountAvatarWithCardFeed';
 import Button from '@components/Button';
+import {InlineTextEditCell} from '@components/EditableCell';
 import Icon from '@components/Icon';
 import type {TableData} from '@components/Table';
 import Table from '@components/Table';
@@ -31,6 +32,13 @@ type WorkspaceCompanyCardTableRowData = TableData &
         isCardDeleted: boolean;
         isAssigned: boolean;
         assignedCard?: Card;
+
+        /** Whether the card name can be edited inline from the table. Only assigned cards opt in. */
+        canEditName?: boolean;
+
+        /** Provided only when `canEditName` is supported. */
+        onRenameName?: (newName: string) => void;
+
         exportAccountTitle?: string;
         onDismissError?: () => void;
     };
@@ -184,11 +192,12 @@ function WorkspaceCompanyCardTableRow({
                             style={[styles.flex1, styles.mnw0, styles.justifyContentCenter]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <TextWithTooltip
-                                shouldShowTooltip
-                                numberOfLines={1}
-                                text={customCardName ?? ''}
-                                style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                            <InlineTextEditCell
+                                value={customCardName ?? ''}
+                                accessibilityLabel={translate('workspace.companyCards.cardName')}
+                                canEdit={!!item.canEditName && !item.isCardDeleted}
+                                onSave={item.onRenameName}
+                                displayTextStyle={[styles.lh16, styles.optionDisplayName, styles.pre]}
                             />
                         </View>
                     )}
diff --git a/src/components/Tables/WorkspaceCompanyCardsTable/index.tsx b/src/components/Tables/WorkspaceCompanyCardsTable/index.tsx
index 0e25dbcf9f9e..9b644b50f32f 100644
--- a/src/components/Tables/WorkspaceCompanyCardsTable/index.tsx
+++ b/src/components/Tables/WorkspaceCompanyCardsTable/index.tsx
@@ -20,6 +20,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {resetFailedWorkspaceCompanyCardUnassignment} from '@libs/actions/CompanyCards';
+import {renameCompanyCardInline} from '@libs/actions/Policy/InlineEdit';
 import {formatMaskedCardName, getCompanyCardCustomName, getDefaultCardName} from '@libs/CardUtils';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
 import tokenizedSearch from '@libs/tokenizedSearch';
@@ -190,6 +191,7 @@ function WorkspaceCompanyCardsTable({
     const isGB = countryByIp === CONST.COUNTRY.GB;
     const shouldShowGBDisclaimer = isGB && (isNoFeed || hasNoAssignedCard);
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
+    const isSelectionModeActive = selectedCardKeys.length > 0 || isSelectionModeEnabled;
 
     // Drives the actions column's dynamic sizing below. Mirrors the row's own Assign button condition rather than
     // isAssigningCardDisabled, since a disabled Assign button still renders and needs the same space as an enabled one.
@@ -241,7 +243,8 @@ function WorkspaceCompanyCardsTable({
             label: translate('workspace.companyCards.cardName'),
             sortable: true,
             styling: {
-                containerStyles: [styles.mnw0],
+                // editableCellHeader matches the padded card name cell so the label and value share an edge.
+                containerStyles: [styles.mnw0, styles.editableCellHeader],
             },
             dynamicSizing: {
                 getContentToMeasure: (item) => (item.customCardName ? [{text: item.customCardName, fontSize: fontScale.text}] : []),
@@ -274,14 +277,20 @@ function WorkspaceCompanyCardsTable({
         : (companyCardEntries ?? [])
               .map(({cardName, encryptedCardNumber, isAssigned, assignedCard}) => {
                   const cardholder = assignedCard?.accountID ? personalDetails?.[assignedCard.accountID] : undefined;
+                  const isCardDeleted = assignedCard?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                  const cardID = assignedCard?.cardID;
+                  // The cell shows a placeholder when the card was never renamed. Rollback uses the stored name so a failed rename does not persist that placeholder.
+                  const storedCardName = getCompanyCardCustomName(cardID, sharedCardCustomNames, customCardNames);
+                  const customCardName = storedCardName ?? getDefaultCardName(cardholder?.displayName ?? '');
+                  const canEditName = canWriteCompanyCards && !!bankName && isAssigned && cardID !== undefined && !isCardDeleted && !isSelectionModeActive;
 
                   return {
                       cardName,
-                      keyForList: `${cardName}_${assignedCard?.cardID ?? 'unassigned'}_${encryptedCardNumber}`,
+                      keyForList: `${cardName}_${cardID ?? 'unassigned'}_${encryptedCardNumber}`,
                       encryptedCardNumber,
-                      customCardName: getCompanyCardCustomName(assignedCard?.cardID, sharedCardCustomNames, customCardNames) ?? getDefaultCardName(cardholder?.displayName ?? ''),
-                      isCardDeleted: assignedCard?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                      disabled: assignedCard?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                      customCardName,
+                      isCardDeleted,
+                      disabled: isCardDeleted,
                       isAssigned,
                       assignedCard,
                       cardholder,
@@ -289,6 +298,13 @@ function WorkspaceCompanyCardsTable({
                       exportAccountTitle: shouldShowExportAccountColumn && assignedCard ? getCardExportAccountTitle(cardExportSettings, assignedCard) : undefined,
                       errors: isFeedConnectionBroken || assignedCard?.pendingFields?.lastScrape ? undefined : assignedCard?.errors,
                       pendingAction: assignedCard?.pendingAction,
+                      canEditName,
+                      onRenameName: (newName: string) => {
+                          if (!bankName || cardID === undefined) {
+                              return;
+                          }
+                          renameCompanyCardInline(domainOrWorkspaceAccountID, String(cardID), newName, bankName, customCardName, storedCardName);
+                      },
                       onDismissError: () => resetFailedWorkspaceCompanyCardUnassignment(domainOrWorkspaceAccountID, bankName, assignedCard?.cardID),
                   };
               })
diff --git a/src/components/Tables/WorkspaceDistanceRatesTable/WorkspaceDistanceRateValueCell.tsx b/src/components/Tables/WorkspaceDistanceRatesTable/WorkspaceDistanceRateValueCell.tsx
new file mode 100644
index 000000000000..625d9ac808ad
--- /dev/null
+++ b/src/components/Tables/WorkspaceDistanceRatesTable/WorkspaceDistanceRateValueCell.tsx
@@ -0,0 +1,35 @@
+import {InlineNumberEditCell} from '@components/EditableCell';
+import type {EditableProps} from '@components/EditableCell';
+
+import useLocalize from '@hooks/useLocalize';
+
+import CONST from '@src/CONST';
+import type {Rate} from '@src/types/onyx/Policy';
+
+import React from 'react';
+
+type WorkspaceDistanceRateValueCellProps = {
+    rate: Rate;
+    displayText: string;
+} & EditableProps<string>;
+
+function WorkspaceDistanceRateValueCell({rate, displayText, canEdit, onSave}: WorkspaceDistanceRateValueCellProps) {
+    const {translate} = useLocalize();
+    const currency = rate.currency ?? CONST.CURRENCY.USD;
+    const rateValue = (parseFloat((rate.rate ?? 0).toString()) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET).toFixed(CONST.MAX_TAX_RATE_DECIMAL_PLACES);
+
+    return (
+        <InlineNumberEditCell
+            value={rateValue}
+            currency={currency}
+            displayText={displayText}
+            decimals={CONST.MAX_TAX_RATE_DECIMAL_PLACES}
+            textAlign="left"
+            accessibilityLabel={translate('workspace.distanceRates.rate')}
+            canEdit={canEdit}
+            onSave={onSave}
+        />
+    );
+}
+
+export default WorkspaceDistanceRateValueCell;
diff --git a/src/components/Tables/WorkspaceDistanceRatesTable/WorkspaceDistanceRatesTableRow.tsx b/src/components/Tables/WorkspaceDistanceRatesTable/WorkspaceDistanceRatesTableRow.tsx
index e805120fedd7..47d9b941749a 100644
--- a/src/components/Tables/WorkspaceDistanceRatesTable/WorkspaceDistanceRatesTableRow.tsx
+++ b/src/components/Tables/WorkspaceDistanceRatesTable/WorkspaceDistanceRatesTableRow.tsx
@@ -1,3 +1,4 @@
+import {InlineTextEditCell} from '@components/EditableCell';
 import Icon from '@components/Icon';
 import StatusBadge from '@components/StatusBadge';
 import Switch from '@components/Switch';
@@ -28,6 +29,8 @@ import {format, parseISO} from 'date-fns';
 import React from 'react';
 import {View} from 'react-native';
 
+import WorkspaceDistanceRateValueCell from './WorkspaceDistanceRateValueCell';
+
 type DistanceRateTableItemData = TableData & {
     rateID: string;
     rate: Rate;
@@ -39,6 +42,10 @@ type DistanceRateTableItemData = TableData & {
     action: () => void;
     dismissError: () => void;
     onToggleEnabled: (value: boolean) => void;
+    canEditName: boolean;
+    onRenameName: (newName: string) => void;
+    canEditRate: boolean;
+    onChangeRate: (newRate: string) => void;
 };
 
 type WorkspaceDistanceRatesTableRowProps = {
@@ -187,25 +194,26 @@ function WorkspaceDistanceRatesTableRow({item, rowIndex, shouldUseNarrowTableLay
                             style={[styles.flex1]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <TextWithTooltip
-                                shouldShowTooltip
-                                numberOfLines={1}
-                                text={rate.name ?? ''}
-                                style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                            <InlineTextEditCell
+                                value={rate.name ?? ''}
+                                accessibilityLabel={translate('common.name')}
+                                canEdit={item.canEditName && !item.disabled}
+                                onSave={item.onRenameName}
+                                displayTextStyle={[styles.lh16, styles.optionDisplayName, styles.pre]}
                             />
                         </View>
                     )}
 
                     {!shouldUseNarrowTableLayout && (
                         <View
-                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap2]}
+                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.editableCellColumn]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <TextWithTooltip
-                                shouldShowTooltip
-                                numberOfLines={1}
-                                text={formattedRate}
-                                style={[styles.lh16, styles.optionDisplayName, styles.pre, styles.flexShrink1]}
+                            <WorkspaceDistanceRateValueCell
+                                rate={rate}
+                                displayText={formattedRate}
+                                canEdit={item.canEditRate && !item.disabled}
+                                onSave={item.onChangeRate}
                             />
                             {autoGeneratedIcon}
                         </View>
diff --git a/src/components/Tables/WorkspaceDistanceRatesTable/index.tsx b/src/components/Tables/WorkspaceDistanceRatesTable/index.tsx
index 481850c8aa32..75a30fb9d701 100644
--- a/src/components/Tables/WorkspaceDistanceRatesTable/index.tsx
+++ b/src/components/Tables/WorkspaceDistanceRatesTable/index.tsx
@@ -70,8 +70,24 @@ function WorkspaceDistanceRatesTable({
             width: variables.tableStatusColumnWidth,
             styling: {containerStyles: [styles.justifyContentCenter]},
         },
-        {key: 'name', label: translate('common.name'), sortable: true},
-        {key: 'rate', label: translate('workspace.distanceRates.rate'), sortable: true},
+        {
+            key: 'name',
+            label: translate('common.name'),
+            sortable: true,
+            styling: {
+                // editableCellHeader matches the padded name cell so the label and value share an edge.
+                containerStyles: [styles.editableCellHeader],
+            },
+        },
+        {
+            key: 'rate',
+            label: translate('workspace.distanceRates.rate'),
+            sortable: true,
+            styling: {
+                // Same chrome as the name column so the rate label lines up with the padded rate cell.
+                containerStyles: [styles.editableCellHeader],
+            },
+        },
         ...(hasAnyDateBound
             ? ([
                   {key: 'startDate', label: translate('workspace.distanceRates.startDate'), sortable: true},
diff --git a/src/components/Tables/WorkspaceExpenseDefaultsTable/WorkspaceExpenseDefaultsTableRow.tsx b/src/components/Tables/WorkspaceExpenseDefaultsTable/WorkspaceExpenseDefaultsTableRow.tsx
index de0d69719442..7e602700a3a2 100644
--- a/src/components/Tables/WorkspaceExpenseDefaultsTable/WorkspaceExpenseDefaultsTableRow.tsx
+++ b/src/components/Tables/WorkspaceExpenseDefaultsTable/WorkspaceExpenseDefaultsTableRow.tsx
@@ -106,7 +106,7 @@ function WorkspaceExpenseDefaultsTableRow({item, rowIndex, shouldUseNarrowTableL
             <Table.Row
                 interactive
                 rowIndex={rowIndex}
-                disabled={isDeleting}
+                disabled={isDeleting || !!item.disabled}
                 accessibilityLabel={accessibilityLabel}
                 sentryLabel={SECTION_SENTRY_LABELS[item.section]}
                 offlineWithFeedback={{
diff --git a/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardLimitCell.tsx b/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardLimitCell.tsx
new file mode 100644
index 000000000000..2d26f8b6a3e2
--- /dev/null
+++ b/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardLimitCell.tsx
@@ -0,0 +1,34 @@
+import {InlineNumberEditCell} from '@components/EditableCell';
+import type {EditableProps} from '@components/EditableCell';
+
+import useLocalize from '@hooks/useLocalize';
+
+import {convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+type WorkspaceExpensifyCardLimitCellProps = {
+    /** Unapproved expense limit in cents */
+    limit: number;
+    currency?: string;
+    displayText: string;
+} & EditableProps<string>;
+
+function WorkspaceExpensifyCardLimitCell({limit, currency = CONST.CURRENCY.USD, displayText, canEdit, onSave}: WorkspaceExpensifyCardLimitCellProps) {
+    const {translate} = useLocalize();
+
+    return (
+        <InlineNumberEditCell
+            value={convertToFrontendAmountAsString(limit, 0)}
+            currency={currency}
+            displayText={displayText}
+            accessibilityLabel={translate('workspace.expensifyCard.limit')}
+            canEdit={canEdit}
+            onSave={onSave}
+        />
+    );
+}
+
+export default WorkspaceExpensifyCardLimitCell;
diff --git a/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardLimitTypeCell.tsx b/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardLimitTypeCell.tsx
new file mode 100644
index 000000000000..f0a4ac0e6729
--- /dev/null
+++ b/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardLimitTypeCell.tsx
@@ -0,0 +1,67 @@
+import {EditableCell, usePopoverEditState} from '@components/EditableCell';
+import TextWithTooltip from '@components/TextWithTooltip';
+import WorkspaceExpensifyCardLimitTypePickerModal, {useWorkspaceExpensifyCardLimitTypePickerPopover} from '@components/WorkspaceExpensifyCardLimitTypePickerModal';
+
+import useLocalize from '@hooks/useLocalize';
+
+import {getDefaultExpensifyCardLimitType, getDisplayedExpensifyCardLimitType, getTranslationKeyForLimitType} from '@libs/CardUtils';
+
+import type {Card, Policy} from '@src/types/onyx';
+import type {CardLimitType} from '@src/types/onyx/Card';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import React from 'react';
+
+type WorkspaceExpensifyCardLimitTypeCellProps = {
+    limitType: CardLimitType | undefined;
+    card: Card;
+    policy: OnyxEntry<Policy>;
+    canEdit?: boolean;
+    onSave?: (limitType: CardLimitType) => void;
+};
+
+function WorkspaceExpensifyCardLimitTypeCell({limitType, card, policy, canEdit, onSave}: WorkspaceExpensifyCardLimitTypeCellProps) {
+    const {translate} = useLocalize();
+    const currentLimitType = getDisplayedExpensifyCardLimitType(limitType, getDefaultExpensifyCardLimitType(policy));
+    const limitTypeLabel = translate(getTranslationKeyForLimitType(currentLimitType));
+    const {popoverHeight} = useWorkspaceExpensifyCardLimitTypePickerPopover({card, policy});
+
+    const {isEditing, anchorRef, isPopoverVisible, popoverPosition, isInverted, startEditing, cancelEditing, handleSave} = usePopoverEditState({
+        canEdit,
+        value: currentLimitType,
+        onSave,
+        popoverHeight,
+    });
+
+    return (
+        <EditableCell
+            canEdit={canEdit}
+            isEditing={isEditing}
+            onStartEditing={startEditing}
+            anchorRef={anchorRef}
+            popoverContent={
+                <WorkspaceExpensifyCardLimitTypePickerModal
+                    policy={policy}
+                    card={card}
+                    selectedLimitType={currentLimitType}
+                    isVisible={isPopoverVisible}
+                    onClose={cancelEditing}
+                    anchorPosition={popoverPosition}
+                    shouldMeasureAnchorPositionFromTop={!isInverted}
+                    onSelected={(selectedLimitType) => {
+                        handleSave(selectedLimitType);
+                    }}
+                />
+            }
+        >
+            <TextWithTooltip
+                shouldShowTooltip
+                numberOfLines={1}
+                text={limitTypeLabel}
+            />
+        </EditableCell>
+    );
+}
+
+export default WorkspaceExpensifyCardLimitTypeCell;
diff --git a/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardsTableRow.tsx b/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardsTableRow.tsx
index 5db51f66b01d..7848e3885868 100644
--- a/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardsTableRow.tsx
+++ b/src/components/Tables/WorkspaceExpensifyCardsTable/WorkspaceExpensifyCardsTableRow.tsx
@@ -1,4 +1,5 @@
 import UserAvatar from '@components/Avatar/UserAvatar';
+import {InlineTextEditCell} from '@components/EditableCell';
 import Icon from '@components/Icon';
 import {useSession} from '@components/OnyxListItemProvider';
 import Table from '@components/Table';
@@ -11,7 +12,7 @@ import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getTranslationKeyForCardStatus, getTranslationKeyForLimitType} from '@libs/CardUtils';
+import {getDefaultExpensifyCardLimitType, getDisplayedExpensifyCardLimitType, getTranslationKeyForCardStatus, getTranslationKeyForLimitType} from '@libs/CardUtils';
 import {convertToShortDisplayString} from '@libs/CurrencyUtils';
 import DateUtils from '@libs/DateUtils';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
@@ -19,22 +20,31 @@ import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
 import {View} from 'react-native';
 
 import type {WorkspaceExpensifyCardTableRowData} from '.';
 
+import WorkspaceExpensifyCardLimitCell from './WorkspaceExpensifyCardLimitCell';
+import WorkspaceExpensifyCardLimitTypeCell from './WorkspaceExpensifyCardLimitTypeCell';
+
 type WorkspaceExpensifyCardsTableRowProps = {
     item: WorkspaceExpensifyCardTableRowData;
     rowIndex: number;
     shouldUseNarrowTableLayout: boolean;
 
+    /** Policy used to determine which limit types can be assigned from the inline editor */
+    policy: OnyxEntry<Policy>;
+
     /** Whether the Export account column is shown, so the row must keep its cell in step with the column */
     shouldShowExportAccountColumn: boolean;
 };
 
-export default function WorkspaceExpensifyCardsTableRow({item, rowIndex, shouldUseNarrowTableLayout, shouldShowExportAccountColumn}: WorkspaceExpensifyCardsTableRowProps) {
+export default function WorkspaceExpensifyCardsTableRow({item, rowIndex, shouldUseNarrowTableLayout, policy, shouldShowExportAccountColumn}: WorkspaceExpensifyCardsTableRowProps) {
     const icons = useMemoizedLazyExpensifyIcons(['ArrowRight', 'FreezeCard']);
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber, dateFnsLocale} = useLocalize();
@@ -48,7 +58,7 @@ export default function WorkspaceExpensifyCardsTableRow({item, rowIndex, shouldU
     const cardholderName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: item.cardholder, translate, formatPhoneNumber});
     const narrowLayoutSubtitle = [item.lastFourPAN, item.name].filter(Boolean).join(` ${CONST.DOT_SEPARATOR} `);
     const cardType = item.isVirtual ? translate('workspace.expensifyCard.virtual') : translate('workspace.expensifyCard.physical');
-    const limitTypeLabel = translate(getTranslationKeyForLimitType(item.limitType));
+    const limitTypeLabel = translate(getTranslationKeyForLimitType(getDisplayedExpensifyCardLimitType(item.limitType, getDefaultExpensifyCardLimitType(policy))));
     const statusTranslationKey = getTranslationKeyForCardStatus(item.card.state, item.isVirtual);
     const statusLabel = statusTranslationKey ? translate(statusTranslationKey) : '';
     const formattedLimit = convertToShortDisplayString(item.limit, item.currency);
@@ -137,12 +147,15 @@ export default function WorkspaceExpensifyCardsTableRow({item, rowIndex, shouldU
                                     style={[styles.textLabelSupporting, styles.lh16, styles.pre, styles.mr3]}
                                 />
                             ) : (
-                                <TextWithTooltip
-                                    shouldShowTooltip
-                                    numberOfLines={1}
-                                    text={item.name}
-                                    style={styles.textLabelSupporting}
-                                />
+                                <View style={styles.editableCellFlushWithSibling}>
+                                    <InlineTextEditCell
+                                        value={item.name}
+                                        accessibilityLabel={translate('workspace.card.issueNewCard.cardName')}
+                                        canEdit={!!item.canEditName}
+                                        onSave={item.onRenameName}
+                                        displayTextStyle={[styles.textLabelSupporting, styles.lh16]}
+                                    />
+                                </View>
                             )}
                         </View>
                     </View>
@@ -162,13 +175,15 @@ export default function WorkspaceExpensifyCardsTableRow({item, rowIndex, shouldU
 
                     {!shouldUseNarrowTableLayout && (
                         <View
-                            style={[styles.flex1, styles.mnw0, styles.flexRow, styles.alignItemsCenter]}
+                            style={[styles.flex1, styles.mnw0, styles.flexRow, styles.alignItemsCenter, styles.editableCellColumn]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <TextWithTooltip
-                                shouldShowTooltip
-                                numberOfLines={1}
-                                text={limitTypeLabel}
+                            <WorkspaceExpensifyCardLimitTypeCell
+                                limitType={item.limitType}
+                                card={item.card}
+                                policy={policy}
+                                canEdit={!!item.canEditLimitType}
+                                onSave={item.onChangeLimitType}
                             />
                         </View>
                     )}
@@ -218,13 +233,16 @@ export default function WorkspaceExpensifyCardsTableRow({item, rowIndex, shouldU
                             shouldUseNarrowTableLayout ? styles.alignItemsEnd : styles.flex1,
                             shouldUseNarrowTableLayout ? styles.justifyContentStart : styles.alignItemsCenter,
                             shouldUseNarrowTableLayout ? undefined : styles.justifyContentEnd,
+                            !shouldUseNarrowTableLayout && styles.editableCellColumn,
                         ]}
                         {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                     >
-                        <TextWithTooltip
-                            shouldShowTooltip
-                            numberOfLines={1}
-                            text={formattedLimit}
+                        <WorkspaceExpensifyCardLimitCell
+                            limit={item.limit}
+                            currency={item.currency}
+                            displayText={formattedLimit}
+                            canEdit={!!item.canEditLimit}
+                            onSave={item.onChangeLimit}
                         />
                         {shouldUseNarrowTableLayout && (
                             <Text
@@ -238,7 +256,7 @@ export default function WorkspaceExpensifyCardsTableRow({item, rowIndex, shouldU
 
                     {!shouldUseNarrowTableLayout && (
                         <View
-                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}
+                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd, styles.editableCellHeader]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
                             <TextWithTooltip
diff --git a/src/components/Tables/WorkspaceExpensifyCardsTable/index.tsx b/src/components/Tables/WorkspaceExpensifyCardsTable/index.tsx
index d1968811a845..b1dd7dca94e7 100644
--- a/src/components/Tables/WorkspaceExpensifyCardsTable/index.tsx
+++ b/src/components/Tables/WorkspaceExpensifyCardsTable/index.tsx
@@ -6,7 +6,13 @@ import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {filterCardsByPersonalDetails, getTranslationKeyForCardStatus, getTranslationKeyForLimitType} from '@libs/CardUtils';
+import {
+    filterCardsByPersonalDetails,
+    getDefaultExpensifyCardLimitType,
+    getDisplayedExpensifyCardLimitType,
+    getTranslationKeyForCardStatus,
+    getTranslationKeyForLimitType,
+} from '@libs/CardUtils';
 import {convertToShortDisplayString} from '@libs/CurrencyUtils';
 import {getLatestErrorMessage} from '@libs/ErrorUtils';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
@@ -17,7 +23,7 @@ import WorkspaceCardListLabels from '@pages/workspace/expensifyCard/WorkspaceCar
 import {fontScale} from '@styles/typography';
 import variables from '@styles/variables';
 
-import type {Card, PersonalDetails, PersonalDetailsList} from '@src/types/onyx';
+import type {Card, PersonalDetails, PersonalDetailsList, Policy} from '@src/types/onyx';
 import type {CardLimitType} from '@src/types/onyx/Card';
 import type ExpensifyCardSettings from '@src/types/onyx/ExpensifyCardSettings';
 import type {ExpensifyCardSettingsBase} from '@src/types/onyx/ExpensifyCardSettings';
@@ -26,6 +32,7 @@ import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type {ListRenderItemInfo} from '@shopify/flash-list';
 import type {ReactElement} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
 import {View} from 'react-native';
@@ -51,12 +58,19 @@ type WorkspaceExpensifyCardTableRowData = TableData & {
     frozenDate?: string;
     errors?: OnyxCommon.Errors;
     pendingAction?: OnyxCommon.PendingAction;
+    canEditName?: boolean;
+    canEditLimitType?: boolean;
+    canEditLimit?: boolean;
     action: () => void;
+    onRenameName?: (newName: string) => void;
+    onChangeLimitType?: (limitType: CardLimitType) => void;
+    onChangeLimit?: (newLimit: string) => void;
     onClose: () => void;
 };
 
 type WorkspaceExpensifyCardsTableProps = {
     policyID: string;
+    policy: OnyxEntry<Policy>;
 
     /** Optional page-level content rendered above the card labels that scrolls with the rows */
     headerComponent?: ReactElement;
@@ -92,6 +106,7 @@ type WorkspaceExpensifyCardsTableProps = {
 
 export default function WorkspaceExpensifyCardsTable({
     policyID,
+    policy,
     headerComponent,
     cards,
     selectionEnabled,
@@ -111,6 +126,8 @@ export default function WorkspaceExpensifyCardsTable({
 
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
     const errorMessage = getLatestErrorMessage(cardSettings) ?? '';
+    const defaultLimitType = getDefaultExpensifyCardLimitType(policy);
+    const getLimitTypeLabel = (limitType: CardLimitType | undefined) => translate(getTranslationKeyForLimitType(getDisplayedExpensifyCardLimitType(limitType, defaultLimitType)));
 
     const columns: Array<TableColumn<WorkspaceExpensifyCardTableColumnKey, WorkspaceExpensifyCardTableRowData>> = [
         {
@@ -150,10 +167,13 @@ export default function WorkspaceExpensifyCardsTable({
             label: translate('workspace.card.issueNewCard.limitType'),
             sortable: true,
             styling: {
-                containerStyles: [styles.mnw0],
+                // minWidth: 0 lets the grid track size purely from its 1fr share instead of the cell content,
+                // so a long limit type value truncates instead of widening the column.
+                // editableCellHeader matches the padded Limit type cell so the label and value share an edge.
+                containerStyles: [styles.mnw0, styles.editableCellHeader],
             },
             dynamicSizing: {
-                getContentToMeasure: (item) => [{text: translate(getTranslationKeyForLimitType(item.limitType)), fontSize: fontScale.text}],
+                getContentToMeasure: (item) => [{text: getLimitTypeLabel(item.limitType), fontSize: fontScale.text}],
                 shouldFitContent: true,
             },
         },
@@ -187,7 +207,8 @@ export default function WorkspaceExpensifyCardsTable({
             label: translate('workspace.expensifyCard.limit'),
             sortable: true,
             styling: {
-                containerStyles: [styles.justifyContentEnd],
+                // editableCellHeader insets the right-aligned label to match the padded Limit cell.
+                containerStyles: [styles.justifyContentEnd, styles.editableCellHeader],
             },
             dynamicSizing: {
                 getContentToMeasure: (item) => [{text: convertToShortDisplayString(item.limit, item.currency), fontSize: fontScale.text}],
@@ -199,7 +220,8 @@ export default function WorkspaceExpensifyCardsTable({
             label: translate('workspace.expensifyCard.remaining'),
             sortable: true,
             styling: {
-                containerStyles: [styles.justifyContentEnd],
+                // Same chrome as Limit so the two amount columns share a right edge even though Remaining is not editable.
+                containerStyles: [styles.justifyContentEnd, styles.editableCellHeader],
             },
             dynamicSizing: {
                 getContentToMeasure: (item) => [{text: convertToShortDisplayString(item.remainingLimit, item.currency), fontSize: fontScale.text}],
@@ -224,8 +246,8 @@ export default function WorkspaceExpensifyCardsTable({
         }
 
         if (activeSorting.columnKey === 'limitType') {
-            const limitType1 = translate(getTranslationKeyForLimitType(item1.limitType));
-            const limitType2 = translate(getTranslationKeyForLimitType(item2.limitType));
+            const limitType1 = getLimitTypeLabel(item1.limitType);
+            const limitType2 = getLimitTypeLabel(item2.limitType);
             return localeCompare(limitType1, limitType2) * orderMultiplier;
         }
 
@@ -269,6 +291,7 @@ export default function WorkspaceExpensifyCardsTable({
             item={item}
             rowIndex={index}
             shouldUseNarrowTableLayout={shouldUseNarrowTableLayout}
+            policy={policy}
             shouldShowExportAccountColumn={shouldShowExportAccountColumn}
         />
     );
diff --git a/src/components/Tables/WorkspaceListTable/WorkspaceRowBrickRoadIndicator.tsx b/src/components/Tables/WorkspaceListTable/WorkspaceRowBrickRoadIndicator.tsx
index 6024109a71f6..a7a78ad6d77c 100644
--- a/src/components/Tables/WorkspaceListTable/WorkspaceRowBrickRoadIndicator.tsx
+++ b/src/components/Tables/WorkspaceListTable/WorkspaceRowBrickRoadIndicator.tsx
@@ -7,7 +7,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 
 import {isConnectionInProgress} from '@libs/actions/connections';
-import {getPolicyBrickRoadIndicatorStatus, getUberConnectionErrorDirectlyFromPolicy, isMergeHRCompleteSetupNeededSelector, shouldShowEmployeeListError} from '@libs/PolicyUtils';
+import {
+    getPolicyBrickRoadIndicatorStatus,
+    getUberConnectionErrorDirectlyFromPolicy,
+    isMergeHRCompleteSetupNeededSelector,
+    isQBORefreshTokenExpiringSoonSelector,
+    shouldShowEmployeeListError,
+} from '@libs/PolicyUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -48,12 +54,13 @@ function WorkspaceRowBrickRoadIndicator({policyID}: WorkspaceRowBrickRoadIndicat
     const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`);
     const [hasPolicyErrors] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {selector: createPolicyErrorsSelector(connectionSyncProgress)});
     const [isHRCompleteSetupNeeded] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {selector: isMergeHRCompleteSetupNeededSelector});
+    const [isQBORefreshTokenExpiringSoon] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {selector: isQBORefreshTokenExpiringSoonSelector});
 
-    // All of the error sources resolve to ERROR or undefined; the HR setup check is the only INFO source
-    // and every error takes precedence over it.
+    // All of the error sources resolve to ERROR or undefined. The HR setup check and the QBO token expiry
+    // warning are the only INFO sources, and every error takes precedence over them.
     const hasError = !!hasReimbursementAccountErrors || !!hasCardFeedErrors || !!hasPolicyErrors;
 
-    if (!hasError && !isHRCompleteSetupNeeded) {
+    if (!hasError && !isHRCompleteSetupNeeded && !isQBORefreshTokenExpiringSoon) {
         return null;
     }
 
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
new file mode 100644
index 000000000000..08ccdd0ef3b7
--- /dev/null
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMemberRoleCell.tsx
@@ -0,0 +1,62 @@
+import {EditableCell, usePopoverEditState} from '@components/EditableCell';
+import Text from '@components/Text';
+import WorkspaceMemberRolePickerModal, {useWorkspaceMemberRolePickerPopover} from '@components/WorkspaceMemberRolePickerModal';
+
+import useLocalize from '@hooks/useLocalize';
+
+import {getAllowedRolesForMember} from '@libs/PolicyMemberRoleUtils';
+
+import type CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import React from 'react';
+
+type WorkspaceMemberRoleCellProps = {
+    role: ValueOf<typeof CONST.POLICY.ROLE> | undefined;
+    policy: OnyxEntry<Policy>;
+    memberLogin: string;
+    canEdit?: boolean;
+    onSave?: (role: ValueOf<typeof CONST.POLICY.ROLE>) => void;
+};
+
+function WorkspaceMemberRoleCell({role, policy, memberLogin, canEdit, onSave}: WorkspaceMemberRoleCellProps) {
+    const {translate} = useLocalize();
+    const roleLabel = translate('workspace.common.roleName', role);
+    const allowedRoles = getAllowedRolesForMember(policy, memberLogin);
+    const {popoverHeight} = useWorkspaceMemberRolePickerPopover({policy, selectedRole: role, allowedRoles});
+
+    const {isEditing, anchorRef, isPopoverVisible, popoverPosition, isInverted, startEditing, cancelEditing, handleSave} = usePopoverEditState({
+        canEdit,
+        value: role,
+        onSave,
+        popoverHeight,
+    });
+
+    return (
+        <EditableCell
+            canEdit={canEdit}
+            isEditing={isEditing}
+            onStartEditing={startEditing}
+            anchorRef={anchorRef}
+            popoverContent={
+                <WorkspaceMemberRolePickerModal
+                    policy={policy}
+                    selectedRole={role}
+                    allowedRoles={allowedRoles}
+                    isVisible={isPopoverVisible}
+                    onClose={cancelEditing}
+                    anchorPosition={popoverPosition}
+                    shouldMeasureAnchorPositionFromTop={!isInverted}
+                    onSelected={handleSave}
+                />
+            }
+        >
+            <Text numberOfLines={1}>{roleLabel}</Text>
+        </EditableCell>
+    );
+}
+
+export default WorkspaceMemberRoleCell;
diff --git a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
index 313061100b1b..540bc847c3ec 100644
--- a/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/WorkspaceMembersTableRow.tsx
@@ -2,7 +2,6 @@ import AccountAvatar from '@components/Avatar/connected/AccountAvatar';
 import Icon from '@components/Icon';
 import Table from '@components/Table';
 import {getCellAccessibilityProps, shouldUseTableSemantics} from '@components/Table/tableAccessibility';
-import Text from '@components/Text';
 import TextWithTooltip from '@components/TextWithTooltip';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -13,12 +12,17 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
 import {View} from 'react-native';
 
 import type {WorkspaceMemberRowData} from '.';
 
+import WorkspaceMemberRoleCell from './WorkspaceMemberRoleCell';
+
 type WorkspaceMembersTableRowProps = {
     item: WorkspaceMemberRowData;
     rowIndex: number;
@@ -29,9 +33,19 @@ type WorkspaceMembersTableRowProps = {
 
     /** Whether the custom field 2 column is visible on web screens or not */
     shouldShowCustomField2Column: boolean;
+
+    /** Policy used to determine which roles can be assigned from the inline editor */
+    policy: OnyxEntry<Policy>;
 };
 
-export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCustomField1Column, shouldShowCustomField2Column, shouldUseNarrowTableLayout}: WorkspaceMembersTableRowProps) {
+export default function WorkspaceMembersTableRow({
+    item,
+    rowIndex,
+    shouldShowCustomField1Column,
+    shouldShowCustomField2Column,
+    shouldUseNarrowTableLayout,
+    policy,
+}: WorkspaceMembersTableRowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -120,10 +134,16 @@ export default function WorkspaceMembersTableRow({item, rowIndex, shouldShowCust
 
                     {!shouldUseNarrowTableLayout && (
                         <View
-                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}
+                            style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.editableCellColumn]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <Text numberOfLines={1}>{roleLabel}</Text>
+                            <WorkspaceMemberRoleCell
+                                role={item.role}
+                                policy={policy}
+                                memberLogin={item.login}
+                                canEdit={item.canEditRole}
+                                onSave={item.onChangeRole}
+                            />
                         </View>
                     )}
 
diff --git a/src/components/Tables/WorkspaceMembersTable/index.tsx b/src/components/Tables/WorkspaceMembersTable/index.tsx
index 2b88b77ac975..bc553bfde633 100644
--- a/src/components/Tables/WorkspaceMembersTable/index.tsx
+++ b/src/components/Tables/WorkspaceMembersTable/index.tsx
@@ -4,6 +4,7 @@ import compareOptionalValues from '@components/Table/compareOptionalValues';
 
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getPolicyApproverLogins, isControlPolicy, isSubmitPolicy} from '@libs/PolicyUtils';
 import tokenizedSearch from '@libs/tokenizedSearch';
@@ -17,6 +18,7 @@ import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 
 import type {ListRenderItemInfo} from '@shopify/flash-list';
 import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 
 import React from 'react';
 
@@ -27,7 +29,7 @@ type WorkspaceMembersTableColumnKey = 'member' | 'role' | 'actions' | 'customFie
 type WorkspaceMemberRowData = TableData & {
     accountID: number;
     login: string;
-    role?: string;
+    role?: ValueOf<typeof CONST.POLICY.ROLE>;
     employeeUserID?: string;
     employeePayrollID?: string;
     name: string;
@@ -40,6 +42,8 @@ type WorkspaceMemberRowData = TableData & {
     invitedSecondaryLogin: string;
     action: () => void;
     dismissError: () => void;
+    canEditRole?: boolean;
+    onChangeRole?: (role: ValueOf<typeof CONST.POLICY.ROLE>) => void;
 };
 
 type WorkspaceMembersTableProps = {
@@ -76,6 +80,7 @@ export default function WorkspaceMembersTable({
     onRowSelectionChange,
     headerComponent,
 }: WorkspaceMembersTableProps) {
+    const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
@@ -124,6 +129,10 @@ export default function WorkspaceMembersTable({
             key: 'role',
             label: translate('common.role'),
             sortable: true,
+            styling: {
+                // editableCellHeader matches the padded role cell so the label and value share an edge.
+                containerStyles: [styles.editableCellHeader],
+            },
             dynamicSizing: {
                 getContentToMeasure: (item) => [{text: translate('workspace.common.roleName', item.role), fontSize: fontScale.text}],
                 // A role is one of a short, known set of labels, so the column always shows them in full.
@@ -275,6 +284,7 @@ export default function WorkspaceMembersTable({
                 shouldUseNarrowTableLayout={shouldUseNarrowTableLayout}
                 shouldShowCustomField1Column={shouldShowCustomField1Column}
                 shouldShowCustomField2Column={shouldShowCustomField2Column}
+                policy={policy}
             />
         );
     };
diff --git a/src/components/Tables/WorkspacePerDiemTable/WorkspacePerDiemAmountCell.tsx b/src/components/Tables/WorkspacePerDiemTable/WorkspacePerDiemAmountCell.tsx
new file mode 100644
index 000000000000..712dfdd1ff71
--- /dev/null
+++ b/src/components/Tables/WorkspacePerDiemTable/WorkspacePerDiemAmountCell.tsx
@@ -0,0 +1,36 @@
+import {InlineNumberEditCell} from '@components/EditableCell';
+import type {EditableProps} from '@components/EditableCell';
+
+import useLocalize from '@hooks/useLocalize';
+
+import {convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+type WorkspacePerDiemAmountCellProps = {
+    /** Subrate amount in cents */
+    rate: number;
+    currency: string;
+    displayText: string;
+} & EditableProps<string>;
+
+function WorkspacePerDiemAmountCell({rate, currency, displayText, canEdit, onSave}: WorkspacePerDiemAmountCellProps) {
+    const {translate} = useLocalize();
+
+    return (
+        <InlineNumberEditCell
+            value={convertToFrontendAmountAsString(rate, CONST.DEFAULT_CURRENCY_DECIMALS)}
+            currency={currency}
+            displayText={displayText}
+            decimals={CONST.DEFAULT_CURRENCY_DECIMALS}
+            allowNegativeInput
+            accessibilityLabel={translate('workspace.perDiem.amount')}
+            canEdit={canEdit}
+            onSave={onSave}
+        />
+    );
+}
+
+export default WorkspacePerDiemAmountCell;
diff --git a/src/components/Tables/WorkspacePerDiemTable/WorkspacePerDiemTableRow.tsx b/src/components/Tables/WorkspacePerDiemTable/WorkspacePerDiemTableRow.tsx
index 6efd06b5e97b..ac24a7894bcd 100644
--- a/src/components/Tables/WorkspacePerDiemTable/WorkspacePerDiemTableRow.tsx
+++ b/src/components/Tables/WorkspacePerDiemTable/WorkspacePerDiemTableRow.tsx
@@ -1,9 +1,11 @@
+import {InlineTextEditCell} from '@components/EditableCell';
 import Icon from '@components/Icon';
 import Table from '@components/Table';
 import {getCellAccessibilityProps, shouldUseTableSemantics} from '@components/Table/tableAccessibility';
 import TextWithTooltip from '@components/TextWithTooltip';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -16,6 +18,8 @@ import {View} from 'react-native';
 
 import type {PerDiemTableRowData} from '.';
 
+import WorkspacePerDiemAmountCell from './WorkspacePerDiemAmountCell';
+
 type WorkspacePerDiemTableRowProps = {
     /** Data about the per diem subrate */
     item: PerDiemTableRowData;
@@ -27,6 +31,7 @@ type WorkspacePerDiemTableRowProps = {
 function WorkspacePerDiemTableRow({item, rowIndex, shouldUseNarrowTableLayout}: WorkspacePerDiemTableRowProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
+    const {translate} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['ArrowRight']);
 
     const isTableSemanticsEnabled = shouldUseTableSemantics(shouldUseNarrowTableLayout);
@@ -69,11 +74,12 @@ function WorkspacePerDiemTableRow({item, rowIndex, shouldUseNarrowTableLayout}:
                             style={[styles.flex1]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <TextWithTooltip
-                                shouldShowTooltip
-                                numberOfLines={1}
-                                text={item.destination}
-                                style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                            <InlineTextEditCell
+                                value={item.destination}
+                                accessibilityLabel={translate('common.destination')}
+                                canEdit={item.canEditDestination && !item.disabled}
+                                onSave={item.onRenameDestination}
+                                displayTextStyle={[styles.lh16, styles.optionDisplayName, styles.pre]}
                             />
                         </View>
                     )}
@@ -83,25 +89,27 @@ function WorkspacePerDiemTableRow({item, rowIndex, shouldUseNarrowTableLayout}:
                             style={[styles.flex1]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <TextWithTooltip
-                                shouldShowTooltip
-                                numberOfLines={1}
-                                text={item.subRateName}
-                                style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                            <InlineTextEditCell
+                                value={item.subRateName}
+                                accessibilityLabel={translate('common.subrate')}
+                                canEdit={item.canEditSubrate && !item.disabled}
+                                onSave={item.onRenameSubrate}
+                                displayTextStyle={[styles.lh16, styles.optionDisplayName, styles.pre]}
                             />
                         </View>
                     )}
 
                     {!shouldUseNarrowTableLayout && (
                         <View
-                            style={[styles.flex1, styles.alignItemsEnd]}
+                            style={[styles.flex1, styles.alignItemsEnd, styles.editableCellColumn]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                         >
-                            <TextWithTooltip
-                                shouldShowTooltip
-                                numberOfLines={1}
-                                text={item.formattedAmount}
-                                style={[styles.lh16, styles.optionDisplayName, styles.pre]}
+                            <WorkspacePerDiemAmountCell
+                                rate={item.rate}
+                                currency={item.currency}
+                                displayText={item.formattedAmount}
+                                canEdit={item.canEditAmount && !item.disabled}
+                                onSave={item.onChangeAmount}
                             />
                         </View>
                     )}
diff --git a/src/components/Tables/WorkspacePerDiemTable/index.tsx b/src/components/Tables/WorkspacePerDiemTable/index.tsx
index 25fbbae37881..ad71128fe187 100644
--- a/src/components/Tables/WorkspacePerDiemTable/index.tsx
+++ b/src/components/Tables/WorkspacePerDiemTable/index.tsx
@@ -26,10 +26,17 @@ type PerDiemTableRowData = TableData & {
     destination: string;
     subRateName: string;
     rate: number;
+    currency: string;
     formattedAmount: string;
     disabled?: boolean;
     pendingAction?: OnyxCommon.PendingAction;
+    canEditDestination: boolean;
+    canEditSubrate: boolean;
+    canEditAmount: boolean;
     action: () => void;
+    onRenameDestination: (newName: string) => void;
+    onRenameSubrate: (newName: string) => void;
+    onChangeAmount: (newAmount: string) => void;
 };
 
 type WorkspacePerDiemTableProps = {
@@ -48,14 +55,30 @@ export default function WorkspacePerDiemTable({perDiemData, selectionEnabled, se
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
 
     const columns: Array<TableColumn<PerDiemTableColumnKey>> = [
-        {key: 'destination', label: translate('common.destination'), sortable: true},
-        {key: 'subrate', label: translate('common.subrate'), sortable: true},
+        {
+            key: 'destination',
+            label: translate('common.destination'),
+            sortable: true,
+            styling: {
+                // editableCellHeader matches the padded destination cell so the label and value share an edge.
+                containerStyles: [styles.editableCellHeader],
+            },
+        },
+        {
+            key: 'subrate',
+            label: translate('common.subrate'),
+            sortable: true,
+            styling: {
+                containerStyles: [styles.editableCellHeader],
+            },
+        },
         {
             key: 'amount',
             label: translate('workspace.perDiem.amount'),
             sortable: true,
             styling: {
-                containerStyles: [styles.justifyContentEnd],
+                // Keep the amount right-aligned, inset by the same chrome as the padded amount cell.
+                containerStyles: [styles.justifyContentEnd, styles.editableCellHeader],
             },
         },
         {key: 'actions', label: '', sortable: false, width: variables.tableCaretColumnWidth},
diff --git a/src/components/Tables/WorkspaceTagsTable/WorkspaceTagsTableRow.tsx b/src/components/Tables/WorkspaceTagsTable/WorkspaceTagsTableRow.tsx
index 8022801fa888..b99d50d7feca 100644
--- a/src/components/Tables/WorkspaceTagsTable/WorkspaceTagsTableRow.tsx
+++ b/src/components/Tables/WorkspaceTagsTable/WorkspaceTagsTableRow.tsx
@@ -1,4 +1,5 @@
 import UserAvatar from '@components/Avatar/UserAvatar';
+import {InlineTextEditCell} from '@components/EditableCell';
 import Icon from '@components/Icon';
 import Switch from '@components/Switch';
 import Table from '@components/Table';
@@ -92,11 +93,12 @@ export default function WorkspaceTagsTableRow({
                         style={[styles.flex1, shouldUseNarrowTableLayout && styles.gap1]}
                         {...getCellAccessibilityProps(isTableSemanticsEnabled)}
                     >
-                        <TextWithTooltip
-                            shouldShowTooltip
-                            numberOfLines={1}
-                            text={item.name}
-                            style={styles.optionDisplayName}
+                        <InlineTextEditCell
+                            value={item.name}
+                            accessibilityLabel={translate('common.name')}
+                            canEdit={!!item.canEditName && !item.disabled}
+                            onSave={item.onRenameName}
+                            displayTextStyle={styles.optionDisplayName}
                         />
                         {shouldUseNarrowTableLayout && !!tagCountSubtitle && (
                             <Text
diff --git a/src/components/Tables/WorkspaceTagsTable/index.tsx b/src/components/Tables/WorkspaceTagsTable/index.tsx
index b606b48bd1d4..786806c0d5fd 100644
--- a/src/components/Tables/WorkspaceTagsTable/index.tsx
+++ b/src/components/Tables/WorkspaceTagsTable/index.tsx
@@ -40,8 +40,12 @@ type WorkspaceTagTableRowData = TableData & {
     isLocked: boolean;
     isSwitchDisabled?: boolean;
     showEnabledSwitch: boolean;
+    /** Only single-level tags opt in. */
+    canEditName?: boolean;
     action: () => void;
     onToggleEnabled?: (enabled: boolean) => void;
+    /** Provided only when `canEditName` is supported. */
+    onRenameName?: (newName: string) => void;
     onClose: () => void;
 };
 
@@ -83,6 +87,10 @@ export default function WorkspaceTagsTable({
             key: 'name',
             label: translate('common.name'),
             sortable: true,
+            styling: {
+                // editableCellHeader matches the padded name cell so the label and value share an edge.
+                containerStyles: [styles.editableCellHeader],
+            },
         },
         ...(shouldShowGLCodeColumn
             ? [
diff --git a/src/components/TagPicker/index.tsx b/src/components/TagPicker/index.tsx
index 44995e0065e3..82db74d1bdc5 100644
--- a/src/components/TagPicker/index.tsx
+++ b/src/components/TagPicker/index.tsx
@@ -3,6 +3,7 @@ import SelectionListWithSections from '@components/SelectionList/SelectionListWi
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLoadPolicyTags from '@hooks/useLoadPolicyTags';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -18,6 +19,7 @@ import {getTagArrayFromName} from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PolicyTag, PolicyTags} from '@src/types/onyx';
+import getEmptyArray from '@src/types/utils/getEmptyArray';
 
 import React, {useMemo, useState} from 'react';
 
@@ -103,6 +105,9 @@ function TagPicker({
     const {translate, localeCompare} = useLocalize();
     const [searchValue, setSearchValue] = useState('');
 
+    // Backfill the policy's tags on demand so lazy-loaded accounts don't get stuck showing only the selected tag.
+    const {isLoadingPolicyTags} = useLoadPolicyTags(policyID);
+
     const policyRecentlyUsedTagsList = useMemo(() => policyRecentlyUsedTags?.[tagListName] ?? [], [policyRecentlyUsedTags, tagListName]);
     const policyTagList = getTagList(policyTags, tagListIndex);
     const selectedOptions = getSelectedOptions(selectedTag);
@@ -155,15 +160,17 @@ function TagPicker({
         translate,
         shouldShowGLCode,
     });
-    const sections = shouldOrderListByTagName
-        ? tagSections.map((option) => ({
-              ...option,
-              data: option.data.sort((a, b) => localeCompare(a.text ?? '', b.text ?? '')),
-          }))
-        : tagSections;
+    const sections = tagSections.map((section) => ({
+        ...section,
+        data: (shouldOrderListByTagName ? section.data.sort((a, b) => localeCompare(a.text ?? '', b.text ?? '')) : section.data).map((tag) => ({...tag, titleStyles: styles.w100})),
+    }));
 
     const selectedOptionKey = sections.at(0)?.data?.find((policyTag) => policyTag.searchText === selectedTag)?.keyForList;
 
+    // While the on-demand fetch above is in flight, show the list skeleton instead of flashing the selected-only
+    // fallback. Orphaned tags passed in by the caller are a complete local list, so they render immediately.
+    const isLoadingNewOptions = isLoadingPolicyTags && !additionalTagsToInclude?.length;
+
     const textInputOptions = {
         value: searchValue,
         onChangeText: setSearchValue,
@@ -176,18 +183,18 @@ function TagPicker({
 
     return (
         <SelectionListWithSections
-            sections={sections}
+            // The list only renders the skeleton when it has no items, so the sections have to be emptied too.
+            // Otherwise the selected-only fallback row still shows while the fetch is in flight.
+            sections={isLoadingNewOptions ? getEmptyArray<never>() : sections}
             ListItem={SingleSelectListItem}
-            style={{
-                sectionTitleStyles: styles.mt5,
-                listItemTitleStyles: styles.w100,
-            }}
+            style={{sectionTitleStyles: styles.mt5}}
             textInputOptions={textInputOptions}
             shouldShowTextInput={availableTagsCount >= CONST.STANDARD_LIST_ITEM_LIMIT}
+            shouldShowLoadingPlaceholder={isLoadingNewOptions}
+            isLoadingNewOptions={isLoadingNewOptions}
             initiallyFocusedItemKey={selectedOptionKey}
             onSelectRow={onSubmit}
             addBottomSafeAreaPadding={addBottomSafeAreaPadding}
-            isRowMultilineSupported
             titleNumberOfLines={CONST.TRANSACTION_TAG_AND_CATEGORY_PICKER_MAX_TITLE_LINES}
         />
     );
diff --git a/src/components/TestToolMenu.tsx b/src/components/TestToolMenu.tsx
index 44f6e96a2cc0..c5a5ee17f08b 100644
--- a/src/components/TestToolMenu.tsx
+++ b/src/components/TestToolMenu.tsx
@@ -1,19 +1,23 @@
+import useActiveServer from '@hooks/useActiveServer';
 import useEnvironment from '@hooks/useEnvironment';
 import useIsAgentAccount from '@hooks/useIsAgentAccount';
 import useIsAuthenticated from '@hooks/useIsAuthenticated';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import {useSidebarOrderedReportsActions} from '@hooks/useSidebarOrderedReports';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getActiveServer} from '@libs/ApiUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 
+import variables from '@styles/variables';
+
 import {setShouldFailAllRequests, setShouldForceOffline, setShouldSimulatePoorConnection} from '@userActions/Network';
 import {expireSessionWithDelay, invalidateAuthToken, invalidateCredentials} from '@userActions/Session';
 import {getBackToParam} from '@userActions/TestTool';
-import {setActiveServer, setIsDebugModeEnabled, setShouldShowBranchNameInTitle} from '@userActions/User';
+import {setIsDebugModeEnabled, setShouldShowBranchNameInTitle} from '@userActions/User';
 
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
@@ -21,10 +25,12 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import React from 'react';
-import {Platform} from 'react-native';
+import {Platform, View} from 'react-native';
 
 import BiometricsTestToolRow from './BiometricsTestToolRow';
 import Button from './Button';
+import Icon from './Icon';
+import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
 import QAAuthTestToolRows from './QAAuthTestToolRows';
 import SoftKillTestToolRow from './SoftKillTestToolRow';
 import Switch from './Switch';
@@ -32,13 +38,19 @@ import TestCrash from './TestCrash';
 import TestToolRow from './TestToolRow';
 import Text from './Text';
 
-function TestToolMenu() {
+type TestToolMenuProps = {
+    serverPageRoute: typeof ROUTES.SETTINGS_TROUBLESHOOT_SERVER | ReturnType<typeof ROUTES.TEST_TOOLS_SERVER.getRoute>;
+};
+
+function TestToolMenu({serverPageRoute}: TestToolMenuProps) {
     const [network] = useOnyx(ONYXKEYS.NETWORK);
     const [isUsingImportedState] = useOnyx(ONYXKEYS.IS_USING_IMPORTED_STATE);
-    const [activeServer = getActiveServer()] = useOnyx(ONYXKEYS.ACTIVE_SERVER);
+    const {activeServer, isPinnedByEnvironment} = useActiveServer();
     const [isDebugModeEnabled = false] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
     const [shouldShowBranchNameInTitle = false] = useOnyx(ONYXKEYS.SHOULD_SHOW_BRANCH_NAME_IN_TITLE);
     const styles = useThemeStyles();
+    const theme = useTheme();
+    const icons = useMemoizedLazyExpensifyIcons(['ArrowRight']);
     const {translate} = useLocalize();
     const {clearLHNCache} = useSidebarOrderedReportsActions();
     const {isProduction} = useEnvironment();
@@ -49,6 +61,26 @@ function TestToolMenu() {
     // Agent accounts can't have biometric multifactor authentication, so hide the biometrics test row for them.
     const isAgentAccount = useIsAgentAccount();
 
+    // Only the pinned row needs an accessible title: the pressable below announces it on every other build.
+    const serverRow = (
+        <TestToolRow
+            title={translate('initialSettingsPage.troubleshoot.server')}
+            isTitleAccessible={isPinnedByEnvironment}
+        >
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1]}>
+                <Text style={styles.textSupporting}>{translate(`initialSettingsPage.troubleshoot.servers.${activeServer}.label`)}</Text>
+                {!isPinnedByEnvironment && (
+                    <Icon
+                        src={icons.ArrowRight}
+                        fill={theme.icon}
+                        width={variables.iconSizeSmall}
+                        height={variables.iconSizeSmall}
+                    />
+                )}
+            </View>
+        </TestToolRow>
+    );
+
     return (
         <>
             <Text
@@ -149,21 +181,22 @@ function TestToolMenu() {
                 </>
             )}
 
-            {/* Option to switch between staging and default api endpoints.
-        This enables QA, internal testers and external devs to take advantage of sandbox environments for 3rd party services like Plaid and Onfido.
-        This toggle is not rendered for internal devs as they make environment changes directly to the .env file. */}
-            {!CONFIG.IS_USING_LOCAL_WEB && (
-                <TestToolRow
-                    title={translate('initialSettingsPage.troubleshoot.useStagingServer')}
-                    isTitleAccessible={false}
-                >
-                    <Switch
-                        accessibilityLabel="Use Staging Server"
-                        isOn={activeServer === CONST.SERVER.STAGING}
-                        onToggle={(isOn) => setActiveServer(isOn ? CONST.SERVER.STAGING : CONST.SERVER.PRODUCTION)}
-                    />
-                </TestToolRow>
-            )}
+            {/* This row enables QA, internal testers and external devs to take advantage of sandbox environments
+        for 3rd party services like Plaid and Onfido. It is not rendered for internal devs, as they make
+        environment changes directly to the .env file. */}
+            {!CONFIG.IS_USING_LOCAL_WEB &&
+                (isPinnedByEnvironment ? (
+                    serverRow
+                ) : (
+                    <PressableWithoutFeedback
+                        accessibilityLabel={translate('initialSettingsPage.troubleshoot.server')}
+                        sentryLabel={CONST.SENTRY_LABEL.TEST_TOOL_MENU.SERVER}
+                        role={CONST.ROLE.BUTTON}
+                        onPress={() => Navigation.navigate(serverPageRoute)}
+                    >
+                        {serverRow}
+                    </PressableWithoutFeedback>
+                ))}
 
             {/* QA server auth flow. Web only, and only when it is configured. */}
             <QAAuthTestToolRows />
diff --git a/src/components/TestToolsModalPage.tsx b/src/components/TestToolsModalPage.tsx
index 02aa0545127e..c21b97f030ed 100644
--- a/src/components/TestToolsModalPage.tsx
+++ b/src/components/TestToolsModalPage.tsx
@@ -1,47 +1,47 @@
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {TestToolsModalModalNavigatorParamList} from '@libs/Navigation/types';
+
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 
 import React from 'react';
-import {View} from 'react-native';
 
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
-import SafeAreaConsumer from './SafeAreaConsumer';
 import ScrollView from './ScrollView';
 import TestToolMenu from './TestToolMenu';
+import TestToolsScreenWrapper from './TestToolsScreenWrapper';
 import Text from './Text';
 
-function TestToolsModalPage() {
-    const {windowHeight} = useWindowDimensions();
+type TestToolsModalPageProps = PlatformStackScreenProps<TestToolsModalModalNavigatorParamList, typeof SCREENS.TEST_TOOLS_MODAL.ROOT>;
+
+function TestToolsModalPage({route}: TestToolsModalPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const maxHeight = windowHeight;
 
     return (
-        <SafeAreaConsumer>
-            {({safeAreaPaddingBottomStyle}) => (
-                <View style={[{maxHeight}, styles.h100, styles.defaultModalContainer, safeAreaPaddingBottomStyle]}>
-                    <ScrollView
-                        style={[styles.flex1, styles.ph5]}
-                        contentContainerStyle={styles.flexGrow1}
+        <TestToolsScreenWrapper>
+            <ScrollView
+                style={[styles.flex1, styles.ph5]}
+                contentContainerStyle={styles.flexGrow1}
+            >
+                <PressableWithoutFeedback
+                    accessible={false}
+                    style={[styles.cursorDefault]}
+                    sentryLabel="TestToolsModalPage-ReleaseOptions"
+                >
+                    <Text
+                        style={[styles.textLabelSupporting, styles.mt5, styles.mb3]}
+                        numberOfLines={1}
                     >
-                        <PressableWithoutFeedback
-                            accessible={false}
-                            style={[styles.cursorDefault]}
-                            sentryLabel="TestToolsModalPage-ReleaseOptions"
-                        >
-                            <Text
-                                style={[styles.textLabelSupporting, styles.mt5, styles.mb3]}
-                                numberOfLines={1}
-                            >
-                                {translate('initialSettingsPage.troubleshoot.releaseOptions')}
-                            </Text>
-                            <TestToolMenu />
-                        </PressableWithoutFeedback>
-                    </ScrollView>
-                </View>
-            )}
-        </SafeAreaConsumer>
+                        {translate('initialSettingsPage.troubleshoot.releaseOptions')}
+                    </Text>
+                    <TestToolMenu serverPageRoute={ROUTES.TEST_TOOLS_SERVER.getRoute(route.params?.backTo)} />
+                </PressableWithoutFeedback>
+            </ScrollView>
+        </TestToolsScreenWrapper>
     );
 }
 
diff --git a/src/components/TestToolsScreenWrapper.tsx b/src/components/TestToolsScreenWrapper.tsx
new file mode 100644
index 000000000000..2279d28da386
--- /dev/null
+++ b/src/components/TestToolsScreenWrapper.tsx
@@ -0,0 +1,23 @@
+/**
+ * The shared surface for every screen in the test tools modal, so a second screen cannot drift out of step with the first.
+ */
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {ReactNode} from 'react';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import SafeAreaConsumer from './SafeAreaConsumer';
+
+type TestToolsScreenWrapperProps = {
+    children: ReactNode;
+};
+
+function TestToolsScreenWrapper({children}: TestToolsScreenWrapperProps) {
+    const styles = useThemeStyles();
+
+    return <SafeAreaConsumer>{({safeAreaPaddingBottomStyle}) => <View style={[styles.h100, styles.defaultModalContainer, safeAreaPaddingBottomStyle]}>{children}</View>}</SafeAreaConsumer>;
+}
+
+export default TestToolsScreenWrapper;
diff --git a/src/components/TestToolsServerPage.tsx b/src/components/TestToolsServerPage.tsx
new file mode 100644
index 000000000000..192bdaf16be8
--- /dev/null
+++ b/src/components/TestToolsServerPage.tsx
@@ -0,0 +1,23 @@
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {TestToolsModalModalNavigatorParamList} from '@libs/Navigation/types';
+
+import ServerSelector from '@pages/settings/Troubleshoot/ServerSelector';
+
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+import React from 'react';
+
+import TestToolsScreenWrapper from './TestToolsScreenWrapper';
+
+type TestToolsServerPageProps = PlatformStackScreenProps<TestToolsModalModalNavigatorParamList, typeof SCREENS.TEST_TOOLS_MODAL.SERVER>;
+
+function TestToolsServerPage({route}: TestToolsServerPageProps) {
+    return (
+        <TestToolsScreenWrapper>
+            <ServerSelector backToRoute={ROUTES.TEST_TOOLS_MODAL.getRoute(route.params?.backTo)} />
+        </TestToolsScreenWrapper>
+    );
+}
+
+export default TestToolsServerPage;
diff --git a/src/components/TextInput/BaseTextInput/HtmlPasteHandler.tsx b/src/components/TextInput/BaseTextInput/HtmlPasteHandler.tsx
new file mode 100644
index 000000000000..4c19e682d138
--- /dev/null
+++ b/src/components/TextInput/BaseTextInput/HtmlPasteHandler.tsx
@@ -0,0 +1,25 @@
+import useHtmlPaste from '@hooks/useHtmlPaste';
+import type UseHtmlPaste from '@hooks/useHtmlPaste/types';
+
+type HtmlPasteHandlerProps = {
+    /** Ref to the input that should receive the pasted HTML */
+    inputRef: Parameters<UseHtmlPaste>[0];
+
+    /** Maximum length of the text input value after pasting */
+    maxLength?: number;
+};
+
+/**
+ * Renders nothing and exists only to scope `useHtmlPaste` to inputs that accept markdown.
+ * The hook subscribes to reports so a pasted room mention resolves to its name, and a hook cannot be
+ * called conditionally — so the call lives in a child that is only rendered when it is needed, keeping
+ * plain text fields free of that subscription.
+ */
+function HtmlPasteHandler({inputRef, maxLength}: HtmlPasteHandlerProps) {
+    useHtmlPaste(inputRef, undefined, true, maxLength);
+    return null;
+}
+
+HtmlPasteHandler.displayName = 'HtmlPasteHandler';
+
+export default HtmlPasteHandler;
diff --git a/src/components/TextInput/BaseTextInput/implementation/index.native.tsx b/src/components/TextInput/BaseTextInput/implementation/index.native.tsx
index 880b65d742b5..7a94946cb56c 100644
--- a/src/components/TextInput/BaseTextInput/implementation/index.native.tsx
+++ b/src/components/TextInput/BaseTextInput/implementation/index.native.tsx
@@ -7,6 +7,7 @@ import type {AnimatedMarkdownTextInputRef} from '@components/RNMarkdownTextInput
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import RNTextInput from '@components/RNTextInput';
 import Text from '@components/Text';
+import HtmlPasteHandler from '@components/TextInput/BaseTextInput/HtmlPasteHandler';
 import InputComponentMap from '@components/TextInput/BaseTextInput/implementations';
 import type {BaseTextInputProps, BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import * as styleConst from '@components/TextInput/styleConst';
@@ -14,7 +15,6 @@ import TextInputClearButton from '@components/TextInput/TextInputClearButton';
 import TextInputLabel from '@components/TextInput/TextInputLabel';
 import TextInputMeasurement from '@components/TextInput/TextInputMeasurement';
 
-import useHtmlPaste from '@hooks/useHtmlPaste';
 import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -131,8 +131,6 @@ function BaseTextInput({
     const isLabelActive = useRef(initialActiveLabel);
     const hasLabel = !!label?.length;
 
-    useHtmlPaste(input, undefined, isMarkdownEnabled, maxLength);
-
     const animateLabel = useCallback(
         (translateY: number, scale: number) => {
             labelScale.set(
@@ -312,6 +310,13 @@ function BaseTextInput({
 
     return (
         <>
+            {/* Scoped to markdown inputs so plain text fields never subscribe to reports. */}
+            {isMarkdownEnabled && (
+                <HtmlPasteHandler
+                    inputRef={input}
+                    maxLength={maxLength}
+                />
+            )}
             <View style={[containerStyles]}>
                 <PressableWithoutFeedback
                     role={CONST.ROLE.PRESENTATION}
diff --git a/src/components/TextInput/BaseTextInput/implementation/index.tsx b/src/components/TextInput/BaseTextInput/implementation/index.tsx
index b8b659058e5c..ea06fd735f38 100644
--- a/src/components/TextInput/BaseTextInput/implementation/index.tsx
+++ b/src/components/TextInput/BaseTextInput/implementation/index.tsx
@@ -8,6 +8,7 @@ import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import RNTextInput from '@components/RNTextInput';
 import SwipeInterceptPanResponder from '@components/SwipeInterceptPanResponder';
 import Text from '@components/Text';
+import HtmlPasteHandler from '@components/TextInput/BaseTextInput/HtmlPasteHandler';
 import InputComponentMap from '@components/TextInput/BaseTextInput/implementations';
 import type {BaseTextInputProps, BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import {ACTIVE_LABEL_SCALE, ACTIVE_LABEL_TRANSLATE_Y, INACTIVE_LABEL_SCALE, INACTIVE_LABEL_TRANSLATE_Y} from '@components/TextInput/styleConst';
@@ -15,7 +16,6 @@ import TextInputClearButton from '@components/TextInput/TextInputClearButton';
 import TextInputLabel from '@components/TextInput/TextInputLabel';
 import TextInputMeasurement from '@components/TextInput/TextInputMeasurement';
 
-import useHtmlPaste from '@hooks/useHtmlPaste';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useMarkdownStyle from '@hooks/useMarkdownStyle';
@@ -130,8 +130,6 @@ function BaseTextInput({
     const isLabelActive = useRef(initialActiveLabel);
     const didScrollToEndRef = useRef(false);
 
-    useHtmlPaste(input as RefObject<ComponentRef<typeof TextInput> | null>, undefined, isMarkdownEnabled, maxLength);
-
     // AutoFocus which only works on mount:
     useEffect(() => {
         // We are manually managing focus to prevent this issue: https://github.com/Expensify/App/issues/4514
@@ -369,6 +367,13 @@ function BaseTextInput({
 
     return (
         <>
+            {/* Scoped to markdown inputs so plain text fields never subscribe to reports. */}
+            {isMarkdownEnabled && (
+                <HtmlPasteHandler
+                    inputRef={input as RefObject<ComponentRef<typeof TextInput> | null>}
+                    maxLength={maxLength}
+                />
+            )}
             <View
                 style={[containerStyles]}
                 {...(shouldInterceptSwipe && SwipeInterceptPanResponder.panHandlers)}
diff --git a/src/components/TextInput/TextInputMeasurement/index.tsx b/src/components/TextInput/TextInputMeasurement/index.tsx
index 4c8b74af69be..2731c2a18f3a 100644
--- a/src/components/TextInput/TextInputMeasurement/index.tsx
+++ b/src/components/TextInput/TextInputMeasurement/index.tsx
@@ -52,6 +52,8 @@ function TextInputMeasurement({
                             autoGrowHeight && styles.autoGrowHeightHiddenInput(width ?? 0, typeof maxAutoGrowHeight === 'number' ? maxAutoGrowHeight : undefined),
                             {width: contentWidth},
                         ]}
+                        // Match the input's line breaking on Android.
+                        textBreakStrategy="simple"
                         accessible={false}
                         accessibilityElementsHidden
                         importantForAccessibility="no"
@@ -82,6 +84,8 @@ function TextInputMeasurement({
                             styles.hiddenElementOutsideOfWindow,
                             styles.visibilityHidden,
                         ]}
+                        // Match the input's line breaking on Android.
+                        textBreakStrategy="simple"
                         accessible={false}
                         accessibilityElementsHidden
                         importantForAccessibility="no"
diff --git a/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
index ca84fc416897..b19a42c8dbff 100644
--- a/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
+++ b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
@@ -63,6 +63,12 @@ function BaseEducationalTooltip({
 
         getTooltipCoordinates(tooltipElementRef.current, (bounds) => {
             updateTargetBounds(bounds);
+
+            if (!shouldHideOnScroll) {
+                showTooltip();
+                return;
+            }
+
             const {x, y, width: elementWidth, height} = bounds;
 
             const offset = 10; // Tooltip hides when content moves 10px past header/footer.
@@ -91,7 +97,7 @@ function BaseEducationalTooltip({
                 showTooltip();
             }
         });
-    }, [contentHeaderHeight, insets.top, insets.bottom, insets.left, shouldShowTooltip, shouldSuppressTooltip]);
+    }, [contentHeaderHeight, insets.top, insets.bottom, insets.left, shouldHideOnScroll, shouldShowTooltip, shouldSuppressTooltip]);
 
     useEffect(() => {
         if (!genericTooltipStateRef.current || !shouldRender) {
diff --git a/src/components/TransactionItemRow/DataCells/CategoryCell.tsx b/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
index adbe8c041f89..c65078fd3fd4 100644
--- a/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/CategoryCell.tsx
@@ -1,9 +1,9 @@
 import CategoryPickerModal from '@components/CategoryPicker/CategoryPickerModal';
+import {EditableCell, usePopoverEditState} from '@components/EditableCell';
+import type {EditableProps} from '@components/EditableCell';
 import TextWithIconCell from '@components/Search/SearchList/ListItem/TextWithIconCell';
 import type {ListItem} from '@components/SelectionList/types';
 import TextWithTooltip from '@components/TextWithTooltip';
-import {EditableCell, usePopoverEditState} from '@components/TransactionItemRow/EditableCell';
-import type {EditableProps} from '@components/TransactionItemRow/EditableCell';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useThemeStyles from '@hooks/useThemeStyles';
diff --git a/src/components/TransactionItemRow/DataCells/MerchantCell.tsx b/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
index a44e2d0341e7..b2d7ef8e84d0 100644
--- a/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/MerchantCell.tsx
@@ -1,8 +1,8 @@
+import {EditableCell, useInlineEditState} from '@components/EditableCell';
+import type {EditableProps} from '@components/EditableCell/types';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import TextWithTooltip from '@components/TextWithTooltip';
-import {EditableCell, useInlineEditState} from '@components/TransactionItemRow/EditableCell';
-import type {EditableProps} from '@components/TransactionItemRow/EditableCell/types';
 
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
diff --git a/src/components/TransactionItemRow/DataCells/TagCell.tsx b/src/components/TransactionItemRow/DataCells/TagCell.tsx
index 663eae5320ab..3ef5b0a0f8bf 100644
--- a/src/components/TransactionItemRow/DataCells/TagCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TagCell.tsx
@@ -1,8 +1,8 @@
+import type {EditableProps} from '@components/EditableCell';
+import {EditableCell, usePopoverEditState} from '@components/EditableCell';
 import TextWithIconCell from '@components/Search/SearchList/ListItem/TextWithIconCell';
 import TagPickerModal from '@components/TagPicker/TagPickerModal';
 import TextWithTooltip from '@components/TextWithTooltip';
-import type {EditableProps} from '@components/TransactionItemRow/EditableCell';
-import {EditableCell, usePopoverEditState} from '@components/TransactionItemRow/EditableCell';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useOnyx from '@hooks/useOnyx';
diff --git a/src/components/TransactionItemRow/DataCells/TotalCell.tsx b/src/components/TransactionItemRow/DataCells/TotalCell.tsx
index e40a5310e8ec..ef1c00597524 100644
--- a/src/components/TransactionItemRow/DataCells/TotalCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/TotalCell.tsx
@@ -1,8 +1,8 @@
+import {EditableCell, useInlineEditState} from '@components/EditableCell';
+import type {EditableProps} from '@components/EditableCell';
 import MoneyRequestAmountInput from '@components/MoneyRequestAmountInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import TextWithTooltip from '@components/TextWithTooltip';
-import {EditableCell, useInlineEditState} from '@components/TransactionItemRow/EditableCell';
-import type {EditableProps} from '@components/TransactionItemRow/EditableCell';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
@@ -12,8 +12,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {convertToBackendAmount, convertToFrontendAmountAsString, sanitizeCurrencyCode} from '@libs/CurrencyUtils';
 import {formatToParts} from '@libs/NumberFormatUtils';
 import {parseFloatAnyLocale, roundToTwoDecimalPlaces} from '@libs/NumberUtils';
-import {getTransactionDisplayAmount, isInvoiceReport, shouldEnableNegative} from '@libs/ReportUtils';
-import {getCurrency as getTransactionCurrency, isExpenseUnreported, isScanning} from '@libs/TransactionUtils';
+import {getTransactionDisplayAmount, isInvoiceReport, isSettled, shouldEnableNegative} from '@libs/ReportUtils';
+import {getCurrency as getTransactionCurrency, isExpenseUnreported, isFailedScanAmountPlaceholder, isScanning} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
 import type {Policy, Report} from '@src/types/onyx';
@@ -50,9 +50,12 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
     const effectiveReport = report ?? transactionItem.report;
     const effectivePolicy = policy ?? transactionItem.policy;
     const amount = getTransactionDisplayAmount(transactionItem, effectiveReport, effectivePolicy);
+    const hasFailedScanAmountPlaceholder = isFailedScanAmountPlaceholder(transactionItem, isSettled(effectiveReport));
     let amountToDisplay = convertToDisplayString(amount, currency);
     if (isScanning(transactionItem)) {
         amountToDisplay = translate('iou.receiptStatusTitle');
+    } else if (hasFailedScanAmountPlaceholder) {
+        amountToDisplay = '';
     }
 
     const iouType = getTransactionItemIouType({...transactionItem, report: effectiveReport});
@@ -63,6 +66,9 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
     const absoluteAmount = Math.abs(amount ?? 0);
     const isOriginalAmountNegative = (amount ?? 0) < 0;
     const [isNegative, setIsNegative] = useState(isOriginalAmountNegative);
+    // Tracks whether the user actually typed in this edit session, so that merely opening and
+    // closing the cell without input isn't mistaken for an explicit confirmation of the amount.
+    const hasUserTypedRef = useRef(false);
 
     const getNormalizedValue = (amountString: string, isAmountNegative: boolean) => {
         const parsedValue = parseFloatAnyLocale(amountString);
@@ -88,7 +94,11 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
                   onSave(normalizedValue);
               }
             : undefined,
-        (value, originalValue) => getNormalizedValue(value, isNegative) === getNormalizedValue(originalValue, isOriginalAmountNegative),
+        // A failed-scan placeholder amount that the user actually typed into is treated as changed so that
+        // explicitly re-entering 0 still submits and clears the scan-failure error, mirroring submitEditAmount in
+        // IOUAmountSubmission.ts. Merely opening and blurring the cell without typing is left as a no-op.
+        (value, originalValue) =>
+            !(hasFailedScanAmountPlaceholder && hasUserTypedRef.current) && getNormalizedValue(value, isNegative) === getNormalizedValue(originalValue, isOriginalAmountNegative),
     );
 
     // Ref used to programmatically focus the input when edit mode starts
@@ -101,14 +111,21 @@ function TotalCell({shouldShowTooltip, transactionItem, canEdit, onSave, report,
 
     const handleStartEditing = () => {
         setIsNegative(isOriginalAmountNegative);
+        hasUserTypedRef.current = false;
         startEditing();
     };
 
     const handleAmountChange = (amountString: string) => {
+        hasUserTypedRef.current = true;
         setLocalValue(amountString);
     };
 
     const onFormatAmount = (amountAsInt: number, currencyParam?: string) => {
+        // Seed the edit input as empty for a failed-scan placeholder, matching the blanked display above and the
+        // same falsy-amount-is-blank convention MoneyRequestAmountForm already uses for an unset amount.
+        if (hasFailedScanAmountPlaceholder) {
+            return '';
+        }
         const decimals = getCurrencyDecimals(currencyParam);
         return convertToFrontendAmountAsString(amountAsInt, decimals);
     };
diff --git a/src/components/ValidateCodeActionModal/ValidateCodeActionContent.tsx b/src/components/ValidateCodeActionModal/ValidateCodeActionContent.tsx
index 47374d2371ea..b4f8a2b4a2f8 100644
--- a/src/components/ValidateCodeActionModal/ValidateCodeActionContent.tsx
+++ b/src/components/ValidateCodeActionModal/ValidateCodeActionContent.tsx
@@ -1,4 +1,5 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
@@ -75,14 +76,18 @@ function ValidateCodeActionContent({
             offlineIndicatorStyle={themeStyles.mtAuto}
             shouldShowOfflineIndicatorInWideScreen
         >
-            <HeaderWithBackButton
+            <HeaderWithBackButtonAndTitle
                 title={title}
                 onBackButtonPress={hide}
-                threeDotsMenuItems={threeDotsMenuItems}
-                shouldShowThreeDotsButton={threeDotsMenuItems.length > 0}
-                shouldOverlayDots
-                onThreeDotsButtonPress={onThreeDotsButtonPress}
-            />
+            >
+                {threeDotsMenuItems.length > 0 && (
+                    <Header.ThreeDotsMenu
+                        items={threeDotsMenuItems}
+                        onIconPress={onThreeDotsButtonPress}
+                        shouldOverlay
+                    />
+                )}
+            </HeaderWithBackButtonAndTitle>
 
             <ScrollView
                 style={[themeStyles.w100, themeStyles.h100, themeStyles.flex1]}
diff --git a/src/components/WalletStatementModal/index.native.tsx b/src/components/WalletStatementModal/index.native.tsx
index d288c69df3f5..c4e45e77b8e9 100644
--- a/src/components/WalletStatementModal/index.native.tsx
+++ b/src/components/WalletStatementModal/index.native.tsx
@@ -1,6 +1,7 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import CONST from '@src/CONST';
@@ -28,6 +29,7 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
 
     const webViewRef = useRef<WebView>(null);
 
@@ -50,7 +52,7 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
         if (!webViewRef.current || !parsedData) {
             return;
         }
-        handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, parsedData.type, parsedData.url);
+        handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, conciergePersonalDetails, parsedData.type, parsedData.url);
     };
 
     return (
diff --git a/src/components/WalletStatementModal/index.tsx b/src/components/WalletStatementModal/index.tsx
index 2d482617245f..6785c328a7ba 100644
--- a/src/components/WalletStatementModal/index.tsx
+++ b/src/components/WalletStatementModal/index.tsx
@@ -1,6 +1,7 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import CONST from '@src/CONST';
@@ -23,6 +24,7 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const navigateRef = useRef<(event: MessageEvent<WalletStatementMessage>) => void>(null);
 
     /**
@@ -32,9 +34,9 @@ function WalletStatementModal({statementPageURL}: WalletStatementProps) {
         (event: MessageEvent<WalletStatementMessage>) => {
             const {data} = event;
             const {type, url} = data || {};
-            handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, type, url);
+            handleWalletStatementNavigation(conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, conciergePersonalDetails, type, url);
         },
-        [conciergeReportID, introSelected, session?.accountID, isSelfTourViewed],
+        [conciergeReportID, introSelected, session?.accountID, isSelfTourViewed, conciergePersonalDetails],
     );
 
     useEffect(() => {
diff --git a/src/components/WalletStatementModal/walletNavigationUtils.ts b/src/components/WalletStatementModal/walletNavigationUtils.ts
index d0db3303e1ba..3a18ac17458e 100644
--- a/src/components/WalletStatementModal/walletNavigationUtils.ts
+++ b/src/components/WalletStatementModal/walletNavigationUtils.ts
@@ -7,6 +7,7 @@ import {navigateToConciergeChat} from '@userActions/Report';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
+import type {PersonalDetailsList} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
@@ -18,6 +19,7 @@ function handleWalletStatementNavigation(
     introSelected: OnyxEntry<IntroSelected>,
     currentUserAccountID: number | undefined,
     isSelfTourViewed: boolean | undefined,
+    conciergePersonalDetails: OnyxEntry<PersonalDetailsList>,
     type?: string,
     url?: string,
 ): void {
@@ -26,7 +28,7 @@ function handleWalletStatementNavigation(
     }
 
     if (type === CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE) {
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID: currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID, isSelfTourViewed});
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID: currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID, isSelfTourViewed, conciergePersonalDetails});
         return;
     }
 
diff --git a/src/components/WideRHPContextProvider/index.native.tsx b/src/components/WideRHPContextProvider/index.native.tsx
index 7166a58e81c1..fb5067a24011 100644
--- a/src/components/WideRHPContextProvider/index.native.tsx
+++ b/src/components/WideRHPContextProvider/index.native.tsx
@@ -17,9 +17,6 @@ const animatedReceiptPaneRHPWidth = new Animated.Value(0);
 const animatedWideRHPWidth = new Animated.Value(0);
 const animatedSuperWideRHPWidth = new Animated.Value(0);
 
-const modalStackOverlaySuperWideRHPPositionLeft = new Animated.Value(0);
-const modalStackOverlayWideRHPPositionLeft = new Animated.Value(0);
-
 const expandedRHPProgress = new Animated.Value(0);
 
 const WideRHPStateContext = createContext<WideRHPStateContextType>(defaultWideRHPStateContextValue);
@@ -47,8 +44,6 @@ export {
     animatedSuperWideRHPWidth,
     animatedWideRHPWidth,
     expandedRHPProgress,
-    modalStackOverlaySuperWideRHPPositionLeft,
-    modalStackOverlayWideRHPPositionLeft,
     secondOverlayRHPOnSuperWideRHPProgress,
     secondOverlayRHPOnWideRHPProgress,
     secondOverlayWideRHPProgress,
diff --git a/src/components/WideRHPContextProvider/index.tsx b/src/components/WideRHPContextProvider/index.tsx
index 1e6c98b455b7..98bb7b990459 100644
--- a/src/components/WideRHPContextProvider/index.tsx
+++ b/src/components/WideRHPContextProvider/index.tsx
@@ -3,10 +3,9 @@ import useRootNavigationState from '@hooks/useRootNavigationState';
 
 import calculateReceiptPaneRHPWidth from '@libs/Navigation/helpers/calculateReceiptPaneRHPWidth';
 import calculateSuperWideRHPWidth from '@libs/Navigation/helpers/calculateSuperWideRHPWidth';
+import calculateWideRHPWidth from '@libs/Navigation/helpers/calculateWideRHPWidth';
 import type {NavigationRoute} from '@libs/Navigation/types';
 
-import variables from '@styles/variables';
-
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -39,19 +38,14 @@ const thirdOverlayProgress = new Animated.Value(0);
 const receiptPaneRHPWidth = calculateReceiptPaneRHPWidth(Dimensions.get('window').width);
 
 // Static values of all RHP widths
-const singleRHPWidth = variables.sideBarWidth;
 const superWideRHPWidth = calculateSuperWideRHPWidth(Dimensions.get('window').width);
-const wideRHPWidth = receiptPaneRHPWidth + singleRHPWidth;
+const wideRHPWidth = calculateWideRHPWidth(Dimensions.get('window').width);
 
 // This animated value is necessary to have responsive RHP widths
 const animatedReceiptPaneRHPWidth = new Animated.Value(receiptPaneRHPWidth);
 const animatedSuperWideRHPWidth = new Animated.Value(superWideRHPWidth);
 const animatedWideRHPWidth = new Animated.Value(wideRHPWidth);
 
-// The left position values of overlays displayed in ModalStackNavigators. A detailed description of how these positions are calculated can be found in src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
-const modalStackOverlayWideRHPPositionLeft = new Animated.Value(superWideRHPWidth - wideRHPWidth);
-const modalStackOverlaySuperWideRHPPositionLeft = new Animated.Value(superWideRHPWidth - singleRHPWidth);
-
 const WideRHPStateContext = createContext<WideRHPStateContextType>(defaultWideRHPStateContextValue);
 const WideRHPActionsContext = createContext<WideRHPActionsContextType>(defaultWideRHPActionsContextValue);
 
@@ -191,7 +185,8 @@ function WideRHPContextProvider({children}: React.PropsWithChildren) {
     /**
      * Effect that manages the tertiary overlay animation and rendering state.
      */
-    const shouldRenderTertiaryOverlay = useShouldRenderOverlay(isRHPFocused && isWideRHPBelow && isSuperWideRHPBelow, thirdOverlayProgress);
+    // react-navigation's card wrapper swallows clicks on the dimmed area, so the overlay from the screen below can't catch them when a skinny RHP sits over a wide or super wide one.
+    const shouldRenderTertiaryOverlay = useShouldRenderOverlay(isRHPFocused && (isWideRHPBelow || isSuperWideRHPBelow), thirdOverlayProgress);
 
     /**
      * Removes the route from both wide and super-wide sets. Used on screen unmount.
@@ -274,11 +269,9 @@ function WideRHPContextProvider({children}: React.PropsWithChildren) {
             const windowWidth = Dimensions.get('window').width;
             const newReceiptPaneRHPWidth = calculateReceiptPaneRHPWidth(windowWidth);
             const newSuperWideRHPWidth = calculateSuperWideRHPWidth(windowWidth);
-            const newWideRHPWidth = newReceiptPaneRHPWidth + singleRHPWidth;
+            const newWideRHPWidth = calculateWideRHPWidth(windowWidth);
             animatedReceiptPaneRHPWidth.setValue(newReceiptPaneRHPWidth);
             animatedWideRHPWidth.setValue(newWideRHPWidth);
-            modalStackOverlayWideRHPPositionLeft.setValue(newSuperWideRHPWidth - newWideRHPWidth);
-            modalStackOverlaySuperWideRHPPositionLeft.setValue(newSuperWideRHPWidth - singleRHPWidth);
             animatedSuperWideRHPWidth.setValue(newSuperWideRHPWidth);
         };
 
@@ -341,8 +334,6 @@ export {
     animatedSuperWideRHPWidth,
     animatedWideRHPWidth,
     expandedRHPProgress,
-    modalStackOverlaySuperWideRHPPositionLeft,
-    modalStackOverlayWideRHPPositionLeft,
     secondOverlayWideRHPProgress,
     secondOverlayRHPOnWideRHPProgress,
     secondOverlayRHPOnSuperWideRHPProgress,
diff --git a/src/components/WideRHPOverlayWrapper/index.tsx b/src/components/WideRHPOverlayWrapper/index.tsx
index 1f8675555f93..207993642efd 100644
--- a/src/components/WideRHPOverlayWrapper/index.tsx
+++ b/src/components/WideRHPOverlayWrapper/index.tsx
@@ -1,16 +1,9 @@
-import {
-    animatedReceiptPaneRHPWidth,
-    modalStackOverlaySuperWideRHPPositionLeft,
-    modalStackOverlayWideRHPPositionLeft,
-    secondOverlayRHPOnSuperWideRHPProgress,
-    secondOverlayRHPOnWideRHPProgress,
-    secondOverlayWideRHPProgress,
-    useWideRHPState,
-} from '@components/WideRHPContextProvider';
+import {secondOverlayRHPOnSuperWideRHPProgress, secondOverlayRHPOnWideRHPProgress, secondOverlayWideRHPProgress, useWideRHPState} from '@components/WideRHPContextProvider';
 
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
-import Overlay from '@libs/Navigation/AppNavigator/Navigators/Overlay';
+import RHPOverlay from '@libs/Navigation/AppNavigator/Navigators/Overlay/RHPOverlay';
+import Navigation from '@libs/Navigation/Navigation';
 
 import {useRoute} from '@react-navigation/native';
 import React from 'react';
@@ -40,30 +33,33 @@ function SecondaryOverlay() {
      * 2. Single RHP is displayed on Super Wide RHP
      * 3. Wide RHP is displayed on Super Wide RHP route.
      *  */
+    // Rendered by the screen below, so the dim clips to its rounded corners and a press dismisses to it.
     if (isRHPDisplayedOnWideRHP) {
         return (
-            <Overlay
+            <RHPOverlay
                 progress={secondOverlayRHPOnWideRHPProgress}
-                // If RHP is displayed on Wide RHP which is displayed above the Super Wide RHP, the secondary overlay's position left should be calculated from the left edge of the super wide RHP.
-                positionLeftValue={animatedReceiptPaneRHPWidth}
+                positionLeftValue={0}
+                onPress={Navigation.dismissToPreviousRHP}
             />
         );
     }
 
     if (isWideRHPDisplayedOnSuperWideRHP) {
         return (
-            <Overlay
+            <RHPOverlay
                 progress={secondOverlayWideRHPProgress}
-                positionLeftValue={modalStackOverlayWideRHPPositionLeft}
+                positionLeftValue={0}
+                onPress={() => Navigation.closeRHPFlow()}
             />
         );
     }
 
     if (isRHPDisplayedOnSuperWideRHP) {
         return (
-            <Overlay
+            <RHPOverlay
                 progress={secondOverlayRHPOnSuperWideRHPProgress}
-                positionLeftValue={modalStackOverlaySuperWideRHPPositionLeft}
+                positionLeftValue={0}
+                onPress={Navigation.dismissToSuperWideRHP}
             />
         );
     }
diff --git a/src/components/WorkspaceExpensifyCardLimitTypePickerModal.tsx b/src/components/WorkspaceExpensifyCardLimitTypePickerModal.tsx
new file mode 100644
index 000000000000..39600c47756d
--- /dev/null
+++ b/src/components/WorkspaceExpensifyCardLimitTypePickerModal.tsx
@@ -0,0 +1,204 @@
+/**
+ * Popover limit-type picker for inline editing an Expensify card from the workspace cards table.
+ */
+import useEnvironment from '@hooks/useEnvironment';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+
+import {getVisibleExpensifyCardLimitTypes} from '@libs/CardUtils';
+import {canMemberRead, getApprovalWorkflow} from '@libs/PolicyUtils';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {Card, Policy} from '@src/types/onyx';
+import type {CardLimitType} from '@src/types/onyx/Card';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import {emailSelector} from '@selectors/Session';
+import React, {useRef} from 'react';
+import {View} from 'react-native';
+
+import type PopoverWithMeasuredContentProps from './PopoverWithMeasuredContent/types';
+import type {ListItem} from './SelectionList/types';
+
+import Icon from './Icon';
+import PopoverWithMeasuredContent from './PopoverWithMeasuredContent';
+import RenderHTML from './RenderHTML';
+import SelectionList from './SelectionList';
+import SingleSelectListItem from './SelectionList/ListItem/SingleSelectListItem';
+
+const DEFAULT_ANCHOR_ALIGNMENT = {
+    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+};
+
+type LimitTypeListItem = ListItem<CardLimitType> & {
+    value: CardLimitType;
+};
+
+type WorkspaceExpensifyCardLimitTypePickerModalProps = {
+    onClose: () => void;
+
+    /** The policy whose approval workflow gates the Smart Limit option */
+    policy: OnyxEntry<Policy>;
+
+    /** The card whose limit type is being edited */
+    card: Card;
+
+    selectedLimitType?: CardLimitType;
+
+    onSelected?: (limitType: CardLimitType) => void;
+} & Omit<PopoverWithMeasuredContentProps, 'anchorRef' | 'children' | 'onClose'>;
+
+/**
+ * Inversion has to use the options this card can actually show. A fixed four-row height flips the menu when a shorter list still fits below the cell.
+ */
+function useWorkspaceExpensifyCardLimitTypePickerPopover({card, policy}: Pick<WorkspaceExpensifyCardLimitTypePickerModalProps, 'card' | 'policy'>) {
+    const styles = useThemeStyles();
+    const {windowHeight} = useWindowDimensions();
+    const {isInLandscapeMode} = useResponsiveLayout();
+
+    // Padding sits outside the list, matching workspace member roles, so it is not clipped into a scrollbar.
+    const listHeight = styles.getSelectionListPopoverHeight({
+        itemCount: getVisibleExpensifyCardLimitTypes(card, policy).length || 1,
+        itemHeight: variables.optionRowHeight,
+        windowHeight,
+        isInLandscapeMode,
+        hasButton: false,
+        // One extra line so a wrapping Smart Limit description is not clipped.
+        extraHeight: variables.lineHeightNormal,
+    }).height;
+    const popoverHeight = listHeight + styles.pt4.paddingTop + styles.pb4.paddingBottom;
+
+    return {popoverHeight};
+}
+
+function WorkspaceExpensifyCardLimitTypePickerModal({
+    isVisible,
+    onClose,
+    anchorPosition,
+    policy,
+    card,
+    selectedLimitType,
+    onSelected,
+    anchorAlignment = DEFAULT_ANCHOR_ALIGNMENT,
+    shouldMeasureAnchorPositionFromTop = false,
+}: WorkspaceExpensifyCardLimitTypePickerModalProps) {
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const {environmentURL} = useEnvironment();
+    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Lock']);
+    const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {selector: emailSelector});
+    const anchorRef = useRef<View>(null);
+    const {popoverHeight} = useWorkspaceExpensifyCardLimitTypePickerPopover({card, policy});
+
+    const areApprovalsConfigured = getApprovalWorkflow(policy) !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    const canReadWorkflows = canMemberRead(policy, currentUserLogin ?? '', CONST.POLICY.POLICY_FEATURE.WORKFLOWS);
+    const workspaceWorkflowsPageURL = canReadWorkflows ? `${environmentURL}/${ROUTES.WORKSPACE_WORKFLOWS.getRoute(policy?.id)}` : undefined;
+    const visibleLimitTypes = getVisibleExpensifyCardLimitTypes(card, policy);
+    const availableLimitTypeItems: LimitTypeListItem[] = [
+        {
+            value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+            text: translate('workspace.card.issueNewCard.smartLimit'),
+            alternateText: areApprovalsConfigured ? translate('workspace.card.issueNewCard.smartLimitDescription') : undefined,
+            alternateTextComponent: areApprovalsConfigured ? undefined : (
+                <RenderHTML html={translate('workspace.card.issueNewCard.smartLimitDisabledDescription', workspaceWorkflowsPageURL)} />
+            ),
+            rightElement: areApprovalsConfigured ? undefined : (
+                <Icon
+                    src={expensifyIcons.Lock}
+                    fill={theme.icon}
+                />
+            ),
+            shouldHideSelectionButton: !areApprovalsConfigured,
+            keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+            isSelected: selectedLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+            isDisabled: !areApprovalsConfigured,
+            titleStyles: areApprovalsConfigured ? undefined : {color: theme.heading},
+        },
+        {
+            value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+            text: translate('workspace.card.issueNewCard.monthly'),
+            alternateText: translate('workspace.card.issueNewCard.monthlyDescription'),
+            keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+            isSelected: selectedLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+        },
+        ...(visibleLimitTypes.includes(CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED)
+            ? [
+                  {
+                      value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                      text: translate('workspace.card.issueNewCard.fixedAmount'),
+                      alternateText: translate('workspace.card.issueNewCard.fixedAmountDescription'),
+                      keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                      isSelected: selectedLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                  } satisfies LimitTypeListItem,
+              ]
+            : []),
+        ...(visibleLimitTypes.includes(CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE)
+            ? [
+                  {
+                      value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE,
+                      text: translate('workspace.card.issueNewCard.singleUse'),
+                      alternateText: translate('workspace.card.issueNewCard.singleUseDescription'),
+                      keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE,
+                      isSelected: selectedLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE,
+                  } satisfies LimitTypeListItem,
+              ]
+            : []),
+    ];
+
+    const selectLimitType = (item: LimitTypeListItem) => {
+        onSelected?.(item.value);
+        onClose();
+    };
+
+    return (
+        <PopoverWithMeasuredContent
+            anchorRef={anchorRef}
+            isVisible={isVisible}
+            onClose={onClose}
+            anchorPosition={anchorPosition}
+            popoverDimensions={{
+                width: CONST.POPOVER_DROPDOWN_WIDTH,
+                height: popoverHeight,
+            }}
+            anchorAlignment={anchorAlignment}
+            innerContainerStyle={StyleUtils.getWidthStyle(CONST.POPOVER_DROPDOWN_WIDTH)}
+            restoreFocusType={CONST.MODAL.RESTORE_FOCUS_TYPE.DELETE}
+            shouldSwitchPositionIfOverflow
+            shouldEnableNewFocusManagement
+            shouldMeasureAnchorPositionFromTop={shouldMeasureAnchorPositionFromTop}
+            shouldSkipRemeasurement
+            shouldDisplayBelowModals
+            enableEdgeToEdgeBottomSafeAreaPadding
+        >
+            <View style={[StyleUtils.getHeight(popoverHeight), styles.flexColumn, styles.pv4]}>
+                <SelectionList
+                    data={availableLimitTypeItems}
+                    ListItem={SingleSelectListItem}
+                    onSelectRow={selectLimitType}
+                    shouldSingleExecuteRowSelect
+                    shouldStopPropagation
+                    initiallyFocusedItemKey={availableLimitTypeItems.find((item) => item.isSelected)?.keyForList}
+                    alternateNumberOfSupportedLines={2}
+                    style={{contentContainerStyle: [styles.pb0]}}
+                />
+            </View>
+        </PopoverWithMeasuredContent>
+    );
+}
+
+export default WorkspaceExpensifyCardLimitTypePickerModal;
+export {useWorkspaceExpensifyCardLimitTypePickerPopover};
diff --git a/src/components/WorkspaceMemberRoleList.tsx b/src/components/WorkspaceMemberRoleList.tsx
index b569350f1969..60eb9120958a 100644
--- a/src/components/WorkspaceMemberRoleList.tsx
+++ b/src/components/WorkspaceMemberRoleList.tsx
@@ -15,6 +15,7 @@ import type {ValueOf} from 'type-fest';
 import React from 'react';
 import {View} from 'react-native';
 
+import type {LocalizedTranslate} from './LocaleContextProvider';
 import type {ListItem} from './SelectionList/types';
 
 import HeaderWithBackButton from './HeaderWithBackButton';
@@ -39,59 +40,71 @@ type WorkspaceMemberRoleListProps = {
     allowedRoles?: Array<ValueOf<typeof CONST.POLICY.ROLE>>;
 };
 
-function WorkspaceMemberRoleList({role, policy, navigateBackTo = undefined, isLoading = false, onSelectRole = () => {}, allowedRoles = undefined}: WorkspaceMemberRoleListProps) {
-    const {translate} = useLocalize();
-    const styles = useThemeStyles();
-    const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
-
+/**
+ * Roles a member can be assigned, in the same order as the role-selection page.
+ * Filters by what the current user may assign and any extra restriction (for example an Authorized Payer).
+ */
+function getAssignableWorkspaceMemberRoleItems(
+    translate: LocalizedTranslate,
+    currentRole: string | undefined,
+    policy: OnyxEntry<Policy>,
+    currentUserLogin: string,
+    allowedRoles?: Array<ValueOf<typeof CONST.POLICY.ROLE>>,
+): ListItemType[] {
     const workspaceRoles: ListItemType[] = [
         {
             value: CONST.POLICY.ROLE.ADMIN,
             text: translate('workspace.common.roleName', CONST.POLICY.ROLE.ADMIN),
             alternateText: translate('workspace.common.adminAlternateText'),
-            isSelected: role === CONST.POLICY.ROLE.ADMIN,
+            isSelected: currentRole === CONST.POLICY.ROLE.ADMIN,
             keyForList: CONST.POLICY.ROLE.ADMIN,
         },
         {
             value: CONST.POLICY.ROLE.AUDITOR,
             text: translate('workspace.common.roleName', CONST.POLICY.ROLE.AUDITOR),
             alternateText: translate('workspace.common.auditorAlternateText'),
-            isSelected: role === CONST.POLICY.ROLE.AUDITOR,
+            isSelected: currentRole === CONST.POLICY.ROLE.AUDITOR,
             keyForList: CONST.POLICY.ROLE.AUDITOR,
         },
         {
             value: CONST.POLICY.ROLE.CARD_ADMIN,
             text: translate('workspace.common.roleName', CONST.POLICY.ROLE.CARD_ADMIN),
             alternateText: translate('workspace.common.cardAdminAlternateText'),
-            isSelected: role === CONST.POLICY.ROLE.CARD_ADMIN,
+            isSelected: currentRole === CONST.POLICY.ROLE.CARD_ADMIN,
             keyForList: CONST.POLICY.ROLE.CARD_ADMIN,
         },
         {
             value: CONST.POLICY.ROLE.PEOPLE_ADMIN,
             text: translate('workspace.common.roleName', CONST.POLICY.ROLE.PEOPLE_ADMIN),
             alternateText: translate('workspace.common.peopleAdminAlternateText'),
-            isSelected: role === CONST.POLICY.ROLE.PEOPLE_ADMIN,
+            isSelected: currentRole === CONST.POLICY.ROLE.PEOPLE_ADMIN,
             keyForList: CONST.POLICY.ROLE.PEOPLE_ADMIN,
         },
         {
             value: CONST.POLICY.ROLE.PAYMENTS_ADMIN,
             text: translate('workspace.common.roleName', CONST.POLICY.ROLE.PAYMENTS_ADMIN),
             alternateText: translate('workspace.common.paymentsAdminAlternateText'),
-            isSelected: role === CONST.POLICY.ROLE.PAYMENTS_ADMIN,
+            isSelected: currentRole === CONST.POLICY.ROLE.PAYMENTS_ADMIN,
             keyForList: CONST.POLICY.ROLE.PAYMENTS_ADMIN,
         },
         {
             value: CONST.POLICY.ROLE.USER,
             text: translate('common.member'),
             alternateText: translate('workspace.common.memberAlternateText'),
-            isSelected: role === CONST.POLICY.ROLE.USER,
+            isSelected: currentRole === CONST.POLICY.ROLE.USER,
             keyForList: CONST.POLICY.ROLE.USER,
         },
     ];
 
-    const availableRoleItems: ListItemType[] = workspaceRoles.filter(
-        (item) => canMemberAssignRole(policy, currentUserLogin, item.value) && (!allowedRoles || allowedRoles.includes(item.value)),
-    );
+    return workspaceRoles.filter((item) => canMemberAssignRole(policy, currentUserLogin, item.value) && (!allowedRoles || allowedRoles.includes(item.value)));
+}
+
+function WorkspaceMemberRoleList({role, policy, navigateBackTo = undefined, isLoading = false, onSelectRole = () => {}, allowedRoles = undefined}: WorkspaceMemberRoleListProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
+
+    const availableRoleItems = getAssignableWorkspaceMemberRoleItems(translate, role, policy, currentUserLogin, allowedRoles);
 
     return (
         <>
@@ -116,4 +129,5 @@ function WorkspaceMemberRoleList({role, policy, navigateBackTo = undefined, isLo
 }
 
 export default WorkspaceMemberRoleList;
+export {getAssignableWorkspaceMemberRoleItems};
 export type {ListItemType};
diff --git a/src/components/WorkspaceMemberRolePickerModal.tsx b/src/components/WorkspaceMemberRolePickerModal.tsx
new file mode 100644
index 000000000000..563c8fe3ff34
--- /dev/null
+++ b/src/components/WorkspaceMemberRolePickerModal.tsx
@@ -0,0 +1,130 @@
+/**
+ * Popover role picker for inline editing a workspace member's role from the members table.
+ */
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import React, {useRef} from 'react';
+import {View} from 'react-native';
+
+import type PopoverWithMeasuredContentProps from './PopoverWithMeasuredContent/types';
+import type {ListItemType} from './WorkspaceMemberRoleList';
+
+import PopoverWithMeasuredContent from './PopoverWithMeasuredContent';
+import SelectionList from './SelectionList';
+import SingleSelectListItem from './SelectionList/ListItem/SingleSelectListItem';
+import {getAssignableWorkspaceMemberRoleItems} from './WorkspaceMemberRoleList';
+
+const DEFAULT_ANCHOR_ALIGNMENT = {
+    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+};
+
+type WorkspaceMemberRolePickerModalProps = {
+    onClose: () => void;
+
+    /** The policy whose assignable roles should be shown */
+    policy: OnyxEntry<Policy>;
+
+    selectedRole?: string;
+
+    /** When provided, restricts the selectable roles to this set (e.g. an Authorized Payer may only be an Admin or Payments Admin) */
+    allowedRoles?: Array<ValueOf<typeof CONST.POLICY.ROLE>>;
+
+    onSelected?: (role: ValueOf<typeof CONST.POLICY.ROLE>) => void;
+} & Omit<PopoverWithMeasuredContentProps, 'anchorRef' | 'children' | 'onClose'>;
+
+/**
+ * Authorized Payer rows only show two roles, so inversion has to use that shorter height instead of the full dropdown max.
+ */
+function useWorkspaceMemberRolePickerPopover({policy, selectedRole, allowedRoles}: Pick<WorkspaceMemberRolePickerModalProps, 'policy' | 'selectedRole' | 'allowedRoles'>) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {windowHeight} = useWindowDimensions();
+    const {isInLandscapeMode} = useResponsiveLayout();
+    const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
+
+    const availableRoleItems = getAssignableWorkspaceMemberRoleItems(translate, selectedRole, policy, currentUserLogin, allowedRoles);
+    // Padding sits outside the list, matching Spend tag / GroupBy, so it is not clipped into a scrollbar.
+    const listHeight = styles.getSelectionListPopoverHeight({
+        itemCount: availableRoleItems.length || 1,
+        itemHeight: variables.optionRowHeight,
+        windowHeight,
+        isInLandscapeMode,
+        hasButton: false,
+    }).height;
+    const popoverHeight = listHeight + styles.pt4.paddingTop + styles.pb4.paddingBottom;
+
+    return {availableRoleItems, popoverHeight};
+}
+
+function WorkspaceMemberRolePickerModal({
+    isVisible,
+    onClose,
+    anchorPosition,
+    policy,
+    selectedRole,
+    allowedRoles,
+    onSelected,
+    anchorAlignment = DEFAULT_ANCHOR_ALIGNMENT,
+    shouldMeasureAnchorPositionFromTop = false,
+}: WorkspaceMemberRolePickerModalProps) {
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const anchorRef = useRef<View>(null);
+
+    const {availableRoleItems, popoverHeight} = useWorkspaceMemberRolePickerPopover({policy, selectedRole, allowedRoles});
+
+    const handleRoleSelected = (item: ListItemType) => {
+        onSelected?.(item.value);
+        onClose();
+    };
+
+    return (
+        <PopoverWithMeasuredContent
+            anchorRef={anchorRef}
+            isVisible={isVisible}
+            onClose={onClose}
+            anchorPosition={anchorPosition}
+            popoverDimensions={{
+                width: CONST.POPOVER_DROPDOWN_WIDTH,
+                height: popoverHeight,
+            }}
+            anchorAlignment={anchorAlignment}
+            innerContainerStyle={StyleUtils.getWidthStyle(CONST.POPOVER_DROPDOWN_WIDTH)}
+            restoreFocusType={CONST.MODAL.RESTORE_FOCUS_TYPE.DELETE}
+            shouldSwitchPositionIfOverflow
+            shouldEnableNewFocusManagement
+            shouldMeasureAnchorPositionFromTop={shouldMeasureAnchorPositionFromTop}
+            shouldSkipRemeasurement
+            shouldDisplayBelowModals
+            enableEdgeToEdgeBottomSafeAreaPadding
+        >
+            <View style={[StyleUtils.getHeight(popoverHeight), styles.flexColumn, styles.pv4]}>
+                <SelectionList
+                    data={availableRoleItems}
+                    ListItem={SingleSelectListItem}
+                    onSelectRow={handleRoleSelected}
+                    shouldSingleExecuteRowSelect
+                    initiallyFocusedItemKey={availableRoleItems.find((item) => item.isSelected)?.keyForList}
+                    style={{contentContainerStyle: [styles.pb0]}}
+                />
+            </View>
+        </PopoverWithMeasuredContent>
+    );
+}
+
+export default WorkspaceMemberRolePickerModal;
+export {useWorkspaceMemberRolePickerPopover};
diff --git a/src/components/WorkspaceMembersSelectionList.tsx b/src/components/WorkspaceMembersSelectionList.tsx
index 9b9d8d255516..8c3b438dfcaa 100644
--- a/src/components/WorkspaceMembersSelectionList.tsx
+++ b/src/components/WorkspaceMembersSelectionList.tsx
@@ -9,9 +9,10 @@ import usePolicy from '@hooks/usePolicy';
 import useScreenWrapperTransitionStatus from '@hooks/useScreenWrapperTransitionStatus';
 
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
-import {getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
+import {getSearchValueForPhoneOrEmail} from '@libs/OptionsListUtils';
 import {getMemberAccountIDsForWorkspace, isExpensifyTeam, shouldFilterExpensifyTeam} from '@libs/PolicyUtils';
 import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import MemberRightIcon from '@pages/workspace/MemberRightIcon';
@@ -127,7 +128,7 @@ function WorkspaceMembersSelectionList({policyID, selectedApprover, setApprover}
             disableMaintainingScrollPosition
             addBottomSafeAreaPadding
             showScrollIndicator
-            isRowMultilineSupported
+            titleNumberOfLines={2}
         />
     );
 }
diff --git a/src/hooks/useActiveServer.ts b/src/hooks/useActiveServer.ts
new file mode 100644
index 000000000000..593b51289b1b
--- /dev/null
+++ b/src/hooks/useActiveServer.ts
@@ -0,0 +1,16 @@
+import {resolveActiveServer} from '@libs/ApiUtils';
+import type {ActiveServerState} from '@libs/ApiUtils';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import useEnvironment from './useEnvironment';
+import useOnyx from './useOnyx';
+
+function useActiveServer(): ActiveServerState {
+    const [storedServer] = useOnyx(ONYXKEYS.ACTIVE_SERVER);
+    const {environment} = useEnvironment();
+
+    return resolveActiveServer(storedServer, environment);
+}
+
+export default useActiveServer;
diff --git a/src/hooks/useAdvancedSearchFilters.ts b/src/hooks/useAdvancedSearchFilters.ts
index 54ff2aa0531a..11b39b8ee3fb 100644
--- a/src/hooks/useAdvancedSearchFilters.ts
+++ b/src/hooks/useAdvancedSearchFilters.ts
@@ -1,5 +1,5 @@
 import {isFilterableBankAccount} from '@libs/BankAccountUtils';
-import {isPolicyFeatureEnabled} from '@libs/PolicyUtils';
+import {hasVendorFeatureOnAnyPolicy, isPolicyFeatureEnabled} from '@libs/PolicyUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -11,9 +11,11 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {filterCardsHiddenFromSearch} from '@selectors/Card';
 import {emailSelector} from '@selectors/Session';
+import {useCallback} from 'react';
 
 import useLocalize from './useLocalize';
 import useOnyx from './useOnyx';
+import usePermissions from './usePermissions';
 import useWorkspaceList from './useWorkspaceList';
 
 /**
@@ -38,6 +40,7 @@ const typeFiltersKeys = {
             CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG,
+            CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.ATTENDEE,
             CONST.SEARCH.SYNTAX_FILTER_KEYS.REIMBURSABLE,
@@ -315,6 +318,13 @@ function useAdvancedSearchFilters(type: SearchDataTypes | undefined) {
     const [shouldDisplayCardFilter] = useOnyx(ONYXKEYS.DERIVED.PERSONAL_AND_WORKSPACE_CARD_LIST, {selector: shouldDisplayCardFilterSelector});
     const [policies = getEmptyObject<NonNullable<OnyxCollection<Policy>>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: advancedSearchPoliciesSelector});
     const [policyDerived] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policyDerivedSelector});
+    const {isBetaEnabled} = usePermissions();
+    const isVendorMatchingBetaEnabled = isBetaEnabled(CONST.BETAS.VENDOR_MATCHING);
+    const isVendorFilterAvailableSelector = useCallback(
+        (allPolicies: OnyxCollection<Policy>) => hasVendorFeatureOnAnyPolicy(allPolicies, isVendorMatchingBetaEnabled),
+        [isVendorMatchingBetaEnabled],
+    );
+    const [isVendorFilterAvailable = false] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: isVendorFilterAvailableSelector});
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
 
     const {workspaces} = useAdvancedSearchFiltersWorkspaces(policies);
@@ -339,6 +349,9 @@ function useAdvancedSearchFilters(type: SearchDataTypes | undefined) {
                     if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG && !shouldDisplayTagFilter) {
                         return;
                     }
+                    if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR && !isVendorFilterAvailable) {
+                        return;
+                    }
                     if (
                         (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID ||
                             key === CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED ||
diff --git a/src/hooks/useAppReturnCount/index.native.ts b/src/hooks/useAppReturnCount/index.native.ts
new file mode 100644
index 000000000000..4b859b0824bd
--- /dev/null
+++ b/src/hooks/useAppReturnCount/index.native.ts
@@ -0,0 +1,32 @@
+import {useEffect, useRef, useState} from 'react';
+import {AppState} from 'react-native';
+
+/**
+ * Counts returns from the background. iOS also goes `inactive` for Control Center, the app switcher,
+ * permission dialogs and the camera, and each of those comes back `active`, so require a real
+ * background first.
+ */
+function useAppReturnCount(): number {
+    const [returnCount, setReturnCount] = useState(0);
+    const wasBackgroundedRef = useRef(false);
+
+    useEffect(() => {
+        const subscription = AppState.addEventListener('change', (nextAppState) => {
+            if (nextAppState === 'background') {
+                wasBackgroundedRef.current = true;
+                return;
+            }
+            if (nextAppState !== 'active' || !wasBackgroundedRef.current) {
+                return;
+            }
+            wasBackgroundedRef.current = false;
+            setReturnCount((count) => count + 1);
+        });
+
+        return () => subscription.remove();
+    }, []);
+
+    return returnCount;
+}
+
+export default useAppReturnCount;
diff --git a/src/hooks/useAppReturnCount/index.ts b/src/hooks/useAppReturnCount/index.ts
new file mode 100644
index 000000000000..aacaad8c1e65
--- /dev/null
+++ b/src/hooks/useAppReturnCount/index.ts
@@ -0,0 +1,23 @@
+import Visibility from '@libs/Visibility';
+
+import {useEffect, useState} from 'react';
+
+/** Counts returns to the app. On web that is the browser tab becoming visible again. */
+function useAppReturnCount(): number {
+    const [returnCount, setReturnCount] = useState(0);
+
+    useEffect(
+        () =>
+            Visibility.onVisibilityChange(() => {
+                if (!Visibility.isVisible()) {
+                    return;
+                }
+                setReturnCount((count) => count + 1);
+            }),
+        [],
+    );
+
+    return returnCount;
+}
+
+export default useAppReturnCount;
diff --git a/src/hooks/useAutocompleteSuggestions.ts b/src/hooks/useAutocompleteSuggestions.ts
index 6790dec0399a..2bd13293d02d 100644
--- a/src/hooks/useAutocompleteSuggestions.ts
+++ b/src/hooks/useAutocompleteSuggestions.ts
@@ -25,7 +25,7 @@ import {getDatePresets, getHasOptions} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {CardFeeds, CardList, PersonalDetailsList, Policy} from '@src/types/onyx';
-import type {VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
+import type {ReportAttributesDerivedValue, VisibleReportActionsDerivedValue} from '@src/types/onyx/DerivedValues';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import getEmptyArray from '@src/types/utils/getEmptyArray';
@@ -65,6 +65,7 @@ type UseAutocompleteSuggestionsParams = {
     loginList: OnyxEntry<Record<string, unknown>>;
     policies: NonNullable<OnyxCollection<Policy>>;
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
+    reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
     currentUserAccountID: number;
     currentUserEmail: string;
     personalDetails: OnyxEntry<PersonalDetailsList>;
@@ -117,6 +118,7 @@ function useAutocompleteSuggestions({
     loginList,
     policies,
     visibleReportActionsData,
+    reportAttributesDerived,
     currentUserAccountID,
     currentUserEmail,
     personalDetails,
@@ -124,8 +126,8 @@ function useAutocompleteSuggestions({
     translate,
     autocompleteSubstitutions,
 }: UseAutocompleteSuggestionsParams): AutocompleteItemData[] {
-    const {localeCompare, dateFnsLocale} = useLocalize();
-    const {convertToDisplayString} = useCurrencyListActions();
+    const {localeCompare, dateFnsLocale, formatPhoneNumber} = useLocalize();
+    const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const [allPolicyCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES);
     const [allRecentCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES);
     const [recentCurrencyAutocompleteList] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES);
@@ -136,6 +138,8 @@ function useAutocompleteSuggestions({
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const sortedReportActionsData = useSortedReportActionsData();
     const sortedActions = sortedReportActionsData?.sortedActions;
+    const transactionThreadIDs = sortedReportActionsData?.transactionThreadIDs;
+    const lastActions = sortedReportActionsData?.lastActions;
     const {currencyList} = useCurrencyListState();
     const {exportedToFilterOptions} = useExportedToFilterOptions();
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
@@ -256,6 +260,7 @@ function useAutocompleteSuggestions({
             const participants = getSearchOptions({
                 dateFnsLocale,
                 convertToDisplayString,
+                convertToDisplayStringWithoutCurrency,
                 options,
                 draftComments,
                 isDefaultRoomsBetaEnabled,
@@ -274,9 +279,16 @@ function useAutocompleteSuggestions({
                 currentUserAccountID,
                 currentUserEmail,
                 personalDetails,
+                reportAttributesDerived,
+                currentUserLogin: currentUserEmail,
                 sortedActions,
+                transactionThreadIDs,
+                lastActions,
+                localeCompare,
+                formatPhoneNumber,
                 conciergeReportID,
                 excludeFromSuggestionsOnly: memberExclusions,
+                allPolicyTags: allPoliciesTags,
                 isTrackIntentUser,
                 translate,
                 getReportByID,
@@ -300,6 +312,7 @@ function useAutocompleteSuggestions({
             const filteredReports = getSearchOptions({
                 dateFnsLocale,
                 convertToDisplayString,
+                convertToDisplayStringWithoutCurrency,
                 options,
                 draftComments,
                 isDefaultRoomsBetaEnabled,
@@ -318,8 +331,15 @@ function useAutocompleteSuggestions({
                 currentUserAccountID,
                 currentUserEmail,
                 personalDetails,
+                reportAttributesDerived,
+                currentUserLogin: currentUserEmail,
                 sortedActions,
+                transactionThreadIDs,
+                lastActions,
+                localeCompare,
+                formatPhoneNumber,
                 conciergeReportID,
+                allPolicyTags: allPoliciesTags,
                 isTrackIntentUser,
                 translate,
                 getReportByID,
diff --git a/src/hooks/useBarChartOrientation.ts b/src/hooks/useBarChartOrientation.ts
index ab9c7be5a510..4cad146c7ae8 100644
--- a/src/hooks/useBarChartOrientation.ts
+++ b/src/hooks/useBarChartOrientation.ts
@@ -4,14 +4,17 @@ import usePermissions from './usePermissions';
 import useResponsiveLayout from './useResponsiveLayout';
 
 /**
- * Determines the bar chart orientation: horizontal on wide layouts with the Insights beta, vertical otherwise.
+ * Bar chart orientation with the Insights beta on: horizontal on wide, vertical on narrow unless labels don't fit
+ * even at 45° (`canFallBackToHorizontalBars`). Everything stays vertical when the beta is off.
  */
-function useBarChartOrientation(): {isHorizontal: boolean} {
+function useBarChartOrientation(): {isHorizontal: boolean; canFallBackToHorizontalBars: boolean} {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBetaEnabled} = usePermissions();
-    const isHorizontal = !shouldUseNarrowLayout && isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
+    const isInsightsBeta = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
+    const isHorizontal = !shouldUseNarrowLayout && isInsightsBeta;
+    const canFallBackToHorizontalBars = shouldUseNarrowLayout && isInsightsBeta;
 
-    return {isHorizontal};
+    return {isHorizontal, canFallBackToHorizontalBars};
 }
 
 export default useBarChartOrientation;
diff --git a/src/hooks/useCarouselTransactionIDs.ts b/src/hooks/useCarouselTransactionIDs.ts
new file mode 100644
index 000000000000..65441a95a9c0
--- /dev/null
+++ b/src/hooks/useCarouselTransactionIDs.ts
@@ -0,0 +1,50 @@
+import {isDeletedTransaction, isTransactionPendingDelete} from '@libs/TransactionUtils';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+import getEmptyArray from '@src/types/utils/getEmptyArray';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+
+import useOnyx from './useOnyx';
+
+type CarouselTransactionIDs = {
+    /** The seeded carousel IDs, minus the expenses that are gone */
+    transactionIDs: string[];
+
+    /** The search snapshot the carousel was seeded from, when it was seeded from one */
+    snapshot: OnyxEntry<OnyxTypes.SearchResults>;
+};
+
+function useCarouselTransactionIDs(): CarouselTransactionIDs {
+    const [seededTransactionIDs = getEmptyArray<string>()] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
+    const [snapshotHash] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH);
+    const [snapshot] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${snapshotHash}`);
+    const [siblingDescriptors] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS);
+
+    const validTransactionIDsSelector = (allTransactions: OnyxCollection<OnyxTypes.Transaction>) =>
+        seededTransactionIDs.filter((transactionID) => {
+            const key = `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}` as const;
+
+            // A live `null` means the expense was deleted, so don't let the stale snapshot copy bring it back.
+            const liveTransaction = allTransactions?.[key];
+            if (liveTransaction === null) {
+                return false;
+            }
+
+            // A sibling that hasn't landed in the live collection yet (snapshot-backed flows) is read from the snapshot instead.
+            const transaction = liveTransaction ?? snapshot?.data?.[key];
+
+            if (!transaction) {
+                // Nothing to inspect, so keep the ID only while a descriptor still vouches for the sibling.
+                return !!siblingDescriptors?.[transactionID];
+            }
+            return !isTransactionPendingDelete(transaction) && !isDeletedTransaction(transaction);
+        });
+    const [validTransactionIDs = getEmptyArray<string>(), transactionsMetadata] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {selector: validTransactionIDsSelector});
+
+    return {transactionIDs: isLoadingOnyxValue(transactionsMetadata) ? seededTransactionIDs : validTransactionIDs, snapshot};
+}
+
+export default useCarouselTransactionIDs;
diff --git a/src/hooks/useCombinedExportTemplates.ts b/src/hooks/useCombinedExportTemplates.ts
index 5534ab257843..aef198c3cc21 100644
--- a/src/hooks/useCombinedExportTemplates.ts
+++ b/src/hooks/useCombinedExportTemplates.ts
@@ -1,57 +1,34 @@
 import {getExportTemplates} from '@libs/actions/Search';
+import {isAdminOfCardEnabledPolicy} from '@libs/PolicyUtils';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ExportTemplate, Policy} from '@src/types/onyx';
 
 import useLocalize from './useLocalize';
 import useOnyx from './useOnyx';
 
-type CombinedExportTemplates = {
-    /** Deduplicated custom templates (custom integrations + account/policy in-app templates), sorted alphabetically */
-    customTemplates: ExportTemplate[];
-    /** Deduplicated default templates (expense/report level, and the basic export), sorted alphabetically */
-    defaultTemplates: ExportTemplate[];
-    /** The custom and default templates concatenated, with the group ordering and per-group sorting preserved */
-    combinedExportTemplates: ExportTemplate[];
-};
-
-/**
- * Deduplicates templates by their templateName, keeping the first occurrence, then re-sorts alphabetically by name.
- * Deduplicating per group (rather than across the whole list) keeps each group's alphabetical ordering intact after
- * concatenating templates from the account and every policy.
- */
-function deduplicateAndSortGroup(templates: ExportTemplate[], localeCompare: (a: string, b: string) => number): ExportTemplate[] {
-    const templatesByName = new Map<string, ExportTemplate>();
-    for (const template of templates) {
-        if (templatesByName.has(template.templateName)) {
-            continue;
-        }
-        templatesByName.set(template.templateName, template);
-    }
-    return Array.from(templatesByName.values()).sort((first, second) => localeCompare(first.name, second.name));
-}
-
 /**
- * Collects the export templates available to the user from their account and the given policies, pre-grouped into
- * custom and default templates. Each group is deduplicated by templateName and sorted alphabetically. Both the
- * exported-to search filter and the export selector rely on the same grouping, so the logic lives here to avoid divergence.
+ * Collects the export templates that can be filtered on in the exported-to search filter: the account's integration templates
+ * and the default templates available across the given policies, custom group first, each group sorted alphabetically.
+ * In-app templates are skipped because exports made with them can't be identified by the filter. Both the exported-to
+ * autocomplete and the exported-to selector rely on this list, so the logic lives here to avoid divergence.
  */
-export default function useCombinedExportTemplates(policiesToLoadTemplatesFrom: Policy[]): CombinedExportTemplates {
+export default function useCombinedExportTemplates(policiesToLoadTemplatesFrom: Policy[]): ExportTemplate[] {
     const {translate, localeCompare} = useLocalize();
     const [integrationsExportTemplates] = useOnyx(ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES);
-    const [csvExportLayouts] = useOnyx(ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS);
-
-    const accountTemplateGroups = getExportTemplates(integrationsExportTemplates ?? [], csvExportLayouts ?? {}, translate, localeCompare, undefined, true);
-    const policyTemplateGroups = policiesToLoadTemplatesFrom.map((policy) => getExportTemplates([], {}, translate, localeCompare, policy, false));
 
-    const customTemplates = deduplicateAndSortGroup([accountTemplateGroups.customTemplates, ...policyTemplateGroups.map((group) => group.customTemplates)].flat(), localeCompare);
-    const defaultTemplates = deduplicateAndSortGroup([accountTemplateGroups.defaultTemplates, ...policyTemplateGroups.map((group) => group.defaultTemplates)].flat(), localeCompare);
-
-    return {
-        customTemplates,
-        defaultTemplates,
-        combinedExportTemplates: [...customTemplates, ...defaultTemplates],
-    };
+    const {customTemplates, defaultTemplates} = getExportTemplates(
+        integrationsExportTemplates ?? [],
+        {},
+        translate,
+        localeCompare,
+        undefined,
+        true,
+        false,
+        policiesToLoadTemplatesFrom.some((policy) => policy.outputCurrency === CONST.CURRENCY.CAD),
+        policiesToLoadTemplatesFrom.some((policy) => isAdminOfCardEnabledPolicy(policy)),
+    );
+
+    return [...customTemplates, ...defaultTemplates];
 }
-
-export type {CombinedExportTemplates};
diff --git a/src/hooks/useCompanyCardConnectionError.ts b/src/hooks/useCompanyCardConnectionError.ts
new file mode 100644
index 000000000000..976e08c461c9
--- /dev/null
+++ b/src/hooks/useCompanyCardConnectionError.ts
@@ -0,0 +1,31 @@
+/**
+ * Returns the latest error from adding a company card or its newly connected feed.
+ */
+import {getLatestErrorMessage} from '@libs/ErrorUtils';
+
+import type {AddNewCompanyCardFeed, CombinedCardFeeds, CompanyCardFeedWithDomainID} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+function useCompanyCardConnectionError({
+    cardFeeds,
+    addNewCard,
+    newFeed,
+    isAddingNewCard,
+}: {
+    cardFeeds?: CombinedCardFeeds;
+    addNewCard?: OnyxEntry<AddNewCompanyCardFeed>;
+    newFeed?: CompanyCardFeedWithDomainID;
+    isAddingNewCard: boolean;
+}) {
+    const newFeedErrors = newFeed ? cardFeeds?.[newFeed]?.errors : undefined;
+    const errorMessage = (isAddingNewCard ? getLatestErrorMessage(addNewCard) : '') || getLatestErrorMessage({errors: newFeedErrors});
+    const hasAddNewCardError = isAddingNewCard && !isEmptyObject(addNewCard?.errors);
+    const hasNewFeedError = !isEmptyObject(newFeedErrors);
+    const hasError = hasAddNewCardError || hasNewFeedError;
+
+    return {errorMessage: errorMessage || undefined, hasError};
+}
+
+export default useCompanyCardConnectionError;
diff --git a/src/hooks/useDeleteTransactions.ts b/src/hooks/useDeleteTransactions.ts
index 09883180c48e..6efdf443c903 100644
--- a/src/hooks/useDeleteTransactions.ts
+++ b/src/hooks/useDeleteTransactions.ts
@@ -9,6 +9,7 @@ import {deleteTrackExpense} from '@libs/actions/IOU/TrackExpense';
 import initSplitExpense from '@libs/actions/SplitExpenses';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {calculateAmount as calculateIOUAmount} from '@libs/IOUUtils';
+import Log from '@libs/Log';
 import {getOriginalMessage, isActionableTrackExpense, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
 import {isArchivedReport, isExpenseReport, isInvoiceReport, isIOUReport, isSelfDM} from '@libs/ReportUtils';
 import type {SearchGroupKey} from '@libs/SearchUIUtils';
@@ -329,11 +330,13 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
             });
         }
 
-        for (const {transactionID, action} of nonSplitTransactions) {
+        for (const {transactionID, action, transaction} of nonSplitTransactions) {
+            // Some expenses can have no IOU action, but the API can still delete them by transactionID
             if (!action) {
-                continue;
+                Log.info('[useDeleteTransactions] Deleting expense without an IOU action', false, {transactionID, reportID: transaction?.reportID});
             }
-            const iouReportID = isMoneyRequestAction(action) ? action?.reportID : undefined;
+
+            const iouReportID = isMoneyRequestAction(action) ? action?.reportID : transaction?.reportID;
             const candidateIOUReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
             // For self-DM tracks and split bills, action.reportID resolves to a chat report, not an IOU/expense report.
             // Invoice reports also carry the money request action; without them the optimistic delete would run with an
@@ -413,7 +416,7 @@ function useDeleteTransactions({report, reportActions, policy}: UseDeleteTransac
                 getCurrencyDecimals,
             });
             deletedTransactionIDs.push(transactionID);
-            if (action.childReportID) {
+            if (action?.childReportID) {
                 deletedTransactionThreadReportIDs.add(action.childReportID);
             }
         }
diff --git a/src/hooks/useDomainGroupFilter.ts b/src/hooks/useDomainGroupFilter.ts
index 5848fea19e1a..fe813469d69e 100644
--- a/src/hooks/useDomainGroupFilter.ts
+++ b/src/hooks/useDomainGroupFilter.ts
@@ -1,7 +1,7 @@
 import type {FilterConfig, IsItemInFilterCallback} from '@components/Table';
 import type {DomainMemberRowData, DomainMembersTableFilterKey} from '@components/Tables/DomainMembersTable';
 
-import {sortAlphabetically} from '@libs/OptionsListUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
diff --git a/src/hooks/useEarlyRenewalConfirmation.native.ts b/src/hooks/useEarlyRenewalConfirmation.native.ts
new file mode 100644
index 000000000000..ca842578c4f5
--- /dev/null
+++ b/src/hooks/useEarlyRenewalConfirmation.native.ts
@@ -0,0 +1,22 @@
+import useConfirmModal from './useConfirmModal';
+import useLocalize from './useLocalize';
+
+/** Explains why early renewal offers cannot be accepted in the native mobile app. */
+function useEarlyRenewalConfirmation() {
+    const {showConfirmModal} = useConfirmModal();
+    const {translate} = useLocalize();
+
+    const showEarlyRenewalConfirmation = () => {
+        return showConfirmModal({
+            title: translate('earlyRenewal.title'),
+            prompt: translate('subscription.mobileReducedFunctionalityMessage'),
+            confirmText: translate('common.buttonConfirm'),
+            shouldShowCancelButton: false,
+            shouldEnableNewFocusManagement: true,
+        });
+    };
+
+    return showEarlyRenewalConfirmation;
+}
+
+export default useEarlyRenewalConfirmation;
diff --git a/src/hooks/useEarlyRenewalConfirmation.ts b/src/hooks/useEarlyRenewalConfirmation.ts
new file mode 100644
index 000000000000..81b0c8b5a309
--- /dev/null
+++ b/src/hooks/useEarlyRenewalConfirmation.ts
@@ -0,0 +1,41 @@
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+
+import {acceptEarlyRenewalOffer} from '@libs/actions/EarlyRenewalOffer';
+import DateUtils from '@libs/DateUtils';
+import {getNonIncentivizedEarlyRenewalDates} from '@libs/EarlyRenewalOfferUtils';
+
+import CONST from '@src/CONST';
+
+import useConfirmModal from './useConfirmModal';
+import useLocalize from './useLocalize';
+
+/** Opens the confirmation modal for the non-incentivized early renewal offer. */
+function useEarlyRenewalConfirmation() {
+    const {showConfirmModal} = useConfirmModal();
+    const {translate, dateFnsLocale} = useLocalize();
+
+    const showEarlyRenewalConfirmation = async () => {
+        const {startDate, endDate} = getNonIncentivizedEarlyRenewalDates();
+        const result = await showConfirmModal({
+            title: translate('earlyRenewal.confirmTitle'),
+            prompt: translate('earlyRenewal.confirmationDescription', {
+                startDate: DateUtils.formatWithUTCTimeZone(startDate, CONST.DATE.MONTH_DAY_YEAR_FORMAT, dateFnsLocale),
+                endDate: DateUtils.formatWithUTCTimeZone(endDate, CONST.DATE.MONTH_DAY_YEAR_FORMAT, dateFnsLocale),
+            }),
+            confirmText: translate('earlyRenewal.renew'),
+            cancelText: translate('common.cancel'),
+            shouldDisableConfirmButtonWhenOffline: true,
+            shouldEnableNewFocusManagement: true,
+        });
+
+        if (result.action !== ModalActions.CONFIRM) {
+            return;
+        }
+
+        acceptEarlyRenewalOffer(CONST.SUBSCRIPTION.EARLY_RENEWAL.OFFER_ID.NON_INCENTIVIZED_ONE_YEAR);
+    };
+
+    return showEarlyRenewalConfirmation;
+}
+
+export default useEarlyRenewalConfirmation;
diff --git a/src/hooks/useEarlyRenewalPeriod.ts b/src/hooks/useEarlyRenewalPeriod.ts
new file mode 100644
index 000000000000..8ecef2b55bc1
--- /dev/null
+++ b/src/hooks/useEarlyRenewalPeriod.ts
@@ -0,0 +1,53 @@
+import isNonIncentivizedEarlyRenewalPeriod, {isIncentivizedEarlyRenewalPeriod} from '@libs/EarlyRenewalOfferUtils';
+
+import CONST from '@src/CONST';
+
+import {useEffect, useState} from 'react';
+
+const MAX_TIMEOUT_MS = 2_147_483_647;
+
+function getNextPhaseBoundary(timestamp: number): number | null {
+    const nonIncentivizedStart = Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.NON_INCENTIVIZED_START);
+    const incentivizedStart = Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.INCENTIVIZED_START);
+    const campaignEnd = Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.CAMPAIGN_END);
+
+    if (timestamp < nonIncentivizedStart) {
+        return nonIncentivizedStart;
+    }
+    if (timestamp < incentivizedStart) {
+        return incentivizedStart;
+    }
+    if (timestamp < campaignEnd) {
+        return campaignEnd;
+    }
+    return null;
+}
+
+function useEarlyRenewalPeriod() {
+    const [timestamp, setTimestamp] = useState(Date.now);
+
+    useEffect(() => {
+        let timeoutID: ReturnType<typeof setTimeout> | undefined;
+
+        const updatePeriod = () => {
+            const currentTimestamp = Date.now();
+            setTimestamp(currentTimestamp);
+
+            const nextPhaseBoundary = getNextPhaseBoundary(currentTimestamp);
+            if (nextPhaseBoundary === null) {
+                return;
+            }
+            timeoutID = setTimeout(updatePeriod, Math.min(nextPhaseBoundary - currentTimestamp + 1, MAX_TIMEOUT_MS));
+        };
+
+        updatePeriod();
+        return () => clearTimeout(timeoutID);
+    }, []);
+
+    return {
+        isNonIncentivizedPeriod: isNonIncentivizedEarlyRenewalPeriod(timestamp),
+        isIncentivizedPeriod: isIncentivizedEarlyRenewalPeriod(timestamp),
+    };
+}
+
+export default useEarlyRenewalPeriod;
diff --git a/src/hooks/useExportedToFilterOptions.ts b/src/hooks/useExportedToFilterOptions.ts
index c63e0173b534..1fdf5a56830e 100644
--- a/src/hooks/useExportedToFilterOptions.ts
+++ b/src/hooks/useExportedToFilterOptions.ts
@@ -5,7 +5,7 @@ import {getAllPolicyValues, getConnectedIntegrationNamesForPolicies, getFilterFr
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {ExportTemplate, Policy} from '@src/types/onyx';
+import type {Policy} from '@src/types/onyx';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
@@ -14,7 +14,6 @@ import useOnyx from './useOnyx';
 
 type UseExportedToFilterDataResult = {
     exportedToFilterOptions: string[];
-    combinedUniqueExportTemplates: ExportTemplate[];
     connectedIntegrationNames: Set<string>;
 };
 
@@ -35,7 +34,6 @@ function exportedToPoliciesSelector(policies: OnyxCollection<Policy>): OnyxColle
             id: policy.id,
             name: policy.name,
             connections: policy.connections,
-            exportLayouts: policy.exportLayouts,
             outputCurrency: policy.outputCurrency,
             role: policy.role,
             areCompanyCardsEnabled: policy.areCompanyCardsEnabled,
@@ -58,14 +56,13 @@ export default function useExportedToFilterOptions(): UseExportedToFilterDataRes
 
     // When search is scoped to workspaces, use only those policies otherwise use all.
     const policiesToUse = getAllPolicyValues(policyIDs, ONYXKEYS.COLLECTION.POLICY, policies);
-    const {combinedExportTemplates: combinedUniqueExportTemplates} = useCombinedExportTemplates(policiesToUse);
+    const combinedExportTemplates = useCombinedExportTemplates(policiesToUse);
 
     const integrationConnectionNamesSet = new Set<string>(CONST.POLICY.CONNECTIONS.ACCOUNTING_CONNECTION_NAMES);
 
     const standardAndCustomExportTemplates: string[] = [];
-    for (const template of combinedUniqueExportTemplates) {
-        // Classic export formats map to in-app templates and cannot be identified in exported-to filter.
-        if (template.type === CONST.EXPORT_TEMPLATE_TYPES.IN_APP || integrationConnectionNamesSet.has(template.templateName)) {
+    for (const template of combinedExportTemplates) {
+        if (integrationConnectionNamesSet.has(template.templateName)) {
             continue;
         }
 
@@ -88,7 +85,6 @@ export default function useExportedToFilterOptions(): UseExportedToFilterDataRes
 
     return {
         exportedToFilterOptions,
-        combinedUniqueExportTemplates,
         connectedIntegrationNames,
     };
 }
diff --git a/src/hooks/useFilteredOptions.ts b/src/hooks/useFilteredOptions.ts
index 1d2b605650d3..007a35a052fb 100644
--- a/src/hooks/useFilteredOptions.ts
+++ b/src/hooks/useFilteredOptions.ts
@@ -111,7 +111,9 @@ function useFilteredOptions(config: UseFilteredOptionsConfig): UseFilteredOption
     // every recompute, so it doubles as the report-actions invalidation signal for the option-list cache.
     const sortedReportActionsData = useSortedReportActionsData();
     const sortedActions = sortedReportActionsData?.sortedActions;
-    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
+    const transactionThreadIDs = sortedReportActionsData?.transactionThreadIDs;
+    const lastActions = sortedReportActionsData?.lastActions;
+    const {accountID: currentUserAccountID, login: currentUserLogin} = useCurrentUserPersonalDetails();
 
     const privateIsArchivedMap = usePrivateIsArchivedMap();
 
@@ -132,6 +134,9 @@ function useFilteredOptions(config: UseFilteredOptionsConfig): UseFilteredOption
                       allPolicies,
                       {
                           currentUserAccountID,
+                          currentUserLogin,
+                          transactionThreadIDs,
+                          lastActions,
                           dateFnsLocale,
                           convertToDisplayString,
                           conciergeReportID,
@@ -164,7 +169,10 @@ function useFilteredOptions(config: UseFilteredOptionsConfig): UseFilteredOption
             deferContactsUntilSearch,
             preferredLocale,
             isTrackIntentUser,
+            currentUserLogin,
             sortedActions,
+            transactionThreadIDs,
+            lastActions,
             currentUserAccountID,
             pendingDeleteMemberAccountIDsByReportID,
             dateFnsLocale,
diff --git a/src/hooks/useGPSInProgressModal/index.native.ts b/src/hooks/useGPSInProgressModal/index.native.ts
new file mode 100644
index 000000000000..6dc13166d8ae
--- /dev/null
+++ b/src/hooks/useGPSInProgressModal/index.native.ts
@@ -0,0 +1,97 @@
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+
+import useConfirmModal from '@hooks/useConfirmModal';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useOnyx from '@hooks/useOnyx';
+
+import {closeReactNativeApp} from '@libs/actions/HybridApp';
+import {setIsGPSInProgressModalOpen} from '@libs/actions/isGPSInProgressModalOpen';
+import {getGpsPoints, stopGpsTrip} from '@libs/GPSDraftDetailsUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import {useEffect, useRef} from 'react';
+
+const GPS_IN_PROGRESS_MODAL_ID = 'gpsInProgress';
+
+/**
+ * Pushes the "a trip is in progress" prompt onto the global modal stack.
+ *
+ * The prompt is asked for by `closeReactNativeApp`, a non-React action that cannot call a hook, so the Onyx flag stays
+ * as the cross-boundary trigger and this hook is the controller that turns it into a modal. Nothing other than
+ * the answer below clears the flag, so the entry never has to be taken down by hand.
+ */
+function useGPSInProgressModal() {
+    const [isGPSInProgressModalOpen] = useOnyx(ONYXKEYS.IS_GPS_IN_PROGRESS_MODAL_OPEN);
+    const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const {showConfirmModal, closeModalByID} = useConfirmModal();
+
+    // Keeps a re-render from stacking a second prompt on top of the one that is already open.
+    const isPromptShownRef = useRef(false);
+
+    // Set when the unmount cleanup below took the prompt down, so the handler knows the user never answered.
+    const hasAutoClosedPromptRef = useRef(false);
+    const closeModalByIDRef = useRef(closeModalByID);
+    useEffect(() => {
+        closeModalByIDRef.current = closeModalByID;
+    });
+
+    // The prompt lives on the app-level modal stack, which outlives AuthScreens. Take it down when the session ends
+    // (logout, expiry) so it does not stay over the public screens and stop the trip / switch apps once answered there.
+    useEffect(
+        () => () => {
+            if (!isPromptShownRef.current) {
+                return;
+            }
+            hasAutoClosedPromptRef.current = true;
+            closeModalByIDRef.current(GPS_IN_PROGRESS_MODAL_ID);
+        },
+        [],
+    );
+
+    // The trip keeps recording points while the prompt is open, so what gets submitted has to be read when the user
+    // answers rather than when the prompt is shown. Reading the render-time values inside the handler below would
+    // submit the trip as it stood at show time, which is a truncated trip.
+    const gpsDraftDetailsRef = useRef(gpsDraftDetails);
+    const isOfflineRef = useRef(isOffline);
+
+    useEffect(() => {
+        gpsDraftDetailsRef.current = gpsDraftDetails;
+        isOfflineRef.current = isOffline;
+
+        if (!isGPSInProgressModalOpen || isPromptShownRef.current) {
+            return;
+        }
+        isPromptShownRef.current = true;
+
+        showConfirmModal({
+            id: GPS_IN_PROGRESS_MODAL_ID,
+            title: translate('gps.switchToODWarningTripInProgress.title'),
+            prompt: translate('gps.switchToODWarningTripInProgress.prompt'),
+            confirmText: translate('gps.switchToODWarningTripInProgress.confirm'),
+            cancelText: translate('common.cancel'),
+            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+        }).then(async (result) => {
+            isPromptShownRef.current = false;
+            setIsGPSInProgressModalOpen(false);
+
+            if (hasAutoClosedPromptRef.current) {
+                hasAutoClosedPromptRef.current = false;
+                return;
+            }
+
+            if (result.action !== ModalActions.CONFIRM) {
+                return;
+            }
+
+            await stopGpsTrip(isOfflineRef.current, getGpsPoints(gpsDraftDetailsRef.current));
+            closeReactNativeApp({shouldSetNVP: true, isTrackingGPS: false, shouldIgnoreTryNewDotLoading: true});
+        });
+    }, [gpsDraftDetails, isGPSInProgressModalOpen, isOffline, showConfirmModal, translate]);
+}
+
+export default useGPSInProgressModal;
diff --git a/src/hooks/useGPSInProgressModal/index.ts b/src/hooks/useGPSInProgressModal/index.ts
new file mode 100644
index 000000000000..b7c1b6475393
--- /dev/null
+++ b/src/hooks/useGPSInProgressModal/index.ts
@@ -0,0 +1,4 @@
+// GPS is not available on web, so this hook is a no-op.
+function useGPSInProgressModal() {}
+
+export default useGPSInProgressModal;
diff --git a/src/components/GPSTripStateChecker/index.native.tsx b/src/hooks/useGPSTripStateChecker/index.native.ts
similarity index 50%
rename from src/components/GPSTripStateChecker/index.native.tsx
rename to src/hooks/useGPSTripStateChecker/index.native.ts
index 6ef07dffbcc6..346a60406b31 100644
--- a/src/components/GPSTripStateChecker/index.native.tsx
+++ b/src/hooks/useGPSTripStateChecker/index.native.ts
@@ -1,5 +1,6 @@
-import ConfirmModal from '@components/ConfirmModal';
+import {ModalActions} from '@components/Modal/Global/ModalContext';
 
+import useConfirmModal from '@hooks/useConfirmModal';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
@@ -19,12 +20,19 @@ import {useSplashScreenState} from '@src/SplashScreenStateContext';
 
 import {accountIDSelector} from '@selectors/Session';
 import {hasStartedLocationUpdatesAsync, startLocationUpdatesAsync, stopLocationUpdatesAsync} from 'expo-location';
-import React, {useEffect, useRef, useState} from 'react';
+import {useEffect, useRef, useState} from 'react';
 
 import useUpdateGpsNotification from './useUpdateGpsNotification';
 import useUpdateGpsTripOnReconnect from './useUpdateGpsTripOnReconnect';
 
-function GPSTripStateChecker() {
+// Names this hook's entry on the global modal stack so the effect below can take that one entry down, rather
+// than whatever modal happens to be on top when the trip stops being resumable.
+const CONTINUE_TRIP_MODAL_ID = 'gpsContinueTrip';
+
+/**
+ * Restores a GPS trip that was in progress when the app was closed, asking the user whether to continue or stop it.
+ */
+function useGPSTripStateChecker() {
     const {translate} = useLocalize();
     const [showContinueTripModal, setShowContinueTripModal] = useState(false);
     const [gpsDraftDetails, gpsDraftDetailsMetadata] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
@@ -32,6 +40,7 @@ function GPSTripStateChecker() {
     const isSessionLoaded = currentAccountIDResult.status === 'loaded';
     const hasHandledAppRestart = useRef(false);
     const {isOffline} = useNetwork();
+    const {showConfirmModal, closeModalByID} = useConfirmModal();
 
     const {splashScreenState} = useSplashScreenState();
 
@@ -43,6 +52,44 @@ function GPSTripStateChecker() {
     // A trip started before this shipped records no accountID, so only a different one means another user.
     const isTripFromDifferentUser = isSessionLoaded && !!gpsDraftDetails?.accountID && gpsDraftDetails.accountID !== currentAccountID;
 
+    // The prompt used to be rendered inline with this as its `isVisible`, so it hid itself again the moment any of
+    // these went false. On the global modal stack that no longer happens for free, so the effect below both shows
+    // the entry when this turns true and takes it down when it turns false.
+    const shouldShowContinueTripModal = showContinueTripModal && !!gpsDraftDetails?.isTracking && !isTripFromDifferentUser && splashScreenState === CONST.BOOT_SPLASH_STATE.HIDDEN;
+
+    // Keeps a re-render from stacking a second prompt, and tells the effect whether there is an entry left to close.
+    const isContinueTripModalOpenRef = useRef(false);
+
+    // Tells "the user answered" apart from "the conditions went false and we closed it ourselves". Both resolve the
+    // promise with CLOSE, and CLOSE means "stop the trip" here, so without this an auto-close would stop the trip.
+    const hasAutoClosedContinueTripModalRef = useRef(false);
+
+    // The trip keeps recording points while the prompt is open, so the handlers have to read the trip as it stands
+    // when the user answers. Reading the show-time values would submit a truncated trip.
+    const gpsDraftDetailsRef = useRef(gpsDraftDetails);
+    const isOfflineRef = useRef(isOffline);
+    const reportIDRef = useRef(reportID);
+    const closeModalByIDRef = useRef(closeModalByID);
+    useEffect(() => {
+        gpsDraftDetailsRef.current = gpsDraftDetails;
+        isOfflineRef.current = isOffline;
+        reportIDRef.current = reportID;
+        closeModalByIDRef.current = closeModalByID;
+    });
+
+    // The prompt lives on the app-level modal stack, which outlives AuthScreens. Take it down when the session ends
+    // (logout, expiry) so it does not stay over the public screens and run trip actions once answered there.
+    useEffect(
+        () => () => {
+            if (!isContinueTripModalOpenRef.current) {
+                return;
+            }
+            hasAutoClosedContinueTripModalRef.current = true;
+            closeModalByIDRef.current(CONTINUE_TRIP_MODAL_ID);
+        },
+        [],
+    );
+
     useEffect(() => {
         if (!isTripFromDifferentUser) {
             return;
@@ -100,17 +147,17 @@ function GPSTripStateChecker() {
     }, []);
 
     const navigateToGpsScreen = () => {
-        Navigation.navigate(ROUTES.DISTANCE_REQUEST_CREATE_TAB_GPS.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.CREATE, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, reportID));
+        Navigation.navigate(ROUTES.DISTANCE_REQUEST_CREATE_TAB_GPS.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.CREATE, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, reportIDRef.current));
     };
 
     const continueGpsTrip = async () => {
         const isBackgroundTaskRunning = await hasStartedLocationUpdatesAsync(BACKGROUND_LOCATION_TRACKING_TASK_NAME);
 
-        const unit = gpsDraftDetails?.unit;
+        const unit = gpsDraftDetailsRef.current?.unit;
 
         if (isBackgroundTaskRunning) {
             if (unit) {
-                startGpsTripNotification(translate, reportID, unit, gpsDraftDetails?.distanceInMeters);
+                startGpsTripNotification(translate, reportIDRef.current, unit, gpsDraftDetailsRef.current?.distanceInMeters);
             }
             return;
         }
@@ -126,35 +173,66 @@ function GPSTripStateChecker() {
             return;
         }
 
-        startGpsTripNotification(translate, reportID, unit, gpsDraftDetails?.distanceInMeters);
+        startGpsTripNotification(translate, reportIDRef.current, unit, gpsDraftDetailsRef.current?.distanceInMeters);
     };
 
     const onContinueTrip = () => {
-        setShowContinueTripModal(false);
         continueGpsTrip();
         navigateToGpsScreen();
     };
 
     const onViewTrip = () => {
-        setShowContinueTripModal(false);
-        stopGpsTrip(isOffline, getGpsPoints(gpsDraftDetails));
+        stopGpsTrip(isOfflineRef.current, getGpsPoints(gpsDraftDetailsRef.current));
         navigateToGpsScreen();
     };
 
-    return (
-        <ConfirmModal
-            isVisible={showContinueTripModal && !!gpsDraftDetails?.isTracking && !isTripFromDifferentUser && splashScreenState === CONST.BOOT_SPLASH_STATE.HIDDEN}
-            title={translate('gps.continueGpsTripModal.title')}
-            prompt={translate('gps.continueGpsTripModal.prompt')}
-            shouldReverseStackedButtons
-            confirmText={translate('gps.continueGpsTripModal.confirm')}
-            cancelText={translate('gps.continueGpsTripModal.cancel')}
-            onCancel={onViewTrip}
-            onConfirm={onContinueTrip}
-        />
-    );
-}
+    useEffect(() => {
+        if (!shouldShowContinueTripModal) {
+            if (!isContinueTripModalOpenRef.current) {
+                return;
+            }
 
-GPSTripStateChecker.displayName = 'GPSTripStateChecker';
+            // Closing by ID rather than with `closeModal()`, which pops whatever sits on top and would take an
+            // unrelated modal down if one had been opened over this one.
+            hasAutoClosedContinueTripModalRef.current = true;
+            closeModalByID(CONTINUE_TRIP_MODAL_ID);
+            return;
+        }
+
+        if (isContinueTripModalOpenRef.current) {
+            return;
+        }
+        isContinueTripModalOpenRef.current = true;
+
+        showConfirmModal({
+            id: CONTINUE_TRIP_MODAL_ID,
+            title: translate('gps.continueGpsTripModal.title'),
+            prompt: translate('gps.continueGpsTripModal.prompt'),
+            shouldReverseStackedButtons: true,
+            confirmText: translate('gps.continueGpsTripModal.confirm'),
+            cancelText: translate('gps.continueGpsTripModal.cancel'),
+            // Cancelling here stops the trip rather than dismissing the prompt, so Android hardware back must not be
+            // routed into it. The hook defaults this to true when it is left undefined.
+            shouldHandleNavigationBack: false,
+        }).then((result) => {
+            isContinueTripModalOpenRef.current = false;
+            setShowContinueTripModal(false);
+
+            // The conditions went false and the branch above took the entry down, so the user never answered and
+            // neither branch below may run.
+            if (hasAutoClosedContinueTripModalRef.current) {
+                hasAutoClosedContinueTripModalRef.current = false;
+                return;
+            }
+
+            if (result.action === ModalActions.CONFIRM) {
+                onContinueTrip();
+                return;
+            }
+
+            onViewTrip();
+        });
+    }, [closeModalByID, onContinueTrip, onViewTrip, shouldShowContinueTripModal, showConfirmModal, translate]);
+}
 
-export default GPSTripStateChecker;
+export default useGPSTripStateChecker;
diff --git a/src/hooks/useGPSTripStateChecker/index.ts b/src/hooks/useGPSTripStateChecker/index.ts
new file mode 100644
index 000000000000..4a319ad210e9
--- /dev/null
+++ b/src/hooks/useGPSTripStateChecker/index.ts
@@ -0,0 +1,4 @@
+// GPS is not available on web, so this hook is a no-op.
+function useGPSTripStateChecker() {}
+
+export default useGPSTripStateChecker;
diff --git a/src/components/GPSTripStateChecker/useUpdateGpsNotification/index.ios.ts b/src/hooks/useGPSTripStateChecker/useUpdateGpsNotification/index.ios.ts
similarity index 100%
rename from src/components/GPSTripStateChecker/useUpdateGpsNotification/index.ios.ts
rename to src/hooks/useGPSTripStateChecker/useUpdateGpsNotification/index.ios.ts
diff --git a/src/components/GPSTripStateChecker/useUpdateGpsNotification/index.ts b/src/hooks/useGPSTripStateChecker/useUpdateGpsNotification/index.ts
similarity index 100%
rename from src/components/GPSTripStateChecker/useUpdateGpsNotification/index.ts
rename to src/hooks/useGPSTripStateChecker/useUpdateGpsNotification/index.ts
diff --git a/src/components/GPSTripStateChecker/useUpdateGpsTripOnReconnect.ts b/src/hooks/useGPSTripStateChecker/useUpdateGpsTripOnReconnect.ts
similarity index 100%
rename from src/components/GPSTripStateChecker/useUpdateGpsTripOnReconnect.ts
rename to src/hooks/useGPSTripStateChecker/useUpdateGpsTripOnReconnect.ts
diff --git a/src/hooks/useGeographicalStateAndCountryFromRoute.ts b/src/hooks/useGeographicalStateAndCountryFromRoute.ts
index 81de4e0dfdab..0d6e84af52f3 100644
--- a/src/hooks/useGeographicalStateAndCountryFromRoute.ts
+++ b/src/hooks/useGeographicalStateAndCountryFromRoute.ts
@@ -1,3 +1,5 @@
+import {isRecord} from '@libs/ObjectUtils';
+
 import CONST from '@src/CONST';
 
 import {useRoute} from '@react-navigation/native';
@@ -7,22 +9,35 @@ type State = keyof typeof COMMON_CONST.STATES;
 type Country = keyof typeof CONST.ALL_COUNTRIES;
 type StateAndCountry = {state?: State; country?: Country};
 
+// Own keys exclude prototype properties such as `constructor` and `toString`, which are not valid state or country codes.
+function isState(value: unknown): value is State {
+    return typeof value === 'string' && Object.hasOwn(COMMON_CONST.STATES, value);
+}
+
+function isCountry(value: unknown): value is Country {
+    return typeof value === 'string' && Object.hasOwn(CONST.ALL_COUNTRIES, value);
+}
+
 /**
  * Extracts the 'state' and 'country' query parameters from the route/ url and validates it against COMMON_CONST.STATES and CONST.ALL_COUNTRIES.
  * Example 1: Url: https://new.expensify.com/settings/profile/address?state=MO Returns: state=MO
  * Example 2: Url: https://new.expensify.com/settings/profile/address?state=ASDF Returns: state=undefined
  * Example 3: Url: https://new.expensify.com/settings/profile/address Returns: state=undefined
- * Example 4: Url: https://new.expensify.com/settings/profile/address?state=MO-hash-a12341 Returns: state=MO
+ * Example 4: Url: https://new.expensify.com/settings/profile/address?state=MO-hash-a12341 Returns: state=undefined
  * Similarly for country parameter.
  */
 export default function useGeographicalStateAndCountryFromRoute(stateParamName = 'state', countryParamName = 'country'): StateAndCountry {
-    const routeParams = useRoute().params as Record<string, string>;
+    const routeParams = useRoute().params;
+
+    if (!isRecord(routeParams)) {
+        return {state: undefined, country: undefined};
+    }
 
-    const stateFromUrlTemp = routeParams?.[stateParamName] as string | undefined;
-    const countryFromUrlTemp = routeParams?.[countryParamName] as string | undefined;
+    const stateFromUrl = routeParams[stateParamName];
+    const countryFromUrl = routeParams[countryParamName];
 
     return {
-        state: COMMON_CONST.STATES[stateFromUrlTemp as State]?.stateISO,
-        country: Object.keys(CONST.ALL_COUNTRIES).find((country) => country === countryFromUrlTemp) as Country,
+        state: isState(stateFromUrl) ? COMMON_CONST.STATES[stateFromUrl].stateISO : undefined,
+        country: isCountry(countryFromUrl) ? countryFromUrl : undefined,
     };
 }
diff --git a/src/hooks/useHtmlPaste/index.ts b/src/hooks/useHtmlPaste/index.ts
index abd9964f15a1..770ebdf84a4e 100644
--- a/src/hooks/useHtmlPaste/index.ts
+++ b/src/hooks/useHtmlPaste/index.ts
@@ -1,7 +1,11 @@
+import useOnyx from '@hooks/useOnyx';
+import {buildReportIDToNameMap} from '@hooks/useReportIDToNameMap';
+
 import {isStandaloneURL, toMarkdownLink} from '@libs/MarkdownLinkHelpers';
 import Parser from '@libs/Parser';
 
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 import {useCallback, useEffect, useRef} from 'react';
 
@@ -42,6 +46,8 @@ const insertAtCaret = (target: HTMLElement, insertedText: string, maxLength: num
 };
 
 const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, isActive = false, maxLength = CONST.MAX_COMMENT_LENGTH + 1) => {
+    const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
+
     /**
      * Set pasted text to clipboard
      * @param {String} text
@@ -96,9 +102,10 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, isActive
      */
     const handlePastedHTML = useCallback(
         (html: string) => {
-            paste(Parser.htmlToMarkdown(html, {}));
+            // Built here rather than in render so it costs nothing until a paste actually happens.
+            paste(Parser.htmlToMarkdown(html, {reportIDToName: buildReportIDToNameMap(reports)}));
         },
-        [paste],
+        [paste, reports],
     );
 
     /**
diff --git a/src/hooks/useIsTabFocused.ts b/src/hooks/useIsTabFocused.ts
new file mode 100644
index 000000000000..8447ae06a175
--- /dev/null
+++ b/src/hooks/useIsTabFocused.ts
@@ -0,0 +1,22 @@
+import getActiveTabName from '@libs/Navigation/helpers/getActiveTabName';
+import type {NavigationRoute} from '@libs/Navigation/types';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+
+import useRootNavigationState from './useRootNavigationState';
+
+/**
+ * Returns true when `tabName` is the active tab. Unlike `useIsFocused()`, it stays true when an RHP
+ * is pushed on top of that tab's screen.
+ */
+function useIsTabFocused(tabName: string): boolean {
+    return useRootNavigationState((state) => {
+        if (!state) {
+            return false;
+        }
+        const topTabNavigator = state.routes.findLast((route) => route.name === NAVIGATORS.TAB_NAVIGATOR) as NavigationRoute | undefined;
+        return getActiveTabName(topTabNavigator) === tabName;
+    });
+}
+
+export default useIsTabFocused;
diff --git a/src/hooks/useIsWorkspacesTabFocused.ts b/src/hooks/useIsWorkspacesTabFocused.ts
index a0adcca35029..4df83af7aec9 100644
--- a/src/hooks/useIsWorkspacesTabFocused.ts
+++ b/src/hooks/useIsWorkspacesTabFocused.ts
@@ -1,23 +1,10 @@
-import getActiveTabName from '@libs/Navigation/helpers/getActiveTabName';
-import type {NavigationRoute} from '@libs/Navigation/types';
-
 import NAVIGATORS from '@src/NAVIGATORS';
 
-import useRootNavigationState from './useRootNavigationState';
+import useIsTabFocused from './useIsTabFocused';
 
-/**
- * Returns true when the Workspaces tab is the active tab in the top-most TAB_NAVIGATOR.
- * Stays true when an RHP is pushed on top of a workspace screen, unlike `useIsFocused()`
- * which becomes false because the RHP is the leaf focused route.
- */
+/** Returns true when the Workspaces tab is the active tab in the top-most TAB_NAVIGATOR. See `useIsTabFocused`. */
 function useIsWorkspacesTabFocused(): boolean {
-    return useRootNavigationState((state) => {
-        if (!state) {
-            return false;
-        }
-        const topTabNavigator = state.routes.findLast((route) => route.name === NAVIGATORS.TAB_NAVIGATOR) as NavigationRoute | undefined;
-        return getActiveTabName(topTabNavigator) === NAVIGATORS.WORKSPACE_NAVIGATOR;
-    });
+    return useIsTabFocused(NAVIGATORS.WORKSPACE_NAVIGATOR);
 }
 
 export default useIsWorkspacesTabFocused;
diff --git a/src/hooks/useLoadPolicyCategories.ts b/src/hooks/useLoadPolicyCategories.ts
new file mode 100644
index 000000000000..1da52bce1753
--- /dev/null
+++ b/src/hooks/useLoadPolicyCategories.ts
@@ -0,0 +1,61 @@
+import {clearPolicyCategoriesLoadingState, getPolicyCategories} from '@libs/actions/Policy/Category';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import {useEffect, useRef} from 'react';
+
+import useNetwork from './useNetwork';
+import useOnyx from './useOnyx';
+
+/**
+ * Fetches a policy's categories on demand when a category picker mounts, so a lazy-loaded account does not show only
+ * the category already on the expense.
+ *
+ * The guard is the RAM-only loading state written by `getPolicyCategories`, not "we already tried once": a read that
+ * failed leaves `hasOnceLoaded` false, so the next mount or reconnect retries it. Gating on the collection existing
+ * would not work either, since a partial collection holding just the selected category is indistinguishable from a
+ * complete one. `isLoading` is applied optimistically, so concurrent pickers for the same policy do not each fire a
+ * redundant `GetPolicyCategories` read (`API.read` does not dedupe in flight reads).
+ */
+function useLoadPolicyCategories(policyID: string | undefined) {
+    const [loadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE}${getNonEmptyStringOnyxID(policyID)}`);
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(policyID)}`);
+    const isLoading = !!loadingState?.isLoading;
+    const hasOnceLoaded = !!loadingState?.hasOnceLoaded;
+    const hasCategories = policyCategories !== undefined;
+
+    // The policyID this instance has already dispatched a read for. A failed read clears `isLoading` without setting
+    // `hasOnceLoaded`, which would otherwise re-satisfy the effect's guard and retry in a tight loop. Scoping the
+    // attempt to this instance keeps the retry cadence at "next time a picker opens" (or the next reconnect below).
+    const requestedPolicyIDRef = useRef<string>(undefined);
+
+    const {isOffline} = useNetwork({
+        onReconnect: () => {
+            if (!policyID || hasOnceLoaded) {
+                return;
+            }
+            // A read cut off by the disconnect never gets a response, so its `failureData` never applies and
+            // `isLoading` would stay true for the rest of the session. Clear it so the effect below can retry.
+            requestedPolicyIDRef.current = undefined;
+            clearPolicyCategoriesLoadingState(policyID);
+        },
+    });
+
+    useEffect(() => {
+        if (isOffline || !policyID || isLoading || hasOnceLoaded || requestedPolicyIDRef.current === policyID) {
+            return;
+        }
+        requestedPolicyIDRef.current = policyID;
+        getPolicyCategories(policyID);
+    }, [policyID, isOffline, isLoading, hasOnceLoaded]);
+
+    // True only while the read is unsettled and there is nothing to render yet, so the picker shows a skeleton instead
+    // of an empty list. The `policyID` check mirrors the effect's guard: with no policyID no read is ever dispatched,
+    // so the absent loading state would otherwise keep the skeleton up forever.
+    const isLoadingPolicyCategories = !!policyID && !isOffline && !hasOnceLoaded && !hasCategories && (isLoading || loadingState === undefined);
+
+    return {isLoadingPolicyCategories};
+}
+
+export default useLoadPolicyCategories;
diff --git a/src/hooks/useLoadPolicyTags.ts b/src/hooks/useLoadPolicyTags.ts
new file mode 100644
index 000000000000..eb22b806839b
--- /dev/null
+++ b/src/hooks/useLoadPolicyTags.ts
@@ -0,0 +1,61 @@
+import {clearPolicyTagsLoadingState, openPolicyTagsPage} from '@libs/actions/Policy/Tag';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import {useEffect, useRef} from 'react';
+
+import useNetwork from './useNetwork';
+import useOnyx from './useOnyx';
+
+/**
+ * Fetches a policy's tags on demand when a tag picker mounts, so a lazy-loaded account does not show only the tag
+ * already on the expense. `OpenPolicyTagsPage` is the only tag read available to the client today.
+ *
+ * The guard is the RAM-only loading state written by `openPolicyTagsPage`, not "we already tried once": a read that
+ * failed leaves `hasOnceLoaded` false, so the next mount or reconnect retries it. Gating on the collection existing
+ * would not work either, since a partial collection holding just the selected tag is indistinguishable from a
+ * complete one. `isLoading` is applied optimistically, so concurrent pickers for the same policy do not each fire a
+ * redundant read (`API.read` does not dedupe in flight reads).
+ */
+function useLoadPolicyTags(policyID: string | undefined) {
+    const [loadingState] = useOnyx(`${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE}${getNonEmptyStringOnyxID(policyID)}`);
+    const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(policyID)}`);
+    const isLoading = !!loadingState?.isLoading;
+    const hasOnceLoaded = !!loadingState?.hasOnceLoaded;
+    const hasTags = policyTags !== undefined;
+
+    // The policyID this instance has already dispatched a read for. A failed read clears `isLoading` without setting
+    // `hasOnceLoaded`, which would otherwise re-satisfy the effect's guard and retry in a tight loop. Scoping the
+    // attempt to this instance keeps the retry cadence at "next time a picker opens" (or the next reconnect below).
+    const requestedPolicyIDRef = useRef<string>(undefined);
+
+    const {isOffline} = useNetwork({
+        onReconnect: () => {
+            if (!policyID || hasOnceLoaded) {
+                return;
+            }
+            // A read cut off by the disconnect never gets a response, so its `failureData` never applies and
+            // `isLoading` would stay true for the rest of the session. Clear it so the effect below can retry.
+            requestedPolicyIDRef.current = undefined;
+            clearPolicyTagsLoadingState(policyID);
+        },
+    });
+
+    useEffect(() => {
+        if (isOffline || !policyID || isLoading || hasOnceLoaded || requestedPolicyIDRef.current === policyID) {
+            return;
+        }
+        requestedPolicyIDRef.current = policyID;
+        openPolicyTagsPage(policyID);
+    }, [policyID, isOffline, isLoading, hasOnceLoaded]);
+
+    // True only while the read is unsettled and there is nothing to render yet, so the picker shows a skeleton instead
+    // of an empty list. The `policyID` check mirrors the effect's guard: with no policyID no read is ever dispatched,
+    // so the absent loading state would otherwise keep the skeleton up forever.
+    const isLoadingPolicyTags = !!policyID && !isOffline && !hasOnceLoaded && !hasTags && (isLoading || loadingState === undefined);
+
+    return {isLoadingPolicyTags};
+}
+
+export default useLoadPolicyTags;
diff --git a/src/hooks/useLoadSearchVendorData.ts b/src/hooks/useLoadSearchVendorData.ts
new file mode 100644
index 000000000000..0995cfab7082
--- /dev/null
+++ b/src/hooks/useLoadSearchVendorData.ts
@@ -0,0 +1,59 @@
+import {openSearchVendorFiltersPage} from '@libs/actions/Search';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import {useEffect, useRef} from 'react';
+
+import useNetwork from './useNetwork';
+import useOnyx from './useOnyx';
+
+type UseLoadSearchVendorDataParams = {
+    /** Whether vendor data should be loaded. */
+    shouldLoad?: boolean;
+
+    /** Whether already loaded vendor data should be refreshed. */
+    shouldRefresh?: boolean;
+};
+
+function useLoadSearchVendorData({shouldLoad = true, shouldRefresh = false}: UseLoadSearchVendorDataParams = {}) {
+    const {isOffline} = useNetwork();
+    const [areVendorsLoaded] = useOnyx(ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED);
+    const [isLoadingVendors] = useOnyx(ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA);
+    const hasRequestedVendorDataRef = useRef(false);
+    const hasObservedVendorRequestStateRef = useRef(!!areVendorsLoaded || isLoadingVendors !== undefined);
+
+    useEffect(() => {
+        if (areVendorsLoaded || isLoadingVendors !== undefined) {
+            hasObservedVendorRequestStateRef.current = true;
+        }
+
+        const wasVendorRequestStateCleared = hasRequestedVendorDataRef.current && hasObservedVendorRequestStateRef.current && !areVendorsLoaded && isLoadingVendors === undefined;
+        if (wasVendorRequestStateCleared) {
+            hasRequestedVendorDataRef.current = false;
+            hasObservedVendorRequestStateRef.current = false;
+        }
+
+        if (!shouldLoad) {
+            hasRequestedVendorDataRef.current = false;
+            hasObservedVendorRequestStateRef.current = false;
+            return;
+        }
+
+        if (isLoadingVendors) {
+            hasRequestedVendorDataRef.current = true;
+            return;
+        }
+
+        if (isOffline || hasRequestedVendorDataRef.current || (areVendorsLoaded && !shouldRefresh)) {
+            return;
+        }
+        hasRequestedVendorDataRef.current = true;
+        openSearchVendorFiltersPage();
+    }, [areVendorsLoaded, isLoadingVendors, isOffline, shouldLoad, shouldRefresh]);
+
+    const isLoadingInitialVendors = shouldLoad && !areVendorsLoaded && !isOffline && isLoadingVendors !== false;
+
+    return {areVendorsLoaded, isLoadingInitialVendors, isOffline};
+}
+
+export default useLoadSearchVendorData;
diff --git a/src/hooks/useMoneyReportHeaderMoreContentVisibility.ts b/src/hooks/useMoneyReportHeaderMoreContentVisibility.ts
new file mode 100644
index 000000000000..0bd91309b9d8
--- /dev/null
+++ b/src/hooks/useMoneyReportHeaderMoreContentVisibility.ts
@@ -0,0 +1,46 @@
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import {isGroupPolicy} from '@libs/PolicyUtils';
+import {isInvoiceReport as isInvoiceReportUtil} from '@libs/ReportUtils';
+
+import type CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type {ValueOf} from 'type-fest';
+
+import useMoneyReportHeaderStatusBar from './useMoneyReportHeaderStatusBar';
+import useOnyx from './useOnyx';
+
+type MoneyReportHeaderMoreContentVisibility = {
+    /** Which status bar to render below the header, if any */
+    statusBarType: ValueOf<typeof CONST.REPORT.STATUS_BAR_TYPE> | undefined;
+
+    /** Whether the next step bar should be rendered below the header */
+    shouldShowNextStep: boolean;
+
+    /** Whether the more-content row has anything to show on its own */
+    hasStatusOrNextStep: boolean;
+};
+
+/**
+ * Resolves what the money report header's more-content row (status bar / next step) will display.
+ *
+ * The header needs this before it renders, because it decides where the report actions go: they normally sit at
+ * the end of the more-content row so they line up with its text, but when that row has nothing to show they
+ * would be stranded alone under the title, and belong in the header row instead.
+ */
+function useMoneyReportHeaderMoreContentVisibility(reportID: string | undefined): MoneyReportHeaderMoreContentVisibility {
+    const [moneyRequestReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(moneyRequestReport?.policyID)}`);
+    const {shouldShowStatusBar, statusBarType} = useMoneyReportHeaderStatusBar(reportID, moneyRequestReport?.chatReportID);
+
+    const isInvoiceReport = isInvoiceReportUtil(moneyRequestReport);
+    const shouldShowNextStep = isGroupPolicy(policy) && !isInvoiceReport && !shouldShowStatusBar;
+
+    return {
+        statusBarType,
+        shouldShowNextStep,
+        hasStatusOrNextStep: shouldShowNextStep || !!statusBarType,
+    };
+}
+
+export default useMoneyReportHeaderMoreContentVisibility;
diff --git a/src/hooks/useNavigateToTransactionThread.ts b/src/hooks/useNavigateToTransactionThread.ts
index a27ee37d3c58..792f97bcf8e4 100644
--- a/src/hooks/useNavigateToTransactionThread.ts
+++ b/src/hooks/useNavigateToTransactionThread.ts
@@ -4,7 +4,7 @@ import {useWideRHPActions} from '@components/WideRHPContextProvider';
 import {createTransactionThreadReport, setOptimisticTransactionThread} from '@libs/actions/Report';
 import {setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import Navigation from '@libs/Navigation/Navigation';
-import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
+import {getExpenseCreationIOUActionForTransactionID} from '@libs/ReportActionsUtils';
 
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -33,6 +33,9 @@ type NavigateToTransactionThreadParams = {
     /** Ordered list of sibling transaction IDs used to drive the prev/next carousel in the thread RHP */
     siblingTransactionIDs: string[];
 
+    /** Identity of the screen seeding the carousel, so it can later refresh or release only its own list */
+    carouselSource?: string;
+
     /** Route to return to when navigating back; defaults to the current active route */
     backTo?: string;
 };
@@ -55,15 +58,22 @@ function useNavigateToTransactionThread() {
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
 
-    return ({transactionID, reportActions, report, transaction, siblingTransactionIDs, backTo}: NavigateToTransactionThreadParams) => {
-        const iouAction = getIOUActionForTransactionID(reportActions, transactionID);
+    return ({transactionID, reportActions, report, transaction, siblingTransactionIDs, carouselSource, backTo}: NavigateToTransactionThreadParams) => {
+        // The action that created the expense, not merely one referencing it. In an approved or paid report the
+        // approval and payment actions carry the same IOUTransactionID, and matching one of those would open its
+        // system message thread instead of the expense. The carousel this seeds resolves siblings the same way, so
+        // using the loose lookup here made a row press and a prev/next step onto the same expense disagree.
+        const iouAction = getExpenseCreationIOUActionForTransactionID(reportActions, transactionID);
         const routeAtPress = Navigation.getActiveRoute();
         const resolvedBackTo = backTo ?? routeAtPress;
         let reportIDToNavigate = iouAction?.childReportID;
 
-        const routeParams: {reportID: string | undefined; reportActionID?: string; backTo?: string} = {
+        const routeParams: {reportID: string | undefined; reportActionID?: string; backTo?: string; anchorTransactionID?: string} = {
             reportID: reportIDToNavigate,
             backTo: resolvedBackTo,
+            // Anchors the thread to this expense so the header can show the carousel before the thread's own
+            // parent report action has loaded.
+            anchorTransactionID: transactionID,
         };
 
         if (!reportIDToNavigate) {
@@ -88,8 +98,10 @@ function useNavigateToTransactionThread() {
         }
 
         // Single transaction report opens in RHP. We seed every sibling transaction ID so the RHP can
-        // display prev/next arrows for navigation between expenses.
-        setActiveTransactionIDs(siblingTransactionIDs).then(() => {
+        // display prev/next arrows for navigation between expenses. The pressed row's own screen takes ownership
+        // of the carousel: an earlier version kept a broader list (e.g. the Spend page's) alive here, which left
+        // the report showing a counter and arrows for expenses that weren't in it.
+        setActiveTransactionIDs(siblingTransactionIDs, {source: carouselSource}).then(() => {
             // A second press made before this resolves would stack its expense on top of the first.
             if (Navigation.getActiveRoute() !== routeAtPress) {
                 return;
diff --git a/src/hooks/useOpenConciergeAnywhere/index.native.tsx b/src/hooks/useOpenConciergeAnywhere/index.native.tsx
index cffe57aea519..89ed50dcb6cf 100644
--- a/src/hooks/useOpenConciergeAnywhere/index.native.tsx
+++ b/src/hooks/useOpenConciergeAnywhere/index.native.tsx
@@ -1,8 +1,10 @@
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 
 import {navigateToConciergeChat} from '@userActions/Report';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
@@ -14,12 +16,13 @@ import {hasSeenTourSelector} from '@selectors/Onboarding';
 function useOpenConciergeAnywhere() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const openConciergeAnywhere = (_options?: {forceConcierge?: boolean; reportID?: string}) => {
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed});
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails});
     };
 
     return {openConciergeAnywhere, isInSidePanel: false};
diff --git a/src/hooks/useReportActionsPagination.ts b/src/hooks/useReportActionsPagination.ts
index 61b87c8f7318..77a79341a71f 100644
--- a/src/hooks/useReportActionsPagination.ts
+++ b/src/hooks/useReportActionsPagination.ts
@@ -13,6 +13,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import {useMemo, useState} from 'react';
 
 import {useCurrencyListActions} from './useCurrencyList';
+import useDelegateAccountID from './useDelegateAccountID';
 import useNetwork from './useNetwork';
 import useOnyx from './useOnyx';
 import usePaginatedReportActions from './usePaginatedReportActions';
@@ -39,6 +40,7 @@ function useReportActionsPagination(reportID: string | undefined, reportActionID
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
     const {isOffline} = useNetwork();
     const {getCurrencyDecimals} = useCurrencyListActions();
+    const delegateAccountID = useDelegateAccountID();
     const parentReportAction = useParentReportAction(report);
 
     const [treatAsNoPaginationAnchor, setTreatAsNoPaginationAnchor] = useState(false);
@@ -82,8 +84,18 @@ function useReportActionsPagination(reportID: string | undefined, reportActionID
     // and we also generate an expense action if the number of expenses in allReportActions is less than the total number of expenses
     // to display at least one expense action to match the total data.
     const reportActionsToDisplay = useMemo(
-        () => getReportActionsToDisplay(allReportActions, lastAction, report, reportPreviewAction, thread.transactionThreadReport, shouldAddCreatedAction, getCurrencyDecimals),
-        [allReportActions, lastAction, report, reportPreviewAction, shouldAddCreatedAction, thread.transactionThreadReport, getCurrencyDecimals],
+        () =>
+            getReportActionsToDisplay(
+                allReportActions,
+                lastAction,
+                report,
+                reportPreviewAction,
+                thread.transactionThreadReport,
+                shouldAddCreatedAction,
+                getCurrencyDecimals,
+                delegateAccountID,
+            ),
+        [allReportActions, lastAction, report, reportPreviewAction, shouldAddCreatedAction, thread.transactionThreadReport, getCurrencyDecimals, delegateAccountID],
     );
 
     const reportActions = useMemo(
diff --git a/src/hooks/useReportActionsScroll.ts b/src/hooks/useReportActionsScroll.ts
index 4d7394b6abf5..09bf411c31b8 100644
--- a/src/hooks/useReportActionsScroll.ts
+++ b/src/hooks/useReportActionsScroll.ts
@@ -399,7 +399,8 @@ function useReportActionsScroll({
         if (actionBadgeTargetIndex < 0) {
             return;
         }
-        reportScrollManager.scrollToIndex(actionBadgeTargetIndex, {viewPosition: 1, viewOffset: CONST.REPORT.ACTIONS.LINKED_MESSAGE_OFFSET});
+        // `animated` is explicit because native defaults to an instant jump, which would teleport the list and lose the user's place.
+        reportScrollManager.scrollToIndex(actionBadgeTargetIndex, {animated: true, viewPosition: 1, viewOffset: CONST.REPORT.ACTIONS.LINKED_MESSAGE_OFFSET});
     };
 
     const flushPendingScrollToBottom = () => {
diff --git a/src/hooks/useReportIDToNameMap.ts b/src/hooks/useReportIDToNameMap.ts
new file mode 100644
index 000000000000..652c00467a54
--- /dev/null
+++ b/src/hooks/useReportIDToNameMap.ts
@@ -0,0 +1,30 @@
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+
+import type {OnyxCollection} from 'react-native-onyx';
+
+import useOnyx from './useOnyx';
+
+/** Mapping from reportID to report name. */
+type ReportIDToNameMap = Record<string, string>;
+
+/** Builds a map of reportID to report name from COLLECTION.REPORT. */
+function buildReportIDToNameMap(reports: OnyxCollection<Report> | undefined): ReportIDToNameMap {
+    const map: ReportIDToNameMap = {};
+    for (const report of Object.values(reports ?? {})) {
+        if (!report) {
+            continue;
+        }
+        map[report.reportID] = report.reportName ?? report.reportID;
+    }
+    return map;
+}
+
+/** Returns a map of reportID to report name built from COLLECTION.REPORT. */
+function useReportIDToNameMap(): ReportIDToNameMap {
+    const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
+    return buildReportIDToNameMap(reports);
+}
+
+export default useReportIDToNameMap;
+export {buildReportIDToNameMap};
diff --git a/src/hooks/useReportScrollManager/types.ts b/src/hooks/useReportScrollManager/types.ts
index 68a77ccd9b27..c7649ecc334a 100644
--- a/src/hooks/useReportScrollManager/types.ts
+++ b/src/hooks/useReportScrollManager/types.ts
@@ -14,9 +14,7 @@ type ScrollToIndexOptions = {
 type ReportScrollManagerData = {
     /**
      * Scroll to a list index. `isEditing` suppresses the scroll (web only, defaults to `false`).
-     * When `animated` is omitted each platform keeps its prior default: web animates, native jumps
-     * instantly. ReportActionItemMessageEdit's Android Chrome keyboard hack passes `{animated: false}`
-     * to scroll instantly when the edit composer gains focus and the soft keyboard shifts the viewport.
+     * Omitting `animated` keeps each platform's default: web animates, native jumps.
      */
     scrollToIndex: (index: number, options?: ScrollToIndexOptions) => void;
     scrollToBottom: () => void;
diff --git a/src/hooks/useRulesPrefetch.ts b/src/hooks/useRulesPrefetch.ts
new file mode 100644
index 000000000000..478475c1ac68
--- /dev/null
+++ b/src/hooks/useRulesPrefetch.ts
@@ -0,0 +1,46 @@
+import {getRules, resetRulesFetchState} from '@libs/actions/Policy/Rules';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+
+import {useEffect} from 'react';
+
+import useNetwork from './useNetwork';
+import useOnyx from './useOnyx';
+
+/**
+ * Fetches the `rules_` collection for a screen that reads it without opening a workspace.
+ *
+ * Merchant rules used to arrive on the policy, so anything holding a policy could read them. They now
+ * live in their own collection that only `GetRules` populates, which leaves screens reached from the
+ * workspaces list or from Home reading an empty collection. Where that collection decides whether an
+ * option is offered at all, an empty read silently drops the rules rather than showing a stale count.
+ *
+ * `GetRules` takes no parameters and its response SETs the whole collection, so this fetches once per
+ * session rather than on every mount. The shared guards live here so callers cannot drift apart.
+ *
+ * Returns whether the collection is still on its way, which a screen that decides something from a rule's
+ * absence has to wait for. Onyx hydrates the collection as empty long before the response lands, so without
+ * this a deep linked screen reads "no such rule" for a rule that exists.
+ */
+function useRulesPrefetch(enabled = true): {areRulesLoading: boolean} {
+    // Reconnecting is the only signal that a fetch which never settled is not still on its way.
+    const {isOffline} = useNetwork({onReconnect: resetRulesFetchState});
+    const [hasBeenFetched, hasBeenFetchedResult] = useOnyx(ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED);
+    const [isLoadingRules] = useOnyx(ONYXKEYS.RAM_ONLY_IS_LOADING_RULES);
+    const isFlagLoading = isLoadingOnyxValue(hasBeenFetchedResult);
+    const isFetchNeeded = enabled && !isFlagLoading && !isOffline && !hasBeenFetched && !isLoadingRules;
+
+    useEffect(() => {
+        if (!isFetchNeeded) {
+            return;
+        }
+        getRules();
+    }, [isFetchNeeded]);
+
+    // `isFetchNeeded` and `isFlagLoading` cover the renders before the effect has run, which are the ones a
+    // guard reading the collection would otherwise resolve against nothing. Offline there is nothing to wait for.
+    return {areRulesLoading: enabled && !isOffline && (isFlagLoading || isFetchNeeded || !!isLoadingRules)};
+}
+
+export default useRulesPrefetch;
diff --git a/src/hooks/useSearchHighlightAndScroll.ts b/src/hooks/useSearchAutoRefetch.ts
similarity index 54%
rename from src/hooks/useSearchHighlightAndScroll.ts
rename to src/hooks/useSearchAutoRefetch.ts
index 4f99429f78ec..38ec4cd0e630 100644
--- a/src/hooks/useSearchHighlightAndScroll.ts
+++ b/src/hooks/useSearchAutoRefetch.ts
@@ -1,9 +1,7 @@
-import type {SearchListItem, TransactionGroupListItemType, TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
+import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 import type {SearchQueryJSON} from '@components/Search/types';
-import type {SelectionListHandle} from '@components/SelectionList/types';
 
 import {search} from '@libs/actions/Search';
-import {mergeTransactionIdsHighlightOnSearchRoute} from '@libs/actions/Transaction';
 import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {SearchKey} from '@libs/SearchKeyUtils';
@@ -16,29 +14,44 @@ import type {ReportActions, SearchResults, Transaction} from '@src/types/onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {useIsFocused} from '@react-navigation/native';
-import {useCallback, useEffect, useRef, useState} from 'react';
+import {useEffect, useRef} from 'react';
 
 import useNetwork from './useNetwork';
-import useOnyx from './useOnyx';
-import usePrevious from './usePrevious';
 
-type UseSearchHighlightAndScroll = {
+type UseSearchAutoRefetch = {
+    /** Current Search snapshot */
     searchResults: OnyxEntry<SearchResults>;
+
+    /** Current transactions collection */
     transactions: OnyxCollection<Transaction>;
+
+    /** Previous transactions collection, compared against `transactions` to detect newly-added ones */
     previousTransactions: OnyxCollection<Transaction>;
+
+    /** Current report actions collection */
     reportActions: OnyxCollection<ReportActions>;
+
+    /** Previous report actions collection, compared against `reportActions` to detect new entries */
     previousReportActions: OnyxCollection<ReportActions>;
+
+    /** Parsed search query the refetch is issued for */
     queryJSON: SearchQueryJSON;
+
+    /** Key identifying the current search */
     searchKey: SearchKey | undefined;
+
+    /** Pagination offset for the refetch request */
     offset: number;
+
+    /** Whether the refetch should recalculate result totals */
     shouldCalculateTotals: boolean;
-    shouldUseLiveData: boolean;
 };
 
 /**
- * Hook used to trigger a search when a new transaction or report action is added and handle highlighting and scrolling.
+ * Triggers a search when a transaction or report action is added so the snapshot reflects it.
+ * Returns the newly-added transactions, which the grouped views use to refetch each expanded group's child snapshot.
  */
-function useSearchHighlightAndScroll({
+function useSearchAutoRefetch({
     searchResults,
     transactions,
     previousTransactions,
@@ -48,25 +61,13 @@ function useSearchHighlightAndScroll({
     searchKey,
     offset,
     shouldCalculateTotals,
-    shouldUseLiveData,
-}: UseSearchHighlightAndScroll) {
+}: UseSearchAutoRefetch) {
     const isFocused = useIsFocused();
     const {isOffline} = useNetwork();
-    // Ref to track if the search was triggered by this hook
-    const triggeredByHookRef = useRef(false);
     const searchTriggeredRef = useRef(false);
-    const hasNewItemsRef = useRef(false);
-    const previousSearchResults = usePrevious(searchResults?.data);
-    const [newSearchResultKeys, setNewSearchResultKeys] = useState<Set<string> | null>(null);
-    const highlightedIDs = useRef<Set<string>>(new Set());
-    const initializedRef = useRef(false);
     const hasPendingSearchRef = useRef(false);
     const isChat = queryJSON.type === CONST.SEARCH.DATA_TYPES.CHAT;
 
-    const transactionIDsToHighlightSelector = useCallback((allTransactionIDs: OnyxEntry<Record<string, Record<string, boolean>>>) => allTransactionIDs?.[queryJSON.type], [queryJSON.type]);
-    const [transactionIDsToHighlight] = useOnyx(ONYXKEYS.TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE, {
-        selector: transactionIDsToHighlightSelector,
-    });
     const searchResultsData = searchResults?.data;
 
     const prevTransactionsIDs = Object.keys(previousTransactions ?? {});
@@ -153,13 +154,6 @@ function useSearchHighlightAndScroll({
                     return;
                 }
             }
-            // We only want to highlight new items if the addition of transactions or report actions triggered the search.
-            // This is because, on deletion of items, the backend sometimes returns old items in place of the deleted ones.
-            // We don't want to highlight these old items, even if they appear new in the current search results.
-            hasNewItemsRef.current = isChat ? reportActionsIDs.length > previousReportActionsIDs.length : transactionsIDs.length > previousTransactionIDsLocal.length;
-
-            // Set the flag indicating the search is triggered by the hook
-            triggeredByHookRef.current = true;
 
             // Trigger the search
             TransitionTracker.runAfterTransitions({
@@ -195,155 +189,23 @@ function useSearchHighlightAndScroll({
         }
 
         searchTriggeredRef.current = false;
-    }, [searchResults?.search?.isLoading, shouldUseLiveData, searchResultsData]);
-
-    // Initialize the set with existing IDs only once
-    useEffect(() => {
-        if (initializedRef.current || !searchResultsData) {
-            return;
-        }
-
-        const initialIDs = isChat ? extractReportActionIDsFromSearchResults(searchResultsData) : extractTransactionIDsFromSearchResults(searchResultsData);
-        highlightedIDs.current = new Set(initialIDs);
-        initializedRef.current = true;
-    }, [searchResultsData, isChat]);
-
-    // Detect new items (transactions or report actions)
-    useEffect(() => {
-        if (!previousSearchResults || !searchResults?.data) {
-            return;
-        }
-        if (isChat) {
-            const previousReportActionIDs = extractReportActionIDsFromSearchResults(previousSearchResults);
-            const currentReportActionIDs = extractReportActionIDsFromSearchResults(searchResults.data);
-
-            // Find new report action IDs that are not in the previousReportActionIDs and not already highlighted
-            const newReportActionIDs = currentReportActionIDs.filter((id) => !previousReportActionIDs.includes(id) && !highlightedIDs.current.has(id));
-
-            if (!triggeredByHookRef.current || newReportActionIDs.length === 0 || !hasNewItemsRef.current) {
-                return;
-            }
+    }, [searchResults?.search?.isLoading, searchResultsData]);
 
-            const newKeys = new Set<string>();
-            for (const id of newReportActionIDs) {
-                const newReportActionKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${id}`;
-                highlightedIDs.current.add(newReportActionKey);
-                newKeys.add(newReportActionKey);
-            }
-            setNewSearchResultKeys(newKeys);
-        } else {
-            const previousTransactionIDs = extractTransactionIDsFromSearchResults(previousSearchResults);
-            const currentTransactionIDs = extractTransactionIDsFromSearchResults(searchResults.data);
-            const manualHighlightTransactionIDs = new Set(Object.keys(transactionIDsToHighlight ?? {}).filter((id) => !!transactionIDsToHighlight?.[id]));
-
-            // Find new transaction IDs that are not in the previousTransactionIDs and not already highlighted
-            const newTransactionIDs = currentTransactionIDs.filter((id) => {
-                if (manualHighlightTransactionIDs.has(id)) {
-                    return true;
-                }
-                if (!triggeredByHookRef.current || !hasNewItemsRef.current) {
-                    return false;
-                }
-                return !previousTransactionIDs.includes(id) && !highlightedIDs.current.has(id);
-            });
-
-            if (newTransactionIDs.length === 0) {
-                return;
-            }
-
-            const newKeys = new Set<string>();
-            const consumedManualIDs: string[] = [];
-            for (const id of newTransactionIDs) {
-                const newTransactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${id}`;
-                highlightedIDs.current.add(newTransactionKey);
-                newKeys.add(newTransactionKey);
-                if (manualHighlightTransactionIDs.has(id)) {
-                    consumedManualIDs.push(id);
-                }
-            }
-            setNewSearchResultKeys(newKeys);
-
-            // Clear consumed manual highlight flags so subsequent detect runs don't re-highlight the same IDs.
-            if (consumedManualIDs.length > 0) {
-                mergeTransactionIdsHighlightOnSearchRoute(queryJSON.type, Object.fromEntries(consumedManualIDs.map((id) => [id, false])));
-            }
-        }
-    }, [searchResults?.data, previousSearchResults, isChat, transactionIDsToHighlight, queryJSON.type]);
-
-    // Remove transactionIDsToHighlight when the user leaves the current search type
-    useEffect(
-        () => () => {
-            mergeTransactionIdsHighlightOnSearchRoute(queryJSON.type, null);
-        },
-        [queryJSON.type],
-    );
-
-    // Reset newSearchResultKey after it's been used
-    useEffect(() => {
-        if (newSearchResultKeys === null) {
-            return;
-        }
-
-        const timer = setTimeout(() => {
-            setNewSearchResultKeys(null);
-        }, CONST.ANIMATED_HIGHLIGHT_START_DURATION);
-
-        return () => clearTimeout(timer);
-    }, [newSearchResultKeys]);
-
-    /**
-     * Callback to handle scrolling to the new search result.
-     */
-    const handleSelectionListScroll = (data: SearchListItem[], ref: SelectionListHandle<SearchListItem> | null) => {
-        // Early return if there's no ref, new transaction wasn't brought in by this hook
-        // or there's no new search result key
-        const newSearchResultKey = newSearchResultKeys?.values().next().value;
-        if (!ref || !triggeredByHookRef.current || !newSearchResultKey) {
-            return;
-        }
-
-        // Extract the transaction/report action ID from the newSearchResultKey
-        const newID = newSearchResultKey.replace(isChat ? ONYXKEYS.COLLECTION.REPORT_ACTIONS : ONYXKEYS.COLLECTION.TRANSACTION, '');
-
-        // Find the index of the new transaction/report action in the data array
-        const indexOfNewItem = data.findIndex((item) => {
-            if (isChat) {
-                if ('reportActionID' in item && item.reportActionID === newID) {
-                    return true;
-                }
-            } else {
-                // Handle TransactionListItemType
-                if ('transactionID' in item && item.transactionID === newID) {
-                    return true;
-                }
-
-                // Handle TransactionGroupListItemType with transactions array
-                if ('transactions' in item && Array.isArray(item.transactions)) {
-                    return item.transactions.some((transaction) => transaction?.transactionID === newID);
-                }
-            }
-
-            return false;
-        });
-
-        // Early return if the new item is not found in the data array
-        if (indexOfNewItem < 0) {
-            return;
-        }
-
-        // Reset the trigger even when the item is already first so a later render cannot scroll or highlight it again.
-        triggeredByHookRef.current = false;
-        if (indexOfNewItem === 0) {
-            return;
-        }
-
-        // Perform the scrolling action
-        ref.scrollToIndex(indexOfNewItem);
-    };
+    return {newTransactions};
+}
 
-    const hasQueuedHighlights = newSearchResultKeys !== null && newSearchResultKeys.size > 0;
+function getTransactionIDFromEntry(entry: unknown) {
+    if (typeof entry !== 'object' || entry === null || !('transactionID' in entry) || typeof entry.transactionID !== 'string') {
+        return undefined;
+    }
+    return entry.transactionID;
+}
 
-    return {newSearchResultKeys, handleSelectionListScroll, newTransactions, hasQueuedHighlights};
+function hasNestedTransactions(entry: unknown): entry is {transactions: Array<Partial<TransactionListItemType>>} {
+    if (typeof entry !== 'object' || entry === null || !('transactions' in entry)) {
+        return false;
+    }
+    return Array.isArray(entry.transactions);
 }
 
 /**
@@ -354,18 +216,21 @@ function extractTransactionIDsFromSearchResults(searchResultsData: Partial<Searc
 
     for (const item of Object.values(searchResultsData)) {
         // Check for transactionID directly on the item (TransactionListItemType)
-        if ((item as TransactionListItemType)?.transactionID) {
-            transactionIDs.push((item as TransactionListItemType).transactionID);
+        const transactionID = getTransactionIDFromEntry(item);
+        if (transactionID) {
+            transactionIDs.push(transactionID);
         }
 
         // Check for transactions array within the item (TransactionGroupListItemType)
-        if (Array.isArray((item as TransactionGroupListItemType)?.transactions)) {
-            for (const transaction of (item as TransactionGroupListItemType).transactions) {
-                if (!transaction?.transactionID) {
-                    continue;
-                }
-                transactionIDs.push(transaction.transactionID);
+        if (!hasNestedTransactions(item)) {
+            continue;
+        }
+        for (const transaction of item.transactions) {
+            const nestedTransactionID = getTransactionIDFromEntry(transaction);
+            if (!nestedTransactionID) {
+                continue;
             }
+            transactionIDs.push(nestedTransactionID);
         }
     }
 
@@ -424,5 +289,5 @@ function hasChangedTransactionInSearchResults(
     return changedTransactionIDs.some((transactionID) => searchResultIDs.has(transactionID));
 }
 
-export default useSearchHighlightAndScroll;
-export type {UseSearchHighlightAndScroll};
+export default useSearchAutoRefetch;
+export type {UseSearchAutoRefetch};
diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts
index 8e0a5a054c2f..96691e2d7ec3 100644
--- a/src/hooks/useSearchBulkActions.ts
+++ b/src/hooks/useSearchBulkActions.ts
@@ -9,7 +9,7 @@ import {useSearchQueryContext, useSearchResultsContext, useSearchSelectionAction
 import {getSearchGroupCountByKey} from '@components/Search/selectionBuilders';
 import type {BulkPaySelectionData, PaymentData, QueryFilterKey, SearchColumnType, SearchFilterKey, SearchQueryJSON, SelectedReports, SelectedTransactions} from '@components/Search/types';
 
-import {getAccountingIntegrationDisplayName, getExportLabelForConnection} from '@libs/AccountingUtils';
+import {getAccountingIntegrationDisplayName, getExportLabelForConnection, isIntuitEnterpriseSuiteConnection} from '@libs/AccountingUtils';
 import {getExpensifyCardStatementPDF} from '@libs/actions/CompanyCards';
 import {exportReceiptsToZip, exportReportsToPDF} from '@libs/actions/Export';
 import {unholdRequest} from '@libs/actions/IOU/Hold';
@@ -34,6 +34,7 @@ import {
     getSearchPayOnyxData,
     getTotalFormattedAmount,
     isCurrencySupportWalletBulkPay,
+    queueBulkMarkAsExported,
     queueBulkPayReports,
     queueExportSearchItemsToCSV,
     queueExportSearchWithTemplate,
@@ -203,6 +204,24 @@ function isGroupSelection(key: string, transaction: SelectedTransactions[string]
     return key.startsWith(CONST.SEARCH.GROUP_PREFIX) || (!!transaction.isSelectedViaGroup && !!transaction.groupKey);
 }
 
+/**
+ * How a selection on a grouped search has to be exported.
+ *
+ * Selecting a group stores its loaded children with isSelectedViaGroup. The group key is only stored when no children are loaded.
+ * Use isGroupSelection rather than the key prefix so exports include every item matching the group filter.
+ *
+ * `transactionIDList` drops the rows covered by that filter and keeps the rows the user ticked individually
+ * alongside them.
+ */
+function getGroupExportScope(queryJSON: SearchQueryJSON | undefined, selectedTransactions: SelectedTransactions): {isGroupExport: boolean; transactionIDList: string[]} {
+    const selectedTransactionsKeys = Object.keys(selectedTransactions);
+    const isGroupExport = !!queryJSON?.groupBy && Object.entries(selectedTransactions).some(([key, transaction]) => isGroupSelection(key, transaction));
+    return {
+        isGroupExport,
+        transactionIDList: isGroupExport ? selectedTransactionsKeys.filter((key) => !isGroupSelection(key, selectedTransactions[key])) : selectedTransactionsKeys,
+    };
+}
+
 /**
  * The group rows a selection covers in full.
  *
@@ -328,6 +347,39 @@ function addSelectedGroupsFilter(queryJSON: SearchQueryJSON, selectedTransaction
     return buildSearchQueryJSON(buildSearchQueryString({...queryJSON, flatFilters: newFlatFilters})) ?? queryJSON;
 }
 
+/**
+ * Removes groupBy and limit from a query so a template export returns one row per expense.
+ * ExportSearchWithTemplate has no isGroupExport flag, so with groupBy it would return one row per group.
+ * Without groupBy, limit would cap the number of expenses, so we remove it as well.
+ */
+function getUngroupedTemplateExportQuery(queryJSON: SearchQueryJSON): SearchQueryJSON | undefined {
+    if (!queryJSON.groupBy) {
+        return queryJSON;
+    }
+    return buildSearchQueryJSON(
+        buildSearchQueryString({
+            ...queryJSON,
+            groupBy: undefined,
+            limit: undefined,
+            sortBy: CONST.SEARCH.TABLE_COLUMNS.DATE,
+            sortOrder: CONST.SEARCH.SORT_ORDER.DESC,
+        }),
+    );
+}
+
+/**
+ * The query a template export sends for a group selection.
+ *
+ * Returns undefined when the selected groups can't be turned into a filter, so the export never widens to the whole search.
+ */
+function getTemplateGroupExportQuery(queryJSON: SearchQueryJSON, selectedTransactions: SelectedTransactions, searchData: SearchResultDataType | undefined): SearchQueryJSON | undefined {
+    const groupFilteredQueryJSON = addSelectedGroupsFilter(queryJSON, selectedTransactions, searchData);
+    if (groupFilteredQueryJSON === queryJSON) {
+        return undefined;
+    }
+    return getUngroupedTemplateExportQuery(groupFilteredQueryJSON);
+}
+
 function getAllMatchingExportQueryAndExclusions(
     queryJSON: SearchQueryJSON,
     excludedTransactions: SelectedTransactions,
@@ -629,6 +681,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
     const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
 
     const isExpenseReportType = queryJSON?.type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT;
     const expensifyIcons = useMemoizedLazyExpensifyIcons([
@@ -975,14 +1028,19 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 setIsOfflineModalVisible(true);
                 return;
             }
-            const serializedQuery = queryJSON ? serializeQueryJSONForBackend(queryJSON) : JSON.stringify(queryJSON);
-
             if (areAllMatchingItemsSelected) {
+                const allMatchingQueryJSON = queryJSON ? getUngroupedTemplateExportQuery(queryJSON) : undefined;
+                if (queryJSON && !allMatchingQueryJSON) {
+                    setIsDownloadErrorModalVisible(true);
+                    return;
+                }
                 queueExportSearchWithTemplate(
                     {
                         templateName,
                         templateType,
-                        jsonQuery: serializedQuery,
+                        // searchKey changes what the backend query matches (e.g. reconciliation includes Expensify Card cash back),
+                        // so the export must send it exactly as search() does or the exported set differs from the viewed set.
+                        jsonQuery: allMatchingQueryJSON ? serializeQueryJSONForBackend({...allMatchingQueryJSON, searchKey: currentSearchKey}) : JSON.stringify(queryJSON),
                         reportIDList: [],
                         transactionIDList: [],
                         policyID,
@@ -991,19 +1049,23 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     true,
                 );
             } else {
-                const isGroupExport = !!queryJSON?.groupBy && selectedTransactionsKeys.some((key) => key.startsWith(CONST.SEARCH.GROUP_PREFIX));
+                const {isGroupExport, transactionIDList} = getGroupExportScope(queryJSON, selectedTransactions);
+                const groupExportQueryJSON = isGroupExport && queryJSON ? getTemplateGroupExportQuery(queryJSON, selectedTransactions, currentSearchResults?.data) : undefined;
+                if (isGroupExport && !groupExportQueryJSON) {
+                    setIsDownloadErrorModalVisible(true);
+                    return;
+                }
                 queueExportSearchWithTemplate(
                     {
                         templateName,
                         templateType,
-                        jsonQuery: isGroupExport
-                            ? serializeQueryJSONForBackend(
-                                  addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data),
-                                  getGroupExportExactMatchFilterKeys(queryJSON.groupBy),
-                              )
+                        // searchKey changes what the backend query matches (e.g. reconciliation includes Expensify Card cash back),
+                        // so the export must send it exactly as search() does or the exported set differs from the viewed set.
+                        jsonQuery: groupExportQueryJSON
+                            ? serializeQueryJSONForBackend({...groupExportQueryJSON, searchKey: currentSearchKey}, getGroupExportExactMatchFilterKeys(queryJSON?.groupBy))
                             : '{}',
                         reportIDList: isGroupExport ? [] : selectedTransactionReportIDs,
-                        transactionIDList: isGroupExport ? [] : selectedTransactionsKeys,
+                        transactionIDList,
                         policyID,
                         exportName,
                     },
@@ -1022,9 +1084,9 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             isOffline,
             areAllMatchingItemsSelected,
             currentSearchResults?.data,
+            currentSearchKey,
             queryJSON,
             selectedTransactionReportIDs,
-            selectedTransactionsKeys,
             selectAllMatchingItems,
             clearSelectedTransactions,
         ],
@@ -1161,8 +1223,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 return;
             }
 
-            const isGroupExport = !!queryJSON?.groupBy && Object.entries(selectedTransactions).some(([key, transaction]) => isGroupSelection(key, transaction));
-            const transactionIDList = isGroupExport ? selectedTransactionsKeys.filter((key) => !isGroupSelection(key, selectedTransactions[key])) : selectedTransactionsKeys;
+            const {isGroupExport, transactionIDList} = getGroupExportScope(queryJSON, selectedTransactions);
             let didFail = false;
             const reportIDList = selectedReports.length > 0 ? selectedReportIDs : selectedTransactionReportIDs;
             const queryJSONToExport = isGroupExport && queryJSON ? addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data) : queryJSON;
@@ -2001,7 +2062,8 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
 
             const includeReportLevelExport = ((isExpenseReportType || typeInvoice) && areFullReportsSelected) || (typeExpense && !isExpenseReportType && isAllOneTransactionReport);
 
-            const isGroupedSearch = !!getValidGroupBy(queryJSON?.groupBy);
+            const groupBy = getValidGroupBy(queryJSON?.groupBy);
+            const isGroupedSearch = !!groupBy;
 
             const policy = selectedPolicyIDs.length === 1 ? policies?.[`${ONYXKEYS.COLLECTION.POLICY}${selectedPolicyIDs.at(0)}`] : undefined;
             // The export templates available to the user, pre-grouped and sorted alphabetically. The basic export is part of the default group so it's sorted alongside
@@ -2029,6 +2091,14 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
 
             const isReportsTab = isExpenseReportType;
             const includesGroupExport = isGroupedSearch && Object.entries(selectedTransactions).some(([key, selectedTransaction]) => isGroupSelection(key, selectedTransaction));
+            // Group selections are sent as query filters, not report or transaction IDs, so template exports are usually unavailable.
+            // Reconciliation - All Expenses is supported for card-grouped searches because selected card groups become a `cardID:`
+            // filter, which template reports can use to scope card spend.
+            const includesCardGroupExport = includesGroupExport && groupBy === CONST.SEARCH.GROUP_BY.CARD;
+            const customTemplatesToShow = includesCardGroupExport ? [] : availableCustomTemplates;
+            const defaultTemplatesToShow = includesCardGroupExport
+                ? availableDefaultTemplates.filter((template) => template.templateName === CONST.REPORT.EXPORT_OPTIONS.RECONCILIATION_ALL_EXPENSES)
+                : availableDefaultTemplates;
 
             const canReportBeExported = (report: (typeof selectedReports)[0], exportOption: ValueOf<typeof CONST.REPORT.EXPORT_OPTIONS>) => {
                 if (!report.reportID) {
@@ -2256,7 +2326,36 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     .map((report) => report.reportID)
                     .filter((reportID): reportID is string => reportID !== undefined);
                 if (reportIDsToMark.length > 0) {
-                    const handleMarkAction = buildIntegrationHandleExportAction(reportIDsToMark, integration, integrationGroupSize, false, connectionNameFriendly);
+                    // Under "select all matching", the loaded page can only ever hold a subset of the full matching
+                    // set, so the partial-export and export-again modals below (built from page-scoped counts) do
+                    // not apply. Send the query instead of the loaded IDs, the same way bulk pay does, so the
+                    // backend resolves and marks every matching report on this connection, not just this page.
+                    const handleMarkAllMatchingAction = () => {
+                        if (!hash || !queryJSON) {
+                            return;
+                        }
+                        if (isOffline) {
+                            setIsOfflineModalVisible(true);
+                            return;
+                        }
+                        clearSelectedTransactions();
+                        const qboIntegrationAlias =
+                            integration === CONST.POLICY.CONNECTIONS.NAME.QBO && isIntuitEnterpriseSuiteConnection(integrationPolicy)
+                                ? CONST.POLICY.CONNECTIONS.ACCOUNTING_INTEGRATION_ALIASES.INTUIT_ENTERPRISE_SUITE
+                                : undefined;
+                        queueBulkMarkAsExported(serializeQueryJSONForBackend(queryJSON), integration, qboIntegrationAlias);
+                        playSound(SOUNDS.SUCCESS);
+                    };
+                    const handleMarkAction = areAllMatchingItemsSelected
+                        ? handleMarkAllMatchingAction
+                        : () =>
+                              buildIntegrationHandleExportAction(
+                                  reportIDsToMark,
+                                  integration,
+                                  integrationGroupSize,
+                                  false,
+                                  connectionNameFriendly,
+                              )(() => markAsManuallyExported(reportIDsToMark, integration, integrationPolicy));
                     exportOptions.push({
                         text: translate('workspace.common.markAsExported'),
                         value: CONST.SEARCH.BULK_ACTION_TYPES.EXPORT,
@@ -2264,7 +2363,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                         // which screen readers can't announce. Append the integration name so assistive tech can distinguish them.
                         accessibilityLabel: `${translate('workspace.common.markAsExported')}, ${connectionNameFriendly}`,
                         icon: integrationIcon,
-                        onSelected: () => handleMarkAction(() => markAsManuallyExported(reportIDsToMark, integration, integrationPolicy)),
+                        onSelected: handleMarkAction,
                         shouldCloseModalOnSelect: true,
                         shouldCallAfterModalHide: true,
                         displayInDefaultIconColor: true,
@@ -2287,7 +2386,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 addSeparatorBefore: true,
             });
 
-            if (!allSelectedAreDeleted && !includesGroupExport) {
+            if (!allSelectedAreDeleted && (!includesGroupExport || includesCardGroupExport)) {
                 // Builds a single export sub-menu item for a template. `isDefaultTemplate` picks the icon and `addSeparatorBefore` draws the divider at the top of each group.
                 const buildExportOption = (template: ExportTemplate, isDefaultTemplate: boolean, addSeparatorBefore: boolean): ExportMenuItem => {
                     // The basic export is a plain CSV download, so it uses its own handler rather than the template export flow
@@ -2311,10 +2410,10 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                 };
 
                 // Add each group's templates separately so the icon and the group-boundary divider come from the group itself, not from an index into a combined list.
-                for (const [index, template] of availableCustomTemplates.entries()) {
+                for (const [index, template] of customTemplatesToShow.entries()) {
                     exportOptions.push(buildExportOption(template, false, index === 0));
                 }
-                for (const [index, template] of availableDefaultTemplates.entries()) {
+                for (const [index, template] of defaultTemplatesToShow.entries()) {
                     exportOptions.push(buildExportOption(template, true, index === 0));
                 }
             } else if (!isGroupedSearch) {
@@ -3003,7 +3102,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
 
         const firstTransactionKey = selectedTransactionsKeys.at(0);
         const firstTransactionMeta = firstTransactionKey ? selectedTransactions[firstTransactionKey] : undefined;
-        const canShowDeleteAction = shouldShowDeleteOption(selectedTransactions, currentSearchResults?.data, accountID, rules, selectedReports, queryJSON?.type);
+        const canShowDeleteAction = shouldShowDeleteOption(selectedTransactions, currentSearchResults?.data, accountID, rules, cardList, selectedReports, queryJSON?.type);
 
         const isSplittable = !!firstTransactionMeta?.canSplit;
         const isAlreadySplit = !!firstTransactionMeta?.hasBeenSplit;
@@ -3103,6 +3202,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         return buildResult(options);
     }, [
         selectedTransactionsKeys,
+        cardList,
         hash,
         selectedTransactions,
         excludedTransactions,
diff --git a/src/hooks/useSearchLoadingState.ts b/src/hooks/useSearchLoadingState.ts
index c9f8030000b9..7cd634cb72d6 100644
--- a/src/hooks/useSearchLoadingState.ts
+++ b/src/hooks/useSearchLoadingState.ts
@@ -28,12 +28,13 @@ function useSearchLoadingState(queryJSON: SearchQueryJSON | undefined, searchRes
     const validGroupBy = getValidGroupBy(queryJSON.groupBy);
     const isCardFeedsLoading = validGroupBy === CONST.SEARCH.GROUP_BY.CARD && cardFeedsResult?.status === 'loading';
 
-    const hasErrors = Object.keys(searchResults?.errors ?? {}).length > 0;
+    // Until search() stores the response code, handing off to Search would swap in its skeleton at a different offset.
+    const hasClassifiedErrors = Object.keys(searchResults?.errors ?? {}).length > 0 && searchResults?.search?.responseJsonCode != null;
 
     // Keep the page skeleton visible until the first response arrives and while card feeds load.
     // SearchPage turns a completed response with no data into an empty result, so Search can render its empty state.
     // Errors bypass the missing-data skeleton so Search can render FullPageErrorView.
-    return (hasNoData && !hasErrors) || isCardFeedsLoading;
+    return (hasNoData && !hasClassifiedErrors) || isCardFeedsLoading;
 }
 
 export default useSearchLoadingState;
diff --git a/src/hooks/useSearchSelector/base.ts b/src/hooks/useSearchSelector/base.ts
index 45a2712bbcd7..f016fda7c9a3 100644
--- a/src/hooks/useSearchSelector/base.ts
+++ b/src/hooks/useSearchSelector/base.ts
@@ -187,8 +187,8 @@ function useSearchSelectorBase({
     shouldKeepSelectedInAvailableOptions = false,
     shouldSeparateNonExistingSelectedOptions = false,
 }: UseSearchSelectorConfig): UseSearchSelectorReturn {
-    const {translate, dateFnsLocale} = useLocalize();
-    const {convertToDisplayString} = useCurrencyListActions();
+    const {translate, dateFnsLocale, localeCompare, formatPhoneNumber} = useLocalize();
+    const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const {isBetaEnabled} = usePermissions();
     const [reportAttributesDerived] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES);
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
@@ -201,6 +201,8 @@ function useSearchSelectorBase({
     const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS);
     const sortedReportActionsData = useSortedReportActionsData();
     const sortedActions = sortedReportActionsData?.sortedActions;
+    const transactionThreadIDs = sortedReportActionsData?.transactionThreadIDs;
+    const lastActions = sortedReportActionsData?.lastActions;
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const currentUserAccountID = currentUserPersonalDetails.accountID;
     const currentUserEmail = currentUserPersonalDetails.email ?? '';
@@ -290,6 +292,7 @@ function useSearchSelectorBase({
                     draftComments,
                     dateFnsLocale,
                     convertToDisplayString,
+                    convertToDisplayStringWithoutCurrency,
                     isDefaultRoomsBetaEnabled: isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
                     isUsedInChatFinder: true,
                     includeReadOnly: true,
@@ -303,7 +306,14 @@ function useSearchSelectorBase({
                     currentUserAccountID,
                     currentUserEmail,
                     personalDetails,
+                    reportAttributesDerived: reportAttributesDerived?.reports,
+                    allPolicyTags,
                     sortedActions,
+                    transactionThreadIDs,
+                    lastActions,
+                    currentUserLogin: currentUserEmail,
+                    localeCompare,
+                    formatPhoneNumber,
                     conciergeReportID,
                     isTrackIntentUser,
                     translate,
@@ -322,6 +332,7 @@ function useSearchSelectorBase({
                     {
                         dateFnsLocale,
                         convertToDisplayString,
+                        convertToDisplayStringWithoutCurrency,
                         isDefaultRoomsBetaEnabled: isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
                         searchString: computedSearchTerm,
                         searchInputValue: trimmedSearchInput,
@@ -341,6 +352,10 @@ function useSearchSelectorBase({
                         reportAttributesDerived: reportAttributesDerived?.reports,
                         allPolicyTags,
                         sortedActions,
+                        transactionThreadIDs,
+                        lastActions,
+                        localeCompare,
+                        formatPhoneNumber,
                         isTrackIntentUser,
                         getReportByID,
                         ...appliedGetValidOptionsConfig,
@@ -360,6 +375,7 @@ function useSearchSelectorBase({
                     {
                         dateFnsLocale,
                         convertToDisplayString,
+                        convertToDisplayStringWithoutCurrency,
                         isDefaultRoomsBetaEnabled: isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
                         selectedOptions,
                         includeMultipleParticipantReports: true,
@@ -380,7 +396,12 @@ function useSearchSelectorBase({
                         countryCode,
                         reportAttributesDerived: reportAttributesDerived?.reports,
                         allPolicyTags,
+                        visibleReportActionsData,
                         sortedActions,
+                        transactionThreadIDs,
+                        lastActions,
+                        localeCompare,
+                        formatPhoneNumber,
                         isTrackIntentUser,
                         getReportByID,
                         ...appliedGetValidOptionsConfig,
@@ -400,6 +421,7 @@ function useSearchSelectorBase({
                     {
                         dateFnsLocale,
                         convertToDisplayString,
+                        convertToDisplayStringWithoutCurrency,
                         isDefaultRoomsBetaEnabled: isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
                         includeP2P: true,
                         includeSelectedOptions: false,
@@ -419,6 +441,10 @@ function useSearchSelectorBase({
                         reportAttributesDerived: reportAttributesDerived?.reports,
                         allPolicyTags,
                         sortedActions,
+                        transactionThreadIDs,
+                        lastActions,
+                        localeCompare,
+                        formatPhoneNumber,
                         isTrackIntentUser,
                         getReportByID,
                         ...appliedGetValidOptionsConfig,
@@ -530,7 +556,7 @@ function useSearchSelectorBase({
     };
 
     const selectedOptionsForDisplay = selectedOptions.filter((option) => {
-        const personalDetailSearchTerms = getPersonalDetailSearchTerms(option, currentUserAccountID);
+        const personalDetailSearchTerms = getPersonalDetailSearchTerms(option, currentUserAccountID, translate);
         return (
             !!option.text?.toLowerCase().includes(computedSearchTerm) ||
             !!option.login?.toLowerCase().includes(computedSearchTerm) ||
diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts
index a5b61aeb1a7c..3a6ff2bc6002 100644
--- a/src/hooks/useSelectedTransactionsActions.ts
+++ b/src/hooks/useSelectedTransactionsActions.ts
@@ -15,7 +15,7 @@ import {getLoginByAccountID} from '@libs/PersonalDetailsUtils';
 import {getIOUActionForTransactionID, getOriginalMessage, getReportAction, isDeletedAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {isMergeActionForSelectedTransactions, isSplitAction} from '@libs/ReportSecondaryActionUtils';
 import {
-    canDeleteCardTransactionByLiabilityType,
+    canDeleteCardTransaction,
     canDeleteTransaction,
     canEditFieldOfMoneyRequest,
     canEditMultipleTransactions,
@@ -29,7 +29,7 @@ import {
     isTrackExpenseReport,
 } from '@libs/ReportUtils';
 import {getCurrentSearchQueryJSON} from '@libs/SearchQueryUtils';
-import {getChildTransactions, getOriginalTransactionWithSplitInfo, hasTransactionBeenRejected} from '@libs/TransactionUtils';
+import {getChildTransactions, getOriginalTransactionWithSplitInfo, hasTransactionBeenRejected, isManagedCardTransaction} from '@libs/TransactionUtils';
 
 import type {IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
@@ -98,6 +98,7 @@ function useSelectedTransactionsActions({
     const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [allReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
     const [integrationsExportTemplates] = useOnyx(ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES);
     const [csvExportLayouts] = useOnyx(ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS);
@@ -593,12 +594,16 @@ function useSelectedTransactionsActions({
         }
 
         const canAllSelectedTransactionsBeRemoved = selectedTransactionsList.every((transaction) => {
-            const canRemoveTransaction = canDeleteCardTransactionByLiabilityType(transaction);
             const action = getIOUActionForTransactionID(reportActions, transaction.transactionID);
-            const isActionDeleted = isDeletedAction(action);
-            const isIOUActionOwner = typeof action?.actorAccountID === 'number' && typeof session?.accountID === 'number' && action.actorAccountID === session?.accountID;
+            if (isDeletedAction(action)) {
+                return false;
+            }
+
+            if (isManagedCardTransaction(transaction)) {
+                return canDeleteCardTransaction(transaction, policy, cardList);
+            }
 
-            return canRemoveTransaction && isIOUActionOwner && !isActionDeleted;
+            return typeof action?.actorAccountID === 'number' && typeof session?.accountID === 'number' && action.actorAccountID === session?.accountID;
         });
 
         const canRemoveReportTransaction = canDeleteTransaction(report, rules, isReportArchived);
diff --git a/src/hooks/useSelectionModeReportActions.ts b/src/hooks/useSelectionModeReportActions.ts
index 21e3996bd0c1..46aca1bd577f 100644
--- a/src/hooks/useSelectionModeReportActions.ts
+++ b/src/hooks/useSelectionModeReportActions.ts
@@ -5,7 +5,7 @@ import {useSearchSelectionActions} from '@components/Search/SearchContext';
 
 import {canIOUBePaid as canIOUBePaidAction} from '@libs/actions/IOU/ReportWorkflow';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
-import {getTotalAmountForIOUReportPreviewButton} from '@libs/MoneyRequestReportUtils';
+import {getTotalAmountForIOUReportPreviewButton, isEveryReportTransactionSelected} from '@libs/MoneyRequestReportUtils';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {KYCFlowEvent, TriggerKYCFlow} from '@libs/PaymentUtils';
 import {isSubmitPolicy} from '@libs/PolicyUtils';
@@ -76,6 +76,7 @@ function useSelectionModeReportActions({
     );
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
 
     const isChatReportArchived = useReportIsArchived(chatReport?.reportID);
 
@@ -188,6 +189,7 @@ function useSelectionModeReportActions({
             isChatReportArchived,
             isOffline,
             rules,
+            cardList,
         });
     })();
 
@@ -195,7 +197,7 @@ function useSelectionModeReportActions({
     const hasApproveAction = primaryAction === CONST.REPORT.PRIMARY_ACTIONS.APPROVE || secondaryActions.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE);
     const hasPayAction = primaryAction === CONST.REPORT.PRIMARY_ACTIONS.PAY || secondaryActions.includes(CONST.REPORT.SECONDARY_ACTIONS.PAY);
 
-    const allExpensesSelected = selectedTransactionIDs.length > 0 && selectedTransactionIDs.length === transactions.length;
+    const allExpensesSelected = isEveryReportTransactionSelected(transactions, selectedTransactionIDs);
 
     const selectedTransactions = transactions.filter((transaction) => selectedTransactionIDs.includes(transaction.transactionID));
     const hasSelectedTransactionsOnSubmitPolicy = isSubmitPolicy(policy) && selectedTransactions.length > 0;
@@ -248,7 +250,7 @@ function useSelectionModeReportActions({
 
     // Build report-level action menu
     const selectionModeReportLevelActions = (() => {
-        const actions: Array<DropdownOption<string> & Pick<PopoverMenuItem, 'backButtonText' | 'rightIcon' | 'subMenuItems' | 'subMenuHeaderText'>> = [];
+        const actions: Array<DropdownOption<string> & Pick<PopoverMenuItem, 'rightIcon'>> = [];
         let idx = 0;
         if (hasSubmitAction && !effectiveShouldBlockSubmit) {
             actions[idx++] = {
diff --git a/src/hooks/useShiftRangeSelection.ts b/src/hooks/useShiftRangeSelection.ts
index 7dfc25085c7c..e18a3d051e22 100644
--- a/src/hooks/useShiftRangeSelection.ts
+++ b/src/hooks/useShiftRangeSelection.ts
@@ -1,39 +1,59 @@
 import type {ShiftRangeBatch} from '@libs/shiftRangeSelection';
 
-import {useEffect, useRef, useState} from 'react';
+import {useLayoutEffect, useRef, useState} from 'react';
 
 type Params<TItem> = {
+    /** In the order they appear on screen, which is the order a range spans */
     items: TItem[];
-    // Keys must be unique within items; a null/undefined key keeps the row out of ranges.
+
+    /** Unique within `items`. A null key keeps the row out of ranges */
     getItemKey: (item: TItem) => string | null | undefined;
+
     isItemSelected: (item: TItem) => boolean;
+
+    /** Rows a range must never deselect. Defaults to `isItemSelected` */
+    isItemProtected?: (item: TItem) => boolean;
+
+    /** Never part of a range, and never anchors one */
     isHeaderItem?: (item: TItem) => boolean;
+
+    /** Excluded from ranges, anchors and targets */
     isDisabledItem?: (item: TItem) => boolean;
+
     onApplyRange?: (batch: ShiftRangeBatch<TItem>) => void;
 };
 
 type Api<TItem> = {
+    /** Returns whether it handled the click */
     applyShiftClick: (item: TItem, shiftKey?: boolean) => boolean;
+
     notifyAnchor: (item: TItem) => void;
-    // No caller in this PR — the Search provider's group toggles consume it in the follow-up.
-    seedRangeFromSelection: (selectedKeys: ReadonlySet<string> | readonly string[]) => void;
+
+    /** Lets a selection made elsewhere be narrowed by the next shift+click. Pass a test where the rows may still be loading */
+    seedRangeFromSelection: (members: ReadonlySet<string> | readonly string[] | ((key: string) => boolean)) => void;
+
     seedFullRange: () => void;
-    // No caller in this PR — the Search provider's clear-all consumes it in the follow-up.
+
     clearAnchor: () => void;
 };
 
-// Shift+click always selects — a deselect mode left Shift looking dead. painted: keys the session selected, tracked by key so re-sorts and removals can't misattribute the collapse.
-// Selected rows the session didn't paint are protected from collapse (derived per click, see protectedKeys); a seeded session paints its whole span, so Select All still collapses.
-type SessionState = {kind: 'idle'} | {kind: 'anchored'; anchor: string} | {kind: 'ranging'; anchor: string; painted: ReadonlySet<string>};
+/** `painted` is held by key, so reordering the list cannot confuse what shrinking a range gives back. */
+type RangingSession = {kind: 'ranging'; anchor: string; painted: ReadonlySet<string>};
+
+type ResolvedSession = {kind: 'idle'} | {kind: 'anchored'; anchor: string} | RangingSession;
+
+/** A seeded block resolves at the next shift+click, so rows that had not loaded when it was seeded still join, and `carried` rows stay in it after leaving the list. */
+type SessionState = ResolvedSession | {kind: 'seeded'; isMember: (key: string) => boolean; carried: ReadonlySet<string>};
+
+const IDLE: ResolvedSession = {kind: 'idle'};
 
-const IDLE: SessionState = {kind: 'idle'};
 const NO_KEYS: ReadonlySet<string> = new Set();
 
 /** Shift+click range selection. Consumers notify on plain clicks / select-all so the hook can resolve an anchor for the next shift+click. */
 function useShiftRangeSelection<TItem>(params: Params<TItem>): Api<TItem> {
-    // The api methods are built once but read the latest params through this ref, refreshed after every commit.
+    // Refreshed during the commit, so a click in the same frame as a re-render sees the current rows.
     const paramsRef = useRef(params);
-    useEffect(() => {
+    useLayoutEffect(() => {
         paramsRef.current = params;
     });
 
@@ -57,21 +77,35 @@ function useShiftRangeSelection<TItem>(params: Params<TItem>): Api<TItem> {
             return true;
         },
         notifyAnchor: (item) => {
-            const key = keyOf(paramsRef.current, item);
-            if (key == null) {
+            const currentParams = paramsRef.current;
+            const key = keyOf(currentParams, item);
+            // Keeping the last reachable anchor beats storing one that sends the next shift+click to the top of the list.
+            if (key == null || !canAnchor(currentParams, key)) {
+                // The click still ends the range. Keeping what it painted would let the next shift+click give back rows this click never touched.
+                const session = sessionRef.current;
+                if (session.kind === 'ranging') {
+                    sessionRef.current = {kind: 'anchored', anchor: session.anchor};
+                }
                 return;
             }
             sessionRef.current = {kind: 'anchored', anchor: key};
         },
-        seedRangeFromSelection: (selectedKeys) => {
-            // Keys are passed in because the caller's selection is optimistic — reading it here would see the pre-toggle set.
-            const currentParams = paramsRef.current;
-            const set = selectedKeys instanceof Set ? selectedKeys : new Set(selectedKeys);
-            sessionRef.current = seedRangeState(currentParams, (key) => set.has(key));
+        seedRangeFromSelection: (members) => {
+            // Recorded, not resolved: the rows may not be in the list yet.
+            if (typeof members === 'function') {
+                sessionRef.current = {kind: 'seeded', isMember: members, carried: NO_KEYS};
+                return;
+            }
+            const set = members instanceof Set ? members : new Set(members);
+            // An empty block replaces nothing, so the session it would have replaced is still the truth.
+            if (set.size === 0) {
+                return;
+            }
+            sessionRef.current = {kind: 'seeded', isMember: (key) => set.has(key), carried: NO_KEYS};
         },
         seedFullRange: () => {
-            // After Select All: seed a full-list range so the next shift+click collapses the selection to the clicked sub-range.
-            sessionRef.current = seedRangeState(paramsRef.current, () => true);
+            // Every row counts, including ones that load before the next shift+click, and the rows on screen now stay in even if they leave first.
+            sessionRef.current = {kind: 'seeded', isMember: () => true, carried: seedRangeState(paramsRef.current, () => true, NO_KEYS)?.painted ?? NO_KEYS};
         },
         clearAnchor: () => {
             sessionRef.current = IDLE;
@@ -99,10 +133,9 @@ function buildKeyIndex<TItem>(params: Params<TItem>): Map<string, number> {
     return keyToIndex;
 }
 
-/** Builds a `ranging` session anchored at the first selectable item passing `isIncluded` and painting every passing key, or `IDLE` when none qualify. */
-function seedRangeState<TItem>(params: Params<TItem>, isIncluded: (key: string) => boolean): SessionState {
+function seedRangeState<TItem>(params: Params<TItem>, isIncluded: (key: string) => boolean, carried: ReadonlySet<string>): RangingSession | null {
     let anchor: string | null = null;
-    const painted = new Set<string>();
+    const painted = new Set<string>(carried);
     for (const item of params.items) {
         if (isExcluded(params, item)) {
             continue;
@@ -117,15 +150,62 @@ function seedRangeState<TItem>(params: Params<TItem>, isIncluded: (key: string)
     if (anchor !== null) {
         return {kind: 'ranging', anchor, painted};
     }
-    return IDLE;
+    return null;
+}
+
+type AdoptedBlock = {anchor: string; painted: ReadonlySet<string>};
+
+/**
+ * Rows selected without being picked on their own came from a block, which a range may narrow — but only the block the click lands in:
+ * the run of selected rows around the target, ended by a header or by a row outside the selection. Another block the user picked is
+ * a separate gesture, and a click that never reached it must not give it back.
+ */
+function adoptUnprotectedBlock<TItem>(params: Params<TItem>, keyToIndex: Map<string, number>, targetKey: string): AdoptedBlock | null {
+    // Without a protection predicate of its own every selected row is protected, so there is no block by definition.
+    const isProtected = params.isItemProtected;
+    const targetIdx = keyToIndex.get(targetKey);
+    const target = targetIdx === undefined ? undefined : params.items.at(targetIdx);
+    if (!isProtected || targetIdx === undefined || target == null || !params.isItemSelected(target)) {
+        return null;
+    }
+
+    // A row that cannot be selected sits inside a block without ending it, as a row being deleted does inside a group.
+    const continuesRun = (row: TItem | undefined) => row != null && !params.isHeaderItem?.(row) && (!!params.isDisabledItem?.(row) || params.isItemSelected(row));
+    let start = targetIdx;
+    while (start > 0 && continuesRun(params.items.at(start - 1))) {
+        start--;
+    }
+    let end = targetIdx;
+    while (end < params.items.length - 1 && continuesRun(params.items.at(end + 1))) {
+        end++;
+    }
+
+    let anchor: string | null = null;
+    const painted = new Set<string>();
+    for (const row of params.items.slice(start, end + 1)) {
+        const key = isExcluded(params, row) ? null : keyOf(params, row);
+        if (key == null) {
+            continue;
+        }
+        anchor ??= key;
+        if (!isProtected(row)) {
+            painted.add(key);
+        }
+    }
+    // A run of rows all picked on their own is not a block, so the anchor rule for a cold click stands.
+    return anchor !== null && painted.size > 0 ? {anchor, painted} : null;
 }
 
 /** Selected keys the session didn't paint — derived fresh each click so protection tracks the live selection; the session never deselects these. */
 function protectedKeys<TItem>(params: Params<TItem>, painted: ReadonlySet<string>): ReadonlySet<string> {
     const keys = new Set<string>();
+    const isProtected = params.isItemProtected ?? params.isItemSelected;
     for (const row of params.items) {
+        if (isExcluded(params, row)) {
+            continue;
+        }
         const key = keyOf(params, row);
-        if (key != null && !painted.has(key) && params.isItemSelected(row)) {
+        if (key != null && !painted.has(key) && isProtected(row)) {
             keys.add(key);
         }
     }
@@ -140,15 +220,26 @@ function computeShiftRange<TItem>(params: Params<TItem>, state: SessionState, ta
 
     const keyToIndex = buildKeyIndex(params);
 
-    const seed = state.kind === 'idle' ? null : state.anchor;
-    const anchor = resolveAnchor(params, keyToIndex, seed);
-    if (anchor == null) {
+    // With none of a seeded block on screen there is nothing to narrow, so the click starts a range where it landed.
+    const resolved: ResolvedSession = state.kind === 'seeded' ? (seedRangeState(params, state.isMember, state.carried) ?? {kind: 'anchored', anchor: targetKey}) : state;
+
+    const seed = resolved.kind === 'idle' ? null : resolved.anchor;
+    const resolvedAnchor = resolveAnchor(params, keyToIndex, seed);
+    if (resolvedAnchor == null) {
         return null;
     }
     // The session survives only while the same anchor does; a re-resolved or cold anchor starts fresh.
-    const sameAnchor = state.kind !== 'idle' && anchor === state.anchor;
-    const continuing = state.kind === 'ranging' && sameAnchor;
-    const prevPainted: ReadonlySet<string> = continuing ? state.painted : NO_KEYS;
+    const sameAnchor = resolved.kind !== 'idle' && resolvedAnchor === resolved.anchor;
+    const continuing = resolved.kind === 'ranging' && sameAnchor;
+    // Starting fresh inside a block anchors at that block's start instead, so the span stays inside the block it narrows.
+    const adoptedBlock = sameAnchor ? null : adoptUnprotectedBlock(params, keyToIndex, targetKey);
+    const anchor = adoptedBlock?.anchor ?? resolvedAnchor;
+    let prevPainted: ReadonlySet<string>;
+    if (continuing) {
+        prevPainted = resolved.painted;
+    } else {
+        prevPainted = adoptedBlock?.painted ?? NO_KEYS;
+    }
     const preSelected = protectedKeys(params, prevPainted);
 
     const anchorIdx = keyToIndex.get(anchor);
@@ -222,6 +313,11 @@ function keyOf<TItem>(params: Params<TItem>, item: TItem | null | undefined): st
     return params.getItemKey(item) ?? null;
 }
 
+/** Matched by key, since callers pass clones. */
+function canAnchor<TItem>(params: Params<TItem>, key: string): boolean {
+    return params.items.some((row) => keyOf(params, row) === key && !isExcluded(params, row));
+}
+
 function isExcluded<TItem>(params: Params<TItem>, item: TItem | null | undefined): boolean {
     if (item == null) {
         return true;
diff --git a/src/hooks/useSignOut.ts b/src/hooks/useSignOut.ts
new file mode 100644
index 000000000000..4a3b8e4cef8b
--- /dev/null
+++ b/src/hooks/useSignOut.ts
@@ -0,0 +1,216 @@
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+
+import {disconnect} from '@libs/actions/Delegate';
+import {showPermissionErrorAlert} from '@libs/fileDownload/FileUtils';
+import {getGpsPoints, stopGpsTrip} from '@libs/GPSDraftDetailsUtils';
+import Log from '@libs/Log';
+import {getSaveablePendingReceiptRequests, saveReceiptsToGallery} from '@libs/savePendingReceiptsToGallery';
+
+import {BACKGROUND_LOCATION_TRACKING_TASK_NAME} from '@pages/iou/request/step/IOURequestStepDistanceGPS/const';
+import {stopGpsTripNotification} from '@pages/iou/request/step/IOURequestStepDistanceGPS/GPSNotifications';
+
+import {signOutAndRedirectToSignIn} from '@userActions/Session';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {isActingAsDelegateSelector} from '@src/selectors/Account';
+import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
+import type GpsDraftDetails from '@src/types/onyx/GpsDraftDetails';
+
+import type {RefObject} from 'react';
+
+import {stopLocationUpdatesAsync} from 'expo-location';
+
+import useConfirmModal from './useConfirmModal';
+import useLocalize from './useLocalize';
+import useNetwork from './useNetwork';
+import useOnyx from './useOnyx';
+
+type SignOutOptions = {
+    /** When true, always show the generic sign-out confirm (e.g. from the require-2FA overlay). GPS and receipt prompts still run when applicable. */
+    shouldAlwaysConfirm?: boolean;
+};
+
+type LeaveDelegateAccountOptions = {
+    /** Ref kept current by GpsDraftDetailsRefSync. Read only after the user confirms, so points stay fresh while the modal is open. */
+    gpsDraftDetailsRef?: RefObject<GpsDraftDetails | undefined>;
+};
+
+/** Stops a second Sign out or Leave press from stacking another confirm modal. */
+let isSignOutFlowInFlight = false;
+
+function useSignOut() {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const {showConfirmModal} = useConfirmModal();
+    const [isTrackingGPS = false] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS, {
+        selector: isTrackingSelector,
+    });
+    const [isActingAsDelegate = false] = useOnyx(ONYXKEYS.ACCOUNT, {
+        selector: isActingAsDelegateSelector,
+    });
+    const [stashedCredentials = CONST.EMPTY_OBJECT] = useOnyx(ONYXKEYS.STASHED_CREDENTIALS);
+    const [stashedSession] = useOnyx(ONYXKEYS.STASHED_SESSION);
+
+    const showOfflineModal = () => {
+        showConfirmModal({
+            title: translate('common.youAppearToBeOffline'),
+            prompt: translate('common.offlinePrompt'),
+            confirmText: translate('common.buttonConfirm'),
+            shouldShowCancelButton: false,
+        });
+    };
+
+    const signOutImmediately = () => {
+        signOutAndRedirectToSignIn();
+    };
+
+    const runSignOut = async ({shouldAlwaysConfirm = false}: SignOutOptions = {}) => {
+        const saveableReceipts = getSaveablePendingReceiptRequests();
+        const shouldWarnBeforeSignOut = isOffline || isTrackingGPS;
+        const isOfflineReceiptsCase = isOffline && !isTrackingGPS && saveableReceipts.length > 0;
+
+        if (!shouldAlwaysConfirm && !shouldWarnBeforeSignOut && saveableReceipts.length === 0) {
+            return signOutAndRedirectToSignIn();
+        }
+
+        const confirmModalTitle = isTrackingGPS ? translate('gps.signOutWarningTripInProgress.title') : translate('common.areYouSure');
+        const confirmModalPrompt = isTrackingGPS ? translate('gps.signOutWarningTripInProgress.prompt') : translate('initialSettingsPage.signOutConfirmationText');
+        const confirmModalConfirmText = isTrackingGPS ? translate('gps.signOutWarningTripInProgress.confirm') : translate('initialSettingsPage.signOut');
+
+        const saveReceipts = async () => {
+            try {
+                const {savedCount, failedCount, permissionDenied} = await saveReceiptsToGallery(saveableReceipts);
+                Log.info('[Receipt] Saved pending receipts to gallery before sign-out', false, {savedCount, failedCount, permissionDenied});
+                if (permissionDenied) {
+                    showPermissionErrorAlert(translate);
+                }
+            } catch (error) {
+                Log.alert('[Receipt] Unexpected rejection from saveReceiptsToGallery; sign-out continued', {error});
+            }
+        };
+
+        if (isOfflineReceiptsCase) {
+            const result = await showConfirmModal({
+                title: translate('initialSettingsPage.saveReceiptsAndSignOutConfirmation.title'),
+                prompt: translate('initialSettingsPage.saveReceiptsAndSignOutConfirmation.prompt', {
+                    count: saveableReceipts.length,
+                }),
+                confirmText: translate('initialSettingsPage.saveReceiptsAndSignOutConfirmation.confirm'),
+                cancelText: translate('common.cancel'),
+                shouldShowCancelButton: true,
+                buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+            });
+            if (result.action !== ModalActions.CONFIRM) {
+                return;
+            }
+            await saveReceipts();
+        } else {
+            const shouldShowOfflineOrGpsWarning = shouldWarnBeforeSignOut || shouldAlwaysConfirm;
+            if (shouldShowOfflineOrGpsWarning) {
+                const result = await showConfirmModal({
+                    title: confirmModalTitle,
+                    prompt: confirmModalPrompt,
+                    confirmText: confirmModalConfirmText,
+                    cancelText: translate('common.cancel'),
+                    shouldShowCancelButton: true,
+                    buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+                });
+                if (result.action !== ModalActions.CONFIRM) {
+                    return;
+                }
+            }
+
+            if (saveableReceipts.length > 0) {
+                const result = await showConfirmModal({
+                    title: translate('initialSettingsPage.saveReceiptsConfirmation.title'),
+                    prompt: translate('initialSettingsPage.saveReceiptsConfirmation.prompt', {
+                        count: saveableReceipts.length,
+                    }),
+                    confirmText: translate('initialSettingsPage.saveReceiptsConfirmation.confirm'),
+                    cancelText: translate('common.cancel'),
+                    shouldShowCancelButton: true,
+                });
+                if (result.action !== ModalActions.CONFIRM) {
+                    return;
+                }
+                await saveReceipts();
+            }
+        }
+
+        if (isTrackingGPS) {
+            stopGpsTripNotification();
+            stopLocationUpdatesAsync(BACKGROUND_LOCATION_TRACKING_TASK_NAME).catch((error) => console.error('[GPS distance request] Failed to stop location tracking', error));
+        }
+
+        return signOutAndRedirectToSignIn();
+    };
+
+    const signOut = async ({shouldAlwaysConfirm = false}: SignOutOptions = {}) => {
+        if (isSignOutFlowInFlight) {
+            return;
+        }
+        isSignOutFlowInFlight = true;
+
+        return runSignOut({shouldAlwaysConfirm}).finally(() => {
+            isSignOutFlowInFlight = false;
+        });
+    };
+
+    const runLeaveDelegateAccount = async (gpsDraftDetailsRef?: RefObject<GpsDraftDetails | undefined>) => {
+        if (isOffline) {
+            showOfflineModal();
+            return;
+        }
+
+        const result = await showConfirmModal({
+            title: translate('common.areYouSure'),
+            prompt: translate('delegate.leaveAccountConfirmationText'),
+            confirmText: translate('delegate.leaveAccount'),
+            cancelText: translate('common.cancel'),
+            shouldShowCancelButton: true,
+            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+        });
+        if (result.action !== ModalActions.CONFIRM) {
+            return;
+        }
+
+        const leaveAction = () => disconnect({stashedCredentials, stashedSession});
+
+        if (isTrackingGPS) {
+            const gpsResult = await showConfirmModal({
+                title: translate('gps.switchAccountWarningTripInProgress.title'),
+                prompt: translate('gps.switchAccountWarningTripInProgress.prompt'),
+                confirmText: translate('gps.switchAccountWarningTripInProgress.confirm'),
+                cancelText: translate('common.cancel'),
+            });
+            if (gpsResult.action !== ModalActions.CONFIRM) {
+                return;
+            }
+            await stopGpsTrip(false, getGpsPoints(gpsDraftDetailsRef?.current), true);
+        }
+
+        leaveAction();
+    };
+
+    const leaveDelegateAccount = async ({gpsDraftDetailsRef}: LeaveDelegateAccountOptions = {}) => {
+        if (isSignOutFlowInFlight) {
+            return;
+        }
+        isSignOutFlowInFlight = true;
+
+        return runLeaveDelegateAccount(gpsDraftDetailsRef).finally(() => {
+            isSignOutFlowInFlight = false;
+        });
+    };
+
+    return {
+        signOut,
+        signOutImmediately,
+        leaveDelegateAccount,
+        isActingAsDelegate,
+        isTrackingGPS,
+    };
+}
+
+export default useSignOut;
diff --git a/src/hooks/useTabFocusedRefresh.ts b/src/hooks/useTabFocusedRefresh.ts
new file mode 100644
index 000000000000..9ab4706a3e34
--- /dev/null
+++ b/src/hooks/useTabFocusedRefresh.ts
@@ -0,0 +1,46 @@
+import {useIsFocused} from '@react-navigation/native';
+import {useEffect, useEffectEvent, useRef} from 'react';
+
+import useAppReturnCount from './useAppReturnCount';
+import useIsTabFocused from './useIsTabFocused';
+
+/**
+ * Calls `refresh` when the tab becomes active, when `refreshKey` changes, and when the app becomes
+ * visible again. A change landing behind an RHP waits until the screen is visible, so closing an RHP
+ * refreshes nothing on its own.
+ */
+function useTabFocusedRefresh(tabName: string, refreshKey: string, refresh: () => void): void {
+    const isTabFocused = useIsTabFocused(tabName);
+    const isScreenVisible = useIsFocused();
+    const onRefresh = useEffectEvent(refresh);
+
+    // Currency conversion and the like have nothing local to watch, so a return to the app re-reads them.
+    const appReturnCount = useAppReturnCount();
+
+    const wasTabFocusedRef = useRef(false);
+    const lastRefreshKeyRef = useRef<string | undefined>(undefined);
+    const isRefreshPendingRef = useRef(false);
+
+    useEffect(() => {
+        const wasTabFocused = wasTabFocusedRef.current;
+        wasTabFocusedRef.current = isTabFocused;
+        const currentKey = `${refreshKey}|${appReturnCount}`;
+
+        if (isTabFocused && !wasTabFocused) {
+            isRefreshPendingRef.current = true;
+        }
+        if (currentKey !== lastRefreshKeyRef.current) {
+            lastRefreshKeyRef.current = currentKey;
+            isRefreshPendingRef.current = true;
+        }
+
+        if (!isTabFocused || !isScreenVisible || !isRefreshPendingRef.current) {
+            return;
+        }
+
+        isRefreshPendingRef.current = false;
+        onRefresh();
+    }, [isTabFocused, isScreenVisible, refreshKey, appReturnCount]);
+}
+
+export default useTabFocusedRefresh;
diff --git a/src/hooks/useUndeleteTransactions.ts b/src/hooks/useUndeleteTransactions.ts
index 15e08fb8e8b9..6b7ab910255c 100644
--- a/src/hooks/useUndeleteTransactions.ts
+++ b/src/hooks/useUndeleteTransactions.ts
@@ -29,6 +29,7 @@ function useUndeleteTransactions() {
     const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
 
     return (transactions: Transaction[]) => {
         const transactionIDs = transactions.map((transaction) => transaction.transactionID);
@@ -45,6 +46,7 @@ function useUndeleteTransactions() {
             allTransactionViolation: transactionViolations,
             reports,
             rules,
+            cardList,
             selfDMReportActions,
             isTrackIntentUser,
             personalPolicyOutputCurrency: policy?.outputCurrency,
diff --git a/src/hooks/useUpdateTransactionCategory.ts b/src/hooks/useUpdateTransactionCategory.ts
new file mode 100644
index 000000000000..11105fd909f7
--- /dev/null
+++ b/src/hooks/useUpdateTransactionCategory.ts
@@ -0,0 +1,132 @@
+import {useSearchQueryContext} from '@components/Search/SearchContext';
+
+import {setMoneyRequestCategory} from '@libs/actions/IOU/MoneyRequest';
+import {setDraftSplitTransaction} from '@libs/actions/IOU/Split';
+import {updateMoneyRequestCategory} from '@libs/actions/IOU/UpdateMoneyRequest';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
+
+import useAllTransactionViolations from './useAllTransactionViolations';
+import {useCurrencyListActions} from './useCurrencyList';
+import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
+import useDelegateAccountID from './useDelegateAccountID';
+import useOnyx from './useOnyx';
+import usePermissions from './usePermissions';
+import {usePersonalDetail} from './usePersonalDetails';
+
+type UseUpdateTransactionCategoryParams = {
+    /** ID of the expense being written to, and of the draft a not-yet-created expense lives in */
+    transactionID: string;
+
+    /** Transaction whose category is being written */
+    transaction: OnyxEntry<OnyxTypes.Transaction>;
+
+    /** Report the transaction lives on. Required to edit an existing expense's category */
+    report: OnyxEntry<OnyxTypes.Report>;
+
+    /** Policy the category belongs to */
+    policy: OnyxEntry<OnyxTypes.Policy>;
+
+    /** Categories configured on `policy`, needed to recompute violations after the write */
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
+
+    /** Whether an existing expense is being edited rather than a draft being filled in */
+    isEditing: boolean;
+
+    /** Whether the expense being edited is a split, which writes to the split draft instead */
+    isEditingSplit: boolean;
+};
+
+type UseUpdateTransactionCategoryResult = {
+    /** Writes `category` to whichever of the three stores backs the expense being edited */
+    updateCategory: (category: string) => void;
+
+    /** Whether the write landed on the money request draft rather than a saved expense, for callers that navigate differently for each. */
+    isDraftUpdate: boolean;
+};
+
+/**
+ * Writes a category onto an expense, from wherever it is picked. The three stores an expense can live in (split
+ * draft, saved transaction, money request draft) each take a different write, and each needs the same wide set of
+ * policy and user data to recompute violations. Both the full-page selector and the anchored dropdown save
+ * through here, so a pick in either lands in the same place.
+ */
+function useUpdateTransactionCategory({
+    transactionID,
+    transaction,
+    report,
+    policy,
+    policyCategories,
+    isEditing,
+    isEditingSplit,
+}: UseUpdateTransactionCategoryParams): UseUpdateTransactionCategoryResult {
+    const {getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
+    const {currentSearchHash} = useSearchQueryContext();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const delegateAccountID = useDelegateAccountID();
+    const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
+
+    const policyID = policy?.id;
+
+    const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);
+    const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
+    const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
+    const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
+    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
+    const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const allTransactionViolations = useAllTransactionViolations(transactionID);
+
+    const isSplitUpdate = isEditingSplit && !!transaction;
+    const isExistingExpenseUpdate = !isSplitUpdate && isEditing && !!transaction && !!report;
+
+    const updateCategory = (category: string) => {
+        if (isSplitUpdate) {
+            setDraftSplitTransaction(transaction.transactionID, splitDraftTransaction, {category}, getCurrencyDecimals, getCurrencySymbol, policy);
+            return;
+        }
+
+        if (isExistingExpenseUpdate) {
+            updateMoneyRequestCategory({
+                isVendorMatchingBetaEnabled: isBetaEnabledOrUnknown(CONST.BETAS.VENDOR_MATCHING),
+                transactionID: transaction.transactionID,
+                transaction,
+                transactionThreadReport: report,
+                parentReport,
+                iouReportOwnerLogin,
+                category,
+                policy,
+                policyTagList: policyTags,
+                policyCategories,
+                policyRecentlyUsedCategories,
+                currentUserAccountIDParam: currentUserPersonalDetails.accountID,
+                currentUserEmailParam: currentUserPersonalDetails.login ?? '',
+                isASAPSubmitBetaEnabled: isBetaEnabled(CONST.BETAS.ASAP_SUBMIT),
+                hash: currentSearchHash,
+                delegateAccountID,
+                reportPolicyTags,
+                isTrackIntentUser,
+                violations: allTransactionViolations,
+                getCurrencyDecimals,
+                getCurrencySymbol,
+                rules,
+            });
+            return;
+        }
+
+        setMoneyRequestCategory(transactionID, category, policy, getCurrencyDecimals);
+    };
+
+    return {updateCategory, isDraftUpdate: !isSplitUpdate && !isExistingExpenseUpdate};
+}
+
+export default useUpdateTransactionCategory;
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 1b8f0e88be85..fd8e9d18cfa6 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -413,8 +413,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'Überspringen',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `Brauchen Sie etwas Bestimmtes? Chatten Sie mit Ihrer/Ihrem Kundenbetreuer·in, ${accountManagerDisplayName}.`,
-        chatNow: 'Jetzt chatten',
         workEmail: 'Arbeits-E-Mail',
         destination: 'Ziel',
         subrate: 'Nebensatzrate',
@@ -516,6 +514,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: 'Vorheriges Jahr',
         nextYear: 'Nächstes Jahr',
         avatar: 'Avatar',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} von ${total}`,
         editor: 'Editor',
         restrictions: 'Beschränkungen',
         tryAgain: 'Erneut versuchen',
@@ -525,6 +524,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: 'Keine Ergebnisse. Bitte passen Sie Ihre Filter oder Suchanfrage an',
         unableToDisplayChart: 'Diagram kann nicht angezeigt werden',
         webGLNotSupported: 'Ihr Browser unterstützt WebGL nicht. Bitte aktivieren Sie es oder wechseln Sie den Browser.',
+        chartFailedToLoad: 'Das Diagramm konnte nicht geladen werden. Bitte aktualisieren Sie die Seite und versuchen Sie es erneut.',
         apiKey: 'API-Schlüssel',
         exportsTo: 'Exportiert nach',
     },
@@ -1163,6 +1163,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: 'In Ausgaben anzeigen',
         emptyState: {title: 'Nichts anzuzeigen', subtitle: 'Versuchen Sie, Ihre Kriterien oben anzupassen'},
         noExpensesState: {title: 'Sehen Sie, wohin Ihr Geld fließt', subtitle: 'Sobald Sie Ausgaben haben, finden Sie Ausgabentrends, Top-Händler und mehr.'},
+        compare: {label: 'Vergleichen', previousPeriod: 'Vorheriger Zeitraum', average: 'Durchschnitt'},
     },
     allSettingsScreen: {
         subscription: 'Abonnement',
@@ -1341,6 +1342,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Bevor Sie Entfernungen erfassen, müssen Sie Ihre Privatadresse in Ihrem privaten Profil hinzufügen. Dieser Arbeitsbereich verwendet diese Adresse für Pendlerabzüge.',
             cta: 'Heimatadresse hinzufügen',
         },
+        expenseAdded: 'Ausgabe hinzugefügt',
+        invoiceSent: 'Rechnung gesendet',
         amount: 'Betrag',
         percent: 'Prozent',
         date: 'Datum',
@@ -1920,6 +1923,7 @@ const translations: TranslationDeepObject<typeof en> = {
             prompt: 'Aktivieren Sie Tags im Workspace, um die Ausgabendetails zu bearbeiten oder den Tag aus dieser Ausgabe zu löschen.',
             confirmText: 'Tag löschen',
         },
+        undeletedExpense: 'Löschvorgang für diese Ausgabe rückgängig gemacht',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `Kilometersätze für den neuen Arbeitsbereich aktualisiert – ${policyName}`,
     },
     transactionMerge: {
@@ -2201,7 +2205,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Profil-Avatar',
         customInstructions: 'Benutzerdefinierte Anweisungen',
         copilotIntoAccount: 'Copilot in Konto',
-        viewMemberHistory: 'Mitgliedsverlauf anzeigen',
+        seeChatHistory: 'Chatverlauf anzeigen',
         viewAgentHistory: 'Agentenverlauf anzeigen',
         publicSection: {
             title: 'Öffentlich',
@@ -2332,7 +2336,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Ergebnisse',
             releaseOptions: 'Release-Optionen',
             testingPreferences: 'Testeinstellungen',
-            useStagingServer: 'Staging-Server verwenden',
+            server: 'Server',
+            servers: {
+                production: {label: 'Produktion', description: 'Die Live-Umgebung, die echte Nutzer sehen'},
+                staging: {label: 'Staging', description: 'Spiegel der Produktion. Wird für die endgültige Validierung verwendet'},
+                qa: {label: 'QA', description: 'Experimentelle Umgebung für Tests'},
+            },
+            serverPinnedDescription: 'Dieser Build kommuniziert immer mit einem Server, daher kann er hier nicht geändert werden.',
             forceOffline: 'Offline erzwingen',
             simulatePoorConnection: 'Schlechte Internetverbindung simulieren',
             simulateFailingNetworkRequests: 'Fehlgeschlagene Netzwerk­anfragen simulieren',
@@ -2557,7 +2567,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Zwei-Faktor-Authentifizierung erforderlich',
         twoFactorAuthIsRequiredForAdminsTitle: 'Bitte aktiviere die Zwei-Faktor-Authentifizierung',
         twoFactorAuthIsRequiredXero: 'Ihre Xero-Buchhaltungsverbindung erfordert eine Zwei-Faktor-Authentifizierung.',
-        twoFactorAuthIsRequiredCompany: 'Ihr Unternehmen verlangt eine Zwei-Faktor-Authentifizierung.',
+        twoFactorAuthIsRequiredCompany: 'Ihr Unternehmen erfordert eine Zwei-Faktor-Authentifizierung (2FA).',
         twoFactorAuthCannotDisable: '2FA kann nicht deaktiviert werden',
         twoFactorAuthRequired: 'Die Zwei-Faktor-Authentifizierung (2FA) ist für Ihre Xero-Verbindung erforderlich und kann nicht deaktiviert werden.',
         replaceDevice: 'Gerät ersetzen',
@@ -2569,6 +2579,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: 'Scannen Sie den QR-Code mit Ihrem neuen Gerät und geben Sie dann den Code ein, um die Einrichtung abzuschließen.',
         downloadCodes: 'Codes herunterladen',
         copyCodes: 'Codes kopieren',
+        enable2FA: 'Aktivieren',
     },
     recoveryCodeForm: {
         error: {
@@ -3015,6 +3026,9 @@ ${amount} für ${merchant} – ${date}`,
         memberAlreadyInWorkflowTitle: 'Mitglied ist bereits in einem Workflow',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} befindet sich bereits in einem Genehmigungs-Workflow, der an ${approverName} übermittelt wird. Wenn du das Mitglied hier hinzufügst, wird es in diesen Workflow verschoben.`,
+        moveEveryoneToThisWorkflowTitle: 'Verschieben Sie alle in diesen Workflow',
+        moveEveryoneToThisWorkflowPrompt:
+            'Sie sind dabei, alle auf diesen Genehmigungs-Workflow umzustellen. Dadurch werden alle anderen Genehmigungs-Workflows gelöscht und alle auf diesen verschoben. Diese Aktion kann nicht rückgängig gemacht werden.',
     },
     workflowsApproverPage: {
         genericErrorMessage: 'Die genehmigende Person konnte nicht geändert werden. Bitte versuche es erneut oder kontaktiere den Support.',
@@ -3149,6 +3163,8 @@ ${amount} für ${merchant} – ${date}`,
             updateAvatar: 'Beim Aktualisieren des Avatars dieser Vertretung ist ein Problem aufgetreten',
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} hat die Anweisungen dieses Agenten aktualisiert.\nVorherige Anweisungen:\n${previousPrompt}\nNeue Anweisungen:\n${newPrompt}`,
     newAgentPage: {
         title: 'Neue:r Agent:in',
         buildCustomAgent: 'Eigenen Agenten erstellen',
@@ -3326,6 +3342,7 @@ ${amount} für ${merchant} – ${date}`,
         timeExpiredAnnouncement: 'Die Zeit ist abgelaufen',
         error: {
             pleaseFillSecurityCode: 'Bitte geben Sie Ihren Sicherheitscode ein',
+            tooManyAttempts: 'Zu viele Versuche. Bitte versuchen Sie es später erneut.',
             incorrectSecurityCode: 'Falscher oder ungültiger Sicherheitscode. Bitte versuchen Sie es erneut oder fordern Sie einen neuen Code an.',
             pleaseFillTwoFactorAuth: 'Bitte gib deinen Zwei-Faktor-Authentifizierungscode ein',
         },
@@ -3414,9 +3431,9 @@ ${amount} für ${merchant} – ${date}`,
             otherAccountingSoftware: 'Name der Software',
         },
         interestedFeatures: {
-            title: 'An welchen Funktionen bist du interessiert?',
-            featuresAlreadyEnabled: 'Hier sind unsere beliebtesten Funktionen:',
-            featureYouMayBeInterestedIn: 'Zusätzliche Funktionen aktivieren:',
+            title: 'Wähle die gewünschten Funktionen aus',
+            featuresAlreadyEnabled: 'In Ihrem Workspace ist bereits Folgendes aktiviert:',
+            featureYouMayBeInterestedIn: 'Aktivieren Sie zusätzliche Funktionen, die Sie interessieren könnten:',
         },
         error: {
             requiredFirstName: 'Bitte gib deinen Vornamen ein, um fortzufahren',
@@ -4684,21 +4701,21 @@ ${amount} für ${merchant} – ${date}`,
         },
         nudge: {
             airfareManual:
-                'Wussten Sie, dass Sie Flüge direkt in Expensify buchen und verwalten können? Vermeiden Sie beim nächsten Mal den Aufwand, Ihre Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Wussten Sie, dass Sie Flüge direkt in Expensify buchen und trotzdem Meilen mit Ihren Vielfliegerprogrammen sammeln können? Sparen Sie sich beim nächsten Mal den Aufwand, Ihre Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Wussten Sie, dass Sie Flüge direkt in Expensify buchen und verwalten können? Und dass Belege dabei automatisch für Sie hochgeladen werden? Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Wussten Sie, dass Sie Flüge direkt in Expensify buchen und trotzdem Meilen mit Ihren Vielfliegerprogrammen sammeln können? Die Belege werden außerdem automatisch für Sie hochgeladen. Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Wussten Sie, dass Sie Hotelaufenthalte direkt in Expensify buchen und verwalten können? Sparen Sie sich beim nächsten Mal den Aufwand, Ihre Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Wussten Sie, dass Sie Hotelaufenthalte direkt in Expensify buchen und trotzdem Ihre Hotel-Treueprogramme nutzen können? Vermeiden Sie beim nächsten Mal den Aufwand, Ihre Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                'Wussten Sie, dass Sie Hotelaufenthalte direkt in Expensify buchen und verwalten können? Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Wussten Sie, dass Sie Hotelaufenthalte direkt in Expensify buchen und trotzdem Ihre Hotel-Treueprogramme nutzen können? Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                'Wussten Sie, dass Sie Mietwagen direkt in Expensify buchen und verwalten können? Sparen Sie sich das nächste Mal den Aufwand, Ihre Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Wussten Sie, dass Sie Mietwagen direkt in Expensify buchen und trotzdem Ihre Bonusprogramme für Mietwagen nutzen können? Sparen Sie sich beim nächsten Mal den Aufwand, Ihre Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                'Wussten Sie, dass Sie Mietwagen direkt in Expensify buchen und verwalten können? Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Wussten Sie, dass Sie Mietwagen direkt in Expensify buchen und trotzdem Ihre Mietwagen-Treueprogramme nutzen können? Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Wussten Sie, dass Sie Zugfahrten direkt in Expensify buchen und verwalten können? Sparen Sie sich das nächste Mal den Aufwand, Ihre Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Wussten Sie, dass Sie Zugfahrten direkt in Expensify buchen können und trotzdem Ihre Bahn-Bonusprogramme und BahnCards nutzen können? Sparen Sie sich das nächste Mal den Aufwand, die Ausgabe manuell zu erstellen, und buchen Sie einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Wussten Sie, dass Sie Zugfahrten direkt in Expensify buchen und verwalten können? Und dass Belege dabei automatisch für Sie hochgeladen werden? Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Wussten Sie, dass Sie Zugfahrten direkt in Expensify buchen und trotzdem Ihre Bahntreueprogramme und BahnCards nutzen können? Die Belege werden außerdem automatisch für Sie hochgeladen. Buchen Sie das nächste Mal einfach über <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 'Wussten Sie, dass Sie Gruppenreisen wie diese direkt in Expensify buchen und verwalten können? Sparen Sie sich beim nächsten Mal den Aufwand und probieren Sie unser Tool <a href="https://help.expensify.com/travel/hubs/event-management/">Reise-Events</a> aus.',
             hotelBlockCard:
@@ -6416,6 +6433,8 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
             csvColumnType: 'Typ',
             csvColumnLimitType: 'Limittyp',
             csvColumnLimit: 'Limit',
+            noCardFeedsAvailable: 'Keine Kartenfeeds verfügbar',
+            noCardFeedsAvailableDescription: 'Für diesen Workspace sind keine Kartenfeeds verfügbar.',
         },
         categories: {
             deleteCategories: 'Kategorien löschen',
@@ -6431,6 +6450,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
             deleteFailureMessage: 'Beim Löschen der Kategorie ist ein Fehler aufgetreten, bitte versuche es erneut.',
             categoryName: 'Kategoriename',
             requiresCategory: 'Mitglieder müssen alle Ausgaben kategorisieren',
+            autoCategorizeNewExpenses: 'Neue Ausgaben automatisch kategorisieren',
             showCategoryGLCodes: 'Sachkonten beim Kategorisieren von Ausgaben anzeigen',
             needCategoryForExportToIntegration: (connectionName: string) => `Alle Ausgaben müssen kategorisiert werden, um nach ${connectionName} exportiert zu werden.`,
             subtitle: 'Verschaffe dir einen besseren Überblick darüber, wofür Geld ausgegeben wird. Verwende unsere Standardkategorien oder füge eigene hinzu.',
@@ -6652,7 +6672,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
                 corporate: 'Löschen von Transaktionen einschränken',
                 personal: 'Löschen von Transaktionen erlauben',
                 setFeedNameDescription: 'Gib dem Karten-Feed einen eindeutigen Namen, damit du ihn von den anderen unterscheiden kannst',
-                setTransactionLiabilityDescription: 'Wenn aktiviert, können Karteninhaber Kartentransaktionen löschen. Neue Transaktionen folgen dieser Regel.',
+                setTransactionLiabilityDescription: 'Karteninhaber können Transaktionen löschen. Gilt nur für neue Transaktionen.',
                 emptyAddedFeedTitle: 'Keine Karten in diesem Feed',
                 emptyAddedFeedDescription: 'Stelle sicher, dass sich Karten im Kartenfeed deiner Bank befinden.',
                 pendingFeedTitle: `Wir überprüfen Ihre Anfrage …`,
@@ -7134,6 +7154,16 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
             peopleAdmins: 'Personaladministratoren',
             paymentsAdmins: 'Zahlungsadmins',
             members: 'Mitglieder',
+            workArrangement: 'Arbeitsvereinbarung',
+            officeBased: 'Bürobasiert',
+            noRegularWorkspace: 'Remote oder mobil',
+            workArrangementPage: {
+                title: 'Arbeitsvereinbarung',
+                optionOfficeBasedHelp: 'Mitglied pendelt zu einem Büro. Gewöhnliche Pendelfahrten sind von der Erstattung ausgeschlossen.',
+                optionNoRegularWorkspaceHelp:
+                    'Das Mitglied arbeitet von zu Hause aus oder reist zwischen verschiedenen Standorten ohne festes Büro, daher gelten die Pendelregelungen nicht.',
+                futureOnlyNote: 'Änderungen gelten nur für zukünftige Kilometerberechnungen. Bestehende Kilometerabrechnungen werden nicht neu berechnet.',
+            },
         },
         card: {
             getStartedIssuing: 'Beginne, indem du deine erste virtuelle oder physische Karte ausstellst.',
@@ -7519,6 +7549,8 @@ Der Control-Tarif beginnt bei 9 $ pro aktivem Mitglied und Monat.`,
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Zum Entsperren automatische Synchronisierung aktivieren.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `Ihre QuickBooks Online-Verbindung läuft am ${date} ab.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Ihre QuickBooks Online-Verbindung ist am ${date} abgelaufen.`,
         },
         export: {
             notReadyHeading: 'Nicht bereit zum Export',
@@ -8193,6 +8225,8 @@ Fordern Sie Spesendetails wie Belege und Beschreibungen an, legen Sie Limits und
                 autoPayApprovedReportsSubtitle: 'Legen Sie fest, welche Spesenabrechnungen für die automatische Zahlung infrage kommen.',
                 autoPayApprovedReportsLimitError: (currency?: string) => `Bitte gib einen Betrag ein, der kleiner als ${currency ?? ''}20.000 ist`,
                 autoPayApprovedReportsLockedSubtitle: 'Gehe zu „Weitere Funktionen“ und aktiviere Workflows, dann füge Zahlungen hinzu, um diese Funktion freizuschalten.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `Automatische Zahlung ist nur im Control-Tarif verfügbar. [Upgrade](${upgradeLink}), um diese Funktion freizuschalten.`,
                 autoPayReportsUnderTitle: 'Berichte für automatische Bezahlung unter',
                 autoPayReportsUnderDescription: 'Vollständig konforme Spesenabrechnungen unter diesem Betrag werden automatisch bezahlt.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Füge ${featureName} hinzu, um diese Funktion freizuschalten.`,
@@ -8283,6 +8317,7 @@ Fordern Sie Spesendetails wie Belege und Beschreibungen an, legen Sie Limits und
                 flagAmountsOver: 'Beträge kennzeichnen über',
                 flagAmountsOverDescription: (categoryName: string) => `Gilt für die Kategorie „${categoryName}“.`,
                 flagAmountsOverSubtitle: 'Dadurch wird der Höchstbetrag für alle Ausgaben überschrieben.',
+                expenseLimitType: 'Ausgabenlimit-Typ',
                 expenseLimitTypes: {
                     expense: 'Einzelne Ausgabe',
                     expenseSubtitle:
@@ -8888,6 +8923,35 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 description: 'Wählen Sie Ihr Verrechnungskonto aus, und wir erstellen die Zahlung in Campfire.',
             },
             travelInvoicingPayableAccount: {label: 'Verbindlichkeitskonto für Reiseabrechnungen'},
+            exportToMultipleAccounts: 'Export in mehrere Konten konfigurieren',
+            cardProgramAccount: {
+                label: 'Kartenprogramm-Konto',
+                description: 'Überschreiben Sie das Arbeitsbereichskonto für diese Kartenprogramme.',
+                descriptionLevel2: 'Überschreiben Sie das Workspace-Konto für dieses Kartenprogramm.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Alle Programme verwenden das Standardkonto';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} Programm mit benutzerdefiniertem Konto`;
+                    }
+                    return `${customAccountsCount} Programme mit benutzerdefinierten Konten`;
+                },
+            },
+            cardAccount: {
+                label: 'Konto pro Karte',
+                description: 'Programm-Konto für einzelne Karten überschreiben.',
+                descriptionLevel2: 'Programm-Konto für diese Karten überschreiben.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Alle Karten verwenden Programmkonten';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} Karte mit benutzerdefiniertem Konto`;
+                    }
+                    return `${customAccountsCount} Karten mit benutzerdefinierten Konten`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Dynamics 365 Business Central-Einrichtung',
@@ -8904,6 +8968,51 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
             importDescription: 'Wählen Sie, welche Buchungskonfigurationen aus Dynamics 365 Business Central importiert werden sollen.',
             items: 'Artikel',
             enableNewCategories: 'Neu importierte Kategorien aktivieren',
+            exportDescription: 'Konfigurieren Sie, wie Expensify-Daten nach Dynamics 365 Business Central exportiert werden.',
+            exportDate: {
+                label: 'Transaktionsdatum',
+                description: 'Verwenden Sie dieses Datum beim Exportieren von Berichten nach Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Datum der letzten Ausgabe',
+                        description: 'Datum der letzten im Bericht erfassten Ausgabe.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Exportdatum',
+                        description: 'Datum, an dem der Bericht nach Dynamics 365 Business Central exportiert wurde.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Einreichungsdatum',
+                        description: 'Datum, an dem der Bericht zur Genehmigung eingereicht wurde.',
+                    },
+                },
+            },
+            exportReimbursable: 'Erstattungsfähige Ausgaben exportieren als',
+            exportNonReimbursable: 'Firmenkartenausgaben exportieren als',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Fibu Buch.-Blatt',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Einkaufsrechnungen',
+            },
+            reimbursableAccount: {
+                label: 'Erstattungskonto',
+                description: 'Wählen Sie aus, wohin erstattungsfähige Ausgaben exportiert werden.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Standardanbieter für Firmenkarten',
+                description: 'Wählen Sie einen standardmäßigen Dynamics 365 Business Central-Anbieter für Ausgaben, die nicht automatisch zugeordnet werden.',
+            },
+            companyCardAccount: {
+                label: 'Firmenkartenkonto',
+                description: 'Wählen Sie aus, wohin Firmenkartentransaktionen exportiert werden.',
+            },
+            paymentMethod: {
+                label: 'Zahlungsform',
+                description: 'Wählen Sie eine Zahlungsform für Einkaufsrechnungen, damit Dynamics 365 Business Central sie mit Ihrer Bank abgleichen kann.',
+            },
+            noBankAccountsFound: 'Keine Bankkonten gefunden',
+            noBankAccountsFoundDescription: 'Bitte fügen Sie Bankkonten in Dynamics 365 Business Central hinzu und synchronisieren Sie die Verbindung erneut',
+            noPaymentMethodsFound: 'Keine Zahlungsformen gefunden',
+            noPaymentMethodsFoundDescription: 'Bitte fügen Sie Zahlungsformen in Dynamics 365 Business Central hinzu und synchronisieren Sie die Verbindung erneut',
         },
     },
     getAssistancePage: {
@@ -9556,6 +9665,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `Rechnungseinstellungen von <a href="${sourcePolicyURL}">${sourcePolicyName}</a> kopiert`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `Reiseeinstellungen von <a href="${sourcePolicyURL}">${sourcePolicyName}</a> kopiert`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'aktiviert' : 'deaktiviert'} die automatische Kategorisierung neuer Ausgaben`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'aktiviert' : 'deaktiviert'} die Anforderung zur Ausgabenkategorisierung`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'aktiviert' : 'deaktiviert'} die Anforderung zur Ausgaben-Taggierung`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `hat die Einstellung für die Währungsumrechnungsgebühr auf „${preferenceLabel}“ aktualisiert`,
@@ -9592,6 +9702,10 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 : `hat den Genehmigungs-Workflow für ${member} so geändert, dass Berichte über ${previousLimit} nicht mehr weitergeleitet werden`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `hat den Genehmigungsworkflow für ${member} geändert, um Berichte über ${limit} weiterzuleiten (zuvor ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `hat die Arbeitsregelung von ${displayName} auf ${newArrangement} geändert (zuvor ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `hat die standardmäßige Arbeitsregelung in ${newArrangement} geändert (zuvor ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Mitglied nicht gefunden.',
@@ -9897,6 +10011,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
         noCategory: 'Keine Kategorie',
         noMerchant: 'Kein Händler',
         noTag: 'Kein Tag',
+        noVendor: 'Kein Lieferant',
         expenseType: 'Ausgabenart',
         receiptType: 'Belegart',
         receiptTypeValues: {
@@ -11014,7 +11129,18 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                 invalid: 'Dieser Code ist ungültig',
             },
         },
-        paymentHistory: {title: 'Zahlungsverlauf anzeigen', subtitle: 'Ihre vollständige monatliche Zahlungshistorie, die diesem Konto belastet wurde.'},
+        paymentHistory: {
+            title: 'Zahlungsverlauf anzeigen',
+            subtitle: 'Ihre vollständige monatliche Zahlungshistorie, die diesem Konto belastet wurde.',
+            payments: 'Zahlungen',
+            inclTax: 'inkl. Steuern',
+            empty: 'Noch keine Zahlungen.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 aktiver Benutzer',
+                other: `${count} aktive Benutzer`,
+            }),
+            state: {paid: 'Bezahlt', cleared: 'Ausgeglichen', failed: 'Fehlgeschlagen', refunded: 'Erstattet', disputed: 'Angefochten', balanceTransfer: 'Saldoübertrag'},
+        },
         subscriptionSettings: {
             title: 'Abonnementeinstellungen',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -11127,6 +11253,8 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
             `Sind Sie sicher, dass Sie Ihren Copilot-Zugriff auf das Expensify-Konto von ${delegatorName} entfernen möchten? Diese Aktion kann nicht rückgängig gemacht werden.`,
         removeCopilotAccessConfirm: 'Zugriff entfernen',
         copilotAccess: 'Copilot-Zugriff',
+        leaveAccount: 'Konto verlassen',
+        leaveAccountConfirmationText: 'Sie kehren zu Ihrem eigenen Konto zurück. Sie werden nicht vollständig abgemeldet.',
     },
     debug: {
         debug: 'Debug',
@@ -11584,5 +11712,13 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
             description: `<muted-text>Erstellen Sie benutzerdefinierte Agenten, die Ausgaben anhand Ihrer Regeln prüfen, genehmigen und weiterleiten. <a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">Mehr erfahren</a>.</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) =>
+            `Verlängern Sie Ihr Abonnement für einen Zeitraum von 12 Monaten, von ${startDate} bis ${endDate}.`,
+        title: 'Verlängern Sie Ihr Expensify-Abonnement',
+        subtitle: 'Eine Sache weniger zu erledigen vor dem neuen Jahr.',
+        confirmTitle: 'Verlängerung bestätigen',
+        renew: 'Erneuern',
+    },
 };
 export default translations;
diff --git a/src/languages/el.ts b/src/languages/el.ts
index 150e5abc1e95..d7d7a7548e35 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -48,6 +48,7 @@ const translations: TranslationDeepObject<typeof en> = {
         cancel: 'Άκυρο',
         unableToDisplayChart: 'Δεν είναι δυνατή η εμφάνιση του γραφήματος',
         webGLNotSupported: 'Το πρόγραμμα περιήγησής σας δεν υποστηρίζει WebGL. Παρακαλούμε ενεργοποιήστε το ή αλλάξτε πρόγραμμα περιήγησης.',
+        chartFailedToLoad: 'Δεν ήταν δυνατή η φόρτωση του γραφήματος. Ανανεώστε τη σελίδα και δοκιμάστε ξανά.',
         dismiss: 'Κλείσιμο',
         proceed: 'Συνέχεια',
         unshare: 'Αναίρεση κοινής χρήσης',
@@ -335,6 +336,7 @@ const translations: TranslationDeepObject<typeof en> = {
         automatic: 'Αυτόματο',
         showing: 'Εμφανίζονται',
         of: 'του',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} από ${total}`,
         default: 'Προεπιλογή',
         update: 'Ενημέρωση',
         member: 'Μέλος',
@@ -416,8 +418,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'μ',
         secondAbbreviation: 'ς',
         skip: 'Παράλειψη',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `Χρειάζεστε κάτι συγκεκριμένο; Συνομιλήστε με τον υπεύθυνο λογαριασμού σας, ${accountManagerDisplayName}.`,
-        chatNow: 'Συνομιλήστε τώρα',
         workEmail: 'Εταιρικό email',
         destination: 'Προορισμός',
         subrate: 'Δευτερεύουσα χρέωση',
@@ -1208,6 +1208,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: 'Προβολή στο Spend',
         emptyState: {title: 'Τίποτα προς εμφάνιση', subtitle: 'Δοκιμάστε να προσαρμόσετε τα κριτήριά σας παραπάνω'},
         noExpensesState: {title: 'Δείτε πού πηγαίνουν τα χρήματά σας', subtitle: 'Μόλις έχετε δαπάνες, θα βλέπετε τάσεις δαπανών, κορυφαίους εμπόρους και άλλα.'},
+        compare: {label: 'Σύγκριση', previousPeriod: 'Προηγούμενη περίοδος', average: 'Μέσος όρος'},
     },
     allSettingsScreen: {
         subscription: 'Συνδρομή',
@@ -1386,6 +1387,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Πριν καταγράψετε αποστάσεις, πρέπει να προσθέσετε τη διεύθυνση κατοικίας σας στο ιδιωτικό προφίλ σας. Αυτός ο χώρος εργασίας χρησιμοποιεί αυτή τη διεύθυνση για εκπτώσεις μετακίνησης.',
             cta: 'Προσθήκη οικιακής διεύθυνσης',
         },
+        expenseAdded: 'Δαπάνη προστέθηκε',
+        invoiceSent: 'Τιμολόγιο στάλθηκε',
         amount: 'Ποσό',
         percent: 'Ποσοστό',
         date: 'Ημερομηνία',
@@ -1965,6 +1968,7 @@ const translations: TranslationDeepObject<typeof en> = {
         whatIsHoldExplainDM: 'Η αναμονή είναι σαν να πατάτε «παύση» σε μία δαπάνη μέχρι να είστε έτοιμοι να τη στείλετε.',
         holdIsLeftBehindDM: 'Οι δεσμευμένες δαπάνες δεν θα αποσταλούν μέχρι να καταργήσετε τη δέσμευση.',
         unholdWhenReadyDM: 'Αποδεσμεύστε τις δαπάνες όταν είστε έτοιμοι να τις στείλετε.',
+        undeletedExpense: 'ανέκτησε αυτή τη δαπάνη',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `οι τιμές αποζημίωσης χιλιομέτρων ενημερώθηκαν για το νέο χώρο εργασίας - ${policyName}`,
     },
     transactionMerge: {
@@ -2246,7 +2250,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Εικόνα προφίλ',
         customInstructions: 'Προσαρμοσμένες οδηγίες',
         copilotIntoAccount: 'Οδηγός εντός λογαριασμού',
-        viewMemberHistory: 'Προβολή ιστορικού μέλους',
+        seeChatHistory: 'Δείτε το ιστορικό συνομιλιών',
         viewAgentHistory: 'Προβολή ιστορικού αντιπροσώπου',
         publicSection: {
             title: 'Δημόσιο',
@@ -2381,7 +2385,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Αποτελέσματα',
             releaseOptions: 'Επιλογές έκδοσης',
             testingPreferences: 'Προτιμήσεις δοκιμών',
-            useStagingServer: 'Χρήση διακομιστή staging',
+            server: 'Διακομιστής',
+            servers: {
+                production: {label: 'Παραγωγή', description: 'Το ζωντανό περιβάλλον που βλέπουν οι πραγματικοί χρήστες'},
+                staging: {label: 'Staging', description: 'Αντίγραφο της παραγωγής. Χρησιμοποιείται για τον τελικό έλεγχο'},
+                qa: {label: 'QA', description: 'Πειραματικό περιβάλλον που χρησιμοποιείται για δοκιμές'},
+            },
+            serverPinnedDescription: 'Αυτή η έκδοση επικοινωνεί πάντα με έναν διακομιστή, οπότε δεν μπορεί να αλλάξει εδώ.',
             forceOffline: 'Εξαναγκασμός εκτός σύνδεσης',
             simulatePoorConnection: 'Προσομοίωση κακής σύνδεσης στο διαδίκτυο',
             simulateFailingNetworkRequests: 'Προσομοίωση αποτυχημένων αιτημάτων δικτύου',
@@ -2611,7 +2621,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Απαιτείται έλεγχος ταυτότητας δύο παραγόντων',
         twoFactorAuthIsRequiredForAdminsTitle: 'Παρακαλούμε ενεργοποιήστε τον έλεγχο ταυτότητας δύο παραγόντων',
         twoFactorAuthIsRequiredXero: 'Η σύνδεσή σας με το λογιστικό σύστημα Xero απαιτεί έλεγχο ταυτότητας δύο παραγόντων.',
-        twoFactorAuthIsRequiredCompany: 'Η εταιρεία σας απαιτεί έλεγχο ταυτότητας δύο παραγόντων.',
+        twoFactorAuthIsRequiredCompany: 'Η εταιρεία σας απαιτεί έλεγχο ταυτότητας δύο παραγόντων (2FA).',
         twoFactorAuthCannotDisable: 'Δεν είναι δυνατή η απενεργοποίηση του 2FA',
         twoFactorAuthRequired: 'Η επαλήθευση δύο παραγόντων (2FA) είναι υποχρεωτική για τη σύνδεσή σας με το Xero και δεν μπορεί να απενεργοποιηθεί.',
         replaceDevice: 'Αντικατάσταση συσκευής',
@@ -2621,6 +2631,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyOldDeviceDescriptionWithRecovery: 'Εισαγάγετε έναν έγκυρο κωδικό ανάκτησης για να επιβεβαιώσετε ότι έχετε πρόσβαση στον λογαριασμό σας.',
         verifyNewDeviceTitle: 'Ρύθμιση νέας συσκευής',
         verifyNewDeviceDescription: 'Σαρώστε τον κωδικό QR με τη νέα σας συσκευή και κατόπιν εισαγάγετε τον κωδικό για να ολοκληρώσετε τη ρύθμιση.',
+        enable2FA: 'Ενεργοποίηση',
     },
     recoveryCodeForm: {
         error: {
@@ -3059,6 +3070,9 @@ ${amount} για ${merchant} - ${date}`,
         memberAlreadyInWorkflowTitle: 'Το μέλος συμμετέχει ήδη σε ροή εργασίας',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `Ο/Η ${memberName} βρίσκεται ήδη σε ροή έγκρισης που υποβάλλεται σε ${approverName}. Η προσθήκη τους εδώ θα τους μετακινήσει σε αυτήν τη ροή.`,
+        moveEveryoneToThisWorkflowTitle: 'Μετακινήστε όλους σε αυτήν τη ροή εργασίας',
+        moveEveryoneToThisWorkflowPrompt:
+            'Πρόκειται να μετακινήσετε όλους/όλες σε αυτήν τη ροή έγκρισης. Αυτό θα διαγράψει όλες τις άλλες ροές έγκρισης και θα μετακινήσει όλους/όλες σε αυτήν. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.',
     },
     workflowsApproverPage: {
         genericErrorMessage: 'Δεν ήταν δυνατή η αλλαγή του εγκρίνοντα. Δοκιμάστε ξανά ή επικοινωνήστε με την υποστήριξη.',
@@ -3374,6 +3388,7 @@ ${amount} για ${merchant} - ${date}`,
         error: {
             pleaseFillTwoFactorAuth: 'Εισαγάγετε τον κωδικό ελέγχου ταυτότητας δύο παραγόντων σας',
             pleaseFillSecurityCode: 'Παρακαλούμε εισαγάγετε τον κωδικό ασφαλείας σας',
+            tooManyAttempts: 'Πάρα πολλές προσπάθειες. Δοκιμάστε ξανά αργότερα.',
             incorrectSecurityCode: 'Εσφαλμένος ή μη έγκυρος κωδικός ασφαλείας. Δοκιμάστε ξανά ή ζητήστε έναν νέο κωδικό.',
         },
         securityCodeNotReceived: 'Δεν λάβατε κωδικό ασφαλείας;',
@@ -3462,9 +3477,9 @@ ${amount} για ${merchant} - ${date}`,
             otherAccountingSoftware: 'Όνομα λογισμικού',
         },
         interestedFeatures: {
-            title: 'Σε ποιες δυνατότητες ενδιαφέρεστε;',
-            featuresAlreadyEnabled: 'Αυτά είναι τα πιο δημοφιλή χαρακτηριστικά μας:',
-            featureYouMayBeInterestedIn: 'Ενεργοποιήστε πρόσθετες λειτουργίες:',
+            title: 'Επιλέξτε τις λειτουργίες που θέλετε',
+            featuresAlreadyEnabled: 'Ο χώρος εργασίας σας έχει ήδη ενεργοποιημένα τα εξής:',
+            featureYouMayBeInterestedIn: 'Ενεργοποιήστε πρόσθετες λειτουργίες που μπορεί να σας ενδιαφέρουν:',
         },
         error: {
             requiredFirstName: 'Παρακαλούμε εισαγάγετε το μικρό σας όνομα για να συνεχίσετε',
@@ -4744,21 +4759,21 @@ ${amount} για ${merchant} - ${date}`,
         nightsIn: 'διανυκτερεύσεις σε',
         nudge: {
             airfareManual:
-                'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε πτήσεις απευθείας στο Expensify; Την επόμενη φορά αποφύγετε την ταλαιπωρία της χειροκίνητης δημιουργίας του εξόδού σας και απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε αεροπορικά εισιτήρια απευθείας στο Expensify και να εξακολουθείτε να κερδίζετε μίλια με τα προγράμματα συχνού ταξιδιού σας; Την επόμενη φορά αποφύγετε την ταλαιπωρία της χειροκίνητης δημιουργίας της δαπάνης σας και απλώς κλείστε μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε πτήσεις απευθείας μέσα στο Expensify; Και ότι ανεβάζει αυτόματα τις αποδείξεις για εσάς; Την επόμενη φορά απλώς κάντε την κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε αεροπορικά εισιτήρια απευθείας στο Expensify και να συνεχίσετε να κερδίζετε μίλια με τα προγράμματα συχνού επιβάτη σας; Επίσης ανεβάζει αυτόματα και τις αποδείξεις για εσάς. Την επόμενη φορά απλώς κάντε την κράτησή σας μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Γνωρίζατε ότι μπορείτε να κάνετε κράτηση και να διαχειρίζεστε διαμονές σε ξενοδοχεία απευθείας στο Expensify; Την επόμενη φορά αποφύγετε τον μπελά της χειροκίνητης δημιουργίας της δαπάνης σας και απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε διαμονές σε ξενοδοχεία απευθείας στο Expensify και να συνεχίσετε να χρησιμοποιείτε τα προγράμματα επιβράβευσης πελατών ξενοδοχείων; Την επόμενη φορά, αποφύγετε την ταλαιπωρία της χειροκίνητης δημιουργίας του εξόδου σας και απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε διαμονές σε ξενοδοχεία απευθείας στο Expensify; Την επόμενη φορά απλώς κλείστε μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε διαμονές σε ξενοδοχεία απευθείας στο Expensify και να συνεχίσετε να χρησιμοποιείτε τα προγράμματα επιβράβευσης ξενοδοχείων σας; Την επόμενη φορά απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε ενοικιάσεις αυτοκινήτων απευθείας στο Expensify; Την επόμενη φορά αποφύγετε την ταλαιπωρία της χειροκίνητης δημιουργίας της δαπάνης σας και απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε ενοικιάσεις αυτοκινήτων απευθείας στο Expensify και να συνεχίσετε να χρησιμοποιείτε τα προγράμματα επιβράβευσης ενοικίασης αυτοκινήτου σας; Την επόμενη φορά αποφύγετε την ταλαιπωρία της χειροκίνητης δημιουργίας του εξόδου σας και απλώς κλείστε μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε ενοικιάσεις αυτοκινήτων απευθείας στο Expensify; Την επόμενη φορά απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε ενοικιάσεις αυτοκινήτων απευθείας στο Expensify και να συνεχίσετε να χρησιμοποιείτε τα προγράμματα επιβράβευσης ενοικίασης αυτοκινήτου σας; Την επόμενη φορά απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε σιδηροδρομικά ταξίδια απευθείας στο Expensify; Την επόμενη φορά αποφύγετε την ταλαιπωρία της χειροκίνητης δημιουργίας του εξόδου σας και απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε σιδηροδρομικά ταξίδια απευθείας στο Expensify και να συνεχίσετε να χρησιμοποιείτε τα προγράμματα επιβράβευσης και τις σιδηροδρομικές κάρτες σας; Την επόμενη φορά αποφύγετε τον κόπο της χειροκίνητης δημιουργίας του εξόδου σας και απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε ταξίδια με τρένο απευθείας στο Expensify; Και ότι ανεβάζει αυτόματα τις αποδείξεις για εσάς; Την επόμενη φορά απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Γνωρίζατε ότι μπορείτε να κλείνετε σιδηροδρομικά ταξίδια απευθείας στο Expensify και να συνεχίσετε να χρησιμοποιείτε τα προγράμματα επιβράβευσης και τις σιδηροδρομικές σας κάρτες; Επίσης, ανεβάζει αυτόματα τις αποδείξεις για εσάς. Την επόμενη φορά απλώς κάντε κράτηση μέσω του <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 'Γνωρίζατε ότι μπορείτε να κλείνετε και να διαχειρίζεστε ομαδικά ταξίδια όπως αυτό απευθείας στο Expensify; Γλιτώστε ταλαιπωρία την επόμενη φορά και δοκιμάστε το εργαλείο μας <a href="https://help.expensify.com/travel/hubs/event-management/">Travel Events</a>.',
             hotelBlockCard:
@@ -6525,6 +6540,8 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             statusActive: 'Ενεργό',
             statusInactive: 'Ανενεργό',
             remaining: 'Υπόλοιπο',
+            noCardFeedsAvailable: 'Δεν υπάρχουν διαθέσιμες ροές καρτών',
+            noCardFeedsAvailableDescription: 'Δεν υπάρχουν διαθέσιμες ροές καρτών για αυτόν τον χώρο εργασίας.',
         },
         categories: {
             deleteCategories: 'Διαγραφή κατηγοριών',
@@ -6540,6 +6557,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             deleteFailureMessage: 'Παρουσιάστηκε σφάλμα κατά τη διαγραφή της κατηγορίας, δοκιμάστε ξανά',
             categoryName: 'Όνομα κατηγορίας',
             requiresCategory: 'Τα μέλη πρέπει να κατηγοριοποιούν όλες τις δαπάνες',
+            autoCategorizeNewExpenses: 'Αυτόματη κατηγοριοποίηση νέων δαπανών',
             showCategoryGLCodes: 'Εμφάνιση κωδικών GL κατά την κατηγοριοποίηση δαπανών',
             needCategoryForExportToIntegration: (connectionName: string) => `Όλες οι δαπάνες πρέπει να κατηγοριοποιηθούν για να γίνει η εξαγωγή στο ${connectionName}.`,
             subtitle: 'Αποκτήστε μια καλύτερη εικόνα για το πού ξοδεύονται τα χρήματα. Χρησιμοποιήστε τις προεπιλεγμένες κατηγορίες μας ή προσθέστε τις δικές σας.',
@@ -6772,8 +6790,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
                 corporate: 'Περιορισμός διαγραφής συναλλαγών',
                 personal: 'Να επιτρέπεται η διαγραφή συναλλαγών',
                 setFeedNameDescription: 'Δώστε στη ροή κάρτας ένα μοναδικό όνομα ώστε να τη διακρίνετε από τις άλλες',
-                setTransactionLiabilityDescription:
-                    'Όταν είναι ενεργοποιημένο, οι κάτοχοι καρτών μπορούν να διαγράφουν συναλλαγές κάρτας. Οι νέες συναλλαγές θα ακολουθούν αυτόν τον κανόνα.',
+                setTransactionLiabilityDescription: 'Οι κάτοχοι κάρτας μπορούν να διαγράφουν συναλλαγές. Ισχύει μόνο για νέες συναλλαγές.',
                 emptyAddedFeedTitle: 'Δεν υπάρχουν κάρτες σε αυτήν τη ροή',
                 emptyAddedFeedDescription: 'Βεβαιωθείτε ότι υπάρχουν κάρτες στη ροή καρτών της τράπεζάς σας.',
                 pendingFeedTitle: `Εξετάζουμε το αίτημά σας...`,
@@ -7268,6 +7285,15 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
                 `Αν αφαιρέσετε τον/την ${memberName} από αυτόν τον χώρο εργασίας, θα τον/την αντικαταστήσουμε ως τεχνική επαφή με τον/την ${workspaceOwner}, τον/την κάτοχο του χώρου εργασίας.`,
             cannotRemoveUserDueToReport: ({memberName}: {memberName: string}) =>
                 `Ο/Η ${memberName} έχει μία εκκρεμή αναφορά προς επεξεργασία που απαιτεί ενέργεια. Παρακαλούμε ζητήστε του/της να ολοκληρώσει την απαιτούμενη ενέργεια προτού τον/την αφαιρέσετε από τον χώρο εργασίας.`,
+            workArrangement: 'Διευθέτηση εργασίας',
+            officeBased: 'Με βάση γραφείου',
+            noRegularWorkspace: 'Απομακρυσμένα ή μέσω κινητού',
+            workArrangementPage: {
+                title: 'Διευθέτηση εργασίας',
+                optionOfficeBasedHelp: 'Το μέλος μετακινείται σε ένα γραφείο. Οι συνήθεις μετακινήσεις προς και από την εργασία εξαιρούνται από την αποζημίωση.',
+                optionNoRegularWorkspaceHelp: 'Το μέλος εργάζεται από το σπίτι ή ταξιδεύει μεταξύ τοποθεσιών χωρίς τακτικό γραφείο, επομένως οι κανόνες μετακίνησης δεν ισχύουν.',
+                futureOnlyNote: 'Οι αλλαγές ισχύουν μόνο για μελλοντικούς υπολογισμούς χιλιομέτρων. Οι υπάρχουσες δαπάνες χιλιομέτρων δεν επανυπολογίζονται.',
+            },
         },
         card: {
             getStartedIssuing: 'Ξεκινήστε εκδίδοντας την πρώτη σας εικονική ή φυσική κάρτα.',
@@ -7654,6 +7680,8 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Για να το ξεκλειδώσετε, ενεργοποιήστε τον αυτόματο συγχρονισμό.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `Η σύνδεσή σας με το QuickBooks Online λήγει στις ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Η σύνδεσή σας με το QuickBooks Online έληξε στις ${date}.`,
         },
         hr: {
             title: 'HR',
@@ -8557,6 +8585,8 @@ ${reportName}`,
                 autoPayApprovedReportsLimitError: (currency?: string) => `Παρακαλούμε εισαγάγετε ένα ποσό μικρότερο από ${currency ?? ''}20.000`,
                 autoPayApprovedReportsLockedSubtitle:
                     'Μεταβείτε στις πρόσθετες λειτουργίες και ενεργοποιήστε τις ροές εργασιών, έπειτα προσθέστε πληρωμές για να ξεκλειδώσετε αυτή τη λειτουργία.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `Η αυτόματη πληρωμή είναι διαθέσιμη μόνο στο πλάνο Control. [Κάντε αναβάθμιση](${upgradeLink}) για να ξεκλειδώσετε αυτή τη λειτουργία.`,
                 autoPayReportsUnderTitle: 'Αυτόματη πληρωμή αναφορών κάτω από',
                 autoPayReportsUnderDescription: 'Πλήρως συμβατικές αναφορές εξόδων κάτω από αυτό το ποσό θα εξοφλούνται αυτόματα.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Προσθέστε ${featureName} για να ξεκλειδώσετε αυτήν τη δυνατότητα.`,
@@ -8741,6 +8771,7 @@ ${reportName}`,
                 flagAmountsOver: 'Επισήμανση ποσών άνω των',
                 flagAmountsOverDescription: (categoryName: string) => `Ισχύει για την κατηγορία «${categoryName}».`,
                 flagAmountsOverSubtitle: 'Αυτό παρακάμπτει το μέγιστο ποσό για όλες τις δαπάνες.',
+                expenseLimitType: 'Τύπος ορίου δαπάνης',
                 expenseLimitTypes: {
                     expense: 'Ατομική δαπάνη',
                     expenseSubtitle:
@@ -9056,6 +9087,35 @@ ${reportName}`,
                 description: 'Επιλέξτε τον λογαριασμό διακανονισμού σας και θα δημιουργήσουμε την πληρωμή στο Campfire.',
             },
             travelInvoicingPayableAccount: {label: 'Λογαριασμός πληρωτέων για τιμολόγηση ταξιδιών'},
+            exportToMultipleAccounts: 'Ρύθμιση εξαγωγής σε πολλούς λογαριασμούς',
+            cardProgramAccount: {
+                label: 'Λογαριασμός προγράμματος κάρτας',
+                description: 'Παρακάμψτε τον λογαριασμό χώρου εργασίας για αυτά τα προγράμματα καρτών.',
+                descriptionLevel2: 'Παράκαμψη του λογαριασμού χώρου εργασίας για αυτό το πρόγραμμα κάρτας.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Όλα τα προγράμματα χρησιμοποιούν τον προεπιλεγμένο λογαριασμό';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} πρόγραμμα με προσαρμοσμένο λογαριασμό`;
+                    }
+                    return `${customAccountsCount} προγράμματα με προσαρμοσμένους λογαριασμούς`;
+                },
+            },
+            cardAccount: {
+                label: 'Λογαριασμός ανά κάρτα',
+                description: 'Παρακάμψτε τον λογαριασμό προγράμματος για μεμονωμένες κάρτες.',
+                descriptionLevel2: 'Παράκαμψη του λογαριασμού προγράμματος για αυτές τις κάρτες.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Όλες οι κάρτες χρησιμοποιούν λογαριασμούς προγράμματος';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} κάρτα με προσαρμοσμένο λογαριασμό`;
+                    }
+                    return `${customAccountsCount} κάρτες με προσαρμοσμένους λογαριασμούς`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Ρύθμιση Dynamics 365 Business Central',
@@ -9072,6 +9132,51 @@ ${reportName}`,
             importDescription: 'Επιλέξτε ποιες ρυθμίσεις κωδικοποίησης θέλετε να εισαγάγετε από το Dynamics 365 Business Central.',
             items: 'Στοιχεία',
             enableNewCategories: 'Ενεργοποίηση νέων εισαγόμενων κατηγοριών',
+            exportDescription: 'Ρυθμίστε τον τρόπο με τον οποίο τα δεδομένα του Expensify εξάγονται στο Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Ημερομηνία συναλλαγής',
+                description: 'Χρησιμοποιήστε αυτήν την ημερομηνία κατά την εξαγωγή αναφορών στο Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Ημερομηνία τελευταίας δαπάνης',
+                        description: 'Ημερομηνία της πιο πρόσφατης δαπάνης στην αναφορά.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Ημερομηνία εξαγωγής',
+                        description: 'Ημερομηνία εξαγωγής της αναφοράς στο Dynamics 365 Business Central.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Ημερομηνία υποβολής',
+                        description: 'Ημερομηνία που η αναφορά υποβλήθηκε για έγκριση.',
+                    },
+                },
+            },
+            exportReimbursable: 'Εξαγωγή αποζημιώσιμων εξόδων ως',
+            exportNonReimbursable: 'Εξαγωγή εξόδων εταιρικής κάρτας ως',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Γενικό ημερολόγιο',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Τιμολόγια αγοράς',
+            },
+            reimbursableAccount: {
+                label: 'Λογαριασμός αποζημιώσιμων εξόδων',
+                description: 'Επιλέξτε πού θα εξαχθούν τα αποζημιώσιμα έξοδα.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Προεπιλεγμένος προμηθευτής εταιρικής κάρτας',
+                description: 'Επιλέξτε έναν προεπιλεγμένο προμηθευτή Dynamics 365 Business Central για έξοδα που δεν αντιστοιχίζονται αυτόματα.',
+            },
+            companyCardAccount: {
+                label: 'Λογαριασμός εταιρικής κάρτας',
+                description: 'Επιλέξτε πού θα εξαχθούν οι συναλλαγές εταιρικής κάρτας.',
+            },
+            paymentMethod: {
+                label: 'Μέθοδος πληρωμής',
+                description: 'Επιλέξτε μια μέθοδο πληρωμής για τα τιμολόγια αγοράς, ώστε το Dynamics 365 Business Central να μπορεί να τα συμφωνήσει με την τράπεζά σας.',
+            },
+            noBankAccountsFound: 'Δεν βρέθηκαν τραπεζικοί λογαριασμοί',
+            noBankAccountsFoundDescription: 'Προσθέστε τραπεζικούς λογαριασμούς στο Dynamics 365 Business Central και συγχρονίστε ξανά τη σύνδεση',
+            noPaymentMethodsFound: 'Δεν βρέθηκαν μέθοδοι πληρωμής',
+            noPaymentMethodsFoundDescription: 'Προσθέστε μεθόδους πληρωμής στο Dynamics 365 Business Central και συγχρονίστε ξανά τη σύνδεση',
         },
     },
     getAssistancePage: {
@@ -9591,6 +9696,7 @@ ${reportName}`,
         },
         updatedAttendeeTracking: ({enabled}: {enabled: boolean}) => `παρακολούθηση συμμετεχόντων ${enabled ? 'ενεργοποιημένο' : 'απενεργοποιημένο'}`,
         updatedRequireCompanyCards: ({enabled}: {enabled: boolean}) => `${enabled ? 'ενεργοποιημένο' : 'απενεργοποιημένο'} η απαίτηση για αγορές με εταιρική κάρτα`,
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'ενεργοποιημένο' : 'ανενεργό'} η αυτόματη κατηγοριοποίηση νέων δαπανών`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'ενεργοποιημένο' : 'ανενεργό'} η απαίτηση κατηγοριοποίησης δαπανών`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'ενεργοποιημένο' : 'ανενεργό'} στην απαίτηση κατηγοριοποίησης δαπανών`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `ενημέρωσε τη ρύθμιση προμήθειας μετατροπής νομίσματος σε «${preferenceLabel}»`,
@@ -9780,6 +9886,10 @@ ${reportName}`,
                 : `άλλαξε τη ροή έγκρισης για τον/την ${member} ώστε να σταματήσει η προώθηση αναφορών πάνω από ${previousLimit}`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `άλλαξε τη ροή έγκρισης για τον/την ${member} ώστε να προωθεί αναφορές πάνω από ${limit} (προηγουμένως ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `άλλαξε τη ρύθμιση εργασίας του/της ${displayName} σε ${newArrangement} (προηγουμένως: ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `άλλαξε τη προεπιλεγμένη εργασιακή ρύθμιση σε ${newArrangement} (προηγουμένως ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Το μέλος δεν βρέθηκε.',
@@ -10113,6 +10223,7 @@ ${reportName}`,
         noCategory: 'Χωρίς κατηγορία',
         noMerchant: 'Χωρίς έμπορο',
         noTag: 'Χωρίς ετικέτα',
+        noVendor: 'Χωρίς προμηθευτή',
         expenseType: 'Τύπος εξόδου',
         receiptType: 'Τύπος απόδειξης',
         receiptTypeValues: {
@@ -11235,7 +11346,18 @@ ${reportName}`,
                 invalid: 'Αυτός ο κωδικός δεν είναι έγκυρος',
             },
         },
-        paymentHistory: {title: 'Προβολή ιστορικού πληρωμών', subtitle: 'Το πλήρες ιστορικό των μηνιαίων πληρωμών που χρεώθηκαν σε αυτόν τον λογαριασμό.'},
+        paymentHistory: {
+            title: 'Προβολή ιστορικού πληρωμών',
+            subtitle: 'Το πλήρες ιστορικό των μηνιαίων πληρωμών που χρεώθηκαν σε αυτόν τον λογαριασμό.',
+            payments: 'Πληρωμές',
+            inclTax: 'συμπ. φόρου',
+            empty: 'Δεν υπάρχουν ακόμη πληρωμές.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 ενεργός χρήστης',
+                other: `${count} ενεργοί χρήστες`,
+            }),
+            state: {paid: 'Πληρωμένο', cleared: 'Εκκαθαρισμένο', failed: 'Απέτυχε', refunded: 'Επιστράφηκε', disputed: 'Αμφισβητούμενη', balanceTransfer: 'Μεταφορά υπολοίπου'},
+        },
         subscriptionSettings: {
             title: 'Ρυθμίσεις συνδρομής',
             editSubscription: 'Επεξεργασία συνδρομής',
@@ -11349,6 +11471,8 @@ ${reportName}`,
         notAllowedMessage: (accountOwnerEmail: string) =>
             `Ως <a href="${CONST.DELEGATE_ROLE_HELP_DOT_ARTICLE_LINK}">συνοδοιπόρος</a> για τον/την ${accountOwnerEmail}, δεν έχετε δικαίωμα να εκτελέσετε αυτήν την ενέργεια. Συγγνώμη!`,
         copilotAccess: 'Πρόσβαση στο Copilot',
+        leaveAccount: 'Αποχώρηση από τον λογαριασμό',
+        leaveAccountConfirmationText: 'Θα επιστρέψετε στον δικό σας λογαριασμό. Δεν θα αποσυνδεθείτε πλήρως.',
     },
     debug: {
         debug: 'Εντοπισμός σφαλμάτων',
@@ -11811,6 +11935,8 @@ ${reportName}`,
         closeButton: 'Κλείσιμο',
         addPaymentCardButton: 'Προσθήκη κάρτας πληρωμής',
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `Ο χρήστης ${updatedBy} ενημέρωσε τις οδηγίες αυτού του agent.\nΠροηγούμενες οδηγίες:\n${previousPrompt}\nΝέες οδηγίες:\n${newPrompt}`,
     newAgentPage: {
         title: 'Νέος agent',
         buildCustomAgent: 'Δημιουργία προσαρμοσμένου agent',
@@ -11827,5 +11953,12 @@ ${reportName}`,
         employeePays: 'Ο εργαζόμενος πληρώνει',
         errorMessage: 'Δεν ήταν δυνατή η αλλαγή της προτίμησης χρέωσης μετατροπής νομίσματος. Παρακαλούμε δοκιμάστε ξανά ή επικοινωνήστε με την υποστήριξη.',
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Ανανεώστε τη συνδρομή σας για περίοδο 12 μηνών, από ${startDate} έως ${endDate}.`,
+        title: 'Ανανεώστε τη συνδρομή σας στο Expensify',
+        subtitle: 'Ένα πράγμα λιγότερο να κάνετε πριν από το νέο έτος.',
+        confirmTitle: 'Επιβεβαίωση ανανέωσης',
+        renew: 'Ανανέωση',
+    },
 };
 export default translations;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 467b9a867020..61ab6e68a69f 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -36,6 +36,13 @@ type States = Record<keyof typeof COMMON_CONST.STATES, StateValue>;
 type AllCountries = Record<Country, string>;
 
 const translations = {
+    earlyRenewal: {
+        title: 'Renew your Expensify subscription',
+        subtitle: 'One less thing to do before the new year.',
+        confirmTitle: 'Confirm renewal',
+        renew: 'Renew',
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Renew your subscription for a 12-month term, from ${startDate} to ${endDate}.`,
+    },
     common: {
         durationDays: ({count}: {count: number}) => ({
             one: '1 day',
@@ -56,6 +63,8 @@ const translations = {
         unableToDisplayChart: 'Unable to display chart',
         // @context Shown below "Unable to display chart". "WebGL" is a graphics technology name; keep it untranslated.
         webGLNotSupported: "Your browser doesn't support WebGL. Please enable it or switch browsers.",
+        // @context Shown below "Unable to display chart" when the chart renderer failed to load, e.g. after an app update while the page stayed open.
+        chartFailedToLoad: 'The chart could not be loaded. Please refresh the page and try again.',
         // @context Refers to closing or hiding a notification or message, not rejecting or ignoring something.
         dismiss: 'Dismiss',
         // @context Used on a button to continue an action or workflow, not the formal or procedural sense of “to proceed.”
@@ -371,6 +380,8 @@ const translations = {
         automatic: 'Automatic',
         showing: 'Showing',
         of: 'of',
+        // @context Carousel pagination counter showing the current item's position out of the total (e.g. "3 of 50").
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} of ${total}`,
         default: 'Default',
         update: 'Update',
         member: 'Member',
@@ -458,8 +469,6 @@ const translations = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'Skip',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `Need something specific? Chat with your account manager, ${accountManagerDisplayName}.`,
-        chatNow: 'Chat now',
         workEmail: 'Work email',
         destination: 'Destination',
         // @context Refers to a secondary or subordinate rate (e.g., mileage reimbursement). Should be localized consistently across accounting contexts.
@@ -1252,6 +1261,11 @@ const translations = {
     },
     insightsPage: {
         viewOnSpend: 'View on Spend',
+        compare: {
+            label: 'Compare',
+            previousPeriod: 'Previous period',
+            average: 'Average',
+        },
         emptyState: {
             title: 'Nothing to show',
             subtitle: 'Try adjusting your criteria above',
@@ -1435,6 +1449,8 @@ const translations = {
                     : 'Before you track distance, you need to add your home address to your private profile. This workspace uses this address for commuter deductions.',
             cta: 'Add Home Address',
         },
+        expenseAdded: 'Expense added',
+        invoiceSent: 'Invoice sent',
         amount: 'Amount',
         percent: 'Percent',
         date: 'Date',
@@ -1771,6 +1787,7 @@ const translations = {
         unholdExpense: 'Unhold expense',
         heldExpense: 'held this expense',
         unheldExpense: 'unheld this expense',
+        undeletedExpense: 'undeleted this expense',
         moveUnreportedExpense: 'Move unreported expense',
         addExistingExpense: 'Add existing expense',
         selectExistingExpense: 'Select at least one expense to add to the report.',
@@ -2305,7 +2322,7 @@ const translations = {
         profileAvatar: 'Profile avatar',
         customInstructions: 'Custom instructions',
         copilotIntoAccount: 'Copilot into account',
-        viewMemberHistory: 'View member history',
+        seeChatHistory: 'See chat history',
         viewAgentHistory: 'View agent history',
         publicSection: {
             title: 'Public',
@@ -2441,7 +2458,13 @@ const translations = {
             results: 'Results',
             releaseOptions: 'Release options',
             testingPreferences: 'Testing preferences',
-            useStagingServer: 'Use Staging Server',
+            server: 'Server',
+            servers: {
+                production: {label: 'Production', description: 'The live environment real users see'},
+                staging: {label: 'Staging', description: 'Mirror of production. Used for final validation'},
+                qa: {label: 'QA', description: 'Experimental environment used for testing'},
+            },
+            serverPinnedDescription: 'This build always talks to one server, so it cannot be changed here.',
             qaAuth: 'QA auth (Cloudflare)',
             qaAuthRunProbe: 'Run probe',
             qaAuthSession: 'QA auth session',
@@ -2662,12 +2685,13 @@ const translations = {
         copyCodes: 'Copy codes',
         disable: 'Disable',
         enableTwoFactorAuth: 'Enable two-factor authentication',
+        enable2FA: 'Enable',
         pleaseEnableTwoFactorAuth: 'Please enable two-factor authentication.',
         twoFactorAuthIsRequiredDescription: 'For security purposes, Xero requires two-factor authentication to connect the integration.',
         twoFactorAuthIsRequiredForAdminsHeader: 'Two-factor authentication required',
         twoFactorAuthIsRequiredForAdminsTitle: 'Please enable two-factor authentication',
         twoFactorAuthIsRequiredXero: 'Your Xero accounting connection requires two-factor authentication.',
-        twoFactorAuthIsRequiredCompany: 'Your company requires two-factor authentication.',
+        twoFactorAuthIsRequiredCompany: 'Your company requires two-factor authentication (2FA).',
         twoFactorAuthCannotDisable: 'Cannot disable 2FA',
         twoFactorAuthRequired: 'Two-factor authentication (2FA) is required for your Xero connection and cannot be disabled.',
         replaceDevice: 'Replace device',
@@ -3106,6 +3130,9 @@ const translations = {
         memberAlreadyInWorkflowTitle: 'Member already in a workflow',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} is already in an approval workflow that submits to ${approverName}. Adding them here will move them to this workflow.`,
+        moveEveryoneToThisWorkflowTitle: 'Move everyone to this workflow',
+        moveEveryoneToThisWorkflowPrompt:
+            'You’re about to move everyone to this approval workflow. This will delete all other approval workflows and move everyone to this one. This action can’t be undone.',
     },
     workflowsApproverPage: {
         genericErrorMessage: "The approver couldn't be changed. Please try again or contact support.",
@@ -3239,6 +3266,8 @@ const translations = {
             updateAvatar: "There was a problem updating this agent's avatar",
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} updated this agent's instructions.\nPrevious instructions:\n${previousPrompt}\nNew instructions:\n${newPrompt}`,
     newAgentPage: {
         title: 'New agent',
         buildCustomAgent: 'Build custom agent',
@@ -3427,6 +3456,7 @@ const translations = {
         timeExpiredAnnouncement: 'The time has expired',
         error: {
             pleaseFillSecurityCode: 'Please enter your security code',
+            tooManyAttempts: 'Too many attempts. Please try again later.',
             incorrectSecurityCode: 'Incorrect or invalid security code. Please try again or request a new code.',
             pleaseFillTwoFactorAuth: 'Please enter your two-factor authentication code',
         },
@@ -3513,9 +3543,9 @@ const translations = {
             otherAccountingSoftware: 'Name of software',
         },
         interestedFeatures: {
-            title: 'What features are you interested in?',
-            featuresAlreadyEnabled: 'Here are our most popular features:',
-            featureYouMayBeInterestedIn: 'Enable additional features:',
+            title: 'Select the features you want',
+            featuresAlreadyEnabled: 'Your workspace already has the following enabled:',
+            featureYouMayBeInterestedIn: 'Enable additional features you may be interested in:',
         },
         error: {
             requiredFirstName: 'Please input your first name to continue',
@@ -4788,23 +4818,25 @@ const translations = {
         },
         nudge: {
             airfareManual:
-                'Did you know you can book and manage flights right in Expensify? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Did you know you can book flights right in Expensify and still earn miles with your frequent flyer programs? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Did you know you can book and manage flights right in Expensify? And it automatically uploads receipts for you? Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Did you know you can book flights right in Expensify and still earn miles with your frequent flyer programs? It automatically uploads receipts for you, too. Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Did you know you can book and manage hotel stays right in Expensify? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
-            hotelCard: 'Did you know you can book and manage hotel stays right in Expensify? Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Did you know you can book hotel stays right in Expensify and still use your hotel loyalty programs? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+            hotelCard:
+                'Did you know you can book hotel stays right in Expensify and still use your hotel loyalty programs? Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelBlockManual:
                 'Did you know you can book and manage group trips like this right in Expensify? Save yourself the hassle next time and try out our <a href="https://help.expensify.com/travel/hubs/event-management/">Travel Events</a> tool.',
             hotelBlockCard:
                 'Did you know you can book and manage group trips like this right in Expensify? Save yourself the hassle next time and try out our <a href="https://help.expensify.com/travel/hubs/event-management/">Travel Events</a> tool.',
             carManual:
-                'Did you know you can book and manage car rentals right in Expensify? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
-            carCard: 'Did you know you can book and manage car rentals right in Expensify? Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Did you know you can book car rentals right in Expensify and still use your rental car loyalty programs? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+            carCard:
+                'Did you know you can book car rentals right in Expensify and still use your rental car loyalty programs? Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Did you know you can book and manage train rides right in Expensify? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Did you know you can book train rides right in Expensify and still use your rail loyalty programs and railcards? Next time avoid the hassle of creating your expense manually and simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Did you know you can book and manage train rides right in Expensify? And it automatically uploads receipts for you? Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Did you know you can book train rides right in Expensify and still use your rail loyalty programs and railcards? It automatically uploads receipts for you, too. Next time simply book via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
         },
         flightTo: 'Flight to',
         trainTo: 'Train to',
@@ -6298,6 +6330,35 @@ const translations = {
                 label: 'Company card account',
                 description: 'Choose where to export company card transactions.',
             },
+            exportToMultipleAccounts: 'Configure exporting to multiple accounts',
+            cardProgramAccount: {
+                label: 'Card program account',
+                description: 'Override the workspace account for these card programs.',
+                descriptionLevel2: 'Override the workspace account for this card program.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'All programs use default account';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} program with custom account`;
+                    }
+                    return `${customAccountsCount} programs with custom accounts`;
+                },
+            },
+            cardAccount: {
+                label: 'Per-card account',
+                description: 'Override the program account for individual cards.',
+                descriptionLevel2: 'Override the program account for these cards.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'All cards use program accounts';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} card with custom account`;
+                    }
+                    return `${customAccountsCount} cards with custom accounts`;
+                },
+            },
             noAccountsFound: 'No accounts found',
             noAccountsFoundDescription: 'Please add accounts in Campfire and sync the connection again',
             autoSyncDescription: 'Sync Campfire and Expensify automatically, every day. Reports sync in realtime.',
@@ -6348,6 +6409,51 @@ const translations = {
             importDescription: 'Choose which coding configurations to import from Dynamics 365 Business Central.',
             items: 'Items',
             enableNewCategories: 'Enable newly imported categories',
+            exportDescription: 'Configure how Expensify data exports to Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Transaction date',
+                description: 'Use this date when exporting reports to Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Date of last expense',
+                        description: 'Date of the most recent expense on the report.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Export date',
+                        description: 'Date the report was exported to Dynamics 365 Business Central.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Submitted date',
+                        description: 'Date the report was submitted for approval.',
+                    },
+                },
+            },
+            exportReimbursable: 'Export reimbursable expenses as',
+            exportNonReimbursable: 'Export company card expenses as',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'General journal',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Purchase invoices',
+            },
+            reimbursableAccount: {
+                label: 'Reimbursable account',
+                description: 'Choose where to export reimbursable expenses.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Default company card vendor',
+                description: "Choose a default Dynamics 365 Business Central vendor for expenses that don't match automatically.",
+            },
+            companyCardAccount: {
+                label: 'Company card account',
+                description: 'Choose where to export company card transactions.',
+            },
+            paymentMethod: {
+                label: 'Payment method',
+                description: 'Choose a payment method for purchase invoices so Dynamics 365 Business Central can reconcile them with your bank.',
+            },
+            noBankAccountsFound: 'No bank accounts found',
+            noBankAccountsFoundDescription: 'Please add bank accounts in Dynamics 365 Business Central and sync the connection again',
+            noPaymentMethodsFound: 'No payment methods found',
+            noPaymentMethodsFoundDescription: 'Please add payment methods in Dynamics 365 Business Central and sync the connection again',
         },
         type: {
             free: 'Free',
@@ -6526,6 +6632,8 @@ const translations = {
         expensifyCard: {
             issueAndManageCards: 'Issue and manage your Expensify Cards',
             getStartedIssuing: 'Get started by issuing your first virtual or physical card.',
+            noCardFeedsAvailable: 'No card feeds available',
+            noCardFeedsAvailableDescription: 'There are no card feeds available for this workspace.',
             verificationInProgress: 'Verification in progress...',
             verifyingTheDetails: "We're verifying a few details. Concierge will let you know when Expensify Cards are ready to issue.",
             disclaimer:
@@ -6631,6 +6739,7 @@ const translations = {
             deleteFailureMessage: 'An error occurred while deleting the category, please try again',
             categoryName: 'Category name',
             requiresCategory: 'Members must categorize all expenses',
+            autoCategorizeNewExpenses: 'Auto-categorize new expenses',
             showCategoryGLCodes: 'Show GL codes when categorizing expenses',
             needCategoryForExportToIntegration: (connectionName: string) => `All expenses must be categorized in order to export to ${connectionName}.`,
             subtitle: 'Get a better overview of where money is being spent. Use our default categories or add your own.',
@@ -6857,7 +6966,7 @@ const translations = {
                 corporate: 'Restrict deleting transactions',
                 personal: 'Allow deleting transactions',
                 setFeedNameDescription: 'Give the card feed a unique name so you can tell it apart from the others',
-                setTransactionLiabilityDescription: 'When enabled, cardholders can delete card transactions. New transactions will follow this rule.',
+                setTransactionLiabilityDescription: 'Cardholders can delete transactions. Applies to new transactions only.',
                 emptyAddedFeedTitle: 'No cards in this feed',
                 emptyAddedFeedDescription: "Make sure there are cards in your bank's card feed.",
                 pendingFeedTitle: `We're reviewing your request...`,
@@ -7280,6 +7389,15 @@ const translations = {
                 other: 'Remove members',
             }),
             findMember: 'Find member',
+            workArrangement: 'Work arrangement',
+            officeBased: 'Office-based',
+            noRegularWorkspace: 'Remote or mobile',
+            workArrangementPage: {
+                title: 'Work arrangement',
+                optionOfficeBasedHelp: 'Member commutes to an office. Ordinary commutes are excluded from reimbursement.',
+                optionNoRegularWorkspaceHelp: "Member works from home or travels between locations with no regular office, so commute rules don't apply.",
+                futureOnlyNote: 'Changes apply only to future mileage calculations. Existing mileage expenses are not recalculated.',
+            },
             removeWorkspaceMemberButtonTitle: 'Remove from workspace',
             removeGroupMemberButtonTitle: 'Remove from group',
             removeRoomMemberButtonTitle: 'Remove from chat',
@@ -7497,6 +7615,8 @@ const translations = {
             reconnect: 'Reconnect',
             enterCredentials: 'Enter your credentials',
             updateCredentials: 'Update credentials',
+            qboConnectionExpiring: ({date}: {date: string}) => `Your QuickBooks Online connection expires on ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Your QuickBooks Online connection expired on ${date}.`,
             claimOffer: {
                 badgeText: 'Offer available!',
                 xero: {
@@ -8618,6 +8738,7 @@ const translations = {
                 autoPayApprovedReportsSubtitle: 'Configure which expense reports are eligible for auto-pay.',
                 autoPayApprovedReportsLimitError: (currency?: string) => `Please enter an amount less than ${currency ?? ''}20,000`,
                 autoPayApprovedReportsLockedSubtitle: 'Go to more features and enable workflows, then add payments to unlock this feature.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) => `Auto-pay is only available on the Control plan. [Upgrade](${upgradeLink}) to unlock this feature.`,
                 autoPayReportsUnderTitle: 'Auto-pay reports under',
                 autoPayReportsUnderDescription: 'Fully compliant expense reports under this amount will be automatically paid.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Add ${featureName} to unlock this feature.`,
@@ -8818,6 +8939,7 @@ const translations = {
                 flagAmountsOver: 'Flag amounts over',
                 flagAmountsOverDescription: (categoryName: string) => `Applies to the category “${categoryName}”.`,
                 flagAmountsOverSubtitle: 'This overrides the max amount for all expenses.',
+                expenseLimitType: 'Expense limit type',
                 expenseLimitTypes: {
                     expense: 'Individual expense',
                     expenseSubtitle:
@@ -9498,6 +9620,10 @@ const translations = {
                 `changed fixed distance exclusion to ${formattedNewDistance} per claim (previously ${formattedOldDistance})`,
             disabled: 'disabled exclude commutes for distance rates',
         },
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `changed ${displayName}'s work arrangement to ${newArrangement} (previously ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `changed the default work arrangement to ${newArrangement} (previously ${oldArrangement})`,
         updatedReimbursementChoice: (newReimbursementChoice: string, oldReimbursementChoice: string) =>
             `changed reimbursement method to "${newReimbursementChoice}" (previously "${oldReimbursementChoice}")`,
 
@@ -9572,6 +9698,7 @@ const translations = {
         },
         updatedAttendeeTracking: ({enabled}: {enabled: boolean}) => `${enabled ? 'enabled' : 'disabled'} attendee tracking`,
         updatedRequireCompanyCards: ({enabled}: {enabled: boolean}) => `${enabled ? 'enabled' : 'disabled'} the company card purchases requirement`,
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'enabled' : 'disabled'} automatic categorization of new expenses`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'enabled' : 'disabled'} the expense categorization requirement`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'enabled' : 'disabled'} the expense tagging requirement`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `updated the currency conversion fee setting to "${preferenceLabel}"`,
@@ -10112,6 +10239,7 @@ const translations = {
         noCategory: 'No category',
         noMerchant: 'No merchant',
         noTag: 'No tag',
+        noVendor: 'No vendor',
         expenseType: 'Expense type',
         receiptType: 'Receipt type',
         receiptTypeValues: {
@@ -11219,6 +11347,21 @@ const translations = {
         paymentHistory: {
             title: 'View payment history',
             subtitle: 'Your complete monthly payment history charged to this account.',
+            payments: 'Payments',
+            inclTax: 'incl. tax',
+            empty: 'No payments yet.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 active user',
+                other: `${count} active users`,
+            }),
+            state: {
+                paid: 'Paid',
+                cleared: 'Cleared',
+                failed: 'Failed',
+                refunded: 'Refunded',
+                disputed: 'Disputed',
+                balanceTransfer: 'Balance transfer',
+            },
         },
         subscriptionSettings: {
             title: 'Subscription settings',
@@ -11279,6 +11422,8 @@ const translations = {
         removedRoomAvatar: 'removed the room avatar',
     },
     delegate: {
+        leaveAccount: 'Leave account',
+        leaveAccountConfirmationText: "You'll return to your own account. You won't be fully signed out.",
         switchAccount: 'Switch accounts:',
         switch: 'Switch',
         copilot: 'Copilot',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index f8b9b288a7d6..c5a2d9be8706 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -37,6 +37,7 @@ const translations: TranslationDeepObject<typeof en> = {
         cancel: 'Cancelar',
         unableToDisplayChart: 'No se puede mostrar el gráfico',
         webGLNotSupported: 'Tu navegador no es compatible con WebGL. Por favor, habilítalo o cambia de navegador.',
+        chartFailedToLoad: 'No se pudo cargar el gráfico. Actualiza la página e inténtalo de nuevo.',
         dismiss: 'Descartar',
         proceed: 'Proceder',
         unshare: 'Dejar de compartir',
@@ -401,8 +402,6 @@ const translations: TranslationDeepObject<typeof en> = {
         hourAbbreviation: 'h',
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
-        chatWithAccountManager: (accountManagerDisplayName) => `¿Necesitas algo específico? Habla con tu gerente de cuenta, ${accountManagerDisplayName}.`,
-        chatNow: 'Chatear ahora',
         workEmail: 'correo electrónico de trabajo',
         destination: 'Destino',
         subrate: 'Subtasa',
@@ -505,6 +504,7 @@ const translations: TranslationDeepObject<typeof en> = {
         goToConcierge: 'Ir a Concierge',
         allSet: '¡Todo listo!',
         enterDigitLabel: ({digitIndex, totalDigits}: {digitIndex: number; totalDigits: number}) => `introducir dígito ${digitIndex} de ${totalDigits}`,
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} de ${total}`,
         apiKey: 'Clave API',
         editor: 'Editor',
         restrictions: 'Restricciones',
@@ -1158,6 +1158,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: 'Ver en Gastos',
         emptyState: {title: 'Nada que mostrar', subtitle: 'Prueba a ajustar tus criterios de arriba'},
         noExpensesState: {title: 'Ve adónde va tu dinero', subtitle: 'Una vez que tengas gastos, encontrarás tendencias de gasto, principales comercios y mucho más.'},
+        compare: {label: 'Comparar', previousPeriod: 'Periodo anterior', average: 'Promedio'},
     },
     allSettingsScreen: {
         subscription: 'Suscripcion',
@@ -1335,6 +1336,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Antes de registrar distancias, tienes que añadir tu dirección de casa a tu perfil privado. Este espacio de trabajo utiliza esta dirección para las deducciones por desplazamientos al trabajo.',
             cta: 'Añadir dirección de domicilio',
         },
+        expenseAdded: 'Gasto añadido',
+        invoiceSent: 'Factura enviada',
         amount: 'Importe',
         percent: 'Porcentaje',
         date: 'Fecha',
@@ -1904,6 +1907,7 @@ const translations: TranslationDeepObject<typeof en> = {
             prompt: 'Habilita las etiquetas en el espacio de trabajo para editar los detalles del gasto o eliminar la etiqueta de este gasto.',
             confirmText: 'Eliminar etiqueta',
         },
+        undeletedExpense: 'restauró este gasto',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `se han actualizado las tarifas de kilometraje para el nuevo espacio de trabajo: ${policyName}`,
     },
     transactionMerge: {
@@ -2117,7 +2121,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Perfil avatar',
         customInstructions: 'Instrucciones personalizadas',
         copilotIntoAccount: 'Copilot a la cuenta',
-        viewMemberHistory: 'Ver historial del miembro',
+        seeChatHistory: 'Ver historial del chat',
         viewAgentHistory: 'Ver historial del agente',
         publicSection: {
             title: 'Público',
@@ -2248,7 +2252,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Resultados',
             releaseOptions: 'Opciones de publicación',
             testingPreferences: 'Preferencias para Tests',
-            useStagingServer: 'Usar servidor "staging"',
+            server: 'Servidor',
+            servers: {
+                production: {label: 'Producción', description: 'El entorno en vivo que ven los usuarios reales'},
+                staging: {label: 'Staging', description: 'Réplica de producción. Se usa para la validación final'},
+                qa: {label: 'QA', description: 'Entorno experimental usado para pruebas'},
+            },
+            serverPinnedDescription: 'Esta versión siempre se conecta a un solo servidor, por lo que no se puede cambiar aquí.',
             forceOffline: 'Forzar desconexión',
             simulatePoorConnection: 'Simular una conexión a internet deficiente',
             simulateFailingNetworkRequests: 'Simular fallos en solicitudes de red',
@@ -2472,7 +2482,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Autenticación de dos factores requerida',
         twoFactorAuthIsRequiredForAdminsTitle: 'Por favor, habilita la autenticación de dos factores',
         twoFactorAuthIsRequiredXero: 'Tu conexión de contabilidad con Xero requiere el uso de autenticación de dos factores. Por favor, habilítala para seguir usando Expensify.',
-        twoFactorAuthIsRequiredCompany: 'Tu empresa requiere el uso de autenticación de dos factores. Por favor, habilítala para seguir usando Expensify.',
+        twoFactorAuthIsRequiredCompany: 'Tu empresa requiere autenticación de dos factores (2FA).',
         twoFactorAuthCannotDisable: 'No se puede desactivar la autenticación de dos factores (2FA)',
         twoFactorAuthRequired: 'La autenticación de dos factores (2FA) es obligatoria para tu conexión a Xero y no se puede desactivar.',
         replaceDevice: 'Reemplazar dispositivo',
@@ -2484,6 +2494,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: 'Escanea el código QR con tu nuevo dispositivo y luego introduce el código para completar la configuración.',
         downloadCodes: 'Descargar códigos',
         copyCodes: 'Copiar códigos',
+        enable2FA: 'Habilitar',
     },
     recoveryCodeForm: {
         error: {
@@ -2915,6 +2926,9 @@ ${amount} para ${merchant} - ${date}`,
         memberAlreadyInWorkflowTitle: 'Miembro ya está en un flujo de trabajo',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} ya está en un flujo de trabajo de aprobación que envía a ${approverName}. Agregarlo aquí lo moverá a este flujo de trabajo.`,
+        moveEveryoneToThisWorkflowTitle: 'Mover a todos a este flujo de trabajo',
+        moveEveryoneToThisWorkflowPrompt:
+            'Estás a punto de mover a todo el mundo a este flujo de aprobación. Esto eliminará todos los demás flujos de aprobación y trasladará a todo el mundo a este. Esta acción no se puede deshacer.',
     },
     workflowsApproverPage: {
         genericErrorMessage: 'El aprobador no pudo ser cambiado. Por favor, inténtelo de nuevo o contacte al soporte.',
@@ -3049,6 +3063,8 @@ ${amount} para ${merchant} - ${date}`,
             updateAvatar: 'Hubo un problema al actualizar el avatar de este agente',
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} actualizó las instrucciones de este agente.\nInstrucciones anteriores:\n${previousPrompt}\nNuevas instrucciones:\n${newPrompt}`,
     newAgentPage: {
         title: 'Nuevo agente',
         buildCustomAgent: 'Crear agente personalizado',
@@ -3227,6 +3243,7 @@ ${amount} para ${merchant} - ${date}`,
         timeExpiredAnnouncement: 'El tiempo ha expirado',
         error: {
             pleaseFillSecurityCode: 'Por favor, introduce tu código de seguridad',
+            tooManyAttempts: 'Demasiados intentos. Por favor, inténtalo de nuevo más tarde.',
             incorrectSecurityCode: 'Código de seguridad incorrecto o no válido. Inténtalo de nuevo o solicita un código nuevo.',
             pleaseFillTwoFactorAuth: 'Por favor, introduce tu código de autenticación de dos factores.',
         },
@@ -3315,9 +3332,9 @@ ${amount} para ${merchant} - ${date}`,
             otherAccountingSoftware: 'Nombre del software',
         },
         interestedFeatures: {
-            title: '¿Qué funciones te interesan?',
-            featuresAlreadyEnabled: 'Aquí están nuestras funciones más populares:',
-            featureYouMayBeInterestedIn: 'Habilita funciones adicionales:',
+            title: 'Selecciona las funciones que quieras',
+            featuresAlreadyEnabled: 'Tu espacio de trabajo ya tiene habilitado lo siguiente:',
+            featureYouMayBeInterestedIn: 'Habilita funciones adicionales que podrían interesarte:',
         },
         error: {
             requiredFirstName: 'Introduce tu nombre para continuar',
@@ -4589,21 +4606,21 @@ ${amount} para ${merchant} - ${date}`,
         nightsIn: 'noches en',
         nudge: {
             airfareManual:
-                '¿Sabías que puedes reservar y gestionar vuelos directamente en Expensify? La próxima vez evita la molestia de crear tu gasto manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                '¿Sabías que puedes reservar vuelos directamente en Expensify y seguir acumulando millas con tus programas de viajero frecuente? La próxima vez evita la molestia de crear tu gasto manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                '¿Sabías que puedes reservar y gestionar vuelos directamente en Expensify? ¿Y que sube los recibos automáticamente por ti? La próxima vez, simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                '¿Sabías que puedes reservar vuelos directamente en Expensify y seguir acumulando millas con tus programas de viajero frecuente? También sube los recibos automáticamente por ti. La próxima vez simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                '¿Sabías que puedes reservar y gestionar estancias de hotel directamente en Expensify? La próxima vez evita la molestia de crear tu gasto manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                '¿Sabías que puedes reservar estancias de hotel directamente en Expensify y seguir usando tus programas de fidelidad de hotel? La próxima vez evita la molestia de crear tu gasto manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                '¿Sabías que puedes reservar y gestionar estancias en hoteles directamente en Expensify? La próxima vez simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                '¿Sabías que puedes reservar estancias de hotel directamente en Expensify y seguir usando tus programas de fidelidad de hotel? La próxima vez, simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                '¿Sabías que puedes reservar y gestionar alquileres de coche directamente en Expensify? La próxima vez evita la molestia de crear tus gastos manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                '¿Sabías que puedes reservar coches de alquiler directamente en Expensify y seguir usando tus programas de fidelidad de alquiler de coches? La próxima vez evita la molestia de crear tu gasto manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                '¿Sabías que puedes reservar y gestionar alquileres de coche directamente en Expensify? La próxima vez simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                '¿Sabías que puedes reservar coches de alquiler directamente en Expensify y seguir usando tus programas de fidelidad de alquiler de coches? La próxima vez simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                '¿Sabías que puedes reservar y gestionar viajes en tren directamente en Expensify? La próxima vez evita la molestia de crear tu gasto manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                '¿Sabías que puedes reservar viajes en tren directamente en Expensify y seguir usando tus programas de fidelidad y tus tarjetas ferroviarias? La próxima vez evita la molestia de crear tu gasto manualmente y simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                '¿Sabías que puedes reservar y gestionar viajes en tren directamente en Expensify? ¿Y que además sube los recibos automáticamente por ti? La próxima vez, simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                '¿Sabías que puedes reservar viajes en tren directamente en Expensify y seguir usando tus programas de fidelidad y tus tarjetas ferroviarias? Además, sube automáticamente los recibos por ti. La próxima vez simplemente reserva a través de <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 '¿Sabías que puedes reservar y gestionar viajes en grupo como este directamente en Expensify? Evita complicaciones la próxima vez y prueba nuestra herramienta de <a href="https://help.expensify.com/travel/hubs/event-management/">Eventos de viaje</a>.',
             hotelBlockCard:
@@ -6278,6 +6295,8 @@ ${amount} para ${merchant} - ${date}`,
             oneMoreStepDescription: 'Parece que tenemos que verificar manualmente tu cuenta bancaria. Dirígete a Concierge, donde te esperan las instrucciones.',
             gotIt: 'Entendido',
             goToConcierge: 'Ir a Concierge',
+            noCardFeedsAvailable: 'No hay feeds de tarjetas disponibles',
+            noCardFeedsAvailableDescription: 'No hay feeds de tarjetas disponibles para este espacio de trabajo.',
         },
         categories: {
             deleteCategories: 'Eliminar categorías',
@@ -6293,6 +6312,7 @@ ${amount} para ${merchant} - ${date}`,
             deleteFailureMessage: 'Se ha producido un error al intentar eliminar la categoría. Por favor, inténtalo más tarde.',
             categoryName: 'Nombre de la categoría',
             requiresCategory: 'Los miembros deben clasificar todos los gastos',
+            autoCategorizeNewExpenses: 'Categorizar automáticamente los gastos nuevos',
             showCategoryGLCodes: 'Mostrar códigos GL al categorizar gastos',
             needCategoryForExportToIntegration: (connectionName) => `Todos los gastos deben estar categorizados para poder exportar a ${connectionName}.`,
             subtitle: 'Obtén una visión general de dónde te gastas el dinero. Utiliza las categorías predeterminadas o añade las tuyas propias.',
@@ -6521,8 +6541,7 @@ ${amount} para ${merchant} - ${date}`,
                 corporate: 'Restringir eliminación de transacciones',
                 personal: 'Permitir eliminación de transacciones',
                 setFeedNameDescription: 'Dale al feed de tarjeta un nombre único para que puedas distinguirlo de los demás',
-                setTransactionLiabilityDescription:
-                    'Cuando está habilitada, los titulares de tarjetas pueden eliminar transacciones con tarjeta. Las transacciones nuevas seguirán esta regla.',
+                setTransactionLiabilityDescription: 'Los titulares de la tarjeta pueden eliminar transacciones. Se aplica solo a transacciones nuevas.',
                 emptyAddedFeedTitle: 'Asignar tarjetas de empresa',
                 emptyAddedFeedDescription: 'Comienza asignando tu primera tarjeta a un miembro.',
                 pendingFeedTitle: `Estamos revisando tu solicitud...`,
@@ -7004,6 +7023,16 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             peopleAdmins: 'Administradores de personas',
             paymentsAdmins: 'Administradores de pagos',
             members: 'Miembros',
+            workArrangement: 'Modalidad de trabajo',
+            officeBased: 'En oficina',
+            noRegularWorkspace: 'Remoto o móvil',
+            workArrangementPage: {
+                title: 'Modalidad de trabajo',
+                optionOfficeBasedHelp: 'La persona se desplaza habitualmente a una oficina. Los desplazamientos ordinarios quedan excluidos del reembolso.',
+                optionNoRegularWorkspaceHelp:
+                    'La persona miembro trabaja desde casa o viaja entre ubicaciones sin una oficina fija, por lo que no se aplican las normas sobre desplazamientos.',
+                futureOnlyNote: 'Los cambios se aplican solo a los cálculos de kilometraje futuros. Los gastos de kilometraje existentes no se recalculan.',
+            },
         },
         accounting: {
             settings: 'configuración',
@@ -7326,6 +7355,8 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Para desbloquear, habilita la sincronización automática.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `Tu conexión con QuickBooks Online caduca el ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Tu conexión con QuickBooks Online caducó el ${date}.`,
         },
         card: {
             issueCard: 'Emitir tarjeta',
@@ -8220,6 +8251,8 @@ ${reportName}`,
                 autoPayApprovedReportsSubtitle: 'Configura qué informes de gastos pueden pagarse de forma automática.',
                 autoPayApprovedReportsLimitError: (currency) => `Por favor, introduce un importe menor a ${currency ?? ''}20,000`,
                 autoPayApprovedReportsLockedSubtitle: 'Ve a más funciones y habilita flujos de trabajo, luego agrega pagos para desbloquear esta función.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink) =>
+                    `El pago automático solo está disponible en el plan Controlar. [Mejora el plan](${upgradeLink}) para desbloquear esta función.`,
                 autoPayReportsUnderTitle: 'Pagar automáticamente informes por debajo de',
                 autoPayReportsUnderDescription: 'Los informes de gastos totalmente conformes por debajo de este importe se pagarán automáticamente.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName) => `Añade ${featureName} para desbloquear esta función.`,
@@ -8311,6 +8344,7 @@ ${reportName}`,
                 flagAmountsOver: 'Señala importes superiores a',
                 flagAmountsOverDescription: (categoryName) => `Aplica a la categoría “${categoryName}”.`,
                 flagAmountsOverSubtitle: 'Esto anula el importe máximo para todos los gastos.',
+                expenseLimitType: 'Tipo de límite de gasto',
                 expenseLimitTypes: {
                     expense: 'Gasto individual',
                     expenseSubtitle:
@@ -8714,6 +8748,35 @@ ${reportName}`,
             syncTravelInvoicingSettlements: 'Sincroniza las liquidaciones de facturación de viajes',
             travelInvoicingSettlementAccount: {label: 'Cuenta de liquidación de facturación de viajes', description: 'Elige tu cuenta de liquidación y crearemos el pago en Campfire.'},
             travelInvoicingPayableAccount: {label: 'Cuenta a pagar de facturación de viajes'},
+            exportToMultipleAccounts: 'Configura la exportación a varias cuentas',
+            cardProgramAccount: {
+                label: 'Cuenta del programa de tarjetas',
+                description: 'Sobrescribe la cuenta del espacio de trabajo para estos programas de tarjetas.',
+                descriptionLevel2: 'Anular la cuenta del espacio de trabajo para este programa de tarjetas.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Todos los programas usan la cuenta predeterminada';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} programa con cuenta personalizada`;
+                    }
+                    return `${customAccountsCount} programas con cuentas personalizadas`;
+                },
+            },
+            cardAccount: {
+                label: 'Cuenta por tarjeta',
+                description: 'Anula la cuenta del programa para tarjetas individuales.',
+                descriptionLevel2: 'Sobrescribe la cuenta del programa para estas tarjetas.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Todas las tarjetas usan cuentas del programa';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} tarjeta con cuenta personalizada`;
+                    }
+                    return `${customAccountsCount} tarjetas con cuentas personalizadas`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Configuración de Dynamics 365 Business Central',
@@ -8730,6 +8793,51 @@ ${reportName}`,
             importDescription: 'Elige qué configuraciones de codificación quieres importar desde Dynamics 365 Business Central.',
             items: 'Artículos',
             enableNewCategories: 'Activar categorías recién importadas',
+            exportDescription: 'Configura cómo se exportan los datos de Expensify a Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Fecha de la transacción',
+                description: 'Usa esta fecha al exportar informes a Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Fecha del último gasto',
+                        description: 'Fecha del gasto más reciente del informe.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Fecha de exportación',
+                        description: 'Fecha en que se exportó el informe a Dynamics 365 Business Central.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Fecha de envío',
+                        description: 'Fecha en que se envió el informe para su aprobación.',
+                    },
+                },
+            },
+            exportReimbursable: 'Exportar gastos reembolsables como',
+            exportNonReimbursable: 'Exportar gastos de tarjetas de empresa como',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Diario general',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Facturas de compra',
+            },
+            reimbursableAccount: {
+                label: 'Cuenta de gastos reembolsables',
+                description: 'Elige a dónde exportar los gastos reembolsables.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Proveedor predeterminado de la tarjeta de empresa',
+                description: 'Elige un proveedor predeterminado de Dynamics 365 Business Central para los gastos que no se asignen automáticamente.',
+            },
+            companyCardAccount: {
+                label: 'Cuenta de tarjeta de empresa',
+                description: 'Elige a dónde exportar las transacciones de tarjetas de empresa.',
+            },
+            paymentMethod: {
+                label: 'Forma de pago',
+                description: 'Elige una forma de pago para las facturas de compra para que Dynamics 365 Business Central pueda conciliarlas con tu banco.',
+            },
+            noBankAccountsFound: 'No se encontraron cuentas bancarias',
+            noBankAccountsFoundDescription: 'Añade cuentas bancarias en Dynamics 365 Business Central y vuelve a sincronizar la conexión',
+            noPaymentMethodsFound: 'No se encontraron formas de pago',
+            noPaymentMethodsFoundDescription: 'Añade formas de pago en Dynamics 365 Business Central y vuelve a sincronizar la conexión',
         },
     },
     getAssistancePage: {
@@ -9383,6 +9491,7 @@ ${reportName}`,
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `copió la configuración de facturas de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `copió la configuración de viaje de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'habilitado' : 'deshabilitado'} la categorización automática de gastos nuevos`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'habilitado' : 'deshabilitado'} el requisito de categorización de gastos`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'habilitado' : 'deshabilitado'} el requisito de etiquetado de gastos`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `actualizó el ajuste de la comisión por conversión de moneda a «${preferenceLabel}»`,
@@ -9419,6 +9528,10 @@ ${reportName}`,
                 : `cambió el flujo de aprobación para ${member} para dejar de reenviar informes por encima de ${previousLimit}`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `cambió el flujo de aprobación para ${member} para reenviar los informes superiores a ${limit} (previamente ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `cambió el acuerdo de trabajo de ${displayName} a ${newArrangement} (previamente ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `cambió la modalidad de trabajo predeterminada a ${newArrangement} (previamente ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Miembro no encontrado.',
@@ -9736,6 +9849,7 @@ ${reportName}`,
         noCategory: 'Sin categoría',
         noMerchant: 'Sin comerciante',
         noTag: 'Sin etiqueta',
+        noVendor: 'Sin proveedor',
         expenseType: 'Tipo de gasto',
         receiptType: 'Tipo de recibo',
         receiptTypeValues: {
@@ -11207,7 +11321,18 @@ ${reportName}`,
                 invalid: 'Este código no es válido',
             },
         },
-        paymentHistory: {title: 'Ver historial de pagos', subtitle: 'Tu historial completo de pagos mensuales cargados a esta cuenta.'},
+        paymentHistory: {
+            title: 'Ver historial de pagos',
+            subtitle: 'Tu historial completo de pagos mensuales cargados a esta cuenta.',
+            payments: 'Pagos',
+            inclTax: 'incl. impuestos',
+            empty: 'Aún no hay pagos.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 usuario activo',
+                other: `${count} usuarios activos`,
+            }),
+            state: {paid: 'Pagado', cleared: 'Borrado', failed: 'Error', refunded: 'Reembolsado', disputed: 'En disputa', balanceTransfer: 'Transferencia de saldo'},
+        },
         subscriptionSettings: {
             title: 'Configuración de suscripción',
             summary: (subscriptionType, subscriptionSize, expensifyCode, autoRenew, autoIncrease) =>
@@ -11317,6 +11442,8 @@ ${reportName}`,
         notAllowedMessage: (accountOwnerEmail) =>
             `Como <a href="${CONST.DELEGATE_ROLE_HELP_DOT_ARTICLE_LINK}">copiloto</a> de ${accountOwnerEmail}, no tienes permiso para realizar esta acción. ¡Lo siento!`,
         copilotAccess: 'Acceso a Copilot',
+        leaveAccount: 'Abandonar cuenta',
+        leaveAccountConfirmationText: 'Volverás a tu propia cuenta. No cerrarás sesión por completo.',
     },
     debug: {
         debug: 'Depuración',
@@ -11853,5 +11980,12 @@ ${reportName}`,
             description: `<muted-text>Crea agentes personalizados para revisar, aprobar y asignar gastos según las reglas que configures. <a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">Más información</a>.</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Renueva tu suscripción por un período de 12 meses, desde ${startDate} hasta ${endDate}.`,
+        title: 'Renueva tu suscripción de Expensify',
+        subtitle: 'Una cosa menos que hacer antes del nuevo año.',
+        confirmTitle: 'Confirmar renovación',
+        renew: 'Renovar',
+    },
 };
 export default translations;
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 25aa1b34cabc..ef0e1e78c77e 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -412,9 +412,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'Ignorer',
-        chatWithAccountManager: (accountManagerDisplayName: string) =>
-            `Vous avez besoin de quelque chose en particulier ? Discutez avec votre gestionnaire de compte, ${accountManagerDisplayName}.`,
-        chatNow: 'Discuter maintenant',
         workEmail: 'E-mail professionnel',
         destination: 'Destination',
         subrate: 'Sous-taux',
@@ -516,6 +513,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: 'Année précédente',
         nextYear: 'L’an prochain',
         avatar: 'Avatar',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} sur ${total}`,
         editor: 'Éditeur',
         restrictions: 'Restrictions',
         tryAgain: 'Réessayer',
@@ -525,6 +523,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: 'Aucun résultat. Veuillez essayer de modifier vos filtres ou votre requête de recherche',
         unableToDisplayChart: 'Impossible d’afficher le graphique',
         webGLNotSupported: 'Votre navigateur ne prend pas en charge WebGL. Veuillez l’activer ou changer de navigateur.',
+        chartFailedToLoad: 'Le graphique n’a pas pu être chargé. Veuillez actualiser la page et réessayer.',
         apiKey: 'Clé API',
         exportsTo: 'Exports vers',
     },
@@ -1168,6 +1167,7 @@ const translations: TranslationDeepObject<typeof en> = {
             title: 'Voyez où va votre argent',
             subtitle: 'Une fois que vous aurez des dépenses, vous verrez des tendances de dépenses, les principaux marchands et plus encore.',
         },
+        compare: {label: 'Comparer', previousPeriod: 'Période précédente', average: 'Moyenne'},
     },
     allSettingsScreen: {
         subscription: 'Abonnement',
@@ -1347,6 +1347,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Avant de suivre une distance, vous devez ajouter votre adresse personnelle à votre profil privé. Cet espace de travail utilise cette adresse pour les déductions liées aux trajets domicile-travail.',
             cta: 'Ajouter une adresse domicile',
         },
+        expenseAdded: 'Dépense ajoutée',
+        invoiceSent: 'Facture envoyée',
         amount: 'Montant',
         percent: 'Pourcentage',
         date: 'Date',
@@ -1926,6 +1928,7 @@ const translations: TranslationDeepObject<typeof en> = {
             prompt: 'Active les tags dans l’espace de travail pour modifier les détails de la dépense ou supprimer le tag de cette dépense.',
             confirmText: 'Supprimer le tag',
         },
+        undeletedExpense: 'a restauré cette dépense',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `les taux kilométriques ont été mis à jour pour le nouvel espace de travail - ${policyName}`,
     },
     transactionMerge: {
@@ -2207,7 +2210,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Avatar de profil',
         customInstructions: 'Instructions personnalisées',
         copilotIntoAccount: 'Copilot dans le compte',
-        viewMemberHistory: 'Voir l’historique du membre',
+        seeChatHistory: 'Voir l’historique de discussion',
         viewAgentHistory: 'Voir l’historique de l’agent',
         publicSection: {
             title: 'Public',
@@ -2338,7 +2341,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Résultats',
             releaseOptions: 'Options de version',
             testingPreferences: 'Préférences de test',
-            useStagingServer: 'Utiliser le serveur de préproduction',
+            server: 'Serveur',
+            servers: {
+                production: {label: 'Production', description: "L'environnement en direct que voient les vrais utilisateurs"},
+                staging: {label: 'Préproduction', description: 'Copie de la production. Utilisée pour la validation finale'},
+                qa: {label: 'QA', description: 'Environnement expérimental utilisé pour les tests'},
+            },
+            serverPinnedDescription: 'Cette version communique toujours avec un seul serveur, il est donc impossible de le changer ici.',
             forceOffline: 'Forcer le mode hors ligne',
             simulatePoorConnection: 'Simuler une mauvaise connexion Internet',
             simulateFailingNetworkRequests: 'Simuler l’échec des requêtes réseau',
@@ -2563,7 +2572,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Authentification à deux facteurs requise',
         twoFactorAuthIsRequiredForAdminsTitle: 'Veuillez activer l’authentification à deux facteurs',
         twoFactorAuthIsRequiredXero: 'Votre connexion comptable Xero nécessite une authentification à deux facteurs.',
-        twoFactorAuthIsRequiredCompany: 'Votre entreprise exige l’authentification à deux facteurs.',
+        twoFactorAuthIsRequiredCompany: 'Votre entreprise exige l’authentification à deux facteurs (2FA).',
         twoFactorAuthCannotDisable: 'Impossible de désactiver la 2FA',
         twoFactorAuthRequired: 'L’authentification à deux facteurs (2FA) est requise pour votre connexion Xero et ne peut pas être désactivée.',
         replaceDevice: 'Remplacer l’appareil',
@@ -2575,6 +2584,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: 'Scannez le code QR avec votre nouvel appareil, puis saisissez le code pour terminer la configuration.',
         downloadCodes: 'Télécharger les codes',
         copyCodes: 'Copier les codes',
+        enable2FA: 'Activer',
     },
     recoveryCodeForm: {
         error: {
@@ -3020,6 +3030,9 @@ ${amount} pour ${merchant} - ${date}`,
         memberAlreadyInWorkflowTitle: 'Membre déjà dans un workflow',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} fait déjà partie d’un workflow d’approbation qui soumet à ${approverName}. L’ajouter ici le déplacera vers ce workflow.`,
+        moveEveryoneToThisWorkflowTitle: 'Déplacer tout le monde vers ce workflow',
+        moveEveryoneToThisWorkflowPrompt:
+            'Vous êtes sur le point de déplacer tout le monde vers ce workflow d’approbation. Cela supprimera tous les autres workflows d’approbation et déplacera tout le monde vers celui-ci. Cette action est irréversible.',
         header: 'Quand les membres suivants soumettent des dépenses :',
     },
     workflowsApproverPage: {
@@ -3156,6 +3169,8 @@ ${amount} pour ${merchant} - ${date}`,
             updateAvatar: "Un problème est survenu lors de la mise à jour de l'avatar de cet agent",
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} a mis à jour les instructions de cet agent.\nInstructions précédentes :\n${previousPrompt}\nNouvelles instructions :\n${newPrompt}`,
     newAgentPage: {
         title: 'Nouvel agent',
         buildCustomAgent: 'Créer un agent personnalisé',
@@ -3333,6 +3348,7 @@ ${amount} pour ${merchant} - ${date}`,
         timeExpiredAnnouncement: 'Le temps est écoulé',
         error: {
             pleaseFillSecurityCode: 'Veuillez saisir votre code de sécurité',
+            tooManyAttempts: 'Trop de tentatives. Veuillez réessayer plus tard.',
             incorrectSecurityCode: 'Code de sécurité incorrect ou non valide. Veuillez réessayer ou demander un nouveau code.',
             pleaseFillTwoFactorAuth: 'Veuillez saisir votre code d’authentification à deux facteurs',
         },
@@ -3422,9 +3438,9 @@ ${amount} pour ${merchant} - ${date}`,
             otherAccountingSoftware: 'Nom du logiciel',
         },
         interestedFeatures: {
-            title: 'Quelles fonctionnalités vous intéressent ?',
-            featuresAlreadyEnabled: 'Voici nos fonctionnalités les plus populaires :',
-            featureYouMayBeInterestedIn: 'Activer des fonctionnalités supplémentaires :',
+            title: 'Sélectionnez les fonctionnalités souhaitées',
+            featuresAlreadyEnabled: 'Votre espace de travail a déjà les éléments suivants activés :',
+            featureYouMayBeInterestedIn: 'Activez des fonctionnalités supplémentaires qui pourraient vous intéresser :',
         },
         error: {
             requiredFirstName: 'Veuillez saisir votre prénom pour continuer',
@@ -4692,21 +4708,21 @@ ${amount} pour ${merchant} - ${date}`,
         },
         nudge: {
             airfareManual:
-                'Saviez-vous que vous pouvez réserver et gérer vos vols directement dans Expensify ? La prochaine fois, évitez la corvée de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Saviez-vous que vous pouvez réserver vos vols directement dans Expensify tout en continuant à cumuler des miles avec vos programmes de fidélité ? La prochaine fois, évitez la corvée de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Saviez-vous que vous pouvez réserver et gérer vos vols directement dans Expensify ? Et que les reçus sont automatiquement téléchargés pour vous ? La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Saviez-vous que vous pouvez réserver des vols directement dans Expensify tout en continuant à accumuler des miles avec vos programmes de fidélité ? L’application télécharge également automatiquement les reçus pour vous. La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Saviez-vous que vous pouvez réserver et gérer vos séjours à l’hôtel directement dans Expensify&nbsp;? La prochaine fois, évitez les tracas de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Saviez-vous que vous pouvez réserver des séjours à l’hôtel directement dans Expensify tout en continuant à utiliser vos programmes de fidélité hôteliers ? La prochaine fois, évitez la corvée de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                'Saviez-vous que vous pouvez réserver et gérer vos séjours à l’hôtel directement dans Expensify ? La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Saviez-vous que vous pouvez réserver vos séjours à l’hôtel directement dans Expensify tout en continuant à utiliser vos programmes de fidélité hôteliers ? La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                'Saviez-vous que vous pouvez réserver et gérer vos locations de voiture directement dans Expensify ? La prochaine fois, évitez la corvée de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Saviez-vous que vous pouvez réserver des locations de voiture directement dans Expensify tout en continuant à utiliser vos programmes de fidélité de location de voiture ? La prochaine fois, évitez la corvée de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                'Saviez-vous que vous pouvez réserver et gérer vos locations de voiture directement dans Expensify&nbsp;? La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Saviez-vous que vous pouvez réserver des voitures de location directement dans Expensify tout en utilisant vos programmes de fidélité de location de voiture ? La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Saviez-vous que vous pouvez réserver et gérer vos trajets en train directement dans Expensify ? La prochaine fois, évitez la corvée de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Saviez-vous que vous pouvez réserver des trajets en train directement dans Expensify tout en continuant à utiliser vos programmes de fidélité ferroviaires et vos cartes de réduction ? La prochaine fois, évitez les tracas de créer votre dépense manuellement et réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Saviez-vous que vous pouvez réserver et gérer vos trajets en train directement dans Expensify ? Et que les reçus sont automatiquement téléchargés pour vous ? La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Saviez-vous que vous pouvez réserver vos trajets en train directement dans Expensify tout en utilisant vos programmes de fidélité et vos cartes de réduction ferroviaires ? Les reçus sont également téléchargés automatiquement pour vous. La prochaine fois, réservez simplement via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 'Saviez-vous que vous pouvez réserver et gérer des voyages de groupe comme celui-ci directement dans Expensify ? Évitez-vous des ennuis la prochaine fois et essayez notre outil <a href="https://help.expensify.com/travel/hubs/event-management/">Événements de voyage</a>.',
             hotelBlockCard:
@@ -6422,6 +6438,8 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
             csvColumnType: 'Type',
             csvColumnLimitType: 'Type de limite',
             csvColumnLimit: 'Limite',
+            noCardFeedsAvailable: 'Aucun flux de carte disponible',
+            noCardFeedsAvailableDescription: 'Aucun flux de carte n’est disponible pour cet espace de travail.',
         },
         categories: {
             deleteCategories: 'Supprimer des catégories',
@@ -6437,6 +6455,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
             deleteFailureMessage: "Une erreur s'est produite lors de la suppression de la catégorie, veuillez réessayer",
             categoryName: 'Nom de la catégorie',
             requiresCategory: 'Les membres doivent catégoriser toutes les dépenses',
+            autoCategorizeNewExpenses: 'Catégoriser automatiquement les nouvelles dépenses',
             showCategoryGLCodes: 'Afficher les codes de grand livre lors de la catégorisation des dépenses',
             needCategoryForExportToIntegration: (connectionName: string) => `Toutes les dépenses doivent être catégorisées afin de pouvoir être exportées vers ${connectionName}.`,
             subtitle: 'Obtenez une meilleure vue d’ensemble de l’endroit où l’argent est dépensé. Utilisez nos catégories par défaut ou ajoutez les vôtres.',
@@ -6668,8 +6687,7 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
                 corporate: 'Restreindre la suppression des transactions',
                 personal: 'Autoriser la suppression des transactions',
                 setFeedNameDescription: 'Donnez au flux de cartes un nom unique afin de pouvoir le distinguer des autres',
-                setTransactionLiabilityDescription:
-                    'Lorsque cette option est activée, les titulaires de carte peuvent supprimer les transactions de carte. Les nouvelles transactions suivront cette règle.',
+                setTransactionLiabilityDescription: 'Les titulaires de carte peuvent supprimer des transactions. S’applique uniquement aux nouvelles transactions.',
                 emptyAddedFeedTitle: 'Aucune carte dans ce flux',
                 emptyAddedFeedDescription: 'Assurez-vous qu’il y a des cartes dans le flux de cartes de votre banque.',
                 pendingFeedTitle: `Nous examinons votre demande...`,
@@ -7153,6 +7171,16 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             peopleAdmins: 'Administrateurs des personnes',
             paymentsAdmins: 'Administrateurs des paiements',
             members: 'Membres',
+            workArrangement: 'Modalités de travail',
+            officeBased: 'Basé au bureau',
+            noRegularWorkspace: 'À distance ou mobile',
+            workArrangementPage: {
+                title: 'Modalités de travail',
+                optionOfficeBasedHelp: 'Le membre se rend au bureau. Les trajets domicile-travail ordinaires sont exclus du remboursement.',
+                optionNoRegularWorkspaceHelp:
+                    'Le membre travaille à domicile ou se déplace entre plusieurs sites sans bureau fixe, donc les règles relatives aux trajets domicile-travail ne s’appliquent pas.',
+                futureOnlyNote: 'Les modifications s’appliquent uniquement aux calculs de kilométrage futurs. Les dépenses de kilométrage existantes ne sont pas recalculées.',
+            },
         },
         card: {
             getStartedIssuing: 'Commencez par émettre votre première carte virtuelle ou physique.',
@@ -7540,6 +7568,8 @@ Le forfait Control commence à 9 $ par Membre actif et par mois.`,
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Pour le déverrouiller, activez la synchronisation automatique.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `Votre connexion QuickBooks Online expire le ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Votre connexion à QuickBooks Online a expiré le ${date}.`,
         },
         export: {
             notReadyHeading: 'Pas prêt à être exporté',
@@ -8213,6 +8243,8 @@ Rendez obligatoires des informations de dépense comme les reçus et les descrip
                 autoPayApprovedReportsSubtitle: 'Configurez quelles notes de frais sont éligibles au paiement automatique.',
                 autoPayApprovedReportsLimitError: (currency?: string) => `Veuillez saisir un montant inférieur à ${currency ?? ''}20 000`,
                 autoPayApprovedReportsLockedSubtitle: 'Accédez à Plus de fonctionnalités et activez les flux de travail, puis ajoutez les paiements pour déverrouiller cette fonctionnalité.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `Le paiement automatique n’est disponible qu’avec l’offre Control. [Mettez à niveau](${upgradeLink}) pour déverrouiller cette fonctionnalité.`,
                 autoPayReportsUnderTitle: 'Notes de frais payées automatiquement sous',
                 autoPayReportsUnderDescription: 'Les notes de frais entièrement conformes en dessous de ce montant seront payées automatiquement.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Ajoutez ${featureName} pour déverrouiller cette fonctionnalité.`,
@@ -8305,6 +8337,7 @@ Rendez obligatoires des informations de dépense comme les reçus et les descrip
                 flagAmountsOver: 'Signaler les montants supérieurs à',
                 flagAmountsOverDescription: (categoryName: string) => `S’applique à la catégorie « ${categoryName} ».`,
                 flagAmountsOverSubtitle: 'Cela remplace le montant maximal pour toutes les dépenses.',
+                expenseLimitType: 'Type de limite de dépense',
                 expenseLimitTypes: {
                     expense: 'Dépense individuelle',
                     expenseSubtitle:
@@ -8910,6 +8943,35 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 description: 'Choisissez votre compte de règlement et nous créerons le paiement dans Campfire.',
             },
             travelInvoicingPayableAccount: {label: 'Compte fournisseur pour la facturation de voyage'},
+            exportToMultipleAccounts: 'Configurer l’exportation vers plusieurs comptes',
+            cardProgramAccount: {
+                label: 'Compte du programme de carte',
+                description: 'Remplacer le compte de l’espace de travail pour ces programmes de cartes.',
+                descriptionLevel2: 'Remplacer le compte de l’espace de travail pour ce programme de carte.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Tous les programmes utilisent le compte par défaut';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} programme avec compte personnalisé`;
+                    }
+                    return `${customAccountsCount} programmes avec comptes personnalisés`;
+                },
+            },
+            cardAccount: {
+                label: 'Compte par carte',
+                description: 'Remplacez le compte de programme pour des cartes individuelles.',
+                descriptionLevel2: 'Remplacer le compte de programme pour ces cartes.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Toutes les cartes utilisent des comptes de programme';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} carte avec un compte personnalisé`;
+                    }
+                    return `${customAccountsCount} cartes avec comptes personnalisés`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Configuration de Dynamics 365 Business Central',
@@ -8926,6 +8988,51 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
             importDescription: 'Choisissez quelles configurations de codage importer depuis Dynamics 365 Business Central.',
             items: 'Articles',
             enableNewCategories: 'Activer les nouvelles catégories importées',
+            exportDescription: 'Configurez comment les données Expensify sont exportées vers Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Date de transaction',
+                description: 'Utiliser cette date lors de l’exportation des notes de frais vers Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Date de la dernière dépense',
+                        description: 'Date de la dépense la plus récente figurant dans le rapport.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: "Date d'exportation",
+                        description: "Date d'exportation du rapport vers Dynamics 365 Business Central.",
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Date de soumission',
+                        description: 'Date de soumission du rapport pour approbation.',
+                    },
+                },
+            },
+            exportReimbursable: 'Exporter les dépenses remboursables en tant que',
+            exportNonReimbursable: 'Exporter les dépenses de carte d’entreprise en tant que',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Journal général',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Factures d’achat',
+            },
+            reimbursableAccount: {
+                label: 'Compte des dépenses remboursables',
+                description: 'Choisissez où exporter les dépenses remboursables.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Fournisseur de carte entreprise par défaut',
+                description: 'Choisissez un fournisseur Dynamics 365 Business Central par défaut pour les dépenses qui ne correspondent pas automatiquement.',
+            },
+            companyCardAccount: {
+                label: 'Compte de carte d’entreprise',
+                description: 'Choisissez où exporter les transactions de carte d’entreprise.',
+            },
+            paymentMethod: {
+                label: 'Mode de règlement',
+                description: 'Choisissez un mode de règlement pour les factures d’achat afin que Dynamics 365 Business Central puisse les rapprocher de votre banque.',
+            },
+            noBankAccountsFound: 'Aucun compte bancaire trouvé',
+            noBankAccountsFoundDescription: 'Veuillez ajouter des comptes bancaires dans Dynamics 365 Business Central et synchroniser à nouveau la connexion',
+            noPaymentMethodsFound: 'Aucun mode de règlement trouvé',
+            noPaymentMethodsFoundDescription: 'Veuillez ajouter des modes de règlement dans Dynamics 365 Business Central et synchroniser à nouveau la connexion',
         },
     },
     getAssistancePage: {
@@ -9582,6 +9689,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `paramètres de facturation copiés depuis <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `paramètres de déplacement copiés depuis <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'activé' : 'Désactivé'} la catégorisation automatique des nouvelles dépenses`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'activé' : 'Désactivé'} l’exigence de catégorisation des dépenses`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'activé' : 'Désactivé'} l’exigence de tag des dépenses`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `mis à jour le paramètre de frais de conversion de devise sur « ${preferenceLabel} »`,
@@ -9618,6 +9726,10 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 : `a modifié le flux d'approbation pour ${member} afin d'arrêter de transférer les notes de frais au-delà de ${previousLimit}`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `a modifié le circuit d’approbation pour ${member} afin de transférer les notes de frais supérieures à ${limit} (auparavant ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `a modifié l’organisation du travail de ${displayName} en ${newArrangement} (auparavant ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `a modifié le mode de travail par défaut en ${newArrangement} (auparavant ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Membre introuvable.',
@@ -9922,6 +10034,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
         noCategory: 'Aucune catégorie',
         noMerchant: 'Aucun commerçant',
         noTag: 'Aucun tag',
+        noVendor: 'Aucun fournisseur',
         expenseType: 'Type de dépense',
         receiptType: 'Type de reçu',
         receiptTypeValues: {
@@ -11039,7 +11152,18 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 invalid: "Ce code n'est pas valide",
             },
         },
-        paymentHistory: {title: 'Afficher l’historique des paiements', subtitle: 'Votre historique complet des paiements mensuels facturés sur ce compte.'},
+        paymentHistory: {
+            title: 'Afficher l’historique des paiements',
+            subtitle: 'Votre historique complet des paiements mensuels facturés sur ce compte.',
+            payments: 'Paiements',
+            inclTax: 'incl. taxes',
+            empty: 'Aucun paiement pour l’instant.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 utilisateur actif',
+                other: `${count} utilisateurs actifs`,
+            }),
+            state: {paid: 'Payé', cleared: 'Compensé', failed: 'Échec', refunded: 'Remboursé', disputed: 'Contesté', balanceTransfer: 'Virement de solde'},
+        },
         subscriptionSettings: {
             title: 'Paramètres d’abonnement',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -11152,6 +11276,8 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
             `Êtes-vous sûr de vouloir supprimer votre accès copilote au compte Expensify de ${delegatorName} ? Cette action est irréversible.`,
         removeCopilotAccessConfirm: "Supprimer l'accès",
         copilotAccess: 'Accès Copilot',
+        leaveAccount: 'Quitter le compte',
+        leaveAccountConfirmationText: 'Vous reviendrez à votre propre compte. Vous ne serez pas complètement déconnecté.',
     },
     debug: {
         debug: 'Déboguer',
@@ -11613,5 +11739,12 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
             description: `<muted-text>Créez des agents personnalisés pour examiner, approuver et acheminer les dépenses selon les règles que vous définissez. <a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">En savoir plus</a>.</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Renouvelez votre abonnement pour une durée de 12 mois, du ${startDate} au ${endDate}.`,
+        title: 'Renouvelez votre abonnement Expensify',
+        subtitle: 'Une chose de moins à faire avant la nouvelle année.',
+        confirmTitle: 'Confirmer le renouvellement',
+        renew: 'Renouveler',
+    },
 };
 export default translations;
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 6064e9b5cc38..200743b63e56 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -413,8 +413,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'Salta',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `Hai bisogno di qualcosa in particolare? Chatta con il tuo account manager, ${accountManagerDisplayName}.`,
-        chatNow: 'Chatta ora',
         workEmail: 'Email di lavoro',
         destination: 'Destinazione',
         subrate: 'Tariffa secondaria',
@@ -515,6 +513,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: 'Anno precedente',
         nextYear: "L'anno prossimo",
         avatar: 'Avatar',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} di ${total}`,
         editor: 'Editor',
         restrictions: 'Restrizioni',
         tryAgain: 'Riprova',
@@ -524,6 +523,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: 'Nessun risultato. Prova a modificare i filtri o la ricerca',
         unableToDisplayChart: 'Impossibile visualizzare il grafico',
         webGLNotSupported: 'Il tuo browser non supporta WebGL. Abilitalo oppure passa a un altro browser.',
+        chartFailedToLoad: 'Impossibile caricare il grafico. Aggiorna la pagina e riprova.',
         apiKey: 'Chiave API',
         exportsTo: 'Esporta in',
     },
@@ -1163,6 +1163,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: 'Visualizza in Spese',
         emptyState: {title: 'Niente da mostrare', subtitle: 'Prova a modificare i criteri qui sopra'},
         noExpensesState: {title: 'Scopri dove va il tuo denaro', subtitle: 'Una volta che avrai delle spese, troverai tendenze di spesa, principali esercenti e altro ancora.'},
+        compare: {label: 'Confronta', previousPeriod: 'Periodo precedente', average: 'Media'},
     },
     allSettingsScreen: {
         subscription: 'Abbonamento',
@@ -1338,6 +1339,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Prima di poter registrare la distanza, devi aggiungere il tuo indirizzo di casa al tuo profilo privato. Questo spazio di lavoro utilizza questo indirizzo per le detrazioni per i pendolari.',
             cta: 'Aggiungi indirizzo di casa',
         },
+        expenseAdded: 'Spesa aggiunta',
+        invoiceSent: 'Fattura inviata',
         amount: 'Importo',
         percent: 'Percentuale',
         date: 'Data',
@@ -1913,6 +1916,7 @@ const translations: TranslationDeepObject<typeof en> = {
             prompt: 'Abilita le etichette nello spazio di lavoro per modificare i dettagli della spesa o eliminare l’etichetta da questa spesa.',
             confirmText: 'Elimina tag',
         },
+        undeletedExpense: 'ha ripristinato questa spesa',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `tariffe chilometriche aggiornate per il nuovo spazio di lavoro - ${policyName}`,
     },
     transactionMerge: {
@@ -2194,7 +2198,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Avatar profilo',
         customInstructions: 'Istruzioni personalizzate',
         copilotIntoAccount: "Copilot nell'account",
-        viewMemberHistory: 'Visualizza cronologia membro',
+        seeChatHistory: 'Vedi cronologia chat',
         viewAgentHistory: 'Visualizza cronologia agente',
         publicSection: {
             title: 'Pubblico',
@@ -2325,7 +2329,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Risultati',
             releaseOptions: 'Opzioni di rilascio',
             testingPreferences: 'Preferenze di test',
-            useStagingServer: 'Usa server di staging',
+            server: 'Server',
+            servers: {
+                production: {label: 'Produzione', description: "L'ambiente live che vedono gli utenti reali"},
+                staging: {label: 'Staging', description: 'Copia della produzione. Usata per la validazione finale'},
+                qa: {label: 'QA', description: 'Ambiente sperimentale usato per i test'},
+            },
+            serverPinnedDescription: 'Questa build comunica sempre con un solo server, quindi non può essere modificato qui.',
             forceOffline: 'Forza offline',
             simulatePoorConnection: 'Simula una connessione Internet scadente',
             simulateFailingNetworkRequests: 'Simula le richieste di rete non riuscite',
@@ -2547,7 +2557,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Autenticazione a due fattori richiesta',
         twoFactorAuthIsRequiredForAdminsTitle: 'Abilita l’autenticazione a due fattori',
         twoFactorAuthIsRequiredXero: 'La tua connessione contabile Xero richiede l’autenticazione a due fattori.',
-        twoFactorAuthIsRequiredCompany: 'La tua azienda richiede l’autenticazione a due fattori.',
+        twoFactorAuthIsRequiredCompany: 'La tua azienda richiede l’autenticazione a due fattori (2FA).',
         twoFactorAuthCannotDisable: "Impossibile disabilitare l'autenticazione a due fattori",
         twoFactorAuthRequired: 'Per la connessione a Xero è richiesta l’autenticazione a due fattori (2FA) e non può essere disattivata.',
         replaceDevice: 'Sostituisci dispositivo',
@@ -2559,6 +2569,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: 'Scansiona il codice QR con il tuo nuovo dispositivo, poi inserisci il codice per completare la configurazione.',
         downloadCodes: 'Scarica codici',
         copyCodes: 'Copia codici',
+        enable2FA: 'Abilita',
     },
     recoveryCodeForm: {
         error: {
@@ -3001,6 +3012,9 @@ ${amount} per ${merchant} - ${date}`,
         memberAlreadyInWorkflowTitle: 'Membro già in un flusso di lavoro',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} è già in un flusso di approvazione che invia a ${approverName}. Aggiungendolo qui lo sposterà in questo flusso di lavoro.`,
+        moveEveryoneToThisWorkflowTitle: 'Sposta tutti in questo flusso di lavoro',
+        moveEveryoneToThisWorkflowPrompt:
+            'Stai per spostare tutti a questo flusso di approvazione. Questo eliminerà tutti gli altri flussi di approvazione e sposterà tutti su questo. Questa azione non può essere annullata.',
     },
     workflowsApproverPage: {
         genericErrorMessage: "Non è stato possibile modificare l'approvatore. Riprova o contatta l'assistenza.",
@@ -3136,6 +3150,8 @@ ${amount} per ${merchant} - ${date}`,
             updateAvatar: "Si è verificato un problema durante l'aggiornamento dell'avatar di questo agente",
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} ha aggiornato le istruzioni di questo agente.\nIstruzioni precedenti:\n${previousPrompt}\nNuove istruzioni:\n${newPrompt}`,
     newAgentPage: {
         title: 'Nuovo agente',
         buildCustomAgent: 'Crea un agente personalizzato',
@@ -3313,6 +3329,7 @@ ${amount} per ${merchant} - ${date}`,
         timeExpiredAnnouncement: 'Il tempo è scaduto',
         error: {
             pleaseFillSecurityCode: 'Inserisci il tuo codice di sicurezza',
+            tooManyAttempts: 'Troppi tentativi. Riprova più tardi.',
             incorrectSecurityCode: 'Codice di sicurezza errato o non valido. Riprova oppure richiedi un nuovo codice.',
             pleaseFillTwoFactorAuth: 'Inserisci il tuo codice di autenticazione a due fattori',
         },
@@ -3399,9 +3416,9 @@ ${amount} per ${merchant} - ${date}`,
             otherAccountingSoftware: 'Nome del software',
         },
         interestedFeatures: {
-            title: 'A quali funzionalità sei interessato?',
-            featuresAlreadyEnabled: 'Ecco le nostre funzionalità più popolari:',
-            featureYouMayBeInterestedIn: 'Abilita funzionalità aggiuntive:',
+            title: 'Seleziona le funzionalità che desideri',
+            featuresAlreadyEnabled: 'Il tuo spazio di lavoro ha già attivato quanto segue:',
+            featureYouMayBeInterestedIn: 'Abilita funzionalità aggiuntive che potrebbero interessarti:',
         },
         error: {
             requiredFirstName: 'Inserisci il tuo nome per continuare',
@@ -4654,21 +4671,21 @@ ${amount} per ${merchant} - ${date}`,
         },
         nudge: {
             airfareManual:
-                'Sapevi che puoi prenotare e gestire i voli direttamente in Expensify? La prossima volta evita il fastidio di creare la spesa manualmente e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Sapevi che puoi prenotare i voli direttamente in Expensify e continuare ad accumulare miglia con i tuoi programmi frequent flyer? La prossima volta evita la seccatura di creare la spesa manualmente e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Sapevi che puoi prenotare e gestire i voli direttamente in Expensify? E che carica automaticamente le ricevute per te? La prossima volta prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Lo sapevi che puoi prenotare i voli direttamente in Expensify e continuare a guadagnare miglia con i tuoi programmi frequent flyer? Carica automaticamente anche le ricevute per te. La prossima volta prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Lo sapevi che puoi prenotare e gestire i soggiorni in hotel direttamente in Expensify? La prossima volta evita il fastidio di creare la tua spesa manualmente e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Sapevi che puoi prenotare i soggiorni in hotel direttamente in Expensify e continuare a usare i tuoi programmi fedeltà degli hotel? La prossima volta evita la seccatura di creare manualmente la tua nota spese e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                'Lo sapevi che puoi prenotare e gestire i soggiorni in hotel direttamente in Expensify? La prossima volta prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Lo sapevi che puoi prenotare i soggiorni in hotel direttamente in Expensify e continuare a usare i tuoi programmi fedeltà degli hotel? La prossima volta ti basta prenotare tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                'Sapevi che puoi prenotare e gestire il noleggio auto direttamente in Expensify? La prossima volta evita la seccatura di creare la tua spesa manualmente e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Lo sapevi che puoi prenotare il noleggio auto direttamente in Expensify e continuare a usare i tuoi programmi fedeltà per il noleggio? La prossima volta evita la seccatura di creare la spesa manualmente e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                'Lo sapevi che puoi prenotare e gestire il noleggio auto direttamente in Expensify? La prossima volta prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Sapevi che puoi prenotare il noleggio auto direttamente in Expensify e continuare a usare i tuoi programmi fedeltà per il noleggio? La prossima volta ti basta prenotare tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Sapevi che puoi prenotare e gestire i viaggi in treno direttamente in Expensify? La prossima volta evita la seccatura di creare la spesa manualmente e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Sapevi che puoi prenotare i viaggi in treno direttamente in Expensify continuando a usare i tuoi programmi fedeltà ferroviari e le tue railcard? La prossima volta evita la seccatura di creare la spesa manualmente e prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Sapevi che puoi prenotare e gestire i viaggi in treno direttamente in Expensify? E che le ricevute vengono caricate automaticamente per te? La prossima volta prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Sapevi che puoi prenotare i viaggi in treno direttamente in Expensify e continuare a usare i tuoi programmi fedeltà ferroviari e le railcard? Carica automaticamente anche le ricevute per te. La prossima volta, prenota semplicemente tramite <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 'Sapevi che puoi prenotare e gestire viaggi di gruppo come questo direttamente in Expensify? Evita lo stress la prossima volta e prova il nostro strumento <a href="https://help.expensify.com/travel/hubs/event-management/">Eventi di viaggio</a>.',
             hotelBlockCard:
@@ -6368,6 +6385,8 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
             csvColumnType: 'Tipo',
             csvColumnLimitType: 'Tipo di limite',
             csvColumnLimit: 'Limite',
+            noCardFeedsAvailable: 'Nessun feed carta disponibile',
+            noCardFeedsAvailableDescription: 'Non sono disponibili flussi di carte per questo spazio di lavoro.',
         },
         categories: {
             deleteCategories: 'Elimina categorie',
@@ -6383,6 +6402,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
             deleteFailureMessage: 'Si è verificato un errore durante l’eliminazione della categoria, riprova per favore',
             categoryName: 'Nome categoria',
             requiresCategory: 'I membri devono categorizzare tutte le spese',
+            autoCategorizeNewExpenses: 'Categorizza automaticamente le nuove spese',
             showCategoryGLCodes: 'Mostra i codici CO.GE. quando classifichi le spese',
             needCategoryForExportToIntegration: (connectionName: string) => `Tutte le spese devono essere categorizzate per poterle esportare su ${connectionName}.`,
             subtitle: 'Ottieni una panoramica migliore di dove viene speso il denaro. Usa le nostre categorie predefinite oppure aggiungi le tue.',
@@ -6614,7 +6634,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
                 corporate: 'Limita l’eliminazione delle transazioni',
                 personal: 'Consenti l’eliminazione delle transazioni',
                 setFeedNameDescription: 'Dai al feed della carta un nome univoco così potrai distinguerlo dagli altri',
-                setTransactionLiabilityDescription: 'Quando è abilitato, i titolari della carta possono eliminare le transazioni della carta. Le nuove transazioni seguiranno questa regola.',
+                setTransactionLiabilityDescription: 'I titolari di carta possono eliminare le transazioni. Si applica solo alle nuove transazioni.',
                 emptyAddedFeedTitle: 'Nessuna carta in questo feed',
                 emptyAddedFeedDescription: 'Assicurati che ci siano carte nel flusso di carte della tua banca.',
                 pendingFeedTitle: `Stiamo esaminando la tua richiesta...`,
@@ -7092,6 +7112,16 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             peopleAdmins: 'Amministratori persone',
             paymentsAdmins: 'Amministratori pagamenti',
             members: 'Membri',
+            workArrangement: 'Modalità di lavoro',
+            officeBased: 'In ufficio',
+            noRegularWorkspace: 'Remoto o mobile',
+            workArrangementPage: {
+                title: 'Modalità di lavoro',
+                optionOfficeBasedHelp: 'Il membro si reca in ufficio per il tragitto casa-lavoro. I tragitti ordinari casa-lavoro sono esclusi dal rimborso.',
+                optionNoRegularWorkspaceHelp:
+                    'Il membro lavora da casa o si sposta tra diverse sedi senza un ufficio fisso, quindi le regole relative al tragitto casa-lavoro non si applicano.',
+                futureOnlyNote: 'Le modifiche si applicano solo ai calcoli chilometrici futuri. Le spese chilometriche esistenti non vengono ricalcolate.',
+            },
         },
         card: {
             getStartedIssuing: 'Inizia emettendo la tua prima carta virtuale o fisica.',
@@ -7477,6 +7507,8 @@ Il piano Control parte da 9 $ al mese per ogni membro attivo.`,
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Per sbloccare, abilita la sincronizzazione automatica.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `La tua connessione a QuickBooks Online scade il ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `La tua connessione a QuickBooks Online è scaduta il ${date}.`,
         },
         export: {
             notReadyHeading: 'Non pronto per l’esportazione',
@@ -8144,6 +8176,8 @@ Richiedi dettagli sulle spese come ricevute e descrizioni, imposta limiti e valo
                 autoPayApprovedReportsSubtitle: 'Configura quali note spese sono idonee per il pagamento automatico.',
                 autoPayApprovedReportsLimitError: (currency?: string) => `Inserisci un importo inferiore a ${currency ?? ''}20.000`,
                 autoPayApprovedReportsLockedSubtitle: 'Vai su Altre funzionalità e abilita i flussi di lavoro, poi aggiungi i pagamenti per sbloccare questa funzione.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `Il pagamento automatico è disponibile solo con il piano Control. [Esegui l’upgrade](${upgradeLink}) per sbloccare questa funzione.`,
                 autoPayReportsUnderTitle: 'Paga automaticamente i report sotto',
                 autoPayReportsUnderDescription: 'Le note spese pienamente conformi inferiori a questo importo verranno rimborsate automaticamente.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Aggiungi ${featureName} per sbloccare questa funzione.`,
@@ -8235,6 +8269,7 @@ Richiedi dettagli sulle spese come ricevute e descrizioni, imposta limiti e valo
                 flagAmountsOver: 'Contrassegna importi superiori a',
                 flagAmountsOverDescription: (categoryName: string) => `Si applica alla categoria “${categoryName}”.`,
                 flagAmountsOverSubtitle: 'Questo sostituisce l’importo massimo per tutte le spese.',
+                expenseLimitType: 'Tipo di limite di spesa',
                 expenseLimitTypes: {
                     expense: 'Spesa individuale',
                     expenseSubtitle:
@@ -8832,6 +8867,35 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             syncTravelInvoicingSettlements: 'Sincronizza le liquidazioni di fatturazione viaggi',
             travelInvoicingSettlementAccount: {label: 'Conto di regolamento fatturazione viaggi', description: 'Scegli il tuo conto di regolamento e creeremo il pagamento in Campfire.'},
             travelInvoicingPayableAccount: {label: 'Conto debiti per fatturazione viaggi'},
+            exportToMultipleAccounts: 'Configura l’esportazione su più conti',
+            cardProgramAccount: {
+                label: 'Conto del programma carta',
+                description: 'Ignora il conto spazio di lavoro per questi programmi di carta.',
+                descriptionLevel2: 'Ignora il conto dello spazio di lavoro per questo programma di carte.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Tutti i programmi usano il conto predefinito';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} programma con conto personalizzato`;
+                    }
+                    return `${customAccountsCount} programmi con conti personalizzati`;
+                },
+            },
+            cardAccount: {
+                label: 'Conto per carta',
+                description: 'Sostituisci il conto del programma per le singole carte.',
+                descriptionLevel2: 'Sostituisci il conto del programma per queste carte.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Tutte le carte usano conti di programma';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} carta con conto personalizzato`;
+                    }
+                    return `${customAccountsCount} carte con conti personalizzati`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Configurazione Dynamics 365 Business Central',
@@ -8848,6 +8912,51 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             importDescription: 'Scegli quali configurazioni di codifica importare da Dynamics 365 Business Central.',
             items: 'Articoli',
             enableNewCategories: 'Abilita le categorie appena importate',
+            exportDescription: 'Configura come i dati di Expensify vengono esportati in Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Data della transazione',
+                description: 'Usa questa data quando esporti i report su Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: "Data dell'ultima spesa",
+                        description: 'Data della spesa più recente riportata nel report.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Data di esportazione',
+                        description: 'Data di esportazione del report a Dynamics 365 Business Central.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Data di invio',
+                        description: "Data di invio del report per l'approvazione.",
+                    },
+                },
+            },
+            exportReimbursable: 'Esporta le spese rimborsabili come',
+            exportNonReimbursable: 'Esporta le spese della carta aziendale come',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Giornale generale',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Fatture di acquisto',
+            },
+            reimbursableAccount: {
+                label: 'Conto spese rimborsabili',
+                description: 'Scegli dove esportare le spese rimborsabili.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Fornitore predefinito della carta aziendale',
+                description: 'Scegli un fornitore Dynamics 365 Business Central predefinito per le spese che non vengono abbinate automaticamente.',
+            },
+            companyCardAccount: {
+                label: 'Conto carta aziendale',
+                description: 'Scegli dove esportare le transazioni della carta aziendale.',
+            },
+            paymentMethod: {
+                label: 'Metodo di pagamento',
+                description: 'Scegli un metodo di pagamento per le fatture di acquisto, così Dynamics 365 Business Central può riconciliarle con la tua banca.',
+            },
+            noBankAccountsFound: 'Nessun conto bancario trovato',
+            noBankAccountsFoundDescription: 'Aggiungi conti bancari in Dynamics 365 Business Central e sincronizza di nuovo la connessione',
+            noPaymentMethodsFound: 'Nessun metodo di pagamento trovato',
+            noPaymentMethodsFoundDescription: 'Aggiungi metodi di pagamento in Dynamics 365 Business Central e sincronizza di nuovo la connessione',
         },
     },
     getAssistancePage: {
@@ -9510,6 +9619,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `impostazioni fattura copiate da <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `impostazioni di viaggio copiate da <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'attivato' : 'disattivato'} la categorizzazione automatica delle nuove spese`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'attivato' : 'disattivato'} il requisito di categorizzazione della spesa`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'attivato' : 'disattivato'} il requisito di assegnazione etichette alle spese`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `ha aggiornato l’impostazione della commissione di conversione valuta a "${preferenceLabel}"`,
@@ -9546,6 +9656,10 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 : `ha modificato il workflow di approvazione per ${member} per smettere di inoltrare i report oltre ${previousLimit}`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `ha modificato il flusso di approvazione per ${member} per inoltrare i report superiori a ${limit} (in precedenza ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `ha modificato l'accordo di lavoro di ${displayName} in ${newArrangement} (in precedenza ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `ha modificato la modalità di lavoro predefinita in ${newArrangement} (precedentemente ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Membro non trovato.',
@@ -9850,6 +9964,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
         noCategory: 'Nessuna categoria',
         noMerchant: 'Nessun esercente',
         noTag: 'Nessun tag',
+        noVendor: 'Nessun fornitore',
         expenseType: 'Tipo di spesa',
         receiptType: 'Tipo di ricevuta',
         receiptTypeValues: {
@@ -10962,7 +11077,18 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 invalid: 'Questo codice non è valido',
             },
         },
-        paymentHistory: {title: 'Vedi cronologia pagamenti', subtitle: 'Il tuo storico completo dei pagamenti mensili addebitati su questo conto.'},
+        paymentHistory: {
+            title: 'Vedi cronologia pagamenti',
+            subtitle: 'Il tuo storico completo dei pagamenti mensili addebitati su questo conto.',
+            payments: 'Pagamenti',
+            inclTax: 'incl. tasse',
+            empty: 'Ancun pagamento finora.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 utente attivo',
+                other: `${count} utenti attivi`,
+            }),
+            state: {paid: 'Pagato', cleared: 'Compensato', failed: 'Non riuscito', refunded: 'Rimborsato', disputed: 'Contestata', balanceTransfer: 'Trasferimento di saldo'},
+        },
         subscriptionSettings: {
             title: 'Impostazioni abbonamento',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -11075,6 +11201,8 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             `Sei sicuro di voler rimuovere il tuo accesso copilota all'account Expensify di ${delegatorName}? Questa azione non può essere annullata.`,
         removeCopilotAccessConfirm: 'Rimuovi accesso',
         copilotAccess: 'Accesso a Copilot',
+        leaveAccount: 'Abbandona account',
+        leaveAccountConfirmationText: 'Verrai reindirizzato al tuo account. Non verrai disconnesso completamente.',
     },
     debug: {
         debug: 'Debug',
@@ -11535,5 +11663,12 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
             description: `<muted-text>Crea agenti personalizzati per verificare, approvare e instradare le spese in base alle regole che imposti. <a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">Scopri di più</a>.</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Rinnova il tuo abbonamento per un periodo di 12 mesi, dal ${startDate} al ${endDate}.`,
+        title: 'Rinnova il tuo abbonamento Expensify',
+        subtitle: 'Una cosa in meno da fare prima del nuovo anno.',
+        confirmTitle: 'Conferma rinnovo',
+        renew: 'Rinnova',
+    },
 };
 export default translations;
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 042a7c0d4ab0..5686951a9547 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -412,8 +412,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'スキップ',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `特定のご要望がありますか？アカウントマネージャーの${accountManagerDisplayName}とチャットしましょう。`,
-        chatNow: '今すぐチャット',
         workEmail: '勤務先メール',
         destination: '宛先',
         subrate: 'サブレート',
@@ -514,6 +512,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: '前年',
         nextYear: '来年',
         avatar: 'アバター',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${total} 件中 ${current} 件目`,
         editor: '編集者',
         restrictions: '制限',
         tryAgain: '再試行',
@@ -523,6 +522,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: '結果がありません。フィルターや検索キーワードを調整してお試しください',
         unableToDisplayChart: 'グラフを表示できません',
         webGLNotSupported: 'お使いのブラウザは WebGL に対応していません。有効にするか、別のブラウザに切り替えてください。',
+        chartFailedToLoad: 'グラフを読み込めませんでした。ページを再読み込みして、もう一度お試しください。',
         apiKey: 'API キー',
         exportsTo: 'エクスポート先',
     },
@@ -1150,6 +1150,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: '支出で表示',
         emptyState: {title: '表示するものはありません', subtitle: '上の条件を調整してみてください'},
         noExpensesState: {title: 'お金の使い道を確認する', subtitle: '経費が登録されると、支出の傾向や上位の加盟店など、さまざまな情報を確認できるようになります。'},
+        compare: {label: '比較', previousPeriod: '前の期間', average: '平均'},
     },
     allSettingsScreen: {
         subscription: 'サブスクリプション',
@@ -1323,6 +1324,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : '距離を記録する前に、プライベートプロフィールに自宅住所を追加する必要があります。このワークスペースでは、その住所を通勤控除に使用します。',
             cta: '自宅住所を追加',
         },
+        expenseAdded: '経費を追加しました',
+        invoiceSent: '請求書を送信しました',
         amount: '金額',
         percent: 'パーセント',
         date: '日付',
@@ -1894,6 +1897,7 @@ const translations: TranslationDeepObject<typeof en> = {
             prompt: 'ワークスペースでタグを有効にすると、この経費の詳細を編集したり、この経費からタグを削除したりできます。',
             confirmText: 'タグを削除',
         },
+        undeletedExpense: 'この経費を復元しました',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `新しいワークスペース「${policyName}」の距離単価を更新しました`,
     },
     transactionMerge: {
@@ -2175,7 +2179,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'プロフィールアバター',
         customInstructions: 'カスタム指示',
         copilotIntoAccount: 'アカウントにCopilot',
-        viewMemberHistory: 'メンバー履歴を表示',
+        seeChatHistory: 'チャット履歴を表示',
         viewAgentHistory: 'エージェント履歴を表示',
         publicSection: {
             title: '公開',
@@ -2305,7 +2309,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: '結果',
             releaseOptions: 'リリースオプション',
             testingPreferences: 'テスト設定',
-            useStagingServer: 'ステージングサーバーを使用',
+            server: 'サーバー',
+            servers: {
+                production: {label: '本番', description: '実際のユーザーが利用している環境'},
+                staging: {label: 'ステージング', description: '本番のミラー。最終確認に使用します'},
+                qa: {label: 'QA', description: 'テストに使用する実験的な環境'},
+            },
+            serverPinnedDescription: 'このビルドは常に単一のサーバーに接続するため、ここでは変更できません。',
             forceOffline: '強制的にオフラインにする',
             simulatePoorConnection: '不安定なインターネット接続をシミュレート',
             simulateFailingNetworkRequests: 'ネットワークリクエストの失敗をシミュレート',
@@ -2529,7 +2539,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: '2要素認証が必要です',
         twoFactorAuthIsRequiredForAdminsTitle: '2要素認証を有効にしてください',
         twoFactorAuthIsRequiredXero: 'Xero 会計連携には二要素認証が必要です。',
-        twoFactorAuthIsRequiredCompany: 'あなたの会社では、2 要素認証が必須です。',
+        twoFactorAuthIsRequiredCompany: 'お客様の会社では、2 要素認証（2FA）が必須です。',
         twoFactorAuthCannotDisable: '2要素認証を無効にできません',
         twoFactorAuthRequired: 'Xero 連携には二要素認証（2FA）が必須で、無効にすることはできません。',
         replaceDevice: 'デバイスを交換',
@@ -2541,6 +2551,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: '新しいデバイスでQRコードをスキャンし、表示されたコードを入力して設定を完了してください。',
         downloadCodes: 'コードをダウンロード',
         copyCodes: 'コードをコピー',
+        enable2FA: '有効にする',
     },
     recoveryCodeForm: {
         error: {
@@ -2974,6 +2985,9 @@ ${date} の ${merchant} への ${amount}`,
         memberAlreadyInWorkflowTitle: 'メンバーはすでにワークフローに属しています',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName}はすでに${approverName}に提出する承認ワークフローに属しています。ここに追加すると、このワークフローに移動します。`,
+        moveEveryoneToThisWorkflowTitle: '全員をこのワークフローに移動する',
+        moveEveryoneToThisWorkflowPrompt:
+            'すべてのメンバーをこの承認ワークフローに移動しようとしています。他のすべての承認ワークフローは削除され、全員がこのワークフローに移行されます。この操作は元に戻せません。',
     },
     workflowsApproverPage: {
         genericErrorMessage: '承認者を変更できませんでした。もう一度お試しいただくか、サポートにお問い合わせください。',
@@ -3107,6 +3121,8 @@ ${date} の ${merchant} への ${amount}`,
             updateAvatar: 'このエージェントのアバターを更新する際に問題が発生しました',
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} がこのエージェントの指示を更新しました。\n以前の指示:\n${previousPrompt}\n新しい指示:\n${newPrompt}`,
     newAgentPage: {
         title: '新しいエージェント',
         buildCustomAgent: 'カスタムエージェントを作成',
@@ -3283,6 +3299,7 @@ ${date} の ${merchant} への ${amount}`,
         timeExpiredAnnouncement: '時間切れです',
         error: {
             pleaseFillSecurityCode: 'セキュリティコードを入力してください',
+            tooManyAttempts: '試行回数が多すぎます。しばらくしてからもう一度お試しください。',
             incorrectSecurityCode: 'セキュリティコードが正しくないか無効です。もう一度お試しいただくか、新しいコードをリクエストしてください。',
             pleaseFillTwoFactorAuth: '2 要素認証コードを入力してください',
         },
@@ -3370,9 +3387,9 @@ ${date} の ${merchant} への ${amount}`,
             otherAccountingSoftware: 'ソフトウェア名',
         },
         interestedFeatures: {
-            title: 'どの機能にご興味がありますか？',
-            featuresAlreadyEnabled: '当社で最も人気のある機能はこちらです。',
-            featureYouMayBeInterestedIn: '追加機能を有効にする:',
+            title: 'ご希望の機能を選択してください',
+            featuresAlreadyEnabled: 'ワークスペースでは、すでに次の機能が有効になっています：',
+            featureYouMayBeInterestedIn: '興味のありそうな追加機能を有効にする：',
         },
         error: {
             requiredFirstName: '続行するには名を入力してください',
@@ -4619,19 +4636,21 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
         },
         nudge: {
             airfareManual:
-                'Expensify でフライトの予約や管理ができることをご存じでしたか？次回からは経費を手動で作成する手間を省き、<a href="https://travel.expensify.com">Expensify Travel</a> から簡単に予約しましょう ✈️',
+                'Expensify で直接フライトを予約しても、マイレージプログラムでマイルを獲得できることをご存じでしたか？ 次回からは経費を手動で作成する手間を省き、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> から予約してください ✈️',
             airfareCard:
-                'Expensify でフライトの予約や管理ができることをご存じでしたか？しかも領収書は自動でアップロードされます。次回からは、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> で予約してください ✈️',
+                'Expensify で直接フライトを予約しても、お持ちのマイレージプログラムでマイルを貯められることをご存じでしたか？領収書も自動的にアップロードされます。次回からは、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> からご予約ください ✈️',
             hotelManual:
-                'Expensify でホテルの予約や管理ができることをご存じですか？次回からは経費を手入力する手間を省き、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> から予約してください 🏨',
-            hotelCard: 'Expensify でホテルの予約や管理ができることをご存じでしたか？次回からは、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> 経由で予約してください 🏨',
+                'Expensify から直接ホテルを予約しても、ホテルのロイヤリティプログラムをそのまま使えることをご存じでしたか？次回からは経費を手動で作成する手間を省き、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> から予約しましょう 🏨',
+            hotelCard:
+                'Expensify から直接ホテルを予約しても、ホテルのロイヤリティプログラムをそのまま利用できることをご存じでしたか？次回からは、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> 経由で予約してください 🏨',
             carManual:
-                'Expensify でレンタカーの予約や管理ができることをご存じですか？次回からは経費を手動で作成する手間を省き、<a href="https://travel.expensify.com">Expensify Travel</a> から予約するだけで済みます。',
-            carCard: 'Expensify でレンタカーの予約や管理ができることをご存じですか？次回からは、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> からご予約ください。',
+                'Expensify でレンタカーを直接予約できて、レンタカーのロイヤルティプログラムもそのままご利用いただけることをご存じでしたか？次回からは経費を手動で作成する手間を省き、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> から予約してください 🚗',
+            carCard:
+                'Expensify からそのままレンタカーを予約しても、お持ちのレンタカー会員プログラムを引き続きご利用いただけることをご存じでしたか？次回からは、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> でご予約ください 🚗',
             railManual:
-                'Expensify で列車の予約や管理ができることをご存じでしたか？次回からは、経費を手動で作成する手間を省いて、<a href="https://travel.expensify.com">Expensify Travel</a> から簡単に予約しましょう。',
+                'Expensify で列車の予約ができて、しかも鉄道のロイヤルティプログラムやレールカードもそのまま使えることをご存じでしたか？次回からは、経費を手動で作成する手間を省き、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> から予約してください 🚂',
             railCard:
-                'Expensify で電車の予約や管理ができることをご存じでしたか？しかも領収書も自動でアップロードされます。次回からは、ぜひ <a href="https://travel.expensify.com">Expensify Travel</a> から予約してください 🚂',
+                'Expensify で鉄道の乗車券を直接予約できて、鉄道のロイヤルティプログラムやレールカードもそのまま使えることをご存じでしたか？領収書も自動的にアップロードされます。次回からは <a href="https://travel.expensify.com">Expensify Travel</a> から簡単に予約しましょう。',
             hotelBlockManual:
                 'Expensify では、このようなグループ旅行の予約と管理を直接行えることをご存じでしたか？次回は面倒を省くために、ぜひ <a href="https://help.expensify.com/travel/hubs/event-management/">Travel Events</a> ツールをお試しください。',
             hotelBlockCard:
@@ -6294,6 +6313,8 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
             csvColumnType: 'タイプ',
             csvColumnLimitType: '限度タイプ',
             csvColumnLimit: '限度額',
+            noCardFeedsAvailable: '利用できるカードフィードがありません',
+            noCardFeedsAvailableDescription: 'このワークスペースで利用できるカードフィードはありません。',
         },
         categories: {
             deleteCategories: 'カテゴリを削除',
@@ -6309,6 +6330,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
             deleteFailureMessage: 'カテゴリの削除中にエラーが発生しました。もう一度お試しください',
             categoryName: 'カテゴリ名',
             requiresCategory: 'メンバーはすべての経費を分類する必要があります',
+            autoCategorizeNewExpenses: '新しい経費を自動分類する',
             showCategoryGLCodes: '経費を分類するときに GL コードを表示する',
             needCategoryForExportToIntegration: (connectionName: string) => `${connectionName} にエクスポートするには、すべての経費にカテゴリを指定する必要があります。`,
             subtitle: 'お金がどこで使われているかを、より分かりやすく把握しましょう。デフォルトのカテゴリを使うか、自分用のカテゴリを追加できます。',
@@ -6524,7 +6546,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
                 corporate: '取引の削除を制限',
                 personal: '取引の削除を許可',
                 setFeedNameDescription: '他と区別できるように、カードフィードに一意の名前を付けてください',
-                setTransactionLiabilityDescription: '有効にすると、カード保有者はカード取引を削除できるようになります。新しい取引にもこのルールが適用されます。',
+                setTransactionLiabilityDescription: 'カード保有者は取引を削除できます。新しい取引にのみ適用されます。',
                 emptyAddedFeedTitle: 'このフィードにはカードがありません',
                 emptyAddedFeedDescription: '銀行のカード明細フィードにカードが含まれていることを確認してください。',
                 pendingFeedTitle: `リクエストを確認しています…`,
@@ -7003,6 +7025,15 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             peopleAdmins: 'People 管理者',
             paymentsAdmins: '支払い管理者',
             members: 'メンバー',
+            workArrangement: '勤務形態',
+            officeBased: 'オフィス勤務',
+            noRegularWorkspace: 'リモートまたはモバイル',
+            workArrangementPage: {
+                title: '勤務形態',
+                optionOfficeBasedHelp: 'メンバーはオフィスへ通勤します。通常の通勤は払い戻しの対象外です。',
+                optionNoRegularWorkspaceHelp: 'メンバーは在宅勤務、または決まったオフィスがなく拠点間を移動しているため、通勤規程は適用されません。',
+                futureOnlyNote: '変更は今後の走行距離計算にのみ適用されます。既存の走行距離経費は再計算されません。',
+            },
         },
         card: {
             getStartedIssuing: 'まずは最初のバーチャルカードまたは物理カードを発行しましょう。',
@@ -7388,6 +7419,8 @@ Control プランは、アクティブメンバー1人あたり月額 $9 から
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'ロックを解除するには、自動同期を有効にしてください。',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `QuickBooks Online との接続は ${date} に有効期限が切れます。`,
+            qboConnectionExpired: ({date}: {date: string}) => `QuickBooks Online との接続は ${date} に期限切れになりました。`,
         },
         export: {
             notReadyHeading: 'エクスポートの準備ができていません',
@@ -8041,6 +8074,8 @@ ${reportName}`,
                 autoPayApprovedReportsSubtitle: '自動支払いの対象となる経費レポートを設定する。',
                 autoPayApprovedReportsLimitError: (currency?: string) => `${currency ?? ''}20,000未満の金額を入力してください`,
                 autoPayApprovedReportsLockedSubtitle: '「その他の機能」に移動してワークフローを有効にし、その後「支払い」を追加してこの機能を有効化してください。',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `自動支払いはControlプランでのみご利用いただけます。この機能を有効にするには[アップグレード](${upgradeLink})してください。`,
                 autoPayReportsUnderTitle: '自動支払いレポートの対象:',
                 autoPayReportsUnderDescription: 'この金額以下で完全準拠の経費精算書は、自動的に支払われます。',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `この機能を利用するには、${featureName} を追加してください。`,
@@ -8128,6 +8163,7 @@ ${reportName}`,
                 flagAmountsOver: '超過金額にフラグを付ける',
                 flagAmountsOverDescription: (categoryName: string) => `カテゴリ「${categoryName}」に適用されます。`,
                 flagAmountsOverSubtitle: 'これは、すべての経費の上限金額を上書きします。',
+                expenseLimitType: '経費上限の種類',
                 expenseLimitTypes: {
                     expense: '個別経費',
                     expenseSubtitle:
@@ -8711,6 +8747,35 @@ ${reportName}`,
             syncTravelInvoicingSettlements: '出張請求の精算を同期',
             travelInvoicingSettlementAccount: {label: '出張請求精算口座', description: '精算に使う口座を選択してください。選択された口座で、Campfire に支払いを作成します。'},
             travelInvoicingPayableAccount: {label: '旅行請求買掛金勘定'},
+            exportToMultipleAccounts: '複数の勘定科目へのエクスポートを設定する',
+            cardProgramAccount: {
+                label: 'カードプログラム口座',
+                description: 'これらのカードプログラムのワークスペースアカウントを上書きします。',
+                descriptionLevel2: 'このカードプログラムのワークスペース口座を上書きします。',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'すべてのプログラムはデフォルトアカウントを使用します';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `カスタム勘定科目を使用するプログラム：${customAccountsCount} 件`;
+                    }
+                    return `${customAccountsCount} 件のプログラム（カスタムアカウントあり）`;
+                },
+            },
+            cardAccount: {
+                label: 'カード単位の口座',
+                description: '個々のカードに対してプログラム口座を上書きします。',
+                descriptionLevel2: 'これらのカードのプログラム口座を上書きします。',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'すべてのカードはプログラムアカウントを使用します';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `カスタム口座付きカード ${customAccountsCount} 枚`;
+                    }
+                    return `カスタム口座のあるカードが ${customAccountsCount} 枚`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Dynamics 365 Business Central のセットアップ',
@@ -8727,6 +8792,51 @@ ${reportName}`,
             importDescription: 'Dynamics 365 Business Central からインポートするコーディング構成を選択してください。',
             items: 'アイテム',
             enableNewCategories: '新しくインポートされたカテゴリを有効にする',
+            exportDescription: 'Expensify のデータを Dynamics 365 Business Central にエクスポートする方法を設定します。',
+            exportDate: {
+                label: '取引日',
+                description: 'レポートを Dynamics 365 Business Central にエクスポートするときは、この日付を使用します。',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: '最終支出日',
+                        description: 'レポートに記載されている最新の支出日。',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'エクスポート日',
+                        description: 'レポートが Dynamics 365 Business Central にエクスポートされた日付。',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: '提出日',
+                        description: 'レポートが承認のために提出された日付。',
+                    },
+                },
+            },
+            exportReimbursable: '返金対象経費の書き出し形式',
+            exportNonReimbursable: '会社カード経費のエクスポート形式',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: '一般仕訳帳',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: '購入請求書',
+            },
+            reimbursableAccount: {
+                label: '返金対象経費の口座',
+                description: '返金対象経費のエクスポート先を選択してください。',
+            },
+            defaultCompanyCardVendor: {
+                label: 'デフォルトの会社カードベンダー',
+                description: '自動的に一致しない経費に使用する、デフォルトの Dynamics 365 Business Central ベンダーを選択してください。',
+            },
+            companyCardAccount: {
+                label: '会社カード口座',
+                description: '会社カード取引のエクスポート先を選択してください。',
+            },
+            paymentMethod: {
+                label: '支払方法',
+                description: 'Dynamics 365 Business Central が銀行と照合できるよう、購入請求書の支払方法を選択してください。',
+            },
+            noBankAccountsFound: '銀行口座が見つかりません',
+            noBankAccountsFoundDescription: 'Dynamics 365 Business Central で銀行口座を追加し、接続を再度同期してください',
+            noPaymentMethodsFound: '支払方法が見つかりません',
+            noPaymentMethodsFoundDescription: 'Dynamics 365 Business Central で支払方法を追加し、接続を再度同期してください',
         },
     },
     getAssistancePage: {
@@ -9371,6 +9481,7 @@ ${reportName}`,
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `<a href="${sourcePolicyURL}">${sourcePolicyName}</a> から請求書の設定をコピーしました`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `<a href="${sourcePolicyURL}">${sourcePolicyName}</a> から出張設定をコピーしました`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? '有効' : '無効'} 新しい経費の自動分類`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? '有効' : '無効'} 経費の分類要件`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? '有効' : '無効'} の経費タグ付け要件`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `通貨換算手数料の設定を「${preferenceLabel}」に更新しました`,
@@ -9407,6 +9518,10 @@ ${reportName}`,
                 : `${member} さんの承認ワークフローを変更し、${previousLimit} を超えるレポートを転送しないようにしました`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `${member} さんの承認ワークフローを、${limit} を超えるレポートを転送するように変更しました（以前は ${previousLimit}）。`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `${displayName}さんの勤務形態を${newArrangement}（以前は${oldArrangement}）に変更しました`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `デフォルトの勤務形態を${newArrangement}（以前は${oldArrangement}）に変更しました`,
     },
     roomMembersPage: {
         memberNotFound: 'メンバーが見つかりません。',
@@ -9705,6 +9820,7 @@ ${reportName}`,
         noCategory: 'カテゴリなし',
         noMerchant: '店舗なし',
         noTag: 'タグなし',
+        noVendor: 'ベンダーなし',
         expenseType: '経費の種類',
         receiptType: '領収書の種類',
         receiptTypeValues: {
@@ -10800,7 +10916,18 @@ ${reportName}`,
                 invalid: 'このコードは無効です',
             },
         },
-        paymentHistory: {title: '支払い履歴を表示', subtitle: 'このアカウントに請求された毎月の支払い履歴のすべてです。'},
+        paymentHistory: {
+            title: '支払い履歴を表示',
+            subtitle: 'このアカウントに請求された毎月の支払い履歴のすべてです。',
+            payments: '支払い',
+            inclTax: '税込み',
+            empty: 'まだ支払いはありません。',
+            activeUsers: ({count}: {count: number}) => ({
+                one: 'アクティブユーザー 1 人',
+                other: `アクティブユーザー ${count} 名`,
+            }),
+            state: {paid: '支払い済み', cleared: '決済済み', failed: '失敗しました', refunded: '返金済み', disputed: '異議あり', balanceTransfer: '残高振替'},
+        },
         subscriptionSettings: {
             title: 'サブスクリプション設定',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -10910,6 +11037,8 @@ ${reportName}`,
         removeCopilotAccessConfirmation: (delegatorName: string) => `${delegatorName}のExpensifyアカウントへのコパイロットアクセスを削除してもよろしいですか？この操作は元に戻せません。`,
         removeCopilotAccessConfirm: 'アクセスを削除',
         copilotAccess: 'Copilot へのアクセス',
+        leaveAccount: 'アカウントを退出',
+        leaveAccountConfirmationText: 'ご自身のアカウントに戻りますが、完全にはサインアウトされません。',
     },
     debug: {
         debug: 'デバッグ',
@@ -11365,5 +11494,12 @@ ${reportName}`,
             description: `<muted-text>設定したルールに基づいて経費を確認、承認、振り分けるカスタムエージェントを作成できます。<a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">さらに詳しく</a>。</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `${startDate} から ${endDate} までの12か月契約でサブスクリプションを更新します。`,
+        title: 'Expensify のサブスクリプションを更新する',
+        subtitle: '新年までにやることがひとつ減りました。',
+        confirmTitle: '更新を確認',
+        renew: '更新する',
+    },
 };
 export default translations;
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index eae278301c6c..b6b1bdd42149 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -412,8 +412,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'Overslaan',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `Zoek je iets specifieks? Chat met je accountmanager, ${accountManagerDisplayName}.`,
-        chatNow: 'Nu chatten',
         workEmail: 'Zakelijk e-mailadres',
         destination: 'Bestemming',
         subrate: 'Subtarief',
@@ -515,6 +513,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: 'Vorig jaar',
         nextYear: 'Volgend jaar',
         avatar: 'Avatar',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} van ${total}`,
         editor: 'Editor',
         restrictions: 'Beperkingen',
         tryAgain: 'Probeer het opnieuw',
@@ -524,6 +523,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: 'Geen resultaten. Probeer je filters of zoekopdracht aan te passen',
         unableToDisplayChart: 'Grafiek kan niet worden weergegeven',
         webGLNotSupported: 'Je browser ondersteunt WebGL niet. Schakel het in of gebruik een andere browser.',
+        chartFailedToLoad: 'De grafiek kon niet worden geladen. Vernieuw de pagina en probeer het opnieuw.',
         apiKey: 'API-sleutel',
         exportsTo: 'Exporteert naar',
     },
@@ -1162,6 +1162,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: 'Bekijken in Uitgaven',
         emptyState: {title: 'Niets om weer te geven', subtitle: 'Probeer je criteria hierboven aan te passen'},
         noExpensesState: {title: 'Zie waar je geld naartoe gaat', subtitle: 'Zodra je uitgaven hebt, zie je bestedingspatronen, topverkopers en meer.'},
+        compare: {label: 'Vergelijken', previousPeriod: 'Vorige periode', average: 'Gemiddeld'},
     },
     allSettingsScreen: {
         subscription: 'Abonnement',
@@ -1339,6 +1340,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Voordat je afstand kunt bijhouden, moet je je huisadres toevoegen aan je privéprofiel. Deze werkruimte gebruikt dit adres voor woon-werkverkeeraftrek.',
             cta: 'Thuisadres toevoegen',
         },
+        expenseAdded: 'Uitgave toegevoegd',
+        invoiceSent: 'Factuur verzonden',
         amount: 'Bedrag',
         percent: 'Procent',
         date: 'Datum',
@@ -1911,6 +1914,7 @@ const translations: TranslationDeepObject<typeof en> = {
             prompt: 'Schakel tags in op de werkruimte om de onkostendetails te bewerken of de tag uit deze onkosten te verwijderen.',
             confirmText: 'Label verwijderen',
         },
+        undeletedExpense: 'heeft deze uitgave teruggezet',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `kilometervergoedingen bijgewerkt voor de nieuwe workspace - ${policyName}`,
     },
     transactionMerge: {
@@ -2192,7 +2196,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Profielavatar',
         customInstructions: 'Aangepaste instructies',
         copilotIntoAccount: 'Copilot naar account',
-        viewMemberHistory: 'Ledengeschiedenis bekijken',
+        seeChatHistory: 'Chatgeschiedenis bekijken',
         viewAgentHistory: 'Agentgeschiedenis bekijken',
         publicSection: {
             title: 'Openbaar',
@@ -2323,7 +2327,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Resultaten',
             releaseOptions: 'Opties voor vrijgeven',
             testingPreferences: 'Testvoorkeuren',
-            useStagingServer: 'Stagingserver gebruiken',
+            server: 'Server',
+            servers: {
+                production: {label: 'Productie', description: 'De live-omgeving die echte gebruikers zien'},
+                staging: {label: 'Staging', description: 'Kopie van productie. Wordt gebruikt voor de eindvalidatie'},
+                qa: {label: 'QA', description: 'Experimentele omgeving voor tests'},
+            },
+            serverPinnedDescription: 'Deze build communiceert altijd met één server, dus dit kan hier niet worden gewijzigd.',
             forceOffline: 'Offline forceren',
             simulatePoorConnection: 'Slechte internetverbinding simuleren',
             simulateFailingNetworkRequests: 'Netwerkaanvragen mislukken simuleren',
@@ -2549,7 +2559,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Tweefactorauthenticatie vereist',
         twoFactorAuthIsRequiredForAdminsTitle: 'Schakel tweestapsverificatie in',
         twoFactorAuthIsRequiredXero: 'Je Xero-boekhoudkoppeling vereist tweefactorauthenticatie.',
-        twoFactorAuthIsRequiredCompany: 'Je bedrijf vereist tweefactorauthenticatie.',
+        twoFactorAuthIsRequiredCompany: 'Je bedrijf vereist tweefactorauthenticatie (2FA).',
         twoFactorAuthCannotDisable: 'Kan 2FA niet uitschakelen',
         twoFactorAuthRequired: 'Tweestapsverificatie (2FA) is vereist voor je Xero-verbinding en kan niet worden uitgeschakeld.',
         replaceDevice: 'Apparaat vervangen',
@@ -2561,6 +2571,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: 'Scan de QR-code met je nieuwe apparaat en voer daarna de code in om de installatie te voltooien.',
         downloadCodes: 'Codes downloaden',
         copyCodes: 'Codes kopiëren',
+        enable2FA: 'Inschakelen',
     },
     recoveryCodeForm: {
         error: {
@@ -3005,6 +3016,9 @@ ${amount} voor ${merchant} - ${date}`,
         memberAlreadyInWorkflowTitle: 'Lid bevindt zich al in een workflow',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} bevindt zich al in een goedkeuringsworkflow die indient bij ${approverName}. Door het lid hier toe te voegen, wordt het naar deze workflow verplaatst.`,
+        moveEveryoneToThisWorkflowTitle: 'Verplaats iedereen naar deze workflow',
+        moveEveryoneToThisWorkflowPrompt:
+            'Je staat op het punt om iedereen naar deze goedkeuringsworkflow te verplaatsen. Dit verwijdert alle andere goedkeuringsworkflows en verplaatst iedereen naar deze. Deze actie kan niet ongedaan worden gemaakt.',
     },
     workflowsApproverPage: {
         genericErrorMessage: 'De fiatteur kon niet worden gewijzigd. Probeer het opnieuw of neem contact op met support.',
@@ -3140,6 +3154,8 @@ ${amount} voor ${merchant} - ${date}`,
             updateAvatar: 'Er is een probleem opgetreden bij het bijwerken van de avatar van deze agent',
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} heeft de instructies van deze agent bijgewerkt.\nVorige instructies:\n${previousPrompt}\nNieuwe instructies:\n${newPrompt}`,
     newAgentPage: {
         title: 'Nieuwe agent',
         buildCustomAgent: 'Eigen agent bouwen',
@@ -3316,6 +3332,7 @@ ${amount} voor ${merchant} - ${date}`,
         timeExpiredAnnouncement: 'De tijd is verstreken',
         error: {
             pleaseFillSecurityCode: 'Voer je beveiligingscode in',
+            tooManyAttempts: 'Te veel pogingen. Probeer het later opnieuw.',
             incorrectSecurityCode: 'Onjuiste of ongeldige beveiligingscode. Probeer het opnieuw of vraag een nieuwe code aan.',
             pleaseFillTwoFactorAuth: 'Voer je twee-factor-authenticatiecode in',
         },
@@ -3403,9 +3420,9 @@ ${amount} voor ${merchant} - ${date}`,
             otherAccountingSoftware: 'Naam van de software',
         },
         interestedFeatures: {
-            title: 'In welke functies ben je geïnteresseerd?',
-            featuresAlreadyEnabled: 'Hier zijn onze populairste functies:',
-            featureYouMayBeInterestedIn: 'Schakel extra functies in:',
+            title: 'Selecteer de functies die je wilt',
+            featuresAlreadyEnabled: 'Je werkruimte heeft het volgende al ingeschakeld:',
+            featureYouMayBeInterestedIn: 'Schakel extra functies in die je mogelijk interesseren:',
         },
         error: {
             requiredFirstName: 'Voer je voornaam in om door te gaan',
@@ -4655,21 +4672,21 @@ ${amount} voor ${merchant} - ${date}`,
         },
         nudge: {
             airfareManual:
-                'Wist je dat je rechtstreeks in Expensify vluchten kunt boeken en beheren? Vermijd de volgende keer het gedoe van het handmatig aanmaken van je uitgave en boek gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Wist je dat je rechtstreeks in Expensify vluchten kunt boeken en nog steeds miles spaart met je frequent flyer-programma’s? Vermijd de volgende keer het gedoe van het handmatig aanmaken van je uitgave en boek gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Wist je dat je rechtstreeks in Expensify vluchten kunt boeken en beheren? En dat bonnen automatisch voor je worden geüpload? Boek de volgende keer gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Wist je dat je rechtstreeks in Expensify vluchten kunt boeken en nog steeds miles verdient met je frequent flyer-programma’s? Het uploadt ook automatisch bonnetjes voor je. Boek de volgende keer gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Wist je dat je hotelovernachtingen direct in Expensify kunt boeken en beheren? Vermijd de volgende keer het gedoe van het handmatig aanmaken van je uitgave en boek gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Wist je dat je hotelovernachtingen direct in Expensify kunt boeken en toch je hotelspaarprogramma’s kunt blijven gebruiken? Vermijd de volgende keer het gedoe van het handmatig aanmaken van je uitgave en boek eenvoudig via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                'Wist je dat je hotelverblijven direct in Expensify kunt boeken en beheren? Boek de volgende keer gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Wist je dat je hotelovernachtingen rechtstreeks in Expensify kunt boeken en toch je hotel-loyaliteitsprogramma’s kunt gebruiken? Boek de volgende keer gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                'Wist je dat je autoverhuur rechtstreeks in Expensify kunt boeken en beheren? Vermijd de volgende keer het gedoe van het handmatig aanmaken van je uitgave en boek gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Wist je dat je rechtstreeks in Expensify autoverhuur kunt boeken en toch je loyaliteitsprogramma’s voor huurauto’s kunt blijven gebruiken? Vermijd de volgende keer het gedoe van het handmatig aanmaken van je uitgave en boek gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                'Wist je dat je autoverhuur rechtstreeks in Expensify kunt boeken en beheren? Boek de volgende keer eenvoudig via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Wist je dat je autoverhuur direct in Expensify kunt boeken en toch je loyaliteitsprogramma’s voor autoverhuur kunt blijven gebruiken? Boek de volgende keer gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Wist je dat je treinreizen direct in Expensify kunt boeken en beheren? Vermijd de volgende keer het gedoe van het handmatig aanmaken van je uitgave en boek gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Wist je dat je treinreizen direct in Expensify kunt boeken en toch je loyaliteitsprogramma’s voor de trein en je kortingskaarten kunt gebruiken? Bespaar jezelf de volgende keer de moeite van het handmatig aanmaken van je onkostendeclaratie en boek gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Wist je dat je treinreizen rechtstreeks in Expensify kunt boeken en beheren? En dat bonnen automatisch voor je worden geüpload? Boek de volgende keer gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Wist je dat je treinreizen direct in Expensify kunt boeken en toch je treinspaarprogramma’s en kortingskaarten kunt gebruiken? Bonnetjes worden ook automatisch voor je geüpload. Boek de volgende keer gewoon via <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 'Wist je dat je groepsreizen zoals deze direct in Expensify kunt boeken en beheren? Bespaar jezelf de moeite de volgende keer en probeer onze tool <a href="https://help.expensify.com/travel/hubs/event-management/">Reisevenementen</a> eens uit.',
             hotelBlockCard:
@@ -6362,6 +6379,8 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
             csvColumnType: 'Type',
             csvColumnLimitType: 'Limiettype',
             csvColumnLimit: 'Limiet',
+            noCardFeedsAvailable: 'Geen kaartfeeds beschikbaar',
+            noCardFeedsAvailableDescription: 'Er zijn geen kaartfeeds beschikbaar voor deze workspace.',
         },
         categories: {
             deleteCategories: 'Categorieën verwijderen',
@@ -6377,6 +6396,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
             deleteFailureMessage: 'Er is een fout opgetreden bij het verwijderen van de categorie, probeer het opnieuw',
             categoryName: 'Categorienaam',
             requiresCategory: 'Leden moeten alle uitgaven categoriseren',
+            autoCategorizeNewExpenses: 'Nieuwe uitgaven automatisch categoriseren',
             showCategoryGLCodes: 'Toon GL-codes bij het categoriseren van uitgaven',
             needCategoryForExportToIntegration: (connectionName: string) => `Alle onkosten moeten worden gecategoriseerd om te kunnen exporteren naar ${connectionName}.`,
             subtitle: 'Krijg beter inzicht in waar geld wordt uitgegeven. Gebruik onze standaardcategorieën of voeg je eigen categorieën toe.',
@@ -6600,7 +6620,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
                 corporate: 'Beperken van het verwijderen van transacties',
                 personal: 'Verwijderen van transacties toestaan',
                 setFeedNameDescription: 'Geef de kaartfeed een unieke naam zodat je deze van de andere kunt onderscheiden',
-                setTransactionLiabilityDescription: 'Indien ingeschakeld kunnen kaarthouders kaarttransacties verwijderen. Nieuwe transacties zullen deze regel volgen.',
+                setTransactionLiabilityDescription: 'Kaarthouders kunnen transacties verwijderen. Geldt alleen voor nieuwe transacties.',
                 emptyAddedFeedTitle: 'Geen kaarten in deze feed',
                 emptyAddedFeedDescription: 'Controleer of er kaarten in de kaartfeed van je bank staan.',
                 pendingFeedTitle: `We beoordelen je aanvraag...`,
@@ -7077,6 +7097,15 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             peopleAdmins: 'People-beheerders',
             paymentsAdmins: 'Betalingsbeheerders',
             members: 'Leden',
+            workArrangement: 'Werkregeling',
+            officeBased: 'Op kantoor',
+            noRegularWorkspace: 'Op afstand of mobiel',
+            workArrangementPage: {
+                title: 'Werkregeling',
+                optionOfficeBasedHelp: 'Lid pendelt naar een kantoor. Gewone woon-werkverplaatsingen komen niet in aanmerking voor vergoeding.',
+                optionNoRegularWorkspaceHelp: 'Lid werkt thuis of reist tussen locaties zonder vaste kantoorlocatie, waardoor woon-werkregels niet van toepassing zijn.',
+                futureOnlyNote: 'Wijzigingen zijn alleen van toepassing op toekomstige kilometerberekeningen. Bestaande kilometerdeclaraties worden niet opnieuw berekend.',
+            },
         },
         card: {
             getStartedIssuing: 'Begin met het uitgeven van je eerste virtuele of fysieke kaart.',
@@ -7462,6 +7491,8 @@ Het Control-abonnement begint bij $9 per actieve deelnemer per maand.`,
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Schakel automatisch synchroniseren in om dit te ontgrendelen.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `Je QuickBooks Online-verbinding verloopt op ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Je QuickBooks Online-verbinding is op ${date} verlopen.`,
         },
         export: {
             notReadyHeading: 'Niet klaar om te exporteren',
@@ -8123,6 +8154,8 @@ Vereis onkostendetails zoals bonnen en beschrijvingen, stel limieten en standaar
                 autoPayApprovedReportsSubtitle: 'Configureren welke onkostendeclaraties in aanmerking komen voor automatische betaling.',
                 autoPayApprovedReportsLimitError: (currency?: string) => `Voer een bedrag in dat lager is dan ${currency ?? ''}20.000`,
                 autoPayApprovedReportsLockedSubtitle: 'Ga naar Meer functies en schakel Workflows in, voeg vervolgens Betalingen toe om deze functie te ontgrendelen.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `Automatisch betalen is alleen beschikbaar met het Control-abonnement. [Upgrade](${upgradeLink}) om deze functie te ontgrendelen.`,
                 autoPayReportsUnderTitle: 'Automatisch rapporten betalen onder',
                 autoPayReportsUnderDescription: 'Volledig conforme onkostendeclaraties onder dit bedrag worden automatisch betaald.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Voeg ${featureName} toe om deze functie te ontgrendelen.`,
@@ -8212,6 +8245,7 @@ Vereis onkostendetails zoals bonnen en beschrijvingen, stel limieten en standaar
                 flagAmountsOver: 'Markeer bedragen boven',
                 flagAmountsOverDescription: (categoryName: string) => `Is van toepassing op de categorie “${categoryName}”.`,
                 flagAmountsOverSubtitle: 'Dit overschrijft het maximale bedrag voor alle onkosten.',
+                expenseLimitType: 'Type onkostenlimiet',
                 expenseLimitTypes: {
                     expense: 'Individuele uitgave',
                     expenseSubtitle:
@@ -8808,6 +8842,35 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             syncTravelInvoicingSettlements: 'Reisfacturering-afrekeningen synchroniseren',
             travelInvoicingSettlementAccount: {label: 'Reisfacturatie-vereffeningsrekening', description: 'Kies je afrekenrekening en we maken de betaling aan in Campfire.'},
             travelInvoicingPayableAccount: {label: 'Te betalen rekening voor reisinvoicing'},
+            exportToMultipleAccounts: 'Export naar meerdere rekeningen instellen',
+            cardProgramAccount: {
+                label: 'Kaartprogramma-account',
+                description: 'Overschrijf de werkruimteaccount voor deze kaartprogramma’s.',
+                descriptionLevel2: 'Overschrijf de workspace-account voor dit kaartprogramma.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Alle programma’s gebruiken de standaardrekening';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} programma met aangepaste rekening`;
+                    }
+                    return `${customAccountsCount} programma’s met aangepaste rekeningen`;
+                },
+            },
+            cardAccount: {
+                label: 'Account per kaart',
+                description: 'Overschrijf de programmarekening voor individuele kaarten.',
+                descriptionLevel2: 'Overschrijf de programmarekening voor deze kaarten.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Alle kaarten gebruiken programmarekeningen';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} kaart met aangepast account`;
+                    }
+                    return `${customAccountsCount} kaarten met aangepaste rekeningen`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Dynamics 365 Business Central-configuratie',
@@ -8824,6 +8887,51 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             importDescription: 'Kies welke codeerconfiguraties je uit Dynamics 365 Business Central wilt importeren.',
             items: 'Artikelen',
             enableNewCategories: 'Nieuw geïmporteerde categorieën inschakelen',
+            exportDescription: 'Stel in hoe Expensify-gegevens worden geëxporteerd naar Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Transactiedatum',
+                description: 'Gebruik deze datum bij het exporteren van rapporten naar Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Datum van de laatste uitgave',
+                        description: 'Datum van de meest recente uitgave op het rapport.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Exportdatum',
+                        description: 'Datum waarop het rapport naar Dynamics 365 Business Central is geëxporteerd.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Inleverdatum',
+                        description: 'Datum waarop het rapport ter goedkeuring is ingediend.',
+                    },
+                },
+            },
+            exportReimbursable: 'Vergoedbare uitgaven exporteren als',
+            exportNonReimbursable: 'Bedrijfspaskosten exporteren als',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Algemeen journaal',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Inkoopfacturen',
+            },
+            reimbursableAccount: {
+                label: 'Rekening voor vergoedbare uitgaven',
+                description: 'Kies waarheen vergoedbare uitgaven worden geëxporteerd.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Standaard leverancier bedrijfspas',
+                description: 'Kies een standaard Dynamics 365 Business Central-leverancier voor uitgaven die niet automatisch worden gekoppeld.',
+            },
+            companyCardAccount: {
+                label: 'Bedrijfskaartrekening',
+                description: 'Kies waarheen transacties met bedrijfspassen worden geëxporteerd.',
+            },
+            paymentMethod: {
+                label: 'Betalingswijze',
+                description: 'Kies een betalingswijze voor inkoopfacturen, zodat Dynamics 365 Business Central ze kan afstemmen met je bank.',
+            },
+            noBankAccountsFound: 'Geen bankrekeningen gevonden',
+            noBankAccountsFoundDescription: 'Voeg bankrekeningen toe in Dynamics 365 Business Central en synchroniseer de verbinding opnieuw',
+            noPaymentMethodsFound: 'Geen betalingswijzen gevonden',
+            noPaymentMethodsFoundDescription: 'Voeg betalingswijzen toe in Dynamics 365 Business Central en synchroniseer de verbinding opnieuw',
         },
     },
     getAssistancePage: {
@@ -9478,6 +9586,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `factuurinstellingen gekopieerd van <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `reiskosteninstellingen gekopieerd van <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'ingeschakeld' : 'uitgeschakeld'} het automatisch categoriseren van nieuwe uitgaven`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'ingeschakeld' : 'uitgeschakeld'} de vereiste voor uitgavencategorisatie`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'ingeschakeld' : 'uitgeschakeld'} de vereiste voor het taggen van uitgaven`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `heeft de wisselkoerskostinstelling bijgewerkt naar ‘${preferenceLabel}’`,
@@ -9514,6 +9623,10 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 : `heeft de goedkeuringsworkflow voor ${member} gewijzigd zodat rapporten boven ${previousLimit} niet meer worden doorgestuurd`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `heeft de goedkeuringsworkflow voor ${member} gewijzigd om rapporten boven ${limit} door te sturen (voorheen ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `heeft de werkregeling van ${displayName} gewijzigd naar ${newArrangement} (voorheen ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `heeft de standaardwerkregeling gewijzigd naar ${newArrangement} (voorheen ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Lid niet gevonden.',
@@ -9805,6 +9918,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
         noCategory: 'Geen categorie',
         noMerchant: 'Geen handelaar',
         noTag: 'Geen tag',
+        noVendor: 'Geen leverancier',
         expenseType: 'Onkostentype',
         receiptType: 'Bontype',
         receiptTypeValues: {
@@ -10927,7 +11041,18 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                 invalid: 'Deze code is ongeldig',
             },
         },
-        paymentHistory: {title: 'Bekijk betalingsgeschiedenis', subtitle: 'Je volledige maandelijkse betalingsgeschiedenis die op deze rekening in rekening is gebracht.'},
+        paymentHistory: {
+            title: 'Bekijk betalingsgeschiedenis',
+            subtitle: 'Je volledige maandelijkse betalingsgeschiedenis die op deze rekening in rekening is gebracht.',
+            payments: 'Betalingen',
+            inclTax: 'incl. btw',
+            empty: 'Nog geen betalingen.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 actieve gebruiker',
+                other: `${count} actieve gebruikers`,
+            }),
+            state: {paid: 'Betaald', cleared: 'Afgeboekt', failed: 'Mislukt', refunded: 'Terugbetaald', disputed: 'Betwist', balanceTransfer: 'Saldo-overboeking'},
+        },
         subscriptionSettings: {
             title: 'Abonnementsinstellingen',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -11041,6 +11166,8 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             `Weet je zeker dat je je copilot-toegang tot het Expensify-account van ${delegatorName} wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.`,
         removeCopilotAccessConfirm: 'Toegang verwijderen',
         copilotAccess: 'Copilot-toegang',
+        leaveAccount: 'Account verlaten',
+        leaveAccountConfirmationText: 'Je gaat terug naar je eigen account. Je wordt niet volledig uitgelogd.',
     },
     debug: {
         debug: 'Debug',
@@ -11500,5 +11627,12 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
             description: `<muted-text>Maak aangepaste agents om uitgaven te beoordelen, goed te keuren en door te sturen op basis van regels die jij instelt. <a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">Meer informatie</a>.</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Verleng je abonnement voor een periode van 12 maanden, van ${startDate} tot ${endDate}.`,
+        title: 'Verleng je Expensify-abonnement',
+        subtitle: 'Weer iets minder te doen vóór het nieuwe jaar.',
+        confirmTitle: 'Verlenging bevestigen',
+        renew: 'Verleng',
+    },
 };
 export default translations;
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 482f1f887b4a..d0218ffe04fe 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -416,8 +416,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'Pomiń',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `Potrzebujesz czegoś konkretnego? Porozmawiaj ze swoim opiekunem konta, ${accountManagerDisplayName}.`,
-        chatNow: 'Czat teraz',
         workEmail: 'Służbowy e-mail',
         destination: 'Cel',
         subrate: 'Stawka dodatkowa',
@@ -518,6 +516,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: 'Poprzedni rok',
         nextYear: 'W przyszłym roku',
         avatar: 'Avatar',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} z ${total}`,
         editor: 'Edytor',
         restrictions: 'Ograniczenia',
         tryAgain: 'Spróbuj ponownie',
@@ -527,6 +526,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: 'Brak wyników. Spróbuj zmienić filtry lub zapytanie wyszukiwania',
         unableToDisplayChart: 'Nie można wyświetlić wykresu',
         webGLNotSupported: 'Twoja przeglądarka nie obsługuje WebGL. Włącz ją albo zmień przeglądarkę.',
+        chartFailedToLoad: 'Nie udało się załadować wykresu. Odśwież stronę i spróbuj ponownie.',
         apiKey: 'Klucz API',
         exportsTo: 'Eksporty do',
     },
@@ -1183,6 +1183,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: 'Zobacz w Wydatkach',
         emptyState: {title: 'Nic do wyświetlenia', subtitle: 'Spróbuj zmienić kryteria powyżej'},
         noExpensesState: {title: 'Zobacz, na co idą twoje pieniądze', subtitle: 'Gdy będziesz mieć wydatki, zobaczysz trendy w wydawaniu, najważniejszych sprzedawców i więcej.'},
+        compare: {label: 'Porównaj', previousPeriod: 'Poprzedni okres', average: 'Średnia'},
     },
     allSettingsScreen: {
         subscription: 'Subskrypcja',
@@ -1372,6 +1373,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Zanim zaczniesz śledzić dystans, musisz dodać swój adres domowy do prywatnego profilu. To miejsce pracy używa tego adresu do odliczeń dojazdów.',
             cta: 'Dodaj adres domowy',
         },
+        expenseAdded: 'Dodano wydatek',
+        invoiceSent: 'Wysłano fakturę',
         amount: 'Kwota',
         percent: 'Procent',
         date: 'Data',
@@ -1946,6 +1949,7 @@ const translations: TranslationDeepObject<typeof en> = {
             prompt: 'Włącz tagi w przestrzeni roboczej, aby edytować szczegóły wydatku lub usunąć ten tag z tego wydatku.',
             confirmText: 'Usuń znacznik',
         },
+        undeletedExpense: 'przywrócił ten wydatek',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `stawki za przejechany dystans zaktualizowane dla nowej przestrzeni roboczej – ${policyName}`,
     },
     transactionMerge: {
@@ -2227,7 +2231,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Awatar profilu',
         customInstructions: 'Niestandardowe instrukcje',
         copilotIntoAccount: 'Copilot do konta',
-        viewMemberHistory: 'Zobacz historię członka',
+        seeChatHistory: 'Zobacz historię czatu',
         viewAgentHistory: 'Zobacz historię agenta',
         publicSection: {
             title: 'Public',
@@ -2357,7 +2361,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Wyniki',
             releaseOptions: 'Opcje wydania',
             testingPreferences: 'Preferencje testowe',
-            useStagingServer: 'Użyj serwera testowego',
+            server: 'Serwer',
+            servers: {
+                production: {label: 'Produkcja', description: 'Środowisko produkcyjne, które widzą prawdziwi użytkownicy'},
+                staging: {label: 'Staging', description: 'Kopia produkcji. Używana do ostatecznej weryfikacji'},
+                qa: {label: 'QA', description: 'Eksperymentalne środowisko używane do testów'},
+            },
+            serverPinnedDescription: 'Ta wersja zawsze łączy się z jednym serwerem, więc nie można tego tutaj zmienić.',
             forceOffline: 'Wymuś tryb offline',
             simulatePoorConnection: 'Symuluj słabe połączenie internetowe',
             simulateFailingNetworkRequests: 'Symuluj nieudane żądania sieciowe',
@@ -2587,7 +2597,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Wymagane uwierzytelnianie dwuskładnikowe',
         twoFactorAuthIsRequiredForAdminsTitle: 'Włącz uwierzytelnianie dwuskładnikowe',
         twoFactorAuthIsRequiredXero: 'Twoje połączenie księgowe z Xero wymaga uwierzytelniania dwuskładnikowego.',
-        twoFactorAuthIsRequiredCompany: 'Twoetapowe uwierzytelnianie jest wymagane przez Twoją firmę.',
+        twoFactorAuthIsRequiredCompany: 'Twoja firma wymaga uwierzytelniania dwuskładnikowego (2FA).',
         twoFactorAuthCannotDisable: 'Nie można wyłączyć 2FA',
         twoFactorAuthRequired: 'Dla połączenia z Xero wymagana jest weryfikacja dwuetapowa (2FA) i nie można jej wyłączyć.',
         replaceDevice: 'Zastąp urządzenie',
@@ -2599,6 +2609,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: 'Zeskanuj kod QR nowym urządzeniem, a następnie wpisz ten kod, aby zakończyć konfigurację.',
         downloadCodes: 'Pobierz kody',
         copyCodes: 'Skopiuj kody',
+        enable2FA: 'Włącz',
     },
     recoveryCodeForm: {
         error: {
@@ -3034,6 +3045,9 @@ ${amount} dla ${merchant} - ${date}`,
         memberAlreadyInWorkflowTitle: 'Członek jest już w procesie',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} jest już w procesie zatwierdzania, który przesyła do ${approverName}. Dodanie go tutaj przeniesie go do tego procesu.`,
+        moveEveryoneToThisWorkflowTitle: 'Przenieś wszystkich do tego przepływu pracy',
+        moveEveryoneToThisWorkflowPrompt:
+            'Za chwilę przeniesiesz wszystkich do tego schematu zatwierdzania. Spowoduje to usunięcie wszystkich innych schematów zatwierdzania i przeniesienie wszystkich do tego jednego. Tej czynności nie da się cofnąć.',
     },
     workflowsApproverPage: {
         genericErrorMessage: 'Nie udało się zmienić osoby zatwierdzającej. Spróbuj ponownie lub skontaktuj się z pomocą techniczną.',
@@ -3167,6 +3181,8 @@ ${amount} dla ${merchant} - ${date}`,
             updateAvatar: 'Wystąpił problem z aktualizacją awatara tego agenta',
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} zaktualizował(-a) instrukcje tego agenta.\nPoprzednie instrukcje:\n${previousPrompt}\nNowe instrukcje:\n${newPrompt}`,
     newAgentPage: {
         title: 'Nowy agent',
         buildCustomAgent: 'Utwórz własnego agenta',
@@ -3345,6 +3361,7 @@ ${amount} dla ${merchant} - ${date}`,
         timeExpiredAnnouncement: 'Czas minął',
         error: {
             pleaseFillSecurityCode: 'Wpisz swój kod bezpieczeństwa',
+            tooManyAttempts: 'Za dużo prób. Spróbuj ponownie później.',
             incorrectSecurityCode: 'Nieprawidłowy lub nieważny kod zabezpieczający. Spróbuj ponownie albo poproś o nowy kod.',
             pleaseFillTwoFactorAuth: 'Wprowadź swój kod uwierzytelniania dwuskładnikowego',
         },
@@ -3433,9 +3450,9 @@ ${amount} dla ${merchant} - ${date}`,
             otherAccountingSoftware: 'Nazwa oprogramowania',
         },
         interestedFeatures: {
-            title: 'Jakie funkcje Cię interesują?',
-            featuresAlreadyEnabled: 'Oto nasze najpopularniejsze funkcje:',
-            featureYouMayBeInterestedIn: 'Włącz dodatkowe funkcje:',
+            title: 'Wybierz funkcje, których potrzebujesz',
+            featuresAlreadyEnabled: 'W Twojej przestrzeni roboczej są już włączone następujące funkcje:',
+            featureYouMayBeInterestedIn: 'Włącz dodatkowe funkcje, które mogą Cię zainteresować:',
         },
         error: {
             requiredFirstName: 'Podaj swoje imię, aby kontynuować',
@@ -4684,21 +4701,21 @@ ${amount} dla ${merchant} - ${date}`,
         },
         nudge: {
             airfareManual:
-                'Czy wiesz, że możesz rezerwować i zarządzać lotami bezpośrednio w Expensify? Następnym razem uniknij kłopotu ręcznego tworzenia wydatku i po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Wiesz, że możesz rezerwować loty bezpośrednio w Expensify i nadal zbierać mile w swoich programach lojalnościowych dla często podróżujących? Następnym razem uniknij kłopotu ręcznego tworzenia wydatku i po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Wiesz, że możesz rezerwować i zarządzać lotami bezpośrednio w Expensify? I że paragony są automatycznie przesyłane za ciebie? Następnym razem po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Wiesz, że możesz rezerwować loty bezpośrednio w Expensify i nadal zbierać mile w swoich programach lojalnościowych linii lotniczych? Paragony też są automatycznie przesyłane za Ciebie. Następnym razem po prostu zarezerwuj lot przez <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Czy wiesz, że możesz rezerwować i zarządzać pobytami w hotelach bezpośrednio w Expensify? Następnym razem uniknij kłopotu ręcznego tworzenia wydatku i po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Wiesz, że możesz rezerwować pobyty w hotelach bezpośrednio w Expensify i nadal korzystać ze swoich programów lojalnościowych hoteli? Następnym razem uniknij kłopotu z ręcznym tworzeniem wydatku i po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                'Wiesz, że możesz rezerwować i zarządzać pobytami w hotelach bezpośrednio w Expensify? Następnym razem po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Wiesz, że możesz rezerwować pobyty w hotelach bezpośrednio w Expensify i nadal korzystać ze swoich programów lojalnościowych hoteli? Następnym razem po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                'Wiesz, że możesz rezerwować i zarządzać wynajmem samochodów bezpośrednio w Expensify? Następnym razem uniknij kłopotu ręcznego tworzenia wydatku i po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Wiesz, że możesz rezerwować wynajem samochodów bezpośrednio w Expensify i nadal korzystać ze swoich programów lojalnościowych wypożyczalni? Następnym razem uniknij kłopotu z ręcznym tworzeniem wydatku i po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                'Wiesz, że możesz rezerwować i zarządzać wynajmem samochodów bezpośrednio w Expensify? Następnym razem po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Wiesz, że możesz rezerwować samochody w Expensify i nadal korzystać ze swoich programów lojalnościowych wypożyczalni? Następnym razem po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Wiesz, że możesz rezerwować i zarządzać przejazdami pociągiem bezpośrednio w Expensify? Następnym razem uniknij kłopotu z ręcznym tworzeniem wydatku i po prostu zarezerwuj przejazd przez <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Wiesz, że możesz rezerwować przejazdy pociągiem bezpośrednio w Expensify i nadal korzystać ze swoich programów lojalnościowych kolei oraz kart zniżkowych? Następnym razem uniknij kłopotu ręcznego tworzenia wydatku i po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Wiesz, że możesz rezerwować i zarządzać przejazdami pociągiem bezpośrednio w Expensify? I że paragony są automatycznie przesyłane za Ciebie? Następnym razem po prostu zarezerwuj przez <a href="https://travel.expensify.com">Expensify Travel</a>',
+                'Wiesz, że możesz rezerwować przejazdy pociągiem bezpośrednio w Expensify i wciąż korzystać ze swoich programów lojalnościowych kolei oraz kart zniżkowych? Paragony też są automatycznie przesyłane za ciebie. Następnym razem po prostu zarezerwuj podróż przez <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 'Wiesz, że możesz rezerwować i zarządzać takimi wyjazdami grupowymi bezpośrednio w Expensify? Oszczędź sobie zachodu następnym razem i wypróbuj nasze narzędzie <a href="https://help.expensify.com/travel/hubs/event-management/">Travel Events</a>.',
             hotelBlockCard:
@@ -6385,6 +6402,8 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
             csvColumnType: 'Typ',
             csvColumnLimitType: 'Typ limitu',
             csvColumnLimit: 'Limit',
+            noCardFeedsAvailable: 'Brak dostępnych kanałów kart',
+            noCardFeedsAvailableDescription: 'Dla tego obszaru roboczego nie ma dostępnych żadnych kanałów kart.',
         },
         categories: {
             deleteCategories: 'Usuń kategorie',
@@ -6400,6 +6419,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
             deleteFailureMessage: 'Wystąpił błąd podczas usuwania kategorii, spróbuj ponownie',
             categoryName: 'Nazwa kategorii',
             requiresCategory: 'Członkowie muszą kategoryzować wszystkie wydatki',
+            autoCategorizeNewExpenses: 'Automatycznie kategoryzuj nowe wydatki',
             showCategoryGLCodes: 'Pokaż kody GL podczas kategoryzowania wydatków',
             needCategoryForExportToIntegration: (connectionName: string) => `Wszystkie wydatki muszą zostać skategoryzowane, aby można je było wyeksportować do ${connectionName}.`,
             subtitle: 'Uzyskaj lepszy wgląd w to, gdzie wydawane są pieniądze. Użyj naszych domyślnych kategorii lub dodaj własne.',
@@ -6624,7 +6644,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
                 corporate: 'Ogranicz usuwanie transakcji',
                 personal: 'Zezwól na usuwanie transakcji',
                 setFeedNameDescription: 'Nadaj kanałowi karty unikalną nazwę, aby odróżnić go od pozostałych',
-                setTransactionLiabilityDescription: 'Po włączeniu posiadacze kart mogą usuwać transakcje kartą. Nowe transakcje będą podlegać tej zasadzie.',
+                setTransactionLiabilityDescription: 'Posiadacze karty mogą usuwać transakcje. Dotyczy tylko nowych transakcji.',
                 emptyAddedFeedTitle: 'Brak kart w tym kanale',
                 emptyAddedFeedDescription: 'Upewnij się, że w strumieniu kart Twojego banku znajdują się karty.',
                 pendingFeedTitle: `Przeglądamy Twoje zgłoszenie…`,
@@ -7102,6 +7122,15 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
             peopleAdmins: 'Administratorzy osób',
             paymentsAdmins: 'Administratorzy płatności',
             members: 'Członkowie',
+            workArrangement: 'Ustalenia dotyczące pracy',
+            officeBased: 'Praca w biurze',
+            noRegularWorkspace: 'Zdalnie lub mobilnie',
+            workArrangementPage: {
+                title: 'Ustalenia dotyczące pracy',
+                optionOfficeBasedHelp: 'Członek dojeżdża do biura. Zwykłe dojazdy nie podlegają zwrotowi kosztów.',
+                optionNoRegularWorkspaceHelp: 'Członek pracuje z domu lub podróżuje między lokalizacjami bez stałego biura, więc zasady dotyczące dojazdów do pracy nie mają zastosowania.',
+                futureOnlyNote: 'Zmiany mają zastosowanie tylko do przyszłych obliczeń kilometrówki. Istniejące wydatki za przejazdy nie są przeliczane ponownie.',
+            },
         },
         card: {
             getStartedIssuing: 'Zacznij od wydania swojej pierwszej wirtualnej lub fizycznej karty.',
@@ -7486,6 +7515,8 @@ Plan Control zaczyna się od 9 USD za aktywnego członka miesięcznie.`,
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Aby odblokować, włącz automatyczną synchronizację.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `Twoje połączenie z QuickBooks Online wygaśnie ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Twoje połączenie z QuickBooks Online wygasło ${date}.`,
         },
         export: {
             notReadyHeading: 'Niegotowe do eksportu',
@@ -8149,6 +8180,8 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
                 autoPayApprovedReportsSubtitle: 'Skonfiguruj, które raporty wydatków kwalifikują się do automatycznej płatności.',
                 autoPayApprovedReportsLimitError: (currency?: string) => `Wprowadź kwotę mniejszą niż ${currency ?? ''}20 000`,
                 autoPayApprovedReportsLockedSubtitle: 'Przejdź do „Więcej funkcji” i włącz Workflows, a następnie dodaj płatności, aby odblokować tę funkcję.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `Automatyczna płatność jest dostępna tylko w planie Control. [Uaktualnij](${upgradeLink}), aby odblokować tę funkcję.`,
                 autoPayReportsUnderTitle: 'Automatycznie opłacaj raporty w ramach',
                 autoPayReportsUnderDescription: 'W pełni zgodne raporty wydatków poniżej tej kwoty zostaną opłacone automatycznie.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Dodaj ${featureName}, aby odblokować tę funkcję.`,
@@ -8235,6 +8268,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
                 flagAmountsOver: 'Oznaczaj kwoty powyżej',
                 flagAmountsOverDescription: (categoryName: string) => `Dotyczy kategorii „${categoryName}”.`,
                 flagAmountsOverSubtitle: 'To zastępuje maksymalną kwotę dla wszystkich wydatków.',
+                expenseLimitType: 'Typ limitu wydatków',
                 expenseLimitTypes: {
                     expense: 'Pojedynczy wydatek',
                     expenseSubtitle:
@@ -8823,6 +8857,35 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
             syncTravelInvoicingSettlements: 'Synchronizuj rozliczenia Travel Invoicing',
             travelInvoicingSettlementAccount: {label: 'Konto rozliczeniowe fakturowania podróży', description: 'Wybierz swoje konto rozliczeniowe, a my utworzymy płatność w Campfire.'},
             travelInvoicingPayableAccount: {label: 'Konto zobowiązań z tytułu faktur za podróże'},
+            exportToMultipleAccounts: 'Skonfiguruj eksport do wielu kont',
+            cardProgramAccount: {
+                label: 'Konto programu kartowego',
+                description: 'Zastąp konto przestrzeni roboczej dla tych programów kart.',
+                descriptionLevel2: 'Zastąp konto przestrzeni roboczej dla tego programu kart.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Wszystkie programy używają domyślnego konta';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} program z niestandardowym kontem`;
+                    }
+                    return `${customAccountsCount} programy z niestandardowymi kontami`;
+                },
+            },
+            cardAccount: {
+                label: 'Konto przypisane do karty',
+                description: 'Zastąp konto programu dla poszczególnych kart.',
+                descriptionLevel2: 'Zastąp konto programu dla tych kart.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Wszystkie karty korzystają z kont programu';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} karta z niestandardowym kontem`;
+                    }
+                    return `${customAccountsCount} karty z niestandardowymi kontami`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Konfiguracja Dynamics 365 Business Central',
@@ -8839,6 +8902,51 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
             importDescription: 'Wybierz, które konfiguracje kodowania zaimportować z Dynamics 365 Business Central.',
             items: 'Pozycje',
             enableNewCategories: 'Włącz nowo zaimportowane kategorie',
+            exportDescription: 'Skonfiguruj sposób eksportowania danych Expensify do Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Data transakcji',
+                description: 'Użyj tej daty podczas eksportowania raportów do Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Data ostatniego wydatku',
+                        description: 'Data ostatniego wydatku w raporcie.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Data eksportu',
+                        description: 'Data wyeksportowania raportu do Dynamics 365 Business Central.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Data przesłania',
+                        description: 'Data przesłania raportu do zatwierdzenia.',
+                    },
+                },
+            },
+            exportReimbursable: 'Eksportuj wydatki podlegające zwrotowi jako',
+            exportNonReimbursable: 'Eksportuj wydatki z firmowej karty jako',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Dziennik ogólny',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Faktury zakupu',
+            },
+            reimbursableAccount: {
+                label: 'Konto wydatków podlegających zwrotowi',
+                description: 'Wybierz, dokąd eksportować wydatki podlegające zwrotowi.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Domyślny dostawca karty firmowej',
+                description: 'Wybierz domyślnego dostawcę Dynamics 365 Business Central dla wydatków, które nie zostaną dopasowane automatycznie.',
+            },
+            companyCardAccount: {
+                label: 'Konto karty firmowej',
+                description: 'Wybierz, dokąd eksportować transakcje kartą firmową.',
+            },
+            paymentMethod: {
+                label: 'Metoda płatności',
+                description: 'Wybierz metodę płatności dla faktur zakupu, aby Dynamics 365 Business Central mógł uzgodnić je z Twoim bankiem.',
+            },
+            noBankAccountsFound: 'Nie znaleziono kont bankowych',
+            noBankAccountsFoundDescription: 'Dodaj konta bankowe w Dynamics 365 Business Central i ponownie zsynchronizuj połączenie',
+            noPaymentMethodsFound: 'Nie znaleziono metod płatności',
+            noPaymentMethodsFoundDescription: 'Dodaj metody płatności w Dynamics 365 Business Central i ponownie zsynchronizuj połączenie',
         },
     },
     getAssistancePage: {
@@ -9488,6 +9596,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `skopiowano ustawienia faktur z <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `skopiowano ustawienia podróży z <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'włączone' : 'wyłączone'} automatyczną kategoryzację nowych wydatków`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'włączone' : 'wyłączone'} wymóg kategoryzacji wydatków`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'włączone' : 'wyłączone'} wymóg tagowania wydatków`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `zaktualizowano ustawienie opłaty za przewalutowanie na „${preferenceLabel}”`,
@@ -9524,6 +9633,10 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 : `zmienił(a) proces akceptacji dla ${member}, żeby przestać przekazywać raporty powyżej ${previousLimit}`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `zmienił obieg akceptacji dla ${member}, aby przekazywać raporty powyżej ${limit} (wcześniej ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `zmienił(a) tryb pracy użytkownika ${displayName} na ${newArrangement} (wcześniej ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `zmienił domyślny tryb pracy na ${newArrangement} (wcześniej ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Nie znaleziono członka.',
@@ -9834,6 +9947,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
         noCategory: 'Brak kategorii',
         noMerchant: 'Brak sprzedawcy',
         noTag: 'Brak tagu',
+        noVendor: 'Brak dostawcy',
         expenseType: 'Typ wydatku',
         receiptType: 'Typ paragonu',
         receiptTypeValues: {
@@ -10945,7 +11059,18 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 invalid: 'Ten kod jest nieprawidłowy',
             },
         },
-        paymentHistory: {title: 'Zobacz historię płatności', subtitle: 'Pełna miesięczna historia płatności obciążających to konto.'},
+        paymentHistory: {
+            title: 'Zobacz historię płatności',
+            subtitle: 'Pełna miesięczna historia płatności obciążających to konto.',
+            payments: 'Płatności',
+            inclTax: 'z VAT',
+            empty: 'Brak płatności.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 aktywny użytkownik',
+                other: `${count} aktywnych użytkowników`,
+            }),
+            state: {paid: 'Opłacone', cleared: 'Rozliczono', failed: 'Niepowodzenie', refunded: 'Zwrócono', disputed: 'Kwestionowana', balanceTransfer: 'Przelew salda'},
+        },
         subscriptionSettings: {
             title: 'Ustawienia subskrypcji',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -11057,6 +11182,8 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
             `Czy na pewno chcesz usunąć swój dostęp kopilota do konta Expensify użytkownika ${delegatorName}? Tej czynności nie można cofnąć.`,
         removeCopilotAccessConfirm: 'Usuń dostęp',
         copilotAccess: 'Dostęp do Copilota',
+        leaveAccount: 'Opuść konto',
+        leaveAccountConfirmationText: 'Wrócisz do swojego konta. Nie zostaniesz całkowicie wylogowany.',
     },
     debug: {
         debug: 'Debug',
@@ -11515,5 +11642,12 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
             description: `<muted-text>Twórz niestandardowych agentów do przeglądania, zatwierdzania i kierowania wydatków na podstawie ustalonych przez siebie zasad. <a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">Dowiedz się więcej</a>.</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Odnów swoją subskrypcję na 12-miesięczny okres, od ${startDate} do ${endDate}.`,
+        title: 'Odnów swoją subskrypcję Expensify',
+        subtitle: 'O jedną rzecz mniej do zrobienia przed nowym rokiem.',
+        confirmTitle: 'Potwierdź odnowienie',
+        renew: 'Odnów',
+    },
 };
 export default translations;
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index ce56c5cad2bc..c3a3dd80685c 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -412,8 +412,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: 's',
         skip: 'Pular',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `Precisa de algo específico? Converse com seu gerente de conta, ${accountManagerDisplayName}.`,
-        chatNow: 'Conversar agora',
         workEmail: 'E-mail profissional',
         destination: 'Destino',
         subrate: 'Subtaxa',
@@ -514,6 +512,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: 'Ano anterior',
         nextYear: 'Ano que vem',
         avatar: 'Avatar',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `${current} de ${total}`,
         editor: 'Editor',
         restrictions: 'Restrições',
         tryAgain: 'Tentar novamente',
@@ -523,6 +522,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: 'Nenhum resultado. Tente ajustar seus filtros ou termo de pesquisa',
         unableToDisplayChart: 'Não foi possível exibir o gráfico',
         webGLNotSupported: 'Seu navegador não é compatível com WebGL. Ative-o ou mude de navegador.',
+        chartFailedToLoad: 'Não foi possível carregar o gráfico. Atualize a página e tente novamente.',
         apiKey: 'Chave de API',
         exportsTo: 'Exportações para',
     },
@@ -1162,6 +1162,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: 'Ver em Gastos',
         emptyState: {title: 'Nada para mostrar', subtitle: 'Tente ajustar seus critérios acima'},
         noExpensesState: {title: 'Veja para onde vai o seu dinheiro', subtitle: 'Quando você tiver despesas, vai encontrar tendências de gastos, principais estabelecimentos e muito mais.'},
+        compare: {label: 'Comparar', previousPeriod: 'Período anterior', average: 'Média'},
     },
     allSettingsScreen: {
         subscription: 'Assinatura',
@@ -1338,6 +1339,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : 'Antes de registrar a distância, você precisa adicionar seu endereço residencial ao seu perfil privado. Este workspace usa esse endereço para deduções de deslocamento.',
             cta: 'Adicionar endereço residencial',
         },
+        expenseAdded: 'Despesa adicionada',
+        invoiceSent: 'Fatura enviada',
         amount: 'Valor',
         percent: 'Porcentagem',
         date: 'Data',
@@ -1904,6 +1907,7 @@ const translations: TranslationDeepObject<typeof en> = {
             confirmText: 'Excluir categoria',
         },
         tagDisabledAlert: {title: 'Tag desativada', prompt: 'Ative as tags no workspace para editar os detalhes da despesa ou excluir a tag desta despesa.', confirmText: 'Excluir tag'},
+        undeletedExpense: 'restaurou esta despesa',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `taxas de distância atualizadas para o novo workspace - ${policyName}`,
     },
     transactionMerge: {
@@ -2185,7 +2189,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: 'Avatar do perfil',
         customInstructions: 'Instruções personalizadas',
         copilotIntoAccount: 'Copilot na conta',
-        viewMemberHistory: 'Ver histórico do membro',
+        seeChatHistory: 'Ver histórico do chat',
         viewAgentHistory: 'Ver histórico do agente',
         publicSection: {
             title: 'Público',
@@ -2315,7 +2319,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: 'Resultados',
             releaseOptions: 'Opções de lançamento',
             testingPreferences: 'Preferências de teste',
-            useStagingServer: 'Usar servidor de homologação',
+            server: 'Servidor',
+            servers: {
+                production: {label: 'Produção', description: 'O ambiente ativo que os usuários reais veem'},
+                staging: {label: 'Homologação', description: 'Cópia da produção. Usada para a validação final'},
+                qa: {label: 'QA', description: 'Ambiente experimental usado para testes'},
+            },
+            serverPinnedDescription: 'Esta versão sempre se conecta a um único servidor, portanto não é possível alterá-lo aqui.',
             forceOffline: 'Forçar modo offline',
             simulatePoorConnection: 'Simular conexão de internet ruim',
             simulateFailingNetworkRequests: 'Simular falhas em requisições de rede',
@@ -2541,7 +2551,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: 'Autenticação em duas etapas obrigatória',
         twoFactorAuthIsRequiredForAdminsTitle: 'Ative a autenticação em duas etapas',
         twoFactorAuthIsRequiredXero: 'Sua conexão contábil com o Xero exige autenticação em duas etapas.',
-        twoFactorAuthIsRequiredCompany: 'Sua empresa exige autenticação em duas etapas.',
+        twoFactorAuthIsRequiredCompany: 'Sua empresa exige autenticação de dois fatores (2FA).',
         twoFactorAuthCannotDisable: 'Não é possível desativar a 2FA',
         twoFactorAuthRequired: 'A autenticação em duas etapas (2FA) é obrigatória para sua conexão com o Xero e não pode ser desativada.',
         replaceDevice: 'Substituir dispositivo',
@@ -2553,6 +2563,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: 'Escaneie o código QR com seu novo dispositivo e depois insira o código para concluir a configuração.',
         downloadCodes: 'Baixar códigos',
         copyCodes: 'Copiar códigos',
+        enable2FA: 'Ativar',
     },
     recoveryCodeForm: {
         error: {
@@ -2993,6 +3004,9 @@ ${amount} para ${merchant} - ${date}`,
         memberAlreadyInWorkflowTitle: 'Membro já está em um fluxo de trabalho',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName} já está em um fluxo de aprovação que envia para ${approverName}. Adicioná-lo aqui irá movê-lo para este fluxo de trabalho.`,
+        moveEveryoneToThisWorkflowTitle: 'Mover todos para este fluxo de trabalho',
+        moveEveryoneToThisWorkflowPrompt:
+            'Você está prestes to mover todo mundo para este fluxo de aprovação. Isso vai excluir todos os outros fluxos de aprovação e mover todo mundo para este. Essa ação não pode ser desfeita.',
     },
     workflowsApproverPage: {
         genericErrorMessage: 'O aprovador não pôde ser alterado. Tente novamente ou entre em contato com o suporte.',
@@ -3128,6 +3142,8 @@ ${amount} para ${merchant} - ${date}`,
             updateAvatar: 'Ocorreu um problema ao atualizar o avatar deste agente',
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} atualizou as instruções deste agente.\nInstruções anteriores:\n${previousPrompt}\nNovas instruções:\n${newPrompt}`,
     newAgentPage: {
         title: 'Novo agente',
         buildCustomAgent: 'Criar agente personalizado',
@@ -3304,6 +3320,7 @@ ${amount} para ${merchant} - ${date}`,
         timeExpiredAnnouncement: 'O tempo expirou',
         error: {
             pleaseFillSecurityCode: 'Insira seu código de segurança',
+            tooManyAttempts: 'Muitas tentativas. Tente novamente mais tarde.',
             incorrectSecurityCode: 'Código de segurança incorreto ou inválido. Tente novamente ou solicite um novo código.',
             pleaseFillTwoFactorAuth: 'Insira seu código de autenticação de dois fatores',
         },
@@ -3390,9 +3407,9 @@ ${amount} para ${merchant} - ${date}`,
             otherAccountingSoftware: 'Nome do software',
         },
         interestedFeatures: {
-            title: 'Em quais recursos você tem interesse?',
-            featuresAlreadyEnabled: 'Aqui estão nossos recursos mais populares:',
-            featureYouMayBeInterestedIn: 'Ativar recursos adicionais:',
+            title: 'Selecione os recursos que você deseja',
+            featuresAlreadyEnabled: 'Seu espaço de trabalho já tem o seguinte ativado:',
+            featureYouMayBeInterestedIn: 'Ative recursos adicionais que podem interessar a você:',
         },
         error: {
             requiredFirstName: 'Insira seu primeiro nome para continuar',
@@ -4647,21 +4664,21 @@ ${amount} para ${merchant} - ${date}`,
         },
         nudge: {
             airfareManual:
-                'Você sabia que pode reservar e gerenciar voos diretamente no Expensify? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Você sabia que pode reservar voos diretamente no Expensify e ainda acumular milhas nos seus programas de passageiro frequente? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             airfareCard:
-                'Você sabia que dá para reservar e gerenciar voos direto pelo Expensify? E que os recibos são enviados automaticamente para você? Na próxima vez, simplesmente faça sua reserva pelo <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
+                'Você sabia que pode reservar voos diretamente no Expensify e ainda acumular milhas nos seus programas de milhagem? Os recibos também são enviados automaticamente para você. Da próxima vez, simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> ✈️',
             hotelManual:
-                'Você sabia que pode reservar e gerenciar estadias em hotéis direto no Expensify? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Você sabia que pode reservar estadias em hotéis direto pelo Expensify e ainda usar seus programas de fidelidade de hotéis? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             hotelCard:
-                'Você sabia que pode reservar e gerenciar estadias em hotéis direto no Expensify? Da próxima vez, simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
+                'Você sabia que pode reservar estadias em hotéis direto pelo Expensify e ainda usar seus programas de fidelidade? Da próxima vez, simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🏨',
             carManual:
-                'Você sabia que pode reservar e gerenciar aluguel de carros direto no Expensify? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Você sabia que pode reservar carros para alugar direto no Expensify e ainda usar seus programas de fidelidade de locadoras? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             carCard:
-                'Você sabia que pode reservar e gerenciar aluguel de carros direto no Expensify? Da próxima vez, simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
+                'Você sabia que pode reservar carros direto no Expensify e ainda usar seus programas de fidelidade de locadoras? Na próxima vez, simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🚗',
             railManual:
-                'Você sabia que pode reservar e gerenciar viagens de trem direto no Expensify? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pela <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Você sabia que pode reservar viagens de trem diretamente no Expensify e ainda usar seus programas de fidelidade ferroviária e railcards? Da próxima vez, evite o trabalho de criar sua despesa manualmente e simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             railCard:
-                'Você sabia que dá para reservar e gerenciar viagens de trem direto no Expensify? E que os recibos são enviados automaticamente para você? Da próxima vez, é só reservar pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
+                'Sabia que você pode reservar viagens de trem diretamente no Expensify e ainda usar seus programas de fidelidade ferroviária e railcards? Os recibos também são enviados automaticamente para você. Da próxima vez, simplesmente reserve pelo <a href="https://travel.expensify.com">Expensify Travel</a> 🚂',
             hotelBlockManual:
                 'Você sabia que pode reservar e gerenciar viagens em grupo como esta direto no Expensify? Poupe-se do transtorno da próxima vez e experimente nossa ferramenta de <a href="https://help.expensify.com/travel/hubs/event-management/">Eventos de Viagem</a>.',
             hotelBlockCard:
@@ -6360,6 +6377,8 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
             csvColumnType: 'Tipo',
             csvColumnLimitType: 'Tipo de limite',
             csvColumnLimit: 'Limite',
+            noCardFeedsAvailable: 'Nenhum feed de cartão disponível',
+            noCardFeedsAvailableDescription: 'Não há feeds de cartão disponíveis para este workspace.',
         },
         categories: {
             deleteCategories: 'Excluir categorias',
@@ -6375,6 +6394,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
             deleteFailureMessage: 'Ocorreu um erro ao excluir a categoria, tente novamente',
             categoryName: 'Nome da categoria',
             requiresCategory: 'Os membros devem categorizar todas as despesas',
+            autoCategorizeNewExpenses: 'Categorizar automaticamente novas despesas',
             showCategoryGLCodes: 'Mostrar códigos GL ao categorizar despesas',
             needCategoryForExportToIntegration: (connectionName: string) => `Todas as despesas devem ser categorizadas para serem exportadas para ${connectionName}.`,
             subtitle: 'Tenha uma visão melhor de onde o dinheiro está sendo gasto. Use nossas categorias padrão ou adicione as suas.',
@@ -6602,7 +6622,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
                 corporate: 'Restringir exclusão de transações',
                 personal: 'Permitir excluir transações',
                 setFeedNameDescription: 'Dê um nome exclusivo ao feed de cartão para diferenciá-lo dos demais',
-                setTransactionLiabilityDescription: 'Quando ativado, titulares de cartão podem excluir transações do cartão. Novas transações seguirão esta regra.',
+                setTransactionLiabilityDescription: 'Portadores do cartão podem excluir transações. Aplica-se apenas a novas transações.',
                 emptyAddedFeedTitle: 'Nenhum cartão neste feed',
                 emptyAddedFeedDescription: 'Verifique se há cartões no feed de cartões do seu banco.',
                 pendingFeedTitle: `Estamos analisando sua solicitação...`,
@@ -7079,6 +7099,15 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             peopleAdmins: 'Administradores de pessoas',
             paymentsAdmins: 'Administradores de pagamentos',
             members: 'Membros',
+            workArrangement: 'Arranjo de trabalho',
+            officeBased: 'Baseado em escritório',
+            noRegularWorkspace: 'Remoto ou móvel',
+            workArrangementPage: {
+                title: 'Arranjo de trabalho',
+                optionOfficeBasedHelp: 'Membro se desloca para um escritório. Deslocamentos habituais não são reembolsados.',
+                optionNoRegularWorkspaceHelp: 'O membro trabalha em casa ou viaja entre locais sem um escritório fixo, portanto as regras de deslocamento não se aplicam.',
+                futureOnlyNote: 'As alterações se aplicam apenas aos cálculos de quilometragem futuros. As despesas de quilometragem existentes não são recalculadas.',
+            },
         },
         card: {
             getStartedIssuing: 'Comece emitindo seu primeiro cartão virtual ou físico.',
@@ -7464,6 +7493,8 @@ O plano Control começa em US$ 9 por membro ativo por mês.`,
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: 'Para desbloquear, ative a sincronização automática.',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `Sua conexão com o QuickBooks Online expira em ${date}.`,
+            qboConnectionExpired: ({date}: {date: string}) => `Sua conexão com o QuickBooks Online expirou em ${date}.`,
         },
         export: {
             notReadyHeading: 'Não está pronto para exportar',
@@ -8129,6 +8160,8 @@ Exija dados de despesas como recibos e descrições, defina limites e padrões e
                 autoPayApprovedReportsSubtitle: 'Configurar quais relatórios de despesas são elegíveis para pagamento automático.',
                 autoPayApprovedReportsLimitError: (currency?: string) => `Insira um valor menor que ${currency ?? ''}20.000`,
                 autoPayApprovedReportsLockedSubtitle: 'Vá para mais recursos e ative os fluxos de trabalho, depois adicione pagamentos para desbloquear este recurso.',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) =>
+                    `O pagamento automático está disponível apenas no plano Control. [Faça upgrade](${upgradeLink}) para desbloquear este recurso.`,
                 autoPayReportsUnderTitle: 'Relatórios com pagamento automático em',
                 autoPayReportsUnderDescription: 'Relatórios de despesas totalmente compatíveis abaixo deste valor serão pagos automaticamente.',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `Adicione ${featureName} para desbloquear este recurso.`,
@@ -8218,6 +8251,7 @@ Exija dados de despesas como recibos e descrições, defina limites e padrões e
                 flagAmountsOver: 'Sinalizar valores acima de',
                 flagAmountsOverDescription: (categoryName: string) => `Aplica-se à categoria “${categoryName}”.`,
                 flagAmountsOverSubtitle: 'Isso substitui o valor máximo para todas as despesas.',
+                expenseLimitType: 'Tipo de limite de despesa',
                 expenseLimitTypes: {
                     expense: 'Despesa individual',
                     expenseSubtitle:
@@ -8814,6 +8848,35 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 description: 'Escolha sua conta de liquidação e nós vamos criar o pagamento no Campfire.',
             },
             travelInvoicingPayableAccount: {label: 'Conta a pagar de faturamento de viagens'},
+            exportToMultipleAccounts: 'Configurar exportação para várias contas',
+            cardProgramAccount: {
+                label: 'Conta do programa de cartão',
+                description: 'Substituir a conta do workspace para estes programas de cartão.',
+                descriptionLevel2: 'Substituir a conta do workspace para este programa de cartão.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Todos os programas usam a conta padrão';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} programa com conta personalizada`;
+                    }
+                    return `${customAccountsCount} programas com contas personalizadas`;
+                },
+            },
+            cardAccount: {
+                label: 'Conta por cartão',
+                description: 'Substitua a conta do programa para cartões individuais.',
+                descriptionLevel2: 'Substituir a conta do programa para estes cartões.',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return 'Todos os cartões usam contas do programa';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} cartão com conta personalizada`;
+                    }
+                    return `${customAccountsCount} cartões com contas personalizadas`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Configuração do Dynamics 365 Business Central',
@@ -8830,6 +8893,51 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             importDescription: 'Escolha quais configurações de codificação importar do Dynamics 365 Business Central.',
             items: 'Itens',
             enableNewCategories: 'Ativar novas categorias importadas',
+            exportDescription: 'Configure como os dados do Expensify são exportados para o Dynamics 365 Business Central.',
+            exportDate: {
+                label: 'Data da transação',
+                description: 'Use esta data ao exportar relatórios para o Dynamics 365 Business Central.',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Data da última despesa',
+                        description: 'Data da despesa mais recente no relatório.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Data de exportação',
+                        description: 'Data em que o relatório foi exportado para o Dynamics 365 Business Central.',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Data de envio',
+                        description: 'Data em que o relatório foi enviado para aprovação.',
+                    },
+                },
+            },
+            exportReimbursable: 'Exportar despesas reembolsáveis como',
+            exportNonReimbursable: 'Exportar despesas de cartão corporativo como',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: 'Diário geral',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: 'Faturas de compra',
+            },
+            reimbursableAccount: {
+                label: 'Conta de despesas reembolsáveis',
+                description: 'Escolha para onde exportar as despesas reembolsáveis.',
+            },
+            defaultCompanyCardVendor: {
+                label: 'Fornecedor padrão do cartão corporativo',
+                description: 'Escolha um fornecedor padrão do Dynamics 365 Business Central para despesas que não forem correspondidas automaticamente.',
+            },
+            companyCardAccount: {
+                label: 'Conta de cartão corporativo',
+                description: 'Escolha para onde exportar as transações de cartão corporativo.',
+            },
+            paymentMethod: {
+                label: 'Forma de pagamento',
+                description: 'Escolha uma forma de pagamento para as faturas de compra para que o Dynamics 365 Business Central possa conciliá-las com seu banco.',
+            },
+            noBankAccountsFound: 'Nenhuma conta bancária encontrada',
+            noBankAccountsFoundDescription: 'Adicione contas bancárias no Dynamics 365 Business Central e sincronize a conexão novamente',
+            noPaymentMethodsFound: 'Nenhuma forma de pagamento encontrada',
+            noPaymentMethodsFoundDescription: 'Adicione formas de pagamento no Dynamics 365 Business Central e sincronize a conexão novamente',
         },
     },
     getAssistancePage: {
@@ -9476,6 +9584,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `configurações de fatura copiadas de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `configurações de viagem copiadas de <a href="${sourcePolicyURL}">${sourcePolicyName}</a>`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? 'ativado' : 'desativado'} a categorização automática de novas despesas`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? 'ativado' : 'desativado'} o requisito de categorização de despesas`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? 'ativado' : 'desativado'} o requisito de marcação de despesas`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `atualizou a configuração da taxa de conversão de moeda para "${preferenceLabel}"`,
@@ -9512,6 +9621,10 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 : `alterou o fluxo de aprovação de ${member} para parar de encaminhar relatórios acima de ${previousLimit}`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `alterou o fluxo de aprovação de ${member} para encaminhar relatórios acima de ${limit} (antes ${previousLimit})`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `alterou o regime de trabalho de ${displayName} para ${newArrangement} (antes ${oldArrangement})`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `alterou o regime de trabalho padrão para ${newArrangement} (antes ${oldArrangement})`,
     },
     roomMembersPage: {
         memberNotFound: 'Membro não encontrado.',
@@ -9802,6 +9915,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
         noCategory: 'Sem categoria',
         noMerchant: 'Sem comerciante',
         noTag: 'Sem tag',
+        noVendor: 'Sem fornecedor',
         expenseType: 'Tipo de despesa',
         receiptType: 'Tipo de recibo',
         receiptTypeValues: {
@@ -10921,7 +11035,18 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
                 invalid: 'Este código é inválido',
             },
         },
-        paymentHistory: {title: 'Ver histórico de pagamento', subtitle: 'Seu histórico completo de pagamentos mensais cobrados nesta conta.'},
+        paymentHistory: {
+            title: 'Ver histórico de pagamento',
+            subtitle: 'Seu histórico completo de pagamentos mensais cobrados nesta conta.',
+            payments: 'Pagamentos',
+            inclTax: 'incl. impostos',
+            empty: 'Ainda não há pagamentos.',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 usuário ativo',
+                other: `${count} usuários ativos`,
+            }),
+            state: {paid: 'Pago', cleared: 'Compensado', failed: 'Falhou', refunded: 'Reembolsado', disputed: 'Contestado', balanceTransfer: 'Transferência de saldo'},
+        },
         subscriptionSettings: {
             title: 'Configurações de assinatura',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -11034,6 +11159,8 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             `Tem certeza de que deseja remover seu acesso de copiloto à conta Expensify de ${delegatorName}? Esta ação não pode ser desfeita.`,
         removeCopilotAccessConfirm: 'Remover acesso',
         copilotAccess: 'Acesso ao Copilot',
+        leaveAccount: 'Sair da conta',
+        leaveAccountConfirmationText: 'Você voltará para a sua própria conta. Você não será totalmente desconectado.',
     },
     debug: {
         debug: 'Depurar',
@@ -11492,5 +11619,12 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
             description: `<muted-text>Crie agentes personalizados para revisar, aprovar e direcionar despesas com base nas regras que você definir. <a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">Saiba mais</a>.</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `Renove sua assinatura por um período de 12 meses, de ${startDate} a ${endDate}.`,
+        title: 'Renove sua assinatura do Expensify',
+        subtitle: 'Uma coisa a menos para fazer antes do ano novo.',
+        confirmTitle: 'Confirmar renovação',
+        renew: 'Renovar',
+    },
 };
 export default translations;
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index ba103eb5ca9e..71de802346df 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -412,8 +412,6 @@ const translations: TranslationDeepObject<typeof en> = {
         minuteAbbreviation: 'm',
         secondAbbreviation: '秒',
         skip: '跳过',
-        chatWithAccountManager: (accountManagerDisplayName: string) => `有具体需求吗？请联系您的客户经理 ${accountManagerDisplayName}。`,
-        chatNow: '立即聊天',
         workEmail: '工作邮箱',
         destination: '目的地',
         subrate: '次级费率',
@@ -510,6 +508,7 @@ const translations: TranslationDeepObject<typeof en> = {
         previousYear: '上一年',
         nextYear: '明年',
         avatar: '头像',
+        currentOfTotal: ({current, total}: {current: number; total: number}) => `第 ${current} 项（共 ${total} 项）`,
         editor: '编辑',
         restrictions: '限制',
         tryAgain: '重试',
@@ -519,6 +518,7 @@ const translations: TranslationDeepObject<typeof en> = {
         noResultsFoundSubtitle: '无结果。请尝试调整筛选条件或搜索内容',
         unableToDisplayChart: '无法显示图表',
         webGLNotSupported: '您的浏览器不支持 WebGL。请启用该功能或更换浏览器。',
+        chartFailedToLoad: '无法加载图表。请刷新页面后重试。',
         apiKey: 'API 密钥',
         exportsTo: '导出到',
     },
@@ -1116,6 +1116,7 @@ const translations: TranslationDeepObject<typeof en> = {
         viewOnSpend: '在支出中查看',
         emptyState: {title: '没有可显示的内容', subtitle: '请尝试调整上面的条件'},
         noExpensesState: {title: '查看你的资金流向', subtitle: '添加报销后，您就能查看消费趋势、主要商家等更多信息。'},
+        compare: {label: '比较', previousPeriod: '上一期', average: '平均'},
     },
     allSettingsScreen: {
         subscription: '订阅',
@@ -1286,6 +1287,8 @@ const translations: TranslationDeepObject<typeof en> = {
                     : '在开始记录里程之前，您需要在个人资料中添加您的家庭住址。此工作区会使用该地址计算通勤扣除。',
             cta: '添加家庭住址',
         },
+        expenseAdded: '已添加支出',
+        invoiceSent: '已发送发票',
         amount: '金额',
         percent: '百分比',
         date: '日期',
@@ -1835,6 +1838,7 @@ const translations: TranslationDeepObject<typeof en> = {
         deleteConfirmationSomePendingBYOC: '您确定要删除这些报销吗？其中一些处于待处理状态，如果入账后，我们可能会再次导入。',
         categoryDisabledAlert: {title: '类别已禁用', prompt: '在工作区中启用类别，以编辑报销详情或从此报销中删除该类别。', confirmText: '删除类别'},
         tagDisabledAlert: {title: '标签已停用', prompt: '请在工作区中启用标签，以便编辑该报销的详细信息或从此报销中删除该标签。', confirmText: '删除标签'},
+        undeletedExpense: '恢复了此报销单',
         conciergeAutoSelectedDistanceRates: ({policyName}: {policyName: string}) => `已为新工作区更新里程报销标准 - ${policyName}`,
     },
     transactionMerge: {
@@ -2116,7 +2120,7 @@ const translations: TranslationDeepObject<typeof en> = {
         profileAvatar: '个人头像',
         customInstructions: '自定义指令',
         copilotIntoAccount: 'Copilot 到账户',
-        viewMemberHistory: '查看成员历史记录',
+        seeChatHistory: '查看聊天记录',
         viewAgentHistory: '查看代理历史记录',
         publicSection: {
             title: '公开',
@@ -2245,7 +2249,13 @@ const translations: TranslationDeepObject<typeof en> = {
             results: '结果',
             releaseOptions: '发布选项',
             testingPreferences: '测试偏好',
-            useStagingServer: '使用预备服务器',
+            server: '服务器',
+            servers: {
+                production: {label: '生产', description: '真实用户所使用的线上环境'},
+                staging: {label: '预备', description: '生产环境的镜像，用于最终验证'},
+                qa: {label: 'QA', description: '用于测试的实验环境'},
+            },
+            serverPinnedDescription: '此版本始终连接到单一服务器，因此无法在此处更改。',
             forceOffline: '强制离线',
             simulatePoorConnection: '模拟较差的互联网连接',
             simulateFailingNetworkRequests: '模拟失败的网络请求',
@@ -2464,7 +2474,7 @@ const translations: TranslationDeepObject<typeof en> = {
         twoFactorAuthIsRequiredForAdminsHeader: '需要启用双重身份验证',
         twoFactorAuthIsRequiredForAdminsTitle: '请启用双重身份验证',
         twoFactorAuthIsRequiredXero: '您的 Xero 会计连接需要启用双重身份验证。',
-        twoFactorAuthIsRequiredCompany: '您的公司要求使用双重身份验证。',
+        twoFactorAuthIsRequiredCompany: '您的公司要求使用双重身份验证（2FA）。',
         twoFactorAuthCannotDisable: '无法禁用双重验证',
         twoFactorAuthRequired: '您的 Xero 连接需要启用双重身份验证（2FA），且无法将其禁用。',
         replaceDevice: '更换设备',
@@ -2476,6 +2486,7 @@ const translations: TranslationDeepObject<typeof en> = {
         verifyNewDeviceDescription: '使用新设备扫描二维码，然后输入代码完成设置。',
         downloadCodes: '下载代码',
         copyCodes: '复制代码',
+        enable2FA: '启用',
     },
     recoveryCodeForm: {
         error: {
@@ -2899,6 +2910,8 @@ ${amount}，商户：${merchant} - 日期：${date}`,
         memberAlreadyInWorkflowTitle: '成员已在工作流中',
         memberAlreadyInWorkflowPrompt: ({memberName, approverName}: {memberName: string; approverName: string}) =>
             `${memberName}已在提交给${approverName}的审批流程中。在此处添加将把该成员移动到此工作流。`,
+        moveEveryoneToThisWorkflowTitle: '将所有人移至此工作流程',
+        moveEveryoneToThisWorkflowPrompt: '您即将将所有人迁移到此审批流程。这将删除所有其他审批流程，并将所有人迁移到此流程。此操作无法撤销。',
     },
     workflowsApproverPage: {
         genericErrorMessage: '无法更改审批人。请重试或联系支持。',
@@ -3029,6 +3042,8 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             updateAvatar: '更新此代理的头像时出现问题',
         },
     },
+    agentPromptUpdated: ({updatedBy, previousPrompt, newPrompt}: {updatedBy: string; previousPrompt: string; newPrompt: string}) =>
+        `${updatedBy} 更新了此智能体的指令。\n之前的指令：\n${previousPrompt}\n新的指令：\n${newPrompt}`,
     newAgentPage: {
         title: '新代理',
         buildCustomAgent: '构建自定义代理',
@@ -3202,7 +3217,12 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             other: `剩余时间：${count} 秒`,
         }),
         timeExpiredAnnouncement: '时间已到期',
-        error: {pleaseFillSecurityCode: '请输入您的安全码', incorrectSecurityCode: '安全码不正确或无效。请重试或请求新代码。', pleaseFillTwoFactorAuth: '请输入您的双重身份验证代码'},
+        error: {
+            pleaseFillSecurityCode: '请输入您的安全码',
+            tooManyAttempts: '尝试次数过多。请稍后再试。',
+            incorrectSecurityCode: '安全码不正确或无效。请重试或请求新代码。',
+            pleaseFillTwoFactorAuth: '请输入您的双重身份验证代码',
+        },
     },
     passwordForm: {
         pleaseFillOutAllFields: '请填写所有字段',
@@ -3286,9 +3306,9 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             otherAccountingSoftware: '软件名称',
         },
         interestedFeatures: {
-            title: '你对哪些功能感兴趣？',
-            featuresAlreadyEnabled: '以下是我们最受欢迎的功能：',
-            featureYouMayBeInterestedIn: '启用更多功能：',
+            title: '选择你想要的功能',
+            featuresAlreadyEnabled: '您的工作区已启用以下功能：',
+            featureYouMayBeInterestedIn: '启用您可能感兴趣的其他功能：',
         },
         error: {
             requiredFirstName: '请输入您的名以继续',
@@ -4512,15 +4532,20 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             error: {required: '请输入您的法人税号。'},
         },
         nudge: {
-            airfareManual: '你知道吗？你可以直接在 Expensify 中预订和管理机票！下次无需再手动创建报销，只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 ✈️',
-            airfareCard: '你知道吗？你可以直接在 Expensify 预订和管理机票，而且还能自动为你上传收据。下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 ✈️',
+            airfareManual:
+                '你知道吗？你可以直接在 Expensify 预订机票，同时照常累积常旅客计划的里程！下次无需手动创建报销，只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 ✈️',
+            airfareCard:
+                '你知道吗？你可以直接在 Expensify 中预订机票，同时照常累积常旅客里程！系统还会自动为你上传收据。下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 ✈️',
             hotelManual:
-                '你知道吗？你可以直接在 Expensify 中预订和管理酒店住宿！下次无需再手动创建报销，只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 完成预订即可 🏨',
-            hotelCard: '你知道吗？你可以直接在 Expensify 中预订和管理酒店住宿！下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 🏨',
-            carManual: '你知道吗？你可以直接在 Expensify 中预订和管理租车服务。下次就不用再手动创建报销了，只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 🚗',
-            carCard: '你知道吗？你可以直接在 Expensify 中预订和管理租车！下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 🚗',
-            railManual: '你知道吗？你可以直接在 Expensify 中预订和管理火车行程！下次无需再手动创建报销，只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 🚂',
-            railCard: '你知道吗？你可以直接在 Expensify 中预订和管理火车行程，而且还会自动为你上传收据。下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 🚂',
+                '你知道吗？你可以直接在 Expensify 预订酒店入住，同时照常累积酒店会员积分！下次无需再手动创建报销，只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可。',
+            hotelCard: '你知道吗？你可以直接在 Expensify 预订酒店住宿，同时照常累积酒店会员积分。下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可 🏨',
+            carManual:
+                '你知道吗？你可以直接在 Expensify 预订租车，同时照常使用你的租车会员计划！下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订，就能省去手动创建报销的麻烦。',
+            carCard: '你知道吗？你可以直接在 Expensify 预订租车，并且照样使用你的租车会员计划。下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 进行预订 🚗',
+            railManual:
+                '你知道吗？你可以直接在 Expensify 中预订火车行程，同时照常使用你的铁路会员计划和铁路卡。下次就不用再手动创建报销了，只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可。',
+            railCard:
+                '你知道吗？你可以直接在 Expensify 预订火车行程，同时照常使用铁路常旅客计划和铁路卡！系统还会自动为你上传收据。下次只需通过 <a href="https://travel.expensify.com">Expensify Travel</a> 预订即可。',
             hotelBlockManual:
                 '你知道吗？你可以直接在 Expensify 中预订和管理像这样的团队行程。下次就不用再费心了，试试我们的 <a href="https://help.expensify.com/travel/hubs/event-management/">Travel Events</a> 工具吧。',
             hotelBlockCard:
@@ -6149,6 +6174,8 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             csvColumnType: '类型',
             csvColumnLimitType: '限额类型',
             csvColumnLimit: '限额',
+            noCardFeedsAvailable: '没有可用的卡片流水',
+            noCardFeedsAvailableDescription: '此工作区暂无可用的卡片流水。',
         },
         categories: {
             deleteCategories: '删除类别',
@@ -6164,6 +6191,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             deleteFailureMessage: '删除类别时出错，请重试',
             categoryName: '类别名称',
             requiresCategory: '成员必须为所有报销分类',
+            autoCategorizeNewExpenses: '自动为新报销分类',
             showCategoryGLCodes: '在分类报销时显示总账科目代码',
             needCategoryForExportToIntegration: (connectionName: string) => `要导出到 ${connectionName}，所有报销都必须先进行分类。`,
             subtitle: '更好地了解资金的支出去向。使用我们的默认类别或添加你自己的类别。',
@@ -6364,7 +6392,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
                 corporate: '限制删除交易',
                 personal: '允许删除交易',
                 setFeedNameDescription: '为该卡片流水命名一个唯一名称，以便与其他区分',
-                setTransactionLiabilityDescription: '启用后，持卡人可以删除卡片交易。新的交易将遵循此规则。',
+                setTransactionLiabilityDescription: '持卡人可以删除交易。仅适用于新交易。',
                 emptyAddedFeedTitle: '此订阅源中没有卡片',
                 emptyAddedFeedDescription: '请确保在您银行的卡片交易流水中有可用的卡片。',
                 pendingFeedTitle: `我们正在审核你的请求…`,
@@ -6825,6 +6853,15 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             peopleAdmins: '人员管理员',
             paymentsAdmins: '付款管理员',
             members: '成员',
+            workArrangement: '工作安排',
+            officeBased: '以办公室为基地',
+            noRegularWorkspace: '远程或移动',
+            workArrangementPage: {
+                title: '工作安排',
+                optionOfficeBasedHelp: '成员通勤前往办公室。日常通勤不予报销。',
+                optionNoRegularWorkspaceHelp: '成员在家办公或在各地点之间出差，没有固定办公地点，因此通勤规则不适用。',
+                futureOnlyNote: '更改仅适用于未来的里程计算，现有的里程报销将不会重新计算。',
+            },
         },
         card: {
             getStartedIssuing: '从发放您的第一张虚拟卡或实体卡开始使用。',
@@ -7204,6 +7241,8 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
             syncTravelInvoicingSettlementsNoAutoSyncTooltip: '若要解锁，请启用自动同步。',
             campfire: 'Campfire',
             businessCentral: 'Dynamics 365 Business Central',
+            qboConnectionExpiring: ({date}: {date: string}) => `您的 QuickBooks Online 连接将于 ${date} 过期。`,
+            qboConnectionExpired: ({date}: {date: string}) => `您与 QuickBooks Online 的连接已于 ${date} 过期。`,
         },
         export: {
             notReadyHeading: '尚未准备好导出',
@@ -7846,6 +7885,7 @@ ${reportName}`,
                 autoPayApprovedReportsSubtitle: '配置哪些报销报告符合自动付款条件。',
                 autoPayApprovedReportsLimitError: (currency?: string) => `请输入小于 ${currency ?? ''}20,000 的金额`,
                 autoPayApprovedReportsLockedSubtitle: '前往“更多功能”并启用“工作流”，然后添加“付款”以解锁此功能。',
+                autoPayApprovedReportsControlPlanSubtitle: (upgradeLink: string) => `自动付款仅适用于 Control 方案。[升级](${upgradeLink})以解锁此功能。`,
                 autoPayReportsUnderTitle: '自动支付报销单于',
                 autoPayReportsUnderDescription: '在此金额以下且完全合规的报销单将被自动支付。',
                 unlockFeatureEnableWorkflowsSubtitle: (featureName: string) => `添加 ${featureName} 以解锁此功能。`,
@@ -7928,6 +7968,7 @@ ${reportName}`,
                 flagAmountsOver: '标记超过此金额的费用',
                 flagAmountsOverDescription: (categoryName: string) => `适用于类别“${categoryName}”。`,
                 flagAmountsOverSubtitle: '这将覆盖所有报销的最高金额限制。',
+                expenseLimitType: '报销限额类型',
                 expenseLimitTypes: {
                     expense: '单笔报销',
                     expenseSubtitle: '按类别标记报销金额。此规则会覆盖工作区的一般最高报销金额规则。多天预订将按每晚平均金额进行评估。',
@@ -8476,6 +8517,35 @@ ${reportName}`,
             syncTravelInvoicingSettlements: '同步差旅开票结算',
             travelInvoicingSettlementAccount: {label: '差旅开票结算账户', description: '选择您的结算账户，我们会在 Campfire 中创建这笔付款。'},
             travelInvoicingPayableAccount: {label: '差旅开票应付账户'},
+            exportToMultipleAccounts: '配置导出到多个账户',
+            cardProgramAccount: {
+                label: '卡计划账户',
+                description: '为这些卡计划覆盖工作区账户。',
+                descriptionLevel2: '覆盖此卡计划的工作区账户。',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return '所有方案使用默认账户';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} 个自定义账户的项目`;
+                    }
+                    return `${customAccountsCount} 个具有自定义科目的项目`;
+                },
+            },
+            cardAccount: {
+                label: '按卡计费账户',
+                description: '为单张卡片覆盖默认项目账户。',
+                descriptionLevel2: '为这些卡片覆盖默认项目账户。',
+                countInfo: (customAccountsCount: number) => {
+                    if (!customAccountsCount) {
+                        return '所有卡都使用项目账户';
+                    }
+                    if (customAccountsCount === 1) {
+                        return `${customAccountsCount} 张带有自定义账户的卡`;
+                    }
+                    return `${customAccountsCount} 张带有自定义账户的卡`;
+                },
+            },
         },
         businessCentral: {
             businessCentralSetup: 'Dynamics 365 Business Central 设置',
@@ -8492,6 +8562,51 @@ ${reportName}`,
             importDescription: '选择要从 Dynamics 365 Business Central 导入的编码配置。',
             items: '项目',
             enableNewCategories: '启用新导入的类别',
+            exportDescription: '配置 Expensify 数据导出到 Dynamics 365 Business Central 的方式。',
+            exportDate: {
+                label: '交易日期',
+                description: '将报表导出到 Dynamics 365 Business Central 时使用此日期。',
+                values: {
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: '最新支出日期',
+                        description: '报告中最近一次支出的日期。',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: '导出日期',
+                        description: '报告导出至 Dynamics 365 Business Central 的日期。',
+                    },
+                    [CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: '提交日期',
+                        description: '报告提交审批的日期。',
+                    },
+                },
+            },
+            exportReimbursable: '将可报销费用导出为',
+            exportNonReimbursable: '导出公司卡费用为',
+            exportDestination: {
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY]: '普通日记账',
+                [CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE]: '采购发票',
+            },
+            reimbursableAccount: {
+                label: '可报销费用账户',
+                description: '选择可报销费用的导出位置。',
+            },
+            defaultCompanyCardVendor: {
+                label: '默认公司卡供应商',
+                description: '为未自动匹配的费用选择默认的 Dynamics 365 Business Central 供应商。',
+            },
+            companyCardAccount: {
+                label: '公司卡账户',
+                description: '选择公司卡交易的导出位置。',
+            },
+            paymentMethod: {
+                label: '付款方式',
+                description: '为采购发票选择付款方式，以便 Dynamics 365 Business Central 将其与您的银行进行对账。',
+            },
+            noBankAccountsFound: '未找到银行账户',
+            noBankAccountsFoundDescription: '请在 Dynamics 365 Business Central 中添加银行账户，然后重新同步连接',
+            noPaymentMethodsFound: '未找到付款方式',
+            noPaymentMethodsFoundDescription: '请在 Dynamics 365 Business Central 中添加付款方式，然后重新同步连接',
         },
     },
     getAssistancePage: {
@@ -9119,6 +9234,7 @@ ${reportName}`,
             invoices: (sourcePolicyName: string, sourcePolicyURL: string) => `已从 <a href="${sourcePolicyURL}">${sourcePolicyName}</a> 复制发票设置`,
             travel: (sourcePolicyName: string, sourcePolicyURL: string) => `已从 <a href="${sourcePolicyURL}">${sourcePolicyName}</a> 复制出差设置`,
         },
+        updatedAutoCategorizeNewExpenses: ({enabled}: {enabled: boolean}) => `${enabled ? '已启用' : '已禁用'} 新报销自动分类`,
         updatedRequiresCategory: ({enabled}: {enabled: boolean}) => `${enabled ? '已启用' : '已禁用'} 费用分类要求`,
         updatedRequiresTag: ({enabled}: {enabled: boolean}) => `${enabled ? '已启用' : '已禁用'} 费用标签要求`,
         updatedCurrencyConversionFee: ({preferenceLabel}: {preferenceLabel: string}) => `将货币转换费用设置更新为“${preferenceLabel}”`,
@@ -9155,6 +9271,10 @@ ${reportName}`,
                 : `已更改 ${member} 的审批流程，停止转发超过 ${previousLimit} 的报销报告`,
         changedApprovalLimit: ({member, limit, previousLimit}: {member: string; limit: string; previousLimit: string}) =>
             `已将 ${member} 的审批流程更改为：转交超过 ${limit} 的报销单（之前为 ${previousLimit}）`,
+        updatedMemberWorkArrangement: ({displayName, newArrangement, oldArrangement}: {displayName: string; newArrangement: string; oldArrangement: string}) =>
+            `已将 ${displayName} 的工作安排更改为 ${newArrangement}（之前为 ${oldArrangement}）`,
+        updatedDefaultWorkArrangement: ({newArrangement, oldArrangement}: {newArrangement: string; oldArrangement: string}) =>
+            `已将默认工作安排更改为 ${newArrangement}（之前为 ${oldArrangement}）`,
     },
     roomMembersPage: {
         memberNotFound: '未找到成员。',
@@ -9443,6 +9563,7 @@ ${reportName}`,
         noCategory: '无类别',
         noMerchant: '无商家',
         noTag: '无标签',
+        noVendor: '无供应商',
         expenseType: '报销类型',
         receiptType: '收据类型',
         receiptTypeValues: {
@@ -10519,7 +10640,18 @@ ${reportName}`,
                 invalid: '此代码无效',
             },
         },
-        paymentHistory: {title: '查看付款记录', subtitle: '此账户每月全部付款记录。'},
+        paymentHistory: {
+            title: '查看付款记录',
+            subtitle: '此账户每月全部付款记录。',
+            payments: '付款',
+            inclTax: '含税',
+            empty: '尚无付款。',
+            activeUsers: ({count}: {count: number}) => ({
+                one: '1 位活跃用户',
+                other: `${count} 名活跃用户`,
+            }),
+            state: {paid: '已支付', cleared: '已清算', failed: '失败', refunded: '已退款', disputed: '有争议', balanceTransfer: '余额转账'},
+        },
         subscriptionSettings: {
             title: '订阅设置',
             summary: (subscriptionType: string, subscriptionSize: string, expensifyCode: string, autoRenew: string, autoIncrease: string) =>
@@ -10627,6 +10759,8 @@ ${reportName}`,
         removeCopilotAccessConfirmation: (delegatorName: string) => `您确定要移除对${delegatorName}的 Expensify 账户的副驾驶访问权限吗？此操作无法撤销。`,
         removeCopilotAccessConfirm: '移除访问权限',
         copilotAccess: 'Copilot 访问',
+        leaveAccount: '退出账户',
+        leaveAccountConfirmationText: '您将返回到您自己的账户。您不会完全登出。',
     },
     debug: {
         debug: '调试',
@@ -11069,5 +11203,12 @@ ${reportName}`,
             description: `<muted-text>创建自定义代理，根据你设置的规则审核、批准和分配报销。<a href="${CONST.AI_FEATURES_PROMO_LEARN_MORE_URLS.BUILD_AGENTS}">了解更多</a>。</muted-text>`,
         },
     },
+    earlyRenewal: {
+        confirmationDescription: ({startDate, endDate}: {startDate: string; endDate: string}) => `将您的订阅续订为 12 个月期限，自 ${startDate} 至 ${endDate}。`,
+        title: '续订您的 Expensify 订阅',
+        subtitle: '在新年到来前又少了一件要做的事。',
+        confirmTitle: '确认续订',
+        renew: '续订',
+    },
 };
 export default translations;
diff --git a/src/libs/API/parameters/AcceptEarlyRenewalOfferParams.ts b/src/libs/API/parameters/AcceptEarlyRenewalOfferParams.ts
new file mode 100644
index 000000000000..6580bdc3f16e
--- /dev/null
+++ b/src/libs/API/parameters/AcceptEarlyRenewalOfferParams.ts
@@ -0,0 +1,5 @@
+type AcceptEarlyRenewalOfferParams = {
+    offerID: string;
+};
+
+export default AcceptEarlyRenewalOfferParams;
diff --git a/src/libs/API/parameters/DeleteMoneyRequestParams.ts b/src/libs/API/parameters/DeleteMoneyRequestParams.ts
index b44223905e8c..e5524eb9d6a6 100644
--- a/src/libs/API/parameters/DeleteMoneyRequestParams.ts
+++ b/src/libs/API/parameters/DeleteMoneyRequestParams.ts
@@ -1,6 +1,6 @@
 type DeleteMoneyRequestParams = {
     transactionID: string | undefined;
-    reportActionID: string;
+    reportActionID?: string;
 };
 
 export default DeleteMoneyRequestParams;
diff --git a/src/libs/API/parameters/QueueBulkMarkAsExportedParams.ts b/src/libs/API/parameters/QueueBulkMarkAsExportedParams.ts
new file mode 100644
index 000000000000..2e6eade627ad
--- /dev/null
+++ b/src/libs/API/parameters/QueueBulkMarkAsExportedParams.ts
@@ -0,0 +1,17 @@
+import type {SearchQueryString} from '@components/Search/types';
+
+import type CONST from '@src/CONST';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+
+type QueueBulkMarkAsExportedParams = {
+    /** Serialized search query describing every report to mark as exported, so the backend can page through all matches instead of relying on a client-side list */
+    jsonQuery: SearchQueryString;
+
+    /** The accounting connection to scope the bulk action to, since the button is per-integration and must never mix connections */
+    connectionName: ConnectionName;
+
+    /** Set only when connectionName is QBO and the connection is its Intuit Enterprise Suite variant, since that shares connectionName with regular QBO and the backend otherwise can't tell them apart */
+    qboIntegrationAlias?: typeof CONST.POLICY.CONNECTIONS.ACCOUNTING_INTEGRATION_ALIASES.INTUIT_ENTERPRISE_SUITE;
+};
+
+export default QueueBulkMarkAsExportedParams;
diff --git a/src/libs/API/parameters/ReplaceReceiptParams.ts b/src/libs/API/parameters/ReplaceReceiptParams.ts
index ea56f9a4d4e0..9951e9c2f906 100644
--- a/src/libs/API/parameters/ReplaceReceiptParams.ts
+++ b/src/libs/API/parameters/ReplaceReceiptParams.ts
@@ -1,10 +1,11 @@
 import type CONST from '@src/CONST';
+import type {Receipt} from '@src/types/onyx/Transaction';
 
 import type {ValueOf} from 'type-fest';
 
 type ReplaceReceiptParams = {
     transactionID: string;
-    receipt: File;
+    receipt: Receipt;
     receiptState?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
     isSameReceipt?: boolean;
     reportActionID?: string;
diff --git a/src/libs/API/parameters/SetEmployeeWorkArrangementParams.ts b/src/libs/API/parameters/SetEmployeeWorkArrangementParams.ts
new file mode 100644
index 000000000000..706b7aff83f3
--- /dev/null
+++ b/src/libs/API/parameters/SetEmployeeWorkArrangementParams.ts
@@ -0,0 +1,11 @@
+type SetEmployeeWorkArrangementParams = {
+    policyID: string;
+
+    /** Comma-separated accountIDs of the employees to update. Supports individual and bulk updates. */
+    employeeAccountIDList: string;
+
+    /** True for office-based, false for no regular workspace. */
+    isOffice: boolean;
+};
+
+export default SetEmployeeWorkArrangementParams;
diff --git a/src/libs/API/parameters/SetPolicyAutoCategorizeNewExpensesParams.ts b/src/libs/API/parameters/SetPolicyAutoCategorizeNewExpensesParams.ts
new file mode 100644
index 000000000000..058a0b6d6f13
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyAutoCategorizeNewExpensesParams.ts
@@ -0,0 +1,6 @@
+type SetPolicyAutoCategorizeNewExpensesParams = {
+    policyID: string;
+    enabled: boolean;
+};
+
+export default SetPolicyAutoCategorizeNewExpensesParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralDefaultVendorParams.ts b/src/libs/API/parameters/UpdateBusinessCentralDefaultVendorParams.ts
new file mode 100644
index 000000000000..057eb79ec173
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralDefaultVendorParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralDefaultVendorParams = {
+    policyID: string;
+    vendorID: BusinessCentralExport['defaultVendorID'];
+};
+
+export default UpdateBusinessCentralDefaultVendorParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralExportDateParams.ts b/src/libs/API/parameters/UpdateBusinessCentralExportDateParams.ts
new file mode 100644
index 000000000000..60ba83cde7dd
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralExportDateParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralExportDateParams = {
+    policyID: string;
+    value: BusinessCentralExport['exportDate'];
+};
+
+export default UpdateBusinessCentralExportDateParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralExporterParams.ts b/src/libs/API/parameters/UpdateBusinessCentralExporterParams.ts
new file mode 100644
index 000000000000..722cf125d794
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralExporterParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralExporterParams = {
+    policyID: string;
+    email: BusinessCentralExport['exporter'];
+};
+
+export default UpdateBusinessCentralExporterParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralNonreimbursableAccountParams.ts b/src/libs/API/parameters/UpdateBusinessCentralNonreimbursableAccountParams.ts
new file mode 100644
index 000000000000..3eb5a7079b1a
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralNonreimbursableAccountParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralNonreimbursableAccountParams = {
+    policyID: string;
+    value: BusinessCentralExport['nonReimbursableAccount'];
+};
+
+export default UpdateBusinessCentralNonreimbursableAccountParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams.ts b/src/libs/API/parameters/UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams.ts
new file mode 100644
index 000000000000..567bd134db87
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams = {
+    policyID: string;
+    value: BusinessCentralExport['nonReimbursable'];
+};
+
+export default UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralPaymentMethodParams.ts b/src/libs/API/parameters/UpdateBusinessCentralPaymentMethodParams.ts
new file mode 100644
index 000000000000..553dac6a18d4
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralPaymentMethodParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralPaymentMethodParams = {
+    policyID: string;
+    value: BusinessCentralExport['paymentMethodCode'];
+};
+
+export default UpdateBusinessCentralPaymentMethodParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralReimbursableAccountParams.ts b/src/libs/API/parameters/UpdateBusinessCentralReimbursableAccountParams.ts
new file mode 100644
index 000000000000..519337e247c6
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralReimbursableAccountParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralReimbursableAccountParams = {
+    policyID: string;
+    value: BusinessCentralExport['reimbursableAccount'];
+};
+
+export default UpdateBusinessCentralReimbursableAccountParams;
diff --git a/src/libs/API/parameters/UpdateBusinessCentralReimbursableExpensesExportDestinationParams.ts b/src/libs/API/parameters/UpdateBusinessCentralReimbursableExpensesExportDestinationParams.ts
new file mode 100644
index 000000000000..70da81290e45
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBusinessCentralReimbursableExpensesExportDestinationParams.ts
@@ -0,0 +1,8 @@
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+type UpdateBusinessCentralReimbursableExpensesExportDestinationParams = {
+    policyID: string;
+    value: BusinessCentralExport['reimbursable'];
+};
+
+export default UpdateBusinessCentralReimbursableExpensesExportDestinationParams;
diff --git a/src/libs/API/parameters/UpdateCampfireCardProgramAccountParams.ts b/src/libs/API/parameters/UpdateCampfireCardProgramAccountParams.ts
new file mode 100644
index 000000000000..a661f6eca75f
--- /dev/null
+++ b/src/libs/API/parameters/UpdateCampfireCardProgramAccountParams.ts
@@ -0,0 +1,10 @@
+import type {CardFeedWithNumber} from '@src/types/onyx/CardFeeds';
+import type {CampfireAccount} from '@src/types/onyx/Policy';
+
+type UpdateCampfireCardProgramAccountParams = {
+    policyID: string;
+    feedKey: CardFeedWithNumber;
+    cardProgramAccountID: CampfireAccount['id'];
+};
+
+export default UpdateCampfireCardProgramAccountParams;
diff --git a/src/libs/API/parameters/UpdateCampfireExportToMultipleAccountsParams.ts b/src/libs/API/parameters/UpdateCampfireExportToMultipleAccountsParams.ts
new file mode 100644
index 000000000000..6ae025c89ef2
--- /dev/null
+++ b/src/libs/API/parameters/UpdateCampfireExportToMultipleAccountsParams.ts
@@ -0,0 +1,6 @@
+type UpdateCampfireExportToMultipleAccountsParams = {
+    policyID: string;
+    enabled: boolean;
+};
+
+export default UpdateCampfireExportToMultipleAccountsParams;
diff --git a/src/libs/API/parameters/WorkspaceApprovalParams.ts b/src/libs/API/parameters/WorkspaceApprovalParams.ts
index 7282a2cf5a3f..8cb344726c7d 100644
--- a/src/libs/API/parameters/WorkspaceApprovalParams.ts
+++ b/src/libs/API/parameters/WorkspaceApprovalParams.ts
@@ -9,12 +9,13 @@ type CreateWorkspaceApprovalParams = {
      * }>
      */
     employees: string;
-};
 
-type UpdateWorkspaceApprovalParams = CreateWorkspaceApprovalParams & {
+    /** Email of the approver to make the policy's default approver */
     defaultApprover?: string;
 };
 
+type UpdateWorkspaceApprovalParams = CreateWorkspaceApprovalParams;
+
 type RemoveWorkspaceApprovalParams = CreateWorkspaceApprovalParams;
 
 export type {CreateWorkspaceApprovalParams, UpdateWorkspaceApprovalParams, RemoveWorkspaceApprovalParams};
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index bf3a2b659ea4..1fe1c4a0225b 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -88,6 +88,8 @@ export type {default as UpdateCampfireExporterParams} from './UpdateCampfireExpo
 export type {default as UpdateCampfireExportDateParams} from './UpdateCampfireExportDateParams';
 export type {default as UpdateCampfireDefaultVendorParams} from './UpdateCampfireDefaultVendorParams';
 export type {default as UpdateCampfireCreditCardAccountParams} from './UpdateCampfireCreditCardAccountParams';
+export type {default as UpdateCampfireExportToMultipleAccountsParams} from './UpdateCampfireExportToMultipleAccountsParams';
+export type {default as UpdateCampfireCardProgramAccountParams} from './UpdateCampfireCardProgramAccountParams';
 export type {default as UpdateCampfireAutoSyncParams} from './UpdateCampfireAutoSyncParams';
 export type {default as UpdateCampfireAccountingMethodParams} from './UpdateCampfireAccountingMethodParams';
 export type {default as UpdateCampfireSyncReimbursedReportsParams} from './UpdateCampfireSyncReimbursedReportsParams';
@@ -103,6 +105,14 @@ export type {default as UpdateBusinessCentralEnableNewCategoriesParams} from './
 export type {default as UpdateBusinessCentralFieldMappingParams} from './UpdateBusinessCentralFieldMappingParams';
 export type {default as UpdateBusinessCentralSyncTaxRatesParams} from './UpdateBusinessCentralSyncTaxRatesParams';
 export type {default as UpdateBusinessCentralSyncItemsParams} from './UpdateBusinessCentralSyncItemsParams';
+export type {default as UpdateBusinessCentralExporterParams} from './UpdateBusinessCentralExporterParams';
+export type {default as UpdateBusinessCentralExportDateParams} from './UpdateBusinessCentralExportDateParams';
+export type {default as UpdateBusinessCentralReimbursableExpensesExportDestinationParams} from './UpdateBusinessCentralReimbursableExpensesExportDestinationParams';
+export type {default as UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams} from './UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams';
+export type {default as UpdateBusinessCentralReimbursableAccountParams} from './UpdateBusinessCentralReimbursableAccountParams';
+export type {default as UpdateBusinessCentralNonreimbursableAccountParams} from './UpdateBusinessCentralNonreimbursableAccountParams';
+export type {default as UpdateBusinessCentralDefaultVendorParams} from './UpdateBusinessCentralDefaultVendorParams';
+export type {default as UpdateBusinessCentralPaymentMethodParams} from './UpdateBusinessCentralPaymentMethodParams';
 export type {default as UpdateNetSuiteAccountingMethodParams} from './UpdateNetSuiteAccountingMethodParams';
 export type {default as UpdateQuickbooksOnlineAccountingMethodParams} from './UpdateQuickbooksOnlineAccountingMethodParams';
 export type {default as UpdateXeroAccountingMethodParams} from './UpdateXeroAccountingMethodParams';
@@ -299,6 +309,7 @@ export type {default as SetWorkspaceCategoriesEnabledParams} from './SetWorkspac
 export type {default as CreateWorkspaceCategoriesParams} from './CreateWorkspaceCategoriesParams';
 export type {default as RenameWorkspaceCategoriesParams} from './RenameWorkspaceCategoriesParams';
 export type {default as SetWorkspaceRequiresCategoryParams} from './SetWorkspaceRequiresCategoryParams';
+export type {default as SetPolicyAutoCategorizeNewExpensesParams} from './SetPolicyAutoCategorizeNewExpensesParams';
 export type {default as SetPolicyShowCategoryGLCodesParams} from './SetPolicyShowCategoryGLCodesParams';
 export type {default as DeleteWorkspaceCategoriesParams} from './DeleteWorkspaceCategoriesParams';
 export type {default as UpdatePolicyCategoryPayrollCodeParams} from './UpdatePolicyCategoryPayrollCodeParams';
@@ -580,6 +591,7 @@ export type {default as ChangeReportPolicyAndInviteSubmitterParams} from './Chan
 export type {ChangeTransactionsReportParams, TransactionThreadInfo} from './ChangeTransactionsReportParams';
 export type {default as SetPolicyProhibitedExpensesParams} from './SetPolicyProhibitedExpensesParams';
 export type {default as SetPolicyCommuterExclusionsParams} from './SetPolicyCommuterExclusionsParams';
+export type {default as SetEmployeeWorkArrangementParams} from './SetEmployeeWorkArrangementParams';
 export type {default as DisablePolicyCommuterExclusionsParams} from './DisablePolicyCommuterExclusionsParams';
 export type {default as SetPolicyRequireMapOrGPSParams} from './SetPolicyRequireMapOrGPSParams';
 export type {default as CreateDigitalWalletParams} from './CreateDigitalWalletParams';
@@ -599,11 +611,13 @@ export type {default as ExportSearchWithTemplateParams} from './ExportSearchWith
 export type {default as QueueExportSearchItemsToCSVParams} from './QueueExportSearchItemsToCSVParams';
 export type {default as QueueExportSearchWithTemplateParams} from './QueueExportSearchWithTemplateParams';
 export type {default as QueueBulkPayReportsParams} from './QueueBulkPayReportsParams';
+export type {default as QueueBulkMarkAsExportedParams} from './QueueBulkMarkAsExportedParams';
 export type {default as AssignReportToMeParams} from './AssignReportToMeParams';
 export type {default as AddReportApproverParams} from './AddReportApproverParams';
 export type {default as EnableGlobalReimbursementsForUSDBankAccountParams} from './EnableGlobalReimbursementsForUSDBankAccountParams';
 export type {default as SendReminderForCorpaySignerInformationParams} from './SendReminderForCorpaySignerInformationParams';
 export type {default as SendScheduleCallNudgeParams} from './SendScheduleCallNudge';
+export type {default as AcceptEarlyRenewalOfferParams} from './AcceptEarlyRenewalOfferParams';
 export type {default as DomainParams} from './DomainParams';
 export type {default as OpenDomainPageParams} from './OpenDomainPageParams';
 export type {default as RequestDomainAdminshipParams} from './RequestDomainAdminshipParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 899d4ece3c87..883a395ae6bd 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -191,6 +191,7 @@ const WRITE_COMMANDS = {
     CREATE_POLICY_TAG: 'CreatePolicyTag',
     RENAME_POLICY_TAG: 'RenamePolicyTag',
     SET_WORKSPACE_REQUIRES_CATEGORY: 'SetWorkspaceRequiresCategory',
+    SET_POLICY_AUTO_CATEGORIZE_NEW_EXPENSES: 'SetPolicyAutoCategorizeNewExpenses',
     SET_POLICY_SHOW_CATEGORY_GL_CODES: 'SetPolicyShowCategoryGLCodes',
     UPDATE_POLICY_CATEGORY_PAYROLL_CODE: 'UpdatePolicyCategoryPayrollCode',
     UPDATE_POLICY_CATEGORY_GL_CODE: 'UpdatePolicyCategoryGLCode',
@@ -294,6 +295,7 @@ const WRITE_COMMANDS = {
     SET_POLICY_EXPENSE_MAX_AMOUNT: 'SetPolicyExpenseMaxAmount',
     SET_POLICY_PROHIBITED_EXPENSES: 'SetPolicyProhibitedExpenses',
     SET_POLICY_COMMUTER_EXCLUSIONS: 'SetPolicyCommuterExclusions',
+    SET_EMPLOYEE_WORK_ARRANGEMENT: 'SetEmployeeWorkArrangement',
     DISABLE_POLICY_COMMUTER_EXCLUSIONS: 'DisablePolicyCommuterExclusions',
     SET_POLICY_REQUIRE_MAP_OR_GPS: 'SetPolicyRequireMapOrGPS',
     SET_POLICY_EXPENSE_MAX_AGE: 'SetPolicyExpenseMaxAge',
@@ -408,6 +410,7 @@ const WRITE_COMMANDS = {
     UPDATE_SUBSCRIPTION_TYPE: 'UpdateSubscriptionType',
     SIGN_UP_USER: 'SignUpUser',
     UPDATE_SUBSCRIPTION_AUTO_RENEW: 'UpdateSubscriptionAutoRenew',
+    ACCEPT_EARLY_RENEWAL_OFFER: 'AcceptEarlyRenewalOffer',
     UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY: 'UpdateSubscriptionAddNewUsersAutomatically',
     UPDATE_PERSONAL_KARMA: 'UpdatePersonalKarma',
     UPDATE_SUBSCRIPTION_SIZE: 'UpdateSubscriptionSize',
@@ -578,6 +581,14 @@ const WRITE_COMMANDS = {
     UPDATE_BUSINESS_CENTRAL_FIELD_MAPPING: 'UpdateBusinessCentralFieldMapping',
     UPDATE_BUSINESS_CENTRAL_SYNC_TAX_RATES: 'UpdateBusinessCentralSyncTaxRates',
     UPDATE_BUSINESS_CENTRAL_SYNC_ITEMS: 'UpdateBusinessCentralSyncItems',
+    UPDATE_BUSINESS_CENTRAL_EXPORTER: 'UpdateBusinessCentralExporter',
+    UPDATE_BUSINESS_CENTRAL_EXPORT_DATE: 'UpdateBusinessCentralExportDate',
+    UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateBusinessCentralReimbursableExpensesExportDestination',
+    UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateBusinessCentralNonreimbursableExpensesExportDestination',
+    UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_ACCOUNT: 'UpdateBusinessCentralReimbursableAccount',
+    UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_ACCOUNT: 'UpdateBusinessCentralNonreimbursableAccount',
+    UPDATE_BUSINESS_CENTRAL_DEFAULT_VENDOR: 'UpdateBusinessCentralDefaultVendor',
+    UPDATE_BUSINESS_CENTRAL_PAYMENT_METHOD: 'UpdateBusinessCentralPaymentMethod',
     CONNECT_POLICY_TO_CAMPFIRE: 'ConnectPolicyToCampfire',
     UPDATE_CAMPFIRE_SUBSIDIARY: 'UpdateCampfireSubsidiary',
     UPDATE_CAMPFIRE_FIELD_MAPPING: 'UpdateCampfireFieldMapping',
@@ -587,6 +598,8 @@ const WRITE_COMMANDS = {
     UPDATE_CAMPFIRE_EXPORT_DATE: 'UpdateCampfireExportDate',
     UPDATE_CAMPFIRE_DEFAULT_VENDOR: 'UpdateCampfireDefaultVendor',
     UPDATE_CAMPFIRE_CREDIT_CARD_ACCOUNT: 'UpdateCampfireCreditCardAccount',
+    UPDATE_CAMPFIRE_EXPORT_TO_MULTIPLE_ACCOUNTS: 'UpdateCampfireExportToMultipleAccounts',
+    UPDATE_CAMPFIRE_CARD_PROGRAM_ACCOUNT: 'UpdateCampfireCardProgramAccount',
     UPDATE_CAMPFIRE_AUTO_SYNC: 'UpdateCampfireAutoSync',
     UPDATE_CAMPFIRE_ACCOUNTING_METHOD: 'UpdateCampfireAccountingMethod',
     UPDATE_CAMPFIRE_SYNC_REIMBURSED_REPORTS: 'UpdateCampfireSyncReimbursedReports',
@@ -603,6 +616,7 @@ const WRITE_COMMANDS = {
     QUEUE_EXPORT_SEARCH_ITEMS_TO_CSV: 'QueueExportSearchToCSV',
     QUEUE_EXPORT_SEARCH_WITH_TEMPLATE: 'QueueExportSearchWithTemplate',
     QUEUE_BULK_PAY_REPORTS: 'QueueBulkPayReports',
+    QUEUE_BULK_MARK_AS_EXPORTED: 'QueueBulkMarkAsExported',
     CREATE_WORKSPACE_APPROVAL: 'CreateWorkspaceApproval',
     UPDATE_WORKSPACE_APPROVAL: 'UpdateWorkspaceApproval',
     REMOVE_WORKSPACE_APPROVAL: 'RemoveWorkspaceApproval',
@@ -912,6 +926,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.EXPORT_RECEIPTS_TO_ZIP]: Parameters.ExportReceiptsToZipParams;
     [WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY]: Parameters.RenameWorkspaceCategoriesParams;
     [WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY]: Parameters.SetWorkspaceRequiresCategoryParams;
+    [WRITE_COMMANDS.SET_POLICY_AUTO_CATEGORIZE_NEW_EXPENSES]: Parameters.SetPolicyAutoCategorizeNewExpensesParams;
     [WRITE_COMMANDS.SET_POLICY_SHOW_CATEGORY_GL_CODES]: Parameters.SetPolicyShowCategoryGLCodesParams;
     [WRITE_COMMANDS.DELETE_WORKSPACE_CATEGORIES]: Parameters.DeleteWorkspaceCategoriesParams;
     [WRITE_COMMANDS.UPDATE_POLICY_CATEGORY_PAYROLL_CODE]: Parameters.UpdatePolicyCategoryPayrollCodeParams;
@@ -1155,6 +1170,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UNSHARE_BANK_ACCOUNT]: Parameters.UnshareBankAccountParams;
     [WRITE_COMMANDS.SIGN_UP_USER]: Parameters.SignUpUserParams;
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_AUTO_RENEW]: Parameters.UpdateSubscriptionAutoRenewParams;
+    [WRITE_COMMANDS.ACCEPT_EARLY_RENEWAL_OFFER]: Parameters.AcceptEarlyRenewalOfferParams;
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY]: Parameters.UpdateSubscriptionAddNewUsersAutomaticallyParams;
     [WRITE_COMMANDS.UPDATE_PERSONAL_KARMA]: Parameters.UpdatePersonalKarmaParams;
     [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_SIZE]: Parameters.UpdateSubscriptionSizeParams;
@@ -1179,6 +1195,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SAVE_CORPAY_ONBOARDING_COMPANY_DETAILS]: Parameters.SaveCorpayOnboardingCompanyDetailsParams;
     [WRITE_COMMANDS.SET_POLICY_PROHIBITED_EXPENSES]: Parameters.SetPolicyProhibitedExpensesParams;
     [WRITE_COMMANDS.SET_POLICY_COMMUTER_EXCLUSIONS]: Parameters.SetPolicyCommuterExclusionsParams;
+    [WRITE_COMMANDS.SET_EMPLOYEE_WORK_ARRANGEMENT]: Parameters.SetEmployeeWorkArrangementParams;
     [WRITE_COMMANDS.DISABLE_POLICY_COMMUTER_EXCLUSIONS]: Parameters.DisablePolicyCommuterExclusionsParams;
     [WRITE_COMMANDS.SET_POLICY_REQUIRE_MAP_OR_GPS]: Parameters.SetPolicyRequireMapOrGPSParams;
     [WRITE_COMMANDS.RETRACT_REPORT]: Parameters.RetractReportParams;
@@ -1281,6 +1298,14 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_FIELD_MAPPING]: Parameters.UpdateBusinessCentralFieldMappingParams;
     [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_SYNC_TAX_RATES]: Parameters.UpdateBusinessCentralSyncTaxRatesParams;
     [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_SYNC_ITEMS]: Parameters.UpdateBusinessCentralSyncItemsParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_EXPORTER]: Parameters.UpdateBusinessCentralExporterParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_EXPORT_DATE]: Parameters.UpdateBusinessCentralExportDateParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateBusinessCentralReimbursableExpensesExportDestinationParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_ACCOUNT]: Parameters.UpdateBusinessCentralReimbursableAccountParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_ACCOUNT]: Parameters.UpdateBusinessCentralNonreimbursableAccountParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_DEFAULT_VENDOR]: Parameters.UpdateBusinessCentralDefaultVendorParams;
+    [WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_PAYMENT_METHOD]: Parameters.UpdateBusinessCentralPaymentMethodParams;
 
     [WRITE_COMMANDS.CONNECT_POLICY_TO_CAMPFIRE]: Parameters.ConnectPolicyToCampfireParams;
     [WRITE_COMMANDS.UPDATE_CAMPFIRE_SUBSIDIARY]: Parameters.UpdateCampfireSubsidiaryParams;
@@ -1291,6 +1316,8 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_CAMPFIRE_EXPORT_DATE]: Parameters.UpdateCampfireExportDateParams;
     [WRITE_COMMANDS.UPDATE_CAMPFIRE_DEFAULT_VENDOR]: Parameters.UpdateCampfireDefaultVendorParams;
     [WRITE_COMMANDS.UPDATE_CAMPFIRE_CREDIT_CARD_ACCOUNT]: Parameters.UpdateCampfireCreditCardAccountParams;
+    [WRITE_COMMANDS.UPDATE_CAMPFIRE_EXPORT_TO_MULTIPLE_ACCOUNTS]: Parameters.UpdateCampfireExportToMultipleAccountsParams;
+    [WRITE_COMMANDS.UPDATE_CAMPFIRE_CARD_PROGRAM_ACCOUNT]: Parameters.UpdateCampfireCardProgramAccountParams;
     [WRITE_COMMANDS.UPDATE_CAMPFIRE_AUTO_SYNC]: Parameters.UpdateCampfireAutoSyncParams;
     [WRITE_COMMANDS.UPDATE_CAMPFIRE_ACCOUNTING_METHOD]: Parameters.UpdateCampfireAccountingMethodParams;
     [WRITE_COMMANDS.UPDATE_CAMPFIRE_SYNC_REIMBURSED_REPORTS]: Parameters.UpdateCampfireSyncReimbursedReportsParams;
@@ -1383,6 +1410,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.QUEUE_EXPORT_SEARCH_ITEMS_TO_CSV]: Parameters.QueueExportSearchItemsToCSVParams;
     [WRITE_COMMANDS.QUEUE_EXPORT_SEARCH_WITH_TEMPLATE]: Parameters.QueueExportSearchWithTemplateParams;
     [WRITE_COMMANDS.QUEUE_BULK_PAY_REPORTS]: Parameters.QueueBulkPayReportsParams;
+    [WRITE_COMMANDS.QUEUE_BULK_MARK_AS_EXPORTED]: Parameters.QueueBulkMarkAsExportedParams;
     [WRITE_COMMANDS.EXPORT_REPORT_TO_CSV]: Parameters.ExportReportCSVParams;
     [WRITE_COMMANDS.CREATE_WORKSPACE_APPROVAL]: Parameters.CreateWorkspaceApprovalParams;
     [WRITE_COMMANDS.UPDATE_WORKSPACE_APPROVAL]: Parameters.UpdateWorkspaceApprovalParams;
@@ -1533,6 +1561,7 @@ const READ_COMMANDS = {
     OPEN_SEARCH_PAGE: 'OpenSearchPage',
     OPEN_SEARCH_CARD_FILTERS_PAGE: 'OpenSearchCardFiltersPage',
     OPEN_SEARCH_CATEGORY_FILTERS_PAGE: 'OpenSearchCategoryFiltersPage',
+    OPEN_SEARCH_VENDOR_FILTERS_PAGE: 'OpenSearchVendorFiltersPage',
     SEARCH: 'Search',
     GET_INSIGHTS: 'GetInsights',
     GET_TRANSACTIONS_CONVERTED_AMOUNT: 'GetTransactionsConvertedAmount',
@@ -1567,6 +1596,7 @@ const READ_COMMANDS = {
     OPEN_POLICY_REPORT_FIELDS_PAGE: 'OpenPolicyReportFieldsPage',
     OPEN_POLICY_INVOICES_PAGE: 'OpenPolicyInvoicesPage',
     OPEN_POLICY_RULES_PAGE: 'OpenPolicyRulesPage',
+    GET_RULES: 'GetRules',
     OPEN_POLICY_EXPENSIFY_CARDS_PAGE: 'OpenPolicyExpensifyCardsPage',
     OPEN_POLICY_TRAVEL_PAGE: 'OpenPolicyTravelPage',
     GET_TRAVEL_BILLING_STATEMENT_PDF: 'GetTravelBillingStatementPDF',
@@ -1589,6 +1619,7 @@ const READ_COMMANDS = {
     OPEN_DUPLICATE_POLICY_PAGE: 'OpenDuplicatePolicyPage',
     OPEN_POLICY_INITIAL_PAGE: 'OpenPolicyInitialPage',
     OPEN_SUBSCRIPTION_PAGE: 'OpenSubscriptionPage',
+    OPEN_HOME_PAGE: 'OpenHomePage',
     OPEN_PAYMENT_HISTORY_PAGE: 'OpenPaymentHistoryPage',
     OPEN_SAVE_THE_WORLD_PAGE: 'OpenSaveTheWorldPage',
     OPEN_DRAFT_DISTANCE_EXPENSE: 'OpenDraftDistanceExpense',
@@ -1683,6 +1714,7 @@ type ReadCommandParameters = {
     [READ_COMMANDS.OPEN_POLICY_REPORT_FIELDS_PAGE]: Parameters.OpenPolicyReportFieldsPageParams;
     [READ_COMMANDS.OPEN_POLICY_INVOICES_PAGE]: Parameters.OpenPolicyReportFieldsPageParams;
     [READ_COMMANDS.OPEN_POLICY_RULES_PAGE]: Parameters.OpenPolicyRulesPageParams;
+    [READ_COMMANDS.GET_RULES]: EmptyObject;
     [READ_COMMANDS.OPEN_WORKSPACE_INVITE_PAGE]: Parameters.OpenWorkspaceInvitePageParams;
     [READ_COMMANDS.OPEN_DRAFT_WORKSPACE_REQUEST]: Parameters.OpenDraftWorkspaceRequestParams;
     [READ_COMMANDS.OPEN_DRAFT_PER_DIEM_EXPENSE]: Parameters.OpenDraftPerDiemExpenseParams;
@@ -1705,11 +1737,13 @@ type ReadCommandParameters = {
     [READ_COMMANDS.OPEN_POLICY_INITIAL_PAGE]: Parameters.OpenPolicyInitialPageParams;
     [READ_COMMANDS.OPEN_POLICY_RECEIPT_PARTNERS_PAGE]: Parameters.OpenPolicyReceiptPartnersPageParams;
     [READ_COMMANDS.OPEN_SUBSCRIPTION_PAGE]: null;
+    [READ_COMMANDS.OPEN_HOME_PAGE]: null;
     [READ_COMMANDS.OPEN_PAYMENT_HISTORY_PAGE]: null;
     [READ_COMMANDS.OPEN_SAVE_THE_WORLD_PAGE]: null;
     [READ_COMMANDS.OPEN_DRAFT_DISTANCE_EXPENSE]: null;
     [READ_COMMANDS.OPEN_SEARCH_CARD_FILTERS_PAGE]: null;
     [READ_COMMANDS.OPEN_SEARCH_CATEGORY_FILTERS_PAGE]: null;
+    [READ_COMMANDS.OPEN_SEARCH_VENDOR_FILTERS_PAGE]: null;
     [READ_COMMANDS.START_ISSUE_NEW_CARD_FLOW]: Parameters.StartIssueNewCardFlowParams;
     [READ_COMMANDS.OPEN_CARD_DETAILS_PAGE]: Parameters.OpenCardDetailsPageParams;
     [READ_COMMANDS.GET_CORPAY_ONBOARDING_FIELDS]: Parameters.GetCorpayOnboardingFieldsParams;
@@ -1744,6 +1778,7 @@ const SIDE_EFFECT_REQUEST_COMMANDS = {
     IMPORT_TAGS_SPREADSHEET: 'ImportTagsSpreadsheet',
     OPEN_OLD_DOT_LINK: 'OpenOldDotLink',
     RECONNECT_APP: 'ReconnectApp',
+    LOAD_PERSONAL_DETAILS: 'LoadPersonalDetails',
     REVEAL_EXPENSIFY_TRAVEL_CARD_DETAILS: 'RevealExpensifyTravelCardDetails',
     TWO_FACTOR_AUTH_VALIDATE: 'TwoFactorAuth_Validate',
     CONNECT_AS_DELEGATE: 'ConnectAsDelegate',
@@ -1753,6 +1788,7 @@ const SIDE_EFFECT_REQUEST_COMMANDS = {
     MERGE_INTO_ACCOUNT_AND_LOGIN: 'MergeIntoAccountAndLogIn',
     ADD_WORK_EMAIL: 'AddWorkEmail',
     SEARCH: 'Search',
+    GET_INSIGHTS: 'GetInsights',
     GET_SCIM_TOKEN: 'GetSCIMToken',
 
     LOG_OUT: 'LogOut',
@@ -1795,6 +1831,7 @@ type SideEffectRequestCommandParameters = {
     [SIDE_EFFECT_REQUEST_COMMANDS.REVEAL_EXPENSIFY_TRAVEL_CARD_DETAILS]: Parameters.RevealExpensifyCardDetailsParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES]: Parameters.GetMissingOnyxMessagesParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.LOAD_PERSONAL_DETAILS]: null;
     [SIDE_EFFECT_REQUEST_COMMANDS.GENERATE_SPOTNANA_TOKEN]: Parameters.GenerateSpotnanaTokenParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.CONNECT_AS_DELEGATE]: Parameters.ConnectAsDelegateParams;
diff --git a/src/libs/Accessibility/moveAccessibilityFocus/types.ts b/src/libs/Accessibility/moveAccessibilityFocus/types.ts
index 6756bdd6f773..be34fd86cc00 100644
--- a/src/libs/Accessibility/moveAccessibilityFocus/types.ts
+++ b/src/libs/Accessibility/moveAccessibilityFocus/types.ts
@@ -1,6 +1,9 @@
-import type {ElementRef, RefObject} from 'react';
+import type {ComponentRef, RefObject} from 'react';
 import type {HostComponent} from 'react-native';
 
-type MoveAccessibilityFocus = (ref?: ElementRef<HostComponent<unknown>> & RefObject<HTMLOrSVGElement>) => void;
+type AccessibilityFocusTarget = ComponentRef<HostComponent<unknown>> & RefObject<HTMLOrSVGElement | null>;
 
+type MoveAccessibilityFocus = (ref?: AccessibilityFocusTarget) => void;
+
+export type {AccessibilityFocusTarget};
 export default MoveAccessibilityFocus;
diff --git a/src/libs/AccountingUtils.ts b/src/libs/AccountingUtils.ts
index 4449389535d2..af5c8662556e 100644
--- a/src/libs/AccountingUtils.ts
+++ b/src/libs/AccountingUtils.ts
@@ -7,6 +7,8 @@ import type {ConnectionName, PolicyConnectionName} from '@src/types/onyx/Policy'
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
+import {differenceInCalendarDays, fromUnixTime} from 'date-fns';
+
 const ROUTE_NAME_MAPPING = {
     [CONST.POLICY.CONNECTIONS.ROUTE.QBO]: CONST.POLICY.CONNECTIONS.NAME.QBO,
     [CONST.POLICY.CONNECTIONS.ROUTE.XERO]: CONST.POLICY.CONNECTIONS.NAME.XERO,
@@ -77,6 +79,37 @@ function isIntuitEnterpriseSuiteConnection(policy: OnyxEntry<Policy>): boolean {
     return !!policy?.connections?.quickbooksOnline?.config?.credentials?.scope?.includes(CONST.POLICY.CONNECTIONS.INTUIT_ENTERPRISE_SUITE_SCOPE);
 }
 
+/** The moment the QuickBooks Online refresh token stops working. Intuit restarts its 100-day lifetime on every refresh, so this only gets close on idle connections. */
+function getQBORefreshTokenExpiryDate(policy: OnyxEntry<Policy>): Date | undefined {
+    const refreshTokenExpiresAt = policy?.connections?.quickbooksOnline?.config?.credentials?.refreshTokenExpiresAt;
+    if (!refreshTokenExpiresAt) {
+        return undefined;
+    }
+    return fromUnixTime(refreshTokenExpiresAt);
+}
+
+/**
+ * Whether the QuickBooks Online refresh token expires within the warning window or already has, so the workspace should ask its admins to reconnect
+ * before exports start failing. A connection that already reports an authentication error is excluded since it shows the reconnect error state instead.
+ */
+function getQBORefreshTokenExpiryStatus(policy: OnyxEntry<Policy>, now: Date = new Date()): ValueOf<typeof CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_STATUS> | undefined {
+    const expiryDate = getQBORefreshTokenExpiryDate(policy);
+    if (!expiryDate || policy?.connections?.quickbooksOnline?.lastSync?.isAuthenticationError === true) {
+        return undefined;
+    }
+    if (expiryDate.getTime() <= now.getTime()) {
+        return CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_STATUS.EXPIRED;
+    }
+    if (differenceInCalendarDays(expiryDate, now) <= CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_WARNING_DAYS) {
+        return CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_STATUS.EXPIRING_SOON;
+    }
+    return undefined;
+}
+
+function isQBORefreshTokenExpiringSoon(policy: OnyxEntry<Policy>, now: Date = new Date()): boolean {
+    return !!getQBORefreshTokenExpiryStatus(policy, now);
+}
+
 function getQuickbooksOnlineIntegrationName(policy: OnyxEntry<Policy>, translate: LocaleContextProps['translate']): string {
     return translate(isIntuitEnterpriseSuiteConnection(policy) ? 'workspace.accounting.intuitEnterpriseSuite' : 'workspace.accounting.qbo');
 }
@@ -107,10 +140,13 @@ export {
     getConnectionNameFromRouteParam,
     getExportLabelForConnection,
     getExportLabelsForConnection,
+    getQBORefreshTokenExpiryDate,
+    getQBORefreshTokenExpiryStatus,
     getQuickbooksOnlineIntegrationName,
     getRouteParamForConnection,
     getStandardExportTemplateDisplayName,
     isStandardExportTemplate,
     isStandardExportTemplateLabel,
     isIntuitEnterpriseSuiteConnection,
+    isQBORefreshTokenExpiringSoon,
 };
diff --git a/src/libs/AgentRulesUtils.ts b/src/libs/AgentRulesUtils.ts
index 9fc00872b77a..19663bf3ed3d 100644
--- a/src/libs/AgentRulesUtils.ts
+++ b/src/libs/AgentRulesUtils.ts
@@ -1,6 +1,9 @@
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+
 import CONST from '@src/CONST';
 import type {Policy} from '@src/types/onyx';
 import type {AgentRule} from '@src/types/onyx/Policy';
+import type SuggestedAgentRule from '@src/types/onyx/SuggestedAgentRule';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
@@ -10,6 +13,13 @@ type AgentRuleWithID = AgentRule & {
     ruleID: string;
 };
 
+type SuggestedAgentRuleSection = {
+    /** Empty for suggestions without a category */
+    category: string;
+
+    suggestions: SuggestedAgentRule[];
+};
+
 function getAgentRuleDisplayTitle(rule: AgentRule): string {
     return (rule.title ?? rule.prompt).replaceAll(/\s+/g, ' ').trim();
 }
@@ -57,5 +67,22 @@ function isRuleBotEnforcingRulesOnAnyPolicy(accountID: number | undefined, polic
     return !!getRuleBotEnforcedPolicy(accountID, policies);
 }
 
-export {getAgentRuleDisplayTitle, getVisibleAgentRules, getRuleBotEnforcedPolicy, isRuleBotEnforcingRules, isRuleBotEnforcingRulesOnAnyPolicy};
+function groupSuggestedAgentRulesByCategory(suggestions: SuggestedAgentRule[], localeCompare: LocaleContextProps['localeCompare']): SuggestedAgentRuleSection[] {
+    const suggestionsByCategory = new Map<string, SuggestedAgentRule[]>();
+    for (const suggestion of suggestions) {
+        const category = suggestion.category ?? '';
+        const categorySuggestions = suggestionsByCategory.get(category);
+        if (categorySuggestions) {
+            categorySuggestions.push(suggestion);
+        } else {
+            suggestionsByCategory.set(category, [suggestion]);
+        }
+    }
+    return Array.from(suggestionsByCategory, ([category, categorySuggestions]) => ({
+        category,
+        suggestions: categorySuggestions.sort((a, b) => localeCompare(a.title, b.title)),
+    }));
+}
+
+export {getAgentRuleDisplayTitle, getVisibleAgentRules, getRuleBotEnforcedPolicy, groupSuggestedAgentRulesByCategory, isRuleBotEnforcingRules, isRuleBotEnforcingRulesOnAnyPolicy};
 export type {AgentRuleWithID};
diff --git a/src/libs/ApiUtils.ts b/src/libs/ApiUtils.ts
index fef6b1a242f8..9cc5fb8de91b 100644
--- a/src/libs/ApiUtils.ts
+++ b/src/libs/ApiUtils.ts
@@ -11,10 +11,25 @@ import Onyx from 'react-native-onyx';
 import proxyConfig from '../../config/proxyConfig';
 import getEnvironment from './Environment/getEnvironment';
 
+type Server = ValueOf<typeof CONST.SERVER>;
+
+type ActiveServerState = {
+    activeServer: Server;
+
+    /** When true, a stored ACTIVE_SERVER is inert. */
+    isPinnedByEnvironment: boolean;
+
+    /** When true, a stored staging resolves to another server, so nothing reaches the staging hosts. */
+    isStagingIgnored: boolean;
+
+    /** When true, a stored QA is honored. The selector reads it so it cannot offer a server this refuses. */
+    isQASelectable: boolean;
+};
+
 // To avoid rebuilding native apps, native apps use production config for both staging and prod
 // We use the async environment check because it works on all platforms
 let envName: ValueOf<typeof CONST.ENVIRONMENT> = CONST.ENVIRONMENT.PRODUCTION;
-let storedServer: ValueOf<typeof CONST.SERVER> | undefined;
+let storedServer: Server | undefined;
 let hasReadStoredServer = false;
 
 // Stored verbatim, so the preference and the environment can arrive in either order. Onyx calls back even for
@@ -33,39 +48,42 @@ getEnvironment().then((value) => {
 });
 
 /**
- * Which server requests are sent to.
- *
- * Derived on demand rather than cached, so that a preference stored before the environment resolved is still
- * applied once it does.
+ * The server a stored value and an environment resolve to. Pure, so `useActiveServer` can call it during
+ * render with the values its own Onyx and environment subscriptions hand back.
  */
-function resolveActiveServer(): ValueOf<typeof CONST.SERVER> {
+function resolveActiveServer(value: Server | undefined, environment: ValueOf<typeof CONST.ENVIRONMENT>): ActiveServerState {
     // Selecting QA with no QA root leaves getApiRoot returning an empty string, and getCommandURL turns
     // that into a relative `api/Command?` the browser resolves against the app's own origin
     const isQAConfigured = !!CONFIG.EXPENSIFY.QA_API_ROOT;
 
     // The environment is baked into the bundle, and there is no meaningful way
     // to point qa.new.exops.io at production
-    if (envName === CONST.ENVIRONMENT.QA && isQAConfigured) {
-        return CONST.SERVER.QA;
+    if (environment === CONST.ENVIRONMENT.QA && isQAConfigured) {
+        return {activeServer: CONST.SERVER.QA, isPinnedByEnvironment: true, isStagingIgnored: false, isQASelectable: true};
     }
 
     // A stored 'qa' outlives the config that produced it: clearing QA_EXPENSIFY_URL hides the switch and
     // turns the QA gate off, but leaves the old Onyx value behind. A production bundle is the same case,
     // since it has no QA host to reach whatever is stored
-    const isQASelectable = isQAConfigured && envName !== CONST.ENVIRONMENT.PRODUCTION;
-    const server = storedServer === CONST.SERVER.QA && !isQASelectable ? undefined : storedServer;
+    const isQASelectable = isQAConfigured && environment !== CONST.ENVIRONMENT.PRODUCTION;
+    const server = value === CONST.SERVER.QA && !isQASelectable ? undefined : value;
 
     if (CONFIG.IS_USING_LOCAL_WEB && server !== CONST.SERVER.QA) {
-        return CONST.SERVER.PRODUCTION;
+        return {activeServer: CONST.SERVER.PRODUCTION, isPinnedByEnvironment: false, isStagingIgnored: true, isQASelectable};
     }
 
-    // An unread preference looks the same as an unset one, and defaulting to staging would ignore an opt-out
-    if (!hasReadStoredServer) {
-        return CONST.SERVER.PRODUCTION;
-    }
+    const defaultServer = environment === CONST.ENVIRONMENT.STAGING || environment === CONST.ENVIRONMENT.ADHOC ? CONST.SERVER.STAGING : CONST.SERVER.PRODUCTION;
+    return {activeServer: server ?? defaultServer, isPinnedByEnvironment: false, isStagingIgnored: false, isQASelectable};
+}
 
-    const defaultServer = envName === CONST.ENVIRONMENT.STAGING || envName === CONST.ENVIRONMENT.ADHOC ? CONST.SERVER.STAGING : CONST.SERVER.PRODUCTION;
-    return server ?? defaultServer;
+/**
+ * The state the app itself runs on. Derived on demand rather than cached, so that a preference stored before
+ * the environment resolved is still applied once it does.
+ */
+function getCurrentActiveServerState(): ActiveServerState {
+    // An unread preference looks the same as an unset one, and defaulting to staging would ignore an opt-out,
+    // so until it is read it stands in as an explicit production
+    return resolveActiveServer(hasReadStoredServer ? storedServer : CONST.SERVER.PRODUCTION, envName);
 }
 
 /**
@@ -74,7 +92,7 @@ function resolveActiveServer(): ValueOf<typeof CONST.SERVER> {
  */
 function getApiRoot<TKey extends OnyxKey = never>(request?: Partial<Pick<Request<TKey>, 'shouldUseSecure' | 'shouldSkipWebProxy' | 'command'>>, forceProduction = false): string {
     const shouldUseSecure = request?.shouldUseSecure ?? false;
-    const server = forceProduction ? CONST.SERVER.PRODUCTION : resolveActiveServer();
+    const server = forceProduction ? CONST.SERVER.PRODUCTION : getCurrentActiveServerState().activeServer;
 
     if (server === CONST.SERVER.QA) {
         // No web-proxy branch: Cloudflare Access answers the preflight and matches the bearer against the
@@ -111,11 +129,12 @@ function getCommandURL<TKey extends OnyxKey>(request: Request<TKey>): string {
 }
 
 function isQAServerActive(): boolean {
-    return resolveActiveServer() === CONST.SERVER.QA;
+    return getCurrentActiveServerState().activeServer === CONST.SERVER.QA;
 }
 
-function getActiveServer(): ValueOf<typeof CONST.SERVER> {
-    return resolveActiveServer();
+function getActiveServer(): Server {
+    return getCurrentActiveServerState().activeServer;
 }
 
-export {getActiveServer, getApiRoot, getCommandURL, isQAServerActive};
+export type {ActiveServerState, Server};
+export {getActiveServer, getApiRoot, getCommandURL, isQAServerActive, resolveActiveServer};
diff --git a/src/libs/AttendeeUtils.ts b/src/libs/AttendeeUtils.ts
index 1191df9e5b33..517b6ebb723f 100644
--- a/src/libs/AttendeeUtils.ts
+++ b/src/libs/AttendeeUtils.ts
@@ -7,7 +7,7 @@ import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
-import {sortAlphabetically} from './OptionsListUtils';
+import sortAlphabetically from './sortAlphabetically';
 
 function getNormalizedString(value?: string): string | undefined {
     const normalizedValue = value?.trim();
diff --git a/src/libs/Avatars/InitialAvatars.ts b/src/libs/Avatars/InitialAvatars.ts
deleted file mode 100644
index ecddd338ffbc..000000000000
--- a/src/libs/Avatars/InitialAvatars.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-type LetterInitial = 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'L' | 'M' | 'N' | 'O' | 'P' | 'Q' | 'R' | 'S' | 'T' | 'U' | 'V' | 'W' | 'X' | 'Y' | 'Z';
-type NumberInitial = '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9';
-
-type Initial = LetterInitial | NumberInitial;
-
-const DEFAULT_INITIAL: Initial = 'A';
-
-function getInitialFromText(text: string | null | undefined): Initial {
-    const match = text?.toUpperCase().match(/[A-Z0-9]/);
-    const initial = match?.[0] as Initial | undefined;
-    return initial ?? DEFAULT_INITIAL;
-}
-
-export {getInitialFromText, DEFAULT_INITIAL};
diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index a30236e64bbc..2c5dc30daaec 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -27,7 +27,7 @@ import type {
     Transaction,
     WorkspaceCardsList,
 } from '@src/types/onyx';
-import type {UnassignedCard} from '@src/types/onyx/Card';
+import type {CardLimitType, UnassignedCard} from '@src/types/onyx/Card';
 import type {
     BankName,
     CardFeed,
@@ -43,6 +43,7 @@ import type {
 import type {CardFeedErrors} from '@src/types/onyx/DerivedValues';
 import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
 import type {Connections} from '@src/types/onyx/Policy';
+import type {ACHDataReimbursementAccount} from '@src/types/onyx/ReimbursementAccount';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
 
@@ -58,6 +59,7 @@ import {isBankAccountPartiallySetup} from './BankAccountUtils';
 import {CARD_FEED_COLORS, GENERIC_CARD_COLORS} from './CardArtworkColors';
 import DateUtils from './DateUtils';
 import {areAddressAndPersonalDetailsMissing, arePersonalDetailsMissing, temporaryGetDisplayNameOrDefault} from './PersonalDetailsUtils';
+import {hasInProgressVBBA} from './ReimbursementAccountUtils';
 import StringUtils from './StringUtils';
 
 /**
@@ -494,6 +496,16 @@ function getDefaultExpensifyCardLimitType(policy?: OnyxEntry<Policy>): ValueOf<t
     return areApprovalsConfigured ? CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART : CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY;
 }
 
+/**
+ * Cards issued before a limit type was stored have none, and those fall back to the policy default rather than to the
+ * `smartLimit` translation `getTranslationKeyForLimitType` returns for a missing type. Everything that shows a card's
+ * limit type has to resolve it the same way, or the visible text, accessibility label, sort order, column width and
+ * CSV export disagree with each other.
+ */
+function getDisplayedExpensifyCardLimitType(limitType: CardLimitType | undefined, defaultLimitType: CardLimitType): CardLimitType {
+    return limitType ?? defaultLimitType;
+}
+
 function getTranslationKeyForLimitType(limitType: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES> | undefined): TranslationPaths {
     switch (limitType) {
         case CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART:
@@ -509,6 +521,110 @@ function getTranslationKeyForLimitType(limitType: ValueOf<typeof CONST.EXPENSIFY
     }
 }
 
+/**
+ * Switching from Monthly or Fixed to Smart, or from Smart or Fixed to Monthly, can start
+ * declining new spend when unapproved spend is already at the limit.
+ */
+const EXPENSIFY_CARD_LIMIT_TYPE_CHANGE_CONFIRMATION_COMBINATIONS: Array<[CardLimitType, CardLimitType]> = [
+    [CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],
+    [CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY],
+    [CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],
+    [CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY],
+];
+
+/**
+ * Whether Fixed should be offered when editing an Expensify card's limit type.
+ * Hidden when a monthly or Smart card has already spent its full unapproved limit.
+ * `fallbackLimitType` is the policy default, used when the card has no `limitType` yet.
+ */
+function shouldShowExpensifyCardFixedLimitType(card?: Card, fallbackLimitType?: CardLimitType): boolean {
+    if (!card?.totalSpend || !card.nameValuePairs?.unapprovedExpenseLimit) {
+        return true;
+    }
+
+    const currentLimitType = card.nameValuePairs.limitType ?? fallbackLimitType;
+    if (currentLimitType !== CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY && currentLimitType !== CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART) {
+        return true;
+    }
+
+    return Math.abs(card.totalSpend) < card.nameValuePairs.unapprovedExpenseLimit;
+}
+
+/**
+ * Smart and Monthly are always offered. Fixed is hidden once spend is already at the limit, and Single Use only exists on virtual cards.
+ */
+function getVisibleExpensifyCardLimitTypes(card: Card | undefined, policy: OnyxEntry<Policy>): CardLimitType[] {
+    const limitTypes: CardLimitType[] = [CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY];
+    if (shouldShowExpensifyCardFixedLimitType(card, getDefaultExpensifyCardLimitType(policy))) {
+        limitTypes.push(CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED);
+    }
+    if (card?.nameValuePairs?.isVirtual) {
+        limitTypes.push(CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE);
+    }
+    return limitTypes;
+}
+
+/**
+ * Whether changing to `newLimitType` can decline new transactions because unapproved spend is already at the limit.
+ * `fallbackLimitType` is the policy default, used when the card has no `limitType` yet.
+ */
+function shouldConfirmExpensifyCardLimitTypeChange(card: Card | undefined, newLimitType: CardLimitType, fallbackLimitType?: CardLimitType): boolean {
+    if (!card?.unapprovedSpend || !card.nameValuePairs?.unapprovedExpenseLimit) {
+        return false;
+    }
+
+    const unapprovedSpend = Math.abs(card.unapprovedSpend);
+    if (unapprovedSpend < card.nameValuePairs.unapprovedExpenseLimit) {
+        return false;
+    }
+
+    const currentLimitType = card.nameValuePairs.limitType ?? fallbackLimitType;
+    return EXPENSIFY_CARD_LIMIT_TYPE_CHANGE_CONFIRMATION_COMBINATIONS.some(([fromLimitType, toLimitType]) => currentLimitType === fromLimitType && newLimitType === toLimitType);
+}
+
+/**
+ * Warning copy for a limit-type change that would start declining transactions.
+ * Monthly and Fixed warn about switching to Smart; every other current type warns about Monthly.
+ */
+function getExpensifyCardLimitTypeChangeWarningKey(
+    currentLimitType: CardLimitType | undefined,
+): 'workspace.expensifyCard.changeCardSmartLimitTypeWarning' | 'workspace.expensifyCard.changeCardMonthlyLimitTypeWarning' {
+    if (currentLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY || currentLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED) {
+        return 'workspace.expensifyCard.changeCardSmartLimitTypeWarning';
+    }
+
+    return 'workspace.expensifyCard.changeCardMonthlyLimitTypeWarning';
+}
+
+type ExpensifyCardLimitChangeWarningKey = 'workspace.expensifyCard.smartLimitWarning' | 'workspace.expensifyCard.monthlyLimitWarning' | 'workspace.expensifyCard.fixedLimitWarning';
+
+/**
+ * Remaining spend after applying `newLimit` in cents. Current spend is
+ * `unapprovedExpenseLimit - availableSpend`, matching the RHP limit form so inline
+ * table edits use the same formula.
+ */
+function getExpensifyCardNewAvailableSpend(card: Card | undefined, newLimit: number): number {
+    const currentLimit = card?.nameValuePairs?.unapprovedExpenseLimit ?? 0;
+    const currentSpend = currentLimit - (card?.availableSpend ?? 0);
+    return newLimit - currentSpend;
+}
+
+/**
+ * Warning copy when a new limit would leave remaining spend at or below zero.
+ * Matches the RHP limit form so inline edits and the full-page form stay in sync.
+ */
+function getExpensifyCardLimitChangeWarningKey(limitType: CardLimitType | undefined): ExpensifyCardLimitChangeWarningKey {
+    switch (limitType) {
+        case CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART:
+            return 'workspace.expensifyCard.smartLimitWarning';
+        case CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY:
+            return 'workspace.expensifyCard.monthlyLimitWarning';
+        case CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED:
+        default:
+            return 'workspace.expensifyCard.fixedLimitWarning';
+    }
+}
+
 /**
  * Maps an Expensify Card `state` to the translation key for its status label shown in the workspace Expensify Card table.
  * `Pending order` and `Shipped` are physical-only states, so a virtual card in one of those states has no status to show.
@@ -594,6 +710,37 @@ function getEligibleBankAccountsForUkEuCard(bankAccountsList: OnyxEntry<BankAcco
     );
 }
 
+type ExpensifyCardEnrollmentRouteParams = {
+    /** Policy to do the enrollment on */
+    policyID: string;
+
+    /** Selected policy's outputCurrency */
+    currencyCode: string | undefined;
+
+    /** Return value from useCanEnrollNewExpensifyCardProgram */
+    isUkEuCurrencySupported: boolean;
+
+    /** ONYXKEYS.BANK_ACCOUNT_LIST */
+    bankAccountsList: OnyxEntry<BankAccountList>;
+
+    /** ONYXKEYS.CARD_SUPPORTED_COUNTRIES */
+    supportedCountriesByCurrency: OnyxEntry<Record<string, string[]>>;
+
+    /** ONYXKEYS.REIMBURSEMENT_ACCOUNT ACH data, to know if the user should be shown the bank account setup flow */
+    achData: ACHDataReimbursementAccount | undefined;
+};
+
+/** Returns the next enrollment route based on whether the workspace can use an existing bank account or must add one. */
+function getExpensifyCardEnrollmentRoute({policyID, currencyCode, isUkEuCurrencySupported, bankAccountsList, supportedCountriesByCurrency, achData}: ExpensifyCardEnrollmentRouteParams) {
+    const eligibleBankAccounts = isUkEuCurrencySupported
+        ? getEligibleBankAccountsForUkEuCard(bankAccountsList, supportedCountriesByCurrency, currencyCode)
+        : getEligibleBankAccountsForCard(bankAccountsList);
+    if (!eligibleBankAccounts.length || hasInProgressVBBA(achData, currencyCode !== CONST.CURRENCY.USD, policyID)) {
+        return ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute({policyID, backTo: ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID)});
+    }
+    return ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.getRoute(policyID);
+}
+
 /**
  * Returns whether any assigned card matches the predicate, skipping the `cardList` bucket of cards that are
  * still available to assign. Short-circuits on the first match and avoids the intermediate array/object copy
@@ -1216,6 +1363,84 @@ function getDefaultCardName(cardholder?: string) {
     return `${cardholder}'s card`;
 }
 
+/** The reason a proposed card name is invalid. Callers translate it via `getCardNameErrorMessage`. */
+type CardNameError = typeof CONST.INPUT_VALIDATION_ERRORS.REQUIRED | typeof CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+
+/**
+ * Validates a card name. Sanitize first so RHP forms, assign/issue steps, and inline
+ * table edits reject and persist the same value.
+ */
+function getCardNameError(newName: string): CardNameError | undefined {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (StringUtils.isEmptyString(sanitized)) {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    if (StringUtils.getUTF8ByteLength(sanitized) > CONST.STANDARD_LENGTH_LIMIT) {
+        return CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+    }
+
+    return undefined;
+}
+
+/** Translates a {@link CardNameError} into a user-facing message for the given name. */
+function getCardNameErrorMessage(translate: LocaleContextProps['translate'], error: CardNameError, name: string): string {
+    switch (error) {
+        case CONST.INPUT_VALIDATION_ERRORS.REQUIRED:
+            return translate('common.error.fieldRequired');
+        case CONST.INPUT_VALIDATION_ERRORS.TOO_LONG:
+        default:
+            return translate('common.error.characterLimitExceedCounter', StringUtils.getUTF8ByteLength(StringUtils.sanitizeName(name)), CONST.STANDARD_LENGTH_LIMIT);
+    }
+}
+
+/** The reason a proposed Expensify card limit is invalid. Callers translate it via `getExpensifyCardLimitErrorMessage`. */
+type ExpensifyCardLimitError =
+    | typeof CONST.INPUT_VALIDATION_ERRORS.REQUIRED
+    | typeof CONST.INPUT_VALIDATION_ERRORS.INVALID
+    | typeof CONST.INPUT_VALIDATION_ERRORS.NOT_INTEGER
+    | typeof CONST.INPUT_VALIDATION_ERRORS.TOO_HIGH;
+
+/**
+ * Validates an Expensify card limit against the same rules the RHP edit form uses.
+ * `newLimit` is the dollar amount as a string. Returns an error code, or undefined when the limit is valid.
+ */
+function getExpensifyCardLimitError(newLimit: string): ExpensifyCardLimitError | undefined {
+    if (!newLimit) {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    if (Number.isNaN(Number(newLimit))) {
+        return CONST.INPUT_VALIDATION_ERRORS.INVALID;
+    }
+
+    if (!Number.isInteger(Number(newLimit))) {
+        return CONST.INPUT_VALIDATION_ERRORS.NOT_INTEGER;
+    }
+
+    if (Number(newLimit) > CONST.EXPENSIFY_CARD.LIMIT_VALUE) {
+        return CONST.INPUT_VALIDATION_ERRORS.TOO_HIGH;
+    }
+
+    return undefined;
+}
+
+/** Translates an {@link ExpensifyCardLimitError} into a user-facing message. */
+function getExpensifyCardLimitErrorMessage(translate: LocaleContextProps['translate'], error: ExpensifyCardLimitError): string {
+    switch (error) {
+        case CONST.INPUT_VALIDATION_ERRORS.REQUIRED:
+            return translate('common.error.fieldRequired');
+        case CONST.INPUT_VALIDATION_ERRORS.NOT_INTEGER:
+            return translate('iou.error.invalidIntegerAmount');
+        case CONST.INPUT_VALIDATION_ERRORS.TOO_HIGH:
+            return translate('workspace.card.issueNewCard.cardLimitError');
+        case CONST.INPUT_VALIDATION_ERRORS.INVALID:
+        default:
+            return translate('iou.error.invalidAmount');
+    }
+}
+
 /** Resolves a company card's custom name, preferring the shared workspace NVP over the personal NVP. */
 function getCompanyCardCustomName(
     cardID: string | number | undefined,
@@ -1254,17 +1479,18 @@ function getCardAssignmentStartDate(isEditing: boolean | undefined, existingStar
 
 function checkIfNewFeedConnected(prevFeedsData: CombinedCardFeeds, currentFeedsData: CombinedCardFeeds, plaidBank?: string) {
     const prevFeeds = Object.keys(prevFeedsData);
-    const currentFeeds = Object.keys(currentFeedsData);
+    const currentFeeds = Object.keys(currentFeedsData) as CompanyCardFeedWithDomainID[];
+    const newFeed = currentFeeds.find((feed) => !prevFeeds.includes(feed));
 
-    const plaidBankFound =
-        plaidBank &&
-        currentFeeds.find((feed) => {
-            return splitCardFeedWithDomainID(feed as CompanyCardFeedWithDomainID)?.feedName === `${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`;
-        });
+    const plaidBankFound = plaidBank
+        ? currentFeeds.find((feed) => {
+              return splitCardFeedWithDomainID(feed)?.feedName === `${CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID}.${plaidBank}`;
+          })
+        : undefined;
 
     return {
         isNewFeedConnected: currentFeeds.length > prevFeeds.length || plaidBankFound,
-        newFeed: currentFeeds.find((feed) => !prevFeeds.includes(feed)) as CompanyCardFeedWithDomainID | undefined,
+        newFeed,
     };
 }
 
@@ -2259,6 +2485,12 @@ export {
     getCardFeedBackgroundColor,
     getCardFeedTextColor,
     getDefaultExpensifyCardLimitType,
+    getDisplayedExpensifyCardLimitType,
+    shouldShowExpensifyCardFixedLimitType,
+    shouldConfirmExpensifyCardLimitTypeChange,
+    getExpensifyCardLimitTypeChangeWarningKey,
+    getExpensifyCardNewAvailableSpend,
+    getExpensifyCardLimitChangeWarningKey,
     isExpensifyCard,
     isUkEuExpensifyCard,
     isOfflinePINMarket,
@@ -2273,8 +2505,10 @@ export {
     getMCardNumberString,
     getTranslationKeyForLimitType,
     getTranslationKeyForCardStatus,
+    getVisibleExpensifyCardLimitTypes,
     maskPin,
     getEligibleBankAccountsForCard,
+    getExpensifyCardEnrollmentRoute,
     sortCardsByCardholderName,
     isCurrencySupportedForECards,
     getCardFeedIcon,
@@ -2303,6 +2537,10 @@ export {
     hasOnlyOneCardToAssign,
     checkIfNewFeedConnected,
     getDefaultCardName,
+    getCardNameError,
+    getCardNameErrorMessage,
+    getExpensifyCardLimitError,
+    getExpensifyCardLimitErrorMessage,
     getCompanyCardCustomName,
     getCardAssignmentDateOption,
     getCardAssignmentStartDate,
diff --git a/src/libs/CategoryContextualRulesUtils.ts b/src/libs/CategoryContextualRulesUtils.ts
index 499cc0d09514..26f8091f479d 100644
--- a/src/libs/CategoryContextualRulesUtils.ts
+++ b/src/libs/CategoryContextualRulesUtils.ts
@@ -9,10 +9,12 @@ import type {CurrencyListActionsContextType} from '@hooks/useCurrencyList';
 import CONST from '@src/CONST';
 import type {DynamicRouteSuffix} from '@src/ROUTES';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import type {Policy, PolicyCategory} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyCategory} from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 
+import {getCategoryTaxRuleTaxID, getRuleDeletionPendingAction, getTaxRateDisplayName} from './CategoryTaxRulesUtils';
 import {hasExplicitFlagAmount} from './FlagForReviewRulesUtils';
+import {getTaxByID} from './PolicyUtils';
 import {
     categoryHasAnyRequireFieldsRule,
     formatRequireFieldsRuleDescriptions,
@@ -56,6 +58,7 @@ function getFlagForReviewContextualSummary(
  */
 function getCategoryContextualRules({
     policy,
+    policyCategories,
     category,
     categoryName,
     translate,
@@ -63,6 +66,8 @@ function getCategoryContextualRules({
     isOffline,
 }: {
     policy: Policy | undefined;
+    /** Read for the pending delete of the category a tax default depends on. */
+    policyCategories: PolicyCategories | undefined;
     category: PolicyCategory | undefined;
     categoryName: string;
     translate: LocaleContextProps['translate'];
@@ -110,6 +115,24 @@ function getCategoryContextualRules({
         }
     }
 
+    // A tax default lives in `policy.rules.expenseRules` rather than on the category, and carries no pending state of
+    // its own, so it follows the Expense defaults table and borrows the delete of the category or rate it depends on.
+    const taxID = getCategoryTaxRuleTaxID(policy.rules?.expenseRules, categoryName);
+    if (taxID) {
+        const taxPendingAction = getRuleDeletionPendingAction(policy, policyCategories, categoryName, taxID);
+        const isTaxPendingDelete = taxPendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+        if (isOffline || !isTaxPendingDelete) {
+            const taxDisplayName = getTaxByID(policy, taxID) ? getTaxRateDisplayName(policy, taxID) : '';
+            rules.push({
+                key: `tax-${categoryName}`,
+                summary: translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', translate('common.tax').toLowerCase(), taxDisplayName),
+                dynamicRoutePath: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_TAX_EDIT.path,
+                pendingAction: taxPendingAction,
+                isDisabled: isTaxPendingDelete,
+            });
+        }
+    }
+
     return rules;
 }
 
diff --git a/src/libs/CategoryTaxRulesUtils.ts b/src/libs/CategoryTaxRulesUtils.ts
index ce1ac8097367..b274d681983c 100644
--- a/src/libs/CategoryTaxRulesUtils.ts
+++ b/src/libs/CategoryTaxRulesUtils.ts
@@ -198,6 +198,7 @@ export {
     getCategoryTaxRulesTableData,
     getCategoryTaxRuleTaxID,
     getRuleCategoryName,
+    getRuleDeletionPendingAction,
     getTaxRateDisplayName,
     hasSelectableCategoryTaxRate,
     hasUsableTaxRates,
diff --git a/src/libs/CategoryUtils.ts b/src/libs/CategoryUtils.ts
index 2fae95808f1b..e1617b01c8b2 100644
--- a/src/libs/CategoryUtils.ts
+++ b/src/libs/CategoryUtils.ts
@@ -11,6 +11,8 @@ import type {OnyxCollection} from 'react-native-onyx';
 
 import {Str} from 'expensify-common';
 
+import StringUtils from './StringUtils';
+
 function formatDefaultTaxRateText(translate: LocaleContextProps['translate'], taxID: string, taxRate: TaxRate, policyTaxRates?: TaxRatesWithDefault) {
     const taxRateText = `${taxRate.name} ${CONST.DOT_SEPARATOR} ${taxRate.value}`;
 
@@ -138,6 +140,59 @@ function getDecodedCategoryName(categoryName: string) {
     return Str.htmlDecode(categoryName);
 }
 
+/** The reason a proposed category name is invalid. Callers translate it via `getCategoryNameErrorMessage`. */
+type CategoryNameError =
+    | typeof CONST.INPUT_VALIDATION_ERRORS.REQUIRED
+    | typeof CONST.INPUT_VALIDATION_ERRORS.EXISTING
+    | typeof CONST.INPUT_VALIDATION_ERRORS.INVALID
+    | typeof CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+
+/**
+ * Validates a category name against every rule (required, unique, reserved, length). This is the single
+ * source of truth shared by the create form, the RHP edit form, and inline table editing. Pass
+ * `currentName` (the decoded display name) when editing so renaming a category to its own name isn't flagged
+ * as a duplicate. Uniqueness also matches HTML-encoded stored names such as `Food &amp; Drink` vs `Food & Drink`.
+ * Returns an error code, or undefined when the name is valid.
+ */
+function getCategoryNameError(policyCategories: PolicyCategories | undefined, newName: string, currentName?: string): CategoryNameError | undefined {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (StringUtils.isEmptyString(sanitized)) {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    // Category keys may be HTML-encoded, so uniqueness compares decoded names. currentName is already decoded by the caller.
+    if (sanitized !== currentName && Object.keys(policyCategories ?? {}).some((name) => getDecodedCategoryName(name) === sanitized)) {
+        return CONST.INPUT_VALIDATION_ERRORS.EXISTING;
+    }
+
+    if (sanitized === CONST.INVALID_CATEGORY_NAME || sanitized === CONST.SEARCH.CATEGORY_DEFAULT_VALUE) {
+        return CONST.INPUT_VALIDATION_ERRORS.INVALID;
+    }
+
+    // Spread to count Unicode code points rather than UTF-16 code units.
+    if ([...sanitized].length > CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH) {
+        return CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+    }
+
+    return undefined;
+}
+
+/** Translates a {@link CategoryNameError} into a user-facing message for the given name. */
+function getCategoryNameErrorMessage(translate: LocaleContextProps['translate'], error: CategoryNameError, name: string): string {
+    switch (error) {
+        case CONST.INPUT_VALIDATION_ERRORS.REQUIRED:
+            return translate('workspace.categories.categoryRequiredError');
+        case CONST.INPUT_VALIDATION_ERRORS.EXISTING:
+            return translate('workspace.categories.existingCategoryError');
+        case CONST.INPUT_VALIDATION_ERRORS.INVALID:
+            return translate('workspace.categories.invalidCategoryName');
+        case CONST.INPUT_VALIDATION_ERRORS.TOO_LONG:
+        default:
+            return translate('common.error.characterLimitExceedCounter', [...StringUtils.sanitizeName(name)].length, CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH);
+    }
+}
+
 /**
  * Splits a category name on the colon separator, removes empty middle segments,
  * and merges a trailing empty segment into the previous part (preserving trailing colons).
@@ -239,4 +294,6 @@ export {
     processCategoryNameSegments,
     getAvailableNonPersonalPolicyCategories,
     hasAnyCategoryRules,
+    getCategoryNameError,
+    getCategoryNameErrorMessage,
 };
diff --git a/src/libs/Clipboard/getClipboardText/index.native.ts b/src/libs/Clipboard/getClipboardText/index.native.ts
index b8fe4771c48d..ef00c9c63637 100644
--- a/src/libs/Clipboard/getClipboardText/index.native.ts
+++ b/src/libs/Clipboard/getClipboardText/index.native.ts
@@ -1,5 +1,5 @@
 import Parser from '@libs/Parser';
 
-export default function getClipboardText(selection: string): string {
-    return Parser.htmlToMarkdown(selection);
+export default function getClipboardText(selection: string, reportIDToName?: Record<string, string>): string {
+    return Parser.htmlToMarkdown(selection, {reportIDToName});
 }
diff --git a/src/libs/Clipboard/getClipboardText/index.ts b/src/libs/Clipboard/getClipboardText/index.ts
index 69e9098892bb..772d0bc1f384 100644
--- a/src/libs/Clipboard/getClipboardText/index.ts
+++ b/src/libs/Clipboard/getClipboardText/index.ts
@@ -1,5 +1,5 @@
 import Parser from '@libs/Parser';
 
-export default function getClipboardText(selection: string): string {
-    return Parser.htmlToText(selection);
+export default function getClipboardText(selection: string, reportIDToName?: Record<string, string>): string {
+    return Parser.htmlToText(selection, {reportIDToName});
 }
diff --git a/src/libs/CurrentUserStore.ts b/src/libs/CurrentUserStore.ts
index fd5588f03b1a..d44cb3410fc3 100644
--- a/src/libs/CurrentUserStore.ts
+++ b/src/libs/CurrentUserStore.ts
@@ -1,19 +1,20 @@
 import ONYXKEYS from '@src/ONYXKEYS';
 
 /**
- * Thin store for current user email that has no dependencies on Log.
- * This avoids circular dependency: Log -> NetworkStore -> Log
- * Other modules can import getCurrentUserEmail from NetworkStore for convenience,
- * but Log specifically imports from here to break the cycle.
+ * Session email/auth-token mirror with no imports beyond Onyx. Keeps Log and light
+ * consumers away from NetworkStore, which imports Log, and from
+ * actions/Session, which drags the whole session layer into their import graphs.
  */
 import Onyx from 'react-native-onyx';
 
 let currentUserEmail: string | null = null;
+let sessionAuthToken: string | null = null;
 
 Onyx.connectWithoutView({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
         currentUserEmail = val?.email ?? null;
+        sessionAuthToken = val?.authToken ?? null;
     },
 });
 
@@ -21,5 +22,8 @@ function getCurrentUserEmail(): string | null {
     return currentUserEmail;
 }
 
-// eslint-disable-next-line import/prefer-default-export
-export {getCurrentUserEmail};
+function hasAuthToken(): boolean {
+    return !!sessionAuthToken;
+}
+
+export {getCurrentUserEmail, hasAuthToken};
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index ffdf30e3acbe..8903666754ba 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -323,11 +323,9 @@ function startCurrentDateUpdater() {
 }
 
 function getCurrentTimezone(timezone: Timezone): Required<Timezone> {
-    const currentTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-    if (timezone.automatic && timezone.selected !== currentTimezone) {
-        return {...timezone, selected: currentTimezone as SelectedTimezone, automatic: timezone.automatic ?? false};
-    }
-    return {selected: timezone.selected ?? (CONST.DEFAULT_TIME_ZONE.selected as SelectedTimezone), automatic: timezone.automatic ?? false};
+    const automatic = timezone.automatic ?? false;
+    const currentTimezone = automatic ? formatToSupportedTimezone({selected: Intl.DateTimeFormat().resolvedOptions().timeZone as SelectedTimezone}).selected : undefined;
+    return {selected: currentTimezone ?? timezone.selected ?? (CONST.DEFAULT_TIME_ZONE.selected as SelectedTimezone), automatic};
 }
 
 /**
diff --git a/src/libs/EarlyRenewalOfferUtils.ts b/src/libs/EarlyRenewalOfferUtils.ts
new file mode 100644
index 000000000000..431929786bac
--- /dev/null
+++ b/src/libs/EarlyRenewalOfferUtils.ts
@@ -0,0 +1,23 @@
+import CONST from '@src/CONST';
+
+export default function isNonIncentivizedEarlyRenewalPeriod(timestamp = Date.now()): boolean {
+    return timestamp >= Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.NON_INCENTIVIZED_START) && timestamp < Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.INCENTIVIZED_START);
+}
+
+function isIncentivizedEarlyRenewalPeriod(timestamp = Date.now()): boolean {
+    return timestamp >= Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.INCENTIVIZED_START) && timestamp < Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.CAMPAIGN_END);
+}
+
+function getNonIncentivizedEarlyRenewalDates(timestamp = Date.now()) {
+    const acceptedAt = new Date(timestamp);
+    const year = acceptedAt.getUTCFullYear();
+    const month = acceptedAt.getUTCMonth();
+
+    // Match Auth's acceptance-month anchor so January renewals move to the month the offer is accepted.
+    return {
+        startDate: new Date(Date.UTC(year, month, 1)).toISOString(),
+        endDate: new Date(Date.UTC(year + 1, month, 1)).toISOString(),
+    };
+}
+
+export {getNonIncentivizedEarlyRenewalDates, isIncentivizedEarlyRenewalPeriod};
diff --git a/src/libs/ExpenseDefaultRuleUtils.ts b/src/libs/ExpenseDefaultRuleUtils.ts
new file mode 100644
index 000000000000..c1cee4959ef9
--- /dev/null
+++ b/src/libs/ExpenseDefaultRuleUtils.ts
@@ -0,0 +1,467 @@
+/**
+ * Helpers for the expense default rules stored in the `rules_` collection, which is what the merchant rule
+ * editor reads and writes. Converts between the rules engine's filter tree and the flat form the editor
+ * uses, and reports the rules the form can't represent so they stay read-only instead of losing data on save.
+ */
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, Rule} from '@src/types/onyx';
+import type {ApprovalWorkflowAction} from '@src/types/onyx/ApprovalWorkflowRules';
+import type {
+    ExpenseDefaultAction,
+    ExpenseDefaultActionField,
+    ExpenseDefaultActions,
+    ExpenseDefaultRule,
+    ExpenseDefaultTaxValue,
+    ExpenseDefaultTriggers,
+} from '@src/types/onyx/ExpenseDefaultRules';
+import type {RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
+
+import type {OnyxCollection} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import {rand64} from './NumberUtils';
+import Parser from './Parser';
+import {fromIndexMap, getRuleFilterLeaves, isExpenseDefaultRule, isRuleFilterComparison, isRuleFilterNode, toIndexMap} from './RuleUtils';
+
+/** The form shape the merchant rule editor round-trips a rule through. */
+type MerchantRuleFormValues = {
+    /** The merchant string an expense has to match */
+    merchantToMatch: string;
+
+    /** Whether the merchant has to match exactly (`eq`) or partially (`contains`) */
+    matchType: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>;
+
+    /** The merchant the expense is renamed to */
+    merchant?: string;
+
+    /** The category set on the expense */
+    category?: string;
+
+    /** The tag set on the expense */
+    tag?: string;
+
+    /** The external ID of the tax rate set on the expense */
+    tax?: string;
+
+    /** The external ID of the vendor set on the expense */
+    vendorID?: string;
+
+    /** The description set on the expense, as markdown */
+    comment?: string;
+
+    /** Whether the expense is reimbursable */
+    reimbursable?: boolean;
+
+    /** Whether the expense is billable */
+    billable?: boolean;
+};
+
+/** A rule from the `rules_` collection together with the ID parsed out of its Onyx key. */
+type RuleWithID = {
+    /** The rule's ID, i.e. the `rules_` key suffix */
+    ruleID: string;
+
+    /** The rule itself, narrowed to the expense default shape by `getPolicyExpenseDefaultRules` */
+    rule: Rule & ExpenseDefaultRule;
+};
+
+const {FIELD} = CONST.RULES.EXPENSE_DEFAULT;
+const {TRIGGERS: TRIGGER, ACTIONS: ACTION} = CONST.RULES;
+const {EQUAL_TO, CONTAINS} = CONST.SEARCH.SYNTAX_OPERATORS;
+
+/** The order actions are written in, which fixes the numeric keys a built rule uses. */
+const ACTION_FIELD_ORDER = [FIELD.MERCHANT, FIELD.CATEGORY, FIELD.TAG, FIELD.TAX, FIELD.VENDOR_ID, FIELD.COMMENT, FIELD.REIMBURSABLE, FIELD.BILLABLE] as const;
+
+/** Merchant match types the editor can represent. Any other operator on the merchant node makes a rule read-only. */
+const SUPPORTED_MERCHANT_MATCH_TYPES = new Set<ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>>([EQUAL_TO, CONTAINS]);
+
+/**
+ * The form key each action field reads back into, which makes reading a rule the mirror of writing one.
+ *
+ * A field that is absent here has no form input, so a rule setting it is read-only rather than landing in
+ * whichever branch happens to catch it.
+ */
+const STRING_ACTION_FIELD_TO_FORM_KEY = {
+    [FIELD.MERCHANT]: 'merchant',
+    [FIELD.CATEGORY]: 'category',
+    [FIELD.TAG]: 'tag',
+    [FIELD.VENDOR_ID]: 'vendorID',
+    [FIELD.COMMENT]: 'comment',
+} as const satisfies Partial<Record<ExpenseDefaultActionField, keyof MerchantRuleFormValues>>;
+
+/** See `STRING_ACTION_FIELD_TO_FORM_KEY`. */
+const BOOLEAN_ACTION_FIELD_TO_FORM_KEY = {
+    [FIELD.REIMBURSABLE]: 'reimbursable',
+    [FIELD.BILLABLE]: 'billable',
+} as const satisfies Partial<Record<ExpenseDefaultActionField, keyof MerchantRuleFormValues>>;
+
+function isStringActionField(field: ExpenseDefaultActionField): field is keyof typeof STRING_ACTION_FIELD_TO_FORM_KEY {
+    return field in STRING_ACTION_FIELD_TO_FORM_KEY;
+}
+
+function isBooleanActionField(field: ExpenseDefaultActionField): field is keyof typeof BOOLEAN_ACTION_FIELD_TO_FORM_KEY {
+    return field in BOOLEAN_ACTION_FIELD_TO_FORM_KEY;
+}
+
+/**
+ * The rule format has no notion of an empty value: a field the admin cleared is simply not set.
+ *
+ * The value is trimmed as well as tested, so a field holding only padding round-trips as unset rather than as
+ * whitespace the admin never typed.
+ */
+function emptyToUndefined(value: string | undefined): string | undefined {
+    const trimmed = value?.trim();
+    if (!trimmed) {
+        return undefined;
+    }
+    return trimmed;
+}
+
+/** Lists a rule's actions keyed by their stringified index. Rules of other kinds (approval workflows) carry actions of a different shape. */
+function getRuleActionEntries(rule: Rule | ExpenseDefaultRule | undefined): Array<[string, ExpenseDefaultAction | ApprovalWorkflowAction]> {
+    const actions: Record<string, ExpenseDefaultAction | ApprovalWorkflowAction> | undefined = rule?.actions;
+    return Object.entries(actions ?? {});
+}
+
+/** Lists a rule's actions. See `getRuleActionEntries`. */
+function getRuleActions(rule: Rule | ExpenseDefaultRule | undefined): Array<ExpenseDefaultAction | ApprovalWorkflowAction> {
+    const actions: Record<string, ExpenseDefaultAction | ApprovalWorkflowAction> | undefined = rule?.actions;
+    return fromIndexMap(actions);
+}
+
+/** `GetRules` returns every rule the user can see, so callers have to narrow the collection to one policy themselves. */
+function isPolicyScopedRule(rule: Rule | undefined, policyID: string | undefined): boolean {
+    return !!rule && !!policyID && rule.scope === CONST.RULES.SCOPE.POLICY && rule.scopeID === policyID;
+}
+
+/** Returns the policy's expense default rules, with each rule's ID parsed out of its Onyx key. */
+function getPolicyExpenseDefaultRules(rulesCollection: OnyxCollection<Rule> | undefined, policyID: string | undefined): RuleWithID[] {
+    if (!policyID) {
+        return [];
+    }
+
+    const rules: RuleWithID[] = [];
+
+    for (const [onyxKey, rule] of Object.entries(rulesCollection ?? {})) {
+        if (!rule || !isPolicyScopedRule(rule, policyID) || !isExpenseDefaultRule(rule)) {
+            continue;
+        }
+        rules.push({ruleID: onyxKey.slice(ONYXKEYS.COLLECTION.RULE.length), rule});
+    }
+
+    return rules;
+}
+
+/** Builds the `tax` action value, which carries the rate's name and value alongside its external ID for display. */
+function buildTaxActionValue(taxKey: string | undefined, policy: Policy | undefined): ExpenseDefaultTaxValue | undefined {
+    if (!taxKey) {
+        return undefined;
+    }
+
+    const tax = policy?.taxRates?.taxes?.[taxKey];
+
+    return {
+        // field_id_TAX is the name the rules engine gives this key, so it can't follow our casing convention
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        field_id_TAX: {
+            externalID: taxKey,
+            ...(tax ? {value: tax.value, name: tax.name} : {}),
+        },
+    };
+}
+
+/**
+ * A merchant rule as this editor builds it. Stored rules may carry a whole filter tree, but the editor only ever
+ * produces one merchant comparison, so callers converting a freshly built rule can read the filter directly.
+ */
+type BuiltMerchantRule = Omit<ExpenseDefaultRule, 'filters'> & {
+    /** The single `merchant eq|contains <value>` comparison this editor matches on. */
+    filters: RuleFilterComparison;
+};
+
+/** Builds the filter tree for a merchant rule: a single `merchant eq|contains <value>` comparison. */
+function buildMerchantRuleFilters(formValues: Partial<MerchantRuleFormValues>): RuleFilterComparison | undefined {
+    const merchantToMatch = formValues.merchantToMatch?.trim();
+    if (!merchantToMatch) {
+        return undefined;
+    }
+
+    return {
+        left: FIELD.MERCHANT,
+        operator: formValues.matchType ?? CONTAINS,
+        right: merchantToMatch,
+    };
+}
+
+/** Builds the `Set` actions for a merchant rule, keyed by a stringified index in a fixed field order. */
+function buildMerchantRuleActions(formValues: Partial<MerchantRuleFormValues>, policy: Policy | undefined): ExpenseDefaultActions {
+    const comment = emptyToUndefined(formValues.comment);
+    const valuesByField: Partial<Record<ExpenseDefaultActionField, ExpenseDefaultAction['value'] | undefined>> = {
+        [FIELD.MERCHANT]: emptyToUndefined(formValues.merchant),
+        [FIELD.CATEGORY]: emptyToUndefined(formValues.category),
+        [FIELD.TAG]: emptyToUndefined(formValues.tag),
+        [FIELD.TAX]: buildTaxActionValue(formValues.tax, policy),
+        [FIELD.VENDOR_ID]: emptyToUndefined(formValues.vendorID),
+        [FIELD.COMMENT]: comment ? Parser.replace(comment) : undefined,
+        [FIELD.REIMBURSABLE]: formValues.reimbursable,
+        [FIELD.BILLABLE]: formValues.billable,
+    };
+
+    const actions: ExpenseDefaultAction[] = [];
+
+    for (const field of ACTION_FIELD_ORDER) {
+        const value = valuesByField[field];
+        if (value === undefined) {
+            continue;
+        }
+        actions.push({name: ACTION.SET, field, value});
+    }
+
+    return toIndexMap(actions);
+}
+
+/**
+ * Builds the rules engine body for a merchant rule. It is what the `rules_` collection stores, and what the
+ * legacy `codingRuleValue` is derived from until writes move to `SetRule`.
+ * Returns undefined when the form has nothing to match on or nothing to set, which the API rejects.
+ */
+function buildMerchantRule(formValues: Partial<MerchantRuleFormValues>, policy: Policy | undefined): BuiltMerchantRule | undefined {
+    const filters = buildMerchantRuleFilters(formValues);
+    const actions = buildMerchantRuleActions(formValues, policy);
+
+    if (!filters || Object.keys(actions).length === 0) {
+        return undefined;
+    }
+
+    const triggers: ExpenseDefaultTriggers = toIndexMap([TRIGGER.CREATE_TRANSACTION]);
+
+    return {triggers, filters, actions};
+}
+
+/** A tax action value is the only non-primitive value a `Set` action can carry. */
+function isExpenseDefaultTaxValue(value: unknown): value is ExpenseDefaultTaxValue {
+    if (!value || typeof value !== 'object' || !('field_id_TAX' in value)) {
+        return false;
+    }
+
+    const taxField: unknown = value.field_id_TAX;
+    return !!taxField && typeof taxField === 'object' && 'externalID' in taxField && typeof taxField.externalID === 'string';
+}
+
+/** Every trigger has to be one the editor knows about, otherwise saving the form would drop the rest. */
+function areTriggersEditable(triggers: Record<string, string> | undefined): boolean {
+    const triggerValues = fromIndexMap(triggers);
+    return triggerValues.length > 0 && triggerValues.every((trigger) => trigger === TRIGGER.CREATE_TRANSACTION);
+}
+
+/** The editor matches on exactly one merchant condition, so anything else (a tree, another field, a list) can't be shown in the form. */
+function getEditableMerchantMatch(filters: RuleFilterNode | undefined): Pick<MerchantRuleFormValues, 'matchType' | 'merchantToMatch'> | undefined {
+    if (!filters || !isRuleFilterNode(filters) || !isRuleFilterComparison(filters)) {
+        return undefined;
+    }
+
+    if (filters.left !== FIELD.MERCHANT || !SUPPORTED_MERCHANT_MATCH_TYPES.has(filters.operator)) {
+        return undefined;
+    }
+
+    // The backend ORs a list of values together. The form only has one merchant input, so only a single value round-trips.
+    const rightValues = [filters.right].flat();
+    const merchantToMatch = rightValues.at(0);
+    if (rightValues.length !== 1 || typeof merchantToMatch !== 'string' || !merchantToMatch) {
+        return undefined;
+    }
+
+    return {merchantToMatch, matchType: filters.operator};
+}
+
+/**
+ * Converts a stored rule back into the values the merchant rule editor renders.
+ *
+ * Returns undefined when the rule can't be represented by the form, such as a nested filter tree, a filter on a
+ * field the form has no input for, an unknown trigger or action, or two actions writing the same field.
+ * Callers MUST treat undefined as "show this rule read-only": rendering a partial form and saving it back
+ * would silently drop everything the form couldn't represent.
+ */
+function getMerchantRuleFormValues(rule: Rule | ExpenseDefaultRule | undefined): MerchantRuleFormValues | undefined {
+    if (!rule || !areTriggersEditable(rule.triggers)) {
+        return undefined;
+    }
+
+    const merchantMatch = getEditableMerchantMatch(rule.filters);
+    if (!merchantMatch) {
+        return undefined;
+    }
+
+    const formValues: MerchantRuleFormValues = {...merchantMatch};
+
+    const actions = getRuleActions(rule);
+    if (actions.length === 0) {
+        return undefined;
+    }
+
+    const seenFields = new Set<ExpenseDefaultActionField>();
+
+    for (const action of actions) {
+        // An action the form can't produce - a non-`Set` action, an unknown field, or a second action on a
+        // field the form has a single input for - means saving the form would drop it.
+        if (!action || action.name !== ACTION.SET || !('field' in action) || !('value' in action) || seenFields.has(action.field)) {
+            return undefined;
+        }
+        seenFields.add(action.field);
+
+        const {field, value} = action;
+
+        if (isStringActionField(field)) {
+            if (typeof value !== 'string') {
+                return undefined;
+            }
+            // Descriptions are stored as HTML and edited as markdown. Every other string field is stored as typed.
+            formValues[STRING_ACTION_FIELD_TO_FORM_KEY[field]] = field === FIELD.COMMENT ? Parser.htmlToMarkdown(value) : value;
+            continue;
+        }
+
+        if (isBooleanActionField(field)) {
+            if (typeof value !== 'boolean') {
+                return undefined;
+            }
+            formValues[BOOLEAN_ACTION_FIELD_TO_FORM_KEY[field]] = value;
+            continue;
+        }
+
+        if (field === FIELD.TAX) {
+            if (!isExpenseDefaultTaxValue(value)) {
+                return undefined;
+            }
+            formValues.tax = value.field_id_TAX.externalID;
+            continue;
+        }
+
+        return undefined;
+    }
+
+    return formValues;
+}
+
+/**
+ * Summarizes the merchants a rule matches on, for the condition text and the search index.
+ *
+ * Derived from the filter tree rather than from `getMerchantRuleFormValues`, so a rule the editor can't
+ * represent still shows what it matches and can still be found by merchant while staying read-only.
+ */
+function getRuleMerchantMatchSummary(filters: RuleFilterNode | undefined): {merchants: string; isExactMatch: boolean} {
+    const merchantLeaves = getRuleFilterLeaves(filters).filter((leaf) => leaf.left === FIELD.MERCHANT);
+
+    return {
+        merchants: merchantLeaves.flatMap((leaf) => [leaf.right].flat()).join(', '),
+        isExactMatch: merchantLeaves.length > 0 && merchantLeaves.every((leaf) => leaf.operator === EQUAL_TO),
+    };
+}
+
+/** A single field a rule sets, normalized for display. */
+type ExpenseDefaultRuleSummaryField = {
+    /** The expense field being set */
+    field: ExpenseDefaultActionField;
+
+    /** The value the field is set to. `comment` is converted back to markdown; `tax` keeps its object shape */
+    value: ExpenseDefaultAction['value'];
+};
+
+/**
+ * Lists the fields a rule sets, in action-key order. Works for any rule, including ones the editor
+ * can't open, so the rules list can summarize them without going through the form.
+ */
+function getExpenseDefaultRuleSummaryFields(rule: Rule | ExpenseDefaultRule | undefined): ExpenseDefaultRuleSummaryField[] {
+    // Keys are stringified indexes, so "10" has to sort after "2" rather than before it.
+    const sortedEntries = getRuleActionEntries(rule).sort(([leftKey], [rightKey]) => Number(leftKey) - Number(rightKey));
+
+    const summaryFields: ExpenseDefaultRuleSummaryField[] = [];
+
+    for (const [, action] of sortedEntries) {
+        if (!action || action.name !== ACTION.SET || !('field' in action) || !('value' in action)) {
+            continue;
+        }
+        summaryFields.push({
+            field: action.field,
+            value: action.field === FIELD.COMMENT && typeof action.value === 'string' ? Parser.htmlToMarkdown(action.value) : action.value,
+        });
+    }
+
+    // Read back in the same field order the editor writes, not the order the actions happen to be indexed in.
+    // The backend reindexes the actions it stores, so ordering the summary by index reshuffles the text once a
+    // save comes back.
+    return summaryFields.sort((first, second) => ACTION_FIELD_ORDER.indexOf(first.field) - ACTION_FIELD_ORDER.indexOf(second.field));
+}
+
+/**
+ * Builds copies of a policy's expense default rules for another policy, as `ruleID -> rule`.
+ *
+ * Rules live in their own collection and carry the ID of the policy they belong to, so copying a workspace
+ * can't reuse the source's rules: each copy is a new rule, with a new ID, scoped to the target policy.
+ */
+function buildCopiedExpenseDefaultRules(rules: OnyxCollection<Rule> | undefined, sourcePolicyID: string | undefined, targetPolicyID: string): Record<string, Rule> {
+    const copiedRules: Record<string, Rule> = {};
+    const created = new Date().toISOString();
+
+    for (const {rule} of getPolicyExpenseDefaultRules(rules, sourcePolicyID)) {
+        if (rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+            continue;
+        }
+
+        copiedRules[rand64()] = {
+            triggers: rule.triggers,
+            filters: rule.filters,
+            actions: rule.actions,
+            scope: CONST.RULES.SCOPE.POLICY,
+            scopeID: targetPolicyID,
+            priority: rule.priority ?? CONST.RULES.EXPENSE_DEFAULT.PRIORITY,
+            created,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        };
+    }
+
+    return copiedRules;
+}
+
+/** How many expense default rules the policy has, ignoring ones being deleted. Used by the copy/duplicate feature lists. */
+function getExpenseDefaultRuleCount(rules: OnyxCollection<Rule> | undefined, policyID: string | undefined): number {
+    return getPolicyExpenseDefaultRules(rules, policyID).filter(({rule}) => rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length;
+}
+
+/** Whether any of the policy's expense default rules failed to save. */
+function hasExpenseDefaultRuleErrors(rules: OnyxCollection<Rule> | undefined, policyID: string | undefined): boolean {
+    return getPolicyExpenseDefaultRules(rules, policyID).some(({rule}) => Object.keys(rule.errors ?? {}).length > 0);
+}
+
+/** Whether the merchant rule editor can safely open this rule. See `getMerchantRuleFormValues`. */
+function isEditableMerchantRule(rule: Rule | ExpenseDefaultRule | undefined): boolean {
+    return !!getMerchantRuleFormValues(rule);
+}
+
+/**
+ * Whether the merchant rule editor is allowed to open this rule for the given policy.
+ *
+ * The `rules_` collection holds every kind of rule for every workspace the user can see, so a ruleID from a
+ * stale link or a bookmark can resolve to another policy's rule or to an approval workflow. Saving from the
+ * editor writes a freshly built merchant rule over that same ruleID, so anything it can't represent has to be
+ * refused rather than opened. A rule the form can edit is already an expense default rule, because the form only
+ * accepts `CreateTransaction` triggers and `Set` actions.
+ */
+function canEditMerchantRule(rule: Rule | undefined, policyID: string | undefined): boolean {
+    return isPolicyScopedRule(rule, policyID) && isEditableMerchantRule(rule);
+}
+
+export type {BuiltMerchantRule, MerchantRuleFormValues};
+export {
+    buildCopiedExpenseDefaultRules,
+    buildMerchantRule,
+    canEditMerchantRule,
+    getExpenseDefaultRuleCount,
+    getExpenseDefaultRuleSummaryFields,
+    getMerchantRuleFormValues,
+    getPolicyExpenseDefaultRules,
+    getRuleMerchantMatchSummary,
+    hasExpenseDefaultRuleErrors,
+    isEditableMerchantRule,
+    isExpenseDefaultTaxValue,
+};
diff --git a/src/libs/ExportOnyxState/masking.ts b/src/libs/ExportOnyxState/masking.ts
index 858974cbd070..578429ff5a4b 100644
--- a/src/libs/ExportOnyxState/masking.ts
+++ b/src/libs/ExportOnyxState/masking.ts
@@ -202,6 +202,8 @@ const safeOnyxKeys = new Set<string>([
     ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING,
     ONYXKEYS.COLLECTION.RAM_ONLY_COMPANY_CARDS_LOADING_STATE,
     ONYXKEYS.COLLECTION.RAM_ONLY_EXPENSIFY_CARD_LOADING_STATE,
+    ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE,
+    ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE,
     ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE,
     ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
     ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE,
@@ -223,6 +225,7 @@ const safeOnyxKeys = new Set<string>([
     ONYXKEYS.CURRENCY_LIST,
     ONYXKEYS.CURRENT_DATE,
     ONYXKEYS.DOMAIN_GROUP_CREATE_PREFERRED_POLICY_ID,
+    ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY,
     ONYXKEYS.EXPENSIFY_CARD_STATEMENT,
     ONYXKEYS.FULLSCREEN_VISIBILITY,
     ONYXKEYS.GOVERNMENT_MILEAGE_RATES,
@@ -252,8 +255,10 @@ const safeOnyxKeys = new Set<string>([
     ONYXKEYS.IS_PLAID_DISABLED,
     ONYXKEYS.IS_SEARCH_FILTERS_CARD_DATA_LOADED,
     ONYXKEYS.IS_SEARCH_FILTERS_CATEGORY_DATA_LOADED,
+    ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED,
     ONYXKEYS.IS_SENTRY_DEBUG_ENABLED,
     ONYXKEYS.IS_SENTRY_SEND_ENABLED,
+    ONYXKEYS.IS_SWITCHING_TO_DELEGATOR,
     ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN,
     ONYXKEYS.IS_USING_IMPORTED_STATE,
     ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID,
@@ -329,14 +334,18 @@ const safeOnyxKeys = new Set<string>([
     ONYXKEYS.PREFERRED_THEME,
     ONYXKEYS.RAM_ONLY_ARE_TRANSLATIONS_LOADING,
     ONYXKEYS.RAM_ONLY_CORPAY_PAY_MODAL,
+    ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS,
+    ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED,
     ONYXKEYS.RAM_ONLY_IS_AUTHENTICATING_WITH_SHORT_LIVED_TOKEN,
     ONYXKEYS.RAM_ONLY_IS_CHECKING_PENDING_WALLET_APPROVAL,
     ONYXKEYS.RAM_ONLY_IS_CHECKING_PUBLIC_ROOM,
+    ONYXKEYS.RAM_ONLY_IS_LOADING_RULES,
     ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS,
     ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_USERS,
     ONYXKEYS.RAM_ONLY_IS_SIDEBAR_LOADED,
     ONYXKEYS.RAM_ONLY_MERCHANT_RULE_SUGGESTION,
     ONYXKEYS.RAM_ONLY_MOBILE_SELECTION_MODE,
+    ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS,
     ONYXKEYS.RAM_ONLY_UPDATE_REQUIRED,
     ONYXKEYS.REIMBURSEMENT_ACCOUNT_OPTION_PRESSED,
     ONYXKEYS.REIMBURSEMENT_ACCOUNT_WORKSPACE_ID,
@@ -356,7 +365,7 @@ const safeOnyxKeys = new Set<string>([
     ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED,
     ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING,
     ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL,
-    ONYXKEYS.TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE,
+    ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH,
     ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS,
     ONYXKEYS.TRAVEL_BILLING_STATEMENT,
     ONYXKEYS.VALIDATE_DOMAIN_TWO_FACTOR_CODE,
@@ -495,6 +504,7 @@ const onyxKeysToMaskFragileData = new Set<string>([
     ONYXKEYS.RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER,
     ONYXKEYS.RAM_ONLY_HAS_FRESH_WALLET_DATA,
     ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA,
+    ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA,
     ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_PAGINATION,
     ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_RESULTS,
     ONYXKEYS.RAM_ONLY_WALLET_ONFIDO,
@@ -511,6 +521,7 @@ const onyxKeysToMaskFragileData = new Set<string>([
     ONYXKEYS.SCREEN_SHARE_REQUEST,
     ONYXKEYS.SEARCH_FILTERS,
     ONYXKEYS.SEARCH_FOOTER_CONVERSION,
+    // eslint-disable-next-line @typescript-eslint/no-deprecated -- the key is still on device until the migration drains it
     ONYXKEYS.SEARCH_QUERY_BY_HASH,
     ONYXKEYS.SHARE_BANK_ACCOUNT,
     ONYXKEYS.SHARE_TEMP_FILE,
diff --git a/src/libs/FraudProtection/GroupIBSdkBridge/cidMap/index.ts b/src/libs/FraudProtection/GroupIBSdkBridge/cidMap/index.ts
index 13a8e031fa04..6890e1543042 100644
--- a/src/libs/FraudProtection/GroupIBSdkBridge/cidMap/index.ts
+++ b/src/libs/FraudProtection/GroupIBSdkBridge/cidMap/index.ts
@@ -1,9 +1,12 @@
+import type Environment from '@libs/Environment/getEnvironment/types';
+
 import CONST from '@src/CONST';
 
-const cidMap: Record<string, string> = {
+const cidMap: Record<Environment, string> = {
     [CONST.ENVIRONMENT.PRODUCTION]: 'gib-w-expensify',
     [CONST.ENVIRONMENT.STAGING]: 'gib-w-expensify-stg',
     [CONST.ENVIRONMENT.DEV]: 'gib-w-expensify-uat',
+    [CONST.ENVIRONMENT.QA]: 'gib-w-expensify-uat',
     [CONST.ENVIRONMENT.ADHOC]: 'gib-w-expensify-uat',
 };
 
diff --git a/src/libs/FraudProtection/GroupIBSdkBridge/index.native.ts b/src/libs/FraudProtection/GroupIBSdkBridge/index.native.ts
index 881b27c21631..87e505ebc8c0 100644
--- a/src/libs/FraudProtection/GroupIBSdkBridge/index.native.ts
+++ b/src/libs/FraudProtection/GroupIBSdkBridge/index.native.ts
@@ -1,6 +1,7 @@
 import {getApiRoot} from '@libs/ApiUtils';
 import {getOldDotEnvironmentURL} from '@libs/Environment/Environment';
 import getEnvironment from '@libs/Environment/getEnvironment';
+import type Environment from '@libs/Environment/getEnvironment/types';
 import Log from '@libs/Log';
 
 import CONST from '@src/CONST';
@@ -10,16 +11,18 @@ import {FP, FPAttributeFormat} from 'group-ib-fp';
 import enableCapabilities from './enableCapabilities/index';
 
 // The GroupIB SDK requires us to set both iOS and Android customer IDs when initializing the SDK, instead of just one that the App is running on.
-const cidIOSMap: Record<string, string> = {
+const cidIOSMap: Record<Environment, string> = {
     [CONST.ENVIRONMENT.PRODUCTION]: 'gib-i-expensify',
     [CONST.ENVIRONMENT.STAGING]: 'gib-i-expensify-stg',
     [CONST.ENVIRONMENT.DEV]: 'gib-i-expensify-uat',
+    [CONST.ENVIRONMENT.QA]: 'gib-i-expensify-stg',
     [CONST.ENVIRONMENT.ADHOC]: 'gib-i-expensify-stg',
 };
-const cidAndroidMap: Record<string, string> = {
+const cidAndroidMap: Record<Environment, string> = {
     [CONST.ENVIRONMENT.PRODUCTION]: 'gib-a-expensify',
     [CONST.ENVIRONMENT.STAGING]: 'gib-a-expensify-stg',
     [CONST.ENVIRONMENT.DEV]: 'gib-a-expensify-uat',
+    [CONST.ENVIRONMENT.QA]: 'gib-a-expensify-stg',
     [CONST.ENVIRONMENT.ADHOC]: 'gib-a-expensify-stg',
 };
 
diff --git a/src/libs/IOUAmountSubmission.ts b/src/libs/IOUAmountSubmission.ts
index 45da96e74191..2f82f342afe3 100644
--- a/src/libs/IOUAmountSubmission.ts
+++ b/src/libs/IOUAmountSubmission.ts
@@ -52,7 +52,17 @@ import {getLoginByAccountID} from './PersonalDetailsUtils';
 import {isTaxTrackingEnabled} from './PolicyUtils';
 import {getPolicyExpenseChat, getTransactionDetails, isMoneyRequestReport, isPolicyExpenseChat, isSelfDM, shouldEnableNegative} from './ReportUtils';
 import shouldUseDefaultExpensePolicy from './shouldUseDefaultExpensePolicy';
-import {calculateTaxAmount, getAmount, getCurrency, getDefaultTaxCode, getIsFromGlobalCreate, getTaxValue, hasReceipt, isExpenseUnreported} from './TransactionUtils';
+import {
+    calculateTaxAmount,
+    getAmount,
+    getCurrency,
+    getDefaultTaxCode,
+    getIsFromGlobalCreate,
+    getTaxValue,
+    hasReceipt,
+    isExpenseUnreported,
+    isFailedScanAmountPlaceholder,
+} from './TransactionUtils';
 
 type SubmitAmountArgs = {
     dateFnsLocale: DateFnsLocale | undefined;
@@ -645,7 +655,8 @@ function submitEditAmount(args: SubmitAmountArgs, ctx: SubmitAmountContext): voi
 
     // If the value hasn't changed, don't request to save changes on the server and just close the modal
     const transactionCurrency = getCurrency(currentTransaction);
-    if (newAmount === getAmount(currentTransaction, false, false, allowNegative, disableOppositeConversion) && selectedCurrency === transactionCurrency) {
+    const hasFailedScanAmountPlaceholder = isFailedScanAmountPlaceholder(currentTransaction);
+    if (!hasFailedScanAmountPlaceholder && newAmount === getAmount(currentTransaction, false, false, allowNegative, disableOppositeConversion) && selectedCurrency === transactionCurrency) {
         navigateBack();
         return;
     }
diff --git a/src/libs/ImportCategoriesUtils.ts b/src/libs/ImportCategoriesUtils.ts
new file mode 100644
index 000000000000..13953600ac8c
--- /dev/null
+++ b/src/libs/ImportCategoriesUtils.ts
@@ -0,0 +1,127 @@
+import CONST from '@src/CONST';
+import type {ImportedSpreadsheet, PolicyCategories, PolicyCategory} from '@src/types/onyx';
+import type {PolicyCategoryExpenseLimitType} from '@src/types/onyx/PolicyCategory';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import {convertToBackendAmount} from './CurrencyUtils';
+
+/** Matches a number that uses commas as thousands separators, such as "299,393.00", which is how Expensify Classic exports amounts */
+const THOUSANDS_SEPARATED_NUMBER_REGEX = /^\d{1,3}(,\d{3})+(\.\d+)?$/;
+
+/**
+ * Converts a CSV cell to a number. Commas are only stripped when they are valid thousands separators,
+ * so a value such as "1,5" stays invalid instead of being read as 15.
+ */
+function parseCsvNumber(value: string): number {
+    return Number(THOUSANDS_SEPARATED_NUMBER_REGEX.test(value) ? value.replaceAll(',', '') : value);
+}
+
+/**
+ * Parses a CSV cell value for receipt requirement columns.
+ * Mirrors the OD import logic: "required"/"always_required" → 0,
+ * "not_required" → DISABLED_MAX_EXPENSE_VALUE, numeric string → number.
+ * Returns undefined for unmapped columns, empty/default values, or invalid input.
+ */
+function parseCsvReceiptValue(raw: string | undefined): number | undefined {
+    if (raw === undefined) {
+        return undefined;
+    }
+    const trimmed = raw.trim().toLowerCase();
+    if (!trimmed || trimmed === 'default') {
+        return undefined;
+    }
+    if (trimmed === 'required' || trimmed === 'always_required') {
+        return 0;
+    }
+    if (trimmed === 'not_required') {
+        return CONST.DISABLED_MAX_EXPENSE_VALUE;
+    }
+    const num = parseCsvNumber(trimmed);
+    if (Number.isFinite(num) && num >= 0) {
+        return convertToBackendAmount(num);
+    }
+    return undefined;
+}
+
+/**
+ * Parses a CSV cell value for the max expense amount column.
+ * Returns undefined for empty or invalid input so the existing value is left unchanged.
+ */
+function parseCsvAmountValue(raw: string | undefined): number | undefined {
+    const trimmed = raw?.trim();
+    if (!trimmed) {
+        return undefined;
+    }
+    const num = parseCsvNumber(trimmed);
+    return Number.isFinite(num) && num >= 0 ? convertToBackendAmount(num) : undefined;
+}
+
+/**
+ * Parses a CSV cell value for the expense limit type column.
+ * Returns undefined for anything other than a known expense limit type.
+ */
+function parseCsvExpenseLimitType(raw: string | undefined): PolicyCategoryExpenseLimitType | undefined {
+    const trimmed = raw?.trim().toLowerCase();
+    return Object.values(CONST.POLICY.EXPENSE_LIMIT_TYPES).find((type) => type === trimmed);
+}
+
+/**
+ * Builds the categories to import from the mapped spreadsheet columns.
+ * Unmapped rule columns are left out so they don't overwrite the values of existing categories.
+ */
+function buildCategoriesFromSpreadsheet(spreadsheet: OnyxEntry<ImportedSpreadsheet>, policyCategories: OnyxEntry<PolicyCategories>): PolicyCategory[] | undefined {
+    const {containsHeader = true} = spreadsheet ?? {};
+    const columns = Object.values(spreadsheet?.columns ?? {});
+    const categoriesNamesColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.NAME);
+    const categoriesGLCodeColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.GL_CODE);
+    const categoriesEnabledColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.ENABLED);
+    const categoriesMaxAmountNoReceiptColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_RECEIPT);
+    const categoriesMaxAmountNoItemizedReceiptColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_ITEMIZED_RECEIPT);
+    const categoriesPayrollCodeColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.PAYROLL_CODE);
+    const categoriesAreCommentsRequiredColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.ARE_COMMENTS_REQUIRED);
+    const categoriesCommentHintColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.COMMENT_HINT);
+    const categoriesMaxExpenseAmountColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.MAX_EXPENSE_AMOUNT);
+    const categoriesExpenseLimitTypeColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.EXPENSE_LIMIT_TYPE);
+    const categoriesNames = spreadsheet?.data[categoriesNamesColumn].map((name) => name);
+    const categoriesEnabled = categoriesEnabledColumn !== -1 ? spreadsheet?.data[categoriesEnabledColumn].map((enabled) => enabled) : [];
+    const categoriesGLCode = categoriesGLCodeColumn !== -1 ? spreadsheet?.data[categoriesGLCodeColumn].map((glCode) => glCode) : [];
+    const categoriesMaxAmountNoReceipt = categoriesMaxAmountNoReceiptColumn !== -1 ? spreadsheet?.data[categoriesMaxAmountNoReceiptColumn] : [];
+    const categoriesMaxAmountNoItemizedReceipt = categoriesMaxAmountNoItemizedReceiptColumn !== -1 ? spreadsheet?.data[categoriesMaxAmountNoItemizedReceiptColumn] : [];
+    const categoriesPayrollCode = categoriesPayrollCodeColumn !== -1 ? spreadsheet?.data[categoriesPayrollCodeColumn] : [];
+    const categoriesAreCommentsRequired = categoriesAreCommentsRequiredColumn !== -1 ? spreadsheet?.data[categoriesAreCommentsRequiredColumn] : [];
+    const categoriesCommentHint = categoriesCommentHintColumn !== -1 ? spreadsheet?.data[categoriesCommentHintColumn] : [];
+    const categoriesMaxExpenseAmount = categoriesMaxExpenseAmountColumn !== -1 ? spreadsheet?.data[categoriesMaxExpenseAmountColumn] : [];
+    const categoriesExpenseLimitType = categoriesExpenseLimitTypeColumn !== -1 ? spreadsheet?.data[categoriesExpenseLimitTypeColumn] : [];
+
+    return categoriesNames?.slice(containsHeader ? 1 : 0).map((name, index) => {
+        const categoryAlreadyExists = policyCategories?.[name];
+        const existingGLCodeOrDefault = categoryAlreadyExists?.['GL Code'] ?? '';
+        const dataIndex = containsHeader ? index + 1 : index;
+
+        const parsedMaxAmountNoReceipt = categoriesMaxAmountNoReceiptColumn !== -1 ? parseCsvReceiptValue(categoriesMaxAmountNoReceipt?.[dataIndex]?.toString()) : undefined;
+        const parsedMaxAmountNoItemizedReceipt =
+            categoriesMaxAmountNoItemizedReceiptColumn !== -1 ? parseCsvReceiptValue(categoriesMaxAmountNoItemizedReceipt?.[dataIndex]?.toString()) : undefined;
+        const parsedMaxExpenseAmount = categoriesMaxExpenseAmountColumn !== -1 ? parseCsvAmountValue(categoriesMaxExpenseAmount?.[dataIndex]?.toString()) : undefined;
+        const parsedExpenseLimitType = categoriesExpenseLimitTypeColumn !== -1 ? parseCsvExpenseLimitType(categoriesExpenseLimitType?.[dataIndex]?.toString()) : undefined;
+
+        return {
+            name,
+            enabled: categoriesEnabledColumn !== -1 ? ['true', 'yes'].includes(categoriesEnabled?.[dataIndex]?.toString().trim().toLowerCase() ?? '') : true,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            'GL Code': categoriesGLCodeColumn !== -1 ? (categoriesGLCode?.[dataIndex] ?? '') : existingGLCodeOrDefault,
+            ...(parsedMaxAmountNoReceipt !== undefined && {maxAmountNoReceipt: parsedMaxAmountNoReceipt}),
+            ...(parsedMaxAmountNoItemizedReceipt !== undefined && {maxAmountNoItemizedReceipt: parsedMaxAmountNoItemizedReceipt}),
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            ...(categoriesPayrollCodeColumn !== -1 && {'Payroll Code': categoriesPayrollCode?.[dataIndex] ?? ''}),
+            ...(categoriesAreCommentsRequiredColumn !== -1 && {
+                areCommentsRequired: ['true', 'yes'].includes(categoriesAreCommentsRequired?.[dataIndex]?.toString().trim().toLowerCase() ?? ''),
+            }),
+            ...(categoriesCommentHintColumn !== -1 && {commentHint: categoriesCommentHint?.[dataIndex] ?? ''}),
+            ...(parsedMaxExpenseAmount !== undefined && {maxExpenseAmount: parsedMaxExpenseAmount}),
+            ...(parsedExpenseLimitType !== undefined && {expenseLimitType: parsedExpenseLimitType}),
+        };
+    });
+}
+
+export {buildCategoriesFromSpreadsheet, parseCsvAmountValue, parseCsvReceiptValue};
diff --git a/src/libs/MerchantTypeRulesUtils.ts b/src/libs/MerchantTypeRulesUtils.ts
index 9cc18a0e8f47..b7dc5e21a90d 100644
--- a/src/libs/MerchantTypeRulesUtils.ts
+++ b/src/libs/MerchantTypeRulesUtils.ts
@@ -6,15 +6,16 @@ import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/MerchantTypeRuleForm';
 import type {MerchantTypeRuleForm} from '@src/types/form/MerchantTypeRuleForm';
-import type {Policy, PolicyCategories} from '@src/types/onyx';
-import type {CodingRule} from '@src/types/onyx/Policy';
+import type {Policy, PolicyCategories, Rule} from '@src/types/onyx';
 
-import {DEFAULT_MCC_GROUP, isDefaultMccGroupID} from './actions/Policy/Category';
+import type {OnyxCollection} from 'react-native-onyx';
+
+import {DEFAULT_MCC_GROUP, isDefaultMccGroupID} from './actions/Policy/OptimisticPolicyCategoriesAndMccGroups';
 import {setWorkspaceDefaultSpendCategory} from './actions/Policy/Policy';
-import {clearPolicyCodingRuleErrors} from './actions/Policy/Rules';
+import {clearMerchantRuleErrors} from './actions/Policy/Rules';
 import {getCategoryTaxRulesTableData, getTaxRateDisplayName} from './CategoryTaxRulesUtils';
 import {getDecodedCategoryName} from './CategoryUtils';
-import Parser from './Parser';
+import {getExpenseDefaultRuleSummaryFields, getPolicyExpenseDefaultRules, getRuleMerchantMatchSummary, isEditableMerchantRule, isExpenseDefaultTaxValue} from './ExpenseDefaultRuleUtils';
 import {getMccGroupDisplayName} from './PolicyRulesUtils';
 import {getCommaSeparatedTagNameWithSanitizedColons, getVendorRuleDisplayValue, isXeroActiveMatchingSource} from './PolicyUtils';
 
@@ -97,22 +98,24 @@ function getMerchantTypeRulesTableData({
     });
 }
 
-function getMerchantCodingRulesTableData({
+function getMerchantRulesTableData({
     policy,
     policyID,
+    rules,
     translate,
     isOffline,
     onNavigate,
 }: {
     policy: Policy | undefined;
     policyID: string;
+    rules: OnyxCollection<Rule> | undefined;
     translate: LocaleContextProps['translate'];
     isOffline: boolean;
     onNavigate: (route: Route) => void;
 }): ExpenseDefaultTableItem[] {
-    const codingRules = policy?.rules?.codingRules;
+    const policyRules = getPolicyExpenseDefaultRules(rules, policyID);
 
-    if (!codingRules) {
+    if (policyRules.length === 0) {
         return [];
     }
 
@@ -124,84 +127,97 @@ function getMerchantCodingRulesTableData({
         tax: translate('common.tax').toLowerCase(),
         vendor: translate(isOnXero ? 'common.supplier' : 'common.vendor').toLowerCase(),
     };
-
-    // A merchant rule outlives the category or tax rate it sets — the backend keeps the rule and only drops that one
-    // default — so no pending state is borrowed here. Only the rule's own delete counts, and it reads the same way as
-    // a category rule's: online the delete resolves in a moment, so the row goes rather than flashing greyed, while
-    // offline it stays and is styled as deleting since there is nothing to wait for.
-    return Object.entries(codingRules)
-        .filter(([, rule]) => !!rule && (isOffline || rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE))
-        .map(([ruleID, rule]: [string, CodingRule]) => {
-            const merchantName = rule.filters?.right ?? '';
-            const hasOnlyMerchantRename =
-                !!rule.merchant &&
-                !rule.category &&
-                !rule.tag &&
-                !rule.comment &&
-                !rule.tax?.field_id_TAX?.value &&
-                !rule.vendorID &&
-                rule.reimbursable === undefined &&
-                rule.billable === undefined;
-            const typeLabel = hasOnlyMerchantRename ? translate('workspace.rules.expenseDefaultsTable.rename') : translate('workspace.rules.expenseDefaultsTable.update');
-
-            const actions: string[] = [];
-            if (rule.merchant) {
-                actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleMerchant', rule.merchant));
-            }
-            if (rule.category) {
-                actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.category, getDecodedCategoryName(rule.category)));
-            }
-            if (rule.tag) {
-                actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.tag, getCommaSeparatedTagNameWithSanitizedColons(rule.tag)));
-            }
-            if (rule.comment) {
-                const commentMarkdown = Parser.htmlToMarkdown(rule.comment);
-                actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.description, commentMarkdown));
-            }
-            if (rule.tax?.field_id_TAX?.value) {
-                actions.push(
-                    translate(
-                        'workspace.rules.merchantRules.ruleSummarySubtitleUpdateField',
-                        fieldLabels.tax,
-                        getTaxRateDisplayName(policy, rule.tax.field_id_TAX.externalID, rule.tax.field_id_TAX),
-                    ),
-                );
-            }
-            if (rule.vendorID) {
-                const unavailableLabel = translate(isOnXero ? 'workspace.rules.merchantRules.supplierUnavailable' : 'workspace.rules.merchantRules.vendorUnavailable');
-                const vendorValue = getVendorRuleDisplayValue(policy, rule.vendorID, unavailableLabel);
-                actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.vendor, vendorValue));
-            }
-            if (rule.reimbursable !== undefined) {
-                actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleReimbursable', rule.reimbursable));
-            }
-            if (rule.billable !== undefined) {
-                actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleBillable', rule.billable));
-            }
-            const ruleDescription = actions.map((action, index) => (index === 0 ? action : action.charAt(0).toLowerCase() + action.slice(1))).join(', ');
-            const pendingAction = rule.pendingAction;
-
-            return {
-                keyForList: ruleID,
-                ruleID,
-                section: CONST.POLICY.EXPENSE_DEFAULTS_SECTION.MERCHANTS,
-                isRename: hasOnlyMerchantRename,
-                typeLabel,
-                conditionText: translate('workspace.rules.expenseDefaultsTable.merchantIs', merchantName),
-                ruleDescription,
-                searchTokens: [merchantName, ruleDescription],
-                pendingAction,
-                errors: rule.errors,
-                onCloseError: () => clearPolicyCodingRuleErrors(policyID, ruleID, rule),
-                disabled: pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                action: () => onNavigate(ROUTES.RULES_MERCHANT_EDIT.getRoute(policyID, ruleID)),
-            };
-        });
+    const {FIELD} = CONST.RULES.EXPENSE_DEFAULT;
+
+    return (
+        policyRules
+            .filter(({rule}) => isOffline || rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+            // Newest first. Copying a workspace stamps one `created` onto every copy, so ties are normal and have
+            // to return 0 rather than a fixed 1, which would order equal rules differently depending on the sort.
+            .sort((first, second) => {
+                const firstCreated = first.rule.created ?? '';
+                const secondCreated = second.rule.created ?? '';
+                if (firstCreated === secondCreated) {
+                    return 0;
+                }
+                return secondCreated < firstCreated ? -1 : 1;
+            })
+            .map(({ruleID, rule}) => {
+                const summaryFields = getExpenseDefaultRuleSummaryFields(rule);
+                const {merchants: merchantName} = getRuleMerchantMatchSummary(rule.filters);
+
+                const hasOnlyMerchantRename = summaryFields.length === 1 && summaryFields.at(0)?.field === FIELD.MERCHANT;
+                const typeLabel = hasOnlyMerchantRename ? translate('workspace.rules.expenseDefaultsTable.rename') : translate('workspace.rules.expenseDefaultsTable.update');
+
+                const actions: string[] = [];
+                for (const {field, value} of summaryFields) {
+                    if (field === FIELD.MERCHANT && typeof value === 'string') {
+                        actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleMerchant', value));
+                    } else if (field === FIELD.CATEGORY && typeof value === 'string') {
+                        actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.category, getDecodedCategoryName(value)));
+                    } else if (field === FIELD.TAG && typeof value === 'string') {
+                        actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.tag, getCommaSeparatedTagNameWithSanitizedColons(value)));
+                    } else if (field === FIELD.COMMENT && typeof value === 'string') {
+                        actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.description, value));
+                    } else if (field === FIELD.TAX && isExpenseDefaultTaxValue(value) && !!value.field_id_TAX.externalID) {
+                        // The rate saved on the rule is a snapshot, so resolve the live one first and keep the snapshot
+                        // as a fallback. Without this a renamed rate reads stale, and a rule saved before the rates
+                        // loaded has no snapshot at all and its tax default disappears from the summary.
+                        actions.push(
+                            translate(
+                                'workspace.rules.merchantRules.ruleSummarySubtitleUpdateField',
+                                fieldLabels.tax,
+                                getTaxRateDisplayName(policy, value.field_id_TAX.externalID, value.field_id_TAX),
+                            ),
+                        );
+                    } else if (field === FIELD.VENDOR_ID && typeof value === 'string') {
+                        const unavailableLabel = translate(isOnXero ? 'workspace.rules.merchantRules.supplierUnavailable' : 'workspace.rules.merchantRules.vendorUnavailable');
+                        actions.push(
+                            translate('workspace.rules.merchantRules.ruleSummarySubtitleUpdateField', fieldLabels.vendor, getVendorRuleDisplayValue(policy, value, unavailableLabel)),
+                        );
+                    } else if (field === FIELD.REIMBURSABLE && typeof value === 'boolean') {
+                        actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleReimbursable', value));
+                    } else if (field === FIELD.BILLABLE && typeof value === 'boolean') {
+                        actions.push(translate('workspace.rules.merchantRules.ruleSummarySubtitleBillable', value));
+                    }
+                }
+                const ruleDescription = actions.map((action, index) => (index === 0 ? action : action.charAt(0).toLowerCase() + action.slice(1))).join(', ');
+                const pendingAction = rule.pendingAction;
+
+                // A rule the editor can't represent would lose whatever the form can't show if it were saved back,
+                // so the row summarizes it but doesn't open it. See `getMerchantRuleFormValues`. It stays selectable
+                // either way, because deleting it is the only thing an admin can still do with it.
+                const isEditable = isEditableMerchantRule(rule);
+                const openEditor = () => {
+                    if (!isEditable) {
+                        return;
+                    }
+                    onNavigate(ROUTES.RULES_MERCHANT_EDIT.getRoute(policyID, ruleID));
+                };
+
+                return {
+                    keyForList: ruleID,
+                    ruleID,
+                    section: CONST.POLICY.EXPENSE_DEFAULTS_SECTION.MERCHANTS,
+                    isRename: hasOnlyMerchantRename,
+                    typeLabel,
+                    conditionText: translate('workspace.rules.expenseDefaultsTable.merchantIs', merchantName),
+                    ruleDescription,
+                    searchTokens: [merchantName, ruleDescription],
+                    pendingAction,
+                    errors: rule.errors,
+                    onCloseError: () => clearMerchantRuleErrors(ruleID, rule),
+                    disabled: rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    action: openEditor,
+                };
+            })
+    );
 }
 
 function getExpenseDefaultsTableData({
     policy,
     policyID,
+    rules,
     policyCategories,
     translate,
     isOffline,
@@ -209,6 +225,7 @@ function getExpenseDefaultsTableData({
 }: {
     policy: Policy | undefined;
     policyID: string;
+    rules: OnyxCollection<Rule> | undefined;
     /** Read for the pending state of a category a rule depends on, so the rule shows as deleting alongside it. */
     policyCategories: PolicyCategories | undefined;
     translate: LocaleContextProps['translate'];
@@ -216,7 +233,7 @@ function getExpenseDefaultsTableData({
     onNavigate: (route: Route) => void;
 }): ExpenseDefaultTableItem[] {
     const categoryTaxRules = getCategoryTaxRulesTableData({policy, policyCategories, translate, isOffline, onNavigate});
-    const merchantRules = getMerchantCodingRulesTableData({policy, policyID, translate, isOffline, onNavigate});
+    const merchantRules = getMerchantRulesTableData({policy, policyID, rules, translate, isOffline, onNavigate});
     const merchantTypeRules = getMerchantTypeRulesTableData({policy, translate, onNavigate});
 
     return [...categoryTaxRules, ...merchantRules, ...merchantTypeRules];
@@ -225,7 +242,7 @@ function getExpenseDefaultsTableData({
 export {
     getDefaultMccGroupCategory,
     getExpenseDefaultsTableData,
-    getMerchantCodingRulesTableData,
+    getMerchantRulesTableData,
     getMerchantTypeRuleFormFromMccGroup,
     isDefaultMccGroupID,
     isMerchantTypeRuleKey,
diff --git a/src/libs/ModifiedExpenseMessage.ts b/src/libs/ModifiedExpenseMessage.ts
index 3b76070a0f96..6a4fb2f4e2bd 100644
--- a/src/libs/ModifiedExpenseMessage.ts
+++ b/src/libs/ModifiedExpenseMessage.ts
@@ -324,17 +324,20 @@ function getForReportAction({
         return translate('iou.addedReceipt');
     }
 
-    const hasModifiedAmount =
-        isReportActionOriginalMessageAnObject && 'oldCurrency' in reportActionOriginalMessage && 'amount' in reportActionOriginalMessage && 'currency' in reportActionOriginalMessage;
+    // oldCurrency isn't required here: confirming a failed-scan placeholder amount (e.g. re-entering 0 to clear the
+    // scan error) has no real previous value, so neither the optimistic message nor the server's confirmed action
+    // include oldAmount/oldCurrency for it. Falling through to hasModifiedAmount=false would otherwise hide the
+    // amount entirely and render the generic "changed the expense" fallback instead of "set the amount to X".
+    const hasModifiedAmount = isReportActionOriginalMessageAnObject && 'amount' in reportActionOriginalMessage && 'currency' in reportActionOriginalMessage;
 
     const hasModifiedMerchant = isReportActionOriginalMessageAnObject && 'oldMerchant' in reportActionOriginalMessage && 'merchant' in reportActionOriginalMessage;
 
     if (hasModifiedAmount) {
-        const oldCurrency = reportActionOriginalMessage?.oldCurrency;
+        const currency = reportActionOriginalMessage?.currency;
+        const oldCurrency = reportActionOriginalMessage?.oldCurrency ?? currency;
         const oldAmountValue = reportActionOriginalMessage?.oldAmount ?? 0;
         const oldAmount = convertToDisplayString(oldAmountValue, oldCurrency);
 
-        const currency = reportActionOriginalMessage?.currency;
         const amount = convertToDisplayString(reportActionOriginalMessage?.amount ?? 0, currency);
 
         // Only Distance edits should modify amount and merchant (which stores distance) in a single transaction.
diff --git a/src/libs/MoneyRequestReportUtils.ts b/src/libs/MoneyRequestReportUtils.ts
index 3db275195add..b3d1ee6f846a 100644
--- a/src/libs/MoneyRequestReportUtils.ts
+++ b/src/libs/MoneyRequestReportUtils.ts
@@ -9,6 +9,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
+import {getLatestErrorField} from './ErrorUtils';
 import {hasPendingSubmitWriteForReport} from './pendingSubmitWrite';
 import {isPaidGroupPolicy} from './PolicyUtils';
 import {getIOUActionForTransactionID, getOriginalMessage, isDeletedAction, isDeletedParentAction, isMoneyRequestAction} from './ReportActionsUtils';
@@ -26,6 +27,33 @@ import {
 } from './ReportUtils';
 import {getSupersededPendingCardTransactionIDs, isTransactionPendingDelete} from './TransactionUtils';
 
+/**
+ * The key of a reject the backend recorded against an expense it has already moved. It reports those under the
+ * expense's own `reject` field rather than the generic `errors`, and it is what disables the row.
+ */
+function getTransactionRejectErrorKey(transaction: OnyxEntry<Transaction>): string | undefined {
+    return Object.keys(getLatestErrorField(transaction, 'reject')).at(0);
+}
+
+/** Whether a row can be selected. A click, Select All and a shift+click range all use this, so they agree on which rows are selectable. */
+function isSelectableReportTransaction(transaction: OnyxEntry<Transaction>): boolean {
+    return !isTransactionPendingDelete(transaction) && !getTransactionRejectErrorKey(transaction);
+}
+
+/**
+ * Whether every selectable transaction on the report is selected, which is when the report-level actions (Submit, Approve,
+ * Pay) are offered. Only selectable rows count: an expense the backend refused to reject stays on the report until its error
+ * is dismissed, and its checkbox is disabled, so counting it would hide those actions for good.
+ */
+function isEveryReportTransactionSelected(transactions: Transaction[], selectedTransactionIDs: string[]): boolean {
+    const selectableTransactions = transactions.filter(isSelectableReportTransaction);
+    if (selectedTransactionIDs.length === 0 || selectableTransactions.length === 0) {
+        return false;
+    }
+    const selectedTransactionIDSet = new Set(selectedTransactionIDs);
+    return selectableTransactions.every((transaction) => selectedTransactionIDSet.has(transaction.transactionID));
+}
+
 function isBillableEnabledOnPolicy(policy: Policy | OnyxEntry<Policy> | undefined): boolean {
     return !!policy && isPaidGroupPolicy(policy) && policy.disabledFields?.defaultBillable !== true;
 }
@@ -227,4 +255,7 @@ export {
     shouldDisplayReportTableView,
     shouldWaitForTransactions,
     isBillableEnabledOnPolicy,
+    getTransactionRejectErrorKey,
+    isSelectableReportTransaction,
+    isEveryReportTransactionSelected,
 };
diff --git a/src/libs/MultifactorAuthentication/shared/VALUES.ts b/src/libs/MultifactorAuthentication/shared/VALUES.ts
index 0782320955e1..dc4dd597cade 100644
--- a/src/libs/MultifactorAuthentication/shared/VALUES.ts
+++ b/src/libs/MultifactorAuthentication/shared/VALUES.ts
@@ -9,7 +9,7 @@ import {PROMPT_NAMES, SCENARIO_NAMES} from '@components/MultifactorAuthenticatio
  */
 const BACKEND_MESSAGE = {
     REGISTRATION_REQUIRED: 'Registration required',
-    INVALID_VALIDATE_CODE: 'Invalid validate code',
+    INVALID_VALIDATE_CODE: 'Invalid validateCode',
     TRANSACTION_EXPIRED: 'Transaction review period expired',
     TRANSACTION_ALREADY_APPROVED: 'Transaction already approved',
     TRANSACTION_ALREADY_DENIED: 'Transaction already denied',
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index eb615e3639bf..f623c2a33423 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -2,8 +2,6 @@ import ComposeProviders from '@components/ComposeProviders';
 import DelegateNoAccessModalProvider from '@components/DelegateNoAccessModalProvider';
 import EnableGlobalReimbursementsPayModal from '@components/EnableGlobalReimbursementsPayModal';
 import ExportDownloadStatusManager from '@components/ExportDownloadStatusManager';
-import GPSInProgressModal from '@components/GPSInProgressModal';
-import GPSTripStateChecker from '@components/GPSTripStateChecker';
 import {KeyboardDismissibleFlatListContextProvider} from '@components/KeyboardDismissibleFlatList/KeyboardDismissibleFlatListContext';
 import KYCWallContextProvider from '@components/KYCWall/KYCWallContext';
 import LockedAccountModalProvider from '@components/LockedAccountModalProvider';
@@ -23,6 +21,8 @@ import {VideoPopoverMenuContextProvider} from '@components/VideoPlayerContexts/V
 import {VolumeContextProvider} from '@components/VideoPlayerContexts/VolumeContext';
 import WideRHPContextProvider from '@components/WideRHPContextProvider';
 
+import useGPSInProgressModal from '@hooks/useGPSInProgressModal';
+import useGPSTripStateChecker from '@hooks/useGPSTripStateChecker';
 import useOnboardingFlowRouter from '@hooks/useOnboardingFlow';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useShouldSuppressPromotionalUI from '@hooks/useShouldSuppressPromotionalUI';
@@ -137,6 +137,8 @@ function AuthScreens() {
     const modalCardStyleInterpolator = useModalCardStyleInterpolator();
     const {isOnboardingCompleted} = useOnboardingFlowRouter();
     const shouldSuppressPromotionalUI = useShouldSuppressPromotionalUI();
+    useGPSTripStateChecker();
+    useGPSInProgressModal();
 
     useEffect(() => {
         NavBarManager.setButtonStyle(theme.navigationBarButtonsStyle);
@@ -403,8 +405,6 @@ function AuthScreens() {
                     <RequireTwoFactorAuthenticationOverlay />
                     <MultifactorAuthenticationModalNavigator />
                     <SearchRouterModal />
-                    <GPSTripStateChecker />
-                    <GPSInProgressModal />
                     <OpenAppFailureModal />
                     <EnableGlobalReimbursementsPayModal />
                     <PriorityModeController />
diff --git a/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx b/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx
index 38959065c908..0250e3d1e4b9 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx
@@ -36,6 +36,7 @@ import {getSearchParamFromUrl} from '@libs/Url';
 import * as App from '@userActions/App';
 import * as Download from '@userActions/Download';
 import {clearStaleExportDownloads} from '@userActions/Export';
+import {setUpPoliciesAndNavigate} from '@userActions/Policy/CreateWorkspaceFlow';
 import * as Report from '@userActions/Report';
 import * as Session from '@userActions/Session';
 import * as User from '@userActions/User';
@@ -225,7 +226,7 @@ function AuthScreensInitHandler() {
             App.reconnectApp(initialLastUpdateIDAppliedToClient);
         }
 
-        App.setUpPoliciesAndNavigate({
+        setUpPoliciesAndNavigate({
             session,
             introSelected,
             currency: currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD,
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 126cbac1a383..43af4494621e 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -438,6 +438,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/PolicyAccountingPage').default,
     [SCREENS.SETTINGS.PREFERENCES.LANGUAGE]: () => require<ReactComponentModule>('../../../../pages/settings/Preferences/LanguagePage').default,
     [SCREENS.SETTINGS.PREFERENCES.THEME]: () => require<ReactComponentModule>('../../../../pages/settings/Preferences/ThemePage').default,
+    [SCREENS.SETTINGS.TROUBLESHOOT_SERVER]: () => require<ReactComponentModule>('../../../../pages/settings/Troubleshoot/ServerPage').default,
     [SCREENS.SETTINGS.PREFERENCES.PAYMENT_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/settings/Preferences/PaymentCurrencyPage').default,
     [SCREENS.SETTINGS.DEVICE_MANAGEMENT]: () => require<ReactComponentModule>('../../../../pages/settings/Security/DeviceManagementPage').default,
     [SCREENS.SETTINGS.CLOSE]: () => require<ReactComponentModule>('../../../../pages/settings/Security/CloseAccount/CloseAccountPage').default,
@@ -580,6 +581,8 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
         require<ReactComponentModule>('../../../../pages/workspace/rules/RequireFieldsRules/AddRequireFieldsRulePage').default,
     [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRE_FIELDS_RULE_EDIT]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/rules/RequireFieldsRules/EditRequireFieldsRulePage').default,
+    [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/MerchantRules/AddCategoryTaxRulePage').default,
+    [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/MerchantRules/EditCategoryTaxRulePage').default,
     [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_ADDRESS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceOverviewAddressPage').default,
     [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_PLAN]: () => require<ReactComponentModule>('../../../../pages/workspace/DynamicWorkspaceOverviewPlanTypePage').default,
     [SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/DynamicWorkspaceCategoriesSettingsPage').default,
@@ -593,6 +596,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.MEMBER_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceMemberDetailsPage').default,
     [SCREENS.WORKSPACE.ROOM_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/rooms/WorkspaceRoomCreatePage').default,
     [SCREENS.WORKSPACE.MEMBER_DETAILS_ROLE]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceMemberDetailsRolePage').default,
+    [SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkArrangementPage').default,
     [SCREENS.WORKSPACE.MEMBER_CUSTOM_FIELD]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceMemberCustomFieldPage').default,
     [SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_CHECK]: () => require<ReactComponentModule>('@pages/workspace/members/DynamicWorkspaceOwnerChangeWrapperPage').default,
     [SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_SUCCESS]: () => require<ReactComponentModule>('../../../../pages/workspace/members/DynamicWorkspaceOwnerChangeSuccessPage').default,
@@ -999,6 +1003,13 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
         require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/export/CampfireDefaultCompanyCardVendorPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_COMPANY_CARD_ACCOUNT]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/export/CampfireCompanyCardAccountPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/export/CampfireCardProgramAccountPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/export/CampfireCardProgramAccountSelectorPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/export/CampfireCardAccountPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT_CARD_LIST]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/export/CampfireCardAccountCardListPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_ADVANCED]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/advanced/CampfireAdvancedPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_EXPORT_METHOD]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/campfire/advanced/CampfireExportMethodPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_BILL_PAYMENT_ACCOUNT]: () =>
@@ -1016,6 +1027,24 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
         require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/BusinessCentralCompanySelector').default,
     [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_IMPORT]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/import/BusinessCentralImportPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralExportPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralPreferredExporterSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DATE]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralExportDateSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableExpensesExportDestinationSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralNonReimbursableExpensesExportDestinationSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralCompanyCardAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralDefaultVendorSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/businessCentral/export/BusinessCentralPaymentMethodSelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/reconciliation/CardReconciliationPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC]: () =>
         require<ReactComponentModule>('../../../../pages/workspace/accounting/reconciliation/CardReconciliationSageIntacctAutoSyncPage').default,
@@ -1438,7 +1467,6 @@ const WorkspacesDomainModalStackNavigator = createModalStackNavigator<Workspaces
     [SCREENS.WORKSPACES_DOMAIN_VERIFIED]: () => require<ReactComponentModule>('../../../../pages/domain/WorkspacesDomainVerifiedPage').default,
     [SCREENS.WORKSPACES_ADD_DOMAIN]: () => require<ReactComponentModule>('../../../../pages/domain/AddDomainPage').default,
     [SCREENS.WORKSPACES_DOMAIN_ADDED]: () => require<ReactComponentModule>('../../../../pages/domain/DomainAddedPage').default,
-    [SCREENS.WORKSPACES_ADD_DOMAIN_VERIFY_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/domain/AddDomainVerifyAccountPage').default,
     [SCREENS.WORKSPACES_DOMAIN_ACCESS_RESTRICTED]: () => require<ReactComponentModule>('../../../../pages/domain/DomainAccessRestrictedPage').default,
     [SCREENS.WORKSPACES_DOMAIN_ALREADY_EXISTS]: () => require<ReactComponentModule>('../../../../pages/domain/DomainAlreadyExistsPage').default,
 });
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts
index 43b37502d3fc..276bb98716b7 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts
@@ -4,11 +4,13 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSidePanelState from '@hooks/useSidePanelState';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import enhanceCardStyleInterpolator from '@libs/Navigation/AppNavigator/enhanceCardStyleInterpolator';
 import hideKeyboardOnSwipe from '@libs/Navigation/AppNavigator/hideKeyboardOnSwipe';
 import RHP_WEB_TRANSITION_SPEC from '@libs/Navigation/AppNavigator/RHPTransitionSpec';
 import useModalCardStyleInterpolator from '@libs/Navigation/AppNavigator/useModalCardStyleInterpolator';
+import getSidePanelRHPShrink from '@libs/Navigation/helpers/getSidePanelRHPShrink';
 import type {PlatformStackNavigationOptions, PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 
 import CONST from '@src/CONST';
@@ -33,6 +35,7 @@ function useWideModalStackScreenOptions() {
     // https://github.com/Expensify/App/issues/63747
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
+    const {windowWidth} = useWindowDimensions();
     const {wideRHPRouteKeys, superWideRHPRouteKeys} = useWideRHPState();
     const {sidePanelOffset} = useSidePanelState();
 
@@ -45,20 +48,27 @@ function useWideModalStackScreenOptions() {
             let cardStyleInterpolator: StackCardStyleInterpolator = baseInterpolator;
 
             if (!isSmallScreenWidth) {
+                // Shrink the super wide sheet by the Side Panel width while it is open so the sheet's
+                // left edge stays put instead of being pushed off-screen, capped at what its panes can spare
+                // so the card never clips its own content. See https://github.com/Expensify/App/issues/99035
+                const sidePanelShrink = getSidePanelRHPShrink(sidePanelOffset.current, windowWidth);
+
+                // Cards draw their own frame, so the container must not clip them.
                 if (superWideRHPRouteKeys.includes(route.key)) {
                     cardStyleInterpolator = enhanceCardStyleInterpolator(baseInterpolator, {
-                        // Shrink the super wide sheet by the Side Panel width while it is open so the sheet's
-                        // left edge stays put instead of being pushed off-screen. See https://github.com/Expensify/App/issues/99035
-                        cardStyle: styles.getSuperWideRHPExtendedCardInterpolatorStyles(Animated.subtract(animatedSuperWideRHPWidth, sidePanelOffset.current)),
+                        cardStyle: styles.getSuperWideRHPExtendedCardInterpolatorStyles(Animated.subtract(animatedSuperWideRHPWidth, sidePanelShrink)),
+                        containerStyle: styles.overflowVisible,
                     });
                 } else if (wideRHPRouteKeys.includes(route.key)) {
                     cardStyleInterpolator = enhanceCardStyleInterpolator(baseInterpolator, {
                         cardStyle: styles.wideRHPExtendedCardInterpolatorStyles,
+                        containerStyle: styles.overflowVisible,
                     });
                     // single RHPs displayed above the wide RHP need to be positioned
                 } else if (superWideRHPRouteKeys.length > 0 || wideRHPRouteKeys.length > 0) {
                     cardStyleInterpolator = enhanceCardStyleInterpolator(baseInterpolator, {
                         cardStyle: styles.singleRHPExtendedCardInterpolatorStyles,
+                        containerStyle: styles.overflowVisible,
                     });
                 }
             }
@@ -71,13 +81,15 @@ function useWideModalStackScreenOptions() {
                     contentStyle: styles.navigationScreenCardStyle,
                 },
                 web: {
+                    // The RHP has its own scrim (BaseOverlay), so stacked screens must not fade in react-navigation's dark backdrop too.
+                    cardOverlayEnabled: false,
                     cardStyle: isSmallScreenWidth ? StyleUtils.getStyleWithEnvSafeAreaPadding(styles.navigationScreenCardStyle) : styles.navigationScreenCardStyle,
                     cardStyleInterpolator,
                     transitionSpec: isSmallScreenWidth ? undefined : RHP_WEB_TRANSITION_SPEC,
                 },
             };
         },
-        [StyleUtils, isSmallScreenWidth, modalCardStyleInterpolator, sidePanelOffset, styles, superWideRHPRouteKeys, wideRHPRouteKeys],
+        [StyleUtils, isSmallScreenWidth, modalCardStyleInterpolator, sidePanelOffset, styles, superWideRHPRouteKeys, windowWidth, wideRHPRouteKeys],
     );
 }
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/MultifactorAuthenticationModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/MultifactorAuthenticationModalNavigator.tsx
index 64a89b8748c8..7f37a4cd94e1 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/MultifactorAuthenticationModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/MultifactorAuthenticationModalNavigator.tsx
@@ -34,6 +34,8 @@ import React, {useEffect, useState} from 'react';
 import {StyleSheet, View} from 'react-native';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 
+import getRHPFrameStyle from './getRHPFrameStyle';
+
 type Phase = 'open' | 'closing' | 'closed';
 
 const Stack = createPlatformStackNavigator<MultifactorAuthenticationModalNavigatorInternalParamList>();
@@ -136,9 +138,11 @@ function MultifactorAuthenticationModalNavigator() {
     }, [phase, backdropProgress, dispatch]);
 
     const backdropAnimatedStyle = useAnimatedStyle(() => ({
-        opacity: backdropProgress.get() * variables.overlayOpacity,
+        opacity: backdropProgress.get() * variables.rhpOverlayOpacity,
     }));
 
+    const frameStyle = getRHPFrameStyle({styles, animatedWidth: variables.rhpWidth, shouldUseNarrowLayout, shouldUseCenteredFrame: false});
+
     if (phase === 'closed') {
         return null;
     }
@@ -160,7 +164,7 @@ function MultifactorAuthenticationModalNavigator() {
                     />
                 </Animated.View>
             )}
-            <View style={[styles.pAbsolute, styles.r0, styles.h100, styles.overflowHidden, shouldUseNarrowLayout ? styles.w100 : {width: variables.sideBarWidth}]}>
+            <View style={frameStyle}>
                 {isStackReadyToMount && (
                     <NavigationIndependentTree>
                         <BaseNavigationContainer
diff --git a/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx b/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx
index 7f8b76f1e38d..8b13efd70f28 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx
@@ -3,7 +3,7 @@ import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeed
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import type {OverlayStylesParams} from '@styles/index';
+import type {OverlayPositionValue, OverlayStylesParams} from '@styles/index';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
@@ -21,16 +21,37 @@ type BaseOverlayProps = {
     progress?: OverlayStylesParams;
 
     /** Overlay position from the left edge of the container */
-    positionLeftValue?: number | Animated.Value | Animated.AnimatedAddition<number>;
+    positionLeftValue?: OverlayPositionValue;
 
     /** Overlay position from the right edge of the container */
-    positionRightValue?: number | Animated.Value | Animated.AnimatedAddition<number>;
+    positionRightValue?: OverlayPositionValue;
+
+    /** Peak opacity the overlay fades to, defaults to variables.overlayOpacity */
+    maxOpacity?: number;
+
+    /** Overlay position from the top edge of the container, in px */
+    positionTopValue?: number;
+
+    /** Overlay position from the bottom edge of the container, in px */
+    positionBottomValue?: number;
+
+    /** Stays positioned and pressable, just paints nothing. */
+    transparent?: boolean;
 };
 
 const defaultPositionLeftValue = -2 * variables.sideBarWidth;
 
 // The default value of positionLeftValue is equal to -2 * variables.sideBarWidth, because we need to stretch the overlay to cover the sidebar and the translate animation distance.
-function BaseOverlay({onPress, progress, positionLeftValue = defaultPositionLeftValue, positionRightValue = 0}: BaseOverlayProps) {
+function BaseOverlay({
+    onPress,
+    progress,
+    positionLeftValue = defaultPositionLeftValue,
+    positionRightValue = 0,
+    positionTopValue = 0,
+    positionBottomValue = 0,
+    maxOpacity = variables.overlayOpacity,
+    transparent = false,
+}: BaseOverlayProps) {
     const styles = useThemeStyles();
     const {current} = useCardAnimation();
     const {translate} = useLocalize();
@@ -39,7 +60,13 @@ function BaseOverlay({onPress, progress, positionLeftValue = defaultPositionLeft
         <Animated.View
             id="BaseOverlay"
             aria-hidden
-            style={[styles.pFixed, styles.t0, styles.b0, styles.overlayBackground, styles.overlayStyles({progress: progress ?? current.progress, positionLeftValue, positionRightValue})]}
+            style={[
+                styles.pFixed,
+                // Overlays shorter than the 30px top bar (the floating RHP gap bands) would otherwise leak a pressable area onto the card below.
+                styles.overflowHidden,
+                !transparent && styles.overlayBackground,
+                styles.overlayStyles({progress: progress ?? current.progress, positionLeftValue, positionRightValue, positionTopValue, positionBottomValue, maxOpacity}),
+            ]}
         >
             <View style={[styles.flex1, styles.flexColumn]}>
                 {/* In the latest Electron version buttons can't be both clickable and draggable.
diff --git a/src/libs/Navigation/AppNavigator/Navigators/Overlay/RHPOverlay.tsx b/src/libs/Navigation/AppNavigator/Navigators/Overlay/RHPOverlay.tsx
new file mode 100644
index 000000000000..fbd73e2c0230
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/Overlay/RHPOverlay.tsx
@@ -0,0 +1,20 @@
+import variables from '@styles/variables';
+
+import React from 'react';
+
+import type {BaseOverlayProps} from './BaseOverlay';
+
+import Overlay from '.';
+
+type RHPOverlayProps = Omit<BaseOverlayProps, 'maxOpacity'>;
+
+function RHPOverlay({...rest}: RHPOverlayProps) {
+    return (
+        <Overlay
+            {...rest}
+            maxOpacity={variables.rhpOverlayOpacity}
+        />
+    );
+}
+
+export default RHPOverlay;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index ea172c42594a..25a6a6592cca 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -1,15 +1,6 @@
 import {DialogLabelProvider, useDialogLabelData} from '@components/DialogLabelContext';
 import NoDropZone from '@components/DragAndDrop/NoDropZone';
-import {
-    animatedWideRHPWidth,
-    expandedRHPProgress,
-    secondOverlayRHPOnSuperWideRHPProgress,
-    secondOverlayRHPOnWideRHPProgress,
-    secondOverlayWideRHPProgress,
-    thirdOverlayProgress,
-    useWideRHPActions,
-    useWideRHPState,
-} from '@components/WideRHPContextProvider';
+import {expandedRHPProgress, thirdOverlayProgress, useWideRHPActions, useWideRHPState} from '@components/WideRHPContextProvider';
 
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSidePanelState from '@hooks/useSidePanelState';
@@ -22,8 +13,9 @@ import hideKeyboardOnSwipe from '@libs/Navigation/AppNavigator/hideKeyboardOnSwi
 import * as ModalStackNavigators from '@libs/Navigation/AppNavigator/ModalStackNavigators';
 import useModalStackScreenOptions from '@libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions';
 import useRHPScreenOptions from '@libs/Navigation/AppNavigator/useRHPScreenOptions';
-import calculateReceiptPaneRHPWidth from '@libs/Navigation/helpers/calculateReceiptPaneRHPWidth';
 import calculateSuperWideRHPWidth from '@libs/Navigation/helpers/calculateSuperWideRHPWidth';
+import calculateWideRHPWidth from '@libs/Navigation/helpers/calculateWideRHPWidth';
+import getSidePanelRHPShrink from '@libs/Navigation/helpers/getSidePanelRHPShrink';
 import {isFullScreenName} from '@libs/Navigation/helpers/isNavigatorName';
 import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 import Animations from '@libs/Navigation/PlatformStackNavigation/navigationOptions/animation';
@@ -38,6 +30,7 @@ import SearchAdvancedFiltersProvider from '@pages/Search/SearchAdvancedFiltersPr
 import {MergeATSApprovalDraftProvider} from '@pages/workspace/recruiting/approver/MergeATSApprovalDraftContext';
 import {MergeATSFiltersDraftProvider} from '@pages/workspace/recruiting/merge/filters/MergeATSFiltersDraftContext';
 
+import type {OverlayPositionValue} from '@styles/index';
 import variables from '@styles/variables';
 
 import CONST from '@src/CONST';
@@ -54,15 +47,15 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import {Animated, DeviceEventEmitter} from 'react-native';
 
+import getRHPFrameStyle from './getRHPFrameStyle';
 import {NarrowPaneContextProvider} from './NarrowPaneContext';
-import Overlay from './Overlay';
+import RHPOverlay from './Overlay/RHPOverlay';
 
 type RightModalNavigatorProps = PlatformStackScreenProps<AuthScreensParamList, typeof NAVIGATORS.RIGHT_MODAL_NAVIGATOR>;
 
 const Stack = createRightModalNavigator<RightModalNavigatorParamList, typeof NAVIGATORS.RIGHT_MODAL_NAVIGATOR>();
 
-const singleRHPWidth = variables.sideBarWidth;
-const getWideRHPWidth = (windowWidth: number) => variables.sideBarWidth + calculateReceiptPaneRHPWidth(windowWidth);
+const singleRHPWidth = variables.rhpWidth;
 
 function MissingPersonalDetailsWithPINContext(props: Record<string, unknown>) {
     return (
@@ -96,43 +89,6 @@ function MergeATSApprovalWithDraftContext(props: Record<string, unknown>) {
     );
 }
 
-function SecondaryOverlay() {
-    const {shouldRenderSecondaryOverlayForWideRHP, shouldRenderSecondaryOverlayForRHPOnWideRHP, shouldRenderSecondaryOverlayForRHPOnSuperWideRHP} = useWideRHPState();
-    const {sidePanelOffset} = useSidePanelState();
-
-    if (shouldRenderSecondaryOverlayForWideRHP) {
-        return (
-            <Overlay
-                progress={secondOverlayWideRHPProgress}
-                positionRightValue={Animated.add(sidePanelOffset.current, animatedWideRHPWidth)}
-                onPress={() => Navigation.closeRHPFlow()}
-            />
-        );
-    }
-
-    if (shouldRenderSecondaryOverlayForRHPOnWideRHP) {
-        return (
-            <Overlay
-                progress={secondOverlayRHPOnWideRHPProgress}
-                positionRightValue={Animated.add(sidePanelOffset.current, variables.sideBarWidth)}
-                onPress={Navigation.dismissToPreviousRHP}
-            />
-        );
-    }
-
-    if (shouldRenderSecondaryOverlayForRHPOnSuperWideRHP) {
-        return (
-            <Overlay
-                progress={secondOverlayRHPOnSuperWideRHPProgress}
-                positionRightValue={Animated.add(sidePanelOffset.current, variables.sideBarWidth)}
-                onPress={Navigation.dismissToSuperWideRHP}
-            />
-        );
-    }
-
-    return null;
-}
-
 const loadRHPReportScreen = () => require<ReactComponentModule>('../../../../pages/inbox/RHPReportScreen').default;
 const loadSearchMoneyRequestReportPage = () => require<ReactComponentModule>('../../../../pages/Search/SearchMoneyRequestReportPage').default;
 const loadSearchSavePage = () => require<ReactComponentModule>('../../../../pages/Search/SearchSavePage').default;
@@ -187,9 +143,17 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
     });
     const isExecutingRef = useRef<boolean>(false);
     const screenOptions = useRHPScreenOptions();
-    const {superWideRHPRouteKeys, wideRHPRouteKeys, shouldRenderTertiaryOverlay} = useWideRHPState();
+    const {
+        superWideRHPRouteKeys,
+        wideRHPRouteKeys,
+        shouldRenderTertiaryOverlay,
+        shouldRenderSecondaryOverlayForRHPOnWideRHP,
+        shouldRenderSecondaryOverlayForRHPOnSuperWideRHP,
+        isWideRHPFocused,
+        isSuperWideRHPFocused,
+    } = useWideRHPState();
     const {clearWideRHPKeys, syncRHPKeys} = useWideRHPActions();
-    const {windowWidth} = useWindowDimensions();
+    const {windowWidth, windowHeight} = useWindowDimensions();
     const modalStackScreenOptions = useModalStackScreenOptions();
     const styles = useThemeStyles();
     const {sidePanelOffset} = useSidePanelState();
@@ -219,25 +183,42 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
     // The super wide RHP already spans almost the full window, so without shrinking it by the same amount
     // its left edge would be pushed off-screen once the Side Panel opens. Subtract the Side Panel offset
     // from the super wide width only (progress === 2) so the sheet's left edge stays put while the Side
-    // Panel animates open/closed. See https://github.com/Expensify/App/issues/99035
-    const superWideRHPSidePanelOffset = Animated.multiply(expandedRHPProgress.interpolate({inputRange: [0, 1, 2], outputRange: [0, 0, 1], extrapolate: 'clamp'}), sidePanelOffset.current);
+    // Panel animates open/closed, and never below what its panes need. See https://github.com/Expensify/App/issues/99035
+    const superWideRHPSidePanelOffset = Animated.multiply(
+        expandedRHPProgress.interpolate({inputRange: [0, 1, 2], outputRange: [0, 0, 1], extrapolate: 'clamp'}),
+        getSidePanelRHPShrink(sidePanelOffset.current, windowWidth),
+    );
 
     const animatedWidth = Animated.subtract(
         expandedRHPProgress.interpolate({
             inputRange: [0, 1, 2],
-            outputRange: [singleRHPWidth, getWideRHPWidth(windowWidth), calculateSuperWideRHPWidth(windowWidth)],
+            outputRange: [singleRHPWidth, calculateWideRHPWidth(windowWidth), calculateSuperWideRHPWidth(windowWidth)],
         }),
         superWideRHPSidePanelOffset,
     );
 
-    const animatedWidthStyle = useMemo(() => {
-        return {
-            width: shouldUseNarrowLayout ? '100%' : animatedWidth,
-        } as const;
-    }, [animatedWidth, shouldUseNarrowLayout]);
-
     const overlayPositionLeft = useMemo(() => -1 * calculateSuperWideRHPWidth(windowWidth), [windowWidth]);
 
+    // Width of the focused card. The super wide animated width already gives up the Side Panel offset.
+    let focusedRHPWidth: OverlayPositionValue = singleRHPWidth;
+    if (isSuperWideRHPFocused) {
+        focusedRHPWidth = animatedWidth;
+    } else if (isWideRHPFocused) {
+        focusedRHPWidth = calculateWideRHPWidth(windowWidth);
+    }
+
+    // Where the focused card starts, measured from the right window edge and from the left.
+    const tertiaryOverlayColumn = Animated.add(sidePanelOffset.current, Animated.add(focusedRHPWidth, 2 * variables.rhpFloatingCardBorderWidth + variables.rhpFloatingCardMargin));
+    const tertiaryOverlayCardBandLeft = Animated.subtract(windowWidth, tertiaryOverlayColumn);
+    const tertiaryOverlayVerticalGapInset = windowHeight - variables.rhpFloatingCardMargin;
+
+    // With a report or expense stacked in the RHP every card draws its own modal, so the frame is invisible.
+    const shouldUseCenteredFrame =
+        !shouldUseNarrowLayout &&
+        (superWideRHPRouteKeys.length > 0 || wideRHPRouteKeys.length > 0 || shouldRenderSecondaryOverlayForRHPOnWideRHP || shouldRenderSecondaryOverlayForRHPOnSuperWideRHP);
+
+    const frameStyle = getRHPFrameStyle({styles, animatedWidth, shouldUseNarrowLayout, shouldUseCenteredFrame});
+
     const screenListeners = useMemo(
         () => ({
             blur: () => {
@@ -276,6 +257,12 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
         }
     }, [navigation]);
 
+    // Pressing the dimmed gap around the focused card goes back one level when a card is stacked below, and closes the RHP when it is not.
+    const floatingCardGapProgress = shouldRenderTertiaryOverlay ? thirdOverlayProgress : undefined;
+    const handleFloatingCardGapPress = shouldRenderTertiaryOverlay ? Navigation.dismissToPreviousRHP : handleOverlayPress;
+    // The gap on the right stops before the Side Panel, which shares that edge.
+    const floatingCardGapRightBandLeft = Animated.subtract(Animated.subtract(windowWidth, sidePanelOffset.current), variables.rhpFloatingCardMargin);
+
     const clearWideRHPKeysAfterTabChanged = useCallback(() => {
         const isRhpOpened = navigationRef?.getRootState()?.routes?.some((rootStateRoute) => rootStateRoute.key === route.key);
         const isFullScreenTopmostRoute = isFullScreenName(navigationRef.getRootState()?.routes?.at(-1)?.name);
@@ -300,7 +287,7 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
         <NarrowPaneContextProvider>
             <NoDropZone>
                 {!shouldUseNarrowLayout && (
-                    <Overlay
+                    <RHPOverlay
                         positionLeftValue={overlayPositionLeft}
                         onPress={handleOverlayPress}
                     />
@@ -314,7 +301,7 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
                     <RightModalDialogFrame
                         hasDialogSemantics={!isSmallScreenWidth}
                         onContainerRef={setContainerNodeFromRef}
-                        style={[styles.pAbsolute, styles.r0, styles.h100, styles.overflowHidden, animatedWidthStyle]}
+                        style={frameStyle}
                     >
                         <Stack.Navigator
                             parentRoute={route}
@@ -572,17 +559,44 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
                         </Stack.Navigator>
                     </RightModalDialogFrame>
                 </DialogLabelProvider>
-                {/* The third and second overlays are displayed here to cover RHP screens wider than the currently focused screen. */}
-                {/* Clicking on these overlays redirects you to the RHP screen below them. */}
-                {/* The width of these overlays is equal to the width of the screen minus the width of the currently focused RHP screen (positionRightValue) */}
-                {!shouldUseNarrowLayout && <SecondaryOverlay />}
+                {/* The tertiary overlay covers RHP screens wider than the focused one and dismisses to the screen below. */}
+                {/* It paints nothing: the dim behind a stacked card is drawn by WideRHPOverlayWrapper from inside the */}
+                {/* screen below, so it follows that card's rounded corners instead of being a rectangle over the top. */}
+                {/* This one only exists because react-navigation's card wrapper swallows clicks on the dimmed area. */}
                 {!shouldUseNarrowLayout && shouldRenderTertiaryOverlay && (
-                    <Overlay
+                    <RHPOverlay
                         progress={thirdOverlayProgress}
-                        positionRightValue={Animated.add(sidePanelOffset.current, variables.sideBarWidth)}
+                        positionRightValue={tertiaryOverlayColumn}
                         onPress={Navigation.dismissToPreviousRHP}
+                        transparent
                     />
                 )}
+                {/* Keeps the dimmed margin above, below and to the right of the focused card pressable. */}
+                {!shouldUseNarrowLayout && shouldUseCenteredFrame && (
+                    <>
+                        <RHPOverlay
+                            progress={floatingCardGapProgress}
+                            positionLeftValue={tertiaryOverlayCardBandLeft}
+                            positionBottomValue={tertiaryOverlayVerticalGapInset}
+                            onPress={handleFloatingCardGapPress}
+                            transparent
+                        />
+                        <RHPOverlay
+                            progress={floatingCardGapProgress}
+                            positionLeftValue={tertiaryOverlayCardBandLeft}
+                            positionTopValue={tertiaryOverlayVerticalGapInset}
+                            onPress={handleFloatingCardGapPress}
+                            transparent
+                        />
+                        <RHPOverlay
+                            progress={floatingCardGapProgress}
+                            positionLeftValue={floatingCardGapRightBandLeft}
+                            positionRightValue={sidePanelOffset.current}
+                            onPress={handleFloatingCardGapPress}
+                            transparent
+                        />
+                    </>
+                )}
             </NoDropZone>
         </NarrowPaneContextProvider>
     );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx
index cb57990e0c2a..edaf758e3603 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TestToolsModalNavigator.tsx
@@ -2,6 +2,7 @@ import NoDropZone from '@components/DragAndDrop/NoDropZone';
 import FocusTrapForScreens from '@components/FocusTrap/FocusTrapForScreen';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import TestToolsModalPage from '@components/TestToolsModalPage';
+import TestToolsServerPage from '@components/TestToolsServerPage';
 
 import useIsAuthenticated from '@hooks/useIsAuthenticated';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
@@ -66,6 +67,10 @@ function TestToolsModalNavigator() {
                                 name={SCREENS.TEST_TOOLS_MODAL.ROOT}
                                 component={TestToolsModalPage}
                             />
+                            <Stack.Screen
+                                name={SCREENS.TEST_TOOLS_MODAL.SERVER}
+                                component={TestToolsServerPage}
+                            />
                         </Stack.Navigator>
                     </View>
                 </FocusTrapForScreens>
diff --git a/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.native.ts b/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.native.ts
new file mode 100644
index 000000000000..503af4d03d4b
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.native.ts
@@ -0,0 +1,12 @@
+import type GetRHPFrameStyle from './types';
+
+/** Native keeps the RHP full-bleed. The floating card is web only. */
+const getRHPFrameStyle: GetRHPFrameStyle = ({styles, animatedWidth, shouldUseNarrowLayout}) => [
+    styles.pAbsolute,
+    styles.r0,
+    styles.h100,
+    styles.overflowHidden,
+    {width: shouldUseNarrowLayout ? '100%' : animatedWidth},
+];
+
+export default getRHPFrameStyle;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.ts b/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.ts
new file mode 100644
index 000000000000..7c718d1c6370
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.ts
@@ -0,0 +1,28 @@
+import variables from '@styles/variables';
+
+// The frame width is added into react-navigation's card styles, which only understand react-native Animated.
+// eslint-disable-next-line no-restricted-imports
+import {Animated} from 'react-native';
+
+import type GetRHPFrameStyle from './types';
+
+/** Narrow keeps the full-bleed frame, the stacked report flow uses an invisible one (each card draws its own modal), everything else is a single floating card. */
+const getRHPFrameStyle: GetRHPFrameStyle = ({styles, animatedWidth, shouldUseNarrowLayout, shouldUseCenteredFrame}) => {
+    if (shouldUseNarrowLayout) {
+        return [styles.pAbsolute, styles.r0, styles.h100, styles.overflowHidden, {width: '100%'}];
+    }
+
+    if (shouldUseCenteredFrame) {
+        return [styles.pAbsolute, styles.RHPCenteredFrame, {width: animatedWidth}];
+    }
+
+    // Border-box card, so the border is added back on top of the width or the wide RHP's fixed-width panes get clipped.
+    // A plain number stays plain, because an animated node only resolves inside an Animated component.
+    const floatingCardWidth =
+        typeof animatedWidth === 'number' ? animatedWidth + 2 * variables.rhpFloatingCardBorderWidth : Animated.add(animatedWidth, 2 * variables.rhpFloatingCardBorderWidth);
+
+    // translateZ0 makes the frame a containing block that clips the fixed RHP screen to the radius.
+    return [styles.pAbsolute, styles.overflowHidden, styles.translateZ0, styles.RHPFloatingCard, {width: floatingCardWidth}];
+};
+
+export default getRHPFrameStyle;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/types.ts b/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/types.ts
new file mode 100644
index 000000000000..9a5f075dfb54
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/types.ts
@@ -0,0 +1,18 @@
+import type {OverlayPositionValue, ThemeStyles} from '@styles/index';
+
+import type {StyleProp, ViewStyle} from 'react-native';
+
+type RHPFrameStyleParams = {
+    styles: ThemeStyles;
+
+    animatedWidth: OverlayPositionValue;
+
+    shouldUseNarrowLayout: boolean;
+
+    /** Whether a report or expense is stacked in the RHP, in which case every card draws its own modal. */
+    shouldUseCenteredFrame: boolean;
+};
+
+type GetRHPFrameStyle = (params: RHPFrameStyleParams) => StyleProp<ViewStyle>;
+
+export default GetRHPFrameStyle;
diff --git a/src/libs/Navigation/AppNavigator/useModalCardStyleInterpolator.ts b/src/libs/Navigation/AppNavigator/useModalCardStyleInterpolator.ts
index 901c8d43db24..b79f7baf2d35 100644
--- a/src/libs/Navigation/AppNavigator/useModalCardStyleInterpolator.ts
+++ b/src/libs/Navigation/AppNavigator/useModalCardStyleInterpolator.ts
@@ -52,15 +52,18 @@ const useModalCardStyleInterpolator = (): ModalCardStyleInterpolator => {
         // existing behavior that prevents a janky double-animation when the side panel slides in/out.
         const sidePanelGateAllowsEntry = isSidePanelTransitionEnded || !!sidePanelNVP?.openNarrowScreen || !shouldUseNarrowLayout;
 
+        // Wide cards draw their own frame and shadow so the container must not clip them. Narrow still needs the clip to mask the slide.
+        const containerOverflow: 'hidden' | 'visible' = shouldUseNarrowLayout ? 'hidden' : 'visible';
+
         if (enter.kind === 'none' || !sidePanelGateAllowsEntry) {
-            return {containerStyle: {overflow: 'hidden'}, cardStyle};
+            return {containerStyle: {overflow: containerOverflow}, cardStyle};
         }
 
         if (enter.kind === 'fade') {
             return {cardStyle: {...cardStyle, opacity: progress}};
         }
 
-        const widthFallback = shouldUseNarrowLayout ? screen.width : variables.sideBarWidth;
+        const widthFallback = shouldUseNarrowLayout ? screen.width : variables.rhpWidth;
         const distancePx = enter.kind === 'slide-and-fade' ? enter.distancePx : widthFallback;
 
         const translateX = Animated.multiply(
@@ -83,7 +86,7 @@ const useModalCardStyleInterpolator = (): ModalCardStyleInterpolator => {
         }
 
         return {
-            containerStyle: {overflow: 'hidden'},
+            containerStyle: {overflow: containerOverflow},
             cardStyle,
         };
     };
diff --git a/src/libs/Navigation/AppNavigator/useRHPScreenOptions.ts b/src/libs/Navigation/AppNavigator/useRHPScreenOptions.ts
index ec12662cacc6..8607c027175f 100644
--- a/src/libs/Navigation/AppNavigator/useRHPScreenOptions.ts
+++ b/src/libs/Navigation/AppNavigator/useRHPScreenOptions.ts
@@ -8,6 +8,8 @@ import Animations from '@libs/Navigation/PlatformStackNavigation/navigationOptio
 import Presentation from '@libs/Navigation/PlatformStackNavigation/navigationOptions/presentation';
 import type {PlatformStackNavigationOptions} from '@libs/Navigation/PlatformStackNavigation/types/NavigationOptions';
 
+import CONST from '@src/CONST';
+
 import type {StackCardInterpolationProps} from '@react-navigation/stack';
 
 import {CardStyleInterpolators} from '@react-navigation/stack';
@@ -34,7 +36,7 @@ const getModifiedCardStyleInterpolatorProps = (props: StackCardInterpolationProp
 const useRHPScreenOptions = (): PlatformStackNavigationOptions => {
     const styles = useThemeStyles();
     const customInterpolator = useModalCardStyleInterpolator();
-    const {wideRHPRouteKeys} = useWideRHPState();
+    const {wideRHPRouteKeys, superWideRHPRouteKeys} = useWideRHPState();
 
     // We have to use the isSmallScreenWidth instead of shouldUseNarrow layout, because we want to have information about screen width without the context of side modal.
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -43,16 +45,22 @@ const useRHPScreenOptions = (): PlatformStackNavigationOptions => {
     // Adjust props on wide layout and when the wide RHP is visible
     const shouldAdjustInterpolatorProps = !isSmallScreenWidth && wideRHPRouteKeys.length;
 
+    // A skinny RHP pushed over a centered wide card gets the same slide-and-fade as the centered cards instead of a full-width slide.
+    const isWideRHPContext = !isSmallScreenWidth && (wideRHPRouteKeys.length > 0 || superWideRHPRouteKeys.length > 0);
+
     return useMemo<PlatformStackNavigationOptions>(() => {
         return {
             headerShown: false,
             animation: Animations.SLIDE_FROM_RIGHT,
             gestureDirection: 'horizontal',
             web: {
-                // The .forHorizontalIOS interpolator from `@react-navigation` is misbehaving on Safari, so we override it with Expensify custom interpolator
-                cardStyleInterpolator: isSafari()
-                    ? (props) => customInterpolator({props, enter: {kind: 'slide-from-width'}})
-                    : (props) => CardStyleInterpolators.forHorizontalIOS(shouldAdjustInterpolatorProps ? getModifiedCardStyleInterpolatorProps(props) : props),
+                // Otherwise forHorizontalIOS misbehaves on Safari, so the custom interpolator replaces it there.
+                // eslint-disable-next-line no-nested-ternary
+                cardStyleInterpolator: isWideRHPContext
+                    ? (props) => customInterpolator({props, enter: {kind: 'slide-and-fade', distancePx: CONST.MODAL.RHP_ENTER_OFFSET_PX_WEB}})
+                    : isSafari()
+                      ? (props) => customInterpolator({props, enter: {kind: 'slide-from-width'}})
+                      : (props) => CardStyleInterpolators.forHorizontalIOS(shouldAdjustInterpolatorProps ? getModifiedCardStyleInterpolatorProps(props) : props),
                 presentation: Presentation.TRANSPARENT_MODAL,
                 cardOverlayEnabled: false,
                 cardStyle: styles.navigationScreenCardStyle,
@@ -60,7 +68,7 @@ const useRHPScreenOptions = (): PlatformStackNavigationOptions => {
                 transitionSpec: isSmallScreenWidth ? undefined : RHP_WEB_TRANSITION_SPEC,
             },
         };
-    }, [customInterpolator, shouldAdjustInterpolatorProps, isSmallScreenWidth, styles.navigationScreenCardStyle]);
+    }, [customInterpolator, shouldAdjustInterpolatorProps, isWideRHPContext, isSmallScreenWidth, styles.navigationScreenCardStyle]);
 };
 
 export default useRHPScreenOptions;
diff --git a/src/libs/Navigation/AppNavigator/useRootNavigatorScreenOptions.ts b/src/libs/Navigation/AppNavigator/useRootNavigatorScreenOptions.ts
index 1bf7bad237a5..34cc1862fc41 100644
--- a/src/libs/Navigation/AppNavigator/useRootNavigatorScreenOptions.ts
+++ b/src/libs/Navigation/AppNavigator/useRootNavigatorScreenOptions.ts
@@ -54,6 +54,8 @@ const useRootNavigatorScreenOptions = () => {
             animationTypeForReplace: 'pop',
             web: {
                 presentation: Presentation.TRANSPARENT_MODAL,
+                // The wide RHP draws its own scrim (BaseOverlay), so drop react-navigation's dark card overlay behind the floating card. Narrow keeps it, as nothing else dims the background there.
+                cardOverlayEnabled: shouldUseNarrowLayout,
                 cardStyleInterpolator: (props: StackCardInterpolationProps) =>
                     modalCardStyleInterpolator({
                         props,
diff --git a/src/libs/Navigation/AppNavigator/withAgentAccessDenied.tsx b/src/libs/Navigation/AppNavigator/withAgentAccessDenied.tsx
index 272963e72772..2904b812cb42 100644
--- a/src/libs/Navigation/AppNavigator/withAgentAccessDenied.tsx
+++ b/src/libs/Navigation/AppNavigator/withAgentAccessDenied.tsx
@@ -1,9 +1,11 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 
 import useIsAgentAccount from '@hooks/useIsAgentAccount';
+import useOnyx from '@hooks/useOnyx';
 
 import Navigation from '@libs/Navigation/Navigation';
 
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
 import {useFocusEffect, useIsFocused} from '@react-navigation/native';
@@ -17,8 +19,10 @@ function withAgentAccessDenied(getComponent: () => React.ComponentType): () => R
             ProtectedComponent = (props) => {
                 const isAgent = useIsAgentAccount();
                 const isFocused = useIsFocused();
+                const [isSwitchingToDelegator] = useOnyx(ONYXKEYS.IS_SWITCHING_TO_DELEGATOR);
                 const isAlreadyOnRedirectTarget = Navigation.isActiveRoute(ROUTES.SETTINGS_PROFILE.route);
                 const shouldRedirect = isAgent === true && !isAlreadyOnRedirectTarget;
+                const shouldShowNotFoundPage = !isSwitchingToDelegator && isAgent === true;
 
                 const redirectAgentAway = useCallback(() => {
                     if (isAgent !== true) {
@@ -81,7 +85,7 @@ function withAgentAccessDenied(getComponent: () => React.ComponentType): () => R
                 if (isAgent === undefined || shouldRedirect) {
                     return null;
                 }
-                if (isAgent === true) {
+                if (shouldShowNotFoundPage) {
                     return (
                         <FullPageNotFoundView
                             shouldShow
diff --git a/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts b/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts
index b3684edafa91..6f4c174b9bbb 100644
--- a/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts
+++ b/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts
@@ -1,5 +1,7 @@
 import Log from '@libs/Log';
+import createScheduleOnce from '@libs/Navigation/helpers/createScheduleOnce';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import getValidDynamicRouteBasePath from '@libs/Navigation/helpers/getValidDynamicRouteBasePath';
 import Navigation from '@libs/Navigation/Navigation';
 import isProductTrainingElementDismissed from '@libs/TooltipUtils';
 
@@ -30,7 +32,14 @@ let isLoadingApp = true;
 let hasRedirectedToMigratedUserModal = false;
 
 function getMigratedUserWelcomeModalRoute(basePath?: string): Route {
-    return createDynamicRoute(DYNAMIC_ROUTES.MIGRATED_USER_WELCOME.path, basePath ?? (Navigation.getActiveRoute() || ROUTES.HOME));
+    return createDynamicRoute(
+        DYNAMIC_ROUTES.MIGRATED_USER_WELCOME.path,
+        basePath ??
+            getValidDynamicRouteBasePath({
+                entryScreens: DYNAMIC_ROUTES.MIGRATED_USER_WELCOME.entryScreens,
+                fallbackPath: ROUTES.HOME,
+            }),
+    );
 }
 
 function resetSessionFlag() {
@@ -62,6 +71,9 @@ function navigateToMigratedUserWelcomeModalIfReady() {
     Navigation.navigate(getMigratedUserWelcomeModalRoute());
 }
 
+/** Waits until the current Onyx update batch has populated every value used by the guard. */
+const scheduleMigratedUserWelcomeModalEvaluation = createScheduleOnce(navigateToMigratedUserWelcomeModalIfReady);
+
 /**
  * Called by guards/index.ts when session or loading app state changes.
  * Reuses the shared Onyx subscriptions from guards/index.ts to avoid duplicate connections.
@@ -69,7 +81,7 @@ function navigateToMigratedUserWelcomeModalIfReady() {
 function onSessionOrLoadingAppChanged(sessionValue: OnyxEntry<Session>, isLoadingAppValue: boolean) {
     session = sessionValue;
     isLoadingApp = isLoadingAppValue;
-    navigateToMigratedUserWelcomeModalIfReady();
+    scheduleMigratedUserWelcomeModalEvaluation();
 }
 
 Onyx.connectWithoutView({
@@ -77,7 +89,7 @@ Onyx.connectWithoutView({
     callback: (value) => {
         const result = value ? tryNewDotOnyxSelector(value) : undefined;
         hasBeenAddedToNudgeMigration = result?.hasBeenAddedToNudgeMigration ?? false;
-        navigateToMigratedUserWelcomeModalIfReady();
+        scheduleMigratedUserWelcomeModalEvaluation();
     },
 });
 
@@ -89,7 +101,7 @@ Onyx.connectWithoutView({
         if (isProductTrainingElementDismissed('migratedUserWelcomeModal', value)) {
             hasRedirectedToMigratedUserModal = false;
         }
-        navigateToMigratedUserWelcomeModalIfReady();
+        scheduleMigratedUserWelcomeModalEvaluation();
     },
 });
 
diff --git a/src/libs/Navigation/guards/SubmitPlanWelcomeModalGuard.ts b/src/libs/Navigation/guards/SubmitPlanWelcomeModalGuard.ts
index 7eaa6446b4fd..2463065a59db 100644
--- a/src/libs/Navigation/guards/SubmitPlanWelcomeModalGuard.ts
+++ b/src/libs/Navigation/guards/SubmitPlanWelcomeModalGuard.ts
@@ -1,8 +1,7 @@
 import getUserSecurityGroup from '@libs/getUserSecurityGroup';
-import Log from '@libs/Log';
+import createScheduleOnce from '@libs/Navigation/helpers/createScheduleOnce';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
-import findFocusedRouteWithOnyxTabGuard from '@libs/Navigation/helpers/findFocusedRouteWithOnyxTabGuard';
-import getStateFromPath from '@libs/Navigation/helpers/getStateFromPath';
+import getValidDynamicRouteBasePath from '@libs/Navigation/helpers/getValidDynamicRouteBasePath';
 import Navigation from '@libs/Navigation/Navigation';
 import {getGroupPoliciesWhereReportCanBeCreated} from '@libs/PolicyUtils';
 
@@ -37,7 +36,6 @@ let isSubmitMigrationModalShownLoaded = false;
 let hasLoadedApp = false;
 
 let hasRedirectedToSubmitPlanModal = false;
-let isEvaluationScheduled = false;
 
 // An `intent=submit` deeplink delivers the same outcome as this modal without asking, so the modal must not open on
 // top of it. Recorded outside Onyx because the deeplink can only mark the modal shown from a React effect, which runs
@@ -54,37 +52,15 @@ function releaseWelcomeModalForSubmitDeeplink() {
     hasPendingSubmitDeeplink = false;
 }
 
-const SUBMIT_PLAN_WELCOME_ENTRY_SCREENS = new Set<string>(DYNAMIC_ROUTES.SUBMIT_PLAN_WELCOME.entryScreens);
-
-/**
- * The submit-plan-welcome modal is a dynamic route that can only attach to the screens listed in
- * DYNAMIC_ROUTES.SUBMIT_PLAN_WELCOME.entryScreens. When we proactively open the modal on app boot,
- * the active route can be any screen (e.g. `/settings/troubleshoot` after "Clear cache and restart"),
- * and stacking the suffix onto a non-entry screen resolves to NotFound. Fall back to HOME (a valid
- * entry screen) whenever the active route isn't an allowed base.
- */
-function getValidModalBasePath(): string {
-    const activeRoute = Navigation.getActiveRoute();
-    if (!activeRoute) {
-        return ROUTES.HOME;
-    }
-    try {
-        // getActiveRoute returns a plain string, while getStateFromPath expects a Route. Any string returned by
-        // getActiveRoute is a valid route path, and getStateFromPath safely handles paths it cannot parse.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        const focusedRouteName = findFocusedRouteWithOnyxTabGuard(getStateFromPath(activeRoute as Route) ?? {})?.name;
-        if (focusedRouteName && SUBMIT_PLAN_WELCOME_ENTRY_SCREENS.has(focusedRouteName)) {
-            return activeRoute;
-        }
-    } catch (error) {
-        // getStateFromPath can throw for paths it cannot parse; fall back to HOME below.
-        Log.warn('[SubmitPlanWelcomeModalGuard] Failed to resolve modal base path, falling back to HOME', {activeRoute, error});
-    }
-    return ROUTES.HOME;
-}
-
 function getSubmitPlanWelcomeModalRoute(basePath?: string): Route {
-    return createDynamicRoute(DYNAMIC_ROUTES.SUBMIT_PLAN_WELCOME.path, basePath ?? getValidModalBasePath());
+    return createDynamicRoute(
+        DYNAMIC_ROUTES.SUBMIT_PLAN_WELCOME.path,
+        basePath ??
+            getValidDynamicRouteBasePath({
+                entryScreens: DYNAMIC_ROUTES.SUBMIT_PLAN_WELCOME.entryScreens,
+                fallbackPath: ROUTES.HOME,
+            }),
+    );
 }
 
 function resetSessionFlag() {
@@ -150,16 +126,7 @@ function navigateToSubmitPlanWelcomeModalIfReady() {
  * pre-sign-in-stale IS_LOADING_APP) only flips true once this session's account data — including the shown-flag —
  * has loaded, covering the sign-in race where eligibility NVPs arrive before the shown-flag.
  */
-function scheduleSubmitPlanWelcomeModalEvaluation() {
-    if (isEvaluationScheduled) {
-        return;
-    }
-    isEvaluationScheduled = true;
-    Promise.resolve().then(() => {
-        isEvaluationScheduled = false;
-        navigateToSubmitPlanWelcomeModalIfReady();
-    });
-}
+const scheduleSubmitPlanWelcomeModalEvaluation = createScheduleOnce(navigateToSubmitPlanWelcomeModalIfReady);
 
 // Session/app-load state drive the one-shot proactive redirect: they are the boot-time signal by which point
 // every eligibility value below has already landed in the same OpenApp batch, so re-evaluating here is safe.
diff --git a/src/libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.native.ts b/src/libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.native.ts
new file mode 100644
index 000000000000..c766a0b52c6d
--- /dev/null
+++ b/src/libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.native.ts
@@ -0,0 +1,7 @@
+// Super Wide RHP is not displayed on native platforms
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function calculateMaxSidePanelRHPShrink(windowWidth: number) {
+    return 0;
+}
+
+export default calculateMaxSidePanelRHPShrink;
diff --git a/src/libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.ts b/src/libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.ts
new file mode 100644
index 000000000000..761e8edb5a5f
--- /dev/null
+++ b/src/libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.ts
@@ -0,0 +1,13 @@
+import calculateSuperWideRHPWidth from '@libs/Navigation/helpers/calculateSuperWideRHPWidth';
+import calculateWideRHPWidth from '@libs/Navigation/helpers/calculateWideRHPWidth';
+
+/**
+ * How much of the Side Panel width the super wide RHP can give up before its own panes stop fitting.
+ * Each stacked RHP card clips its content to its own box, so a sheet narrower than the wide RHP cuts
+ * the receipt pane off. The sheet is free to reach further left instead, like it does without the Side Panel.
+ */
+function calculateMaxSidePanelRHPShrink(windowWidth: number) {
+    return Math.max(0, calculateSuperWideRHPWidth(windowWidth) - calculateWideRHPWidth(windowWidth));
+}
+
+export default calculateMaxSidePanelRHPShrink;
diff --git a/src/libs/Navigation/helpers/calculateReceiptPaneRHPWidth/index.ts b/src/libs/Navigation/helpers/calculateReceiptPaneRHPWidth/index.ts
index 6c8d7b723714..d6abd41cba32 100644
--- a/src/libs/Navigation/helpers/calculateReceiptPaneRHPWidth/index.ts
+++ b/src/libs/Navigation/helpers/calculateReceiptPaneRHPWidth/index.ts
@@ -1,7 +1,10 @@
 import variables from '@styles/variables';
 
-const singleRHPWidth = variables.sideBarWidth;
-const wideRHPMaxWidth = variables.receiptPaneRHPMaxWidth + singleRHPWidth;
+const rightPaneWidth = variables.wideRHPRightPaneWidth;
+const wideRHPMaxWidth = variables.receiptPaneRHPMaxWidth + rightPaneWidth;
+
+// The floating card sits its margin away from the right window edge, and the frame adds its border on top of the pane widths.
+const floatingCardInset = variables.rhpFloatingCardMargin + 2 * variables.rhpFloatingCardBorderWidth;
 
 /**
  * Calculates the optimal width for the receipt pane RHP based on window width.
@@ -11,9 +14,11 @@ const wideRHPMaxWidth = variables.receiptPaneRHPMaxWidth + singleRHPWidth;
  * @returns Calculated RHP width with constraints applied
  */
 function calculateReceiptPaneRHPWidth(windowWidth: number) {
-    const calculatedWidth = windowWidth < wideRHPMaxWidth ? variables.receiptPaneRHPMaxWidth - (wideRHPMaxWidth - windowWidth) : variables.receiptPaneRHPMaxWidth;
+    // Both the shrinking width and the floor give up the inset, or the card's left edge slides off-screen on narrow wide layouts.
+    const availableWidth = windowWidth - floatingCardInset;
+    const calculatedWidth = availableWidth < wideRHPMaxWidth ? variables.receiptPaneRHPMaxWidth - (wideRHPMaxWidth - availableWidth) : variables.receiptPaneRHPMaxWidth;
 
-    return Math.max(calculatedWidth, variables.mobileResponsiveWidthBreakpoint - singleRHPWidth);
+    return Math.max(calculatedWidth, variables.mobileResponsiveWidthBreakpoint - floatingCardInset - rightPaneWidth);
 }
 
 export default calculateReceiptPaneRHPWidth;
diff --git a/src/libs/Navigation/helpers/calculateSuperWideRHPWidth/index.ts b/src/libs/Navigation/helpers/calculateSuperWideRHPWidth/index.ts
index e772d0c70e80..f3b63cc13449 100644
--- a/src/libs/Navigation/helpers/calculateSuperWideRHPWidth/index.ts
+++ b/src/libs/Navigation/helpers/calculateSuperWideRHPWidth/index.ts
@@ -1,4 +1,4 @@
-import calculateReceiptPaneRHPWidth from '@libs/Navigation/helpers/calculateReceiptPaneRHPWidth';
+import calculateWideRHPWidth from '@libs/Navigation/helpers/calculateWideRHPWidth';
 
 import variables from '@styles/variables';
 
@@ -11,7 +11,7 @@ import variables from '@styles/variables';
  */
 function calculateSuperWideRHPWidth(windowWidth: number) {
     const superWideRHPWidth = windowWidth - variables.superWideRHPLeftMargin;
-    const wideRHPWidth = calculateReceiptPaneRHPWidth(windowWidth) + variables.sideBarWidth;
+    const wideRHPWidth = calculateWideRHPWidth(windowWidth);
 
     return Math.max(superWideRHPWidth, wideRHPWidth);
 }
diff --git a/src/libs/Navigation/helpers/calculateWideRHPWidth/index.ts b/src/libs/Navigation/helpers/calculateWideRHPWidth/index.ts
new file mode 100644
index 000000000000..e1faecaf1a34
--- /dev/null
+++ b/src/libs/Navigation/helpers/calculateWideRHPWidth/index.ts
@@ -0,0 +1,10 @@
+import calculateReceiptPaneRHPWidth from '@libs/Navigation/helpers/calculateReceiptPaneRHPWidth';
+
+import variables from '@styles/variables';
+
+/** The frame, its card and the super wide fallback all size from this, or the frame outgrows its card and both borders show. */
+function calculateWideRHPWidth(windowWidth: number) {
+    return calculateReceiptPaneRHPWidth(windowWidth) + variables.wideRHPRightPaneWidth;
+}
+
+export default calculateWideRHPWidth;
diff --git a/src/libs/Navigation/helpers/createScheduleOnce.ts b/src/libs/Navigation/helpers/createScheduleOnce.ts
new file mode 100644
index 000000000000..57c8f6793a05
--- /dev/null
+++ b/src/libs/Navigation/helpers/createScheduleOnce.ts
@@ -0,0 +1,20 @@
+/**
+ * Creates a scheduler that coalesces calls until the queued microtask runs.
+ */
+function createScheduleOnce(run: () => void): () => void {
+    let isScheduled = false;
+
+    return () => {
+        if (isScheduled) {
+            return;
+        }
+
+        isScheduled = true;
+        Promise.resolve().then(() => {
+            isScheduled = false;
+            run();
+        });
+    };
+}
+
+export default createScheduleOnce;
diff --git a/src/libs/Navigation/helpers/dismissModalAndOpenReportInInboxTab.ts b/src/libs/Navigation/helpers/dismissModalAndOpenReportInInboxTab.ts
index 8edd6860c800..8074ab9c774d 100644
--- a/src/libs/Navigation/helpers/dismissModalAndOpenReportInInboxTab.ts
+++ b/src/libs/Navigation/helpers/dismissModalAndOpenReportInInboxTab.ts
@@ -1,3 +1,4 @@
+import {mergeExpenseAddedGrowlTransactionIDs} from '@libs/actions/Transaction';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 import {endSubmitFollowUpActionSpan, isTracking as isSubmitTracking, setPendingSubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
@@ -14,7 +15,7 @@ import setNavigationActionToMicrotaskQueue from './setNavigationActionToMicrotas
  * After finishing the action in RHP from the Inbox tab, besides dismissing the modal, we should open the report.
  * If the action is done from the report RHP, then we just want to dismiss the money request flow screens.
  */
-function dismissModalAndOpenReportInInboxTab(reportID: string | undefined, isInvoice: boolean | undefined, hasMultipleTransactions: boolean) {
+function dismissModalAndOpenReportInInboxTab(reportID: string | undefined, isInvoice: boolean | undefined, hasMultipleTransactions: boolean, transactionID?: string) {
     const rootState = navigationRef.getRootState();
     const hasActiveTracking = isSubmitTracking();
 
@@ -40,6 +41,11 @@ function dismissModalAndOpenReportInInboxTab(reportID: string | undefined, isInv
             }
             // When a report with one expense is opened in the wide RHP and the user adds another expense, RHP should be dismissed and ROUTES.SEARCH_MONEY_REQUEST_REPORT should be displayed.
             if (hasMultipleTransactions && reportID) {
+                // This navigation opens the expense report that contains the new transaction, so consume its pending growl
+                // before the deferred navigation. Inferring the destination from navigation state races the queued action below.
+                if (transactionID) {
+                    mergeExpenseAddedGrowlTransactionIDs({[transactionID]: null});
+                }
                 // On small screens, dismiss all modals and then navigate to the right report.
                 // On large screens, dismiss to the previous RHP first, then replace the current route with the new report.
                 const isNarrowLayout = getIsNarrowLayout();
diff --git a/src/libs/Navigation/helpers/getSidePanelRHPShrink/index.ts b/src/libs/Navigation/helpers/getSidePanelRHPShrink/index.ts
new file mode 100644
index 000000000000..1002a4131693
--- /dev/null
+++ b/src/libs/Navigation/helpers/getSidePanelRHPShrink/index.ts
@@ -0,0 +1,18 @@
+import calculateMaxSidePanelRHPShrink from '@libs/Navigation/helpers/calculateMaxSidePanelRHPShrink';
+
+// The offset is a react-native Animated node driven by the Side Panel and the value feeds react-navigation card styles.
+// eslint-disable-next-line no-restricted-imports
+import type {Animated} from 'react-native';
+
+/** Room the super wide RHP gives the Side Panel, capped at the spare above the wide RHP width so the card never clips its own panes. */
+function getSidePanelRHPShrink(sidePanelOffset: Animated.Value, windowWidth: number) {
+    const paneSpare = calculateMaxSidePanelRHPShrink(windowWidth);
+    const cap = Math.max(paneSpare, 1);
+
+    return sidePanelOffset.interpolate({
+        inputRange: [0, cap, cap + 1],
+        outputRange: [0, paneSpare, paneSpare],
+    });
+}
+
+export default getSidePanelRHPShrink;
diff --git a/src/libs/Navigation/helpers/getValidDynamicRouteBasePath.ts b/src/libs/Navigation/helpers/getValidDynamicRouteBasePath.ts
new file mode 100644
index 000000000000..c9b758fa9e08
--- /dev/null
+++ b/src/libs/Navigation/helpers/getValidDynamicRouteBasePath.ts
@@ -0,0 +1,37 @@
+import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
+
+import type {Route} from '@src/ROUTES';
+import type {Screen} from '@src/SCREENS';
+
+import findFocusedRouteWithOnyxTabGuard from './findFocusedRouteWithOnyxTabGuard';
+import getStateFromPath from './getStateFromPath';
+
+type GetValidDynamicRouteBasePathParams = {
+    entryScreens: ReadonlyArray<Screen | '*'>;
+    fallbackPath: Route;
+};
+
+/** Returns the active route when it can host a dynamic route, or a known-valid fallback. */
+function getValidDynamicRouteBasePath({entryScreens, fallbackPath}: GetValidDynamicRouteBasePathParams): Route {
+    const activeRoute = Navigation.getActiveRoute();
+    if (!activeRoute) {
+        return fallbackPath;
+    }
+
+    try {
+        // Navigation builds this path from the current navigation state, so it is a valid app route.
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        const activeRoutePath = activeRoute as Route;
+        const focusedRouteName = findFocusedRouteWithOnyxTabGuard(getStateFromPath(activeRoutePath) ?? {})?.name;
+        if (focusedRouteName && entryScreens.some((entryScreen) => entryScreen === '*' || entryScreen === focusedRouteName)) {
+            return activeRoutePath;
+        }
+    } catch (error) {
+        Log.warn('[Navigation] Failed to resolve a dynamic route base path', {activeRoute, error});
+    }
+
+    return fallbackPath;
+}
+
+export default getValidDynamicRouteBasePath;
diff --git a/src/libs/Navigation/helpers/navigateAfterExpenseCreate.ts b/src/libs/Navigation/helpers/navigateAfterExpenseCreate.ts
index 74acd3ba3b8b..efa4399fe9c1 100644
--- a/src/libs/Navigation/helpers/navigateAfterExpenseCreate.ts
+++ b/src/libs/Navigation/helpers/navigateAfterExpenseCreate.ts
@@ -17,12 +17,25 @@ import isReportTopmostSplitNavigator from './isReportTopmostSplitNavigator';
 import isSearchTopmostFullScreenRoute from './isSearchTopmostFullScreenRoute';
 
 type NavigateAfterExpenseCreateParams = {
+    /** Report the expense was created in */
     activeReportID?: string;
+
+    /** The created transaction's ID */
     transactionID?: string;
+
+    /** Whether the expense was started from the global create flow (FAB/no existing report) rather than from within a report */
     isFromGlobalCreate?: boolean;
+
+    /** Whether the created item is an invoice rather than a regular expense */
     isInvoice?: boolean;
+
+    /** Whether the destination report already contains transactions */
     hasMultipleTransactions: boolean;
+
+    /** Whether to record the transaction ID in the report's pendingNewTransactionIDs metadata, used to highlight the newly-added row */
     shouldAddPendingNewTransactionIDs?: boolean;
+
+    /** Whether to perform navigation, or only run the side effects */
     shouldNavigate?: boolean;
 
     /**
@@ -54,7 +67,7 @@ function getNavigateAfterCreateSearchNavigatorState() {
  * when creating an expense from the global create button.
  * If the expense is created from the global create button then:
  * - If it is created on the inbox tab, it will open the chat report containing that expense.
- * - If it is created elsewhere, it will navigate to Reports > Expense and highlight the newly created expense.
+ * - If it is created elsewhere, it will navigate to Reports > Expense and show the "Expense added" growl.
  */
 function navigateAfterExpenseCreate({
     activeReportID,
@@ -76,7 +89,7 @@ function navigateAfterExpenseCreate({
     // and open the report chat containing the IOU report
     if (!isFromGlobalCreate || isUserOnInbox || !transactionID) {
         if (shouldNavigate) {
-            dismissModalAndOpenReportInInboxTab(activeReportID, isInvoice, hasMultipleTransactions);
+            dismissModalAndOpenReportInInboxTab(activeReportID, isInvoice, hasMultipleTransactions, transactionID);
         }
         if (shouldAddPendingNewTransactionIDs) {
             addPendingNewTransactionIDs(activeReportID, transactionID);
diff --git a/src/libs/Navigation/helpers/navigateToCreatedExpense.ts b/src/libs/Navigation/helpers/navigateToCreatedExpense.ts
new file mode 100644
index 000000000000..4ce59d65365d
--- /dev/null
+++ b/src/libs/Navigation/helpers/navigateToCreatedExpense.ts
@@ -0,0 +1,142 @@
+import {setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
+import {isMoneyRequestReport} from '@libs/ReportUtils';
+import {getCreated} from '@libs/TransactionUtils';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {Transaction} from '@src/types/onyx';
+
+import isReportOpenInRHP from './isReportOpenInRHP';
+import isReportTopmostSplitNavigator from './isReportTopmostSplitNavigator';
+import isSearchTopmostFullScreenRoute from './isSearchTopmostFullScreenRoute';
+import setNavigationActionToMicrotaskQueue from './setNavigationActionToMicrotaskQueue';
+
+type NavigateToCreatedExpenseParams = {
+    /** The transaction thread report to open. */
+    threadReportID: string;
+
+    /** The created transaction's ID. */
+    transactionID: string;
+
+    /** IOU report the transaction landed in, used to decide whether to stack the expense report underneath. */
+    iouReportID?: string;
+
+    /** Transactions currently belonging to the IOU report. */
+    reportTransactions: Transaction[];
+};
+
+// Created dates are ISO strings, so comparing them as strings orders them chronologically
+function compareByCreated(a: Transaction, b: Transaction) {
+    const createdA = getCreated(a);
+    const createdB = getCreated(b);
+    if (createdA === createdB) {
+        return 0;
+    }
+    return createdA < createdB ? -1 : 1;
+}
+
+function getCurrentRouteBackTo() {
+    const params = navigationRef.current?.getCurrentRoute()?.params;
+    if (typeof params !== 'object' || params === null || !('backTo' in params) || typeof params.backTo !== 'string') {
+        return undefined;
+    }
+    return params.backTo;
+}
+
+/**
+ * Opens a just-created expense when "View" is pressed on the "Expense added" growl. The user may have
+ * switched tabs while the growl was up, so the destination follows wherever they are now.
+ */
+function navigateToCreatedExpense({threadReportID, transactionID, iouReportID, reportTransactions}: NavigateToCreatedExpenseParams) {
+    // Oldest first, so the prev/next arrows follow the expense dates. Grouped layouts (e.g. by category) list them
+    // differently, which only the report view knows.
+    const openableTransactionIDs = reportTransactions
+        .filter((transaction) => transaction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+        .sort(compareByCreated)
+        .map((transaction) => transaction.transactionID);
+    const hasMultipleReportTransactions = iouReportID ? openableTransactionIDs.length > 1 : false;
+
+    // Don't reopen an expense the user is already looking at. getState() can miss a just-opened RHP's nested state,
+    // so read the full tree.
+    const focusedReportID = Navigation.getFocusedReportId(navigationRef.getRootState());
+    if (focusedReportID === threadReportID || (!hasMultipleReportTransactions && !!iouReportID && focusedReportID === iouReportID)) {
+        return;
+    }
+
+    const openOnInbox = isReportTopmostSplitNavigator() && !isSearchTopmostFullScreenRoute();
+
+    // When a report/expense is already open in the RHP the app's convention is to replace it rather than stack a second
+    // report RHP on top of it.
+    const forceReplace = isReportOpenInRHP(navigationRef.getRootState());
+    const backTo = forceReplace ? getCurrentRouteBackTo() : Navigation.getActiveRoute();
+
+    if (!openOnInbox) {
+        setActiveTransactionIDs([transactionID]).then(() => {
+            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: threadReportID, backTo}), {forceReplace});
+        });
+        return;
+    }
+
+    // Same as opening the expense from its report preview: the thread goes in the RHP on top of its report, so the
+    // prev/next arrows show.
+    if (getIsNarrowLayout() && iouReportID && hasMultipleReportTransactions) {
+        // The expense report is already open full screen, with or without an RHP above it, so the thread goes on top of it.
+        if ((!forceReplace && focusedReportID === iouReportID) || (forceReplace && Navigation.getTopmostReportId() === iouReportID)) {
+            setActiveTransactionIDs(openableTransactionIDs);
+            const threadBackTo = backTo ?? ROUTES.REPORT_WITH_ID.getRoute(iouReportID);
+            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: threadReportID, backTo: threadBackTo}), {forceReplace});
+            return;
+        }
+
+        const openThreadOnExpenseReport = () => {
+            // Expense reports replace each other rather than stack, so another one open full screen is swapped out
+            const openReportID = Navigation.getTopmostReportId(navigationRef.getRootState());
+            const shouldReplaceOpenReport = !!openReportID && isMoneyRequestReport(openReportID);
+            const reportBackTo = shouldReplaceOpenReport ? getCurrentRouteBackTo() : Navigation.getActiveRoute();
+            const reportRoute = ROUTES.REPORT_WITH_ID.getRoute(iouReportID, undefined, undefined, reportBackTo);
+            Navigation.navigate(reportRoute, {forceReplace: shouldReplaceOpenReport});
+            setActiveTransactionIDs(openableTransactionIDs);
+            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: threadReportID, backTo: reportRoute}));
+        };
+
+        // A full screen report would be pushed above the open RHP instead of replacing it, so close the RHP first.
+        if (forceReplace) {
+            Navigation.dismissModal({afterTransition: openThreadOnExpenseReport});
+            return;
+        }
+        openThreadOnExpenseReport();
+        return;
+    }
+
+    if (getIsNarrowLayout()) {
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(threadReportID, undefined, undefined, backTo), {forceReplace});
+        return;
+    }
+    if (iouReportID) {
+        // The replaced RHP's backTo can point at this same report, which turns into a not-here page once it's
+        // deleted. Drop it so deleting falls back to the report's chat instead.
+        Navigation.navigate(ROUTES.EXPENSE_REPORT_RHP.getRoute({reportID: iouReportID, backTo: forceReplace ? undefined : backTo}), {forceReplace});
+
+        // A multi-transaction report opens super wide RHP, so stack the thread RHP on top of it. A single-transaction
+        // report collapses to the thread itself, so the navigation above already landed on it.
+        if (hasMultipleReportTransactions) {
+            // Defer so the thread RHP stacks on top of the expense report navigation above. This is always a
+            // push (never a replace) - it stacks on the report we just opened, not on the previously-open one.
+            setNavigationActionToMicrotaskQueue(() => {
+                // Seed every expense on the report, not just this one, so the thread shows the prev/next arrows.
+                setActiveTransactionIDs(openableTransactionIDs).then(() => {
+                    Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID: threadReportID, backTo: Navigation.getActiveRoute()}));
+                });
+            });
+        }
+        return;
+    }
+
+    // A tracked expense has no expense report, so open the thread as a full report - the same way tapping
+    // the expense in its self-DM chat does.
+    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(threadReportID, undefined, undefined, backTo), {forceReplace});
+}
+
+export default navigateToCreatedExpense;
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
index 055766708097..6e3617325da6 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/SETTINGS_TO_RHP.ts
@@ -128,7 +128,7 @@ const SETTINGS_TO_RHP: Partial<Record<keyof SettingsSplitNavigatorParamList, str
     ],
     [SCREENS.SETTINGS.ABOUT]: [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS],
     [SCREENS.SETTINGS.SAVE_THE_WORLD]: [SCREENS.SAVE_THE_WORLD.ADD_PAYMENT_CARD, SCREENS.I_KNOW_A_TEACHER, SCREENS.I_AM_A_TEACHER],
-    [SCREENS.SETTINGS.TROUBLESHOOT]: [SCREENS.SETTINGS.DYNAMIC_EXIT_SURVEY_REASON, SCREENS.SETTINGS.DYNAMIC_EXIT_SURVEY_CONFIRM],
+    [SCREENS.SETTINGS.TROUBLESHOOT]: [SCREENS.SETTINGS.DYNAMIC_EXIT_SURVEY_REASON, SCREENS.SETTINGS.DYNAMIC_EXIT_SURVEY_CONFIRM, SCREENS.SETTINGS.TROUBLESHOOT_SERVER],
     [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: [
         SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD,
         SCREENS.SETTINGS.SUBSCRIPTION.SIZE,
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACES_LIST_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACES_LIST_TO_RHP.ts
index a82764cd2c7e..4eab17ffcbfa 100644
--- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACES_LIST_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACES_LIST_TO_RHP.ts
@@ -11,7 +11,6 @@ const WORKSPACES_LIST_TO_RHP: Record<typeof SCREENS.WORKSPACES_LIST, string[]> =
         SCREENS.WORKSPACES_VERIFY_DOMAIN,
         SCREENS.WORKSPACES_DOMAIN_VERIFIED,
         SCREENS.WORKSPACES_ADD_DOMAIN,
-        SCREENS.WORKSPACES_ADD_DOMAIN_VERIFY_ACCOUNT,
         SCREENS.WORKSPACES_DOMAIN_ADDED,
         SCREENS.WORKSPACES_DOMAIN_ACCESS_RESTRICTED,
         SCREENS.WORKSPACES_DOMAIN_ALREADY_EXISTS,
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
index 4cd1deb156ee..6902146a51aa 100755
--- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts
@@ -18,6 +18,7 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
     [SCREENS.WORKSPACE.MEMBERS]: [
         SCREENS.WORKSPACE.MEMBER_DETAILS,
         SCREENS.WORKSPACE.MEMBER_DETAILS_ROLE,
+        SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT,
         SCREENS.WORKSPACE.MEMBER_CUSTOM_FIELD,
         SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_CHECK,
         SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_SUCCESS,
@@ -262,6 +263,10 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
         SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_VENDOR_BILL_DATE,
         SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_DEFAULT_COMPANY_CARD_VENDOR,
         SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_COMPANY_CARD_ACCOUNT,
+        SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT,
+        SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR,
+        SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT,
+        SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT_CARD_LIST,
         SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_ADVANCED,
         SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_EXPORT_METHOD,
         SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_BILL_PAYMENT_ACCOUNT,
@@ -272,6 +277,15 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
         SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_SETUP,
         SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_COMPANY_SELECTOR,
         SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_IMPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DATE,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR,
+        SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD,
     ],
     [SCREENS.WORKSPACE.TAXES]: [
         SCREENS.WORKSPACE.TAXES_SETTINGS,
@@ -350,6 +364,8 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
         SCREENS.WORKSPACE.DYNAMIC_CATEGORY_FLAG_FOR_REVIEW_RULE_AMOUNT,
         SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRE_FIELDS_RULE_NEW,
         SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRE_FIELDS_RULE_EDIT,
+        SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_NEW,
+        SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_EDIT,
         SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_ROOT,
         SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_SETTINGS,
         SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORIES_SETTINGS,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 96c19f3e1504..ba1c8e228bf7 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -145,6 +145,10 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                             path: ROUTES.SETTINGS_THEME,
                             exact: true,
                         },
+                        [SCREENS.SETTINGS.TROUBLESHOOT_SERVER]: {
+                            path: ROUTES.SETTINGS_TROUBLESHOOT_SERVER,
+                            exact: true,
+                        },
                         [SCREENS.SETTINGS.PREFERENCES.PAYMENT_CURRENCY]: {
                             path: ROUTES.SETTINGS_PAYMENT_CURRENCY,
                             exact: true,
@@ -859,6 +863,10 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_VENDOR_BILL_DATE]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_VENDOR_BILL_DATE.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_DEFAULT_COMPANY_CARD_VENDOR]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_DEFAULT_COMPANY_CARD_VENDOR.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_COMPANY_CARD_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_COMPANY_CARD_ACCOUNT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_PROGRAM_ACCOUNT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_ACCOUNT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT_CARD_LIST]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_ACCOUNT_CARD_LIST.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_ADVANCED]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_ADVANCED.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_EXPORT_METHOD]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_EXPORT_METHOD.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_BILL_PAYMENT_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_CAMPFIRE_BILL_PAYMENT_ACCOUNT.route},
@@ -869,6 +877,19 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_SETUP]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_SETUP.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_COMPANY_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_COMPANY_SELECTOR.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_IMPORT]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_IMPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DATE]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_DATE.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: {
+                            path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: {
+                            path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD]: {path: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {path: ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC]: {
                             path: ROUTES.POLICY_ACCOUNTING_CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC.route,
@@ -1123,6 +1144,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.WORKSPACE.MEMBER_DETAILS_ROLE]: {
                             path: ROUTES.WORKSPACE_MEMBER_DETAILS_ROLE.route,
                         },
+                        [SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT]: {
+                            path: ROUTES.WORKSPACE_MEMBER_WORK_ARRANGEMENT.route,
+                        },
                         [SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_SUCCESS]: DYNAMIC_ROUTES.WORKSPACE_OWNER_CHANGE_SUCCESS.path,
                         [SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_ERROR]: DYNAMIC_ROUTES.WORKSPACE_OWNER_CHANGE_ERROR.path,
                         [SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_CHECK]: DYNAMIC_ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.path,
@@ -1148,6 +1172,8 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_FLAG_FOR_REVIEW_RULE_AMOUNT]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_FLAG_FOR_REVIEW_AMOUNT.path,
                         [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRE_FIELDS_RULE_NEW]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_REQUIRE_FIELDS_NEW.path,
                         [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_REQUIRE_FIELDS_RULE_EDIT]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_REQUIRE_FIELDS_EDIT.path,
+                        [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_NEW]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_TAX_NEW.path,
+                        [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_EDIT]: DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_TAX_EDIT.path,
                         [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: {
                             path: ROUTES.WORKSPACE_CREATE_DISTANCE_RATE.route,
                         },
@@ -2247,7 +2273,6 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                             exact: true,
                         },
                         [SCREENS.WORKSPACES_ADD_DOMAIN]: ROUTES.WORKSPACES_ADD_DOMAIN,
-                        [SCREENS.WORKSPACES_ADD_DOMAIN_VERIFY_ACCOUNT]: ROUTES.WORKSPACES_ADD_DOMAIN_VERIFY_ACCOUNT,
                         [SCREENS.WORKSPACES_DOMAIN_ADDED]: {
                             path: ROUTES.WORKSPACES_DOMAIN_ADDED.route,
                             exact: true,
@@ -2293,11 +2318,16 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
             },
         },
         [NAVIGATORS.TEST_TOOLS_MODAL_NAVIGATOR]: {
+            initialRouteName: SCREENS.TEST_TOOLS_MODAL.ROOT,
             screens: {
                 [SCREENS.TEST_TOOLS_MODAL.ROOT]: {
                     path: ROUTES.TEST_TOOLS_MODAL.route,
                     exact: true,
                 },
+                [SCREENS.TEST_TOOLS_MODAL.SERVER]: {
+                    path: ROUTES.TEST_TOOLS_SERVER.route,
+                    exact: true,
+                },
             },
         },
         [NAVIGATORS.TAB_NAVIGATOR]: {
diff --git a/src/libs/Navigation/linkingConfig/subscribe.ts b/src/libs/Navigation/linkingConfig/subscribe.ts
index fbad0b6a60e2..c746d9eac4c9 100644
--- a/src/libs/Navigation/linkingConfig/subscribe.ts
+++ b/src/libs/Navigation/linkingConfig/subscribe.ts
@@ -1,5 +1,5 @@
-import {hasAuthToken} from '@libs/actions/Session';
 import continuePlaidOAuth from '@libs/continuePlaidOAuth';
+import {hasAuthToken} from '@libs/CurrentUserStore';
 import navigationRef from '@libs/Navigation/navigationRef';
 import type {RootNavigatorParamList} from '@libs/Navigation/types';
 
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 201be0b09617..dc664dd32594 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -106,6 +106,7 @@ type SettingsNavigatorParamList = {
     [SCREENS.SETTINGS.PREFERENCES.PAYMENT_CURRENCY]: undefined;
     [SCREENS.SETTINGS.PREFERENCES.LANGUAGE]: undefined;
     [SCREENS.SETTINGS.PREFERENCES.THEME]: undefined;
+    [SCREENS.SETTINGS.TROUBLESHOOT_SERVER]: undefined;
     [SCREENS.SETTINGS.CLOSE]: undefined;
     [SCREENS.SETTINGS.CLOSE_ACCOUNT_CONFIRM_VALIDATE_CODE]: undefined;
     [SCREENS.SETTINGS.MERGE_ACCOUNTS.ACCOUNT_DETAILS]: {
@@ -344,6 +345,7 @@ type SettingsNavigatorParamList = {
     [SCREENS.SETTINGS.PROFILE.VACATION_DELEGATE_MISSING_WORKSPACES]: undefined;
     [SCREENS.WORKSPACE.CURRENCY]: {
         isForcedToChangeCurrency?: boolean;
+        shouldStartExpensifyCardEnrollment?: boolean;
     };
     [SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_OVERVIEW_ADDRESS]: {
         policyID: string;
@@ -486,6 +488,14 @@ type SettingsNavigatorParamList = {
         policyID: string;
         categoryName: string;
     };
+    [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_NEW]: {
+        policyID: string;
+        categoryName: string;
+    };
+    [SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_EDIT]: {
+        policyID: string;
+        categoryName: string;
+    };
     [SCREENS.WORKSPACE.UPGRADE]: {
         policyID?: string;
         featureName?: string;
@@ -766,6 +776,10 @@ type SettingsNavigatorParamList = {
         policyID: string;
         accountID: string;
     };
+    [SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT]: {
+        policyID: string;
+        accountID: string;
+    };
     [SCREENS.WORKSPACE.MEMBER_CUSTOM_FIELD]: {
         policyID: string;
         accountID: string;
@@ -1449,6 +1463,20 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_COMPANY_CARD_ACCOUNT]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR]: {
+        policyID: string;
+        feed: CardFeedWithDomainID;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT_CARD_LIST]: {
+        policyID: string;
+        feed: CardFeedWithDomainID;
+    };
     [SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_ADVANCED]: {
         policyID: string;
     };
@@ -1479,6 +1507,33 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_IMPORT]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DATE]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {
         policyID: string;
         connection: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>;
@@ -1837,8 +1892,8 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.DYNAMIC_RULES_MERCHANT_TAX]: {
         policyID: string;
         ruleID?: undefined;
-        /** The callout flow only ever creates merchant rules, never a category tax default */
-        categoryName?: undefined;
+        /** Set when opened from a category tax default in the category details RHP, absent from the callout flow */
+        categoryName?: string;
     };
     [SCREENS.WORKSPACE.DYNAMIC_RULES_MERCHANT_VENDOR]: {
         policyID: string;
@@ -2913,7 +2968,6 @@ type WorkspacesDomainModalNavigatorParamList = {
         domainAccountID: number;
     };
     [SCREENS.WORKSPACES_ADD_DOMAIN]: undefined;
-    [SCREENS.WORKSPACES_ADD_DOMAIN_VERIFY_ACCOUNT]: undefined;
     [SCREENS.WORKSPACES_DOMAIN_ADDED]: {
         domainAccountID: number;
     };
@@ -3007,6 +3061,7 @@ type RightModalNavigatorParamList = {
     [SCREENS.RIGHT_MODAL.SEARCH_REPORT]: {
         reportID: string;
         reportActionID?: string;
+        anchorTransactionID?: string;
         shouldReplaceWithExpenseReportRHP?: string;
         // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
         backTo?: Routes;
@@ -3699,6 +3754,10 @@ type TestToolsModalModalNavigatorParamList = {
         // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md
         backTo?: Routes;
     };
+    [SCREENS.TEST_TOOLS_MODAL.SERVER]: {
+        // eslint-disable-next-line no-restricted-syntax -- not a new `backTo`: this screen reads the one TEST_TOOLS_MODAL.ROOT already carries
+        backTo?: Routes;
+    };
 };
 
 type MultifactorAuthenticationParamList = {
diff --git a/src/libs/NetSuiteUtils.ts b/src/libs/NetSuiteUtils.ts
new file mode 100644
index 000000000000..e878532b34ad
--- /dev/null
+++ b/src/libs/NetSuiteUtils.ts
@@ -0,0 +1,221 @@
+import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleContextProvider';
+import type {SelectorType} from '@components/SelectionScreen';
+
+import CONST from '@src/CONST';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+import type {Policy} from '@src/types/onyx';
+import type {NetSuiteAccount, NetSuiteCustomList, NetSuiteCustomSegment} from '@src/types/onyx/Policy';
+
+import type {ValueOf} from 'type-fest';
+
+function getNetSuiteVendorOptions(policy: Policy | undefined, selectedVendorId: string | undefined): SelectorType[] {
+    const vendors = policy?.connections?.netsuite?.options.data.vendors;
+
+    return (vendors ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === selectedVendorId,
+    }));
+}
+
+function getNetSuitePayableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
+
+    return (payableAccounts ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === selectedBankAccountId,
+    }));
+}
+
+function getNetSuiteReceivableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const receivableAccounts = policy?.connections?.netsuite?.options.data.receivableList;
+
+    return (receivableAccounts ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === selectedBankAccountId,
+    }));
+}
+
+function getNetSuiteExpenseAccountOptions(policy: Policy | undefined, selectedExpenseAccountId: string | undefined): SelectorType[] {
+    const expenseAccounts = policy?.connections?.netsuite?.options.data.expenseAccounts;
+
+    return (expenseAccounts ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === selectedExpenseAccountId,
+    }));
+}
+
+function getNetSuiteInvoiceItemOptions(policy: Policy | undefined, selectedItemId: string | undefined): SelectorType[] {
+    const invoiceItems = policy?.connections?.netsuite?.options.data.items;
+
+    return (invoiceItems ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === selectedItemId,
+    }));
+}
+
+function getNetSuiteTaxAccountOptions(policy: Policy | undefined, subsidiaryCountry?: string, selectedAccountId?: string): SelectorType[] {
+    const taxAccounts = policy?.connections?.netsuite?.options.data.taxAccountsList;
+    const accountOptions = (taxAccounts ?? []).filter(({country}) => country === subsidiaryCountry);
+
+    return accountOptions.map(({externalID, name}) => ({
+        value: externalID,
+        text: name,
+        keyForList: externalID,
+        isSelected: externalID === selectedAccountId,
+    }));
+}
+
+function canUseTaxNetSuite(canUseNetSuiteUSATax?: boolean, subsidiaryCountry?: string) {
+    return !!canUseNetSuiteUSATax || CONST.NETSUITE_TAX_COUNTRIES.includes(subsidiaryCountry ?? '');
+}
+
+function canUseProvincialTaxNetSuite(subsidiaryCountry?: string) {
+    return subsidiaryCountry === '_canada';
+}
+
+function getFilteredReimbursableAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
+    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.BANK || type === CONST.NETSUITE_ACCOUNT_TYPE.CREDIT_CARD);
+}
+
+function getNetSuiteReimbursableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
+    const accountOptions = getFilteredReimbursableAccountOptions(payableAccounts);
+
+    return accountOptions.map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === selectedBankAccountId,
+    }));
+}
+
+function getFilteredCollectionAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
+    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.BANK);
+}
+
+function getNetSuiteCollectionAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
+    const accountOptions = getFilteredCollectionAccountOptions(payableAccounts);
+
+    return accountOptions.map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === selectedBankAccountId,
+    }));
+}
+
+function getFilteredApprovalAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
+    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE);
+}
+
+function getNetSuiteApprovalAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined, translate: LocalizedTranslate): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
+    const defaultApprovalAccount: NetSuiteAccount = {
+        id: CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT,
+        name: translate('workspace.netsuite.advancedConfig.defaultApprovalAccount'),
+        type: CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE,
+    };
+    const accountOptions = getFilteredApprovalAccountOptions([defaultApprovalAccount].concat(payableAccounts ?? []));
+
+    // When nothing is explicitly set, the synthesized default approval account is the effective selection in NetSuite.
+    const effectiveSelectionId = selectedBankAccountId ?? CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT;
+
+    return accountOptions.map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: id === effectiveSelectionId,
+    }));
+}
+
+function getCustomersOrJobsLabelNetSuite(policy: Policy | undefined, translate: LocaleContextProps['translate']): string | undefined {
+    const importMapping = policy?.connections?.netsuite?.options?.config?.syncOptions?.mapping;
+    if (!importMapping?.customers && !importMapping?.jobs) {
+        return undefined;
+    }
+    const importFields: string[] = [];
+    const importCustomer = importMapping?.customers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+    const importJobs = importMapping?.jobs ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+
+    if (importCustomer === CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT && importJobs === CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
+        return undefined;
+    }
+
+    const importedValue = importMapping?.customers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT ? importCustomer : importJobs;
+
+    if (importCustomer !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
+        importFields.push(translate('workspace.netsuite.import.customersOrJobs.customers'));
+    }
+
+    if (importJobs !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
+        importFields.push(translate('workspace.netsuite.import.customersOrJobs.jobs'));
+    }
+
+    const importedValueLabel = translate(`workspace.netsuite.import.customersOrJobs.label`, importFields, translate(`workspace.accounting.importTypes.${importedValue}`).toLowerCase());
+    return importedValueLabel.charAt(0).toUpperCase() + importedValueLabel.slice(1);
+}
+
+function getNetSuiteImportCustomFieldLabel(
+    policy: Policy | undefined,
+    importField: ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>,
+    translate: LocaleContextProps['translate'],
+    localeCompare: LocaleContextProps['localeCompare'],
+): string | undefined {
+    const fieldData = policy?.connections?.netsuite?.options?.config.syncOptions?.[importField] ?? [];
+    if (fieldData.length === 0) {
+        return undefined;
+    }
+
+    const mappingSet = new Set(fieldData.map((item) => item.mapping));
+    const importedTypes = Array.from(mappingSet)
+        .sort((a, b) => localeCompare(b, a))
+        .map((mapping) => translate(`workspace.netsuite.import.importTypes.${mapping !== '' ? mapping : 'TAG'}.label`).toLowerCase());
+    return translate(`workspace.netsuite.import.importCustomFields.label`, importedTypes);
+}
+
+function isNetSuiteCustomSegmentRecord(customField: NetSuiteCustomList | NetSuiteCustomSegment): boolean {
+    return 'segmentName' in customField;
+}
+
+function getNameFromNetSuiteCustomField(customField: NetSuiteCustomList | NetSuiteCustomSegment): string {
+    return 'segmentName' in customField ? customField.segmentName : customField.listName;
+}
+
+function isNetSuiteCustomFieldPropertyEditable(customField: NetSuiteCustomList | NetSuiteCustomSegment, fieldName: string) {
+    const fieldsAllowedToEdit = isNetSuiteCustomSegmentRecord(customField) ? [INPUT_IDS.SEGMENT_NAME, INPUT_IDS.INTERNAL_ID, INPUT_IDS.SCRIPT_ID, INPUT_IDS.MAPPING] : [INPUT_IDS.MAPPING];
+    const fieldKey = fieldName as keyof typeof customField;
+    return fieldsAllowedToEdit.includes(fieldKey);
+}
+
+export {
+    getNetSuiteVendorOptions,
+    getNetSuitePayableAccountOptions,
+    getNetSuiteReceivableAccountOptions,
+    getNetSuiteExpenseAccountOptions,
+    getNetSuiteInvoiceItemOptions,
+    getNetSuiteTaxAccountOptions,
+    canUseTaxNetSuite,
+    canUseProvincialTaxNetSuite,
+    getFilteredReimbursableAccountOptions,
+    getNetSuiteReimbursableAccountOptions,
+    getFilteredCollectionAccountOptions,
+    getNetSuiteCollectionAccountOptions,
+    getFilteredApprovalAccountOptions,
+    getNetSuiteApprovalAccountOptions,
+    getCustomersOrJobsLabelNetSuite,
+    getNetSuiteImportCustomFieldLabel,
+    isNetSuiteCustomSegmentRecord,
+    getNameFromNetSuiteCustomField,
+    isNetSuiteCustomFieldPropertyEditable,
+};
diff --git a/src/libs/Network/NetworkStore.ts b/src/libs/Network/NetworkStore.ts
index 1586dd74957b..22e241e93365 100644
--- a/src/libs/Network/NetworkStore.ts
+++ b/src/libs/Network/NetworkStore.ts
@@ -16,6 +16,16 @@ let authTokenType: ValueOf<typeof CONST.AUTH_TOKEN_TYPES> | null;
 let accountID: number | null | undefined;
 let authenticating = false;
 
+type AuthTokenDrop = {
+    source: 'setAuthToken' | 'session';
+    droppedAt: number;
+    stack?: string;
+};
+
+let lastAuthTokenDrop: AuthTokenDrop | undefined;
+
+const AUTH_TOKEN_DROP_STACK_FRAMES = 8;
+
 let resolveIsReadyPromise: (args?: unknown[]) => void;
 let isReadyPromise = new Promise((resolve) => {
     resolveIsReadyPromise = resolve;
@@ -44,7 +54,12 @@ function resetHasReadRequiredDataFromStorage() {
 Onyx.connectWithoutView({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
-        authToken = val?.authToken ?? null;
+        const newAuthToken = val?.authToken ?? null;
+        if (authToken && !newAuthToken) {
+            lastAuthTokenDrop = {source: 'session', droppedAt: Date.now()};
+            Log.info('[NetworkStore] authToken dropped', false, {source: 'session', hasEmail: !!val?.email, accountID: val?.accountID});
+        }
+        authToken = newAuthToken;
         authTokenType = val?.authTokenType ?? null;
         accountID = val?.accountID ?? null;
         checkRequiredData();
@@ -86,9 +101,18 @@ function isSupportAuthToken(): boolean {
 }
 
 function setAuthToken(newAuthToken: string | null) {
+    if (authToken && !newAuthToken) {
+        const stack = new Error().stack?.split('\n').slice(0, AUTH_TOKEN_DROP_STACK_FRAMES).join('\n');
+        lastAuthTokenDrop = {source: 'setAuthToken', droppedAt: Date.now(), stack};
+        Log.info('[NetworkStore] authToken dropped', false, {source: 'setAuthToken', stack});
+    }
     authToken = newAuthToken;
 }
 
+function getLastAuthTokenDrop(): AuthTokenDrop | undefined {
+    return lastAuthTokenDrop;
+}
+
 function hasReadRequiredDataFromStorage(): Promise<unknown> {
     return isReadyPromise;
 }
@@ -115,4 +139,5 @@ export {
     isSupportAuthToken,
     getLastShortAuthToken,
     setLastShortAuthToken,
+    getLastAuthTokenDrop,
 };
diff --git a/src/libs/Network/enhanceParameters.ts b/src/libs/Network/enhanceParameters.ts
index a6f7de574105..39c2eaf37e95 100644
--- a/src/libs/Network/enhanceParameters.ts
+++ b/src/libs/Network/enhanceParameters.ts
@@ -1,6 +1,7 @@
 import {AUTHENTICATION_COMMAND} from '@libs/API/types';
 import * as Environment from '@libs/Environment/Environment';
 import getPlatform from '@libs/getPlatform';
+import Log from '@libs/Log';
 
 import CONFIG from '@src/CONFIG';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -8,7 +9,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import Onyx from 'react-native-onyx';
 
 import pkg from '../../../package.json';
-import {getAuthToken, getCurrentUserEmail} from './NetworkStore';
+import {getAuthToken, getCurrentUserEmail, getLastAuthTokenDrop} from './NetworkStore';
 
 // For all requests, we'll send the lastUpdateID that is applied to this client. This will
 // allow us to calculate previousUpdateID faster.
@@ -80,7 +81,18 @@ export default function enhanceParameters(command: string, parameters: Record<st
     const finalParameters: Record<string, unknown> = {...parameters, ...getBaseRequestParameters(parameters.email)};
 
     if (isAuthTokenRequired(command) && !parameters.authToken) {
-        finalParameters.authToken = getAuthToken() ?? null;
+        const authToken = getAuthToken();
+        if (!authToken) {
+            const lastDrop = getLastAuthTokenDrop();
+            Log.info('[enhanceParameters] Sending request without authToken', false, {
+                command,
+                authTokenState: authToken === undefined ? 'notHydrated' : 'empty',
+                lastDropSource: lastDrop?.source,
+                msSinceLastDrop: lastDrop ? Date.now() - lastDrop.droppedAt : undefined,
+                lastDropStack: lastDrop?.stack,
+            });
+        }
+        finalParameters.authToken = authToken ?? null;
     }
 
     finalParameters.clientUpdateID = lastUpdateIDAppliedToClient;
diff --git a/src/libs/OptionsListUtils/getChatPreviewParts.ts b/src/libs/OptionsListUtils/getChatPreviewParts.ts
deleted file mode 100644
index 7da4d20297af..000000000000
--- a/src/libs/OptionsListUtils/getChatPreviewParts.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import type {LocalizedTranslate} from '@components/LocaleContextProvider';
-
-import {
-    getLastVisibleActionIncludingTransactionThread,
-    getOriginalMessage,
-    getRenamedAction,
-    getReportActionActorAccountID,
-    getReportActionMessageText,
-    isActionOfType,
-    isCardIssuedAction,
-    isInviteOrRemovedAction,
-    isMovedTransactionAction,
-    isOldDotReportAction,
-    isPolicyCopyReportAction,
-    isRenamedAction,
-    isReportActionVisibleAsLastAction,
-    isTaskAction,
-} from '@libs/ReportActionsUtils';
-import {getLastActorDisplayName, getLastActorDisplayNameFromLastVisibleActions, shouldShowLastActorDisplayName} from '@libs/ReportAlternateTextUtils';
-import {getReportName} from '@libs/ReportNameUtils';
-import {
-    canUserPerformWriteAction,
-    formatReportLastMessageText,
-    getReportOrDraftReport,
-    isChatThread,
-    isDeprecatedGroupDM,
-    isExpenseReport,
-    isChatRoom as reportUtilsIsChatRoom,
-    isGroupChat as reportUtilsIsGroupChat,
-    isPolicyExpenseChat as reportUtilsIsPolicyExpenseChat,
-    isTaskReport as reportUtilsIsTaskReport,
-    isThread as reportUtilsIsThread,
-} from '@libs/ReportUtils';
-
-import CONST from '@src/CONST';
-import type {PersonalDetails, PersonalDetailsList, Report, ReportAction, ReportAttributesDerivedValue, VisibleReportActionsDerivedValue} from '@src/types/onyx';
-
-import type {OnyxEntry} from 'react-native-onyx';
-
-// These POLICY_CHANGE_LOG actions have no custom alternate text branch in SidebarUtils.getOptionData,
-// so the LHN renders them with the generic `Name: message` prefix and search must keep the prefix too.
-const POLICY_CHANGE_LOG_ACTIONS_WITHOUT_CUSTOM_TEXT = new Set<string>([
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CUSTOM_UNIT,
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CUSTOM_UNIT,
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CATEGORIES,
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REPLACE_CATEGORIES,
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SET_AUTO_REIMBURSEMENT,
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DISABLED_FIELDS,
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MULTIPLE_TAGS_APPROVER_RULES,
-    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_COMMUTER_EXCLUSIONS,
-]);
-const POLICY_CHANGE_LOG_ACTION_NAMES = new Set<string>(
-    Object.values(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG).filter((actionName) => !POLICY_CHANGE_LOG_ACTIONS_WITHOUT_CUSTOM_TEXT.has(actionName)),
-);
-const ROOM_CHANGE_LOG_ACTION_NAMES = new Set<string>(Object.values(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG));
-const CUSTOM_ALTERNATE_TEXT_ACTION_NAMES = new Set<string>([
-    CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED,
-    CONST.REPORT.ACTIONS.TYPE.COMPANY_CARD_CONNECTION_BROKEN,
-    CONST.REPORT.ACTIONS.TYPE.COMPANY_CARD_CONNECTION_BROKEN_30_DAYS,
-    CONST.REPORT.ACTIONS.TYPE.PERSONAL_CARD_CONNECTION_BROKEN,
-    CONST.REPORT.ACTIONS.TYPE.PERSONAL_CARD_CONNECTION_BROKEN_30_DAYS,
-    CONST.REPORT.ACTIONS.TYPE.PLAID_BALANCE_FAILURE,
-    CONST.REPORT.ACTIONS.TYPE.UNREPORTED_TRANSACTION,
-    CONST.REPORT.ACTIONS.TYPE.RETRACTED,
-    CONST.REPORT.ACTIONS.TYPE.REOPENED,
-    CONST.REPORT.ACTIONS.TYPE.TRAVEL_UPDATE,
-    CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL,
-    CONST.REPORT.ACTIONS.TYPE.REROUTE,
-    CONST.REPORT.ACTIONS.TYPE.REASSIGN_APPROVER,
-    CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED,
-]);
-
-function isActionWithCustomAlternateText(lastAction: OnyxEntry<ReportAction>): boolean {
-    const actionName = lastAction?.actionName;
-    if (!lastAction || !actionName) {
-        return false;
-    }
-    return (
-        isRenamedAction(lastAction) ||
-        isTaskAction(lastAction) ||
-        isInviteOrRemovedAction(lastAction) ||
-        isCardIssuedAction(lastAction) ||
-        isOldDotReportAction(lastAction) ||
-        isPolicyCopyReportAction(lastAction) ||
-        isMovedTransactionAction(lastAction) ||
-        (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_FRAUD_ALERT) && !!getOriginalMessage(lastAction)?.resolution) ||
-        POLICY_CHANGE_LOG_ACTION_NAMES.has(actionName) ||
-        ROOM_CHANGE_LOG_ACTION_NAMES.has(actionName) ||
-        CUSTOM_ALTERNATE_TEXT_ACTION_NAMES.has(actionName)
-    );
-}
-
-/**
- * Pieces of the chat preview line that the LHN renders for the last message.
- */
-type ChatPreviewParts = {
-    /** The `Name: ` prefix identifying the author of the last message, or an empty string when no prefix should be shown */
-    actorPrefix: string;
-
-    /** Replacement preview text for actions whose LHN alternate text embeds the actor (e.g. rename, leave room, invite/remove) */
-    customAlternateText?: string;
-};
-
-/**
- * Returns the chat preview pieces that the LHN (SidebarUtils.getOptionData) renders for the last message:
- * the `Name: ` actor prefix, plus a replacement text for the actions whose LHN alternate text embeds the actor
- * (rename, leave room, invite/remove) — excluding those from the generic prefix alone would drop the actor.
- */
-function getChatPreviewParts({
-    report,
-    personalDetails,
-    isReportArchived,
-    translate,
-    visibleReportActionsData,
-    currentUserAccountID,
-    sortedActions,
-    reportAttributesDerived,
-    oneTransactionThreadReportID,
-}: {
-    report: OnyxEntry<Report>;
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-    isReportArchived: boolean | undefined;
-    translate: LocalizedTranslate;
-    visibleReportActionsData?: VisibleReportActionsDerivedValue;
-    currentUserAccountID: number | undefined;
-    sortedActions?: Record<string, ReportAction[]>;
-    reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
-    oneTransactionThreadReportID?: string;
-}): ChatPreviewParts {
-    if (!report || isReportArchived || currentUserAccountID === undefined) {
-        return {actorPrefix: ''};
-    }
-    const canUserPerformWrite = canUserPerformWriteAction(report, isReportArchived);
-    const sortedActionsForReport = sortedActions?.[report.reportID];
-
-    const lastAction = sortedActionsForReport
-        ? sortedActionsForReport.find((action) => isReportActionVisibleAsLastAction(action, canUserPerformWrite, visibleReportActionsData, report.reportID, currentUserAccountID))
-        : getLastVisibleActionIncludingTransactionThread(report.reportID, canUserPerformWrite, undefined, visibleReportActionsData, oneTransactionThreadReportID, currentUserAccountID);
-
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const lastActorAccountID = getReportActionActorAccountID(lastAction, undefined, undefined) || report.lastActorAccountID;
-    let resolvedLastActorDetails: Partial<PersonalDetails> | null = lastActorAccountID ? (personalDetails?.[lastActorAccountID] ?? null) : null;
-    if (!resolvedLastActorDetails && lastAction?.person?.at(0)?.text) {
-        resolvedLastActorDetails = {
-            displayName: lastAction.person.at(0)?.text,
-            accountID: report.lastActorAccountID,
-        };
-    }
-    const lastActorDisplayName = getLastActorDisplayName(resolvedLastActorDetails, currentUserAccountID, translate);
-
-    const isThreadMessage =
-        reportUtilsIsThread(report) && lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && lastAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const usesChatPrefixRules =
-        reportUtilsIsChatRoom(report) ||
-        reportUtilsIsPolicyExpenseChat(report) ||
-        isChatThread(report) ||
-        reportUtilsIsTaskReport(report) ||
-        isThreadMessage ||
-        reportUtilsIsGroupChat(report) ||
-        isDeprecatedGroupDM(report, isReportArchived);
-
-    let customAlternateText: string | undefined;
-    if (usesChatPrefixRules) {
-        if (isRenamedAction(lastAction)) {
-            customAlternateText = getRenamedAction(translate, lastAction, isExpenseReport(report), lastActorDisplayName);
-        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_ROOM) {
-            const actionMessage = getReportActionMessageText(lastAction);
-            customAlternateText = actionMessage ? `${lastActorDisplayName}: ${actionMessage}` : '';
-        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.LEAVE_ROOM) {
-            customAlternateText = translate('report.actions.type.leftTheChatWithName', lastActorDisplayName);
-        } else if (isInviteOrRemovedAction(lastAction)) {
-            let actorDetails: Partial<PersonalDetails> | undefined;
-            if (lastAction.actorAccountID) {
-                actorDetails = personalDetails?.[lastAction.actorAccountID] ?? undefined;
-            }
-            let actorDisplayName = lastAction.person?.[0]?.text;
-            if (!actorDetails && actorDisplayName && lastAction.actorAccountID) {
-                actorDetails = {
-                    displayName: actorDisplayName,
-                    accountID: lastAction.actorAccountID,
-                };
-            }
-            actorDisplayName = actorDetails ? getLastActorDisplayName(actorDetails, currentUserAccountID, translate) : undefined;
-            const lastActionOriginalMessage = getOriginalMessage(lastAction);
-            const targetAccountIDs = lastActionOriginalMessage?.targetAccountIDs ?? [];
-            const targetAccountIDsLength = targetAccountIDs.length !== 0 ? targetAccountIDs.length : (report.lastMessageHtml?.match(/<mention-user[^>]*><\/mention-user>/g)?.length ?? 0);
-            const isInvite =
-                lastAction.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM || lastAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM;
-            const verb = isInvite ? translate('workspace.invite.invited') : translate('workspace.invite.removed');
-            const users = translate(targetAccountIDsLength > 1 ? 'common.members' : 'common.member')?.toLocaleLowerCase();
-            customAlternateText = formatReportLastMessageText(`${actorDisplayName ?? lastActorDisplayName}: ${verb} ${targetAccountIDsLength} ${users}`);
-            const lastActionReport = lastActionOriginalMessage?.reportID ? getReportOrDraftReport(String(lastActionOriginalMessage.reportID)) : undefined;
-            const derivedReportName = lastActionReport?.reportID ? reportAttributesDerived?.[lastActionReport.reportID]?.reportName : undefined;
-            const roomName = getReportName(lastActionReport, derivedReportName) || lastActionOriginalMessage?.roomName;
-            if (roomName) {
-                const preposition = isInvite ? ` ${translate('workspace.invite.to')}` : ` ${translate('workspace.invite.from')}`;
-                customAlternateText += `${preposition} ${roomName}`;
-            }
-        }
-    }
-
-    const shouldShowActorPrefix = usesChatPrefixRules
-        ? lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && !!lastActorDisplayName && !isActionWithCustomAlternateText(lastAction)
-        : shouldShowLastActorDisplayName(report, resolvedLastActorDetails, lastAction, currentUserAccountID, translate);
-    if (!shouldShowActorPrefix) {
-        return {actorPrefix: '', customAlternateText};
-    }
-    const displayName =
-        getLastActorDisplayNameFromLastVisibleActions(
-            report,
-            resolvedLastActorDetails,
-            currentUserAccountID,
-            personalDetails,
-            isReportArchived,
-            translate,
-            visibleReportActionsData,
-            lastAction,
-        ) || lastActorDisplayName;
-    return {actorPrefix: displayName ? `${displayName}: ` : '', customAlternateText};
-}
-
-export default getChatPreviewParts;
diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts
index 32df73a560aa..68ce51159020 100644
--- a/src/libs/OptionsListUtils/index.ts
+++ b/src/libs/OptionsListUtils/index.ts
@@ -6,6 +6,8 @@ import type {CurrencyListActionsContextType} from '@hooks/useCurrencyList';
 import type {PrivateIsArchivedMap} from '@hooks/usePrivateIsArchivedMap';
 
 import {getEnabledCategoriesCount} from '@libs/CategoryUtils';
+import getCollator from '@libs/CollatorUtils';
+import {convertToDisplayStringWithoutCurrencyForLocale, getCurrencyDecimals} from '@libs/CurrencyUtils';
 import filterArrayByMatch from '@libs/filterArrayByMatch';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {formatPhoneNumber as formatPhoneNumberPhoneUtils} from '@libs/LocalePhoneNumber';
@@ -28,7 +30,7 @@ import {
     isTimeTrackingEnabled,
 } from '@libs/PolicyUtils';
 import {getIOUReportIDFromReportActionPreview, getOneTransactionThreadReportID, isActionOfType} from '@libs/ReportActionsUtils';
-import {deprecatedCachedOneTransactionThreadReportIDs, getLastMessageTextForReport} from '@libs/ReportAlternateTextUtils';
+import {getReportAlternateText, resolveLastActionContext} from '@libs/ReportAlternateTextUtils';
 import {getReportName} from '@libs/ReportNameUtils';
 import type {OptionData} from '@libs/ReportUtils';
 import {
@@ -42,7 +44,6 @@ import {
     getPolicyName,
     getReportNotificationPreference,
     getReportOrDraftReport,
-    getReportSubtitlePrefix,
     getViolatingReportIDForRBRInLHN,
     hasExpensifyGuidesEmails,
     hasIOUWaitingOnCurrentUserBankAccount,
@@ -99,7 +100,6 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {Str} from 'expensify-common';
 import deburr from 'lodash/deburr';
 import lodashOrderBy from 'lodash/orderBy';
-import Onyx from 'react-native-onyx';
 
 import type {
     FilterUserToInviteConfig,
@@ -126,7 +126,6 @@ import type {
     SectionForSearchTerm,
 } from './types';
 
-import getChatPreviewParts from './getChatPreviewParts';
 import {doesPersonalDetailMatchSearchTerm, getCurrentUserSearchTerms, getPersonalDetailSearchTerms} from './searchMatchUtils';
 
 /**
@@ -135,12 +134,6 @@ import {doesPersonalDetailMatchSearchTerm, getCurrentUserSearchTerms, getPersona
  * methods should be named for the views they build options for and then exported for use in a component.
  */
 
-let activePolicyID: OnyxEntry<string>;
-Onyx.connect({
-    key: ONYXKEYS.NVP_ACTIVE_POLICY_ID,
-    callback: (value) => (activePolicyID = value),
-});
-
 /**
  * Return true if personal details data is ready, i.e. report list options can be created.
  */
@@ -226,21 +219,40 @@ type GetAlternateTextConfig = {
     personalDetails: OnyxEntry<PersonalDetailsList>;
     // We'll make it required in the next PR. Ref: https://github.com/Expensify/App/issues/66415
     policy?: OnyxEntry<Policy>;
-    lastActorDetails?: Partial<PersonalDetails> | null;
+    invoiceReceiverPolicy?: OnyxEntry<Policy>;
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
     translate?: LocalizedTranslate;
     reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
     policyTags?: OnyxEntry<PolicyTagLists>;
     conciergeReportID: string | undefined;
-    // TODO: Remove optional (?) once all callers pass sortedActions. Refactor issue: https://github.com/Expensify/App/issues/66381
-    sortedActions?: Record<string, ReportAction[]>;
+    transactionThreadIDs?: Record<string, string | undefined>;
+    lastActions?: Record<string, ReportAction>;
     isTrackIntentUser?: boolean;
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
+    convertToDisplayStringWithoutCurrency?: CurrencyListActionsContextType['convertToDisplayStringWithoutCurrency'];
     // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
     currentUserAccountID?: number;
+    currentUserLogin?: string;
+    localeCompare?: LocaleContextProps['localeCompare'];
+    formatPhoneNumber?: LocaleContextProps['formatPhoneNumber'];
     rules: OnyxCollection<Rule>;
 };
 
+/**
+ * Fallback for non-React callers that cannot provide the hook-bound localeCompare.
+ */
+function fallbackLocaleCompare(a: string, b: string): number {
+    return getCollator(IntlStore.getCurrentLocale()).compare(a, b);
+}
+
+/**
+ * Fallback for the non-React option builders that cannot provide the hook-bound convertToDisplayStringWithoutCurrency. Those builders never
+ * render a chat preview. Every preview caller threads the context implementation from useCurrencyListActions().
+ */
+function fallbackConvertToDisplayStringWithoutCurrency(amountInCents: number, currencyCode: string = CONST.CURRENCY.USD): string {
+    return convertToDisplayStringWithoutCurrencyForLocale(IntlStore.getCurrentLocale(), amountInCents, currencyCode, getCurrencyDecimals);
+}
+
 /**
  * Update alternate text for the option when applicable
  */
@@ -251,17 +263,22 @@ function getAlternateText(
         isReportArchived,
         personalDetails,
         policy,
-        lastActorDetails = {},
+        invoiceReceiverPolicy,
         visibleReportActionsData = {},
         translate,
         convertToDisplayString,
+        convertToDisplayStringWithoutCurrency,
         dateFnsLocale,
         reportAttributesDerived,
         policyTags,
         conciergeReportID,
-        sortedActions,
+        transactionThreadIDs,
+        lastActions,
         isTrackIntentUser,
         currentUserAccountID,
+        currentUserLogin,
+        localeCompare,
+        formatPhoneNumber,
         rules,
     }: GetAlternateTextConfig,
 ) {
@@ -271,75 +288,76 @@ function getAlternateText(
     const isGroupChat = reportUtilsIsGroupChat(report);
     const isExpenseThread = isMoneyRequest(report);
     const translateFn = translate ?? translateLocal;
-    // Keep Plain comments as they're typed (example: `<b>test</b>` stays `<b>test</b>`).
-    // Parser.htmlToText would strip it to `test`. Ref: https://github.com/Expensify/App/issues/82036
-    const isLastActionAddComment = report?.lastActionType === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT;
-    const formattedLastMessageText =
-        formatReportLastMessageText(isLastActionAddComment ? (option.lastMessageText ?? '') : Parser.htmlToText(option.lastMessageText ?? '')) ||
-        getLastMessageTextForReport({
-            translate: translateFn,
-            convertToDisplayString,
-            dateFnsLocale,
-            report,
-            personalDetails,
-            lastActorDetails,
-            policy,
-            isReportArchived,
-            visibleReportActionsDataParam: visibleReportActionsData,
-            reportAttributesDerived,
-            policyTags,
-            conciergeReportID,
-            sortedActions,
-            isTrackIntentUser,
-            currentUserAccountID,
-            rules,
-        });
-    const reportPrefix = getReportSubtitlePrefix(report);
 
-    const {actorPrefix, customAlternateText} =
-        showChatPreviewLine && formattedLastMessageText
-            ? getChatPreviewParts({
-                  report,
-                  personalDetails,
-                  isReportArchived,
-                  translate: translateFn,
-                  visibleReportActionsData,
-                  currentUserAccountID,
-                  sortedActions,
-                  reportAttributesDerived,
-                  // eslint-disable-next-line @typescript-eslint/no-deprecated
-                  oneTransactionThreadReportID: report?.reportID ? deprecatedCachedOneTransactionThreadReportIDs[report.reportID] : undefined,
-              })
-            : {actorPrefix: '', customAlternateText: undefined};
-    const formattedLastMessageTextWithPrefix = reportPrefix + actorPrefix + (customAlternateText ?? formattedLastMessageText);
+    const forcePolicyName = forcePolicyNamePreview && ((option.isPolicyExpenseChat ?? false) || isAdminRoom || isAnnounceRoom);
+    if (showChatPreviewLine && !forcePolicyName) {
+        if (report) {
+            const resolvedCurrentUserAccountID = currentUserAccountID ?? CONST.DEFAULT_NUMBER_ID;
+            const oneTransactionThreadReportID = transactionThreadIDs?.[report.reportID];
+            const {lastAction, lastActionReport, movedFromReport, movedToReport} = resolveLastActionContext(report, isReportArchived, visibleReportActionsData, oneTransactionThreadReportID);
+            return getReportAlternateText({
+                report,
+                lastAction,
+                lastActionReport,
+                movedFromReport,
+                movedToReport,
+                personalDetails,
+                policy,
+                invoiceReceiverPolicy,
+                policyTags,
+                isReportArchived,
+                // The Search path has no separate report NVP source here. The archived flag and private_isArchived
+                // both derive from the same NVP, so the option's archived flag is the equivalent input.
+                privateIsArchived: !!isReportArchived,
+                conciergeReportID,
+                reportAttributesDerived,
+                visibleReportActionsData,
+                // The LHN passes no `sortedActions`, so its preview reads the parent-only actions. The derived value
+                // combines one-transaction reports with their thread and drops the IOU action the report preview needs.
+                oneTransactionThreadReportID,
+                lastOriginalAction: lastActions?.[report.reportID],
+                currentUserAccountID: resolvedCurrentUserAccountID,
+                currentUserLogin: currentUserLogin ?? '',
+                isTrackIntentUser,
+                translate: translateFn,
+                localeCompare: localeCompare ?? fallbackLocaleCompare,
+                formatPhoneNumber: formatPhoneNumber ?? formatPhoneNumberPhoneUtils,
+                dateFnsLocale,
+                convertToDisplayString,
+                convertToDisplayStringWithoutCurrency: convertToDisplayStringWithoutCurrency ?? fallbackConvertToDisplayStringWithoutCurrency,
+                rules,
+            });
+        }
+        if (option.lastMessageText) {
+            return formatReportLastMessageText(Parser.htmlToText(option.lastMessageText));
+        }
+    }
 
     if (isExpenseThread || option.isMoneyRequestReport) {
-        return showChatPreviewLine && formattedLastMessageText ? formattedLastMessageTextWithPrefix : translateFn('iou.expense');
+        return translateFn('iou.expense');
     }
 
     if (option.isThread) {
-        return showChatPreviewLine && formattedLastMessageText ? formattedLastMessageTextWithPrefix : translateFn('threads.thread');
+        return translateFn('threads.thread');
     }
 
     if (option.isChatRoom && !isAdminRoom && !isAnnounceRoom) {
-        return showChatPreviewLine && formattedLastMessageText ? formattedLastMessageTextWithPrefix : option.subtitle;
+        return option.subtitle;
     }
 
     if ((option.isPolicyExpenseChat ?? false) || isAdminRoom || isAnnounceRoom) {
-        return showChatPreviewLine && !forcePolicyNamePreview && formattedLastMessageText ? formattedLastMessageTextWithPrefix : option.subtitle;
+        return option.subtitle;
     }
 
     if (option.isTaskReport) {
-        return showChatPreviewLine && formattedLastMessageText ? formattedLastMessageTextWithPrefix : translateFn('task.task');
+        return translateFn('task.task');
     }
 
     if (isGroupChat) {
-        return showChatPreviewLine && formattedLastMessageText ? formattedLastMessageTextWithPrefix : translateFn('common.group');
+        return translateFn('common.group');
     }
 
-    return showChatPreviewLine && formattedLastMessageText
-        ? formattedLastMessageTextWithPrefix
-        : formatPhoneNumberPhoneUtils(option.participantsList && option.participantsList.length > 0 ? (option.participantsList.at(0)?.login ?? '') : '');
+    return formatPhoneNumberPhoneUtils(option.participantsList && option.participantsList.length > 0 ? (option.participantsList.at(0)?.login ?? '') : '');
 }
 
 /**
@@ -371,14 +389,18 @@ type CreateOptionParams = {
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
     translate?: LocalizedTranslate;
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
+    convertToDisplayStringWithoutCurrency?: CurrencyListActionsContextType['convertToDisplayStringWithoutCurrency'];
     isTrackIntentUser?: boolean;
     conciergeReportID: string | undefined;
     // TODO: Remove optional (?) once all callers pass sortedActions. Refactor issue: https://github.com/Expensify/App/issues/66381
     sortedActions?: Record<string, ReportAction[]>;
+    transactionThreadIDs?: Record<string, string | undefined>;
+    lastActions?: Record<string, ReportAction>;
     // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
     currentUserAccountID?: number;
     // TODO: Remove optional (?) once all callers pass pendingDeleteMemberAccountIDs. Refactor issue: https://github.com/Expensify/App/issues/66421
     pendingDeleteMemberAccountIDs?: string[];
+    currentUserLogin?: string;
 };
 
 /** Shared by createOption and shells so filtering uses the final display text. */
@@ -417,12 +439,15 @@ function createOption({
     visibleReportActionsData = {},
     translate,
     convertToDisplayString,
+    convertToDisplayStringWithoutCurrency,
     dateFnsLocale,
     isTrackIntentUser,
     conciergeReportID,
-    sortedActions,
+    transactionThreadIDs,
+    lastActions,
     currentUserAccountID,
     pendingDeleteMemberAccountIDs,
+    currentUserLogin,
 }: CreateOptionParams): SearchOptionData {
     const {showChatPreviewLine = false, forcePolicyNamePreview = false, showPersonalDetails = false, selected, isSelected, isDisabled} = config ?? {};
     const translateFn = translate ?? translateLocal;
@@ -498,26 +523,6 @@ function createOption({
         hasMultipleParticipants = personalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat || reportUtilsIsGroupChat(report);
         subtitle = getChatRoomSubtitle(report, policy, conciergeReportID, translateFn, rules, true, result.private_isArchived);
 
-        // If displaying chat preview line is needed, let's overwrite the default alternate text
-        const lastActorDetails = personalDetails?.[report?.lastActorAccountID ?? String(CONST.DEFAULT_NUMBER_ID)] ?? {};
-        result.lastMessageText = getLastMessageTextForReport({
-            translate: translateFn,
-            convertToDisplayString,
-            dateFnsLocale,
-            report,
-            personalDetails,
-            lastActorDetails,
-            policy,
-            isReportArchived: result.private_isArchived,
-            visibleReportActionsDataParam: visibleReportActionsData,
-            reportAttributesDerived,
-            policyTags,
-            conciergeReportID,
-            sortedActions,
-            isTrackIntentUser,
-            currentUserAccountID,
-            rules,
-        });
         result.alternateText =
             showPersonalDetails && personalDetail?.login
                 ? personalDetail.login
@@ -529,15 +534,18 @@ function createOption({
                           isReportArchived: !!result.private_isArchived,
                           personalDetails,
                           policy,
-                          lastActorDetails,
                           visibleReportActionsData,
                           translate: translateFn,
                           convertToDisplayString,
+                          convertToDisplayStringWithoutCurrency,
                           reportAttributesDerived,
                           policyTags,
                           conciergeReportID,
-                          sortedActions,
+                          transactionThreadIDs,
+                          lastActions,
+                          isTrackIntentUser,
                           currentUserAccountID,
+                          currentUserLogin,
                           rules,
                       },
                   );
@@ -928,8 +936,11 @@ function processReport(
         visibleReportActionsData = {},
         isTrackIntentUser,
         sortedActions,
+        transactionThreadIDs,
+        lastActions,
         currentUserAccountID,
         pendingDeleteMemberAccountIDs,
+        currentUserLogin,
         convertToDisplayString,
     }: {
         currentUserAccountID: number;
@@ -941,6 +952,9 @@ function processReport(
         isTrackIntentUser?: boolean;
         // TODO: Remove optional (?) once all callers pass sortedActions. Refactor issue: https://github.com/Expensify/App/issues/66381
         sortedActions?: Record<string, ReportAction[]>;
+        transactionThreadIDs?: Record<string, string | undefined>;
+        lastActions?: Record<string, ReportAction>;
+        currentUserLogin?: string;
     },
     rules: OnyxCollection<Rule>,
 ): {
@@ -981,8 +995,11 @@ function processReport(
                 visibleReportActionsData,
                 isTrackIntentUser,
                 sortedActions,
+                transactionThreadIDs,
+                lastActions,
                 currentUserAccountID,
                 pendingDeleteMemberAccountIDs,
+                currentUserLogin,
             }),
         },
     };
@@ -1163,6 +1180,9 @@ function createFilteredOptionList(
     policiesCollection: OnyxCollection<Policy>,
     options: {
         currentUserAccountID: number;
+        currentUserLogin?: string;
+        transactionThreadIDs?: Record<string, string | undefined>;
+        lastActions?: Record<string, ReportAction>;
         dateFnsLocale: DateFnsLocale | undefined;
         convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
         conciergeReportID: string | undefined;
@@ -1193,6 +1213,9 @@ function createFilteredOptionList(
 ): OptionList {
     const {
         currentUserAccountID,
+        currentUserLogin,
+        transactionThreadIDs,
+        lastActions,
         conciergeReportID,
         maxRecentReports = 500,
         includeP2P = true,
@@ -1237,8 +1260,11 @@ function createFilteredOptionList(
         // The RAM_ONLY_SORTED_REPORT_ACTIONS derived value produces a new object on every recompute,
         // so its reference signals that the underlying report actions changed.
         sortedActions,
+        transactionThreadIDs,
+        lastActions,
         currentUserAccountID,
         pendingDeleteMemberAccountIDsByReportID,
+        currentUserLogin,
     ];
     const cachedEntry = shouldUseCache ? filteredOptionListCache.get(cacheEntryKey) : undefined;
     if (cachedEntry && cacheInputs.every((value, index) => value === cachedEntry.inputs.at(index))) {
@@ -1306,8 +1332,11 @@ function createFilteredOptionList(
                 visibleReportActionsData,
                 isTrackIntentUser,
                 sortedActions,
+                transactionThreadIDs,
+                lastActions,
                 currentUserAccountID,
                 pendingDeleteMemberAccountIDs: pendingDeleteMemberAccountIDsByReportID?.[report.reportID],
+                currentUserLogin,
             },
             rules,
         );
@@ -1387,14 +1416,18 @@ type CreateOptionFromReportParams = {
     rules: OnyxCollection<Rule>;
     policy: OnyxEntry<Policy>;
     sortedActions: Record<string, ReportAction[]> | undefined;
+    transactionThreadIDs?: Record<string, string | undefined>;
+    lastActions?: Record<string, ReportAction>;
+    currentUserAccountID: number;
+    currentUserLogin?: string;
     conciergeReportID: string | undefined;
     reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
     config?: PreviewConfig;
     policyTags?: OnyxEntry<PolicyTagLists>;
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
     isTrackIntentUser?: boolean;
-    currentUserAccountID: number;
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
+    convertToDisplayStringWithoutCurrency?: CurrencyListActionsContextType['convertToDisplayStringWithoutCurrency'];
 };
 
 function createOptionFromReport({
@@ -1405,14 +1438,18 @@ function createOptionFromReport({
     rules,
     policy,
     sortedActions,
+    transactionThreadIDs,
+    lastActions,
+    currentUserAccountID,
+    currentUserLogin,
     conciergeReportID,
     reportAttributesDerived,
     config,
     policyTags,
     visibleReportActionsData = {},
     isTrackIntentUser,
-    currentUserAccountID,
     convertToDisplayString,
+    convertToDisplayStringWithoutCurrency,
 }: CreateOptionFromReportParams) {
     const accountIDs = getParticipantsAccountIDsForDisplay(report);
 
@@ -1421,6 +1458,7 @@ function createOptionFromReport({
         ...createOption({
             dateFnsLocale,
             convertToDisplayString,
+            convertToDisplayStringWithoutCurrency,
             accountIDs,
             personalDetails,
             report,
@@ -1433,8 +1471,11 @@ function createOptionFromReport({
             policyTags,
             visibleReportActionsData,
             sortedActions,
-            isTrackIntentUser,
+            transactionThreadIDs,
+            lastActions,
             currentUserAccountID,
+            currentUserLogin,
+            isTrackIntentUser,
         }),
     };
 }
@@ -1613,6 +1654,7 @@ function optionsOrderAndGroupBy<T = SearchOptionData>(
 function orderReportOptionsWithSearch(
     options: SearchOptionData[],
     searchValue: string,
+    activePolicyID: OnyxEntry<string>,
     {preferChatRoomsOverThreads = false, preferPolicyExpenseChat = false, preferRecentExpenseReports = false}: OrderReportOptionsConfig = {},
 ) {
     const orderedByDate = orderReportOptions(options);
@@ -1659,7 +1701,7 @@ function orderReportOptionsWithSearch(
     );
 }
 
-function orderWorkspaceOptions(options: SearchOptionData[]): SearchOptionData[] {
+function orderWorkspaceOptions(options: SearchOptionData[], activePolicyID: OnyxEntry<string>): SearchOptionData[] {
     return options.sort((a, b) => {
         // Check if `a` is the default workspace
         if (a.isPolicyExpenseChat && a.policyID === activePolicyID) {
@@ -1688,21 +1730,31 @@ function sortComparatorReportOptionByDate(options: SearchOptionData) {
 /**
  * Sorts reports and personal details independently.
  */
-function orderOptions<T extends SearchOptionData>(options: ReportAndPersonalDetailOptions<T>): ReportAndPersonalDetailOptions<T>;
+function orderOptions<T extends SearchOptionData>(options: ReportAndPersonalDetailOptions<T>, activePolicyID: OnyxEntry<string>): ReportAndPersonalDetailOptions<T>;
 
 /**
  * Sorts reports and personal details independently, but prioritizes the search value.
  */
-function orderOptions<T extends SearchOptionData>(options: ReportAndPersonalDetailOptions<T>, searchValue: string, config?: OrderReportOptionsConfig): ReportAndPersonalDetailOptions<T>;
-function orderOptions<T extends SearchOptionData>(options: ReportAndPersonalDetailOptions<T>, searchValue?: string, config?: OrderReportOptionsConfig): ReportAndPersonalDetailOptions<T> {
+function orderOptions<T extends SearchOptionData>(
+    options: ReportAndPersonalDetailOptions<T>,
+    activePolicyID: OnyxEntry<string>,
+    searchValue: string,
+    config?: OrderReportOptionsConfig,
+): ReportAndPersonalDetailOptions<T>;
+function orderOptions<T extends SearchOptionData>(
+    options: ReportAndPersonalDetailOptions<T>,
+    activePolicyID: OnyxEntry<string>,
+    searchValue?: string,
+    config?: OrderReportOptionsConfig,
+): ReportAndPersonalDetailOptions<T> {
     let orderedReportOptions: SearchOptionData[];
     if (searchValue) {
-        orderedReportOptions = orderReportOptionsWithSearch(options.recentReports, searchValue, config);
+        orderedReportOptions = orderReportOptionsWithSearch(options.recentReports, searchValue, activePolicyID, config);
     } else {
         orderedReportOptions = orderReportOptions(options.recentReports);
     }
     const orderedPersonalDetailsOptions = orderPersonalDetailsOptions(options.personalDetails);
-    const orderedWorkspaceChats = orderWorkspaceOptions(options?.workspaceChats ?? []);
+    const orderedWorkspaceChats = orderWorkspaceOptions(options?.workspaceChats ?? [], activePolicyID);
 
     return {
         recentReports: orderedReportOptions,
@@ -1982,6 +2034,67 @@ function isValidReport(
     return true;
 }
 
+/**
+ * Cache for the chat preview text that `getAlternateText` resolves.
+ *
+ * `createFilteredOptionList` reuses its whole result while its Onyx inputs are unchanged, but
+ * `prepareReportOptionsForDisplay` runs on every call - once per keystroke in Search - and resolves the full preview
+ * (`getReportAlternateText`) for every option it keeps. The preview depends only on the report and on the Onyx
+ * snapshots guarded below, so it is kept per report and the whole cache is dropped as soon as any of those inputs
+ * changes identity.
+ */
+const alternateTextCache = new Map<string, string | undefined>();
+let alternateTextCacheInputs: unknown[] | undefined;
+
+// Bound the LRU cache so a wide result cap cannot grow it without limit.
+const ALTERNATE_TEXT_CACHE_MAX_ENTRIES = 500;
+
+// The cached previews belong to the signed-in account, so drop them on sign-out instead of holding them until the
+// next call.
+registerSessionCleanupCallback(() => {
+    alternateTextCache.clear();
+    alternateTextCacheInputs = undefined;
+});
+
+/** Clears the preview cache. For tests that measure or exercise the resolve path while the guarded inputs keep their identity. */
+function clearAlternateTextCache() {
+    alternateTextCache.clear();
+    alternateTextCacheInputs = undefined;
+}
+
+/** Drops every cached preview as soon as any input that feeds `getAlternateText` changes identity. */
+function syncAlternateTextCache(inputs: unknown[]) {
+    if (alternateTextCacheInputs?.length === inputs.length && inputs.every((input, index) => input === alternateTextCacheInputs?.at(index))) {
+        return;
+    }
+
+    alternateTextCache.clear();
+    alternateTextCacheInputs = inputs;
+}
+
+/** Returns the cached preview for the key, resolving and storing it on a miss. */
+function getCachedAlternateText(cacheKey: string, resolveAlternateText: () => string | undefined): string | undefined {
+    if (alternateTextCache.has(cacheKey)) {
+        const cachedAlternateText = alternateTextCache.get(cacheKey);
+        // Re-inserting refreshes recency so a frequently-hit entry is not evicted by misses on other keys.
+        alternateTextCache.delete(cacheKey);
+        alternateTextCache.set(cacheKey, cachedAlternateText);
+        return cachedAlternateText;
+    }
+
+    const alternateText = resolveAlternateText();
+
+    if (alternateTextCache.size >= ALTERNATE_TEXT_CACHE_MAX_ENTRIES) {
+        const oldestEntry = alternateTextCache.keys().next();
+        if (!oldestEntry.done) {
+            alternateTextCache.delete(oldestEntry.value);
+        }
+    }
+    alternateTextCache.set(cacheKey, alternateText);
+
+    return alternateText;
+}
+
 /**
  * Prepares report options for display by enriching them with UI-specific properties and filtering out invalid options.
  *
@@ -2001,13 +2114,19 @@ function prepareReportOptionsForDisplay(
     config: GetValidReportsConfig & {
         translate: LocalizedTranslate;
         convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
+        convertToDisplayStringWithoutCurrency?: CurrencyListActionsContextType['convertToDisplayStringWithoutCurrency'];
         dateFnsLocale: DateFnsLocale | undefined;
         currentUserAccountID?: number;
+        currentUserLogin?: string;
+        localeCompare?: LocaleContextProps['localeCompare'];
+        formatPhoneNumber?: LocaleContextProps['formatPhoneNumber'];
+        transactionThreadIDs?: Record<string, string | undefined>;
+        lastActions?: Record<string, ReportAction>;
     },
     conciergeReportID: string | undefined,
     sortedActions: Record<string, ReportAction[]> | undefined,
     rules: OnyxCollection<Rule>,
-    visibleReportActionsData: VisibleReportActionsDerivedValue = {},
+    visibleReportActionsData: VisibleReportActionsDerivedValue = EMPTY_VISIBLE_REPORT_ACTIONS,
     reportAttributesDerived?: ReportAttributesDerivedValue['reports'],
     policyTags?: OnyxCollection<PolicyTagLists>,
     isTrackIntentUser?: boolean,
@@ -2028,13 +2147,42 @@ function prepareReportOptionsForDisplay(
         translate,
         getReportByID,
         convertToDisplayString,
+        convertToDisplayStringWithoutCurrency,
         currentUserAccountID,
+        currentUserLogin,
+        localeCompare,
+        formatPhoneNumber,
+        transactionThreadIDs,
+        lastActions,
     } = config;
 
     const validOptions: Array<SearchOption<Report>> = [];
 
     const preferRecentExpenseReports = action === CONST.IOU.ACTION.CREATE;
 
+    syncAlternateTextCache([
+        getReportByID,
+        policiesCollection,
+        personalDetails,
+        visibleReportActionsData,
+        reportAttributesDerived,
+        policyTags,
+        sortedActions,
+        transactionThreadIDs,
+        lastActions,
+        rules,
+        conciergeReportID,
+        isTrackIntentUser,
+        currentUserAccountID,
+        currentUserLogin,
+        config.dateFnsLocale,
+        convertToDisplayString,
+        convertToDisplayStringWithoutCurrency,
+        localeCompare,
+        formatPhoneNumber,
+        translate,
+    ]);
+
     for (let i = 0; i < options.length; i++) {
         const option = options.at(i);
         if (!option) {
@@ -2043,32 +2191,46 @@ function prepareReportOptionsForDisplay(
         const report = option.item;
         const policy = policiesCollection?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
         const reportPolicyTags = policyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(report?.policyID)}`];
+        const parentReport = getReportByID(report.parentReportID);
+        let invoiceReceiverPolicyID: string | undefined;
+        if (report.invoiceReceiver && 'policyID' in report.invoiceReceiver) {
+            invoiceReceiverPolicyID = report.invoiceReceiver.policyID;
+        }
+        if (parentReport?.invoiceReceiver && 'policyID' in parentReport.invoiceReceiver) {
+            invoiceReceiverPolicyID = parentReport.invoiceReceiver.policyID;
+        }
+        const invoiceReceiverPolicy = invoiceReceiverPolicyID ? policiesCollection?.[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`] : undefined;
         /**
          * By default, generated options does not have the chat preview line enabled.
          * If showChatPreviewLine or forcePolicyNamePreview are true, let's generate and overwrite the alternate text.
          */
-        const lastActorDetails = personalDetails?.[report.lastActorAccountID ?? CONST.DEFAULT_NUMBER_ID] ?? null;
-
-        const alternateText = getAlternateText(
-            option,
-            {showChatPreviewLine, forcePolicyNamePreview},
-            {
-                dateFnsLocale: config.dateFnsLocale,
-                isReportArchived: !!option.private_isArchived,
-                personalDetails,
-                policy,
-                lastActorDetails,
-                visibleReportActionsData,
-                translate,
-                convertToDisplayString,
-                reportAttributesDerived,
-                policyTags: reportPolicyTags,
-                conciergeReportID,
-                sortedActions,
-                isTrackIntentUser,
-                currentUserAccountID,
-                rules,
-            },
+        const alternateText = getCachedAlternateText(`${report.reportID}_${showChatPreviewLine ? 1 : 0}_${forcePolicyNamePreview ? 1 : 0}_${option.private_isArchived ? 1 : 0}`, () =>
+            getAlternateText(
+                option,
+                {showChatPreviewLine, forcePolicyNamePreview},
+                {
+                    dateFnsLocale: config.dateFnsLocale,
+                    isReportArchived: !!option.private_isArchived,
+                    personalDetails,
+                    policy,
+                    invoiceReceiverPolicy,
+                    visibleReportActionsData,
+                    translate,
+                    convertToDisplayString,
+                    convertToDisplayStringWithoutCurrency,
+                    reportAttributesDerived,
+                    policyTags: reportPolicyTags,
+                    conciergeReportID,
+                    transactionThreadIDs,
+                    lastActions,
+                    isTrackIntentUser,
+                    currentUserAccountID,
+                    currentUserLogin,
+                    localeCompare,
+                    formatPhoneNumber,
+                    rules,
+                },
+            ),
         );
         const isSelected = isReportSelected(option, selectedOptions);
 
@@ -2171,9 +2333,14 @@ function getValidOptions(
         personalDetails,
         allPolicyTags,
         countryCode = CONST.DEFAULT_COUNTRY_CODE,
-        visibleReportActionsData = {},
+        visibleReportActionsData = EMPTY_VISIBLE_REPORT_ACTIONS,
         reportAttributesDerived,
         sortedActions,
+        transactionThreadIDs,
+        lastActions,
+        currentUserLogin,
+        localeCompare,
+        formatPhoneNumber,
         isTrackIntentUser,
         isOffline,
         ...config
@@ -2229,26 +2396,6 @@ function getValidOptions(
         const isWorkspaceChat = (report: SearchOption<Report>) => shouldSeparateWorkspaceChat && report.isPolicyExpenseChat && !report.private_isArchived;
         const isSelfDMChat = (report: SearchOption<Report>) => shouldSeparateSelfDMChat && report.isSelfDM && !report.private_isArchived;
 
-        const isSearchTermsFound = (report: SearchOption<Report>) => {
-            let searchText = `${report.text ?? ''}${report.login ?? ''}`;
-            if (report.isThread) {
-                searchText += report.alternateText ?? '';
-            } else if (report.isChatRoom) {
-                searchText += report.subtitle ?? '';
-            } else if (report.isPolicyExpenseChat) {
-                searchText += `${report.subtitle ?? ''}${report.item.policyName ?? ''}`;
-            } else if (report.item.chatType === CONST.REPORT.CHAT_TYPE.GROUP) {
-                const participantsSearchText = report.participantsList?.map((participant) => [participant.displayName, participant.login].filter(Boolean).join(' ')).join(' ') ?? '';
-                searchText += participantsSearchText;
-            }
-            searchText = deburr(searchText.toLocaleLowerCase());
-
-            // Keep the pre-filter a superset of filterReports(). The canonical matcher handles apostrophes,
-            // hyphens, zero-width characters, diacritics, and email searches without dots that this cheap
-            // substring check may miss. Run it only when the cheap check does not find a match.
-            return searchTerms.every((term) => searchText.includes(term)) || filterReports([report], searchTerms).length > 0;
-        };
-
         const filteringFunction = (report: SearchOption<Report>) => {
             if (excludeHidden) {
                 if (report.isThread && report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
@@ -2272,7 +2419,7 @@ function getValidOptions(
             }
 
             const policy = policiesCollection?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
-            if (!isSearchTermsFound(report)) {
+            if (!doesReportMatchSearchTerms(report, searchTerms)) {
                 return false;
             }
 
@@ -2321,6 +2468,11 @@ function getValidOptions(
                     personalDetails,
                     translate,
                     currentUserAccountID,
+                    currentUserLogin: currentUserLogin ?? currentUserEmail,
+                    localeCompare,
+                    formatPhoneNumber,
+                    transactionThreadIDs,
+                    lastActions,
                 },
                 conciergeReportID,
                 sortedActions,
@@ -2350,6 +2502,11 @@ function getValidOptions(
                 personalDetails,
                 translate,
                 currentUserAccountID,
+                currentUserLogin: currentUserLogin ?? currentUserEmail,
+                localeCompare,
+                formatPhoneNumber,
+                transactionThreadIDs,
+                lastActions,
             },
             conciergeReportID,
             sortedActions,
@@ -2375,6 +2532,11 @@ function getValidOptions(
                 personalDetails,
                 translate,
                 currentUserAccountID,
+                currentUserLogin: currentUserLogin ?? currentUserEmail,
+                localeCompare,
+                formatPhoneNumber,
+                transactionThreadIDs,
+                lastActions,
             },
             conciergeReportID,
             sortedActions,
@@ -2440,12 +2602,12 @@ function getValidOptions(
             }
 
             // Keep this pre-filter a superset of filterPersonalDetails().
-            if (searchTerms.length > 0 && filterPersonalDetails([personalDetail], searchTerms, currentUserAccountID).length > 0) {
+            if (searchTerms.length > 0 && filterPersonalDetails([personalDetail], searchTerms, currentUserAccountID, translate).length > 0) {
                 return true;
             }
 
             return searchTerms.every((term) =>
-                doesPersonalDetailMatchSearchTerm(personalDetail, currentUserAccountID, term, {
+                doesPersonalDetailMatchSearchTerm(personalDetail, currentUserAccountID, term, translate, {
                     useLocaleLowerCase: true,
                     transformSearchText: (concatenatedSearchTerms) => deburr(`${concatenatedSearchTerms} ${(personalDetail.text ?? '').toLocaleLowerCase()}`),
                 }),
@@ -2525,6 +2687,7 @@ function getValidOptions(
 type SearchOptionsConfig = {
     dateFnsLocale: DateFnsLocale | undefined;
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
+    convertToDisplayStringWithoutCurrency?: CurrencyListActionsContextType['convertToDisplayStringWithoutCurrency'];
     options: OptionList;
     draftComments: OnyxCollection<string>;
     isDefaultRoomsBetaEnabled?: boolean;
@@ -2547,6 +2710,11 @@ type SearchOptionsConfig = {
     reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
     allPolicyTags?: OnyxCollection<PolicyTagLists>;
     sortedActions: Record<string, ReportAction[]> | undefined;
+    transactionThreadIDs?: Record<string, string | undefined>;
+    lastActions?: Record<string, ReportAction>;
+    currentUserLogin?: string;
+    localeCompare?: LocaleContextProps['localeCompare'];
+    formatPhoneNumber?: LocaleContextProps['formatPhoneNumber'];
     conciergeReportID: string | undefined;
     excludeFromSuggestionsOnly?: Record<string, boolean>;
     isTrackIntentUser?: boolean;
@@ -2575,7 +2743,7 @@ function getSearchOptions({
     shouldShowGBR = false,
     shouldUnreadBeBold = false,
     loginList,
-    visibleReportActionsData = {},
+    visibleReportActionsData = EMPTY_VISIBLE_REPORT_ACTIONS,
     policyCollection,
     currentUserAccountID,
     currentUserEmail,
@@ -2583,12 +2751,18 @@ function getSearchOptions({
     personalDetails,
     allPolicyTags,
     sortedActions,
+    transactionThreadIDs,
+    lastActions,
+    currentUserLogin,
+    localeCompare,
+    formatPhoneNumber,
     conciergeReportID,
     excludeFromSuggestionsOnly = {},
     isTrackIntentUser,
     translate,
     getReportByID,
     convertToDisplayString,
+    convertToDisplayStringWithoutCurrency,
     rules,
 }: SearchOptionsConfig): OptionsResult {
     const optionList = getValidOptions(
@@ -2602,6 +2776,7 @@ function getSearchOptions({
         {
             dateFnsLocale,
             convertToDisplayString,
+            convertToDisplayStringWithoutCurrency,
             isDefaultRoomsBetaEnabled,
             includeRecentReports,
             includeMultipleParticipantReports: true,
@@ -2627,6 +2802,11 @@ function getSearchOptions({
             reportAttributesDerived,
             allPolicyTags,
             sortedActions,
+            transactionThreadIDs,
+            lastActions,
+            currentUserLogin: currentUserLogin ?? currentUserEmail,
+            localeCompare,
+            formatPhoneNumber,
             excludeFromSuggestionsOnly,
             isTrackIntentUser,
             getReportByID,
@@ -2814,7 +2994,7 @@ function formatSectionsFromSearchTerm(
     // This will add them to the list of options, deduping them if they already exist in the other lists
     const selectedParticipantsWithoutDetails = selectedOptions.filter((participant) => {
         const accountID = participant.accountID ?? null;
-        const isPartOfSearchTerm = doesPersonalDetailMatchSearchTerm(participant, currentUserAccountID, cleanSearchTerm);
+        const isPartOfSearchTerm = doesPersonalDetailMatchSearchTerm(participant, currentUserAccountID, cleanSearchTerm, translate);
         const isReportInRecentReports = filteredRecentReports.some((report) => report.accountID === accountID) || filteredWorkspaceChats.some((report) => report.accountID === accountID);
         const isReportInPersonalDetails = filteredPersonalDetails.some((personalDetail) => personalDetail.accountID === accountID);
 
@@ -2900,6 +3080,30 @@ function filterReports(reports: SearchOptionData[], searchTerms: string[]): Sear
     return filteredReports;
 }
 
+/**
+ * Whether a report matches every search term. Keep the cheap substring check a superset of filterReports(): that
+ * canonical matcher handles apostrophes, hyphens, zero-width characters, diacritics, and emails searched without
+ * their dots, and only runs when the cheap check misses. Narrowing the cheap check silently drops matches.
+ */
+function doesReportMatchSearchTerms(report: SearchOption<Report>, searchTerms: string[]): boolean {
+    const normalizeSearchText = (value: string) => deburr(StringUtils.normalizeForMatch(value).toLocaleLowerCase());
+    const normalizedSearchTerms = searchTerms.map(normalizeSearchText);
+    let searchText = `${report.text ?? ''}${report.login ?? ''}`;
+    if (report.isThread) {
+        searchText += report.alternateText ?? '';
+    } else if (report.isChatRoom) {
+        searchText += report.subtitle ?? '';
+    } else if (report.isPolicyExpenseChat) {
+        searchText += `${report.subtitle ?? ''}${report.item.policyName ?? ''}`;
+    } else if (report.item.chatType === CONST.REPORT.CHAT_TYPE.GROUP) {
+        const participantsSearchText = report.participantsList?.map((participant) => [participant.displayName, participant.login].filter(Boolean).join(' ')).join(' ') ?? '';
+        searchText += participantsSearchText;
+    }
+    searchText = normalizeSearchText(searchText);
+
+    return normalizedSearchTerms.every((term) => searchText.includes(term)) || filterReports([report], normalizedSearchTerms).length > 0;
+}
+
 function filterWorkspaceChats(reports: SearchOptionData[], searchTerms: string[]): SearchOptionData[] {
     const filteredReports = searchTerms.reduceRight(
         (items, term) =>
@@ -2917,24 +3121,24 @@ function filterWorkspaceChats(reports: SearchOptionData[], searchTerms: string[]
     return filteredReports;
 }
 
-function filterPersonalDetails<T extends SearchOptionData>(personalDetails: T[], searchTerms: string[], currentUserAccountID: number): T[] {
+function filterPersonalDetails<T extends SearchOptionData>(personalDetails: T[], searchTerms: string[], currentUserAccountID: number, translate: LocalizedTranslate): T[] {
     return searchTerms.reduceRight(
         (items, term) =>
             filterArrayByMatch(items, term, (item) => {
-                const values = getPersonalDetailSearchTerms(item, currentUserAccountID);
+                const values = getPersonalDetailSearchTerms(item, currentUserAccountID, translate);
                 return uniqFast(values);
             }),
         personalDetails,
     );
 }
 
-function filterCurrentUserOption<T extends SearchOptionData>(currentUserOption: T | null | undefined, searchTerms: string[]): T | null | undefined {
+function filterCurrentUserOption<T extends SearchOptionData>(currentUserOption: T | null | undefined, searchTerms: string[], translate: LocalizedTranslate): T | null | undefined {
     return searchTerms.reduceRight<T | null | undefined>((item, term) => {
         if (!item) {
             return null;
         }
 
-        const currentUserOptionSearchText = uniqFast(getCurrentUserSearchTerms(item)).join(' ');
+        const currentUserOptionSearchText = uniqFast(getCurrentUserSearchTerms(item, translate)).join(' ');
         return isSearchStringMatch(term, currentUserOptionSearchText) ? item : null;
     }, currentUserOption);
 }
@@ -2995,6 +3199,7 @@ function filterOptions<T extends SearchOptionData>(
     currentUserAccountID: number,
     personalDetailsCollection: OnyxEntry<PersonalDetailsList>,
     config: FilterUserToInviteConfig,
+    translate: LocalizedTranslate,
     rules: OnyxCollection<Rule>,
 ): Options<T> {
     const trimmedSearchInput = searchInputValue.trim();
@@ -3005,8 +3210,8 @@ function filterOptions<T extends SearchOptionData>(
     const searchTerms = searchValue ? searchValue.split(' ') : [];
 
     const recentReports = filterReports(options.recentReports, searchTerms);
-    const personalDetails = filterPersonalDetails(options.personalDetails, searchTerms, currentUserAccountID);
-    const currentUserOption = filterCurrentUserOption(options.currentUserOption, searchTerms);
+    const personalDetails = filterPersonalDetails(options.personalDetails, searchTerms, currentUserAccountID, translate);
+    const currentUserOption = filterCurrentUserOption(options.currentUserOption, searchTerms, translate);
     const userToInvite = filterUserToInvite(
         {
             recentReports,
@@ -3050,16 +3255,17 @@ type FilterAndOrderConfig = FilterUserToInviteConfig & AllOrderConfigs;
 function combineOrderingOfReportsAndPersonalDetails<T extends SearchOptionData>(
     options: ReportAndPersonalDetailOptions<T>,
     searchInputValue: string,
+    activePolicyID: OnyxEntry<string>,
     {maxRecentReportsToShow, sortByReportTypeInSearch, ...orderReportOptionsConfig}: AllOrderConfigs = {},
 ): ReportAndPersonalDetailOptions<T> {
     // sortByReportTypeInSearch will show the personal details as part of the recent reports
     if (sortByReportTypeInSearch) {
         const personalDetailsWithoutDMs = filteredPersonalDetailsOfRecentReports(options.recentReports, options.personalDetails);
         const reportsAndPersonalDetails = options.recentReports.concat(personalDetailsWithoutDMs);
-        return orderOptions({recentReports: reportsAndPersonalDetails, personalDetails: []}, searchInputValue, orderReportOptionsConfig);
+        return orderOptions({recentReports: reportsAndPersonalDetails, personalDetails: []}, activePolicyID, searchInputValue, orderReportOptionsConfig);
     }
 
-    let orderedReports = orderReportOptionsWithSearch(options.recentReports, searchInputValue, orderReportOptionsConfig);
+    let orderedReports = orderReportOptionsWithSearch(options.recentReports, searchInputValue, activePolicyID, orderReportOptionsConfig);
     if (typeof maxRecentReportsToShow === 'number') {
         orderedReports = orderedReports.slice(0, maxRecentReportsToShow);
     }
@@ -3073,27 +3279,43 @@ function combineOrderingOfReportsAndPersonalDetails<T extends SearchOptionData>(
     };
 }
 
+type FilterAndOrderOptionsParams<T extends SearchOptionData> = {
+    options: Options<T>;
+    searchInputValue: string;
+    countryCode: number;
+    loginList: OnyxEntry<Login>;
+    currentUserEmail: string;
+    currentUserAccountID: number;
+    personalDetails: OnyxEntry<PersonalDetailsList>;
+    config: FilterAndOrderConfig;
+    translate: LocalizedTranslate;
+    rules: OnyxCollection<Rule>;
+    activePolicyID: OnyxEntry<string>;
+};
+
 /**
  * Filters and orders the options based on the search input value.
  * Note that personal details that are part of the recent reports will always be shown as part of the recent reports (ie. DMs).
  */
-function filterAndOrderOptions<T extends SearchOptionData>(
-    options: Options<T>,
-    searchInputValue: string,
-    countryCode: number,
-    loginList: OnyxEntry<Login>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    personalDetails: OnyxEntry<PersonalDetailsList>,
-    config: FilterAndOrderConfig,
-    rules: OnyxCollection<Rule>,
-): Options<T> {
+function filterAndOrderOptions<T extends SearchOptionData>({
+    options,
+    searchInputValue,
+    countryCode,
+    loginList,
+    currentUserEmail,
+    currentUserAccountID,
+    personalDetails,
+    config,
+    translate,
+    rules,
+    activePolicyID,
+}: FilterAndOrderOptionsParams<T>): Options<T> {
     let filterResult = options;
     if (searchInputValue.trim().length > 0) {
-        filterResult = filterOptions(options, searchInputValue, countryCode, loginList, currentUserEmail, currentUserAccountID, personalDetails, config, rules);
+        filterResult = filterOptions(options, searchInputValue, countryCode, loginList, currentUserEmail, currentUserAccountID, personalDetails, config, translate, rules);
     }
 
-    const orderedOptions = combineOrderingOfReportsAndPersonalDetails(filterResult, searchInputValue, config);
+    const orderedOptions = combineOrderingOfReportsAndPersonalDetails(filterResult, searchInputValue, activePolicyID, config);
 
     // on staging server, in specific cases (see issue) BE returns duplicated personalDetails entries
     const uniqueLogins = new Set<string>();
@@ -3112,10 +3334,6 @@ function filterAndOrderOptions<T extends SearchOptionData>(
     };
 }
 
-function sortAlphabetically<T extends Partial<Record<TKey, string | undefined>>, TKey extends keyof T>(items: T[], key: TKey, localeCompare: LocaleContextProps['localeCompare']): T[] {
-    return items.sort((a, b) => localeCompare(a[key]?.toLowerCase() ?? '', b[key]?.toLowerCase() ?? ''));
-}
-
 function getEmptyOptions(): OptionsResult {
     return {
         options: {
@@ -3164,12 +3382,14 @@ function processSearchString(searchString: string | undefined): string[] {
 
 export {
     canCreateOptimisticPersonalDetailOption,
+    clearAlternateTextCache,
     clearFilteredOptionListCache,
     combineOrderingOfReportsAndPersonalDetails,
     createOptionFromReport,
     createFilteredOptionList,
     hydrateContactOption,
     createOption,
+    doesReportMatchSearchTerms,
     filterAndOrderOptions,
     filterReports,
     filterSelfDMChat,
@@ -3205,7 +3425,6 @@ export {
     recentReportComparator,
     shouldUseBoldText,
     shouldUseFullTitleForOption,
-    sortAlphabetically,
     personalDetailsComparator,
     processSearchString,
 };
diff --git a/src/libs/OptionsListUtils/searchMatchUtils.ts b/src/libs/OptionsListUtils/searchMatchUtils.ts
index ccbc947d8e03..996797e78ae0 100644
--- a/src/libs/OptionsListUtils/searchMatchUtils.ts
+++ b/src/libs/OptionsListUtils/searchMatchUtils.ts
@@ -1,4 +1,4 @@
-import {translateLocal} from '@libs/Localize';
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 
 import CONST from '@src/CONST';
 
@@ -22,8 +22,8 @@ type SearchMatchConfig = {
  * @returns Raw (not lowercased) terms: display text, login,
  * login with dots stripped before @, and translated "You"/"Me".
  */
-function getCurrentUserSearchTerms(item: PersonalDetailFilterRankFields) {
-    return [item.text ?? item.displayName ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? '', translateLocal('common.you'), translateLocal('common.me')];
+function getCurrentUserSearchTerms(item: PersonalDetailFilterRankFields, translate: LocalizedTranslate) {
+    return [item.text ?? item.displayName ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? '', translate('common.you'), translate('common.me')];
 }
 
 /**
@@ -33,9 +33,9 @@ function getCurrentUserSearchTerms(item: PersonalDetailFilterRankFields) {
  *
  * @returns Raw (not lowercased) terms the person is searchable by.
  */
-function getPersonalDetailSearchTerms(item: PersonalDetailFilterRankFields, currentUserAccountID: number) {
+function getPersonalDetailSearchTerms(item: PersonalDetailFilterRankFields, currentUserAccountID: number, translate: LocalizedTranslate) {
     if (item.accountID === currentUserAccountID) {
-        return getCurrentUserSearchTerms(item);
+        return getCurrentUserSearchTerms(item, translate);
     }
     return [item.participantsList?.[0]?.displayName ?? item.displayName ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? ''];
 }
@@ -50,9 +50,10 @@ function doesPersonalDetailMatchSearchTerm(
     item: PersonalDetailFilterRankFields,
     currentUserAccountID: number,
     searchTerm: string,
+    translate: LocalizedTranslate,
     {useLocaleLowerCase = false, transformSearchText}: SearchMatchConfig = {},
 ): boolean {
-    const terms = getPersonalDetailSearchTerms(item, currentUserAccountID).join(' ');
+    const terms = getPersonalDetailSearchTerms(item, currentUserAccountID, translate).join(' ');
     let searchText = useLocaleLowerCase ? terms.toLocaleLowerCase() : terms.toLowerCase();
 
     if (transformSearchText) {
diff --git a/src/libs/OptionsListUtils/types.ts b/src/libs/OptionsListUtils/types.ts
index 68b950dba45e..f548aab4e3b4 100644
--- a/src/libs/OptionsListUtils/types.ts
+++ b/src/libs/OptionsListUtils/types.ts
@@ -1,4 +1,4 @@
-import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleContextProvider';
 import type {Section as SelectionListSection} from '@components/SelectionList/SelectionListWithSections/types';
 
 import type {CurrencyListActionsContextType} from '@hooks/useCurrencyList';
@@ -274,6 +274,7 @@ type IsValidReportsConfig = Pick<
 type GetOptionsConfig = {
     dateFnsLocale: DateFnsLocale | undefined;
     convertToDisplayString: CurrencyListActionsContextType['convertToDisplayString'];
+    convertToDisplayStringWithoutCurrency?: CurrencyListActionsContextType['convertToDisplayStringWithoutCurrency'];
     excludeLogins?: Record<string, boolean>;
     excludeFromSuggestionsOnly?: Record<string, boolean>;
     includeCurrentUser?: boolean;
@@ -291,6 +292,11 @@ type GetOptionsConfig = {
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
     reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
     sortedActions?: Record<string, ReportAction[]>;
+    transactionThreadIDs?: Record<string, string | undefined>;
+    lastActions?: Record<string, ReportAction>;
+    currentUserLogin?: string;
+    localeCompare?: LocaleContextProps['localeCompare'];
+    formatPhoneNumber?: LocaleContextProps['formatPhoneNumber'];
     isTrackIntentUser?: boolean;
     /** TODO: Should be required field in the future. Refactor issue: https://github.com/Expensify/App/issues/66407 */
     isOffline?: boolean;
diff --git a/src/libs/Parser.ts b/src/libs/Parser.ts
index d91e00dc2739..14e4c79ad96f 100644
--- a/src/libs/Parser.ts
+++ b/src/libs/Parser.ts
@@ -5,6 +5,7 @@ import {ExpensiMark} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 
 import Log from './Log';
+import {getAccountIDToNameMap} from './PersonalDetailsStore';
 
 let reportIDToNameMap: Record<string, string> = {};
 Onyx.connect({
@@ -26,22 +27,6 @@ Onyx.connect({
     },
 });
 
-let accountIDToNameMap: Record<string, string> = {};
-Onyx.connect({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (personalDetailsList) => {
-        // Clear the map so removed personal detail don’t linger
-        accountIDToNameMap = {};
-        for (const personalDetails of Object.values(personalDetailsList ?? {})) {
-            if (!personalDetails) {
-                continue;
-            }
-
-            accountIDToNameMap[personalDetails.accountID] = personalDetails.login ?? personalDetails.displayName ?? '';
-        }
-    },
-});
-
 type Extras = {
     reportIDToName?: Record<string, string>;
     accountIDToName?: Record<string, string>;
@@ -53,7 +38,7 @@ class ExpensiMarkWithContext extends ExpensiMark {
     htmlToMarkdown(htmlString: string, extras?: Extras): string {
         return super.htmlToMarkdown(htmlString, {
             reportIDToName: extras?.reportIDToName ?? reportIDToNameMap,
-            accountIDToName: extras?.accountIDToName ?? accountIDToNameMap,
+            accountIDToName: extras?.accountIDToName ?? getAccountIDToNameMap(),
             cacheVideoAttributes: extras?.cacheVideoAttributes,
         });
     }
@@ -61,7 +46,7 @@ class ExpensiMarkWithContext extends ExpensiMark {
     htmlToText(htmlString: string, extras?: Extras): string {
         return super.htmlToText(htmlString, {
             reportIDToName: extras?.reportIDToName ?? reportIDToNameMap,
-            accountIDToName: extras?.accountIDToName ?? accountIDToNameMap,
+            accountIDToName: extras?.accountIDToName ?? getAccountIDToNameMap(),
             cacheVideoAttributes: extras?.cacheVideoAttributes,
         });
     }
diff --git a/src/libs/PaymentHistoryUtils.ts b/src/libs/PaymentHistoryUtils.ts
new file mode 100644
index 000000000000..8a7c8e4eb076
--- /dev/null
+++ b/src/libs/PaymentHistoryUtils.ts
@@ -0,0 +1,211 @@
+/**
+ * Builds the payment history table rows from the raw Onyx purchase list, folding refunds, disputes,
+ * balance transfers, and cleared payments onto the bill they modify.
+ */
+import CONST from '@src/CONST';
+import type {Purchase} from '@src/types/onyx/PurchaseList';
+
+import type {ValueOf} from 'type-fest';
+
+type PaymentHistoryState = ValueOf<typeof CONST.PAYMENT_HISTORY.STATE>;
+
+type PaymentHistoryRow = {
+    purchaseID: number;
+    created: string;
+    /** Amount in cents, always positive, in the purchase currency. */
+    amount: number;
+    currency: string;
+    showsTax: boolean;
+    state: PaymentHistoryState;
+    activeUserCount?: number;
+};
+
+const FAILED_BILLING_TYPES: ReadonlySet<string> = new Set([
+    CONST.BILLING.TYPE_FAILED,
+    CONST.BILLING.TYPE_FAILED_2018,
+    CONST.BILLING.TYPE_FAILED_SMARTSCAN,
+    CONST.BILLING.TYPE_STRIPE_FAILED_AUTHENTICATION,
+]);
+
+const TRANSFER_BILLING_TYPES: ReadonlySet<string> = new Set([
+    CONST.BILLING.TYPE_TRANSFER,
+    CONST.BILLING.TYPE_TRANSFER_TO,
+    CONST.BILLING.TYPE_TRANSFER_FAILED,
+    CONST.BILLING.TYPE_TRANSFER_OLD,
+]);
+
+/**
+ * Builds one table row per bill, newest first.
+ * Refunds, disputes, balance transfers, and cleared payments are separate purchases that point at the bill they change, so they are folded onto that bill instead of listed on their own.
+ */
+function getPaymentHistoryRows(purchaseList: Purchase[] | null | undefined): PaymentHistoryRow[] {
+    if (!purchaseList?.length) {
+        return [];
+    }
+
+    const purchaseIDs = new Set(purchaseList.map((purchase) => purchase.purchaseID));
+    const foldedState = new Map<number, {created: string; state: PaymentHistoryState}>();
+
+    for (const purchase of purchaseList) {
+        const parentPurchaseID = getParentPurchaseID(purchase);
+        if (parentPurchaseID === undefined || !purchaseIDs.has(parentPurchaseID)) {
+            continue;
+        }
+
+        const state = getModifierState(purchase);
+        if (!state) {
+            continue;
+        }
+
+        const current = foldedState.get(parentPurchaseID);
+        if (!current || purchase.created >= current.created) {
+            foldedState.set(parentPurchaseID, {created: purchase.created, state});
+        }
+    }
+
+    const rows: PaymentHistoryRow[] = [];
+    for (const purchase of purchaseList) {
+        const parentPurchaseID = getParentPurchaseID(purchase);
+        if (parentPurchaseID !== undefined && purchaseIDs.has(parentPurchaseID)) {
+            continue;
+        }
+
+        rows.push({
+            purchaseID: purchase.purchaseID,
+            created: purchase.created,
+            amount: getDisplayAmount(purchase),
+            currency: purchase.currency,
+            showsTax: !!purchase.message.salesTaxCharged && !purchase.message.salesTaxExempt,
+            state: foldedState.get(purchase.purchaseID)?.state ?? getOwnState(purchase),
+            activeUserCount: getActiveUserCount(purchase),
+        });
+    }
+
+    return rows.sort(compareNewestFirst);
+}
+
+function getParentPurchaseID(purchase: Purchase): number | undefined {
+    if (isDispute(purchase)) {
+        return purchase.message.disputePurchaseID;
+    }
+    if (isRefund(purchase)) {
+        return purchase.message.refundPurchaseID;
+    }
+    if (isBalanceTransfer(purchase)) {
+        return purchase.message.fromPurchaseID;
+    }
+    if (isClear(purchase)) {
+        return purchase.message.failedPurchaseID;
+    }
+    return undefined;
+}
+
+function getModifierState(purchase: Purchase): PaymentHistoryState | undefined {
+    if (isDispute(purchase)) {
+        return CONST.PAYMENT_HISTORY.STATE.DISPUTED;
+    }
+    if (isRefund(purchase)) {
+        return CONST.PAYMENT_HISTORY.STATE.REFUNDED;
+    }
+    if (isBalanceTransfer(purchase)) {
+        return CONST.PAYMENT_HISTORY.STATE.BALANCE_TRANSFER;
+    }
+    if (isClear(purchase)) {
+        return CONST.PAYMENT_HISTORY.STATE.CLEARED;
+    }
+    return undefined;
+}
+
+function getOwnState(purchase: Purchase): PaymentHistoryState {
+    const modifierState = getModifierState(purchase);
+    if (modifierState) {
+        return modifierState;
+    }
+    if (purchase.message.billingType && FAILED_BILLING_TYPES.has(purchase.message.billingType)) {
+        return CONST.PAYMENT_HISTORY.STATE.FAILED;
+    }
+    return CONST.PAYMENT_HISTORY.STATE.PAID;
+}
+
+function isRefund(purchase: Purchase): boolean {
+    return purchase.message.billingType === CONST.BILLING.TYPE_REFUND || purchase.message.billingType === CONST.BILLING.TYPE_CC_REFUND;
+}
+
+function isDispute(purchase: Purchase): boolean {
+    return purchase.message.billingType === CONST.BILLING.TYPE_DISPUTE;
+}
+
+function isClear(purchase: Purchase): boolean {
+    return purchase.message.billingType === CONST.BILLING.TYPE_CLEAR;
+}
+
+function isBalanceTransfer(purchase: Purchase): boolean {
+    const billingType = purchase.message.billingType;
+    return (!!billingType && TRANSFER_BILLING_TYPES.has(billingType)) || !!purchase.message.takenOverFrom || !!purchase.message.transferTo;
+}
+
+function getDisplayAmount(purchase: Purchase): number {
+    const isFailed = !!purchase.message.billingType && FAILED_BILLING_TYPES.has(purchase.message.billingType);
+    // A failed charge never moved money, so the stored amount is empty and the amount that was due lives on the message.
+    const rawAmount = isFailed && purchase.message.billableAmount ? purchase.message.billableAmount : purchase.amount;
+    return Math.abs(rawAmount);
+}
+
+function getActiveUserCount(purchase: Purchase): number | undefined {
+    if (purchase.message.totalUniqueMembersCount !== undefined) {
+        return purchase.message.totalUniqueMembersCount;
+    }
+    if (purchase.message.totalActorCount !== undefined) {
+        return purchase.message.totalActorCount;
+    }
+
+    const emails = new Set<string>();
+    for (const policy of Object.values(purchase.message.billablePolicies ?? {})) {
+        for (const email of policy.actorList?.split(',') ?? []) {
+            const trimmed = email.trim();
+            if (trimmed) {
+                emails.add(trimmed);
+            }
+        }
+    }
+    return emails.size > 0 ? emails.size : undefined;
+}
+
+function compareNewestFirst(left: PaymentHistoryRow, right: PaymentHistoryRow): number {
+    if (left.created === right.created) {
+        return right.purchaseID - left.purchaseID;
+    }
+    return left.created < right.created ? 1 : -1;
+}
+
+function getStateTranslationKey(state: PaymentHistoryState) {
+    switch (state) {
+        case CONST.PAYMENT_HISTORY.STATE.CLEARED:
+            return 'subscription.paymentHistory.state.cleared';
+        case CONST.PAYMENT_HISTORY.STATE.FAILED:
+            return 'subscription.paymentHistory.state.failed';
+        case CONST.PAYMENT_HISTORY.STATE.REFUNDED:
+            return 'subscription.paymentHistory.state.refunded';
+        case CONST.PAYMENT_HISTORY.STATE.DISPUTED:
+            return 'subscription.paymentHistory.state.disputed';
+        case CONST.PAYMENT_HISTORY.STATE.BALANCE_TRANSFER:
+            return 'subscription.paymentHistory.state.balanceTransfer';
+        default:
+            return 'subscription.paymentHistory.state.paid';
+    }
+}
+
+function getBadgeAppearance(state: PaymentHistoryState): {success: boolean; error: boolean} {
+    switch (state) {
+        case CONST.PAYMENT_HISTORY.STATE.PAID:
+            return {success: true, error: false};
+        case CONST.PAYMENT_HISTORY.STATE.FAILED:
+        case CONST.PAYMENT_HISTORY.STATE.DISPUTED:
+            return {success: false, error: true};
+        default:
+            return {success: false, error: false};
+    }
+}
+
+export {getBadgeAppearance, getPaymentHistoryRows, getStateTranslationKey};
+export type {PaymentHistoryRow};
diff --git a/src/libs/PersonalDetailsStore.ts b/src/libs/PersonalDetailsStore.ts
index ae0896e89190..2ce9f54766fe 100644
--- a/src/libs/PersonalDetailsStore.ts
+++ b/src/libs/PersonalDetailsStore.ts
@@ -6,6 +6,8 @@ import Onyx from 'react-native-onyx';
 
 let allPersonalDetails: PersonalDetailsList = {};
 let loginToPersonalDetails: Record<string, PersonalDetails> = {};
+let accountIDToName: Record<string, string> = {};
+let allLogins: string[] = [];
 
 function buildLoginMapping(personalDetailsList: PersonalDetailsList): Record<string, PersonalDetails> {
     const mapping: Record<string, PersonalDetails> = {};
@@ -28,6 +30,13 @@ Onyx.connectWithoutView({
     callback: (value) => {
         allPersonalDetails = value ?? {};
         loginToPersonalDetails = buildLoginMapping(allPersonalDetails);
+        accountIDToName = {};
+        for (const personalDetail of Object.values(allPersonalDetails)) {
+            if (personalDetail) {
+                accountIDToName[personalDetail.accountID] = personalDetail.login ?? personalDetail.displayName ?? '';
+            }
+        }
+        allLogins = Object.values(allPersonalDetails).map((personalDetail) => personalDetail?.login ?? '');
     },
 });
 
@@ -46,4 +55,14 @@ function getPersonalDetailByLogin(login: string | undefined): PersonalDetails |
     return loginToPersonalDetails[login.toLowerCase()];
 }
 
-export {getAllPersonalDetails, getPersonalDetail, getPersonalDetailByLogin};
+// Login, falling back to display name, per accountID, in the shape ExpensiMark expects for mentions
+function getAccountIDToNameMap(): Record<string, string> {
+    return accountIDToName;
+}
+
+// Every known login, in the shape `addDomainToShortMention` expects
+function getAllPersonalDetailLogins(): string[] {
+    return allLogins;
+}
+
+export {getAllPersonalDetails, getPersonalDetail, getPersonalDetailByLogin, getAccountIDToNameMap, getAllPersonalDetailLogins};
diff --git a/src/libs/PolicyDistanceRatesUtils.ts b/src/libs/PolicyDistanceRatesUtils.ts
index 7908e509ffa8..f5526617efce 100644
--- a/src/libs/PolicyDistanceRatesUtils.ts
+++ b/src/libs/PolicyDistanceRatesUtils.ts
@@ -17,24 +17,87 @@ import {getMicroSecondOnyxErrorWithTranslationKey} from './ErrorUtils';
 import getPermittedDecimalSeparator from './getPermittedDecimalSeparator';
 import {replaceAllDigits} from './MoneyRequestUtils';
 import {parseFloatAnyLocale} from './NumberUtils';
+import StringUtils from './StringUtils';
 import {isRequiredFulfilled} from './ValidationUtils';
 
 type RateValueForm = typeof ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM | typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_EDIT_FORM;
 
 type TaxReclaimableForm = typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM;
 
-function validateRateValue(values: FormOnyxValues<RateValueForm>, toLocaleDigit: (arg: string) => string, translate: LocalizedTranslate): FormInputErrors<RateValueForm> {
-    const errors: FormInputErrors<RateValueForm> = {};
-    const parsedRate = replaceAllDigits(values.rate, toLocaleDigit);
-    const decimalSeparator = toLocaleDigit('.');
+/** The reason a proposed distance rate name is invalid. Callers translate it via `getDistanceRateNameErrorMessage`. */
+type DistanceRateNameError = typeof CONST.INPUT_VALIDATION_ERRORS.REQUIRED | typeof CONST.INPUT_VALIDATION_ERRORS.EXISTING | typeof CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+
+/** The reason a proposed distance rate amount is invalid. Shared by the RHP edit form and inline table editing. */
+type DistanceRateValueError = typeof CONST.INPUT_VALIDATION_ERRORS.INVALID | typeof CONST.INPUT_VALIDATION_ERRORS.TOO_LOW;
+
+/**
+ * Validates a distance rate name against every rule (required, unique, length). This is the single
+ * source of truth shared by the create form, the RHP edit form, and inline table editing. Pass
+ * `currentName` when editing so renaming a rate to its own name isn't flagged as a duplicate.
+ * Returns an error code, or undefined when the name is valid.
+ */
+function getDistanceRateNameError(existingRateNames: readonly string[], newName: string, currentName?: string): DistanceRateNameError | undefined {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (StringUtils.isEmptyString(sanitized)) {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    if (sanitized !== currentName && existingRateNames.includes(sanitized)) {
+        return CONST.INPUT_VALIDATION_ERRORS.EXISTING;
+    }
+
+    // Spread to count Unicode code points rather than UTF-16 code units.
+    if ([...sanitized].length > CONST.TAX_RATES.NAME_MAX_LENGTH) {
+        return CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+    }
+
+    return undefined;
+}
+
+/** Translates a {@link DistanceRateNameError} into a user-facing message for the given name. */
+function getDistanceRateNameErrorMessage(translate: LocalizedTranslate, error: DistanceRateNameError, name: string): string {
+    switch (error) {
+        case CONST.INPUT_VALIDATION_ERRORS.REQUIRED:
+            return translate('workspace.distanceRates.errors.nameRequired');
+        case CONST.INPUT_VALIDATION_ERRORS.EXISTING:
+            return translate('workspace.distanceRates.errors.existingRateName');
+        case CONST.INPUT_VALIDATION_ERRORS.TOO_LONG:
+        default:
+            return translate('common.error.characterLimitExceedCounter', [...StringUtils.sanitizeName(name)].length, CONST.TAX_RATES.NAME_MAX_LENGTH);
+    }
+}
 
+/**
+ * Validates a distance rate amount against the same rules as the RHP edit form (format and > 0).
+ * Returns an error code, or undefined when the value is valid.
+ */
+function getDistanceRateValueError(rate: string, toLocaleDigit: (arg: string) => string): DistanceRateValueError | undefined {
+    const parsedRate = replaceAllDigits(rate, toLocaleDigit);
+    const decimalSeparator = toLocaleDigit('.');
     // Allow one more decimal place for accuracy
     const rateValueRegex = RegExp(String.raw`^-?\d{0,${CONST.IOU.AMOUNT_MAX_LENGTH}}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{0,${CONST.MAX_TAX_RATE_DECIMAL_PLACES}})?$`, 'i');
+
     if (!rateValueRegex.test(parsedRate) || parsedRate === '') {
+        return CONST.INPUT_VALIDATION_ERRORS.INVALID;
+    }
+    if (parseFloatAnyLocale(parsedRate) <= 0) {
+        return CONST.INPUT_VALIDATION_ERRORS.TOO_LOW;
+    }
+
+    return undefined;
+}
+
+function validateRateValue(values: FormOnyxValues<RateValueForm>, toLocaleDigit: (arg: string) => string, translate: LocalizedTranslate): FormInputErrors<RateValueForm> {
+    const errors: FormInputErrors<RateValueForm> = {};
+    const error = getDistanceRateValueError(values.rate, toLocaleDigit);
+
+    if (error === CONST.INPUT_VALIDATION_ERRORS.INVALID) {
         errors.rate = translate('common.error.invalidRateError');
-    } else if (parseFloatAnyLocale(parsedRate) <= 0) {
+    } else if (error === CONST.INPUT_VALIDATION_ERRORS.TOO_LOW) {
         errors.rate = translate('common.error.lowRateError');
     }
+
     return errors;
 }
 
@@ -54,14 +117,10 @@ function validateCreateDistanceRateForm(
     existingRateNames: string[],
 ): FormInputErrors<typeof ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM> {
     const errors: FormInputErrors<typeof ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM> = {};
-    const trimmedName = values.name?.trim() ?? '';
-
-    if (!isRequiredFulfilled(trimmedName)) {
-        errors.name = translate('workspace.distanceRates.errors.nameRequired');
-    } else if ([...trimmedName].length > CONST.TAX_RATES.NAME_MAX_LENGTH) {
-        errors.name = translate('common.error.characterLimitExceedCounter', [...trimmedName].length, CONST.TAX_RATES.NAME_MAX_LENGTH);
-    } else if (existingRateNames.includes(trimmedName)) {
-        errors.name = translate('workspace.distanceRates.errors.existingRateName');
+    const nameError = getDistanceRateNameError(existingRateNames, values.name ?? '');
+
+    if (nameError) {
+        errors.name = getDistanceRateNameErrorMessage(translate, nameError, values.name ?? '');
     }
 
     if (!isRequiredFulfilled(values.rate)) {
@@ -308,4 +367,7 @@ export {
     isMapOrGPSRequired,
     getDistanceExpenseTypeForPolicy,
     isGovernmentRateUnmodified,
+    getDistanceRateNameError,
+    getDistanceRateNameErrorMessage,
+    getDistanceRateValueError,
 };
diff --git a/src/libs/PolicyMemberRoleUtils.ts b/src/libs/PolicyMemberRoleUtils.ts
new file mode 100644
index 000000000000..7f72d62840cd
--- /dev/null
+++ b/src/libs/PolicyMemberRoleUtils.ts
@@ -0,0 +1,25 @@
+/**
+ * Authorized Payer role restrictions for workspace members.
+ * Shared by the member details pages and inline role editing so both offer the same roles.
+ */
+import type CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import {getReimburserEmail, PAYER_ROLES} from './PolicyUtils';
+
+function isPolicyReimburser(policy: OnyxEntry<Policy>, memberLogin: string | undefined): boolean {
+    const reimburserEmail = getReimburserEmail(policy);
+    return !!reimburserEmail && reimburserEmail === memberLogin;
+}
+
+/**
+ * Roles the member may be assigned. Restricted to payer roles when they are the Authorized Payer, otherwise undefined so the full assignable list is used.
+ */
+function getAllowedRolesForMember(policy: OnyxEntry<Policy>, memberLogin: string | undefined): Array<ValueOf<typeof CONST.POLICY.ROLE>> | undefined {
+    return isPolicyReimburser(policy, memberLogin) ? [...PAYER_ROLES] : undefined;
+}
+
+export {getAllowedRolesForMember, isPolicyReimburser};
diff --git a/src/libs/PolicyPerDiemUtils.ts b/src/libs/PolicyPerDiemUtils.ts
new file mode 100644
index 000000000000..c9a3f379505a
--- /dev/null
+++ b/src/libs/PolicyPerDiemUtils.ts
@@ -0,0 +1,76 @@
+/**
+ * Validation and sanitization for workspace per diem destination, subrate, and amount fields.
+ * Shared by the RHP edit forms and inline table editing so both surfaces reject the same values.
+ */
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+
+import CONST from '@src/CONST';
+
+import {convertToBackendAmount} from './CurrencyUtils';
+import StringUtils from './StringUtils';
+
+/** The reason a proposed per diem destination or subrate name is invalid. */
+type PerDiemNameError = typeof CONST.INPUT_VALIDATION_ERRORS.REQUIRED | typeof CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+
+/** The reason a proposed per diem amount is invalid. Shared by the RHP edit form and inline table editing. */
+type PerDiemAmountError = typeof CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+
+/**
+ * Validates a per diem destination or subrate name against the same rules as the RHP edit forms
+ * (required and max length). Returns an error code, or undefined when the name is valid.
+ */
+function getPerDiemNameError(newName: string): PerDiemNameError | undefined {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (StringUtils.isEmptyString(sanitized)) {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    // Spread to count Unicode code points rather than UTF-16 code units.
+    if ([...sanitized].length > CONST.MAX_LENGTH_256) {
+        return CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+    }
+
+    return undefined;
+}
+
+/** Translates a {@link PerDiemNameError} into a user-facing message for the given name. */
+function getPerDiemNameErrorMessage(translate: LocaleContextProps['translate'], error: PerDiemNameError, name: string): string {
+    switch (error) {
+        case CONST.INPUT_VALIDATION_ERRORS.REQUIRED:
+            return translate('common.error.fieldRequired');
+        case CONST.INPUT_VALIDATION_ERRORS.TOO_LONG:
+        default:
+            return translate('common.error.characterLimitExceedCounter', [...StringUtils.sanitizeName(name)].length, CONST.MAX_LENGTH_256);
+    }
+}
+
+/**
+ * Validates a per diem amount against the same rules as the RHP edit form (required, not zero,
+ * and not a lone minus sign). Negatives are allowed. Returns an error code, or undefined when
+ * the amount is valid.
+ */
+function getPerDiemAmountError(amount: string): PerDiemAmountError | undefined {
+    const trimmed = amount.trim();
+    if (!trimmed || trimmed === '-') {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    const numeric = Number(trimmed);
+    if (Number.isNaN(numeric) || convertToBackendAmount(numeric) === 0) {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    return undefined;
+}
+
+/** Translates a {@link PerDiemAmountError} into a user-facing message. */
+function getPerDiemAmountErrorMessage(translate: LocaleContextProps['translate'], error: PerDiemAmountError): string {
+    switch (error) {
+        case CONST.INPUT_VALIDATION_ERRORS.REQUIRED:
+        default:
+            return translate('common.error.fieldRequired');
+    }
+}
+
+export {getPerDiemNameError, getPerDiemNameErrorMessage, getPerDiemAmountError, getPerDiemAmountErrorMessage};
diff --git a/src/libs/PolicyRulesUtils.ts b/src/libs/PolicyRulesUtils.ts
index 448af64a2b29..440ea0dbdffe 100644
--- a/src/libs/PolicyRulesUtils.ts
+++ b/src/libs/PolicyRulesUtils.ts
@@ -1,63 +1,5 @@
 import CONST from '@src/CONST';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
-import type SuggestedAgentRule from '@src/types/onyx/SuggestedAgentRule';
-
-import StringUtils from './StringUtils';
-
-type SuggestedAgentRuleIcon = 'ThumbsUp' | 'CircleSlash' | 'Flag' | 'Coins';
-
-type SuggestedAgentRuleIconRule = {
-    /** Icon to show when any keyword matches */
-    icon: Exclude<SuggestedAgentRuleIcon, 'ThumbsUp'>;
-
-    /** Higher priority wins when multiple rules match the same suggestion. */
-    priority: number;
-
-    /** Keywords matched against suggestion id + title */
-    keywords: readonly string[];
-};
-
-/** Fallback when no keyword rule matches */
-const DEFAULT_SUGGESTED_AGENT_RULE_ICON: SuggestedAgentRuleIcon = 'ThumbsUp';
-
-/**
- * Backend suggestions are {id, title, prompt} only. Icons are derived from id + title.
- * Keywords are matched as whole tokens so substrings like "age"/"cap" do not match "manage"/"capital".
- */
-
-const SUGGESTED_AGENT_RULE_ICON_RULES = [
-    {
-        icon: 'Flag',
-        priority: 1,
-        keywords: ['flag', 'flagged', 'mismatch', 'empty', 'mixed', 'age', 'weekend', 'suspected', 'unusually', 'within', 'window', 'deadline'],
-    },
-    {
-        icon: 'Coins',
-        priority: 2,
-        keywords: ['amount', 'total', 'cap', 'tip', 'currency', 'limit'],
-    },
-    {
-        icon: 'CircleSlash',
-        priority: 3,
-        keywords: ['block', 'banned', 'blocked', 'alcohol', 'gift-card', 'personal', 'ai-generated', 'handwritten', 'incorrect-receipt'],
-    },
-] as const satisfies readonly SuggestedAgentRuleIconRule[];
-
-/**
- * Per-id overrides, checked before the keyword rules above. A title can be reworded for
- * copy reasons and pick up a higher-priority keyword that doesn't describe the rule (for
- * example a "mismatch" rule whose new title happens to contain "total"), which would flip
- * its icon. Add an id here when that happens instead of tuning the shared keyword lists.
- */
-/* eslint-disable @typescript-eslint/naming-convention -- keys are external kebab-case rule ids from Web-Expensify's InProductSuggestedRules. */
-const SUGGESTED_AGENT_RULE_ICON_OVERRIDES: Readonly<Record<string, Exclude<SuggestedAgentRuleIcon, 'ThumbsUp'>>> = {
-    'number-of-expenses': 'Flag',
-    'receipt-transaction-mismatch': 'Flag',
-    'itemized-split-recommended': 'Flag',
-};
-/* eslint-enable @typescript-eslint/naming-convention */
-
-const SUGGESTED_AGENT_RULE_ICON_NAMES = [DEFAULT_SUGGESTED_AGENT_RULE_ICON, ...SUGGESTED_AGENT_RULE_ICON_RULES.map((rule) => rule.icon)] as const;
 
 function isPendingDeleteOrUpdate(pendingAction: PendingAction | undefined): boolean {
     return pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
@@ -67,33 +9,4 @@ function getMccGroupDisplayName(groupID: string): string {
     return groupID.charAt(0).toUpperCase() + groupID.slice(1);
 }
 
-/**
- * Returns true when keyword appears as a whole token in text.
- */
-function textIncludesKeywordToken(text: string, keyword: string): boolean {
-    return new RegExp(`(?:^|[^a-z0-9])${StringUtils.escapeRegExp(keyword)}(?:$|[^a-z0-9])`).test(text);
-}
-
-function getSuggestedAgentRuleIcon(suggestion: SuggestedAgentRule): SuggestedAgentRuleIcon {
-    const override = SUGGESTED_AGENT_RULE_ICON_OVERRIDES[suggestion.id];
-    if (override) {
-        return override;
-    }
-
-    const text = `${suggestion.id} ${suggestion.title}`.toLowerCase();
-    let bestMatchingRule: SuggestedAgentRuleIconRule | undefined;
-
-    for (const rule of SUGGESTED_AGENT_RULE_ICON_RULES) {
-        const hasKeywordMatch = rule.keywords.some((keyword) => textIncludesKeywordToken(text, keyword));
-        if (!hasKeywordMatch) {
-            continue;
-        }
-        if (!bestMatchingRule || rule.priority > bestMatchingRule.priority) {
-            bestMatchingRule = rule;
-        }
-    }
-
-    return bestMatchingRule?.icon ?? DEFAULT_SUGGESTED_AGENT_RULE_ICON;
-}
-
-export {getMccGroupDisplayName, getSuggestedAgentRuleIcon, isPendingDeleteOrUpdate, SUGGESTED_AGENT_RULE_ICON_NAMES};
+export {getMccGroupDisplayName, isPendingDeleteOrUpdate};
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils/index.ts
similarity index 84%
rename from src/libs/PolicyUtils.ts
rename to src/libs/PolicyUtils/index.ts
index 3f19a8e29424..4eb60739b272 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils/index.ts
@@ -2,25 +2,31 @@ import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleCon
 import type {PersonalDetailsByLogin} from '@components/PersonalDetailsByLoginProvider';
 import type {SelectorType} from '@components/SelectionScreen';
 
+import {getQuickbooksOnlineIntegrationName, isQBORefreshTokenExpiringSoon} from '@libs/AccountingUtils';
+import {getBankAccountFromID} from '@libs/actions/BankAccounts';
+import {hasSynchronizationErrorMessage, isConnectionUnverified} from '@libs/actions/connections';
+import {shouldShowQBOReimbursableExportDestinationAccountError} from '@libs/actions/connections/QuickbooksOnline';
+import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import {getApiRoot} from '@libs/ApiUtils';
+import {getCategoryApproverRule, hasAnyCategoryRules} from '@libs/CategoryUtils';
+import {convertToBackendAmount} from '@libs/CurrencyUtils';
+import isTeachersUnitePolicyID from '@libs/isTeachersUnitePolicyID';
+import {getHRAdvancedModeFinalApprover, isAnyHRConnected, isMergeHRCompleteSetupNeeded, shouldShowHRConnectionError} from '@libs/merge/HRUtils';
+import {isAnyRecruitingConnected} from '@libs/merge/RecruitingUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getIsOffline} from '@libs/NetworkState';
+import {getAccountIDsByLogins, getKnownAccountIDByLogin, getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
+import {isApprovalWorkflowRule, isRuleFilterComparison} from '@libs/RuleUtils';
+import {getAllSortedTransactions, getCategory, getTag} from '@libs/TransactionUtils';
+import {generateAccountID} from '@libs/UserUtils';
+import {isPublicDomain, isValidAccountRoute} from '@libs/ValidationUtils';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
 import type {PolicyType} from '@src/types/form/WorkspaceConfirmationForm';
-import type {
-    OnyxInputOrEntry,
-    PersonalDetailsList,
-    Policy,
-    PolicyCategories,
-    PolicyEmployeeList,
-    PolicyTagLists,
-    PolicyTags,
-    Report,
-    TaxRate,
-    Transaction,
-    TravelSettings,
-} from '@src/types/onyx';
-import type {ApprovalWorkflowFilter, ApprovalWorkflowFilterComparison, ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
+import type {OnyxInputOrEntry, PersonalDetailsList, Policy, PolicyCategories, PolicyEmployeeList, Report, TaxRate, Transaction, TravelSettings} from '@src/types/onyx';
+import type {ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
 import type {ErrorFields, PendingAction, PendingFields} from '@src/types/onyx/OnyxCommon';
 import type {
     Account,
@@ -29,10 +35,7 @@ import type {
     ConnectionName,
     Connections,
     CustomUnit,
-    NetSuiteAccount,
     NetSuiteConnection,
-    NetSuiteCustomList,
-    NetSuiteCustomSegment,
     PolicyConnectionSyncProgress,
     PolicyFeatureName,
     Rate,
@@ -42,6 +45,7 @@ import type {
 } from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
 import type Rule from '@src/types/onyx/Rule';
+import type {RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
 import type {TransactionCommentVendor} from '@src/types/onyx/Transaction';
 import type {WorkspaceTravelSettings} from '@src/types/onyx/TravelSettings';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -51,24 +55,6 @@ import type {TupleToUnion, ValueOf} from 'type-fest';
 
 import {Str} from 'expensify-common';
 
-import {getQuickbooksOnlineIntegrationName} from './AccountingUtils';
-import {getBankAccountFromID} from './actions/BankAccounts';
-import {hasSynchronizationErrorMessage, isConnectionUnverified} from './actions/connections';
-import {shouldShowQBOReimbursableExportDestinationAccountError} from './actions/connections/QuickbooksOnline';
-import addEncryptedAuthTokenToURL from './addEncryptedAuthTokenToURL';
-import {getApiRoot} from './ApiUtils';
-import {getCategoryApproverRule, hasAnyCategoryRules} from './CategoryUtils';
-import {convertToBackendAmount} from './CurrencyUtils';
-import isTeachersUnitePolicyID from './isTeachersUnitePolicyID';
-import {getHRAdvancedModeFinalApprover, isAnyHRConnected, isMergeHRCompleteSetupNeeded, shouldShowHRConnectionError} from './merge/HRUtils';
-import {isAnyRecruitingConnected} from './merge/RecruitingUtils';
-import Navigation from './Navigation/Navigation';
-import {getIsOffline} from './NetworkState';
-import {getAccountIDsByLogins, getKnownAccountIDByLogin, getPersonalDetailByEmail} from './PersonalDetailsUtils';
-import {getAllSortedTransactions, getCategory, getTag, getTagArrayFromName} from './TransactionUtils';
-import {generateAccountID} from './UserUtils';
-import {isPublicDomain, isValidAccountRoute} from './ValidationUtils';
-
 type MemberEmailsToAccountIDs = Record<string, number>;
 
 type PolicyWithTaxRates = {
@@ -179,10 +165,49 @@ function getActivePoliciesWithExpenseChatAndTimeEnabled(policies: OnyxCollection
 
 /**
  * Checks if the current user is an admin of the policy.
+ *
+ * By default this answers "is the *viewing* user an admin?", because `getPolicyRole` short-circuits on the global
+ * `policy.role`. When `login` belongs to somebody other than the current user you must pass
+ * `shouldCheckGlobalPolicyRole = false`, otherwise the `login` argument is silently ignored.
  */
 const isPolicyAdmin = (policy: OnyxInputOrEntry<Policy>, login?: string, shouldCheckGlobalPolicyRole = true): boolean =>
     getPolicyRole(policy, login, shouldCheckGlobalPolicyRole) === CONST.POLICY.ROLE.ADMIN;
 
+/**
+ * Checks if the given account is the owner (creator) of the policy.
+ *
+ * The account is whoever you pass in, not necessarily the current user — callers resolving another member's role rely
+ * on that.
+ */
+const isPolicyOwner = (policy: OnyxInputOrEntry<Pick<Policy, 'ownerAccountID'>>, accountID: number | undefined): boolean => !!accountID && policy?.ownerAccountID === accountID;
+
+/**
+ * Whether a room member's own policy role protects them from being removed from a policy expense chat.
+ *
+ * Only a member who was invited to the chat can be removed from it. Everybody else is there by virtue of the
+ * workspace configuration, so their membership is governed by that configuration and not by this screen — see the
+ * expense chat rules in `contributingGuides/philosophies/SECURITY.md`. That covers admins, the policy owner and
+ * approvers, who are auto-added to the chats of everybody who submits to them.
+ *
+ * Fails closed on a missing `login`: without one we cannot resolve the member's role, and offering removal for a
+ * member whose role is unknown could remove a workspace admin. Both the member list and the member details page must
+ * agree on this, so it lives here rather than being spelled out at each call site.
+ *
+ * The policy owner is checked by `accountID` rather than by role. `ownerAccountID` is a required top-level field, so
+ * unlike `employeeList` it resolves even when the employee roster has not loaded, and the owner is only protected
+ * incidentally by `role: admin` otherwise. Note the callers' `report.ownerAccountID` is the *report* owner — the
+ * employee whose expense chat it is — which is a different person from the policy owner.
+ *
+ * The approver check is policy-wide rather than walking this submitter's own approval chain, so an approver for a
+ * different submitter who was invited into this chat is protected too. That errs toward un-removable, which is the
+ * safe direction here.
+ *
+ * `accountID` is deliberately a required position rather than optional: omitting it silently drops the owner
+ * protection, so every caller must state it even when it is `undefined`.
+ */
+const isRoomMemberProtectedByPolicyRole = (policy: OnyxInputOrEntry<Policy>, login: string | undefined, accountID: number | undefined): boolean =>
+    isPolicyOwner(policy, accountID) || !login || isPolicyAdmin(policy, login, false) || isPolicyApprover(policy, login);
+
 const WRITE_ALL_POLICY_FEATURES = Object.fromEntries(Object.values(CONST.POLICY.POLICY_FEATURE).map((feature) => [feature, CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE])) as Record<
     PolicyFeature,
     PolicyFeatureAccess
@@ -320,11 +345,10 @@ function hasPolicyCategoriesError(policyCategories: OnyxEntry<PolicyCategories>)
 /**
  * Check if the policy has any errors within the rules.
  */
-function hasPolicyRulesError(policy: OnyxEntry<Policy>): boolean {
-    const codingRules = Object.values(policy?.rules?.codingRules ?? {});
+function hasPolicyRulesError(policy: OnyxEntry<Policy>, hasMerchantRuleErrors: boolean): boolean {
     const agentRules = Object.values(policy?.rules?.agentRules ?? {});
 
-    return codingRules.some((rule) => rule && Object.keys(rule.errors ?? {}).length > 0) || agentRules.some((rule) => rule && Object.keys(rule.errors ?? {}).length > 0);
+    return hasMerchantRuleErrors || agentRules.some((rule) => rule && Object.keys(rule.errors ?? {}).length > 0);
 }
 
 /**
@@ -642,6 +666,11 @@ function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>, isConnecti
  */
 const isMergeHRCompleteSetupNeededSelector = (policy: OnyxEntry<Policy>) => isMergeHRCompleteSetupNeeded(policy);
 
+/**
+ * Returns whether an admin should be warned that the workspace's QuickBooks Online connection is about to expire.
+ */
+const isQBORefreshTokenExpiringSoonSelector = (policy: OnyxEntry<Policy>) => isPolicyAdmin(policy) && isQBORefreshTokenExpiringSoon(policy);
+
 function getPolicyRole(policy: OnyxInputOrEntry<Policy>, currentUserLogin?: string, shouldCheckGlobalPolicyRole = true): string | undefined {
     if (shouldCheckGlobalPolicyRole && policy?.role) {
         return policy.role;
@@ -651,7 +680,13 @@ function getPolicyRole(policy: OnyxInputOrEntry<Policy>, currentUserLogin?: stri
         return;
     }
 
-    return policy?.employeeList?.[currentUserLogin]?.role;
+    // `employeeList` is keyed by the canonical lowercase login, but a login read off personal details is not
+    // guaranteed to be lowercase, so fall back to a normalized lookup when the exact key misses. Both lookups are
+    // O(1), unlike a case-insensitive scan of every employee, which would run per participant on member lists.
+    // Pick the employee entry first and read `role` off whichever matched: `role` is optional, so falling back on the
+    // role itself would resolve one account's role from a different account's entry when the exact entry has no role.
+    const employeeList = policy?.employeeList;
+    return (employeeList?.[currentUserLogin] ?? employeeList?.[currentUserLogin.toLowerCase()])?.role;
 }
 
 /**
@@ -682,6 +717,10 @@ function isPolicyMember(policy: OnyxEntry<Policy>, userLogin: string | undefined
     return !!policy && !!userLogin && (!!policy.employeeList?.[userLogin] || policy.owner === userLogin);
 }
 
+function isMemberInHomeAndOfficeWorkspace(policy: OnyxEntry<Policy>, memberLogin: string): boolean {
+    return !!memberLogin && policy?.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE && !!policy.employeeList?.[memberLogin];
+}
+
 function isPolicyMemberWithoutPendingDelete(currentUserLogin: string | undefined, policy: OnyxEntry<Policy>): boolean {
     if (!currentUserLogin || !policy?.id) {
         return false;
@@ -768,7 +807,7 @@ function isPolicyPayer(policy: OnyxEntry<Policy>, currentUserLogin: string | und
 }
 
 /** Check if the passed employee is an approver in the policy's employeeList */
-function isPolicyApprover(policy: OnyxEntry<Policy>, employeeLogin: string) {
+function isPolicyApprover(policy: OnyxInputOrEntry<Policy>, employeeLogin: string) {
     if (policy?.approver === employeeLogin) {
         return true;
     }
@@ -874,12 +913,6 @@ const isPolicyEmployee = (policyID: string | undefined, policy: OnyxEntry<Policy
     return !!policyID && policyID === policy?.id;
 };
 
-/**
- * Checks if the current user is an owner (creator) of the policy.
- */
-const isPolicyOwner = (policy: OnyxInputOrEntry<Pick<Policy, 'ownerAccountID'>>, currentUserAccountID: number | undefined): boolean =>
-    !!currentUserAccountID && policy?.ownerAccountID === currentUserAccountID;
-
 /**
  * Create an object mapping member emails to their accountIDs. Filter for members without errors if includeMemberWithErrors is false, and get the login email from the personalDetail object using the accountID.
  *
@@ -1120,145 +1153,6 @@ function filterGuideAndAccountManager<T extends {login?: string | null; alternat
     });
 }
 
-function getSortedTagKeys(policyTagList: OnyxEntry<PolicyTagLists>): Array<keyof PolicyTagLists> {
-    if (isEmptyObject(policyTagList)) {
-        return [];
-    }
-
-    return Object.keys(policyTagList).sort((key1, key2) => policyTagList[key1].orderWeight - policyTagList[key2].orderWeight);
-}
-
-/**
- * Gets a tag name of policy tags based on a tag's orderWeight.
- */
-function getTagListName(policyTagList: OnyxEntry<PolicyTagLists>, orderWeight: number): string {
-    if (isEmptyObject(policyTagList)) {
-        return '';
-    }
-
-    return Object.values(policyTagList).find((tag) => tag.orderWeight === orderWeight)?.name ?? '';
-}
-
-/**
- * Gets all tag lists of a policy
- */
-function getTagLists(policyTagList: OnyxEntry<PolicyTagLists>): Array<ValueOf<PolicyTagLists>> {
-    if (isEmptyObject(policyTagList)) {
-        return [];
-    }
-
-    return Object.values(policyTagList)
-        .filter((policyTagListValue) => policyTagListValue !== null)
-        .sort((tagA, tagB) => tagA.orderWeight - tagB.orderWeight);
-}
-
-/**
- * Checks if a policy has any tags
- */
-function hasTags(policyTagList: OnyxEntry<PolicyTagLists>): boolean {
-    const tagLists = getTagLists(policyTagList);
-    return tagLists.some((tagList) => Object.keys(tagList.tags ?? {}).length > 0);
-}
-
-// An anchored filter with no regex operators. Letter and digit escapes (\d, \w, ...) are classes, not literals.
-const LITERAL_PARENT_TAGS_FILTER = /^\^((?:\\[^A-Za-z0-9]|[^\\.*+?()[\]{}|^$])*)\$$/;
-const ESCAPED_CHARACTER = /\\([\s\S])/g;
-
-/**
- * Whether a parentTagsFilter matches a parent tag path.
- * Filters are almost always an anchored, escaped parent path, which is compared as a string -
- * compiling a RegExp per tag dominates scans over large tag lists.
- */
-function matchesParentTagsFilter(filter: string | undefined, parentTagPath: string): boolean {
-    if (!filter) {
-        return true;
-    }
-
-    const literal = LITERAL_PARENT_TAGS_FILTER.exec(filter)?.[1];
-
-    if (literal !== undefined) {
-        return literal.replaceAll(ESCAPED_CHARACTER, '$1') === parentTagPath;
-    }
-
-    return new RegExp(filter).test(parentTagPath);
-}
-
-/**
- * Checks whether a policy tag is selectable under a given parent tag path.
- * Tags of a dependent list only apply below the parents their parentTagsFilter matches,
- * while tags without a filter apply everywhere.
- */
-function matchesParentTagPath(policyTag: ValueOf<PolicyTags>, parentTagPath: string): boolean {
-    return matchesParentTagsFilter(policyTag.rules?.parentTagsFilter ?? policyTag.parentTagsFilter, parentTagPath);
-}
-
-/**
- * Finds the policy tag at a single tag list level that matches a tag name.
- * Dependent tag lists can hold same-named child tags under different parents (stored under unique
- * record keys), so a tag only matches by name when its parent filter also matches the parent tag path.
- */
-function findPolicyTagAtLevel(levelTags: PolicyTags, tagName: string, parentTagPath: string): ValueOf<PolicyTags> | undefined {
-    const matchesTagAtLevel = (levelTag: ValueOf<PolicyTags> | undefined): levelTag is ValueOf<PolicyTags> => {
-        if (!levelTag || levelTag.name !== tagName) {
-            return false;
-        }
-        return matchesParentTagPath(levelTag, parentTagPath);
-    };
-
-    const directMatch = levelTags[tagName];
-    return matchesTagAtLevel(directMatch) ? directMatch : Object.values(levelTags).find(matchesTagAtLevel);
-}
-
-/**
- * Finds a policy tag record and its Onyx storage key within a tag list.
- * Dependent tag lists can hold same-named child tags under different parents (stored under unique
- * record keys), so a tag only matches by name when its parent filter also matches.
- */
-function findPolicyTagEntryByParentFilter(tags: PolicyTags | undefined, tagName: string, parentTagsFilter?: string): {tag: ValueOf<PolicyTags>; tagKey: string} | undefined {
-    if (!tags) {
-        return undefined;
-    }
-
-    if (parentTagsFilter) {
-        const match = Object.entries(tags).find(([, tag]) => tag.name === tagName && (tag.rules?.parentTagsFilter ?? tag.parentTagsFilter) === parentTagsFilter);
-        if (match) {
-            return {tag: match[1], tagKey: match[0]};
-        }
-        return undefined;
-    }
-
-    if (tags[tagName]) {
-        return {tag: tags[tagName], tagKey: tagName};
-    }
-
-    const renamedTag = Object.entries(tags).find(([, tag]) => tag.previousTagName === tagName);
-    if (renamedTag) {
-        return {tag: renamedTag[1], tagKey: renamedTag[0]};
-    }
-
-    return undefined;
-}
-
-function isTagInPolicy(tagValue: string, policyTags: OnyxEntry<PolicyTagLists>): boolean {
-    if (!policyTags) {
-        return false;
-    }
-    const tagComponents = getTagArrayFromName(tagValue);
-    const sortedTagLists = getTagLists(policyTags);
-
-    return tagComponents.every((component, index) => {
-        if (!component) {
-            return true;
-        }
-        const levelTags = sortedTagLists.at(index)?.tags;
-        if (!levelTags) {
-            return false;
-        }
-        const tag = findPolicyTagAtLevel(levelTags, component, tagComponents.slice(0, index).join(':'));
-        return !!tag && tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    });
-}
-
 /**
  * Checks if a policy has any custom categories (categories not in the default list)
  */
@@ -1285,26 +1179,26 @@ function isMaxExpenseAmountSet(value: number | undefined): value is number {
 /**
  * Checks if a policy has any rules configured (structured rules, individual expense limits, or prohibited expenses).
  */
-function hasConfiguredRules(policy: OnyxEntry<Policy>, policyCategories?: PolicyCategories | null): boolean {
+function hasConfiguredRules(policy: OnyxEntry<Policy>, policyCategories: PolicyCategories | null | undefined, hasExpenseDefaultRules: boolean): boolean {
     if (!policy) {
         return false;
     }
 
-    if (!!policy.customRules && policy.customRules.trim().length > 0) {
+    if (hasExpenseDefaultRules) {
         return true;
     }
 
-    const {rules} = policy;
-    if (!!rules?.approvalRules && rules.approvalRules.length > 0) {
+    if (!!policy.customRules && policy.customRules.trim().length > 0) {
         return true;
     }
-    if (!!rules?.expenseRules && rules.expenseRules.length > 0) {
+
+    const {rules: policyRules} = policy;
+    if (!!policyRules?.approvalRules && policyRules.approvalRules.length > 0) {
         return true;
     }
-    if (!!rules?.codingRules && Object.keys(rules.codingRules).length > 0) {
+    if (!!policyRules?.expenseRules && policyRules.expenseRules.length > 0) {
         return true;
     }
-
     if (!!policy.maxExpenseAmount && policy.maxExpenseAmount !== CONST.DISABLED_MAX_EXPENSE_VALUE && policy.maxExpenseAmount !== CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT) {
         return true;
     }
@@ -1353,150 +1247,6 @@ function hasConfiguredRules(policy: OnyxEntry<Policy>, policyCategories?: Policy
     return hasAnyCategoryRules(policyCategories ?? undefined);
 }
 
-/**
- * Gets a tag list of a policy by a tag index
- */
-function getTagList(policyTagList: OnyxEntry<PolicyTagLists>, tagIndex: number): ValueOf<PolicyTagLists> {
-    const tagLists = getTagLists(policyTagList);
-    return (
-        tagLists.at(tagIndex) ?? {
-            name: '',
-            required: false,
-            tags: {},
-            orderWeight: 0,
-        }
-    );
-}
-
-/**
- * Gets a tag list of a policy by a tag's orderWeight.
- */
-function getTagListByOrderWeight(policyTagList: OnyxEntry<PolicyTagLists>, orderWeight: number): ValueOf<PolicyTagLists> {
-    const tagListEmpty = {
-        name: '',
-        required: false,
-        tags: {},
-        orderWeight: 0,
-    };
-    if (isEmptyObject(policyTagList)) {
-        return tagListEmpty;
-    }
-
-    return Object.values(policyTagList).find((tag) => tag.orderWeight === orderWeight) ?? tagListEmpty;
-}
-
-function getTagNamesFromTagsLists(policyTagLists: PolicyTagLists): string[] {
-    const uniqueTagNames = new Set<string>();
-
-    for (const policyTagList of Object.values(policyTagLists ?? {})) {
-        for (const tag of Object.values(policyTagList.tags ?? {})) {
-            uniqueTagNames.add(tag.name);
-        }
-    }
-    return Array.from(uniqueTagNames);
-}
-
-/**
- * Cleans up escaping of colons used to create multi-level tags (e.g. "Parent: Child"),
- * and HTML-decodes the result so tags stored with encoded entities display correctly (e.g. `R&amp;D`, renders as `R&D`)
- */
-function getCleanedTagName(tag: string) {
-    return Str.htmlDecode(tag?.replaceAll('\\:', CONST.COLON) ?? '');
-}
-
-/**
- * Converts a colon-delimited tag string into a comma-separated string, filtering out empty tags.
- */
-function getCommaSeparatedTagNameWithSanitizedColons(tag: string): string {
-    return getTagArrayFromName(tag)
-        .filter((tagItem) => tagItem !== '')
-        .map(getCleanedTagName)
-        .join(', ');
-}
-
-function getLengthOfTag(tag: string): number {
-    if (!tag) {
-        return 0;
-    }
-    return getTagArrayFromName(tag).length;
-}
-
-/**
- * Resolves a transaction's tag to the GL codes configured on the matching policy tags.
- * Multi-level tags resolve each level against the tag list with the same order weight,
- * and the non-empty GL codes are joined into a single comma-separated string.
- */
-function getTagGLCode(policyTagLists: OnyxEntry<PolicyTagLists>, transactionTag: string | undefined): string {
-    if (isEmptyObject(policyTagLists) || !transactionTag) {
-        return '';
-    }
-
-    const tagLists = getTagLists(policyTagLists);
-    const tagParts = getTagArrayFromName(transactionTag);
-    return tagParts
-        .map((tagName, index) => {
-            const levelTags = tagLists.at(index)?.tags;
-            if (!levelTags) {
-                return '';
-            }
-
-            return getGLCodeFromPolicyTag(findPolicyTagAtLevel(levelTags, tagName, tagParts.slice(0, index).join(':')));
-        })
-        .filter(Boolean)
-        .join(', ');
-}
-
-/**
- * Resolves the GL code for a single policy tag object, stripping wrapping quotes from the backend.
- */
-function getGLCodeFromPolicyTag(tag: {['GL Code']?: string | number} | undefined): string {
-    const glCode = tag?.['GL Code'];
-    return glCode != null ? String(glCode).replaceAll('"', '') : '';
-}
-
-/**
- * Escape colon from tag name
- */
-function escapeTagName(tag: string) {
-    return tag?.replaceAll(CONST.COLON, '\\:');
-}
-
-/**
- * Checks if a tag list name is the default 'Tag' name
- */
-function isDefaultTagName(tagName: string | undefined): boolean {
-    if (!tagName) {
-        return false;
-    }
-    return tagName.trim().toLowerCase() === CONST.POLICY.DEFAULT_TAG_NAME.trim().toLowerCase();
-}
-
-/**
- * Gets a count of enabled tags of a policy
- */
-function getCountOfEnabledTagsOfList(policyTags: PolicyTags | undefined): number {
-    if (!policyTags) {
-        return 0;
-    }
-    return Object.values(policyTags).filter((policyTag) => policyTag.enabled).length;
-}
-/**
- * Gets count of required tag lists of a policy
- */
-function getCountOfRequiredTagLists(policyTagLists: OnyxEntry<PolicyTagLists>): number {
-    if (!policyTagLists) {
-        return 0;
-    }
-    return Object.values(policyTagLists).filter((tagList) => tagList.required).length;
-}
-
-/**
- * Whether the policy has multi-level tags
- */
-function isMultiLevelTags(policyTagList: OnyxEntry<PolicyTagLists>): boolean {
-    return Object.keys(policyTagList ?? {}).length > 1;
-}
-
 function isPendingDeletePolicy(policy: OnyxEntry<Policy>): boolean {
     return policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 }
@@ -1735,6 +1485,11 @@ function arePaymentsEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
     return getReimbursementChoice(policy) !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
 }
 
+/** Whether the workspace has everything auto-pay approved reports needs: workflows, direct reimbursements, and a business bank account. */
+function isAutoPayApprovedReportsAvailable(policy: OnyxInputOrEntry<Policy>): boolean {
+    return !!policy?.areWorkflowsEnabled && getReimbursementChoice(policy) === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && !!policy?.achAccount?.bankAccountID;
+}
+
 /**
  * Returns true when the user is both a submitter and an approver, mirroring the Submit/Approve suggested-search eligibility in
  * `getSuggestedSearchesVisibility` (SearchUIUtils): a submitter is a member of any group workspace, and an approver is a member of a
@@ -2053,20 +1808,13 @@ function getFirstRuleApprover(approvalRules: ApprovalRule[], expenseReport: Onyx
     return firstCategoryApprover || firstTagApprover;
 }
 
-/**
- * True when this node is a single comparison instead of a combination of two children.
- */
-function isApprovalWorkflowComparison(node: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison): node is ApprovalWorkflowFilterComparison {
-    return typeof node.left === 'string';
-}
-
-function matchesApprovalWorkflowEmailComparison(node: ApprovalWorkflowFilterComparison, email: string | undefined): boolean {
+function matchesApprovalWorkflowEmailComparison(node: RuleFilterComparison, email: string | undefined): boolean {
     const expectedEmails = (Array.isArray(node.right) ? node.right : [node.right]).map((value) => String(value).toLowerCase());
     const isMatch = !!email && expectedEmails.includes(email.toLowerCase());
     return node.operator === CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO ? !isMatch : isMatch;
 }
 
-function matchesApprovalWorkflowAmountComparison(node: ApprovalWorkflowFilterComparison, amount: number): boolean {
+function matchesApprovalWorkflowAmountComparison(node: RuleFilterComparison, amount: number): boolean {
     const expectedAmount = typeof node.right === 'number' ? node.right : Number(node.right);
     if (Number.isNaN(expectedAmount)) {
         return false;
@@ -2090,8 +1838,8 @@ function matchesApprovalWorkflowAmountComparison(node: ApprovalWorkflowFilterCom
     }
 }
 
-function evaluateApprovalWorkflowFilter(node: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison, context: ApprovalWorkflowContext): boolean {
-    if (!isApprovalWorkflowComparison(node)) {
+function evaluateApprovalWorkflowFilter(node: RuleFilterNode, context: ApprovalWorkflowContext): boolean {
+    if (!isRuleFilterComparison(node)) {
         const left = evaluateApprovalWorkflowFilter(node.left, context);
         const right = evaluateApprovalWorkflowFilter(node.right, context);
         return node.operator === CONST.SEARCH.SYNTAX_OPERATORS.OR ? left || right : left && right;
@@ -2128,7 +1876,7 @@ function getForwardsToFromRules(policy: OnyxEntry<Policy>, context: ApprovalWork
         return undefined;
     }
 
-    const trigger = context.currentApproverEmail ? CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE : CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT;
+    const trigger = context.currentApproverEmail ? CONST.RULES.TRIGGERS.REPORT_APPROVE : CONST.RULES.TRIGGERS.REPORT_SUBMIT;
 
     // Sort by Onyx key so the rule picked stays the same across evaluations when more than one matches (which should not happen).
     const ruleKeys = Object.keys(rules ?? {}).sort();
@@ -2137,14 +1885,14 @@ function getForwardsToFromRules(policy: OnyxEntry<Policy>, context: ApprovalWork
         if (!rule || rule.scope !== CONST.RULES.SCOPE.POLICY || rule.scopeID !== policy.id || rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
             continue;
         }
-        if (!Object.values(rule.triggers ?? {}).includes(trigger)) {
+        if (!isApprovalWorkflowRule(rule) || !Object.values(rule.triggers ?? {}).includes(trigger)) {
             continue;
         }
         if (!evaluateApprovalWorkflowRule(rule, context)) {
             continue;
         }
 
-        return {forwardsTo: Object.values(rule.actions ?? {}).find((action) => action.name === CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO)?.approver};
+        return {forwardsTo: Object.values(rule.actions ?? {}).find((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)?.approver};
     }
 
     return undefined;
@@ -2335,59 +2083,6 @@ function canSendInvoice(policies: OnyxCollection<Policy> | null, currentUserLogi
     return getActiveAdminWorkspaces(policies, currentUserLogin).some((policy) => canSendInvoiceFromWorkspace(policy));
 }
 
-function hasDependentTags(policy: OnyxEntry<Policy>, policyTagList: OnyxEntry<PolicyTagLists>) {
-    if (!policy?.hasMultipleTagLists) {
-        return false;
-    }
-
-    // Walks the records instead of `Object.values(...).some(...)`: a tag list can hold thousands of tags, and copying
-    // them into an array to ask whether any of them has a filter costs that copy on every caller render.
-    // An empty tag list arrives without the `tags` key, despite the type.
-    for (const tagListName in policyTagList) {
-        if (!Object.hasOwn(policyTagList, tagListName)) {
-            continue;
-        }
-
-        const tags = policyTagList[tagListName]?.tags;
-
-        for (const tagName in tags) {
-            if (!Object.hasOwn(tags, tagName)) {
-                continue;
-            }
-
-            const tag = tags[tagName];
-
-            if (tag?.rules?.parentTagsFilter || tag?.parentTagsFilter) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-function hasIndependentTags(policy: OnyxEntry<Policy>, policyTagList: OnyxEntry<PolicyTagLists>) {
-    if (!policy?.hasMultipleTagLists || hasDependentTags(policy, policyTagList)) {
-        return false;
-    }
-    return Object.values(policyTagList ?? {}).some((tagList) => Object.values(tagList.tags ?? {}).length > 0);
-}
-
-/**
- * Whether Required lives on each tag list rather than on the policy-wide requiresTag flag.
- *
- * Deliberately not hasIndependentTags: this gates on the tag list count instead of the hasMultipleTagLists flag, and it
- * must stay true for a multi-level workspace whose lists are still empty, otherwise the per-level rows would disappear.
- */
-function hasPerTagListRequired(policy: OnyxEntry<Policy>, policyTagList: OnyxEntry<PolicyTagLists>) {
-    return isMultiLevelTags(policyTagList) && !hasDependentTags(policy, policyTagList);
-}
-
-/** Admins name their tag lists, so prefer that name and fall back to the caller's generic label. */
-function getTagListLabel(tagListName: string | undefined, fallbackLabel: string) {
-    return (tagListName ? getCleanedTagName(tagListName) : '') || fallbackLabel;
-}
-
 /** Get the Xero organizations connected to the policy */
 function getXeroTenants(policy: Policy | undefined): Tenant[] {
     return policy?.connections?.xero?.data?.tenants ?? [];
@@ -2443,196 +2138,6 @@ function settingsPendingAction(settings?: string[], pendingFields?: PendingField
     return pendingFields[key];
 }
 
-function getNetSuiteVendorOptions(policy: Policy | undefined, selectedVendorId: string | undefined): SelectorType[] {
-    const vendors = policy?.connections?.netsuite?.options.data.vendors;
-
-    return (vendors ?? []).map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === selectedVendorId,
-    }));
-}
-
-function getNetSuitePayableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
-    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
-
-    return (payableAccounts ?? []).map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === selectedBankAccountId,
-    }));
-}
-
-function getNetSuiteReceivableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
-    const receivableAccounts = policy?.connections?.netsuite?.options.data.receivableList;
-
-    return (receivableAccounts ?? []).map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === selectedBankAccountId,
-    }));
-}
-
-function getNetSuiteExpenseAccountOptions(policy: Policy | undefined, selectedExpenseAccountId: string | undefined): SelectorType[] {
-    const expenseAccounts = policy?.connections?.netsuite?.options.data.expenseAccounts;
-
-    return (expenseAccounts ?? []).map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === selectedExpenseAccountId,
-    }));
-}
-
-function getNetSuiteInvoiceItemOptions(policy: Policy | undefined, selectedItemId: string | undefined): SelectorType[] {
-    const invoiceItems = policy?.connections?.netsuite?.options.data.items;
-
-    return (invoiceItems ?? []).map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === selectedItemId,
-    }));
-}
-
-function getNetSuiteTaxAccountOptions(policy: Policy | undefined, subsidiaryCountry?: string, selectedAccountId?: string): SelectorType[] {
-    const taxAccounts = policy?.connections?.netsuite?.options.data.taxAccountsList;
-    const accountOptions = (taxAccounts ?? []).filter(({country}) => country === subsidiaryCountry);
-
-    return accountOptions.map(({externalID, name}) => ({
-        value: externalID,
-        text: name,
-        keyForList: externalID,
-        isSelected: externalID === selectedAccountId,
-    }));
-}
-
-function canUseTaxNetSuite(canUseNetSuiteUSATax?: boolean, subsidiaryCountry?: string) {
-    return !!canUseNetSuiteUSATax || CONST.NETSUITE_TAX_COUNTRIES.includes(subsidiaryCountry ?? '');
-}
-
-function canUseProvincialTaxNetSuite(subsidiaryCountry?: string) {
-    return subsidiaryCountry === '_canada';
-}
-
-function getFilteredReimbursableAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
-    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.BANK || type === CONST.NETSUITE_ACCOUNT_TYPE.CREDIT_CARD);
-}
-
-function getNetSuiteReimbursableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
-    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
-    const accountOptions = getFilteredReimbursableAccountOptions(payableAccounts);
-
-    return accountOptions.map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === selectedBankAccountId,
-    }));
-}
-
-function getFilteredCollectionAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
-    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.BANK);
-}
-
-function getNetSuiteCollectionAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
-    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
-    const accountOptions = getFilteredCollectionAccountOptions(payableAccounts);
-
-    return accountOptions.map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === selectedBankAccountId,
-    }));
-}
-
-function getFilteredApprovalAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
-    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE);
-}
-
-function getNetSuiteApprovalAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined, translate: LocalizedTranslate): SelectorType[] {
-    const payableAccounts = policy?.connections?.netsuite?.options.data.payableList;
-    const defaultApprovalAccount: NetSuiteAccount = {
-        id: CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT,
-        name: translate('workspace.netsuite.advancedConfig.defaultApprovalAccount'),
-        type: CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE,
-    };
-    const accountOptions = getFilteredApprovalAccountOptions([defaultApprovalAccount].concat(payableAccounts ?? []));
-
-    // When nothing is explicitly set, the synthesized default approval account is the effective selection in NetSuite.
-    const effectiveSelectionId = selectedBankAccountId ?? CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT;
-
-    return accountOptions.map(({id, name}) => ({
-        value: id,
-        text: name,
-        keyForList: id,
-        isSelected: id === effectiveSelectionId,
-    }));
-}
-
-function getCustomersOrJobsLabelNetSuite(policy: Policy | undefined, translate: LocaleContextProps['translate']): string | undefined {
-    const importMapping = policy?.connections?.netsuite?.options?.config?.syncOptions?.mapping;
-    if (!importMapping?.customers && !importMapping?.jobs) {
-        return undefined;
-    }
-    const importFields: string[] = [];
-    const importCustomer = importMapping?.customers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
-    const importJobs = importMapping?.jobs ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
-
-    if (importCustomer === CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT && importJobs === CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
-        return undefined;
-    }
-
-    const importedValue = importMapping?.customers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT ? importCustomer : importJobs;
-
-    if (importCustomer !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
-        importFields.push(translate('workspace.netsuite.import.customersOrJobs.customers'));
-    }
-
-    if (importJobs !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
-        importFields.push(translate('workspace.netsuite.import.customersOrJobs.jobs'));
-    }
-
-    const importedValueLabel = translate(`workspace.netsuite.import.customersOrJobs.label`, importFields, translate(`workspace.accounting.importTypes.${importedValue}`).toLowerCase());
-    return importedValueLabel.charAt(0).toUpperCase() + importedValueLabel.slice(1);
-}
-
-function getNetSuiteImportCustomFieldLabel(
-    policy: Policy | undefined,
-    importField: ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>,
-    translate: LocaleContextProps['translate'],
-    localeCompare: LocaleContextProps['localeCompare'],
-): string | undefined {
-    const fieldData = policy?.connections?.netsuite?.options?.config.syncOptions?.[importField] ?? [];
-    if (fieldData.length === 0) {
-        return undefined;
-    }
-
-    const mappingSet = new Set(fieldData.map((item) => item.mapping));
-    const importedTypes = Array.from(mappingSet)
-        .sort((a, b) => localeCompare(b, a))
-        .map((mapping) => translate(`workspace.netsuite.import.importTypes.${mapping !== '' ? mapping : 'TAG'}.label`).toLowerCase());
-    return translate(`workspace.netsuite.import.importCustomFields.label`, importedTypes);
-}
-
-function isNetSuiteCustomSegmentRecord(customField: NetSuiteCustomList | NetSuiteCustomSegment): boolean {
-    return 'segmentName' in customField;
-}
-
-function getNameFromNetSuiteCustomField(customField: NetSuiteCustomList | NetSuiteCustomSegment): string {
-    return 'segmentName' in customField ? customField.segmentName : customField.listName;
-}
-
-function isNetSuiteCustomFieldPropertyEditable(customField: NetSuiteCustomList | NetSuiteCustomSegment, fieldName: string) {
-    const fieldsAllowedToEdit = isNetSuiteCustomSegmentRecord(customField) ? [INPUT_IDS.SEGMENT_NAME, INPUT_IDS.INTERNAL_ID, INPUT_IDS.SCRIPT_ID, INPUT_IDS.MAPPING] : [INPUT_IDS.MAPPING];
-    const fieldKey = fieldName as keyof typeof customField;
-    return fieldsAllowedToEdit.includes(fieldKey);
-}
-
 function getIntegrationLastSuccessfulDate(
     getLocalDateFromDatetime: LocaleContextProps['getLocalDateFromDatetime'],
     connection?: Connections[keyof Connections],
@@ -2869,10 +2374,10 @@ function isXeroActiveMatchingSource(policy: OnyxEntry<Policy>): boolean {
  * the field.
  *
  * The `vendorMatching` beta only gates the integrations that haven't reached GA yet, so
- * `isVendorMatchingBetaEnabled` is consulted on every branch but QBO, Sage Intacct, Rillet, and DualEntry:
+ * `isVendorMatchingBetaEnabled` is consulted on every branch but QBO, Sage Intacct, Xero, Rillet, and DualEntry:
  *   - QBO (R1) with non-reimbursable export = Credit Card or Debit Card. GA, so no beta required
  *   - Sage Intacct (R2) with non-reimbursable export = Credit Card Charge. GA, so no beta required
- *   - Xero (R3) has no export destination enum, so a configured connection is enough. Beta required
+ *   - Xero (R3) has no export destination enum, so a configured connection is enough. GA, so no beta required
  *   - Rillet (R4) configured connection. GA, so no beta required
  *   - DualEntry configured connection. GA, so no beta required
  *   - Business Central configured connection. Beta required
@@ -2883,22 +2388,38 @@ function hasVendorFeature(policy: OnyxEntry<Policy>, isVendorMatchingBetaEnabled
     if (!policy) {
         return false;
     }
-    if (isQBOVendorMatchingActive(policy) || isIntacctVendorMatchingActive(policy) || isRilletVendorMatchingActive(policy) || isDualEntryVendorMatchingActive(policy)) {
+    if (
+        isQBOVendorMatchingActive(policy) ||
+        isIntacctVendorMatchingActive(policy) ||
+        isXeroVendorMatchingActive(policy) ||
+        isRilletVendorMatchingActive(policy) ||
+        isDualEntryVendorMatchingActive(policy)
+    ) {
         return true;
     }
-    return (
-        isVendorMatchingBetaEnabled &&
-        (isXeroVendorMatchingActive(policy) || isBusinessCentralVendorMatchingActive(policy) || isCampfireVendorMatchingActive(policy) || isCertiniaVendorMatchingActive(policy))
-    );
+    return isVendorMatchingBetaEnabled && (isBusinessCentralVendorMatchingActive(policy) || isCampfireVendorMatchingActive(policy) || isCertiniaVendorMatchingActive(policy));
 }
 
 /**
- * Search spans every workspace at once, so the vendor column is offered when any workspace has the vendor feature.
+ * Search spans every workspace at once, so the vendor filter and column are offered when any workspace has the vendor feature.
  */
 function hasVendorFeatureOnAnyPolicy(policies: OnyxCollection<Policy>, isVendorMatchingBetaEnabled: boolean): boolean {
     return Object.values(policies ?? {}).some((policy) => hasVendorFeature(policy, isVendorMatchingBetaEnabled));
 }
 
+/**
+ * IDs of the workspaces that have the vendor feature, so the Search vendor filter only offers their vendor lists.
+ */
+function getVendorFeaturePolicyIDs(policies: OnyxCollection<Policy>, isVendorMatchingBetaEnabled: boolean): string[] {
+    const policyIDs: string[] = [];
+    for (const policy of Object.values(policies ?? {})) {
+        if (policy?.id && hasVendorFeature(policy, isVendorMatchingBetaEnabled)) {
+            policyIDs.push(policy.id);
+        }
+    }
+    return policyIDs;
+}
+
 /**
  * Single source of truth for which connected integration scopes the vendor field for this workspace
  * (QBO, Sage Intacct, Xero, Rillet, DualEntry, Business Central, Campfire, or Certinia) and what its vendor list looks like. Returns `undefined` when no
@@ -3735,13 +3256,9 @@ function isTaxCodeCustomized(taxCode: string | undefined, policy: OnyxEntry<Poli
 export {
     canDisableOrDeleteTaxRate,
     canPolicyAccessFeature,
-    escapeTagName,
     getActivePolicies,
     getActivePoliciesWithExpenseChat,
     getAdminEmployees,
-    getCleanedTagName,
-    getTagListLabel,
-    getCommaSeparatedTagNameWithSanitizedColons,
     getConnectedIntegration,
     getConnectionExporters,
     findVendorByID,
@@ -3765,9 +3282,9 @@ export {
     isXeroVendorMatchingActive,
     hasVendorFeature,
     hasVendorFeatureOnAnyPolicy,
+    getVendorFeaturePolicyIDs,
     isMatchingVendorListLoaded,
     getValidConnectedIntegration,
-    getCountOfEnabledTagsOfList,
     getIneligibleInvitees,
     getExcludedUsers,
     getMemberAccountIDsForWorkspace,
@@ -3776,19 +3293,7 @@ export {
     getSoftExclusionsForGuideAndAccountManager,
     getExpensifyTeamExclusions,
     filterGuideAndAccountManager,
-    isMultiLevelTags,
     getPolicyBrickRoadIndicatorStatus,
-    getSortedTagKeys,
-    getTagList,
-    getTagListByOrderWeight,
-    getTagListName,
-    getTagLists,
-    hasTags,
-    isTagInPolicy,
-    findPolicyTagAtLevel,
-    findPolicyTagEntryByParentFilter,
-    matchesParentTagPath,
-    matchesParentTagsFilter,
     hasCustomCategories,
     hasConfiguredRules,
     isMaxExpenseAmountSet,
@@ -3826,6 +3331,7 @@ export {
     isGroupPolicyByType,
     isPendingDeletePolicy,
     isPolicyAdmin,
+    isRoomMemberProtectedByPolicyRole,
     isPolicyUser,
     isPolicyAuditor,
     isAdminOfCardEnabledPolicy,
@@ -3839,12 +3345,14 @@ export {
     getUberConnectionErrorDirectlyFromPolicy,
     isPolicyOwner,
     isPolicyMember,
+    isMemberInHomeAndOfficeWorkspace,
     isPolicyPayer,
     getReimburserEmail,
     getOwnerChangePayerSuccessData,
     PAYER_ROLES,
     canRolePay,
     arePaymentsEnabled,
+    isAutoPayApprovedReportsAvailable,
     getReimbursementChoice,
     isSubmitterAndApprover,
     isSubmitAndClose,
@@ -3856,28 +3364,13 @@ export {
     canSendInvoiceFromWorkspace,
     canSubmitPerDiemExpenseFromWorkspace,
     canSendInvoice,
-    hasDependentTags,
     getXeroTenants,
     findCurrentXeroOrganization,
     getCurrentXeroOrganizationName,
     getXeroBankAccounts,
     getXeroExpenseAccounts,
     hasPolicyWithXeroConnection,
-    getNetSuiteVendorOptions,
-    canUseTaxNetSuite,
-    canUseProvincialTaxNetSuite,
     getEligibleBankAccountShareRecipientEmails,
-    getFilteredReimbursableAccountOptions,
-    getNetSuiteReimbursableAccountOptions,
-    getFilteredCollectionAccountOptions,
-    getNetSuiteCollectionAccountOptions,
-    getFilteredApprovalAccountOptions,
-    getNetSuiteApprovalAccountOptions,
-    getNetSuitePayableAccountOptions,
-    getNetSuiteReceivableAccountOptions,
-    getNetSuiteExpenseAccountOptions,
-    getNetSuiteInvoiceItemOptions,
-    getNetSuiteTaxAccountOptions,
     getSageIntacctVendors,
     getSageIntacctNonReimbursableActiveDefaultVendor,
     getSageIntacctCreditCards,
@@ -3896,7 +3389,6 @@ export {
     navigateToExpensifyCardPage,
     getIntegrationLastSuccessfulDate,
     getCurrentConnectionName,
-    getCustomersOrJobsLabelNetSuite,
     getDefaultApprover,
     hasCustomApprovalWorkflow,
     getApprovalWorkflow,
@@ -3904,9 +3396,6 @@ export {
     isControlPolicy,
     isAttendeeTrackingEnabled,
     isCollectPolicy,
-    isNetSuiteCustomSegmentRecord,
-    getNameFromNetSuiteCustomField,
-    isNetSuiteCustomFieldPropertyEditable,
     getCurrentSageIntacctEntityName,
     hasOnlyPersonalPolicies,
     getCurrentTaxID,
@@ -3923,12 +3412,10 @@ export {
     getSubmitReportManagerAccountID,
     getAllTaxRatesNamesAndKeys as getAllTaxRates,
     getAllTaxRatesNamesAndValues,
-    getTagNamesFromTagsLists,
     getTagApproverRule,
     getDomainNameForPolicy,
     hasSupportedOnlyOnOldDotIntegration,
     getWorkflowApprovalsUnavailable,
-    getNetSuiteImportCustomFieldLabel,
     getUserFriendlyWorkspaceType,
     getDefaultWorkspacePlanType,
     isPolicyAccessible,
@@ -3945,14 +3432,8 @@ export {
     getManagerAccountID,
     isPreferredExporter,
     getCustomUnitsForDuplication,
-    getCountOfRequiredTagLists,
     getActiveEmployeeWorkspaces,
     getPolicyRole,
-    hasIndependentTags,
-    hasPerTagListRequired,
-    getLengthOfTag,
-    getTagGLCode,
-    getGLCodeFromPolicyTag,
     isPolicyMemberWithoutPendingDelete,
     hasDynamicExternalWorkflow,
     shouldHideDynamicExternalWorkflowPeople,
@@ -3964,7 +3445,6 @@ export {
     isWorkspaceProvisionedForTravel,
     hasAcceptedTravelTerms,
     isNonUSDPolicy,
-    isDefaultTagName,
     isTimeTrackingEnabled,
     isMCPEnabled,
     getDefaultTimeTrackingRate,
@@ -3982,6 +3462,12 @@ export {
     hasAnyPaidPolicy,
     isTaxCodeCustomized,
     isMergeHRCompleteSetupNeededSelector,
+    isQBORefreshTokenExpiringSoonSelector,
 };
 
+// Re-exported with `export *` rather than through the block above: a named re-export becomes a getter that throws
+// while this module is still loading, which breaks tests that spread `jest.requireActual('@libs/PolicyUtils')`
+// from inside an import cycle.
+export * from './tag';
+
 export type {MemberEmailsToAccountIDs, PolicyFeature, PolicyFeatureAccess};
diff --git a/src/libs/PolicyUtils/tag.ts b/src/libs/PolicyUtils/tag.ts
new file mode 100644
index 000000000000..971c1c214afa
--- /dev/null
+++ b/src/libs/PolicyUtils/tag.ts
@@ -0,0 +1,379 @@
+/**
+ * Helpers for a policy's tags: tag-list lookup, parent-tag matching for dependent tags, tag names, and GL codes.
+ * Extracted from PolicyUtils/index.ts to keep that file smaller.
+ */
+import {getTagArrayFromName} from '@libs/TransactionUtils';
+
+import CONST from '@src/CONST';
+import type {Policy, PolicyTagLists, PolicyTags} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import {Str} from 'expensify-common';
+
+function getSortedTagKeys(policyTagList: OnyxEntry<PolicyTagLists>): Array<keyof PolicyTagLists> {
+    if (isEmptyObject(policyTagList)) {
+        return [];
+    }
+
+    return Object.keys(policyTagList).sort((key1, key2) => policyTagList[key1].orderWeight - policyTagList[key2].orderWeight);
+}
+
+/**
+ * Gets a tag name of policy tags based on a tag's orderWeight.
+ */
+function getTagListName(policyTagList: OnyxEntry<PolicyTagLists>, orderWeight: number): string {
+    if (isEmptyObject(policyTagList)) {
+        return '';
+    }
+
+    return Object.values(policyTagList).find((tag) => tag.orderWeight === orderWeight)?.name ?? '';
+}
+
+/**
+ * Gets all tag lists of a policy
+ */
+function getTagLists(policyTagList: OnyxEntry<PolicyTagLists>): Array<ValueOf<PolicyTagLists>> {
+    if (isEmptyObject(policyTagList)) {
+        return [];
+    }
+
+    return Object.values(policyTagList)
+        .filter((policyTagListValue) => policyTagListValue !== null)
+        .sort((tagA, tagB) => tagA.orderWeight - tagB.orderWeight);
+}
+
+/**
+ * Checks if a policy has any tags
+ */
+function hasTags(policyTagList: OnyxEntry<PolicyTagLists>): boolean {
+    const tagLists = getTagLists(policyTagList);
+    return tagLists.some((tagList) => Object.keys(tagList.tags ?? {}).length > 0);
+}
+
+// An anchored filter with no regex operators. Letter and digit escapes (\d, \w, ...) are classes, not literals.
+const LITERAL_PARENT_TAGS_FILTER = /^\^((?:\\[^A-Za-z0-9]|[^\\.*+?()[\]{}|^$])*)\$$/;
+const ESCAPED_CHARACTER = /\\([\s\S])/g;
+
+/**
+ * Whether a parentTagsFilter matches a parent tag path.
+ * Filters are almost always an anchored, escaped parent path, which is compared as a string -
+ * compiling a RegExp per tag dominates scans over large tag lists.
+ */
+function matchesParentTagsFilter(filter: string | undefined, parentTagPath: string): boolean {
+    if (!filter) {
+        return true;
+    }
+
+    const literal = LITERAL_PARENT_TAGS_FILTER.exec(filter)?.[1];
+
+    if (literal !== undefined) {
+        return literal.replaceAll(ESCAPED_CHARACTER, '$1') === parentTagPath;
+    }
+
+    return new RegExp(filter).test(parentTagPath);
+}
+
+/**
+ * Checks whether a policy tag is selectable under a given parent tag path.
+ * Tags of a dependent list only apply below the parents their parentTagsFilter matches,
+ * while tags without a filter apply everywhere.
+ */
+function matchesParentTagPath(policyTag: ValueOf<PolicyTags>, parentTagPath: string): boolean {
+    return matchesParentTagsFilter(policyTag.rules?.parentTagsFilter ?? policyTag.parentTagsFilter, parentTagPath);
+}
+
+/**
+ * Finds the policy tag at a single tag list level that matches a tag name.
+ * Dependent tag lists can hold same-named child tags under different parents (stored under unique
+ * record keys), so a tag only matches by name when its parent filter also matches the parent tag path.
+ */
+function findPolicyTagAtLevel(levelTags: PolicyTags, tagName: string, parentTagPath: string): ValueOf<PolicyTags> | undefined {
+    const matchesTagAtLevel = (levelTag: ValueOf<PolicyTags> | undefined): levelTag is ValueOf<PolicyTags> => {
+        if (!levelTag || levelTag.name !== tagName) {
+            return false;
+        }
+        return matchesParentTagPath(levelTag, parentTagPath);
+    };
+
+    const directMatch = levelTags[tagName];
+    return matchesTagAtLevel(directMatch) ? directMatch : Object.values(levelTags).find(matchesTagAtLevel);
+}
+
+/**
+ * Finds a policy tag record and its Onyx storage key within a tag list.
+ * Dependent tag lists can hold same-named child tags under different parents (stored under unique
+ * record keys), so a tag only matches by name when its parent filter also matches.
+ */
+function findPolicyTagEntryByParentFilter(tags: PolicyTags | undefined, tagName: string, parentTagsFilter?: string): {tag: ValueOf<PolicyTags>; tagKey: string} | undefined {
+    if (!tags) {
+        return undefined;
+    }
+
+    if (parentTagsFilter) {
+        const match = Object.entries(tags).find(([, tag]) => tag.name === tagName && (tag.rules?.parentTagsFilter ?? tag.parentTagsFilter) === parentTagsFilter);
+        if (match) {
+            return {tag: match[1], tagKey: match[0]};
+        }
+        return undefined;
+    }
+
+    if (tags[tagName]) {
+        return {tag: tags[tagName], tagKey: tagName};
+    }
+
+    const renamedTag = Object.entries(tags).find(([, tag]) => tag.previousTagName === tagName);
+    if (renamedTag) {
+        return {tag: renamedTag[1], tagKey: renamedTag[0]};
+    }
+
+    return undefined;
+}
+
+function isTagInPolicy(tagValue: string, policyTags: OnyxEntry<PolicyTagLists>): boolean {
+    if (!policyTags) {
+        return false;
+    }
+    const tagComponents = getTagArrayFromName(tagValue);
+    const sortedTagLists = getTagLists(policyTags);
+
+    return tagComponents.every((component, index) => {
+        if (!component) {
+            return true;
+        }
+        const levelTags = sortedTagLists.at(index)?.tags;
+        if (!levelTags) {
+            return false;
+        }
+        const tag = findPolicyTagAtLevel(levelTags, component, tagComponents.slice(0, index).join(':'));
+        return !!tag && tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+    });
+}
+
+/**
+ * Gets a tag list of a policy by a tag index
+ */
+function getTagList(policyTagList: OnyxEntry<PolicyTagLists>, tagIndex: number): ValueOf<PolicyTagLists> {
+    const tagLists = getTagLists(policyTagList);
+    return (
+        tagLists.at(tagIndex) ?? {
+            name: '',
+            required: false,
+            tags: {},
+            orderWeight: 0,
+        }
+    );
+}
+
+/**
+ * Gets a tag list of a policy by a tag's orderWeight.
+ */
+function getTagListByOrderWeight(policyTagList: OnyxEntry<PolicyTagLists>, orderWeight: number): ValueOf<PolicyTagLists> {
+    const tagListEmpty = {
+        name: '',
+        required: false,
+        tags: {},
+        orderWeight: 0,
+    };
+    if (isEmptyObject(policyTagList)) {
+        return tagListEmpty;
+    }
+
+    return Object.values(policyTagList).find((tag) => tag.orderWeight === orderWeight) ?? tagListEmpty;
+}
+
+function getTagNamesFromTagsLists(policyTagLists: PolicyTagLists): string[] {
+    const uniqueTagNames = new Set<string>();
+
+    for (const policyTagList of Object.values(policyTagLists ?? {})) {
+        for (const tag of Object.values(policyTagList.tags ?? {})) {
+            uniqueTagNames.add(tag.name);
+        }
+    }
+    return Array.from(uniqueTagNames);
+}
+
+/**
+ * Cleans up escaping of colons used to create multi-level tags (e.g. "Parent: Child"),
+ * and HTML-decodes the result so tags stored with encoded entities display correctly (e.g. `R&amp;D`, renders as `R&D`)
+ */
+function getCleanedTagName(tag: string) {
+    return Str.htmlDecode(tag?.replaceAll('\\:', CONST.COLON) ?? '');
+}
+
+/**
+ * Converts a colon-delimited tag string into a comma-separated string, filtering out empty tags.
+ */
+function getCommaSeparatedTagNameWithSanitizedColons(tag: string): string {
+    return getTagArrayFromName(tag)
+        .filter((tagItem) => tagItem !== '')
+        .map(getCleanedTagName)
+        .join(', ');
+}
+
+function getLengthOfTag(tag: string): number {
+    if (!tag) {
+        return 0;
+    }
+    return getTagArrayFromName(tag).length;
+}
+
+/**
+ * Resolves a transaction's tag to the GL codes configured on the matching policy tags.
+ * Multi-level tags resolve each level against the tag list with the same order weight,
+ * and the non-empty GL codes are joined into a single comma-separated string.
+ */
+function getTagGLCode(policyTagLists: OnyxEntry<PolicyTagLists>, transactionTag: string | undefined): string {
+    if (isEmptyObject(policyTagLists) || !transactionTag) {
+        return '';
+    }
+
+    const tagLists = getTagLists(policyTagLists);
+    const tagParts = getTagArrayFromName(transactionTag);
+    return tagParts
+        .map((tagName, index) => {
+            const levelTags = tagLists.at(index)?.tags;
+            if (!levelTags) {
+                return '';
+            }
+
+            return getGLCodeFromPolicyTag(findPolicyTagAtLevel(levelTags, tagName, tagParts.slice(0, index).join(':')));
+        })
+        .filter(Boolean)
+        .join(', ');
+}
+
+/**
+ * Resolves the GL code for a single policy tag object, stripping wrapping quotes from the backend.
+ */
+function getGLCodeFromPolicyTag(tag: {['GL Code']?: string | number} | undefined): string {
+    const glCode = tag?.['GL Code'];
+    return glCode != null ? String(glCode).replaceAll('"', '') : '';
+}
+
+/**
+ * Escape colon from tag name
+ */
+function escapeTagName(tag: string) {
+    return tag?.replaceAll(CONST.COLON, '\\:');
+}
+
+/**
+ * Checks if a tag list name is the default 'Tag' name
+ */
+function isDefaultTagName(tagName: string | undefined): boolean {
+    if (!tagName) {
+        return false;
+    }
+    return tagName.trim().toLowerCase() === CONST.POLICY.DEFAULT_TAG_NAME.trim().toLowerCase();
+}
+
+/**
+ * Gets a count of enabled tags of a policy
+ */
+function getCountOfEnabledTagsOfList(policyTags: PolicyTags | undefined): number {
+    if (!policyTags) {
+        return 0;
+    }
+    return Object.values(policyTags).filter((policyTag) => policyTag.enabled).length;
+}
+/**
+ * Gets count of required tag lists of a policy
+ */
+function getCountOfRequiredTagLists(policyTagLists: OnyxEntry<PolicyTagLists>): number {
+    if (!policyTagLists) {
+        return 0;
+    }
+    return Object.values(policyTagLists).filter((tagList) => tagList.required).length;
+}
+
+/**
+ * Whether the policy has multi-level tags
+ */
+function isMultiLevelTags(policyTagList: OnyxEntry<PolicyTagLists>): boolean {
+    return Object.keys(policyTagList ?? {}).length > 1;
+}
+
+function hasDependentTags(policy: OnyxEntry<Policy>, policyTagList: OnyxEntry<PolicyTagLists>) {
+    if (!policy?.hasMultipleTagLists) {
+        return false;
+    }
+
+    // Walks the records instead of `Object.values(...).some(...)`: a tag list can hold thousands of tags, and copying
+    // them into an array to ask whether any of them has a filter costs that copy on every caller render.
+    // An empty tag list arrives without the `tags` key, despite the type.
+    for (const tagListName in policyTagList) {
+        if (!Object.hasOwn(policyTagList, tagListName)) {
+            continue;
+        }
+
+        const tags = policyTagList[tagListName]?.tags;
+
+        for (const tagName in tags) {
+            if (!Object.hasOwn(tags, tagName)) {
+                continue;
+            }
+
+            const tag = tags[tagName];
+
+            if (tag?.rules?.parentTagsFilter || tag?.parentTagsFilter) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+function hasIndependentTags(policy: OnyxEntry<Policy>, policyTagList: OnyxEntry<PolicyTagLists>) {
+    if (!policy?.hasMultipleTagLists || hasDependentTags(policy, policyTagList)) {
+        return false;
+    }
+    return Object.values(policyTagList ?? {}).some((tagList) => Object.values(tagList.tags ?? {}).length > 0);
+}
+
+/**
+ * Whether Required lives on each tag list rather than on the policy-wide requiresTag flag.
+ *
+ * Deliberately not hasIndependentTags: this gates on the tag list count instead of the hasMultipleTagLists flag, and it
+ * must stay true for a multi-level workspace whose lists are still empty, otherwise the per-level rows would disappear.
+ */
+function hasPerTagListRequired(policy: OnyxEntry<Policy>, policyTagList: OnyxEntry<PolicyTagLists>) {
+    return isMultiLevelTags(policyTagList) && !hasDependentTags(policy, policyTagList);
+}
+
+/** Admins name their tag lists, so prefer that name and fall back to the caller's generic label. */
+function getTagListLabel(tagListName: string | undefined, fallbackLabel: string) {
+    return (tagListName ? getCleanedTagName(tagListName) : '') || fallbackLabel;
+}
+
+export {
+    getSortedTagKeys,
+    getTagListName,
+    getTagLists,
+    hasTags,
+    matchesParentTagsFilter,
+    matchesParentTagPath,
+    findPolicyTagAtLevel,
+    findPolicyTagEntryByParentFilter,
+    isTagInPolicy,
+    getTagList,
+    getTagListByOrderWeight,
+    getTagNamesFromTagsLists,
+    getCleanedTagName,
+    getCommaSeparatedTagNameWithSanitizedColons,
+    getLengthOfTag,
+    getTagGLCode,
+    getGLCodeFromPolicyTag,
+    escapeTagName,
+    isDefaultTagName,
+    getCountOfEnabledTagsOfList,
+    getCountOfRequiredTagLists,
+    isMultiLevelTags,
+    hasDependentTags,
+    hasIndependentTags,
+    hasPerTagListRequired,
+    getTagListLabel,
+};
diff --git a/src/libs/ReceiptStorage/index.native.ts b/src/libs/ReceiptStorage/index.native.ts
index da95c83a91c8..f735b5bebfd4 100644
--- a/src/libs/ReceiptStorage/index.native.ts
+++ b/src/libs/ReceiptStorage/index.native.ts
@@ -52,6 +52,8 @@ const adopt: ReceiptStorage['adopt'] = async (uriOrPath, fileName) => {
 
 const toLocalUri: ReceiptStorage['toLocalUri'] = (durableName) => `file://${getReceiptsUploadFolderPath()}/${durableName}`;
 
+const retain: ReceiptStorage['retain'] = () => {};
+
 const resolve: ReceiptStorage['resolve'] = (source) => {
     if (typeof source !== 'string') {
         return undefined;
@@ -63,6 +65,6 @@ const resolve: ReceiptStorage['resolve'] = (source) => {
     return durableName ? toLocalUri(durableName) : source;
 };
 
-const receiptStorage: ReceiptStorage = {adopt, toLocalUri, resolve};
+const receiptStorage: ReceiptStorage = {adopt, toLocalUri, retain, resolve};
 
 export default receiptStorage;
diff --git a/src/libs/ReceiptStorage/index.ts b/src/libs/ReceiptStorage/index.ts
index caa760269fa3..8fa98e6d5d15 100644
--- a/src/libs/ReceiptStorage/index.ts
+++ b/src/libs/ReceiptStorage/index.ts
@@ -1,10 +1,42 @@
 import type ReceiptStorage from './types';
 
-/** Web has no filesystem to move receipts into, and a blob URL already lives as long as the document. */
+/**
+ * Web has no filesystem to move receipts into. A blob:/file: object URL is only valid for this
+ * document. Onyx may still restore the string after a reload, but the Blob is gone. Track the
+ * URIs this document created so resolve() can refuse stale ones and callers fall back to the
+ * server receipt.
+ *
+ * Prefer a blob:/file: prefix check over isLocalFile(): that helper also matches root-relative
+ * remote URLs like `/staging/chat-attachments/...`.
+ */
+const sessionLocalSources = new Set<string>();
+
+function isSessionLocalUri(source: string): boolean {
+    return source.startsWith('blob:') || source.startsWith('file:');
+}
+
+const retain: ReceiptStorage['retain'] = (source) => {
+    if (!isSessionLocalUri(source)) {
+        return;
+    }
+    sessionLocalSources.add(source);
+};
+
+const resolve: ReceiptStorage['resolve'] = (source) => {
+    if (typeof source !== 'string') {
+        return undefined;
+    }
+    if (isSessionLocalUri(source)) {
+        return sessionLocalSources.has(source) ? source : undefined;
+    }
+    return source;
+};
+
 const receiptStorage: ReceiptStorage = {
     adopt: (uriOrPath) => Promise.resolve(uriOrPath),
     toLocalUri: (durableName) => durableName,
-    resolve: (source) => (typeof source === 'string' ? source : undefined),
+    retain,
+    resolve,
 };
 
 export default receiptStorage;
diff --git a/src/libs/ReceiptStorage/types.ts b/src/libs/ReceiptStorage/types.ts
index 217fbadca8b0..affc64c59a53 100644
--- a/src/libs/ReceiptStorage/types.ts
+++ b/src/libs/ReceiptStorage/types.ts
@@ -8,6 +8,12 @@ type ReceiptStorage = {
     /** Valid for this launch only, so never store the result. */
     toLocalUri: (durableName: string) => string;
 
+    /**
+     * Claims a local source that is about to be stored in Onyx so resolve() will accept it this session.
+     * No-op on native (files are durable). On web, object URLs die with the document.
+     */
+    retain: (source: string) => void;
+
     /** Re-roots a stored source onto the current folder. A remote source passes through unchanged. */
     resolve: (source: ReceiptSource | null | undefined) => string | undefined;
 };
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index ad5d46836d28..34f952b28885 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -75,6 +75,7 @@ import stripFollowupListFromHtml from './ReportActionFollowupUtils/stripFollowup
 import {getOriginalMessage, getReportActionHtml, getReportActionMessage, getReportActionText, getTextFromHtml} from './ReportActionMessageUtils';
 import {isActionOfType, isDynamicExternalWorkflowApproveFailedAction, isModifiedExpenseAction, isMoneyRequestAction} from './ReportActionTypeGuards';
 import StringUtils from './StringUtils';
+import {getWorkArrangementLabel} from './WorkArrangementUtils';
 import {getReportFieldTypeTranslationKey} from './WorkspaceReportFieldUtils';
 import {getUnitTranslationKey, getWorkspaceAddressStreetLines} from './WorkspacesSettingsUtils';
 
@@ -210,9 +211,11 @@ function isDeletedAction(reportAction: OnyxInputOrEntry<ReportAction | Optimisti
 
     // for report actions with this type we get an empty array as message by design
     if (
+        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED ||
         reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DIRECTOR_INFORMATION_REQUIRED ||
         reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED_REPORT_FOR_UNAPPROVED_TRANSACTIONS ||
         reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REASSIGN_APPROVER ||
+        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES ||
         isCardIssuedAction(reportAction) ||
         isPolicyCopyReportAction(reportAction)
     ) {
@@ -1756,15 +1759,7 @@ function isOlderReportAction(a: ReportAction, b: ReportAction): boolean {
  * @param persistedReportActionIDs - IDs of the report actions stored in Onyx
  */
 function getLatestConciergeFeedbackActionID(sortedVisibleReportActions: ReportAction[], persistedReportActionIDs: string[]): string | undefined {
-    const latestConciergeComment = sortedVisibleReportActions.find(
-        (action) =>
-            isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT) &&
-            action.actorAccountID === CONST.ACCOUNT_ID.CONCIERGE &&
-            !isDeletedAction(action) &&
-            !isWhisperAction(action) &&
-            // A failed comment does not exist on the server, so a reaction on it cannot be saved
-            isEmptyObject(action.errors),
-    );
+    const latestConciergeComment = sortedVisibleReportActions.find(isConciergeFeedbackCandidate);
 
     if (!latestConciergeComment || !persistedReportActionIDs.includes(latestConciergeComment.reportActionID)) {
         return undefined;
@@ -1773,6 +1768,34 @@ function getLatestConciergeFeedbackActionID(sortedVisibleReportActions: ReportAc
     return latestConciergeComment.reportActionID;
 }
 
+/** Whether the comment can carry the inline feedback prompt, which needs a Concierge comment the server knows about */
+function isConciergeFeedbackCandidate(action: ReportAction): boolean {
+    return (
+        isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT) &&
+        action.actorAccountID === CONST.ACCOUNT_ID.CONCIERGE &&
+        !isDeletedAction(action) &&
+        !isWhisperAction(action) &&
+        // A failed comment does not exist on the server, so a reaction on it cannot be saved
+        isEmptyObject(action.errors)
+    );
+}
+
+/**
+ * Returns the ID of the newest Concierge comment in a report that can show the feedback prompt.
+ * Reading the report's own actions is what lets a thread decide about the message it hangs off, which lives in the parent report.
+ */
+function getLatestConciergeFeedbackActionIDFromReportActions(reportActions: OnyxEntry<ReportActions>): string | undefined {
+    let latestConciergeComment: ReportAction | undefined;
+
+    for (const action of Object.values(reportActions ?? {})) {
+        if (isConciergeFeedbackCandidate(action) && (!latestConciergeComment || action.created > latestConciergeComment.created)) {
+            latestConciergeComment = action;
+        }
+    }
+
+    return latestConciergeComment?.reportActionID;
+}
+
 /**
  * The first visible action is the second last action in sortedReportActions which satisfy following conditions:
  * 1. That is not pending deletion as pending deletion actions are kept in sortedReportActions in memory.
@@ -2745,6 +2768,25 @@ function getReportActionMessageText(reportAction: OnyxEntry<ReportAction>): stri
     return reportAction?.message?.reduce((acc, curr) => `${acc}${getTextFromHtml(curr?.html || curr?.text)}`, '') ?? '';
 }
 
+function getAgentPromptUpdatedMessage(translate: LocalizedTranslate, reportAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED>): string {
+    const originalMessage = getOriginalMessage(reportAction);
+    return originalMessage ? translate('agentPromptUpdated', originalMessage) : getReportActionMessageText(reportAction);
+}
+
+function getAgentPromptUpdatedMessageHTML(translate: LocalizedTranslate, reportAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED>): string {
+    const originalMessage = getOriginalMessage(reportAction);
+    if (!originalMessage) {
+        return Str.htmlEncode(getReportActionMessageText(reportAction));
+    }
+
+    return translate('agentPromptUpdated', {
+        ...originalMessage,
+        updatedBy: `<mention-user accountID="${originalMessage.updatedByAccountID}"/>`,
+        previousPrompt: Str.htmlEncode(originalMessage.previousPrompt),
+        newPrompt: Str.htmlEncode(originalMessage.newPrompt),
+    });
+}
+
 function getDismissedViolationMessageText(translate: LocalizedTranslate, originalMessage: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION>['originalMessage']): string {
     const reason = originalMessage?.reason;
     const violationName = originalMessage?.violationName;
@@ -2761,11 +2803,15 @@ function getMentionedEmailsFromMessage(message: string) {
     return matches.map((match) => Str.removeSMSDomain(match[1].substring(1)));
 }
 
-function didMessageMentionCurrentUser(reportAction: OnyxInputOrEntry<ReportAction>, currentUserEmail: string) {
+function didMessageMentionCurrentUser(reportAction: OnyxInputOrEntry<ReportAction>, currentUserEmail: string, currentUserAccountID?: number) {
     const accountIDsFromMessage = getMentionedAccountIDsFromAction(reportAction);
     const message = getReportActionMessage(reportAction)?.html ?? '';
     const emailsFromMessage = getMentionedEmailsFromMessage(message);
-    return accountIDsFromMessage.includes(deprecatedCurrentUserAccountID ?? CONST.DEFAULT_NUMBER_ID) || emailsFromMessage.includes(currentUserEmail) || message.includes('<mention-here>');
+    return (
+        accountIDsFromMessage.includes(currentUserAccountID ?? deprecatedCurrentUserAccountID ?? CONST.DEFAULT_NUMBER_ID) ||
+        emailsFromMessage.includes(currentUserEmail) ||
+        message.includes('<mention-here>')
+    );
 }
 
 /**
@@ -2802,6 +2848,43 @@ function getIOUActionForTransactionID(reportActions: ReportAction[], transaction
     return reportActions.find((reportAction) => isMatch(reportAction) && isLive(reportAction)) ?? firstMatch;
 }
 
+/** IOU action types that reference a transaction without being the action that created the expense. */
+const nonExpenseCreationIOUTypes = new Set<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>>([
+    CONST.IOU.REPORT_ACTION_TYPE.PAY,
+    CONST.IOU.REPORT_ACTION_TYPE.APPROVE,
+    CONST.IOU.REPORT_ACTION_TYPE.REJECT,
+    CONST.IOU.REPORT_ACTION_TYPE.CANCEL,
+    CONST.IOU.REPORT_ACTION_TYPE.DELETE,
+]);
+
+/**
+ * The transaction an action created, or undefined when the action merely references one.
+ *
+ * Several IOU actions carry the same `IOUTransactionID`. Paying, approving or rejecting an expense all reference
+ * the transaction they act on, and each has its own thread. Callers that want the expense itself (to open it, or
+ * to page to it in the prev/next carousel) must not match those, or they land the user on, say, the
+ * "marked as paid" system message thread instead of the expense.
+ *
+ * Actions with no `type` are kept: legacy IOU actions predate the field and are expense-creating.
+ */
+function getExpenseCreationTransactionID(reportAction: ReportAction): string | undefined {
+    if (!isMoneyRequestAction(reportAction)) {
+        return undefined;
+    }
+    const originalMessage = getOriginalMessage(reportAction);
+    if (!originalMessage?.IOUTransactionID) {
+        return undefined;
+    }
+    return !originalMessage.type || !nonExpenseCreationIOUTypes.has(originalMessage.type) ? originalMessage.IOUTransactionID : undefined;
+}
+
+/**
+ * Get the action that created an expense, for a transactionID, from the given reportActions.
+ */
+function getExpenseCreationIOUActionForTransactionID(reportActions: ReportAction[], transactionID: string): OnyxEntry<ReportAction> {
+    return reportActions.find((reportAction) => getExpenseCreationTransactionID(reportAction) === transactionID);
+}
+
 /**
  * Get the track expense actionable whisper of the corresponding track expense
  */
@@ -2946,6 +3029,7 @@ function getExportIntegrationActionFragments(
                 case CONST.EXPORT_LABELS.INTACCT:
                 case CONST.EXPORT_LABELS.SAGE_INTACCT:
                 case CONST.EXPORT_LABELS.QBD:
+                case CONST.EXPORT_LABELS.BUSINESS_CENTRAL:
                     // These integrations store IDs, not URLs.
                     url = '';
                     break;
@@ -3737,6 +3821,15 @@ function getWorkspaceAttendeeTrackingUpdateMessage(translate: LocalizedTranslate
     return translate('workspaceActions.updatedAttendeeTracking', {enabled: !!enabled});
 }
 
+function getAutoCategorizeNewExpensesMessage(translate: LocalizedTranslate, action: ReportAction): string {
+    if (!isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES)) {
+        return getReportActionText(action);
+    }
+
+    const {enabled} = getOriginalMessage(action) ?? {};
+    return translate('workspaceActions.updatedAutoCategorizeNewExpenses', {enabled: !!enabled});
+}
+
 function getRequiresCategoryMessage(translate: LocalizedTranslate, action: ReportAction): string {
     if (!isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY)) {
         return getReportActionText(action);
@@ -4575,6 +4668,27 @@ function getUpdatedCommuterExclusionsMessage(translate: LocalizedTranslate, repo
     return getReportActionText(reportAction);
 }
 
+function getUpdatedMemberWorkArrangementMessage(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction>): string {
+    if (!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT)) {
+        return getReportActionText(reportAction);
+    }
+    const {name, email, newValue, oldValue} = getOriginalMessage(reportAction) ?? {};
+
+    if (typeof newValue !== 'boolean' || typeof oldValue !== 'boolean') {
+        return getReportActionText(reportAction);
+    }
+
+    const newArrangement = getWorkArrangementLabel(translate, newValue);
+    const oldArrangement = getWorkArrangementLabel(translate, oldValue);
+
+    // Change logs without a named member describe the workspace default arrangement.
+    const displayName = name ?? (email ? formatPhoneNumber(email) : '');
+    if (!displayName) {
+        return translate('workspaceActions.updatedDefaultWorkArrangement', {newArrangement, oldArrangement});
+    }
+    return translate('workspaceActions.updatedMemberWorkArrangement', {displayName, newArrangement, oldArrangement});
+}
+
 function getUpdatedProhibitedExpensesMessage(translate: LocalizedTranslate, reportAction: OnyxEntry<ReportAction>) {
     const {newProhibitedExpenses, oldProhibitedExpenses} =
         getOriginalMessage(reportAction as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_PROHIBITED_EXPENSES>) ?? {};
@@ -5198,13 +5312,18 @@ export {
     isReportActionUnread,
     getHtmlWithAttachmentID,
     getActionableMentionWhisperMessage,
+    getAgentPromptUpdatedMessage,
+    getAgentPromptUpdatedMessageHTML,
     getAllReportActions,
     getCombinedReportActions,
     getDismissedViolationMessageText,
     getFirstVisibleReportActionID,
     getLatestConciergeFeedbackActionID,
+    getLatestConciergeFeedbackActionIDFromReportActions,
     getIOUActionForReportID,
     getIOUActionForTransactionID,
+    getExpenseCreationIOUActionForTransactionID,
+    getExpenseCreationTransactionID,
     getIOUReportIDFromReportActionPreview,
     getLastVisibleAction,
     getLastVisibleActionIncludingTransactionThread,
@@ -5326,7 +5445,6 @@ export {
     shouldHideNewMarker,
     shouldReportActionBeVisible,
     isReportActionVisible,
-    isReportActionVisibleAsLastAction,
     wasActionTakenByCurrentUser,
     isInviteOrRemovedAction,
     isActionableAddPaymentCard,
@@ -5361,6 +5479,7 @@ export {
     getRequiresCategoryMessage,
     getRequiresTagMessage,
     getCurrencyConversionFeeMessage,
+    getAutoCategorizeNewExpensesMessage,
     getAutoPayApprovedReportsEnabledMessage,
     getAutoReimbursementMessage,
     getCategoryTaxRateMessage,
@@ -5398,6 +5517,7 @@ export {
     getSendMoneyFlowAction,
     getUpdatedProhibitedExpensesMessage,
     getUpdatedCommuterExclusionsMessage,
+    getUpdatedMemberWorkArrangementMessage,
     getWorkspaceTagUpdateMessage,
     getWorkspaceReportFieldUpdateMessage,
     getWorkspaceReportFieldDeleteMessage,
diff --git a/src/libs/ReportAlternateTextUtils.ts b/src/libs/ReportAlternateTextUtils.ts
index 074520ebce65..1455713961b0 100644
--- a/src/libs/ReportAlternateTextUtils.ts
+++ b/src/libs/ReportAlternateTextUtils.ts
@@ -33,7 +33,7 @@ import {getAddAgentRuleMessage, getDeleteAgentRuleMessage, getUpdateAgentRuleMes
 import {isReportMessageAttachment} from './isReportMessageAttachment';
 import {formatPhoneNumber as formatPhoneNumberPhoneUtils} from './LocalePhoneNumber';
 import {formatList} from './Localize';
-import {getForReportAction} from './ModifiedExpenseMessage';
+import {getForReportAction, getMovedReportID} from './ModifiedExpenseMessage';
 import createDynamicRoute from './Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import {getIsOffline} from './NetworkState';
 import Parser from './Parser';
@@ -43,12 +43,14 @@ import {
     getActionableCard3DSTransactionApprovalMessage,
     getActionableCardFraudAlertResolutionMessage,
     getActionableMentionWhisperMessage,
+    getAgentPromptUpdatedMessage,
     getAddedApprovalRuleMessage,
     getAddedBudgetMessage,
     getAddedCardFeedMessage,
     getAddedConnectionMessage,
     getApprovalLimitUpdateMessage,
     getAssignedCompanyCardMessage,
+    getAutoCategorizeNewExpensesMessage,
     getAutoPayApprovedReportsEnabledMessage,
     getAutoReimbursementMessage,
     getCardConnectionBrokenMessage,
@@ -132,6 +134,7 @@ import {
     getUpdatedDefaultTitleMessage,
     getUpdatedIndividualBudgetNotificationMessage,
     getUpdatedManualApprovalThresholdMessage,
+    getUpdatedMemberWorkArrangementMessage,
     getUpdatedOwnershipMessage,
     getUpdatedProhibitedExpensesMessage,
     getUpdatedReimbursementChoiceMessage,
@@ -407,6 +410,36 @@ function getExpenseReportPreviewText(
     return formatReportLastMessageText(translate('iou.expenseAmount', formattedAmount, comment || undefined));
 }
 
+type LastActionContext = {
+    lastAction: OnyxEntry<ReportAction>;
+    lastActionReport: OnyxEntry<Report>;
+    movedFromReport: OnyxEntry<Report>;
+    movedToReport: OnyxEntry<Report>;
+};
+
+function resolveLastActionContext(
+    report: Report,
+    isReportArchived: boolean | undefined,
+    visibleReportActionsData: VisibleReportActionsDerivedValue | undefined,
+    oneTransactionThreadReportID?: string,
+): LastActionContext {
+    const canUserPerformWrite = canUserPerformWriteAction(report, isReportArchived);
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    const resolvedOneTransactionThreadReportID = oneTransactionThreadReportID ?? deprecatedCachedOneTransactionThreadReportIDs[report.reportID];
+    const lastAction = getLastVisibleActionIncludingTransactionThread(report.reportID, canUserPerformWrite, undefined, visibleReportActionsData, resolvedOneTransactionThreadReportID);
+    let lastActionReport: OnyxEntry<Report>;
+    if (isInviteOrRemovedAction(lastAction)) {
+        const lastActionOriginalMessage = getOriginalMessage(lastAction);
+        lastActionReport = lastActionOriginalMessage?.reportID ? getReportOrDraftReport(String(lastActionOriginalMessage.reportID)) : undefined;
+    }
+    return {
+        lastAction,
+        lastActionReport,
+        movedFromReport: getReportOrDraftReport(getMovedReportID(lastAction, CONST.REPORT.MOVE_TYPE.FROM)),
+        movedToReport: getReportOrDraftReport(getMovedReportID(lastAction, CONST.REPORT.MOVE_TYPE.TO)),
+    };
+}
+
 function getLastActorDisplayNameFromLastVisibleActions(
     report: OnyxEntry<Report>,
     lastActorDetails: Partial<PersonalDetails> | null,
@@ -416,10 +449,11 @@ function getLastActorDisplayNameFromLastVisibleActions(
     translate: LocalizedTranslate,
     visibleReportActionsData?: VisibleReportActionsDerivedValue,
     lastAction?: OnyxEntry<ReportAction>,
+    oneTransactionThreadReportID?: string,
 ): string {
     const reportID = report?.reportID;
     const canUserPerformWrite = canUserPerformWriteAction(report, privateIsArchived);
-    const lastReportAction = lastAction ?? getLastVisibleAction(reportID, canUserPerformWrite, {}, undefined, visibleReportActionsData);
+    const lastReportAction = lastAction ?? getLastVisibleActionIncludingTransactionThread(reportID, canUserPerformWrite, undefined, visibleReportActionsData, oneTransactionThreadReportID);
 
     if (lastReportAction) {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -465,6 +499,8 @@ function getLastMessageTextForReport({
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     sortedActions = deprecatedAllSortedReportActions,
     currentUserAccountID,
+    oneTransactionThreadReportID,
+    lastOriginalAction,
     rules,
 }: {
     translate: LocalizedTranslate;
@@ -490,6 +526,8 @@ function getLastMessageTextForReport({
     sortedActions?: Record<string, ReportAction[]>;
     // TODO: Remove optional (?) once all callers pass currentUserAccountID. Refactor issue: https://github.com/Expensify/App/issues/66408
     currentUserAccountID?: number;
+    oneTransactionThreadReportID?: string;
+    lastOriginalAction?: OnyxEntry<ReportAction>;
     rules: OnyxCollection<Rule>;
 }): string {
     const reportID = report?.reportID;
@@ -497,7 +535,7 @@ function getLastMessageTextForReport({
     let lastReportAction = lastAction ?? getLastVisibleAction(reportID, canUserPerformWrite, {}, undefined, visibleReportActionsDataParam);
 
     // eslint-disable-next-line @typescript-eslint/no-deprecated
-    const transactionThreadReportID = reportID ? deprecatedCachedOneTransactionThreadReportIDs[reportID] : undefined;
+    const transactionThreadReportID = oneTransactionThreadReportID ?? (reportID ? deprecatedCachedOneTransactionThreadReportIDs[reportID] : undefined);
 
     if (reportID && !lastAction && transactionThreadReportID) {
         lastReportAction =
@@ -528,7 +566,7 @@ function getLastMessageTextForReport({
 
     // some types of actions are filtered out for lastReportAction, in some cases we need to check the actual last action
     // eslint-disable-next-line @typescript-eslint/no-deprecated
-    const lastOriginalReportAction = reportID ? deprecatedLastReportActions[reportID] : undefined;
+    const lastOriginalReportAction = lastOriginalAction ?? (reportID ? deprecatedLastReportActions[reportID] : undefined);
     let lastMessageTextFromReport = '';
 
     if (isArchivedNonExpenseReport(report, isReportArchived)) {
@@ -601,6 +639,8 @@ function getLastMessageTextForReport({
         lastMessageTextFromReport = translate('parentReportAction.hiddenMessage');
     } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED)) {
         lastMessageTextFromReport = getMarkedReimbursedMessage(translate, lastReportAction);
+    } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED)) {
+        lastMessageTextFromReport = getAgentPromptUpdatedMessage(translate, lastReportAction);
     } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSED)) {
         lastMessageTextFromReport = getReimbursedMessage(
             translate,
@@ -749,6 +789,8 @@ function getLastMessageTextForReport({
         lastMessageTextFromReport = getRenamedAction(translate, lastReportAction, isExpenseReport(report));
     } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION)) {
         lastMessageTextFromReport = getDeletedTransactionMessage(translate, lastReportAction, convertToDisplayString);
+    } else if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION)) {
+        lastMessageTextFromReport = translate('iou.undeletedExpense');
     } else if (
         isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL) ||
         isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.REROUTE) ||
@@ -795,6 +837,9 @@ function getLastMessageTextForReport({
     if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRE_COMPANY_CARDS_ENABLED)) {
         lastMessageTextFromReport = getRequireCompanyCardsEnabledMessage(translate, lastReportAction);
     }
+    if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES)) {
+        lastMessageTextFromReport = getAutoCategorizeNewExpensesMessage(translate, lastReportAction);
+    }
     if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY)) {
         lastMessageTextFromReport = getRequiresCategoryMessage(translate, lastReportAction);
     }
@@ -807,6 +852,9 @@ function getLastMessageTextForReport({
     if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_HARVESTING)) {
         lastMessageTextFromReport = getUpdatedAutoHarvestingMessage(translate, lastReportAction);
     }
+    if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT)) {
+        lastMessageTextFromReport = getUpdatedMemberWorkArrangementMessage(translate, lastReportAction);
+    }
     if (isActionOfType(lastReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REIMBURSEMENT)) {
         lastMessageTextFromReport = getAutoReimbursementMessage(translate, lastReportAction, convertToDisplayString);
     }
@@ -1116,17 +1164,22 @@ type GetReportAlternateTextParams = {
     lastActionReport: OnyxEntry<Report>;
     movedFromReport?: OnyxEntry<Report>;
     movedToReport?: OnyxEntry<Report>;
-    card: Card | undefined;
+    card?: Card | undefined;
     lastMessageTextFromReport?: string;
     personalDetails: OnyxEntry<PersonalDetailsList>;
     policy: OnyxEntry<Policy>;
     invoiceReceiverPolicy: OnyxEntry<Policy>;
+    reportMetadata?: OnyxEntry<ReportMetadata>;
+    participantPersonalDetailListExcludeCurrentUser?: PersonalDetails[];
     policyTags?: OnyxEntry<PolicyTagLists>;
     isReportArchived: boolean | undefined;
     privateIsArchived: boolean;
     conciergeReportID: string | undefined;
     reportAttributesDerived?: ReportAttributesDerivedValue['reports'];
     visibleReportActionsData?: VisibleReportActionsDerivedValue;
+    sortedActions?: Record<string, ReportAction[]>;
+    oneTransactionThreadReportID?: string;
+    lastOriginalAction?: OnyxEntry<ReportAction>;
     currentUserAccountID: number;
     currentUserLogin: string;
     isTrackIntentUser?: boolean;
@@ -1154,12 +1207,17 @@ function getReportAlternateText({
     personalDetails,
     policy,
     invoiceReceiverPolicy,
+    reportMetadata: reportMetadataParam,
+    participantPersonalDetailListExcludeCurrentUser: participantPersonalDetailListExcludeCurrentUserParam,
     policyTags,
     isReportArchived,
     privateIsArchived,
     conciergeReportID,
     reportAttributesDerived,
     visibleReportActionsData,
+    sortedActions,
+    oneTransactionThreadReportID,
+    lastOriginalAction,
     currentUserAccountID,
     currentUserLogin,
     isTrackIntentUser,
@@ -1178,8 +1236,13 @@ function getReportAlternateText({
     const isTaskReportFlag = isTaskReport(report);
     const isAllowedToComment = canUserPerformWriteAction(report, isReportArchived);
     const isExpense = isExpenseReport(report);
-    const reportMetadata = getReportMetadata(report.reportID);
+    const reportMetadata = reportMetadataParam ?? getReportMetadata(report.reportID);
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    const resolvedOneTransactionThreadReportID = oneTransactionThreadReportID ?? deprecatedCachedOneTransactionThreadReportIDs[report.reportID];
     const getParticipantPersonalDetailListExcludeCurrentUser = () => {
+        if (participantPersonalDetailListExcludeCurrentUserParam) {
+            return participantPersonalDetailListExcludeCurrentUserParam;
+        }
         const participantAccountIDs = getParticipantsAccountIDsForDisplay(report);
         const participantAccountIDsExcludeCurrentUser = excludeParticipantsForDisplay(participantAccountIDs, report.participants ?? {}, reportMetadata, {shouldExcludeCurrentUser: true});
         return Object.values(getPersonalDetailsForAccountIDs(participantAccountIDsExcludeCurrentUser, personalDetails));
@@ -1202,9 +1265,11 @@ function getReportAlternateText({
     }
 
     const lastActorDisplayName = getLastActorDisplayName(lastActorDetails, currentUserAccountID, translate);
-    let lastMessageTextFromReport = lastMessageTextFromReportProp;
-    if (!lastMessageTextFromReport) {
-        lastMessageTextFromReport = getLastMessageTextForReport({
+    // An empty precomputed text means "not computed yet", so `||` (not `??`) keeps the recompute fallback meaningful.
+    const lastMessageTextFromReport =
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        lastMessageTextFromReportProp ||
+        getLastMessageTextForReport({
             translate,
             convertToDisplayString,
             dateFnsLocale,
@@ -1223,9 +1288,26 @@ function getReportAlternateText({
             lastAction,
             isTrackIntentUser,
             currentUserAccountID,
+            sortedActions,
+            oneTransactionThreadReportID: resolvedOneTransactionThreadReportID,
+            lastOriginalAction,
             rules,
         });
-    }
+
+    const getLastActorDisplayNamePrefix = () =>
+        (lastMessageTextFromReport.length > 0 &&
+            getLastActorDisplayNameFromLastVisibleActions(
+                report,
+                lastActorDetails,
+                currentUserAccountID,
+                personalDetails,
+                privateIsArchived,
+                translate,
+                visibleReportActionsData,
+                lastAction,
+                resolvedOneTransactionThreadReportID,
+            )) ||
+        lastActorDisplayName;
 
     // We need to remove sms domain in case the last message text has a phone number mention with sms domain.
     let lastMessageText = Str.removeSMSDomain(lastMessageTextFromReport);
@@ -1376,6 +1458,8 @@ function getReportAlternateText({
             alternateText = getWorkspaceAttendeeTrackingUpdateMessage(translate, lastAction);
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRE_COMPANY_CARDS_ENABLED) {
             alternateText = getRequireCompanyCardsEnabledMessage(translate, lastAction);
+        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES) {
+            alternateText = getAutoCategorizeNewExpensesMessage(translate, lastAction);
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY) {
             alternateText = getRequiresCategoryMessage(translate, lastAction);
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_TAG) {
@@ -1523,6 +1607,8 @@ function getReportAlternateText({
             alternateText = translate('iou.retracted');
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REOPENED) {
             alternateText = translate('iou.reopened');
+        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION) {
+            alternateText = translate('iou.undeletedExpense');
         } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.TRAVEL_UPDATE)) {
             alternateText = getTravelUpdateMessage(translate, lastAction);
         } else if (
@@ -1546,20 +1632,7 @@ function getReportAlternateText({
         } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED)) {
             alternateText = Parser.htmlToText(getSettlementAccountLockedMessage(translate, lastAction));
         } else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
-            const displayName =
-                (lastMessageTextFromReport.length > 0 &&
-                    getLastActorDisplayNameFromLastVisibleActions(
-                        report,
-                        lastActorDetails,
-                        currentUserAccountID,
-                        personalDetails,
-                        privateIsArchived,
-                        translate,
-                        visibleReportActionsData,
-                        lastAction,
-                    )) ||
-                lastActorDisplayName;
-            alternateText = formatReportLastMessageText(`${displayName}: ${lastMessageText}`);
+            alternateText = formatReportLastMessageText(`${getLastActorDisplayNamePrefix()}: ${lastMessageText}`);
         } else {
             alternateText =
                 lastMessageTextFromReport.length > 0
@@ -1605,20 +1678,7 @@ function getReportAlternateText({
             );
         }
         if (shouldShowLastActorDisplayName(report, lastActorDetails, lastAction, currentUserAccountID, translate) && !isReportArchived) {
-            const displayName =
-                (lastMessageTextFromReport.length > 0 &&
-                    getLastActorDisplayNameFromLastVisibleActions(
-                        report,
-                        lastActorDetails,
-                        currentUserAccountID,
-                        personalDetails,
-                        privateIsArchived,
-                        translate,
-                        visibleReportActionsData,
-                        lastAction,
-                    )) ||
-                lastActorDisplayName;
-            alternateText = `${displayName}: ${formatReportLastMessageText(lastMessageText)}`;
+            alternateText = `${getLastActorDisplayNamePrefix()}: ${formatReportLastMessageText(lastMessageText)}`;
         } else {
             alternateText = formatReportLastMessageText(lastMessageText);
         }
@@ -1656,13 +1716,12 @@ function getExpensifyCardFromReportAction({
 }
 
 export {
-    // eslint-disable-next-line @typescript-eslint/no-deprecated
-    deprecatedCachedOneTransactionThreadReportIDs,
     getExpensifyCardFromReportAction,
     getLastActorDisplayName,
     getLastActorDisplayNameFromLastVisibleActions,
     getLastMessageTextForReport,
     getReportAlternateText,
     getWelcomeMessage,
+    resolveLastActionContext,
     shouldShowLastActorDisplayName,
 };
diff --git a/src/libs/ReportNameUtils.ts b/src/libs/ReportNameUtils.ts
index 8613be55c193..923629556429 100644
--- a/src/libs/ReportNameUtils.ts
+++ b/src/libs/ReportNameUtils.ts
@@ -41,9 +41,11 @@ import {getCleanedTagName, isPolicyAdmin, isPolicyFieldListEmpty} from './Policy
 import {
     getActionableCard3DSTransactionApprovalMessage,
     getActionableCardFraudAlertResolutionMessage,
+    getAgentPromptUpdatedMessage,
     getAddedCardFeedMessage,
     getApprovalLimitUpdateMessage,
     getAssignedCompanyCardMessage,
+    getAutoCategorizeNewExpensesMessage,
     getAutoPayApprovedReportsEnabledMessage,
     getAutoReimbursementMessage,
     getCardConnectionBrokenMessage,
@@ -805,6 +807,10 @@ function computeReportNameBasedOnReportAction({
         return getMarkedReimbursedMessage(translate, parentReportAction);
     }
 
+    if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED)) {
+        return getAgentPromptUpdatedMessage(translate, parentReportAction);
+    }
+
     if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY)) {
         return getPolicyChangeMessage(translate, parentReportAction);
     }
@@ -976,6 +982,9 @@ function computeReportNameBasedOnReportAction({
     if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRE_COMPANY_CARDS_ENABLED)) {
         return getRequireCompanyCardsEnabledMessage(translate, parentReportAction);
     }
+    if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES)) {
+        return getAutoCategorizeNewExpensesMessage(translate, parentReportAction);
+    }
     if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY)) {
         return getRequiresCategoryMessage(translate, parentReportAction);
     }
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 0c43b8a05b9d..828121b1eded 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -171,47 +171,38 @@ function isSubmitAction(
 }
 
 function isApproveAction(report: Report, reportTransactions: Transaction[], currentUserAccountID: number, reportMetadata: OnyxEntry<ReportMetadata>, policy?: Policy) {
-    if (isArchivedOrPendingDeletePolicy(policy)) {
-        return false;
-    }
-
-    if (isSubmitterApproveBlockedOnSubmitWorkspace(policy, report.ownerAccountID, currentUserAccountID)) {
+    // Cheap report-level checks first so the transaction scans below only run for reports the user can approve
+    const managerID = report?.managerID ?? CONST.DEFAULT_NUMBER_ID;
+    const isCurrentUserManager = managerID === currentUserAccountID;
+    if (!isCurrentUserManager || !isExpenseReportUtils(report) || !isProcessingReportUtils(report) || reportTransactions.length === 0) {
         return false;
     }
 
-    const isAnyReceiptBeingScanned = reportTransactions?.some((transaction) => isScanning(transaction));
-
-    if (isAnyReceiptBeingScanned) {
+    if (isArchivedOrPendingDeletePolicy(policy)) {
         return false;
     }
 
-    const isDEWPolicy = hasDynamicExternalWorkflow(policy);
-    if (hasPendingDEWApprove(reportMetadata, isDEWPolicy)) {
+    if (isSubmitterApproveBlockedOnSubmitWorkspace(policy, report.ownerAccountID, currentUserAccountID)) {
         return false;
     }
 
-    const managerID = report?.managerID ?? CONST.DEFAULT_NUMBER_ID;
-    const isCurrentUserManager = managerID === currentUserAccountID;
-    if (!isCurrentUserManager) {
-        return false;
-    }
-    const isExpenseReport = isExpenseReportUtils(report);
     const isSubmitWorkspace = isSubmitPolicy(policy);
     const isApprovalEnabled = policy?.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
-
-    if (!isExpenseReport || reportTransactions.length === 0) {
+    if (!isApprovalEnabled && !isSubmitWorkspace) {
         return false;
     }
 
-    if (!isApprovalEnabled && !isSubmitWorkspace) {
+    const isDEWPolicy = hasDynamicExternalWorkflow(policy);
+    if (hasPendingDEWApprove(reportMetadata, isDEWPolicy)) {
         return false;
     }
 
-    if (reportTransactions.length > 0 && reportTransactions.every((transaction) => isPending(transaction))) {
+    const isAnyReceiptBeingScanned = reportTransactions.some((transaction) => isScanning(transaction));
+    if (isAnyReceiptBeingScanned) {
         return false;
     }
 
-    return isProcessingReportUtils(report);
+    return !reportTransactions.every((transaction) => isPending(transaction));
 }
 
 function isPrimaryPayAction({
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 90d10672320f..0eca7e463779 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -2,6 +2,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {
     BankAccountList,
+    CardList,
     OutstandingReportsByPolicyIDDerivedValue,
     Policy,
     Report,
@@ -730,11 +731,12 @@ function isDeleteAction(
     reportTransactions: Transaction[],
     currentUserAccountID: number,
     rules: OnyxCollection<Rule>,
+    policy: OnyxEntry<Policy>,
+    cardList: OnyxEntry<CardList>,
     reportActions?: ReportAction[],
-    policy?: Policy,
     isReportLevelDelete = false,
 ): boolean {
-    return canDeleteMoneyRequestReport(report, reportTransactions, reportActions ?? [], currentUserAccountID, rules, policy, isReportLevelDelete);
+    return canDeleteMoneyRequestReport(report, reportTransactions, reportActions ?? [], currentUserAccountID, rules, policy, cardList, isReportLevelDelete);
 }
 
 function shouldShowEditSplitInDeleteAction(
@@ -743,7 +745,9 @@ function shouldShowEditSplitInDeleteAction(
     reportActions: ReportAction[] | undefined,
     originalTransaction: OnyxEntry<Transaction>,
     currentUserAccountID: number,
+    policy: OnyxEntry<Policy>,
     rules: OnyxCollection<Rule>,
+    cardList: OnyxEntry<CardList>,
 ): boolean {
     if (reportTransactions.length !== 1) {
         return false;
@@ -757,7 +761,7 @@ function shouldShowEditSplitInDeleteAction(
     const isSelfDMSplit = isSelfDMReportUtils(report);
     return (
         shouldRedirectDeleteToSplitExpenseEdit(reportTransaction, originalTransaction, isSelfDMSplit) &&
-        isDeleteAction(report, reportTransactions, currentUserAccountID, rules, reportActions)
+        isDeleteAction(report, reportTransactions, currentUserAccountID, rules, policy, cardList, reportActions)
     );
 }
 
@@ -1010,6 +1014,7 @@ function getSecondaryReportActions({
     parentReport,
     isOffline,
     rules,
+    cardList,
 }: {
     currentUserLogin: string;
     currentUserAccountID: number;
@@ -1032,6 +1037,7 @@ function getSecondaryReportActions({
     /** TODO: Should be a required field in the future. Refactor issue: https://github.com/Expensify/App/issues/66407 */
     isOffline?: boolean;
     rules: OnyxCollection<Rule>;
+    cardList: OnyxEntry<CardList>;
 }): Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> {
     const options: Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> = [];
     const reportNameValuePairs = moveExpenseReportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID}`];
@@ -1137,7 +1143,7 @@ function getSecondaryReportActions({
 
     if (
         isSplitAction(report, reportTransactions, originalTransaction, currentUserLogin, currentUserAccountID, rules, submitterLogin, policy, parentReport) &&
-        !shouldShowEditSplitInDeleteAction(report, reportTransactions, reportActions, originalTransaction, currentUserAccountID, rules)
+        !shouldShowEditSplitInDeleteAction(report, reportTransactions, reportActions, originalTransaction, currentUserAccountID, policy, rules, cardList)
     ) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.SPLIT);
     }
@@ -1200,7 +1206,7 @@ function getSecondaryReportActions({
 
     options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS);
 
-    if (isDeleteAction(report, reportTransactions, currentUserAccountID, rules, reportActions ?? [], policy, true)) {
+    if (isDeleteAction(report, reportTransactions, currentUserAccountID, rules, policy, cardList, reportActions ?? [], true)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.DELETE);
     }
 
@@ -1246,6 +1252,7 @@ function getSecondaryTransactionThreadActions({
     grandParentReport,
     hasWorkspaceToSubmitTo = false,
     rules,
+    cardList,
 }: {
     currentUserLogin: string;
     currentUserAccountID: number;
@@ -1268,6 +1275,7 @@ function getSecondaryTransactionThreadActions({
     /** Whether the user belongs to a workspace they can submit an expense to (self-DM split expenses can only be submitted to a workspace). */
     hasWorkspaceToSubmitTo?: boolean;
     rules: OnyxCollection<Rule>;
+    cardList: OnyxEntry<CardList>;
 }): Array<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>> {
     const options: Array<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>> = [];
 
@@ -1285,7 +1293,7 @@ function getSecondaryTransactionThreadActions({
 
     if (
         isSplitAction(parentReport, [reportTransaction], originalTransaction, currentUserLogin, currentUserAccountID, rules, parentReportOwnerLogin, policy, grandParentReport) &&
-        !shouldShowEditSplitInDeleteAction(parentReport, [reportTransaction], reportAction ? [reportAction] : [], originalTransaction, currentUserAccountID, rules)
+        !shouldShowEditSplitInDeleteAction(parentReport, [reportTransaction], reportAction ? [reportAction] : [], originalTransaction, currentUserAccountID, policy, rules, cardList)
     ) {
         options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.SPLIT);
     }
@@ -1336,7 +1344,7 @@ function getSecondaryTransactionThreadActions({
 
     options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS);
 
-    if (isDeleteAction(parentReport, [reportTransaction], currentUserAccountID, rules, reportAction ? [reportAction] : [], policy)) {
+    if (isDeleteAction(parentReport, [reportTransaction], currentUserAccountID, rules, policy, cardList, reportAction ? [reportAction] : [])) {
         options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DELETE);
     }
 
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 5707ba8eb7e3..613ebf56c5a6 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -25,6 +25,7 @@ import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type {
     BankAccountList,
+    CardList,
     GuideAccountIDsDerivedValue,
     IntroSelected,
     OnyxInputOrEntry,
@@ -135,7 +136,7 @@ import {rand64} from './NumberUtils';
 import {isTrackOnboardingChoice} from './OnboardingUtils';
 import Parser from './Parser';
 import {getParsedMessageWithShortMentions} from './ParsingUtils';
-import {getAllPersonalDetails, getPersonalDetail} from './PersonalDetailsStore';
+import {getAllPersonalDetailLogins, getAllPersonalDetails, getPersonalDetail} from './PersonalDetailsStore';
 import {buildPersonalDetailsUpdate, getAccountIDsByLogins, getLoginByAccountID, getPersonalDetailByEmail, temporaryGetDisplayNameOrDefault} from './PersonalDetailsUtils';
 import {
     canMemberWrite as canMemberWritePolicyUtils,
@@ -170,6 +171,7 @@ import {
     shouldShowPolicy,
 } from './PolicyUtils';
 import {
+    didMessageMentionCurrentUser,
     formatLastMessageText,
     getActionableJoinRequestPendingReportAction,
     getAllReportActions,
@@ -213,6 +215,7 @@ import {
     isPayAction,
     isPendingRemove,
     isReopenedAction,
+    isReportActionUnread,
     isReportActionVisible,
     isReportPreviewAction,
     isRetractedAction,
@@ -232,7 +235,6 @@ import {
 // ReportNameUtils imports helper functions from ReportUtils, and ReportUtils imports name generation functions from ReportNameUtils.
 // eslint-disable-next-line import/no-cycle
 import {getGroupChatName, getInvoicePayerName, getInvoiceReportName, getReportName} from './ReportNameUtils';
-import {getAllPersonalDetailLogins} from './ShortMentionLogins';
 import {isTaskCompleted} from './TaskUtils';
 import {
     getAttendees,
@@ -274,10 +276,10 @@ import {
     hasReceipt as hasReceiptTransactionUtils,
     hasViolation,
     hasWarningTypeViolation,
-    isManagedCardTransaction as isCardTransactionTransactionUtils,
     isDeletedTransaction,
     isDemoTransaction,
     isDistanceRequest,
+    isFailedScanAmountPlaceholder,
     isFetchingWaypointsFromServer,
     isManagedCardTransaction,
     isManualDistanceRequest as isManualDistanceRequestTransactionUtils,
@@ -290,6 +292,7 @@ import {
     isScanning,
     isScanRequest as isScanRequestTransactionUtils,
     isTransactionPendingDelete,
+    isTransactionOwner,
 } from './TransactionUtils';
 import addTrailingForwardSlash from './UrlUtils';
 import {getDefaultAvatarURL} from './UserAvatarUtils';
@@ -1915,6 +1918,25 @@ function getReportNotificationPreference(report: OnyxEntry<Report>, currentUserA
     return participant?.notificationPreference || CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
 }
 
+/**
+ * Returns the effective notification preference for the settings UI.
+ * Legacy admin rooms can have known participants with an empty preference, so use the report default for those participants.
+ */
+function getReportNotificationPreferenceForSettings(report: OnyxEntry<Report>, currentUserAccountID?: number): ValueOf<typeof CONST.REPORT.NOTIFICATION_PREFERENCE> {
+    if (!isAdminRoom(report)) {
+        return getReportNotificationPreference(report, currentUserAccountID);
+    }
+
+    const accountID = currentUserAccountID ?? deprecatedCurrentUserAccountID;
+    const participant = accountID ? report?.participants?.[accountID] : undefined;
+
+    if (!participant) {
+        return CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
+    }
+
+    return participant.notificationPreference || getDefaultNotificationPreferenceForReport(report);
+}
+
 /**
  * Only returns true if this is our main 1:1 DM report with Concierge.
  */
@@ -3242,15 +3264,21 @@ function shouldCurrentUserSubmitReport(iouReport: OnyxEntry<Report>, chatReport:
     return isOwnReportAndRetracted || isWaitingForSubmissionFromCurrentUser(chatReport, policy);
 }
 
-/**
- * Checks whether the card transaction support deleting based on liability type
- */
-function canDeleteCardTransactionByLiabilityType(transaction: OnyxEntry<Transaction>): boolean {
-    const isCardTransaction = isCardTransactionTransactionUtils(transaction);
+function canDeleteCardTransaction(transaction: OnyxEntry<Transaction>, policy: OnyxEntry<Policy>, cardList: OnyxEntry<CardList>): boolean {
+    const isCardTransaction = isManagedCardTransaction(transaction);
     if (!isCardTransaction) {
         return true;
     }
-    return transaction?.comment?.liabilityType === CONST.TRANSACTION.LIABILITY_TYPE.ALLOW;
+
+    if (policy?.role === CONST.POLICY.ROLE.ADMIN) {
+        return true;
+    }
+
+    if (!cardList) {
+        return false;
+    }
+
+    return isTransactionOwner(transaction, cardList) && transaction?.comment?.liabilityType === CONST.TRANSACTION.LIABILITY_TYPE.ALLOW;
 }
 
 /**
@@ -3264,7 +3292,8 @@ function canDeleteMoneyRequestReport(
     reportActions: ReportAction[],
     currentUserAccountID: number,
     rules: OnyxCollection<Rule>,
-    policy?: Policy,
+    policy: OnyxEntry<Policy>,
+    cardList: OnyxEntry<CardList>,
     isReportLevelDelete = false,
 ): boolean {
     const isReportPolicyAdmin = isPolicyAdmin(policy);
@@ -3279,7 +3308,8 @@ function canDeleteMoneyRequestReport(
     }
 
     const isUnreported = isSelfDM(report) || transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
-    const canCardTransactionBeDeleted = canDeleteCardTransactionByLiabilityType(transaction);
+    const canCardTransactionBeDeleted = canDeleteCardTransaction(transaction, policy, cardList);
+
     if (isUnreported) {
         return isOwner && canCardTransactionBeDeleted;
     }
@@ -3302,14 +3332,18 @@ function canDeleteMoneyRequestReport(
     }
 
     if (isExpenseReport(report)) {
-        if (isSingleTransaction && !canCardTransactionBeDeleted) {
+        // TODO: Pass reportOwnerLogin in PR 4a, once canDeleteMoneyRequestReport takes it first.
+        // isAwaitingFirstLevelApproval falls back to the personal details store until then. See https://github.com/Expensify/App/issues/66413.
+        if (!isOpenReport(report) && !(isProcessingReport(report) && isAwaitingFirstLevelApproval(report, rules, undefined))) {
             return false;
         }
 
-        const isReportSubmitter = isCurrentUserSubmitter(report, currentUserAccountID);
-        // TODO: Pass reportOwnerLogin in PR 4a, once canDeleteMoneyRequestReport takes it first.
-        // isAwaitingFirstLevelApproval falls back to the personal details store until then. See https://github.com/Expensify/App/issues/66413.
-        return isReportSubmitter && (isOpenReport(report) || (isProcessingReport(report) && isAwaitingFirstLevelApproval(report, rules, undefined)));
+        const isSubmitterOrAdmin = isCurrentUserSubmitter(report, currentUserAccountID) || isPolicyAdmin(policy);
+        if (isSubmitterOrAdmin && isSingleTransaction && isManagedCardTransaction(transaction)) {
+            return canCardTransactionBeDeleted;
+        }
+
+        return isCurrentUserSubmitter(report, currentUserAccountID);
     }
 
     return false;
@@ -3327,17 +3361,18 @@ function canDeleteReportAction(
     childReportActions: OnyxCollection<ReportAction>,
     currentUserAccountID: number,
     rules: OnyxCollection<Rule>,
+    cardList: OnyxEntry<CardList>,
 ): boolean {
     const report = getReportOrDraftReport(reportID);
     const isActionOwner = reportAction?.actorAccountID === currentUserAccountID;
-    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? null;
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? undefined;
 
     if (isDemoTransaction(transaction)) {
         return true;
     }
 
     if (isMoneyRequestAction(reportAction)) {
-        const canCardTransactionBeDeleted = canDeleteCardTransactionByLiabilityType(transaction);
+        const canCardTransactionBeDeleted = canDeleteCardTransaction(transaction, policy, cardList);
         // For now, users cannot delete split actions
         const isSplitAction = getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
 
@@ -3363,7 +3398,8 @@ function canDeleteReportAction(
             Object.values(childReportActions ?? {}).filter((action): action is ReportAction => !!action),
             currentUserAccountID,
             rules,
-            policy ?? undefined,
+            policy,
+            cardList,
             true,
         );
     }
@@ -3702,7 +3738,10 @@ function excludeParticipantsForDisplay(
             return false;
         }
 
-        if (shouldExcludeHidden && isHiddenForCurrentUser(allReportParticipants[accountID]?.notificationPreference)) {
+        const reportParticipant = allReportParticipants[accountID];
+        // An empty preference is used by legacy rooms for members who have access but have not set a preference yet.
+        // Only an explicit hidden preference should remove a known member from the members list.
+        if (shouldExcludeHidden && (!reportParticipant || reportParticipant.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN)) {
             return false;
         }
 
@@ -4545,6 +4584,36 @@ function hasUnresolvedCardFraudAlert(reportOrOption: OnyxEntry<Report> | OptionD
     return !!getUnresolvedCardFraudAlertAction(reportOrOption.reportID);
 }
 
+/**
+ * Returns the oldest unread report action that mentions the current user, so the LHN can link to it.
+ */
+function getOldestUnreadMentionReportAction(
+    reportOrOption: OnyxEntry<Report> | OptionData,
+    reportActions: ReportActions,
+    currentUserLogin: string,
+    currentUserAccountID: number,
+): ReportAction | undefined {
+    let oldestUnreadMentionAction: ReportAction | undefined;
+    for (const action of Object.values(reportActions)) {
+        // Cheap checks run first, so most read actions are skipped before the mention regex and the visibility check
+        if (
+            !isReportActionUnread(action, reportOrOption?.lastReadTime) ||
+            wasActionTakenByCurrentUser(action, currentUserAccountID) ||
+            action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
+            isDeletedAction(action) ||
+            !didMessageMentionCurrentUser(action, currentUserLogin, currentUserAccountID) ||
+            // A hidden action, like a whisper to someone else, can't be linked to, so the LHN link would be dropped
+            !isReportActionVisible(action, reportOrOption?.reportID, undefined, undefined, currentUserAccountID)
+        ) {
+            continue;
+        }
+        if (!oldestUnreadMentionAction || isOlderReportAction(action, oldestUnreadMentionAction)) {
+            oldestUnreadMentionAction = action;
+        }
+    }
+    return oldestUnreadMentionAction;
+}
+
 function getReasonAndReportActionThatRequiresAttention(
     optionOrReport: OnyxEntry<Report> | OptionData,
     currentUserLogin: string,
@@ -4595,12 +4664,6 @@ function getReasonAndReportActionThatRequiresAttention(
         };
     }
 
-    if (isUnreadWithMention(optionOrReport)) {
-        return {
-            reason: CONST.REQUIRES_ATTENTION_REASONS.IS_UNREAD_WITH_MENTION,
-        };
-    }
-
     const optionReportMetadata = reportMetadataParam ?? allReportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${optionOrReport.reportID}`];
     // Prefer the policies collection callers already have on hand (e.g. reportAttributes.ts's own OnyxDerived
     // dependency) over the deprecated allPolicies module cache, which is populated by its own independently-timed
@@ -4644,6 +4707,7 @@ function getReasonAndReportActionThatRequiresAttention(
         !hasOnlyPendingTransactions &&
         !isFallbackReportExcludedForHeldExpenses;
 
+    // Task and IOU actions beat an unread mention, even when no action badge could be computed for them.
     if (actionTypeForAssigneeToComplete) {
         const isAssigneeExpenseAction = actionTypeForAssigneeToComplete === CONST.REPORT.ACTION_TYPES_FOR_ASSIGNEE_TO_COMPLETE.EXPENSE;
         if (isAssigneeExpenseAction) {
@@ -4694,6 +4758,15 @@ function getReasonAndReportActionThatRequiresAttention(
         };
     }
 
+    // An unread mention falls back to a green dot linked to the oldest unread mention. It stays above the invoice room
+    // branch, which can return null.
+    if (isUnreadWithMention(optionOrReport)) {
+        return {
+            reason: CONST.REQUIRES_ATTENTION_REASONS.IS_UNREAD_WITH_MENTION,
+            reportAction: getOldestUnreadMentionReportAction(optionOrReport, reportActions, currentUserLogin, currentUserAccountID),
+        };
+    }
+
     if (hasMissingInvoiceBankAccount(optionOrReport.reportID) && !isSettled(optionOrReport.reportID)) {
         return {
             reason: CONST.REQUIRES_ATTENTION_REASONS.HAS_MISSING_INVOICE_BANK_ACCOUNT,
@@ -4812,6 +4885,27 @@ function getMoneyRequestSpendBreakdown(report: OnyxInputOrEntry<Report>, searchR
     };
 }
 
+/**
+ * Builds the total columns used when an IOU report is converted to an expense report.
+ *
+ * IOU reports store their totals positive while expense reports store them negative, so every total column has to
+ * flip together with `total`. `getMoneyRequestSpendBreakdown` reads `reimbursableTotal` in preference to `total`,
+ * so negating `total` alone leaves the stale positive siblings behind and renders the Total as negative.
+ * Absent columns are not added so they keep being derived from `total`.
+ */
+function getNegatedReportTotals(
+    report: OnyxEntry<Report>,
+): Pick<Report, 'total' | 'reimbursableTotal' | 'nonReimbursableTotal' | 'unheldTotal' | 'unheldReimbursableTotal' | 'unheldNonReimbursableTotal'> {
+    return {
+        total: -(report?.total ?? 0),
+        ...(report?.reimbursableTotal != null && {reimbursableTotal: -report.reimbursableTotal}),
+        ...(report?.nonReimbursableTotal != null && {nonReimbursableTotal: -report.nonReimbursableTotal}),
+        ...(report?.unheldTotal != null && {unheldTotal: -report.unheldTotal}),
+        ...(report?.unheldReimbursableTotal != null && {unheldReimbursableTotal: -report.unheldReimbursableTotal}),
+        ...(report?.unheldNonReimbursableTotal != null && {unheldNonReimbursableTotal: -report.unheldNonReimbursableTotal}),
+    };
+}
+
 function getBillableAndTaxTotal(report: OnyxEntry<Report>, transactions: Array<OnyxEntry<Transaction>>) {
     if (!isExpenseReport(report)) {
         return {
@@ -5389,6 +5483,7 @@ function canEditMultipleTransactions(
                 policy,
                 reportActions: actionsForReport,
                 rules,
+                reportNameValuePairs: undefined,
             }),
         );
 
@@ -5463,8 +5558,7 @@ function canEditFieldOfMoneyRequest({
     transaction: OnyxEntry<Transaction>;
     report?: OnyxInputOrEntry<Report>;
     policy?: OnyxEntry<Policy>;
-    // Temporarily optional while archived report checks are migrated in smaller PRs. Remove this fallback as part of https://github.com/Expensify/App/issues/66422.
-    reportNameValuePairs?: OnyxCollection<ReportNameValuePairs>;
+    reportNameValuePairs: OnyxCollection<ReportNameValuePairs>;
     // Temporarily optional while callers are migrated in smaller PRs. Once every caller passes it, the module-level fallback in hasReportBeenForwardedSinceLastSubmit is removed as part of https://github.com/Expensify/App/issues/66419.
     reportActions?: OnyxEntry<ReportActions> | ReportAction[];
     rules: OnyxCollection<Rule>;
@@ -5521,7 +5615,7 @@ function canEditFieldOfMoneyRequest({
         return false;
     }
 
-    if ((fieldToEdit === CONST.EDIT_REQUEST_FIELD.AMOUNT || fieldToEdit === CONST.EDIT_REQUEST_FIELD.CURRENCY) && isCardTransactionTransactionUtils(transaction)) {
+    if ((fieldToEdit === CONST.EDIT_REQUEST_FIELD.AMOUNT || fieldToEdit === CONST.EDIT_REQUEST_FIELD.CURRENCY) && isManagedCardTransaction(transaction)) {
         return false;
     }
 
@@ -6507,14 +6601,22 @@ function getModifiedExpenseOriginalMessage(
     // to match how we handle the modified expense action in oldDot
     const didAmountOrCurrencyChange = 'amount' in transactionChanges || 'currency' in transactionChanges;
     if (didAmountOrCurrencyChange) {
+        // A failed scan's zero amount is only a placeholder, not a real previous value. When the user enters the
+        // first amount, omit oldAmount/oldCurrency to match the backend and render "set the amount to X" for both
+        // zero and nonzero values. Once an amount has been confirmed, isFailedScanAmountPlaceholder() returns false,
+        // so later edits continue to render "changed the amount to X (previously Y)".
+        const isSettingFailedScanAmount = isFailedScanAmountPlaceholder(oldTransaction ?? undefined) && 'amount' in transactionChanges;
+
         // When the receipt is still being scanned and has no amount yet, omit oldAmount so that
         // buildMessageFragmentForValue() treats this as a first-time "set" (generating "set the amount to X")
         // rather than an "update" (generating "changed the amount from $0 to X").
-        if (!(isReceiptBeingScanned(oldTransaction) && !getTransactionDetails(oldTransaction)?.amount)) {
+        if (!(isReceiptBeingScanned(oldTransaction) && !getTransactionDetails(oldTransaction)?.amount) && !isSettingFailedScanAmount) {
             originalMessage.oldAmount = getTransactionAmount(oldTransaction, isFromExpenseReport, false, allowNegative);
         }
         originalMessage.amount = transactionChanges?.amount ?? transactionChanges.oldAmount;
-        originalMessage.oldCurrency = getCurrency(oldTransaction);
+        if (!isSettingFailedScanAmount) {
+            originalMessage.oldCurrency = getCurrency(oldTransaction);
+        }
         originalMessage.currency = transactionChanges?.currency ?? transactionChanges.oldCurrency;
     }
 
@@ -8466,8 +8568,6 @@ function buildOptimisticModifiedExpenseReportAction(
     allowNegative = false,
 ): OptimisticModifiedExpenseReportAction {
     const originalMessage = getModifiedExpenseOriginalMessage(oldTransaction, transactionChanges, isFromExpenseReport, policy, updatedTransaction, allowNegative);
-    // Falls back to module-level delegateEmail (from Onyx.connect) for callers not yet migrated; will be removed in https://github.com/Expensify/App/issues/66425
-    const effectiveDelegateAccountID = delegateAccountIDParam ?? (delegateEmail ? getPersonalDetailByEmail(delegateEmail)?.accountID : undefined);
 
     return {
         actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
@@ -8496,7 +8596,7 @@ function buildOptimisticModifiedExpenseReportAction(
         reportActionID: rand64(),
         reportID: transactionThread?.reportID,
         shouldShow: true,
-        delegateAccountID: effectiveDelegateAccountID,
+        delegateAccountID: delegateAccountIDParam,
     };
 }
 
@@ -10669,6 +10769,16 @@ function shouldReportBeInOptionList(params: ShouldReportBeInOptionListParams) {
     return reasonForReportToBeInOptionList(params) !== null;
 }
 
+/**
+ * Stable key for a participant set, used by the `ONE_ON_ONE_CHAT_REPORT_IDS` derived value.
+ *
+ * Sorting uses the default comparator to match `getChatByParticipants`, which compares `.sort()`ed number arrays.
+ * That sort is lexicographic: [2, 10] becomes [10, 2]. A numeric sort here would stop matching.
+ */
+function getParticipantsChatKey(accountIDs: number[]): string {
+    return [...accountIDs].sort().join(',');
+}
+
 /**
  * Attempts to find a report in onyx with the provided list of participants. Does not include threads, task, expense, room, and policy expense chat.
  */
@@ -12356,8 +12466,7 @@ function isReportOutstanding(
     iouReport: OnyxInputOrEntry<Report>,
     policyID: string | undefined,
     rules: OnyxCollection<Rule>,
-    // Temporarily optional while archived report checks are migrated in smaller PRs. Remove this fallback as part of https://github.com/Expensify/App/issues/66422.
-    reportNameValuePair?: OnyxInputOrEntry<ReportNameValuePairs>,
+    reportNameValuePair: OnyxInputOrEntry<ReportNameValuePairs>,
     allowSubmitted = true,
 ): boolean {
     if (
@@ -12371,8 +12480,7 @@ function isReportOutstanding(
     ) {
         return false;
     }
-    const resolvedReportNameValuePair = reportNameValuePair ?? allReportNameValuePair?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${iouReport.reportID}`];
-    if (isArchivedReport(resolvedReportNameValuePair)) {
+    if (isArchivedReport(reportNameValuePair)) {
         return false;
     }
     const currentRoute = navigationRef.getCurrentRoute();
@@ -12395,8 +12503,7 @@ function getOutstandingReportsForUser(
     policyID: string | undefined,
     reportOwnerAccountID: number | undefined,
     rules: OnyxCollection<Rule>,
-    // Temporarily optional while archived report checks are migrated in smaller PRs. Remove this fallback as part of https://github.com/Expensify/App/issues/66422.
-    reportNameValuePairs?: OnyxCollection<ReportNameValuePairs>,
+    reportNameValuePairs: OnyxCollection<ReportNameValuePairs>,
     reports: OnyxCollection<Report> = deprecatedAllReports,
     allowSubmitted = true,
 ): Array<OnyxEntry<Report>> {
@@ -12430,7 +12537,7 @@ function getNewestOutstandingReportForUser(
     policyID: string | undefined,
     reportOwnerAccountID: number | undefined,
     rules: OnyxCollection<Rule>,
-    reportNameValuePairs?: OnyxCollection<ReportNameValuePairs>,
+    reportNameValuePairs: OnyxCollection<ReportNameValuePairs>,
     reports: OnyxCollection<Report> = deprecatedAllReports,
 ): OnyxInputValue<Report> {
     const openReports = getOutstandingReportsForUser(policyID, reportOwnerAccountID, rules, reportNameValuePairs, reports, false).filter(isOpenExpenseReport);
@@ -13794,8 +13901,9 @@ function canRejectReportAction(report: Report, currentUserAccountID: number | un
     const isIOU = isIOUReport(report);
     const isInvoice = isInvoiceReport(report);
     const isCurrentUserManager = !!currentUserAccountID && report?.managerID === currentUserAccountID;
+    const isCurrentUserAdmin = isPolicyAdmin(policy);
 
-    if (!isCurrentUserManager) {
+    if (!isCurrentUserManager && !(isCurrentUserAdmin && !isCurrentUserSubmitter(report, currentUserAccountID))) {
         return false;
     }
 
@@ -14192,8 +14300,18 @@ function isWorkspaceMemberLeavingWorkspaceRoom(report: OnyxEntry<Report>, isPoli
     return (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || hasAccessPolicyExpenseChat) && isPolicyEmployee;
 }
 
+/**
+ * Checks whether a list report field has at least one enabled value.
+ * A value without a matching `disabledOptions` entry is treated as enabled, because fields created outside NewDot
+ * can arrive with an empty `disabledOptions` array even when `values` has entries. Iterate over `values` rather than
+ * calling `disabledOptions.some(...)`, which would return false for those fields and hide them.
+ */
+function hasEnabledListValue(reportField: PolicyReportField): boolean {
+    return reportField.values.some((_, index) => !reportField.disabledOptions.at(index));
+}
+
 function shouldHideSingleReportField(reportField: PolicyReportField) {
-    const hasEnableOption = reportField.type !== CONST.REPORT_FIELD_TYPES.LIST || reportField.disabledOptions.some((option) => !option);
+    const hasEnableOption = reportField.type !== CONST.REPORT_FIELD_TYPES.LIST || hasEnabledListValue(reportField);
 
     return isReportFieldOfTypeTitle(reportField) || !hasEnableOption;
 }
@@ -14592,6 +14710,7 @@ export {
     getMissingPaymentMethodForQueuedPayment,
     getLastVisibleMessage,
     getMoneyRequestSpendBreakdown,
+    getNegatedReportTotals,
     getNonHeldAndFullAmount,
     getReimbursableTotal,
     getUnheldReimbursableTotal,
@@ -14602,6 +14721,7 @@ export {
     getParentNavigationSubtitle,
     getParsedComment,
     getParticipantsAccountIDsForDisplay,
+    getParticipantsChatKey,
     getParticipantsList,
     getPendingChatMembers,
     getPendingDeleteMemberAccountIDs,
@@ -14617,6 +14737,7 @@ export {
     getReportIDFromLink,
     getReportTransactions,
     getReportNotificationPreference,
+    getReportNotificationPreferenceForSettings,
     getReportOfflinePendingActionAndErrors,
     getReportParticipantsTitle,
     getReportPreviewMessage,
@@ -14630,7 +14751,7 @@ export {
     getRoom,
     getRootParentReport,
     getRouteFromLink,
-    canDeleteCardTransactionByLiabilityType,
+    canDeleteCardTransaction,
     isTeachersUniteReport,
     getTaskAssigneeChatOnyxData,
     getTransactionCommentObject,
@@ -14654,6 +14775,7 @@ export {
     hasReportBeenForwardedSinceLastSubmit,
     hasAutomatedExpensifyAccountIDs,
     hasEmptyReportsForPolicy,
+    hasEnabledListValue,
     hasHeldExpenses,
     hasIOUWaitingOnCurrentUserBankAccount,
     hasOnlyHeldExpenses,
diff --git a/src/libs/RuleUtils.ts b/src/libs/RuleUtils.ts
new file mode 100644
index 000000000000..89f873647671
--- /dev/null
+++ b/src/libs/RuleUtils.ts
@@ -0,0 +1,98 @@
+/**
+ * Helpers for the `rules_` collection, which holds every kind of rule (approval workflows, expense defaults, ...)
+ * under one shape. Anything reading the collection has to narrow to the kind it handles first, so those predicates
+ * live here rather than in the per-kind util files, which would otherwise import each other.
+ */
+import CONST from '@src/CONST';
+import type {ApprovalWorkflowAction, ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
+import type {ExpenseDefaultAction, ExpenseDefaultRule} from '@src/types/onyx/ExpenseDefaultRules';
+import type Rule from '@src/types/onyx/Rule';
+import type {RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
+
+/**
+ * The index-keyed object shape the rules API uses for lists (`['a', 'b']` becomes `{'1': 'a', '2': 'b'}`). The
+ * indices start at 1 because PHP decodes a 0-keyed JSON object as a list and re-encodes it as a JSON array,
+ * which loses the object shape the rules API expects.
+ */
+function toIndexMap<T>(values: T[]): Record<string, T> {
+    return Object.fromEntries(values.map((value, index) => [String(index + 1), value]));
+}
+
+/** Unwraps one of those index-keyed lists. The indices only order the list, so every reader drops them. */
+function fromIndexMap<T>(indexMap: Record<string, T> | undefined): T[] {
+    return Object.values(indexMap ?? {});
+}
+
+/** A rule's kind is read off its triggers, since nothing on the rule itself says which one it is. */
+function getRuleTriggers(rule: Rule): string[] {
+    const triggers: Record<string, string> | undefined = rule.triggers;
+    return fromIndexMap(triggers);
+}
+
+/**
+ * An approval workflow rule is one that only fires on report events.
+ *
+ * Every trigger has to be a report event, not just one of them. A rule that also fires on transaction creation is
+ * an expense default and is listed as one, so treating it as a workflow would delete it along with the workflows
+ * when approvals are turned off.
+ */
+function isApprovalWorkflowRule(rule: Rule): rule is Rule & ApprovalWorkflowRule {
+    const approvalWorkflowTriggers: readonly string[] = CONST.RULES.APPROVAL_WORKFLOW.TRIGGERS;
+    const triggers = getRuleTriggers(rule);
+
+    return triggers.length > 0 && triggers.every((trigger) => approvalWorkflowTriggers.includes(trigger));
+}
+
+/**
+ * An expense default rule fires on transaction creation, matches on a merchant, and sets at least one field.
+ *
+ * This mirrors the rules engine's own definition. It is a heuristic over triggers, filters and action names rather
+ * than a full check of every action's shape, so callers that go on to read the values still validate them field by
+ * field.
+ *
+ * The merchant condition is what keeps category rules out. They are moving into the same collection, and a client
+ * that has no way to edit them must not list them either.
+ */
+function isExpenseDefaultRule(rule: Rule | undefined): rule is Rule & ExpenseDefaultRule {
+    if (!rule) {
+        return false;
+    }
+
+    // A rule's actions are one kind or the other, so widen to the union before reading the shared name.
+    const actionsByIndex: Record<string, ExpenseDefaultAction | ApprovalWorkflowAction> | undefined = rule.actions;
+    const actions = fromIndexMap(actionsByIndex);
+    const hasCreateTransactionTrigger = getRuleTriggers(rule).some((trigger) => trigger === CONST.RULES.TRIGGERS.CREATE_TRANSACTION);
+    const hasSetAction = actions.some((action) => action?.name === CONST.RULES.ACTIONS.SET);
+    const hasMerchantFilter = getRuleFilterLeaves(rule.filters).some((leaf) => leaf.left === CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT);
+
+    return hasCreateTransactionTrigger && hasMerchantFilter && hasSetAction;
+}
+
+/** Whether an unknown value read off a rule is shaped like a node of its filter tree. */
+function isRuleFilterNode(value: unknown): value is RuleFilterNode {
+    return !!value && typeof value === 'object' && 'left' in value && 'operator' in value && 'right' in value;
+}
+
+/**
+ * A leaf node compares a single field, rather than joining two other nodes.
+ *
+ * Both shapes look the same (`{operator, left, right}`), so the giveaway is `left`: a comparison points at a
+ * field name, a combination points at another node.
+ */
+function isRuleFilterComparison(node: RuleFilterNode | undefined): node is RuleFilterComparison {
+    return !!node && typeof node.left === 'string';
+}
+
+/** Flattens a filter tree into its leaf comparisons, left to right. */
+function getRuleFilterLeaves(filters: RuleFilterNode | undefined): RuleFilterComparison[] {
+    // Rules arrive from the server, so a node can be malformed even though the type says otherwise.
+    if (!filters || !isRuleFilterNode(filters)) {
+        return [];
+    }
+    if (isRuleFilterComparison(filters)) {
+        return [filters];
+    }
+    return [...getRuleFilterLeaves(filters.left), ...getRuleFilterLeaves(filters.right)];
+}
+
+export {fromIndexMap, getRuleFilterLeaves, isApprovalWorkflowRule, isExpenseDefaultRule, isRuleFilterComparison, isRuleFilterNode, toIndexMap};
diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts
index 30934ec63579..bf853191ee79 100644
--- a/src/libs/SearchAutocompleteUtils.ts
+++ b/src/libs/SearchAutocompleteUtils.ts
@@ -258,6 +258,7 @@ function filterOutRangesWithCorrectValue(
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT:
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION:
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.TITLE:
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR:
             return range.value.length > 0;
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPORTED_TO:
             return exportedToList.get().includes(range.value);
diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index aff5fc529fc3..987c224a1d87 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -200,116 +200,117 @@ function peg$parse(input, options) {
   var peg$c14 = "group-currency";
   var peg$c15 = "tag";
   var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "paidBy";
-  var peg$c21 = "paid-by";
-  var peg$c22 = "taxrate";
-  var peg$c23 = "tax-rate";
-  var peg$c24 = "cardID";
-  var peg$c25 = "card";
-  var peg$c26 = "bankAccount";
-  var peg$c27 = "bank-account";
-  var peg$c28 = "from";
-  var peg$c29 = "attendee";
-  var peg$c30 = "expenseType";
-  var peg$c31 = "expense-type";
-  var peg$c32 = "receiptType";
-  var peg$c33 = "receipt-type";
-  var peg$c34 = "transactionStatus";
-  var peg$c35 = "transaction-status";
-  var peg$c36 = "withdrawalType";
-  var peg$c37 = "withdrawal-type";
-  var peg$c38 = "withdrawalStatus";
-  var peg$c39 = "withdrawal-status";
-  var peg$c40 = "paidStatus";
-  var peg$c41 = "paid-status";
-  var peg$c42 = "withdrawalid";
-  var peg$c43 = "withdrawal-id";
-  var peg$c44 = "billable";
-  var peg$c45 = "reimbursable";
-  var peg$c46 = "type";
-  var peg$c47 = "status";
-  var peg$c48 = "sortBy";
-  var peg$c49 = "sort-by";
-  var peg$c50 = "sortOrder";
-  var peg$c51 = "sort-order";
-  var peg$c52 = "policyID";
-  var peg$c53 = "workspace";
-  var peg$c54 = "submitted";
-  var peg$c55 = "approved";
-  var peg$c56 = "paid";
-  var peg$c57 = "exported";
-  var peg$c58 = "posted";
-  var peg$c59 = "withdrawn";
-  var peg$c60 = "groupby";
-  var peg$c61 = "group-by";
-  var peg$c62 = "limit";
-  var peg$c63 = "feed";
-  var peg$c64 = "title";
-  var peg$c65 = "submitteruserid";
-  var peg$c66 = "submitter-user-id";
-  var peg$c67 = "submitterpayrollid";
-  var peg$c68 = "submitter-payroll-id";
-  var peg$c69 = "orderdealnumbers";
-  var peg$c70 = "order-deal-numbers";
-  var peg$c71 = "assignee";
-  var peg$c72 = "createdby";
-  var peg$c73 = "created-by";
-  var peg$c74 = "action";
-  var peg$c75 = "total";
-  var peg$c76 = "has";
-  var peg$c77 = "is";
-  var peg$c78 = "purchaseamount";
-  var peg$c79 = "purchase-amount";
-  var peg$c80 = "purchasecurrency";
-  var peg$c81 = "purchase-currency";
-  var peg$c82 = "amountdebited";
-  var peg$c83 = "amount-debited";
-  var peg$c84 = "amountreimbursed";
-  var peg$c85 = "amount-reimbursed";
-  var peg$c86 = "columns";
-  var peg$c87 = "view";
-  var peg$c88 = "compare";
-  var peg$c89 = "per-diem";
-  var peg$c90 = "drafts";
-  var peg$c91 = "draft";
-  var peg$c92 = "tax";
-  var peg$c93 = "policy-name";
-  var peg$c94 = "long-report-id";
-  var peg$c95 = "exported-to";
-  var peg$c96 = "exportedto";
-  var peg$c97 = "exchange-rate";
-  var peg$c98 = "reimbursable-total";
-  var peg$c99 = "non-reimbursable-total";
-  var peg$c100 = "group-from";
-  var peg$c101 = "group-expenses";
-  var peg$c102 = "group-total";
-  var peg$c103 = "group-card";
-  var peg$c104 = "group-feed";
-  var peg$c105 = "group-bank-account";
-  var peg$c106 = "group-withdrawn";
-  var peg$c107 = "group-withdrawal-id";
-  var peg$c108 = "group-amount-debited";
-  var peg$c109 = "group-amount-reimbursed";
-  var peg$c110 = "group-category";
-  var peg$c111 = "group-tag";
-  var peg$c112 = "group-merchant";
-  var peg$c113 = "group-day";
-  var peg$c114 = "group-month";
-  var peg$c115 = "group-week";
-  var peg$c116 = "group-year";
-  var peg$c117 = "group-quarter";
-  var peg$c118 = "!=";
-  var peg$c119 = ">=";
-  var peg$c120 = ">";
-  var peg$c121 = "<=";
-  var peg$c122 = "<";
-  var peg$c123 = "\\";
-  var peg$c124 = "\u201C";
-  var peg$c125 = "\u201D";
-  var peg$c126 = "\"";
+  var peg$c17 = "vendor";
+  var peg$c18 = "to";
+  var peg$c19 = "exporter";
+  var peg$c20 = "payer";
+  var peg$c21 = "paidBy";
+  var peg$c22 = "paid-by";
+  var peg$c23 = "taxrate";
+  var peg$c24 = "tax-rate";
+  var peg$c25 = "cardID";
+  var peg$c26 = "card";
+  var peg$c27 = "bankAccount";
+  var peg$c28 = "bank-account";
+  var peg$c29 = "from";
+  var peg$c30 = "attendee";
+  var peg$c31 = "expenseType";
+  var peg$c32 = "expense-type";
+  var peg$c33 = "receiptType";
+  var peg$c34 = "receipt-type";
+  var peg$c35 = "transactionStatus";
+  var peg$c36 = "transaction-status";
+  var peg$c37 = "withdrawalType";
+  var peg$c38 = "withdrawal-type";
+  var peg$c39 = "withdrawalStatus";
+  var peg$c40 = "withdrawal-status";
+  var peg$c41 = "paidStatus";
+  var peg$c42 = "paid-status";
+  var peg$c43 = "withdrawalid";
+  var peg$c44 = "withdrawal-id";
+  var peg$c45 = "billable";
+  var peg$c46 = "reimbursable";
+  var peg$c47 = "type";
+  var peg$c48 = "status";
+  var peg$c49 = "sortBy";
+  var peg$c50 = "sort-by";
+  var peg$c51 = "sortOrder";
+  var peg$c52 = "sort-order";
+  var peg$c53 = "policyID";
+  var peg$c54 = "workspace";
+  var peg$c55 = "submitted";
+  var peg$c56 = "approved";
+  var peg$c57 = "paid";
+  var peg$c58 = "exported";
+  var peg$c59 = "posted";
+  var peg$c60 = "withdrawn";
+  var peg$c61 = "groupby";
+  var peg$c62 = "group-by";
+  var peg$c63 = "limit";
+  var peg$c64 = "feed";
+  var peg$c65 = "title";
+  var peg$c66 = "submitteruserid";
+  var peg$c67 = "submitter-user-id";
+  var peg$c68 = "submitterpayrollid";
+  var peg$c69 = "submitter-payroll-id";
+  var peg$c70 = "orderdealnumbers";
+  var peg$c71 = "order-deal-numbers";
+  var peg$c72 = "assignee";
+  var peg$c73 = "createdby";
+  var peg$c74 = "created-by";
+  var peg$c75 = "action";
+  var peg$c76 = "total";
+  var peg$c77 = "has";
+  var peg$c78 = "is";
+  var peg$c79 = "purchaseamount";
+  var peg$c80 = "purchase-amount";
+  var peg$c81 = "purchasecurrency";
+  var peg$c82 = "purchase-currency";
+  var peg$c83 = "amountdebited";
+  var peg$c84 = "amount-debited";
+  var peg$c85 = "amountreimbursed";
+  var peg$c86 = "amount-reimbursed";
+  var peg$c87 = "columns";
+  var peg$c88 = "view";
+  var peg$c89 = "compare";
+  var peg$c90 = "per-diem";
+  var peg$c91 = "drafts";
+  var peg$c92 = "draft";
+  var peg$c93 = "tax";
+  var peg$c94 = "policy-name";
+  var peg$c95 = "long-report-id";
+  var peg$c96 = "exported-to";
+  var peg$c97 = "exportedto";
+  var peg$c98 = "exchange-rate";
+  var peg$c99 = "reimbursable-total";
+  var peg$c100 = "non-reimbursable-total";
+  var peg$c101 = "group-from";
+  var peg$c102 = "group-expenses";
+  var peg$c103 = "group-total";
+  var peg$c104 = "group-card";
+  var peg$c105 = "group-feed";
+  var peg$c106 = "group-bank-account";
+  var peg$c107 = "group-withdrawn";
+  var peg$c108 = "group-withdrawal-id";
+  var peg$c109 = "group-amount-debited";
+  var peg$c110 = "group-amount-reimbursed";
+  var peg$c111 = "group-category";
+  var peg$c112 = "group-tag";
+  var peg$c113 = "group-merchant";
+  var peg$c114 = "group-day";
+  var peg$c115 = "group-month";
+  var peg$c116 = "group-week";
+  var peg$c117 = "group-year";
+  var peg$c118 = "group-quarter";
+  var peg$c119 = "!=";
+  var peg$c120 = ">=";
+  var peg$c121 = ">";
+  var peg$c122 = "<=";
+  var peg$c123 = "<";
+  var peg$c124 = "\\";
+  var peg$c125 = "\u201C";
+  var peg$c126 = "\u201D";
+  var peg$c127 = "\"";
 
   var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
   var peg$r1 = /^[:=]/;
@@ -346,133 +347,134 @@ function peg$parse(input, options) {
   var peg$e17 = peg$literalExpectation("group-currency", true);
   var peg$e18 = peg$literalExpectation("tag", true);
   var peg$e19 = peg$literalExpectation("category", true);
-  var peg$e20 = peg$literalExpectation("to", true);
-  var peg$e21 = peg$literalExpectation("exporter", true);
-  var peg$e22 = peg$literalExpectation("payer", true);
-  var peg$e23 = peg$literalExpectation("paidBy", false);
-  var peg$e24 = peg$literalExpectation("paid-by", true);
-  var peg$e25 = peg$literalExpectation("taxRate", true);
-  var peg$e26 = peg$literalExpectation("tax-rate", true);
-  var peg$e27 = peg$literalExpectation("cardID", false);
-  var peg$e28 = peg$literalExpectation("card", true);
-  var peg$e29 = peg$literalExpectation("bankAccount", false);
-  var peg$e30 = peg$literalExpectation("bank-account", true);
-  var peg$e31 = peg$literalExpectation("from", true);
-  var peg$e32 = peg$literalExpectation("attendee", true);
-  var peg$e33 = peg$literalExpectation("expenseType", false);
-  var peg$e34 = peg$literalExpectation("expense-type", true);
-  var peg$e35 = peg$literalExpectation("receiptType", false);
-  var peg$e36 = peg$literalExpectation("receipt-type", true);
-  var peg$e37 = peg$literalExpectation("transactionStatus", false);
-  var peg$e38 = peg$literalExpectation("transaction-status", true);
-  var peg$e39 = peg$literalExpectation("withdrawalType", false);
-  var peg$e40 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e41 = peg$literalExpectation("withdrawalStatus", false);
-  var peg$e42 = peg$literalExpectation("withdrawal-status", true);
-  var peg$e43 = peg$literalExpectation("paidStatus", false);
-  var peg$e44 = peg$literalExpectation("paid-status", true);
-  var peg$e45 = peg$literalExpectation("withdrawalID", true);
-  var peg$e46 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e47 = peg$literalExpectation("billable", true);
-  var peg$e48 = peg$literalExpectation("reimbursable", true);
-  var peg$e49 = peg$literalExpectation("type", true);
-  var peg$e50 = peg$literalExpectation("status", true);
-  var peg$e51 = peg$literalExpectation("sortBy", false);
-  var peg$e52 = peg$literalExpectation("sort-by", true);
-  var peg$e53 = peg$literalExpectation("sortOrder", false);
-  var peg$e54 = peg$literalExpectation("sort-order", true);
-  var peg$e55 = peg$literalExpectation("policyID", false);
-  var peg$e56 = peg$literalExpectation("workspace", true);
-  var peg$e57 = peg$literalExpectation("submitted", true);
-  var peg$e58 = peg$literalExpectation("approved", true);
-  var peg$e59 = peg$literalExpectation("paid", true);
-  var peg$e60 = peg$literalExpectation("exported", true);
-  var peg$e61 = peg$literalExpectation("posted", true);
-  var peg$e62 = peg$literalExpectation("withdrawn", true);
-  var peg$e63 = peg$literalExpectation("groupBy", true);
-  var peg$e64 = peg$literalExpectation("group-by", true);
-  var peg$e65 = peg$literalExpectation("limit", true);
-  var peg$e66 = peg$literalExpectation("feed", true);
-  var peg$e67 = peg$literalExpectation("title", true);
-  var peg$e68 = peg$literalExpectation("submitterUserID", true);
-  var peg$e69 = peg$literalExpectation("submitter-user-id", true);
-  var peg$e70 = peg$literalExpectation("submitterPayrollID", true);
-  var peg$e71 = peg$literalExpectation("submitter-payroll-id", true);
-  var peg$e72 = peg$literalExpectation("orderDealNumbers", true);
-  var peg$e73 = peg$literalExpectation("order-deal-numbers", true);
-  var peg$e74 = peg$literalExpectation("assignee", true);
-  var peg$e75 = peg$literalExpectation("createdBy", true);
-  var peg$e76 = peg$literalExpectation("created-by", true);
-  var peg$e77 = peg$literalExpectation("action", true);
-  var peg$e78 = peg$literalExpectation("total", true);
-  var peg$e79 = peg$literalExpectation("has", true);
-  var peg$e80 = peg$literalExpectation("is", true);
-  var peg$e81 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e82 = peg$literalExpectation("purchase-amount", true);
-  var peg$e83 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e84 = peg$literalExpectation("purchase-currency", true);
-  var peg$e85 = peg$literalExpectation("amountDebited", true);
-  var peg$e86 = peg$literalExpectation("amount-debited", true);
-  var peg$e87 = peg$literalExpectation("amountReimbursed", true);
-  var peg$e88 = peg$literalExpectation("amount-reimbursed", true);
-  var peg$e89 = peg$literalExpectation("columns", true);
-  var peg$e90 = peg$literalExpectation("view", true);
-  var peg$e91 = peg$literalExpectation("compare", true);
-  var peg$e92 = peg$literalExpectation("per-diem", true);
-  var peg$e93 = peg$literalExpectation("drafts", true);
-  var peg$e94 = peg$literalExpectation("draft", true);
-  var peg$e95 = peg$literalExpectation("tax", true);
-  var peg$e96 = peg$literalExpectation("policy-name", true);
-  var peg$e97 = peg$literalExpectation("long-report-id", true);
-  var peg$e98 = peg$literalExpectation("exported-to", true);
-  var peg$e99 = peg$classExpectation([":", "="], false, false);
-  var peg$e100 = peg$literalExpectation("exportedTo", true);
-  var peg$e101 = peg$literalExpectation("exchange-rate", true);
-  var peg$e102 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e103 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e104 = peg$literalExpectation("group-from", true);
-  var peg$e105 = peg$literalExpectation("group-expenses", true);
-  var peg$e106 = peg$literalExpectation("group-total", true);
-  var peg$e107 = peg$literalExpectation("group-card", true);
-  var peg$e108 = peg$literalExpectation("group-feed", true);
-  var peg$e109 = peg$literalExpectation("group-bank-account", true);
-  var peg$e110 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e111 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e112 = peg$literalExpectation("group-amount-debited", true);
-  var peg$e113 = peg$literalExpectation("group-amount-reimbursed", true);
-  var peg$e114 = peg$literalExpectation("group-category", true);
-  var peg$e115 = peg$literalExpectation("group-tag", true);
-  var peg$e116 = peg$literalExpectation("group-merchant", true);
-  var peg$e117 = peg$literalExpectation("group-day", true);
-  var peg$e118 = peg$literalExpectation("group-month", true);
-  var peg$e119 = peg$literalExpectation("group-week", true);
-  var peg$e120 = peg$literalExpectation("group-year", true);
-  var peg$e121 = peg$literalExpectation("group-quarter", true);
-  var peg$e122 = peg$otherExpectation("operator");
-  var peg$e123 = peg$literalExpectation("!=", false);
-  var peg$e124 = peg$literalExpectation(">=", false);
-  var peg$e125 = peg$literalExpectation(">", false);
-  var peg$e126 = peg$literalExpectation("<=", false);
-  var peg$e127 = peg$literalExpectation("<", false);
-  var peg$e128 = peg$literalExpectation("\\", false);
-  var peg$e129 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false);
-  var peg$e130 = peg$otherExpectation("word");
-  var peg$e131 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e132 = peg$otherExpectation("whitespace");
-  var peg$e133 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e134 = peg$otherExpectation("quote");
-  var peg$e135 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e136 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e137 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e138 = peg$literalExpectation("\u201C", false);
-  var peg$e139 = peg$literalExpectation("\u201D", false);
-  var peg$e140 = peg$literalExpectation("\"", false);
-  var peg$e141 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e142 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e143 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e144 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e145 = peg$classExpectation([","], false, false);
-  var peg$e146 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+  var peg$e20 = peg$literalExpectation("vendor", true);
+  var peg$e21 = peg$literalExpectation("to", true);
+  var peg$e22 = peg$literalExpectation("exporter", true);
+  var peg$e23 = peg$literalExpectation("payer", true);
+  var peg$e24 = peg$literalExpectation("paidBy", false);
+  var peg$e25 = peg$literalExpectation("paid-by", true);
+  var peg$e26 = peg$literalExpectation("taxRate", true);
+  var peg$e27 = peg$literalExpectation("tax-rate", true);
+  var peg$e28 = peg$literalExpectation("cardID", false);
+  var peg$e29 = peg$literalExpectation("card", true);
+  var peg$e30 = peg$literalExpectation("bankAccount", false);
+  var peg$e31 = peg$literalExpectation("bank-account", true);
+  var peg$e32 = peg$literalExpectation("from", true);
+  var peg$e33 = peg$literalExpectation("attendee", true);
+  var peg$e34 = peg$literalExpectation("expenseType", false);
+  var peg$e35 = peg$literalExpectation("expense-type", true);
+  var peg$e36 = peg$literalExpectation("receiptType", false);
+  var peg$e37 = peg$literalExpectation("receipt-type", true);
+  var peg$e38 = peg$literalExpectation("transactionStatus", false);
+  var peg$e39 = peg$literalExpectation("transaction-status", true);
+  var peg$e40 = peg$literalExpectation("withdrawalType", false);
+  var peg$e41 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e42 = peg$literalExpectation("withdrawalStatus", false);
+  var peg$e43 = peg$literalExpectation("withdrawal-status", true);
+  var peg$e44 = peg$literalExpectation("paidStatus", false);
+  var peg$e45 = peg$literalExpectation("paid-status", true);
+  var peg$e46 = peg$literalExpectation("withdrawalID", true);
+  var peg$e47 = peg$literalExpectation("withdrawal-id", true);
+  var peg$e48 = peg$literalExpectation("billable", true);
+  var peg$e49 = peg$literalExpectation("reimbursable", true);
+  var peg$e50 = peg$literalExpectation("type", true);
+  var peg$e51 = peg$literalExpectation("status", true);
+  var peg$e52 = peg$literalExpectation("sortBy", false);
+  var peg$e53 = peg$literalExpectation("sort-by", true);
+  var peg$e54 = peg$literalExpectation("sortOrder", false);
+  var peg$e55 = peg$literalExpectation("sort-order", true);
+  var peg$e56 = peg$literalExpectation("policyID", false);
+  var peg$e57 = peg$literalExpectation("workspace", true);
+  var peg$e58 = peg$literalExpectation("submitted", true);
+  var peg$e59 = peg$literalExpectation("approved", true);
+  var peg$e60 = peg$literalExpectation("paid", true);
+  var peg$e61 = peg$literalExpectation("exported", true);
+  var peg$e62 = peg$literalExpectation("posted", true);
+  var peg$e63 = peg$literalExpectation("withdrawn", true);
+  var peg$e64 = peg$literalExpectation("groupBy", true);
+  var peg$e65 = peg$literalExpectation("group-by", true);
+  var peg$e66 = peg$literalExpectation("limit", true);
+  var peg$e67 = peg$literalExpectation("feed", true);
+  var peg$e68 = peg$literalExpectation("title", true);
+  var peg$e69 = peg$literalExpectation("submitterUserID", true);
+  var peg$e70 = peg$literalExpectation("submitter-user-id", true);
+  var peg$e71 = peg$literalExpectation("submitterPayrollID", true);
+  var peg$e72 = peg$literalExpectation("submitter-payroll-id", true);
+  var peg$e73 = peg$literalExpectation("orderDealNumbers", true);
+  var peg$e74 = peg$literalExpectation("order-deal-numbers", true);
+  var peg$e75 = peg$literalExpectation("assignee", true);
+  var peg$e76 = peg$literalExpectation("createdBy", true);
+  var peg$e77 = peg$literalExpectation("created-by", true);
+  var peg$e78 = peg$literalExpectation("action", true);
+  var peg$e79 = peg$literalExpectation("total", true);
+  var peg$e80 = peg$literalExpectation("has", true);
+  var peg$e81 = peg$literalExpectation("is", true);
+  var peg$e82 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e83 = peg$literalExpectation("purchase-amount", true);
+  var peg$e84 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e85 = peg$literalExpectation("purchase-currency", true);
+  var peg$e86 = peg$literalExpectation("amountDebited", true);
+  var peg$e87 = peg$literalExpectation("amount-debited", true);
+  var peg$e88 = peg$literalExpectation("amountReimbursed", true);
+  var peg$e89 = peg$literalExpectation("amount-reimbursed", true);
+  var peg$e90 = peg$literalExpectation("columns", true);
+  var peg$e91 = peg$literalExpectation("view", true);
+  var peg$e92 = peg$literalExpectation("compare", true);
+  var peg$e93 = peg$literalExpectation("per-diem", true);
+  var peg$e94 = peg$literalExpectation("drafts", true);
+  var peg$e95 = peg$literalExpectation("draft", true);
+  var peg$e96 = peg$literalExpectation("tax", true);
+  var peg$e97 = peg$literalExpectation("policy-name", true);
+  var peg$e98 = peg$literalExpectation("long-report-id", true);
+  var peg$e99 = peg$literalExpectation("exported-to", true);
+  var peg$e100 = peg$classExpectation([":", "="], false, false);
+  var peg$e101 = peg$literalExpectation("exportedTo", true);
+  var peg$e102 = peg$literalExpectation("exchange-rate", true);
+  var peg$e103 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e104 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e105 = peg$literalExpectation("group-from", true);
+  var peg$e106 = peg$literalExpectation("group-expenses", true);
+  var peg$e107 = peg$literalExpectation("group-total", true);
+  var peg$e108 = peg$literalExpectation("group-card", true);
+  var peg$e109 = peg$literalExpectation("group-feed", true);
+  var peg$e110 = peg$literalExpectation("group-bank-account", true);
+  var peg$e111 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e112 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e113 = peg$literalExpectation("group-amount-debited", true);
+  var peg$e114 = peg$literalExpectation("group-amount-reimbursed", true);
+  var peg$e115 = peg$literalExpectation("group-category", true);
+  var peg$e116 = peg$literalExpectation("group-tag", true);
+  var peg$e117 = peg$literalExpectation("group-merchant", true);
+  var peg$e118 = peg$literalExpectation("group-day", true);
+  var peg$e119 = peg$literalExpectation("group-month", true);
+  var peg$e120 = peg$literalExpectation("group-week", true);
+  var peg$e121 = peg$literalExpectation("group-year", true);
+  var peg$e122 = peg$literalExpectation("group-quarter", true);
+  var peg$e123 = peg$otherExpectation("operator");
+  var peg$e124 = peg$literalExpectation("!=", false);
+  var peg$e125 = peg$literalExpectation(">=", false);
+  var peg$e126 = peg$literalExpectation(">", false);
+  var peg$e127 = peg$literalExpectation("<=", false);
+  var peg$e128 = peg$literalExpectation("<", false);
+  var peg$e129 = peg$literalExpectation("\\", false);
+  var peg$e130 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false);
+  var peg$e131 = peg$otherExpectation("word");
+  var peg$e132 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e133 = peg$otherExpectation("whitespace");
+  var peg$e134 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e135 = peg$otherExpectation("quote");
+  var peg$e136 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e137 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e138 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e139 = peg$literalExpectation("\u201C", false);
+  var peg$e140 = peg$literalExpectation("\u201D", false);
+  var peg$e141 = peg$literalExpectation("\"", false);
+  var peg$e142 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e143 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e144 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e145 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e146 = peg$classExpectation([","], false, false);
+  var peg$e147 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
 
   var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
   var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
@@ -548,122 +550,123 @@ function peg$parse(input, options) {
   var peg$f16 = function() { return "groupCurrency"; };
   var peg$f17 = function() { return "tag"; };
   var peg$f18 = function() { return "category"; };
-  var peg$f19 = function() { return "to"; };
-  var peg$f20 = function() { return "exporter"; };
-  var peg$f21 = function() { return "payer"; };
-  var peg$f22 = function() { return "paidBy"; };
-  var peg$f23 = function() { return "taxRate"; };
-  var peg$f24 = function() { return "cardID"; };
-  var peg$f25 = function() { return "bankAccount"; };
-  var peg$f26 = function() { return "from"; };
-  var peg$f27 = function() {return "attendee"};
-  var peg$f28 = function() { return "expenseType"; };
-  var peg$f29 = function() { return "receiptType"; };
-  var peg$f30 = function() { return "transactionStatus"; };
-  var peg$f31 = function() { return "withdrawalType"; };
-  var peg$f32 = function() { return "withdrawalStatus"; };
-  var peg$f33 = function() { return "paidStatus"; };
-  var peg$f34 = function() { return "withdrawalID"; };
-  var peg$f35 = function() { return "billable"; };
-  var peg$f36 = function() { return "reimbursable"; };
-  var peg$f37 = function() { return "type"; };
-  var peg$f38 = function() { return "status"; };
-  var peg$f39 = function() { return "sortBy"; };
-  var peg$f40 = function() { return "sortOrder"; };
-  var peg$f41 = function() { return "policyID"; };
-  var peg$f42 = function() { return "submitted"; };
-  var peg$f43 = function() { return "approved"; };
-  var peg$f44 = function() { return "paid"; };
-  var peg$f45 = function() { return "exported"; };
-  var peg$f46 = function() { return "posted"; };
-  var peg$f47 = function() { return "withdrawn"; };
-  var peg$f48 = function() { return "groupBy"; };
-  var peg$f49 = function() { return "limit"; };
-  var peg$f50 = function() { return "feed"; };
-  var peg$f51 = function() { return "title"; };
-  var peg$f52 = function() { return "submitterUserID"; };
-  var peg$f53 = function() { return "submitterPayrollID"; };
-  var peg$f54 = function() { return "orderDealNumbers"; };
-  var peg$f55 = function() { return "assignee"; };
-  var peg$f56 = function() { return "createdBy"; };
-  var peg$f57 = function() { return "action"; };
-  var peg$f58 = function() {return "total"; };
-  var peg$f59 = function() {return "has"; };
-  var peg$f60 = function() {return "is"; };
-  var peg$f61 = function() {return "purchaseAmount"};
-  var peg$f62 = function() {return "purchaseCurrency"};
-  var peg$f63 = function() {return "amountDebited"};
-  var peg$f64 = function() {return "amountReimbursed"};
-  var peg$f65 = function() {
+  var peg$f19 = function() { return "vendor"; };
+  var peg$f20 = function() { return "to"; };
+  var peg$f21 = function() { return "exporter"; };
+  var peg$f22 = function() { return "payer"; };
+  var peg$f23 = function() { return "paidBy"; };
+  var peg$f24 = function() { return "taxRate"; };
+  var peg$f25 = function() { return "cardID"; };
+  var peg$f26 = function() { return "bankAccount"; };
+  var peg$f27 = function() { return "from"; };
+  var peg$f28 = function() {return "attendee"};
+  var peg$f29 = function() { return "expenseType"; };
+  var peg$f30 = function() { return "receiptType"; };
+  var peg$f31 = function() { return "transactionStatus"; };
+  var peg$f32 = function() { return "withdrawalType"; };
+  var peg$f33 = function() { return "withdrawalStatus"; };
+  var peg$f34 = function() { return "paidStatus"; };
+  var peg$f35 = function() { return "withdrawalID"; };
+  var peg$f36 = function() { return "billable"; };
+  var peg$f37 = function() { return "reimbursable"; };
+  var peg$f38 = function() { return "type"; };
+  var peg$f39 = function() { return "status"; };
+  var peg$f40 = function() { return "sortBy"; };
+  var peg$f41 = function() { return "sortOrder"; };
+  var peg$f42 = function() { return "policyID"; };
+  var peg$f43 = function() { return "submitted"; };
+  var peg$f44 = function() { return "approved"; };
+  var peg$f45 = function() { return "paid"; };
+  var peg$f46 = function() { return "exported"; };
+  var peg$f47 = function() { return "posted"; };
+  var peg$f48 = function() { return "withdrawn"; };
+  var peg$f49 = function() { return "groupBy"; };
+  var peg$f50 = function() { return "limit"; };
+  var peg$f51 = function() { return "feed"; };
+  var peg$f52 = function() { return "title"; };
+  var peg$f53 = function() { return "submitterUserID"; };
+  var peg$f54 = function() { return "submitterPayrollID"; };
+  var peg$f55 = function() { return "orderDealNumbers"; };
+  var peg$f56 = function() { return "assignee"; };
+  var peg$f57 = function() { return "createdBy"; };
+  var peg$f58 = function() { return "action"; };
+  var peg$f59 = function() {return "total"; };
+  var peg$f60 = function() {return "has"; };
+  var peg$f61 = function() {return "is"; };
+  var peg$f62 = function() {return "purchaseAmount"};
+  var peg$f63 = function() {return "purchaseCurrency"};
+  var peg$f64 = function() {return "amountDebited"};
+  var peg$f65 = function() {return "amountReimbursed"};
+  var peg$f66 = function() {
   isColumnsContext = true;
   return "columns";
 };
-  var peg$f66 = function() {return "view"};
-  var peg$f67 = function() {return "compare"};
-  var peg$f68 = function() { return isColumnsContext; };
-  var peg$f69 = function() { return "perDiem"; };
-  var peg$f70 = function() { return "drafts"; };
-  var peg$f71 = function() { return "originalamount"; };
-  var peg$f72 = function() { return "taxAmount"; };
-  var peg$f73 = function() { return "taxrate"; };
-  var peg$f74 = function() { return "policyname"; };
-  var peg$f75 = function() { return "withdrawalID"; };
-  var peg$f76 = function() { return "bankAccount"; };
-  var peg$f77 = function() { return "reportID"; };
-  var peg$f78 = function() { return "base62ReportID"; };
-  var peg$f79 = function() { return "exportedto"; };
-  var peg$f80 = function() { return "exportedTo"; };
+  var peg$f67 = function() {return "view"};
+  var peg$f68 = function() {return "compare"};
+  var peg$f69 = function() { return isColumnsContext; };
+  var peg$f70 = function() { return "perDiem"; };
+  var peg$f71 = function() { return "drafts"; };
+  var peg$f72 = function() { return "originalamount"; };
+  var peg$f73 = function() { return "taxAmount"; };
+  var peg$f74 = function() { return "taxrate"; };
+  var peg$f75 = function() { return "policyname"; };
+  var peg$f76 = function() { return "withdrawalID"; };
+  var peg$f77 = function() { return "bankAccount"; };
+  var peg$f78 = function() { return "reportID"; };
+  var peg$f79 = function() { return "base62ReportID"; };
+  var peg$f80 = function() { return "exportedto"; };
   var peg$f81 = function() { return "exportedTo"; };
-  var peg$f82 = function() { return "exchangeRate"; };
-  var peg$f83 = function() { return "reimbursableTotal"; };
-  var peg$f84 = function() { return "nonReimbursableTotal"; };
-  var peg$f85 = function() { return "groupFrom"; };
-  var peg$f86 = function() { return "groupExpenses"; };
-  var peg$f87 = function() { return "groupTotal"; };
-  var peg$f88 = function() { return "groupCard"; };
-  var peg$f89 = function() { return "groupFeed"; };
-  var peg$f90 = function() { return "groupBankAccount"; };
-  var peg$f91 = function() { return "groupWithdrawn"; };
-  var peg$f92 = function() { return "groupWithdrawalID"; };
-  var peg$f93 = function() { return "groupAmountDebited"; };
-  var peg$f94 = function() { return "groupAmountReimbursed"; };
-  var peg$f95 = function() { return "amountDebited"; };
-  var peg$f96 = function() { return "amountReimbursed"; };
-  var peg$f97 = function() { return "groupCategory"; };
-  var peg$f98 = function() { return "groupTag"; };
-  var peg$f99 = function() { return "groupMerchant"; };
-  var peg$f100 = function() { return "groupday"; };
-  var peg$f101 = function() { return "groupmonth"; };
-  var peg$f102 = function() { return "groupweek"; };
-  var peg$f103 = function() { return "groupyear"; };
-  var peg$f104 = function() { return "groupquarter"; };
-  var peg$f105 = function() { return "eq"; };
-  var peg$f106 = function() { return "neq"; };
-  var peg$f107 = function() { return "gte"; };
-  var peg$f108 = function() { return "gt"; };
-  var peg$f109 = function() { return "lte"; };
-  var peg$f110 = function() { return "lt"; };
-  var peg$f111 = function(o) {
+  var peg$f82 = function() { return "exportedTo"; };
+  var peg$f83 = function() { return "exchangeRate"; };
+  var peg$f84 = function() { return "reimbursableTotal"; };
+  var peg$f85 = function() { return "nonReimbursableTotal"; };
+  var peg$f86 = function() { return "groupFrom"; };
+  var peg$f87 = function() { return "groupExpenses"; };
+  var peg$f88 = function() { return "groupTotal"; };
+  var peg$f89 = function() { return "groupCard"; };
+  var peg$f90 = function() { return "groupFeed"; };
+  var peg$f91 = function() { return "groupBankAccount"; };
+  var peg$f92 = function() { return "groupWithdrawn"; };
+  var peg$f93 = function() { return "groupWithdrawalID"; };
+  var peg$f94 = function() { return "groupAmountDebited"; };
+  var peg$f95 = function() { return "groupAmountReimbursed"; };
+  var peg$f96 = function() { return "amountDebited"; };
+  var peg$f97 = function() { return "amountReimbursed"; };
+  var peg$f98 = function() { return "groupCategory"; };
+  var peg$f99 = function() { return "groupTag"; };
+  var peg$f100 = function() { return "groupMerchant"; };
+  var peg$f101 = function() { return "groupday"; };
+  var peg$f102 = function() { return "groupmonth"; };
+  var peg$f103 = function() { return "groupweek"; };
+  var peg$f104 = function() { return "groupyear"; };
+  var peg$f105 = function() { return "groupquarter"; };
+  var peg$f106 = function() { return "eq"; };
+  var peg$f107 = function() { return "neq"; };
+  var peg$f108 = function() { return "gte"; };
+  var peg$f109 = function() { return "gt"; };
+  var peg$f110 = function() { return "lte"; };
+  var peg$f111 = function() { return "lt"; };
+  var peg$f112 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       isColumnsContext = false;
       return o;
   };
-  var peg$f112 = function(c) { return c; };
-  var peg$f113 = function(chars) { return chars.join("").trim(); };
-  var peg$f114 = function() {
+  var peg$f113 = function(c) { return c; };
+  var peg$f114 = function(chars) { return chars.join("").trim(); };
+  var peg$f115 = function() {
   isColumnsContext = false;
   return "and";
 };
-  var peg$f115 = function() { return expectingNestedQuote; };
-  var peg$f116 = function(start, inner, end) { //handle no-breaking space
+  var peg$f116 = function() { return expectingNestedQuote; };
+  var peg$f117 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f117 = function(start) {return "“"};
-  var peg$f118 = function(start) {return "”"};
-  var peg$f119 = function(start) {return "\""};
-  var peg$f120 = function(start, inner, end) {
+  var peg$f118 = function(start) {return "“"};
+  var peg$f119 = function(start) {return "”"};
+  var peg$f120 = function(start) {return "\""};
+  var peg$f121 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -1088,109 +1091,112 @@ function peg$parse(input, options) {
             if (s1 === peg$FAILED) {
               s1 = peg$parsecategory();
               if (s1 === peg$FAILED) {
-                s1 = peg$parseto();
+                s1 = peg$parsevendor();
                 if (s1 === peg$FAILED) {
-                  s1 = peg$parsetaxRate();
+                  s1 = peg$parseto();
                   if (s1 === peg$FAILED) {
-                    s1 = peg$parsefrom();
+                    s1 = peg$parsetaxRate();
                     if (s1 === peg$FAILED) {
-                      s1 = peg$parseattendee();
+                      s1 = peg$parsefrom();
                       if (s1 === peg$FAILED) {
-                        s1 = peg$parsepayer();
+                        s1 = peg$parseattendee();
                         if (s1 === peg$FAILED) {
-                          s1 = peg$parsepaidBy();
+                          s1 = peg$parsepayer();
                           if (s1 === peg$FAILED) {
-                            s1 = peg$parseexporter();
+                            s1 = peg$parsepaidBy();
                             if (s1 === peg$FAILED) {
-                              s1 = peg$parsecreatedBy();
+                              s1 = peg$parseexporter();
                               if (s1 === peg$FAILED) {
-                                s1 = peg$parseassignee();
+                                s1 = peg$parsecreatedBy();
                                 if (s1 === peg$FAILED) {
-                                  s1 = peg$parseexpenseType();
+                                  s1 = peg$parseassignee();
                                   if (s1 === peg$FAILED) {
-                                    s1 = peg$parsereceiptType();
+                                    s1 = peg$parseexpenseType();
                                     if (s1 === peg$FAILED) {
-                                      s1 = peg$parsetransactionStatus();
+                                      s1 = peg$parsereceiptType();
                                       if (s1 === peg$FAILED) {
-                                        s1 = peg$parsewithdrawalType();
+                                        s1 = peg$parsetransactionStatus();
                                         if (s1 === peg$FAILED) {
-                                          s1 = peg$parsewithdrawalStatus();
+                                          s1 = peg$parsewithdrawalType();
                                           if (s1 === peg$FAILED) {
-                                            s1 = peg$parsepaidStatus();
+                                            s1 = peg$parsewithdrawalStatus();
                                             if (s1 === peg$FAILED) {
-                                              s1 = peg$parsetype();
+                                              s1 = peg$parsepaidStatus();
                                               if (s1 === peg$FAILED) {
-                                                s1 = peg$parsestatus();
+                                                s1 = peg$parsetype();
                                                 if (s1 === peg$FAILED) {
-                                                  s1 = peg$parsecardID();
+                                                  s1 = peg$parsestatus();
                                                   if (s1 === peg$FAILED) {
-                                                    s1 = peg$parsebankAccount();
+                                                    s1 = peg$parsecardID();
                                                     if (s1 === peg$FAILED) {
-                                                      s1 = peg$parsefeed();
+                                                      s1 = peg$parsebankAccount();
                                                       if (s1 === peg$FAILED) {
-                                                        s1 = peg$parsegroupBy();
+                                                        s1 = peg$parsefeed();
                                                         if (s1 === peg$FAILED) {
-                                                          s1 = peg$parseview();
+                                                          s1 = peg$parsegroupBy();
                                                           if (s1 === peg$FAILED) {
-                                                            s1 = peg$parsereimbursable();
+                                                            s1 = peg$parseview();
                                                             if (s1 === peg$FAILED) {
-                                                              s1 = peg$parsebillable();
+                                                              s1 = peg$parsereimbursable();
                                                               if (s1 === peg$FAILED) {
-                                                                s1 = peg$parsepolicyID();
+                                                                s1 = peg$parsebillable();
                                                                 if (s1 === peg$FAILED) {
-                                                                  s1 = peg$parseaction();
+                                                                  s1 = peg$parsepolicyID();
                                                                   if (s1 === peg$FAILED) {
-                                                                    s1 = peg$parsedate();
+                                                                    s1 = peg$parseaction();
                                                                     if (s1 === peg$FAILED) {
-                                                                      s1 = peg$parsesubmitted();
+                                                                      s1 = peg$parsedate();
                                                                       if (s1 === peg$FAILED) {
-                                                                        s1 = peg$parseapproved();
+                                                                        s1 = peg$parsesubmitted();
                                                                         if (s1 === peg$FAILED) {
-                                                                          s1 = peg$parsepaid();
+                                                                          s1 = peg$parseapproved();
                                                                           if (s1 === peg$FAILED) {
-                                                                            s1 = peg$parseexportedTo();
+                                                                            s1 = peg$parsepaid();
                                                                             if (s1 === peg$FAILED) {
-                                                                              s1 = peg$parseexported();
+                                                                              s1 = peg$parseexportedTo();
                                                                               if (s1 === peg$FAILED) {
-                                                                                s1 = peg$parsewithdrawn();
+                                                                                s1 = peg$parseexported();
                                                                                 if (s1 === peg$FAILED) {
-                                                                                  s1 = peg$parseposted();
+                                                                                  s1 = peg$parsewithdrawn();
                                                                                   if (s1 === peg$FAILED) {
-                                                                                    s1 = peg$parsehas();
+                                                                                    s1 = peg$parseposted();
                                                                                     if (s1 === peg$FAILED) {
-                                                                                      s1 = peg$parseis();
+                                                                                      s1 = peg$parsehas();
                                                                                       if (s1 === peg$FAILED) {
-                                                                                        s1 = peg$parsepurchaseCurrency();
+                                                                                        s1 = peg$parseis();
                                                                                         if (s1 === peg$FAILED) {
-                                                                                          s1 = peg$parsepurchaseAmount();
+                                                                                          s1 = peg$parsepurchaseCurrency();
                                                                                           if (s1 === peg$FAILED) {
-                                                                                            s1 = peg$parseamountDebited();
+                                                                                            s1 = peg$parsepurchaseAmount();
                                                                                             if (s1 === peg$FAILED) {
-                                                                                              s1 = peg$parseamountReimbursed();
+                                                                                              s1 = peg$parseamountDebited();
                                                                                               if (s1 === peg$FAILED) {
-                                                                                                s1 = peg$parseamount();
+                                                                                                s1 = peg$parseamountReimbursed();
                                                                                                 if (s1 === peg$FAILED) {
-                                                                                                  s1 = peg$parsemerchant();
+                                                                                                  s1 = peg$parseamount();
                                                                                                   if (s1 === peg$FAILED) {
-                                                                                                    s1 = peg$parsedescription();
+                                                                                                    s1 = peg$parsemerchant();
                                                                                                     if (s1 === peg$FAILED) {
-                                                                                                      s1 = peg$parsereportID();
+                                                                                                      s1 = peg$parsedescription();
                                                                                                       if (s1 === peg$FAILED) {
-                                                                                                        s1 = peg$parsewithdrawalID();
+                                                                                                        s1 = peg$parsereportID();
                                                                                                         if (s1 === peg$FAILED) {
-                                                                                                          s1 = peg$parsetitle();
+                                                                                                          s1 = peg$parsewithdrawalID();
                                                                                                           if (s1 === peg$FAILED) {
-                                                                                                            s1 = peg$parsesubmitterUserID();
+                                                                                                            s1 = peg$parsetitle();
                                                                                                             if (s1 === peg$FAILED) {
-                                                                                                              s1 = peg$parsesubmitterPayrollID();
+                                                                                                              s1 = peg$parsesubmitterUserID();
                                                                                                               if (s1 === peg$FAILED) {
-                                                                                                                s1 = peg$parseorderDealNumbers();
+                                                                                                                s1 = peg$parsesubmitterPayrollID();
                                                                                                                 if (s1 === peg$FAILED) {
-                                                                                                                  s1 = peg$parsereportFieldDynamic();
+                                                                                                                  s1 = peg$parseorderDealNumbers();
                                                                                                                   if (s1 === peg$FAILED) {
-                                                                                                                    s1 = peg$parsecolumns();
+                                                                                                                    s1 = peg$parsereportFieldDynamic();
                                                                                                                     if (s1 === peg$FAILED) {
-                                                                                                                      s1 = peg$parselimit();
+                                                                                                                      s1 = peg$parsecolumns();
+                                                                                                                      if (s1 === peg$FAILED) {
+                                                                                                                        s1 = peg$parselimit();
+                                                                                                                      }
                                                                                                                     }
                                                                                                                   }
                                                                                                                 }
@@ -1588,13 +1594,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseto() {
+  function peg$parsevendor() {
     var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
@@ -1608,13 +1614,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseexporter() {
+  function peg$parseto() {
     var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e21); }
@@ -1628,13 +1634,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsepayer() {
+  function peg$parseexporter() {
     var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 5);
+    s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1648,28 +1654,48 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsepayer() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 5);
+    if (s1.toLowerCase() === peg$c20) {
+      peg$currPos += 5;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f22();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsepaidBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c20) {
-      s0 = peg$c20;
+    if (input.substr(peg$currPos, 6) === peg$c21) {
+      s0 = peg$c21;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c21) {
+      if (s1.toLowerCase() === peg$c22) {
         peg$currPos += 7;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e24); }
+        if (peg$silentFails === 0) { peg$fail(peg$e25); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f22();
+        s1 = peg$f23();
       }
       s0 = s1;
     }
@@ -1681,24 +1707,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c22) {
+    if (s0.toLowerCase() === peg$c23) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c23) {
+      if (s1.toLowerCase() === peg$c24) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e26); }
+        if (peg$silentFails === 0) { peg$fail(peg$e27); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f23();
+        s1 = peg$f24();
       }
       s0 = s1;
     }
@@ -1709,25 +1735,25 @@ function peg$parse(input, options) {
   function peg$parsecardID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c24) {
-      s0 = peg$c24;
+    if (input.substr(peg$currPos, 6) === peg$c25) {
+      s0 = peg$c25;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c25) {
+      if (s1.toLowerCase() === peg$c26) {
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e28); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f24();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1738,25 +1764,25 @@ function peg$parse(input, options) {
   function peg$parsebankAccount() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c26) {
-      s0 = peg$c26;
+    if (input.substr(peg$currPos, 11) === peg$c27) {
+      s0 = peg$c27;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c27) {
+      if (s1.toLowerCase() === peg$c28) {
         peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1769,15 +1795,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c28) {
+    if (s1.toLowerCase() === peg$c29) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f26();
+      s1 = peg$f27();
     }
     s0 = s1;
 
@@ -1789,15 +1815,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c29) {
+    if (s1.toLowerCase() === peg$c30) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f27();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1807,25 +1833,25 @@ function peg$parse(input, options) {
   function peg$parseexpenseType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c30) {
-      s0 = peg$c30;
+    if (input.substr(peg$currPos, 11) === peg$c31) {
+      s0 = peg$c31;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c31) {
+      if (s1.toLowerCase() === peg$c32) {
         peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e34); }
+        if (peg$silentFails === 0) { peg$fail(peg$e35); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f28();
+        s1 = peg$f29();
       }
       s0 = s1;
     }
@@ -1836,25 +1862,25 @@ function peg$parse(input, options) {
   function peg$parsereceiptType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c32) {
-      s0 = peg$c32;
+    if (input.substr(peg$currPos, 11) === peg$c33) {
+      s0 = peg$c33;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c33) {
+      if (s1.toLowerCase() === peg$c34) {
         peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e36); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f29();
+        s1 = peg$f30();
       }
       s0 = s1;
     }
@@ -1865,25 +1891,25 @@ function peg$parse(input, options) {
   function peg$parsetransactionStatus() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 17) === peg$c34) {
-      s0 = peg$c34;
+    if (input.substr(peg$currPos, 17) === peg$c35) {
+      s0 = peg$c35;
       peg$currPos += 17;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 18);
-      if (s1.toLowerCase() === peg$c35) {
+      if (s1.toLowerCase() === peg$c36) {
         peg$currPos += 18;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e38); }
+        if (peg$silentFails === 0) { peg$fail(peg$e39); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f30();
+        s1 = peg$f31();
       }
       s0 = s1;
     }
@@ -1894,25 +1920,25 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c36) {
-      s0 = peg$c36;
+    if (input.substr(peg$currPos, 14) === peg$c37) {
+      s0 = peg$c37;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c37) {
+      if (s1.toLowerCase() === peg$c38) {
         peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e40); }
+        if (peg$silentFails === 0) { peg$fail(peg$e41); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f31();
+        s1 = peg$f32();
       }
       s0 = s1;
     }
@@ -1923,25 +1949,25 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalStatus() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 16) === peg$c38) {
-      s0 = peg$c38;
+    if (input.substr(peg$currPos, 16) === peg$c39) {
+      s0 = peg$c39;
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c39) {
+      if (s1.toLowerCase() === peg$c40) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e42); }
+        if (peg$silentFails === 0) { peg$fail(peg$e43); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f32();
+        s1 = peg$f33();
       }
       s0 = s1;
     }
@@ -1952,25 +1978,25 @@ function peg$parse(input, options) {
   function peg$parsepaidStatus() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 10) === peg$c40) {
-      s0 = peg$c40;
+    if (input.substr(peg$currPos, 10) === peg$c41) {
+      s0 = peg$c41;
       peg$currPos += 10;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c41) {
+      if (s1.toLowerCase() === peg$c42) {
         peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e45); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f33();
+        s1 = peg$f34();
       }
       s0 = s1;
     }
@@ -1982,24 +2008,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c42) {
+    if (s0.toLowerCase() === peg$c43) {
       peg$currPos += 12;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c43) {
+      if (s1.toLowerCase() === peg$c44) {
         peg$currPos += 13;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e46); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f34();
+        s1 = peg$f35();
       }
       s0 = s1;
     }
@@ -2012,15 +2038,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c44) {
+    if (s1.toLowerCase() === peg$c45) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -2032,15 +2058,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c45) {
+    if (s1.toLowerCase() === peg$c46) {
       peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -2052,15 +2078,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c46) {
+    if (s1.toLowerCase() === peg$c47) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f38();
     }
     s0 = s1;
 
@@ -2072,15 +2098,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c47) {
+    if (s1.toLowerCase() === peg$c48) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -2090,25 +2116,25 @@ function peg$parse(input, options) {
   function peg$parsesortBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c48) {
-      s0 = peg$c48;
+    if (input.substr(peg$currPos, 6) === peg$c49) {
+      s0 = peg$c49;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c49) {
+      if (s1.toLowerCase() === peg$c50) {
         peg$currPos += 7;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e52); }
+        if (peg$silentFails === 0) { peg$fail(peg$e53); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f39();
+        s1 = peg$f40();
       }
       s0 = s1;
     }
@@ -2119,25 +2145,25 @@ function peg$parse(input, options) {
   function peg$parsesortOrder() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 9) === peg$c50) {
-      s0 = peg$c50;
+    if (input.substr(peg$currPos, 9) === peg$c51) {
+      s0 = peg$c51;
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c51) {
+      if (s1.toLowerCase() === peg$c52) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e54); }
+        if (peg$silentFails === 0) { peg$fail(peg$e55); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f40();
+        s1 = peg$f41();
       }
       s0 = s1;
     }
@@ -2148,25 +2174,25 @@ function peg$parse(input, options) {
   function peg$parsepolicyID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c52) {
-      s0 = peg$c52;
+    if (input.substr(peg$currPos, 8) === peg$c53) {
+      s0 = peg$c53;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c53) {
+      if (s1.toLowerCase() === peg$c54) {
         peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e56); }
+        if (peg$silentFails === 0) { peg$fail(peg$e57); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f41();
+        s1 = peg$f42();
       }
       s0 = s1;
     }
@@ -2179,15 +2205,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c54) {
+    if (s1.toLowerCase() === peg$c55) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f43();
     }
     s0 = s1;
 
@@ -2199,15 +2225,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c55) {
+    if (s1.toLowerCase() === peg$c56) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e58); }
+      if (peg$silentFails === 0) { peg$fail(peg$e59); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f43();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -2219,15 +2245,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c56) {
+    if (s1.toLowerCase() === peg$c57) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f45();
     }
     s0 = s1;
 
@@ -2239,15 +2265,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c57) {
+    if (s1.toLowerCase() === peg$c58) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f46();
     }
     s0 = s1;
 
@@ -2259,15 +2285,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c58) {
+    if (s1.toLowerCase() === peg$c59) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f46();
+      s1 = peg$f47();
     }
     s0 = s1;
 
@@ -2279,15 +2305,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c59) {
+    if (s1.toLowerCase() === peg$c60) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f47();
+      s1 = peg$f48();
     }
     s0 = s1;
 
@@ -2298,24 +2324,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c60) {
+    if (s0.toLowerCase() === peg$c61) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c61) {
+      if (s1.toLowerCase() === peg$c62) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e64); }
+        if (peg$silentFails === 0) { peg$fail(peg$e65); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f48();
+        s1 = peg$f49();
       }
       s0 = s1;
     }
@@ -2328,15 +2354,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c62) {
+    if (s1.toLowerCase() === peg$c63) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f49();
+      s1 = peg$f50();
     }
     s0 = s1;
 
@@ -2348,15 +2374,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c63) {
+    if (s1.toLowerCase() === peg$c64) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f50();
+      s1 = peg$f51();
     }
     s0 = s1;
 
@@ -2368,15 +2394,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c64) {
+    if (s1.toLowerCase() === peg$c65) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f51();
+      s1 = peg$f52();
     }
     s0 = s1;
 
@@ -2387,24 +2413,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 15);
-    if (s0.toLowerCase() === peg$c65) {
+    if (s0.toLowerCase() === peg$c66) {
       peg$currPos += 15;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c66) {
+      if (s1.toLowerCase() === peg$c67) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+        if (peg$silentFails === 0) { peg$fail(peg$e70); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f52();
+        s1 = peg$f53();
       }
       s0 = s1;
     }
@@ -2416,24 +2442,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 18);
-    if (s0.toLowerCase() === peg$c67) {
+    if (s0.toLowerCase() === peg$c68) {
       peg$currPos += 18;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 20);
-      if (s1.toLowerCase() === peg$c68) {
+      if (s1.toLowerCase() === peg$c69) {
         peg$currPos += 20;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f53();
+        s1 = peg$f54();
       }
       s0 = s1;
     }
@@ -2445,24 +2471,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c69) {
+    if (s0.toLowerCase() === peg$c70) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 18);
-      if (s1.toLowerCase() === peg$c70) {
+      if (s1.toLowerCase() === peg$c71) {
         peg$currPos += 18;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e73); }
+        if (peg$silentFails === 0) { peg$fail(peg$e74); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f54();
+        s1 = peg$f55();
       }
       s0 = s1;
     }
@@ -2475,15 +2501,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c71) {
+    if (s1.toLowerCase() === peg$c72) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f55();
+      s1 = peg$f56();
     }
     s0 = s1;
 
@@ -2494,24 +2520,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c72) {
+    if (s0.toLowerCase() === peg$c73) {
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e75); }
+      if (peg$silentFails === 0) { peg$fail(peg$e76); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c73) {
+      if (s1.toLowerCase() === peg$c74) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e76); }
+        if (peg$silentFails === 0) { peg$fail(peg$e77); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f56();
+        s1 = peg$f57();
       }
       s0 = s1;
     }
@@ -2524,15 +2550,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c74) {
+    if (s1.toLowerCase() === peg$c75) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f57();
+      s1 = peg$f58();
     }
     s0 = s1;
 
@@ -2544,15 +2570,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c75) {
+    if (s1.toLowerCase() === peg$c76) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f58();
+      s1 = peg$f59();
     }
     s0 = s1;
 
@@ -2564,15 +2590,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c76) {
+    if (s1.toLowerCase() === peg$c77) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f59();
+      s1 = peg$f60();
     }
     s0 = s1;
 
@@ -2584,15 +2610,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c77) {
+    if (s1.toLowerCase() === peg$c78) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f60();
+      s1 = peg$f61();
     }
     s0 = s1;
 
@@ -2603,24 +2629,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c78) {
+    if (s0.toLowerCase() === peg$c79) {
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c79) {
+      if (s1.toLowerCase() === peg$c80) {
         peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e82); }
+        if (peg$silentFails === 0) { peg$fail(peg$e83); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f61();
+        s1 = peg$f62();
       }
       s0 = s1;
     }
@@ -2632,24 +2658,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c80) {
+    if (s0.toLowerCase() === peg$c81) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c81) {
+      if (s1.toLowerCase() === peg$c82) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f62();
+        s1 = peg$f63();
       }
       s0 = s1;
     }
@@ -2661,24 +2687,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 13);
-    if (s0.toLowerCase() === peg$c82) {
+    if (s0.toLowerCase() === peg$c83) {
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c83) {
+      if (s1.toLowerCase() === peg$c84) {
         peg$currPos += 14;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f63();
+        s1 = peg$f64();
       }
       s0 = s1;
     }
@@ -2690,24 +2716,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c84) {
+    if (s0.toLowerCase() === peg$c85) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c85) {
+      if (s1.toLowerCase() === peg$c86) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e88); }
+        if (peg$silentFails === 0) { peg$fail(peg$e89); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f64();
+        s1 = peg$f65();
       }
       s0 = s1;
     }
@@ -2720,15 +2746,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c86) {
+    if (s1.toLowerCase() === peg$c87) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f65();
+      s1 = peg$f66();
     }
     s0 = s1;
 
@@ -2740,15 +2766,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c87) {
+    if (s1.toLowerCase() === peg$c88) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f66();
+      s1 = peg$f67();
     }
     s0 = s1;
 
@@ -2760,15 +2786,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c88) {
+    if (s1.toLowerCase() === peg$c89) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f67();
+      s1 = peg$f68();
     }
     s0 = s1;
 
@@ -2780,7 +2806,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f68();
+    s1 = peg$f69();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2915,11 +2941,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c89) {
+    if (s1.toLowerCase() === peg$c90) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2934,7 +2960,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f69();
+        s0 = peg$f70();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2952,19 +2978,19 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c90) {
+    if (s1.toLowerCase() === peg$c91) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c91) {
+      if (s1.toLowerCase() === peg$c92) {
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e94); }
+        if (peg$silentFails === 0) { peg$fail(peg$e95); }
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2980,7 +3006,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f70();
+        s0 = peg$f71();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2998,11 +3024,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c79) {
+    if (s1.toLowerCase() === peg$c80) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3017,7 +3043,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f71();
+        s0 = peg$f72();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3035,11 +3061,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c92) {
+    if (s1.toLowerCase() === peg$c93) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e96); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3054,7 +3080,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f72();
+        s0 = peg$f73();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3072,11 +3098,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c23) {
+    if (s1.toLowerCase() === peg$c24) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3091,7 +3117,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f73();
+        s0 = peg$f74();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3109,11 +3135,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c93) {
+    if (s1.toLowerCase() === peg$c94) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e96); }
+      if (peg$silentFails === 0) { peg$fail(peg$e97); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3128,7 +3154,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f74();
+        s0 = peg$f75();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3146,11 +3172,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c43) {
+    if (s1.toLowerCase() === peg$c44) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3165,7 +3191,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75();
+        s0 = peg$f76();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3183,11 +3209,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c27) {
+    if (s1.toLowerCase() === peg$c28) {
       peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3202,7 +3228,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f76();
+        s0 = peg$f77();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3220,11 +3246,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c94) {
+    if (s1.toLowerCase() === peg$c95) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3239,7 +3265,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f77();
+        s0 = peg$f78();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3276,7 +3302,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f78();
+        s0 = peg$f79();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3294,11 +3320,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c95) {
+    if (s1.toLowerCase() === peg$c96) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3313,7 +3339,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f79();
+        s0 = peg$f80();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3338,7 +3364,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e99); }
+        if (peg$silentFails === 0) { peg$fail(peg$e100); }
       }
       if (s2 !== peg$FAILED) {
         s1 = [s1, s2];
@@ -3357,11 +3383,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c96) {
+    if (s1.toLowerCase() === peg$c97) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e100); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3376,7 +3402,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f80();
+        s0 = peg$f81();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3388,11 +3414,11 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c95) {
+      if (s1.toLowerCase() === peg$c96) {
         peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e98); }
+        if (peg$silentFails === 0) { peg$fail(peg$e99); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
@@ -3407,7 +3433,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f81();
+          s0 = peg$f82();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3426,11 +3452,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c97) {
+    if (s1.toLowerCase() === peg$c98) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e101); }
+      if (peg$silentFails === 0) { peg$fail(peg$e102); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3445,7 +3471,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
+        s0 = peg$f83();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3463,11 +3489,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c98) {
+    if (s1.toLowerCase() === peg$c99) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e102); }
+      if (peg$silentFails === 0) { peg$fail(peg$e103); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3482,7 +3508,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
+        s0 = peg$f84();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3500,11 +3526,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c99) {
+    if (s1.toLowerCase() === peg$c100) {
       peg$currPos += 22;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e103); }
+      if (peg$silentFails === 0) { peg$fail(peg$e104); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3519,7 +3545,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f84();
+        s0 = peg$f85();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3537,11 +3563,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c100) {
+    if (s1.toLowerCase() === peg$c101) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3556,7 +3582,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f85();
+        s0 = peg$f86();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3574,11 +3600,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c101) {
+    if (s1.toLowerCase() === peg$c102) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3593,7 +3619,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f87();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3611,11 +3637,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c102) {
+    if (s1.toLowerCase() === peg$c103) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3630,7 +3656,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f87();
+        s0 = peg$f88();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3648,11 +3674,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c103) {
+    if (s1.toLowerCase() === peg$c104) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3667,7 +3693,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f88();
+        s0 = peg$f89();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3685,11 +3711,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c104) {
+    if (s1.toLowerCase() === peg$c105) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3704,7 +3730,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f89();
+        s0 = peg$f90();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3722,11 +3748,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c105) {
+    if (s1.toLowerCase() === peg$c106) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3741,7 +3767,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f90();
+        s0 = peg$f91();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3759,11 +3785,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c106) {
+    if (s1.toLowerCase() === peg$c107) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3778,7 +3804,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f91();
+        s0 = peg$f92();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3796,11 +3822,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c107) {
+    if (s1.toLowerCase() === peg$c108) {
       peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3815,7 +3841,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f92();
+        s0 = peg$f93();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3833,11 +3859,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 20);
-    if (s1.toLowerCase() === peg$c108) {
+    if (s1.toLowerCase() === peg$c109) {
       peg$currPos += 20;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3852,7 +3878,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f93();
+        s0 = peg$f94();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3870,11 +3896,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 23);
-    if (s1.toLowerCase() === peg$c109) {
+    if (s1.toLowerCase() === peg$c110) {
       peg$currPos += 23;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e113); }
+      if (peg$silentFails === 0) { peg$fail(peg$e114); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3889,7 +3915,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f94();
+        s0 = peg$f95();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3907,11 +3933,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c83) {
+    if (s1.toLowerCase() === peg$c84) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e86); }
+      if (peg$silentFails === 0) { peg$fail(peg$e87); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3926,7 +3952,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f95();
+        s0 = peg$f96();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3944,11 +3970,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 17);
-    if (s1.toLowerCase() === peg$c85) {
+    if (s1.toLowerCase() === peg$c86) {
       peg$currPos += 17;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3963,7 +3989,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f96();
+        s0 = peg$f97();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3981,11 +4007,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c110) {
+    if (s1.toLowerCase() === peg$c111) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e114); }
+      if (peg$silentFails === 0) { peg$fail(peg$e115); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4000,7 +4026,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f97();
+        s0 = peg$f98();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4018,11 +4044,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c111) {
+    if (s1.toLowerCase() === peg$c112) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e116); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4037,7 +4063,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f98();
+        s0 = peg$f99();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4055,11 +4081,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c112) {
+    if (s1.toLowerCase() === peg$c113) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e117); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4074,7 +4100,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f99();
+        s0 = peg$f100();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4092,11 +4118,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c113) {
+    if (s1.toLowerCase() === peg$c114) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e118); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4111,7 +4137,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f100();
+        s0 = peg$f101();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4129,11 +4155,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c114) {
+    if (s1.toLowerCase() === peg$c115) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e118); }
+      if (peg$silentFails === 0) { peg$fail(peg$e119); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4148,7 +4174,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f101();
+        s0 = peg$f102();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4166,11 +4192,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c115) {
+    if (s1.toLowerCase() === peg$c116) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e119); }
+      if (peg$silentFails === 0) { peg$fail(peg$e120); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4185,7 +4211,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f102();
+        s0 = peg$f103();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4203,11 +4229,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c116) {
+    if (s1.toLowerCase() === peg$c117) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e120); }
+      if (peg$silentFails === 0) { peg$fail(peg$e121); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4222,7 +4248,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f103();
+        s0 = peg$f104();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4240,11 +4266,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c117) {
+    if (s1.toLowerCase() === peg$c118) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e121); }
+      if (peg$silentFails === 0) { peg$fail(peg$e122); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4259,7 +4285,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f104();
+        s0 = peg$f105();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4282,81 +4308,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e99); }
+      if (peg$silentFails === 0) { peg$fail(peg$e100); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f105();
+      s1 = peg$f106();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c118) {
-        s1 = peg$c118;
+      if (input.substr(peg$currPos, 2) === peg$c119) {
+        s1 = peg$c119;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e123); }
+        if (peg$silentFails === 0) { peg$fail(peg$e124); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f106();
+        s1 = peg$f107();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c119) {
-          s1 = peg$c119;
+        if (input.substr(peg$currPos, 2) === peg$c120) {
+          s1 = peg$c120;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e124); }
+          if (peg$silentFails === 0) { peg$fail(peg$e125); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f107();
+          s1 = peg$f108();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c120;
+            s1 = peg$c121;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e125); }
+            if (peg$silentFails === 0) { peg$fail(peg$e126); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f108();
+            s1 = peg$f109();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c121) {
-              s1 = peg$c121;
+            if (input.substr(peg$currPos, 2) === peg$c122) {
+              s1 = peg$c122;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e126); }
+              if (peg$silentFails === 0) { peg$fail(peg$e127); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f109();
+              s1 = peg$f110();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c122;
+                s1 = peg$c123;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e127); }
+                if (peg$silentFails === 0) { peg$fail(peg$e128); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f110();
+                s1 = peg$f111();
               }
               s0 = s1;
             }
@@ -4367,7 +4393,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e122); }
+      if (peg$silentFails === 0) { peg$fail(peg$e123); }
     }
 
     return s0;
@@ -4380,7 +4406,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f111(s1);
+      s1 = peg$f112(s1);
     }
     s0 = s1;
 
@@ -4392,11 +4418,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 92) {
-      s1 = peg$c123;
+      s1 = peg$c124;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e128); }
+      if (peg$silentFails === 0) { peg$fail(peg$e129); }
     }
     if (s1 !== peg$FAILED) {
       s2 = input.charAt(peg$currPos);
@@ -4404,11 +4430,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e129); }
+        if (peg$silentFails === 0) { peg$fail(peg$e130); }
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f112(s2);
+        s0 = peg$f113(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4434,7 +4460,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e131); }
+        if (peg$silentFails === 0) { peg$fail(peg$e132); }
       }
     }
     if (s2 !== peg$FAILED) {
@@ -4447,7 +4473,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e131); }
+            if (peg$silentFails === 0) { peg$fail(peg$e132); }
           }
         }
       }
@@ -4456,13 +4482,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f113(s1);
+      s1 = peg$f114(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e130); }
+      if (peg$silentFails === 0) { peg$fail(peg$e131); }
     }
 
     return s0;
@@ -4474,7 +4500,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f114();
+    s1 = peg$f115();
     s0 = s1;
 
     return s0;
@@ -4490,7 +4516,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e133); }
+      if (peg$silentFails === 0) { peg$fail(peg$e134); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -4499,12 +4525,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e133); }
+        if (peg$silentFails === 0) { peg$fail(peg$e134); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e132); }
+    if (peg$silentFails === 0) { peg$fail(peg$e133); }
 
     return s0;
   }
@@ -4514,7 +4540,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f115();
+    s1 = peg$f116();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4551,7 +4577,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e135); }
+      if (peg$silentFails === 0) { peg$fail(peg$e136); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4560,7 +4586,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e135); }
+        if (peg$silentFails === 0) { peg$fail(peg$e136); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4568,7 +4594,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e136); }
+      if (peg$silentFails === 0) { peg$fail(peg$e137); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4579,7 +4605,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e137); }
+          if (peg$silentFails === 0) { peg$fail(peg$e138); }
         }
       }
       while (s4 !== peg$FAILED) {
@@ -4591,7 +4617,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e137); }
+            if (peg$silentFails === 0) { peg$fail(peg$e138); }
           }
         }
       }
@@ -4600,7 +4626,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e136); }
+        if (peg$silentFails === 0) { peg$fail(peg$e137); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -4609,7 +4635,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e131); }
+          if (peg$silentFails === 0) { peg$fail(peg$e132); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4618,11 +4644,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e131); }
+            if (peg$silentFails === 0) { peg$fail(peg$e132); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f116(s1, s3, s5);
+        s0 = peg$f117(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4634,7 +4660,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e134); }
+      if (peg$silentFails === 0) { peg$fail(peg$e135); }
     }
 
     return s0;
@@ -4651,7 +4677,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e135); }
+      if (peg$silentFails === 0) { peg$fail(peg$e136); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4660,7 +4686,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e135); }
+        if (peg$silentFails === 0) { peg$fail(peg$e136); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4668,7 +4694,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e136); }
+      if (peg$silentFails === 0) { peg$fail(peg$e137); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4679,7 +4705,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e137); }
+          if (peg$silentFails === 0) { peg$fail(peg$e138); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4695,15 +4721,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c124;
+              s6 = peg$c125;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e138); }
+              if (peg$silentFails === 0) { peg$fail(peg$e139); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f117(s1);
+              s4 = peg$f118(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4726,15 +4752,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c125;
+                s6 = peg$c126;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e139); }
+                if (peg$silentFails === 0) { peg$fail(peg$e140); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f118(s1);
+                s4 = peg$f119(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4757,15 +4783,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c126;
+                  s6 = peg$c127;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e140); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e141); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f119(s1);
+                  s4 = peg$f120(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4787,7 +4813,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e137); }
+            if (peg$silentFails === 0) { peg$fail(peg$e138); }
           }
           if (s4 === peg$FAILED) {
             s4 = peg$currPos;
@@ -4803,15 +4829,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8220) {
-                s6 = peg$c124;
+                s6 = peg$c125;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e138); }
+                if (peg$silentFails === 0) { peg$fail(peg$e139); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f117(s1);
+                s4 = peg$f118(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4834,15 +4860,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 8221) {
-                  s6 = peg$c125;
+                  s6 = peg$c126;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e139); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e140); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f118(s1);
+                  s4 = peg$f119(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4865,15 +4891,15 @@ function peg$parse(input, options) {
                 }
                 if (s5 !== peg$FAILED) {
                   if (input.charCodeAt(peg$currPos) === 34) {
-                    s6 = peg$c126;
+                    s6 = peg$c127;
                     peg$currPos++;
                   } else {
                     s6 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$e140); }
+                    if (peg$silentFails === 0) { peg$fail(peg$e141); }
                   }
                   if (s6 !== peg$FAILED) {
                     peg$savedPos = s4;
-                    s4 = peg$f119(s1);
+                    s4 = peg$f120(s1);
                   } else {
                     peg$currPos = s4;
                     s4 = peg$FAILED;
@@ -4890,7 +4916,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f120(s1, s3, s4);
+        s0 = peg$f121(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4902,7 +4928,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e134); }
+      if (peg$silentFails === 0) { peg$fail(peg$e135); }
     }
 
     return s0;
@@ -4917,7 +4943,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e136); }
+      if (peg$silentFails === 0) { peg$fail(peg$e137); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4955,7 +4981,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e141); }
+      if (peg$silentFails === 0) { peg$fail(peg$e142); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4964,7 +4990,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e141); }
+        if (peg$silentFails === 0) { peg$fail(peg$e142); }
       }
     }
     s2 = [];
@@ -4973,7 +4999,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e142); }
+      if (peg$silentFails === 0) { peg$fail(peg$e143); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -4982,7 +5008,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e142); }
+        if (peg$silentFails === 0) { peg$fail(peg$e143); }
       }
     }
     s3 = [];
@@ -4991,7 +5017,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e143); }
+      if (peg$silentFails === 0) { peg$fail(peg$e144); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -5000,7 +5026,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e143); }
+        if (peg$silentFails === 0) { peg$fail(peg$e144); }
       }
     }
     s4 = peg$parseoperator();
@@ -5019,7 +5045,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e144); }
+        if (peg$silentFails === 0) { peg$fail(peg$e145); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -5028,7 +5054,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e144); }
+          if (peg$silentFails === 0) { peg$fail(peg$e145); }
         }
       }
       s2 = peg$currPos;
@@ -5075,7 +5101,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e145); }
+          if (peg$silentFails === 0) { peg$fail(peg$e146); }
         }
       }
     }
@@ -5091,7 +5117,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e146); }
+      if (peg$silentFails === 0) { peg$fail(peg$e147); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index 1a24a98020eb..3670ddc8a7fb 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -81,6 +81,7 @@ autocompleteKey "key"
       / total
       / tag
       / category
+      / vendor
       / to
       / taxRate
       / from
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index 5077ae7f8862..7f157f8f71e7 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -29,6 +29,7 @@ groupCurrency
   / "group-currency"i { return "groupCurrency"; }
 tag = "tag"i { return "tag"; }
 category = "category"i { return "category"; }
+vendor = "vendor"i { return "vendor"; }
 to = "to"i { return "to"; }
 exporter = "exporter"i { return "exporter"; }
 payer = "payer"i { return "payer"; }
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index edaa43a60119..7d8737a32597 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -201,116 +201,117 @@ function peg$parse(input, options) {
   var peg$c14 = "group-currency";
   var peg$c15 = "tag";
   var peg$c16 = "category";
-  var peg$c17 = "to";
-  var peg$c18 = "exporter";
-  var peg$c19 = "payer";
-  var peg$c20 = "paidBy";
-  var peg$c21 = "paid-by";
-  var peg$c22 = "taxrate";
-  var peg$c23 = "tax-rate";
-  var peg$c24 = "cardID";
-  var peg$c25 = "card";
-  var peg$c26 = "bankAccount";
-  var peg$c27 = "bank-account";
-  var peg$c28 = "from";
-  var peg$c29 = "attendee";
-  var peg$c30 = "expenseType";
-  var peg$c31 = "expense-type";
-  var peg$c32 = "receiptType";
-  var peg$c33 = "receipt-type";
-  var peg$c34 = "transactionStatus";
-  var peg$c35 = "transaction-status";
-  var peg$c36 = "withdrawalType";
-  var peg$c37 = "withdrawal-type";
-  var peg$c38 = "withdrawalStatus";
-  var peg$c39 = "withdrawal-status";
-  var peg$c40 = "paidStatus";
-  var peg$c41 = "paid-status";
-  var peg$c42 = "withdrawalid";
-  var peg$c43 = "withdrawal-id";
-  var peg$c44 = "billable";
-  var peg$c45 = "reimbursable";
-  var peg$c46 = "type";
-  var peg$c47 = "status";
-  var peg$c48 = "sortBy";
-  var peg$c49 = "sort-by";
-  var peg$c50 = "sortOrder";
-  var peg$c51 = "sort-order";
-  var peg$c52 = "policyID";
-  var peg$c53 = "workspace";
-  var peg$c54 = "submitted";
-  var peg$c55 = "approved";
-  var peg$c56 = "paid";
-  var peg$c57 = "exported";
-  var peg$c58 = "posted";
-  var peg$c59 = "withdrawn";
-  var peg$c60 = "groupby";
-  var peg$c61 = "group-by";
-  var peg$c62 = "limit";
-  var peg$c63 = "feed";
-  var peg$c64 = "title";
-  var peg$c65 = "submitteruserid";
-  var peg$c66 = "submitter-user-id";
-  var peg$c67 = "submitterpayrollid";
-  var peg$c68 = "submitter-payroll-id";
-  var peg$c69 = "orderdealnumbers";
-  var peg$c70 = "order-deal-numbers";
-  var peg$c71 = "assignee";
-  var peg$c72 = "createdby";
-  var peg$c73 = "created-by";
-  var peg$c74 = "action";
-  var peg$c75 = "total";
-  var peg$c76 = "has";
-  var peg$c77 = "is";
-  var peg$c78 = "purchaseamount";
-  var peg$c79 = "purchase-amount";
-  var peg$c80 = "purchasecurrency";
-  var peg$c81 = "purchase-currency";
-  var peg$c82 = "amountdebited";
-  var peg$c83 = "amount-debited";
-  var peg$c84 = "amountreimbursed";
-  var peg$c85 = "amount-reimbursed";
-  var peg$c86 = "columns";
-  var peg$c87 = "view";
-  var peg$c88 = "compare";
-  var peg$c89 = "per-diem";
-  var peg$c90 = "drafts";
-  var peg$c91 = "draft";
-  var peg$c92 = "tax";
-  var peg$c93 = "policy-name";
-  var peg$c94 = "long-report-id";
-  var peg$c95 = "exported-to";
-  var peg$c96 = "exportedto";
-  var peg$c97 = "exchange-rate";
-  var peg$c98 = "reimbursable-total";
-  var peg$c99 = "non-reimbursable-total";
-  var peg$c100 = "group-from";
-  var peg$c101 = "group-expenses";
-  var peg$c102 = "group-total";
-  var peg$c103 = "group-card";
-  var peg$c104 = "group-feed";
-  var peg$c105 = "group-bank-account";
-  var peg$c106 = "group-withdrawn";
-  var peg$c107 = "group-withdrawal-id";
-  var peg$c108 = "group-amount-debited";
-  var peg$c109 = "group-amount-reimbursed";
-  var peg$c110 = "group-category";
-  var peg$c111 = "group-tag";
-  var peg$c112 = "group-merchant";
-  var peg$c113 = "group-day";
-  var peg$c114 = "group-month";
-  var peg$c115 = "group-week";
-  var peg$c116 = "group-year";
-  var peg$c117 = "group-quarter";
-  var peg$c118 = "!=";
-  var peg$c119 = ">=";
-  var peg$c120 = ">";
-  var peg$c121 = "<=";
-  var peg$c122 = "<";
-  var peg$c123 = "\\";
-  var peg$c124 = "\u201C";
-  var peg$c125 = "\u201D";
-  var peg$c126 = "\"";
+  var peg$c17 = "vendor";
+  var peg$c18 = "to";
+  var peg$c19 = "exporter";
+  var peg$c20 = "payer";
+  var peg$c21 = "paidBy";
+  var peg$c22 = "paid-by";
+  var peg$c23 = "taxrate";
+  var peg$c24 = "tax-rate";
+  var peg$c25 = "cardID";
+  var peg$c26 = "card";
+  var peg$c27 = "bankAccount";
+  var peg$c28 = "bank-account";
+  var peg$c29 = "from";
+  var peg$c30 = "attendee";
+  var peg$c31 = "expenseType";
+  var peg$c32 = "expense-type";
+  var peg$c33 = "receiptType";
+  var peg$c34 = "receipt-type";
+  var peg$c35 = "transactionStatus";
+  var peg$c36 = "transaction-status";
+  var peg$c37 = "withdrawalType";
+  var peg$c38 = "withdrawal-type";
+  var peg$c39 = "withdrawalStatus";
+  var peg$c40 = "withdrawal-status";
+  var peg$c41 = "paidStatus";
+  var peg$c42 = "paid-status";
+  var peg$c43 = "withdrawalid";
+  var peg$c44 = "withdrawal-id";
+  var peg$c45 = "billable";
+  var peg$c46 = "reimbursable";
+  var peg$c47 = "type";
+  var peg$c48 = "status";
+  var peg$c49 = "sortBy";
+  var peg$c50 = "sort-by";
+  var peg$c51 = "sortOrder";
+  var peg$c52 = "sort-order";
+  var peg$c53 = "policyID";
+  var peg$c54 = "workspace";
+  var peg$c55 = "submitted";
+  var peg$c56 = "approved";
+  var peg$c57 = "paid";
+  var peg$c58 = "exported";
+  var peg$c59 = "posted";
+  var peg$c60 = "withdrawn";
+  var peg$c61 = "groupby";
+  var peg$c62 = "group-by";
+  var peg$c63 = "limit";
+  var peg$c64 = "feed";
+  var peg$c65 = "title";
+  var peg$c66 = "submitteruserid";
+  var peg$c67 = "submitter-user-id";
+  var peg$c68 = "submitterpayrollid";
+  var peg$c69 = "submitter-payroll-id";
+  var peg$c70 = "orderdealnumbers";
+  var peg$c71 = "order-deal-numbers";
+  var peg$c72 = "assignee";
+  var peg$c73 = "createdby";
+  var peg$c74 = "created-by";
+  var peg$c75 = "action";
+  var peg$c76 = "total";
+  var peg$c77 = "has";
+  var peg$c78 = "is";
+  var peg$c79 = "purchaseamount";
+  var peg$c80 = "purchase-amount";
+  var peg$c81 = "purchasecurrency";
+  var peg$c82 = "purchase-currency";
+  var peg$c83 = "amountdebited";
+  var peg$c84 = "amount-debited";
+  var peg$c85 = "amountreimbursed";
+  var peg$c86 = "amount-reimbursed";
+  var peg$c87 = "columns";
+  var peg$c88 = "view";
+  var peg$c89 = "compare";
+  var peg$c90 = "per-diem";
+  var peg$c91 = "drafts";
+  var peg$c92 = "draft";
+  var peg$c93 = "tax";
+  var peg$c94 = "policy-name";
+  var peg$c95 = "long-report-id";
+  var peg$c96 = "exported-to";
+  var peg$c97 = "exportedto";
+  var peg$c98 = "exchange-rate";
+  var peg$c99 = "reimbursable-total";
+  var peg$c100 = "non-reimbursable-total";
+  var peg$c101 = "group-from";
+  var peg$c102 = "group-expenses";
+  var peg$c103 = "group-total";
+  var peg$c104 = "group-card";
+  var peg$c105 = "group-feed";
+  var peg$c106 = "group-bank-account";
+  var peg$c107 = "group-withdrawn";
+  var peg$c108 = "group-withdrawal-id";
+  var peg$c109 = "group-amount-debited";
+  var peg$c110 = "group-amount-reimbursed";
+  var peg$c111 = "group-category";
+  var peg$c112 = "group-tag";
+  var peg$c113 = "group-merchant";
+  var peg$c114 = "group-day";
+  var peg$c115 = "group-month";
+  var peg$c116 = "group-week";
+  var peg$c117 = "group-year";
+  var peg$c118 = "group-quarter";
+  var peg$c119 = "!=";
+  var peg$c120 = ">=";
+  var peg$c121 = ">";
+  var peg$c122 = "<=";
+  var peg$c123 = "<";
+  var peg$c124 = "\\";
+  var peg$c125 = "\u201C";
+  var peg$c126 = "\u201D";
+  var peg$c127 = "\"";
 
   var peg$r0 = /^[^ \t\r\n\xA0]/;
   var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
@@ -350,133 +351,134 @@ function peg$parse(input, options) {
   var peg$e19 = peg$literalExpectation("group-currency", true);
   var peg$e20 = peg$literalExpectation("tag", true);
   var peg$e21 = peg$literalExpectation("category", true);
-  var peg$e22 = peg$literalExpectation("to", true);
-  var peg$e23 = peg$literalExpectation("exporter", true);
-  var peg$e24 = peg$literalExpectation("payer", true);
-  var peg$e25 = peg$literalExpectation("paidBy", false);
-  var peg$e26 = peg$literalExpectation("paid-by", true);
-  var peg$e27 = peg$literalExpectation("taxRate", true);
-  var peg$e28 = peg$literalExpectation("tax-rate", true);
-  var peg$e29 = peg$literalExpectation("cardID", false);
-  var peg$e30 = peg$literalExpectation("card", true);
-  var peg$e31 = peg$literalExpectation("bankAccount", false);
-  var peg$e32 = peg$literalExpectation("bank-account", true);
-  var peg$e33 = peg$literalExpectation("from", true);
-  var peg$e34 = peg$literalExpectation("attendee", true);
-  var peg$e35 = peg$literalExpectation("expenseType", false);
-  var peg$e36 = peg$literalExpectation("expense-type", true);
-  var peg$e37 = peg$literalExpectation("receiptType", false);
-  var peg$e38 = peg$literalExpectation("receipt-type", true);
-  var peg$e39 = peg$literalExpectation("transactionStatus", false);
-  var peg$e40 = peg$literalExpectation("transaction-status", true);
-  var peg$e41 = peg$literalExpectation("withdrawalType", false);
-  var peg$e42 = peg$literalExpectation("withdrawal-type", true);
-  var peg$e43 = peg$literalExpectation("withdrawalStatus", false);
-  var peg$e44 = peg$literalExpectation("withdrawal-status", true);
-  var peg$e45 = peg$literalExpectation("paidStatus", false);
-  var peg$e46 = peg$literalExpectation("paid-status", true);
-  var peg$e47 = peg$literalExpectation("withdrawalID", true);
-  var peg$e48 = peg$literalExpectation("withdrawal-id", true);
-  var peg$e49 = peg$literalExpectation("billable", true);
-  var peg$e50 = peg$literalExpectation("reimbursable", true);
-  var peg$e51 = peg$literalExpectation("type", true);
-  var peg$e52 = peg$literalExpectation("status", true);
-  var peg$e53 = peg$literalExpectation("sortBy", false);
-  var peg$e54 = peg$literalExpectation("sort-by", true);
-  var peg$e55 = peg$literalExpectation("sortOrder", false);
-  var peg$e56 = peg$literalExpectation("sort-order", true);
-  var peg$e57 = peg$literalExpectation("policyID", false);
-  var peg$e58 = peg$literalExpectation("workspace", true);
-  var peg$e59 = peg$literalExpectation("submitted", true);
-  var peg$e60 = peg$literalExpectation("approved", true);
-  var peg$e61 = peg$literalExpectation("paid", true);
-  var peg$e62 = peg$literalExpectation("exported", true);
-  var peg$e63 = peg$literalExpectation("posted", true);
-  var peg$e64 = peg$literalExpectation("withdrawn", true);
-  var peg$e65 = peg$literalExpectation("groupBy", true);
-  var peg$e66 = peg$literalExpectation("group-by", true);
-  var peg$e67 = peg$literalExpectation("limit", true);
-  var peg$e68 = peg$literalExpectation("feed", true);
-  var peg$e69 = peg$literalExpectation("title", true);
-  var peg$e70 = peg$literalExpectation("submitterUserID", true);
-  var peg$e71 = peg$literalExpectation("submitter-user-id", true);
-  var peg$e72 = peg$literalExpectation("submitterPayrollID", true);
-  var peg$e73 = peg$literalExpectation("submitter-payroll-id", true);
-  var peg$e74 = peg$literalExpectation("orderDealNumbers", true);
-  var peg$e75 = peg$literalExpectation("order-deal-numbers", true);
-  var peg$e76 = peg$literalExpectation("assignee", true);
-  var peg$e77 = peg$literalExpectation("createdBy", true);
-  var peg$e78 = peg$literalExpectation("created-by", true);
-  var peg$e79 = peg$literalExpectation("action", true);
-  var peg$e80 = peg$literalExpectation("total", true);
-  var peg$e81 = peg$literalExpectation("has", true);
-  var peg$e82 = peg$literalExpectation("is", true);
-  var peg$e83 = peg$literalExpectation("purchaseAmount", true);
-  var peg$e84 = peg$literalExpectation("purchase-amount", true);
-  var peg$e85 = peg$literalExpectation("purchaseCurrency", true);
-  var peg$e86 = peg$literalExpectation("purchase-currency", true);
-  var peg$e87 = peg$literalExpectation("amountDebited", true);
-  var peg$e88 = peg$literalExpectation("amount-debited", true);
-  var peg$e89 = peg$literalExpectation("amountReimbursed", true);
-  var peg$e90 = peg$literalExpectation("amount-reimbursed", true);
-  var peg$e91 = peg$literalExpectation("columns", true);
-  var peg$e92 = peg$literalExpectation("view", true);
-  var peg$e93 = peg$literalExpectation("compare", true);
-  var peg$e94 = peg$literalExpectation("per-diem", true);
-  var peg$e95 = peg$literalExpectation("drafts", true);
-  var peg$e96 = peg$literalExpectation("draft", true);
-  var peg$e97 = peg$literalExpectation("tax", true);
-  var peg$e98 = peg$literalExpectation("policy-name", true);
-  var peg$e99 = peg$literalExpectation("long-report-id", true);
-  var peg$e100 = peg$literalExpectation("exported-to", true);
-  var peg$e101 = peg$classExpectation([":", "="], false, false);
-  var peg$e102 = peg$literalExpectation("exportedTo", true);
-  var peg$e103 = peg$literalExpectation("exchange-rate", true);
-  var peg$e104 = peg$literalExpectation("reimbursable-total", true);
-  var peg$e105 = peg$literalExpectation("non-reimbursable-total", true);
-  var peg$e106 = peg$literalExpectation("group-from", true);
-  var peg$e107 = peg$literalExpectation("group-expenses", true);
-  var peg$e108 = peg$literalExpectation("group-total", true);
-  var peg$e109 = peg$literalExpectation("group-card", true);
-  var peg$e110 = peg$literalExpectation("group-feed", true);
-  var peg$e111 = peg$literalExpectation("group-bank-account", true);
-  var peg$e112 = peg$literalExpectation("group-withdrawn", true);
-  var peg$e113 = peg$literalExpectation("group-withdrawal-id", true);
-  var peg$e114 = peg$literalExpectation("group-amount-debited", true);
-  var peg$e115 = peg$literalExpectation("group-amount-reimbursed", true);
-  var peg$e116 = peg$literalExpectation("group-category", true);
-  var peg$e117 = peg$literalExpectation("group-tag", true);
-  var peg$e118 = peg$literalExpectation("group-merchant", true);
-  var peg$e119 = peg$literalExpectation("group-day", true);
-  var peg$e120 = peg$literalExpectation("group-month", true);
-  var peg$e121 = peg$literalExpectation("group-week", true);
-  var peg$e122 = peg$literalExpectation("group-year", true);
-  var peg$e123 = peg$literalExpectation("group-quarter", true);
-  var peg$e124 = peg$otherExpectation("operator");
-  var peg$e125 = peg$literalExpectation("!=", false);
-  var peg$e126 = peg$literalExpectation(">=", false);
-  var peg$e127 = peg$literalExpectation(">", false);
-  var peg$e128 = peg$literalExpectation("<=", false);
-  var peg$e129 = peg$literalExpectation("<", false);
-  var peg$e130 = peg$literalExpectation("\\", false);
-  var peg$e131 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false);
-  var peg$e132 = peg$otherExpectation("word");
-  var peg$e133 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e134 = peg$otherExpectation("whitespace");
-  var peg$e135 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e136 = peg$otherExpectation("quote");
-  var peg$e137 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e138 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e139 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e140 = peg$literalExpectation("\u201C", false);
-  var peg$e141 = peg$literalExpectation("\u201D", false);
-  var peg$e142 = peg$literalExpectation("\"", false);
-  var peg$e143 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e144 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e145 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e146 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e147 = peg$classExpectation([","], false, false);
-  var peg$e148 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
+  var peg$e22 = peg$literalExpectation("vendor", true);
+  var peg$e23 = peg$literalExpectation("to", true);
+  var peg$e24 = peg$literalExpectation("exporter", true);
+  var peg$e25 = peg$literalExpectation("payer", true);
+  var peg$e26 = peg$literalExpectation("paidBy", false);
+  var peg$e27 = peg$literalExpectation("paid-by", true);
+  var peg$e28 = peg$literalExpectation("taxRate", true);
+  var peg$e29 = peg$literalExpectation("tax-rate", true);
+  var peg$e30 = peg$literalExpectation("cardID", false);
+  var peg$e31 = peg$literalExpectation("card", true);
+  var peg$e32 = peg$literalExpectation("bankAccount", false);
+  var peg$e33 = peg$literalExpectation("bank-account", true);
+  var peg$e34 = peg$literalExpectation("from", true);
+  var peg$e35 = peg$literalExpectation("attendee", true);
+  var peg$e36 = peg$literalExpectation("expenseType", false);
+  var peg$e37 = peg$literalExpectation("expense-type", true);
+  var peg$e38 = peg$literalExpectation("receiptType", false);
+  var peg$e39 = peg$literalExpectation("receipt-type", true);
+  var peg$e40 = peg$literalExpectation("transactionStatus", false);
+  var peg$e41 = peg$literalExpectation("transaction-status", true);
+  var peg$e42 = peg$literalExpectation("withdrawalType", false);
+  var peg$e43 = peg$literalExpectation("withdrawal-type", true);
+  var peg$e44 = peg$literalExpectation("withdrawalStatus", false);
+  var peg$e45 = peg$literalExpectation("withdrawal-status", true);
+  var peg$e46 = peg$literalExpectation("paidStatus", false);
+  var peg$e47 = peg$literalExpectation("paid-status", true);
+  var peg$e48 = peg$literalExpectation("withdrawalID", true);
+  var peg$e49 = peg$literalExpectation("withdrawal-id", true);
+  var peg$e50 = peg$literalExpectation("billable", true);
+  var peg$e51 = peg$literalExpectation("reimbursable", true);
+  var peg$e52 = peg$literalExpectation("type", true);
+  var peg$e53 = peg$literalExpectation("status", true);
+  var peg$e54 = peg$literalExpectation("sortBy", false);
+  var peg$e55 = peg$literalExpectation("sort-by", true);
+  var peg$e56 = peg$literalExpectation("sortOrder", false);
+  var peg$e57 = peg$literalExpectation("sort-order", true);
+  var peg$e58 = peg$literalExpectation("policyID", false);
+  var peg$e59 = peg$literalExpectation("workspace", true);
+  var peg$e60 = peg$literalExpectation("submitted", true);
+  var peg$e61 = peg$literalExpectation("approved", true);
+  var peg$e62 = peg$literalExpectation("paid", true);
+  var peg$e63 = peg$literalExpectation("exported", true);
+  var peg$e64 = peg$literalExpectation("posted", true);
+  var peg$e65 = peg$literalExpectation("withdrawn", true);
+  var peg$e66 = peg$literalExpectation("groupBy", true);
+  var peg$e67 = peg$literalExpectation("group-by", true);
+  var peg$e68 = peg$literalExpectation("limit", true);
+  var peg$e69 = peg$literalExpectation("feed", true);
+  var peg$e70 = peg$literalExpectation("title", true);
+  var peg$e71 = peg$literalExpectation("submitterUserID", true);
+  var peg$e72 = peg$literalExpectation("submitter-user-id", true);
+  var peg$e73 = peg$literalExpectation("submitterPayrollID", true);
+  var peg$e74 = peg$literalExpectation("submitter-payroll-id", true);
+  var peg$e75 = peg$literalExpectation("orderDealNumbers", true);
+  var peg$e76 = peg$literalExpectation("order-deal-numbers", true);
+  var peg$e77 = peg$literalExpectation("assignee", true);
+  var peg$e78 = peg$literalExpectation("createdBy", true);
+  var peg$e79 = peg$literalExpectation("created-by", true);
+  var peg$e80 = peg$literalExpectation("action", true);
+  var peg$e81 = peg$literalExpectation("total", true);
+  var peg$e82 = peg$literalExpectation("has", true);
+  var peg$e83 = peg$literalExpectation("is", true);
+  var peg$e84 = peg$literalExpectation("purchaseAmount", true);
+  var peg$e85 = peg$literalExpectation("purchase-amount", true);
+  var peg$e86 = peg$literalExpectation("purchaseCurrency", true);
+  var peg$e87 = peg$literalExpectation("purchase-currency", true);
+  var peg$e88 = peg$literalExpectation("amountDebited", true);
+  var peg$e89 = peg$literalExpectation("amount-debited", true);
+  var peg$e90 = peg$literalExpectation("amountReimbursed", true);
+  var peg$e91 = peg$literalExpectation("amount-reimbursed", true);
+  var peg$e92 = peg$literalExpectation("columns", true);
+  var peg$e93 = peg$literalExpectation("view", true);
+  var peg$e94 = peg$literalExpectation("compare", true);
+  var peg$e95 = peg$literalExpectation("per-diem", true);
+  var peg$e96 = peg$literalExpectation("drafts", true);
+  var peg$e97 = peg$literalExpectation("draft", true);
+  var peg$e98 = peg$literalExpectation("tax", true);
+  var peg$e99 = peg$literalExpectation("policy-name", true);
+  var peg$e100 = peg$literalExpectation("long-report-id", true);
+  var peg$e101 = peg$literalExpectation("exported-to", true);
+  var peg$e102 = peg$classExpectation([":", "="], false, false);
+  var peg$e103 = peg$literalExpectation("exportedTo", true);
+  var peg$e104 = peg$literalExpectation("exchange-rate", true);
+  var peg$e105 = peg$literalExpectation("reimbursable-total", true);
+  var peg$e106 = peg$literalExpectation("non-reimbursable-total", true);
+  var peg$e107 = peg$literalExpectation("group-from", true);
+  var peg$e108 = peg$literalExpectation("group-expenses", true);
+  var peg$e109 = peg$literalExpectation("group-total", true);
+  var peg$e110 = peg$literalExpectation("group-card", true);
+  var peg$e111 = peg$literalExpectation("group-feed", true);
+  var peg$e112 = peg$literalExpectation("group-bank-account", true);
+  var peg$e113 = peg$literalExpectation("group-withdrawn", true);
+  var peg$e114 = peg$literalExpectation("group-withdrawal-id", true);
+  var peg$e115 = peg$literalExpectation("group-amount-debited", true);
+  var peg$e116 = peg$literalExpectation("group-amount-reimbursed", true);
+  var peg$e117 = peg$literalExpectation("group-category", true);
+  var peg$e118 = peg$literalExpectation("group-tag", true);
+  var peg$e119 = peg$literalExpectation("group-merchant", true);
+  var peg$e120 = peg$literalExpectation("group-day", true);
+  var peg$e121 = peg$literalExpectation("group-month", true);
+  var peg$e122 = peg$literalExpectation("group-week", true);
+  var peg$e123 = peg$literalExpectation("group-year", true);
+  var peg$e124 = peg$literalExpectation("group-quarter", true);
+  var peg$e125 = peg$otherExpectation("operator");
+  var peg$e126 = peg$literalExpectation("!=", false);
+  var peg$e127 = peg$literalExpectation(">=", false);
+  var peg$e128 = peg$literalExpectation(">", false);
+  var peg$e129 = peg$literalExpectation("<=", false);
+  var peg$e130 = peg$literalExpectation("<", false);
+  var peg$e131 = peg$literalExpectation("\\", false);
+  var peg$e132 = peg$classExpectation([",", "\"", "\u201D", "\u201C", "\\"], false, false);
+  var peg$e133 = peg$otherExpectation("word");
+  var peg$e134 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e135 = peg$otherExpectation("whitespace");
+  var peg$e136 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e137 = peg$otherExpectation("quote");
+  var peg$e138 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e139 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e140 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e141 = peg$literalExpectation("\u201C", false);
+  var peg$e142 = peg$literalExpectation("\u201D", false);
+  var peg$e143 = peg$literalExpectation("\"", false);
+  var peg$e144 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e145 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e146 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e147 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e148 = peg$classExpectation([","], false, false);
+  var peg$e149 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ","], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -574,122 +576,123 @@ function peg$parse(input, options) {
   var peg$f16 = function() { return "groupCurrency"; };
   var peg$f17 = function() { return "tag"; };
   var peg$f18 = function() { return "category"; };
-  var peg$f19 = function() { return "to"; };
-  var peg$f20 = function() { return "exporter"; };
-  var peg$f21 = function() { return "payer"; };
-  var peg$f22 = function() { return "paidBy"; };
-  var peg$f23 = function() { return "taxRate"; };
-  var peg$f24 = function() { return "cardID"; };
-  var peg$f25 = function() { return "bankAccount"; };
-  var peg$f26 = function() { return "from"; };
-  var peg$f27 = function() {return "attendee"};
-  var peg$f28 = function() { return "expenseType"; };
-  var peg$f29 = function() { return "receiptType"; };
-  var peg$f30 = function() { return "transactionStatus"; };
-  var peg$f31 = function() { return "withdrawalType"; };
-  var peg$f32 = function() { return "withdrawalStatus"; };
-  var peg$f33 = function() { return "paidStatus"; };
-  var peg$f34 = function() { return "withdrawalID"; };
-  var peg$f35 = function() { return "billable"; };
-  var peg$f36 = function() { return "reimbursable"; };
-  var peg$f37 = function() { return "type"; };
-  var peg$f38 = function() { return "status"; };
-  var peg$f39 = function() { return "sortBy"; };
-  var peg$f40 = function() { return "sortOrder"; };
-  var peg$f41 = function() { return "policyID"; };
-  var peg$f42 = function() { return "submitted"; };
-  var peg$f43 = function() { return "approved"; };
-  var peg$f44 = function() { return "paid"; };
-  var peg$f45 = function() { return "exported"; };
-  var peg$f46 = function() { return "posted"; };
-  var peg$f47 = function() { return "withdrawn"; };
-  var peg$f48 = function() { return "groupBy"; };
-  var peg$f49 = function() { return "limit"; };
-  var peg$f50 = function() { return "feed"; };
-  var peg$f51 = function() { return "title"; };
-  var peg$f52 = function() { return "submitterUserID"; };
-  var peg$f53 = function() { return "submitterPayrollID"; };
-  var peg$f54 = function() { return "orderDealNumbers"; };
-  var peg$f55 = function() { return "assignee"; };
-  var peg$f56 = function() { return "createdBy"; };
-  var peg$f57 = function() { return "action"; };
-  var peg$f58 = function() {return "total"; };
-  var peg$f59 = function() {return "has"; };
-  var peg$f60 = function() {return "is"; };
-  var peg$f61 = function() {return "purchaseAmount"};
-  var peg$f62 = function() {return "purchaseCurrency"};
-  var peg$f63 = function() {return "amountDebited"};
-  var peg$f64 = function() {return "amountReimbursed"};
-  var peg$f65 = function() {
+  var peg$f19 = function() { return "vendor"; };
+  var peg$f20 = function() { return "to"; };
+  var peg$f21 = function() { return "exporter"; };
+  var peg$f22 = function() { return "payer"; };
+  var peg$f23 = function() { return "paidBy"; };
+  var peg$f24 = function() { return "taxRate"; };
+  var peg$f25 = function() { return "cardID"; };
+  var peg$f26 = function() { return "bankAccount"; };
+  var peg$f27 = function() { return "from"; };
+  var peg$f28 = function() {return "attendee"};
+  var peg$f29 = function() { return "expenseType"; };
+  var peg$f30 = function() { return "receiptType"; };
+  var peg$f31 = function() { return "transactionStatus"; };
+  var peg$f32 = function() { return "withdrawalType"; };
+  var peg$f33 = function() { return "withdrawalStatus"; };
+  var peg$f34 = function() { return "paidStatus"; };
+  var peg$f35 = function() { return "withdrawalID"; };
+  var peg$f36 = function() { return "billable"; };
+  var peg$f37 = function() { return "reimbursable"; };
+  var peg$f38 = function() { return "type"; };
+  var peg$f39 = function() { return "status"; };
+  var peg$f40 = function() { return "sortBy"; };
+  var peg$f41 = function() { return "sortOrder"; };
+  var peg$f42 = function() { return "policyID"; };
+  var peg$f43 = function() { return "submitted"; };
+  var peg$f44 = function() { return "approved"; };
+  var peg$f45 = function() { return "paid"; };
+  var peg$f46 = function() { return "exported"; };
+  var peg$f47 = function() { return "posted"; };
+  var peg$f48 = function() { return "withdrawn"; };
+  var peg$f49 = function() { return "groupBy"; };
+  var peg$f50 = function() { return "limit"; };
+  var peg$f51 = function() { return "feed"; };
+  var peg$f52 = function() { return "title"; };
+  var peg$f53 = function() { return "submitterUserID"; };
+  var peg$f54 = function() { return "submitterPayrollID"; };
+  var peg$f55 = function() { return "orderDealNumbers"; };
+  var peg$f56 = function() { return "assignee"; };
+  var peg$f57 = function() { return "createdBy"; };
+  var peg$f58 = function() { return "action"; };
+  var peg$f59 = function() {return "total"; };
+  var peg$f60 = function() {return "has"; };
+  var peg$f61 = function() {return "is"; };
+  var peg$f62 = function() {return "purchaseAmount"};
+  var peg$f63 = function() {return "purchaseCurrency"};
+  var peg$f64 = function() {return "amountDebited"};
+  var peg$f65 = function() {return "amountReimbursed"};
+  var peg$f66 = function() {
   isColumnsContext = true;
   return "columns";
 };
-  var peg$f66 = function() {return "view"};
-  var peg$f67 = function() {return "compare"};
-  var peg$f68 = function() { return isColumnsContext; };
-  var peg$f69 = function() { return "perDiem"; };
-  var peg$f70 = function() { return "drafts"; };
-  var peg$f71 = function() { return "originalamount"; };
-  var peg$f72 = function() { return "taxAmount"; };
-  var peg$f73 = function() { return "taxrate"; };
-  var peg$f74 = function() { return "policyname"; };
-  var peg$f75 = function() { return "withdrawalID"; };
-  var peg$f76 = function() { return "bankAccount"; };
-  var peg$f77 = function() { return "reportID"; };
-  var peg$f78 = function() { return "base62ReportID"; };
-  var peg$f79 = function() { return "exportedto"; };
-  var peg$f80 = function() { return "exportedTo"; };
+  var peg$f67 = function() {return "view"};
+  var peg$f68 = function() {return "compare"};
+  var peg$f69 = function() { return isColumnsContext; };
+  var peg$f70 = function() { return "perDiem"; };
+  var peg$f71 = function() { return "drafts"; };
+  var peg$f72 = function() { return "originalamount"; };
+  var peg$f73 = function() { return "taxAmount"; };
+  var peg$f74 = function() { return "taxrate"; };
+  var peg$f75 = function() { return "policyname"; };
+  var peg$f76 = function() { return "withdrawalID"; };
+  var peg$f77 = function() { return "bankAccount"; };
+  var peg$f78 = function() { return "reportID"; };
+  var peg$f79 = function() { return "base62ReportID"; };
+  var peg$f80 = function() { return "exportedto"; };
   var peg$f81 = function() { return "exportedTo"; };
-  var peg$f82 = function() { return "exchangeRate"; };
-  var peg$f83 = function() { return "reimbursableTotal"; };
-  var peg$f84 = function() { return "nonReimbursableTotal"; };
-  var peg$f85 = function() { return "groupFrom"; };
-  var peg$f86 = function() { return "groupExpenses"; };
-  var peg$f87 = function() { return "groupTotal"; };
-  var peg$f88 = function() { return "groupCard"; };
-  var peg$f89 = function() { return "groupFeed"; };
-  var peg$f90 = function() { return "groupBankAccount"; };
-  var peg$f91 = function() { return "groupWithdrawn"; };
-  var peg$f92 = function() { return "groupWithdrawalID"; };
-  var peg$f93 = function() { return "groupAmountDebited"; };
-  var peg$f94 = function() { return "groupAmountReimbursed"; };
-  var peg$f95 = function() { return "amountDebited"; };
-  var peg$f96 = function() { return "amountReimbursed"; };
-  var peg$f97 = function() { return "groupCategory"; };
-  var peg$f98 = function() { return "groupTag"; };
-  var peg$f99 = function() { return "groupMerchant"; };
-  var peg$f100 = function() { return "groupday"; };
-  var peg$f101 = function() { return "groupmonth"; };
-  var peg$f102 = function() { return "groupweek"; };
-  var peg$f103 = function() { return "groupyear"; };
-  var peg$f104 = function() { return "groupquarter"; };
-  var peg$f105 = function() { return "eq"; };
-  var peg$f106 = function() { return "neq"; };
-  var peg$f107 = function() { return "gte"; };
-  var peg$f108 = function() { return "gt"; };
-  var peg$f109 = function() { return "lte"; };
-  var peg$f110 = function() { return "lt"; };
-  var peg$f111 = function(o) {
+  var peg$f82 = function() { return "exportedTo"; };
+  var peg$f83 = function() { return "exchangeRate"; };
+  var peg$f84 = function() { return "reimbursableTotal"; };
+  var peg$f85 = function() { return "nonReimbursableTotal"; };
+  var peg$f86 = function() { return "groupFrom"; };
+  var peg$f87 = function() { return "groupExpenses"; };
+  var peg$f88 = function() { return "groupTotal"; };
+  var peg$f89 = function() { return "groupCard"; };
+  var peg$f90 = function() { return "groupFeed"; };
+  var peg$f91 = function() { return "groupBankAccount"; };
+  var peg$f92 = function() { return "groupWithdrawn"; };
+  var peg$f93 = function() { return "groupWithdrawalID"; };
+  var peg$f94 = function() { return "groupAmountDebited"; };
+  var peg$f95 = function() { return "groupAmountReimbursed"; };
+  var peg$f96 = function() { return "amountDebited"; };
+  var peg$f97 = function() { return "amountReimbursed"; };
+  var peg$f98 = function() { return "groupCategory"; };
+  var peg$f99 = function() { return "groupTag"; };
+  var peg$f100 = function() { return "groupMerchant"; };
+  var peg$f101 = function() { return "groupday"; };
+  var peg$f102 = function() { return "groupmonth"; };
+  var peg$f103 = function() { return "groupweek"; };
+  var peg$f104 = function() { return "groupyear"; };
+  var peg$f105 = function() { return "groupquarter"; };
+  var peg$f106 = function() { return "eq"; };
+  var peg$f107 = function() { return "neq"; };
+  var peg$f108 = function() { return "gte"; };
+  var peg$f109 = function() { return "gt"; };
+  var peg$f110 = function() { return "lte"; };
+  var peg$f111 = function() { return "lt"; };
+  var peg$f112 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       isColumnsContext = false;
       return o;
   };
-  var peg$f112 = function(c) { return c; };
-  var peg$f113 = function(chars) { return chars.join("").trim(); };
-  var peg$f114 = function() {
+  var peg$f113 = function(c) { return c; };
+  var peg$f114 = function(chars) { return chars.join("").trim(); };
+  var peg$f115 = function() {
   isColumnsContext = false;
   return "and";
 };
-  var peg$f115 = function() { return expectingNestedQuote; };
-  var peg$f116 = function(start, inner, end) { //handle no-breaking space
+  var peg$f116 = function() { return expectingNestedQuote; };
+  var peg$f117 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f117 = function(start) {return "“"};
-  var peg$f118 = function(start) {return "”"};
-  var peg$f119 = function(start) {return "\""};
-  var peg$f120 = function(start, inner, end) {
+  var peg$f118 = function(start) {return "“"};
+  var peg$f119 = function(start) {return "”"};
+  var peg$f120 = function(start) {return "\""};
+  var peg$f121 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -1205,85 +1208,88 @@ function peg$parse(input, options) {
                             if (s1 === peg$FAILED) {
                               s1 = peg$parsecategory();
                               if (s1 === peg$FAILED) {
-                                s1 = peg$parseto();
+                                s1 = peg$parsevendor();
                                 if (s1 === peg$FAILED) {
-                                  s1 = peg$parsetaxRate();
+                                  s1 = peg$parseto();
                                   if (s1 === peg$FAILED) {
-                                    s1 = peg$parsecardID();
+                                    s1 = peg$parsetaxRate();
                                     if (s1 === peg$FAILED) {
-                                      s1 = peg$parsebankAccount();
+                                      s1 = peg$parsecardID();
                                       if (s1 === peg$FAILED) {
-                                        s1 = peg$parsefrom();
+                                        s1 = peg$parsebankAccount();
                                         if (s1 === peg$FAILED) {
-                                          s1 = peg$parseattendee();
+                                          s1 = peg$parsefrom();
                                           if (s1 === peg$FAILED) {
-                                            s1 = peg$parsepayer();
+                                            s1 = peg$parseattendee();
                                             if (s1 === peg$FAILED) {
-                                              s1 = peg$parsepaidBy();
+                                              s1 = peg$parsepayer();
                                               if (s1 === peg$FAILED) {
-                                                s1 = peg$parseexporter();
+                                                s1 = peg$parsepaidBy();
                                                 if (s1 === peg$FAILED) {
-                                                  s1 = peg$parseexpenseType();
+                                                  s1 = peg$parseexporter();
                                                   if (s1 === peg$FAILED) {
-                                                    s1 = peg$parsereceiptType();
+                                                    s1 = peg$parseexpenseType();
                                                     if (s1 === peg$FAILED) {
-                                                      s1 = peg$parsetransactionStatus();
+                                                      s1 = peg$parsereceiptType();
                                                       if (s1 === peg$FAILED) {
-                                                        s1 = peg$parsewithdrawalType();
+                                                        s1 = peg$parsetransactionStatus();
                                                         if (s1 === peg$FAILED) {
-                                                          s1 = peg$parsewithdrawalStatus();
+                                                          s1 = peg$parsewithdrawalType();
                                                           if (s1 === peg$FAILED) {
-                                                            s1 = peg$parsepaidStatus();
+                                                            s1 = peg$parsewithdrawalStatus();
                                                             if (s1 === peg$FAILED) {
-                                                              s1 = peg$parsewithdrawalID();
+                                                              s1 = peg$parsepaidStatus();
                                                               if (s1 === peg$FAILED) {
-                                                                s1 = peg$parsesubmitted();
+                                                                s1 = peg$parsewithdrawalID();
                                                                 if (s1 === peg$FAILED) {
-                                                                  s1 = peg$parseapproved();
+                                                                  s1 = peg$parsesubmitted();
                                                                   if (s1 === peg$FAILED) {
-                                                                    s1 = peg$parsepaid();
+                                                                    s1 = peg$parseapproved();
                                                                     if (s1 === peg$FAILED) {
-                                                                      s1 = peg$parseexportedTo();
+                                                                      s1 = peg$parsepaid();
                                                                       if (s1 === peg$FAILED) {
-                                                                        s1 = peg$parseexported();
+                                                                        s1 = peg$parseexportedTo();
                                                                         if (s1 === peg$FAILED) {
-                                                                          s1 = peg$parseposted();
+                                                                          s1 = peg$parseexported();
                                                                           if (s1 === peg$FAILED) {
-                                                                            s1 = peg$parsewithdrawn();
+                                                                            s1 = peg$parseposted();
                                                                             if (s1 === peg$FAILED) {
-                                                                              s1 = peg$parsefeed();
+                                                                              s1 = peg$parsewithdrawn();
                                                                               if (s1 === peg$FAILED) {
-                                                                                s1 = peg$parsetitle();
+                                                                                s1 = peg$parsefeed();
                                                                                 if (s1 === peg$FAILED) {
-                                                                                  s1 = peg$parsesubmitterUserID();
+                                                                                  s1 = peg$parsetitle();
                                                                                   if (s1 === peg$FAILED) {
-                                                                                    s1 = peg$parsesubmitterPayrollID();
+                                                                                    s1 = peg$parsesubmitterUserID();
                                                                                     if (s1 === peg$FAILED) {
-                                                                                      s1 = peg$parseorderDealNumbers();
+                                                                                      s1 = peg$parsesubmitterPayrollID();
                                                                                       if (s1 === peg$FAILED) {
-                                                                                        s1 = peg$parseassignee();
+                                                                                        s1 = peg$parseorderDealNumbers();
                                                                                         if (s1 === peg$FAILED) {
-                                                                                          s1 = peg$parsecreatedBy();
+                                                                                          s1 = peg$parseassignee();
                                                                                           if (s1 === peg$FAILED) {
-                                                                                            s1 = peg$parsereimbursable();
+                                                                                            s1 = peg$parsecreatedBy();
                                                                                             if (s1 === peg$FAILED) {
-                                                                                              s1 = peg$parsebillable();
+                                                                                              s1 = peg$parsereimbursable();
                                                                                               if (s1 === peg$FAILED) {
-                                                                                                s1 = peg$parseaction();
+                                                                                                s1 = peg$parsebillable();
                                                                                                 if (s1 === peg$FAILED) {
-                                                                                                  s1 = peg$parsehas();
+                                                                                                  s1 = peg$parseaction();
                                                                                                   if (s1 === peg$FAILED) {
-                                                                                                    s1 = peg$parseis();
+                                                                                                    s1 = peg$parsehas();
                                                                                                     if (s1 === peg$FAILED) {
-                                                                                                      s1 = peg$parsepurchaseCurrency();
+                                                                                                      s1 = peg$parseis();
                                                                                                       if (s1 === peg$FAILED) {
-                                                                                                        s1 = peg$parsepurchaseAmount();
+                                                                                                        s1 = peg$parsepurchaseCurrency();
                                                                                                         if (s1 === peg$FAILED) {
-                                                                                                          s1 = peg$parsepolicyID();
+                                                                                                          s1 = peg$parsepurchaseAmount();
                                                                                                           if (s1 === peg$FAILED) {
-                                                                                                            s1 = peg$parsestatus();
+                                                                                                            s1 = peg$parsepolicyID();
                                                                                                             if (s1 === peg$FAILED) {
-                                                                                                              s1 = peg$parsereportFieldDynamic();
+                                                                                                              s1 = peg$parsestatus();
+                                                                                                              if (s1 === peg$FAILED) {
+                                                                                                                s1 = peg$parsereportFieldDynamic();
+                                                                                                              }
                                                                                                             }
                                                                                                           }
                                                                                                         }
@@ -1769,13 +1775,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseto() {
+  function peg$parsevendor() {
     var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 2);
+    s1 = input.substr(peg$currPos, 6);
     if (s1.toLowerCase() === peg$c17) {
-      peg$currPos += 2;
+      peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e22); }
@@ -1789,13 +1795,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseexporter() {
+  function peg$parseto() {
     var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 8);
+    s1 = input.substr(peg$currPos, 2);
     if (s1.toLowerCase() === peg$c18) {
-      peg$currPos += 8;
+      peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
@@ -1809,13 +1815,13 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parsepayer() {
+  function peg$parseexporter() {
     var s0, s1;
 
     s0 = peg$currPos;
-    s1 = input.substr(peg$currPos, 5);
+    s1 = input.substr(peg$currPos, 8);
     if (s1.toLowerCase() === peg$c19) {
-      peg$currPos += 5;
+      peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e24); }
@@ -1829,28 +1835,48 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsepayer() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 5);
+    if (s1.toLowerCase() === peg$c20) {
+      peg$currPos += 5;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f22();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsepaidBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c20) {
-      s0 = peg$c20;
+    if (input.substr(peg$currPos, 6) === peg$c21) {
+      s0 = peg$c21;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c21) {
+      if (s1.toLowerCase() === peg$c22) {
         peg$currPos += 7;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e26); }
+        if (peg$silentFails === 0) { peg$fail(peg$e27); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f22();
+        s1 = peg$f23();
       }
       s0 = s1;
     }
@@ -1862,24 +1888,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c22) {
+    if (s0.toLowerCase() === peg$c23) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c23) {
+      if (s1.toLowerCase() === peg$c24) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e28); }
+        if (peg$silentFails === 0) { peg$fail(peg$e29); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f23();
+        s1 = peg$f24();
       }
       s0 = s1;
     }
@@ -1890,25 +1916,25 @@ function peg$parse(input, options) {
   function peg$parsecardID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c24) {
-      s0 = peg$c24;
+    if (input.substr(peg$currPos, 6) === peg$c25) {
+      s0 = peg$c25;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 4);
-      if (s1.toLowerCase() === peg$c25) {
+      if (s1.toLowerCase() === peg$c26) {
         peg$currPos += 4;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+        if (peg$silentFails === 0) { peg$fail(peg$e31); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f24();
+        s1 = peg$f25();
       }
       s0 = s1;
     }
@@ -1919,25 +1945,25 @@ function peg$parse(input, options) {
   function peg$parsebankAccount() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c26) {
-      s0 = peg$c26;
+    if (input.substr(peg$currPos, 11) === peg$c27) {
+      s0 = peg$c27;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c27) {
+      if (s1.toLowerCase() === peg$c28) {
         peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e32); }
+        if (peg$silentFails === 0) { peg$fail(peg$e33); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f25();
+        s1 = peg$f26();
       }
       s0 = s1;
     }
@@ -1950,15 +1976,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c28) {
+    if (s1.toLowerCase() === peg$c29) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f26();
+      s1 = peg$f27();
     }
     s0 = s1;
 
@@ -1970,15 +1996,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c29) {
+    if (s1.toLowerCase() === peg$c30) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f27();
+      s1 = peg$f28();
     }
     s0 = s1;
 
@@ -1988,25 +2014,25 @@ function peg$parse(input, options) {
   function peg$parseexpenseType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c30) {
-      s0 = peg$c30;
+    if (input.substr(peg$currPos, 11) === peg$c31) {
+      s0 = peg$c31;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c31) {
+      if (s1.toLowerCase() === peg$c32) {
         peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e36); }
+        if (peg$silentFails === 0) { peg$fail(peg$e37); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f28();
+        s1 = peg$f29();
       }
       s0 = s1;
     }
@@ -2017,25 +2043,25 @@ function peg$parse(input, options) {
   function peg$parsereceiptType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 11) === peg$c32) {
-      s0 = peg$c32;
+    if (input.substr(peg$currPos, 11) === peg$c33) {
+      s0 = peg$c33;
       peg$currPos += 11;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 12);
-      if (s1.toLowerCase() === peg$c33) {
+      if (s1.toLowerCase() === peg$c34) {
         peg$currPos += 12;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e38); }
+        if (peg$silentFails === 0) { peg$fail(peg$e39); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f29();
+        s1 = peg$f30();
       }
       s0 = s1;
     }
@@ -2046,25 +2072,25 @@ function peg$parse(input, options) {
   function peg$parsetransactionStatus() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 17) === peg$c34) {
-      s0 = peg$c34;
+    if (input.substr(peg$currPos, 17) === peg$c35) {
+      s0 = peg$c35;
       peg$currPos += 17;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 18);
-      if (s1.toLowerCase() === peg$c35) {
+      if (s1.toLowerCase() === peg$c36) {
         peg$currPos += 18;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e40); }
+        if (peg$silentFails === 0) { peg$fail(peg$e41); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f30();
+        s1 = peg$f31();
       }
       s0 = s1;
     }
@@ -2075,25 +2101,25 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalType() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 14) === peg$c36) {
-      s0 = peg$c36;
+    if (input.substr(peg$currPos, 14) === peg$c37) {
+      s0 = peg$c37;
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c37) {
+      if (s1.toLowerCase() === peg$c38) {
         peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e42); }
+        if (peg$silentFails === 0) { peg$fail(peg$e43); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f31();
+        s1 = peg$f32();
       }
       s0 = s1;
     }
@@ -2104,25 +2130,25 @@ function peg$parse(input, options) {
   function peg$parsewithdrawalStatus() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 16) === peg$c38) {
-      s0 = peg$c38;
+    if (input.substr(peg$currPos, 16) === peg$c39) {
+      s0 = peg$c39;
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c39) {
+      if (s1.toLowerCase() === peg$c40) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e44); }
+        if (peg$silentFails === 0) { peg$fail(peg$e45); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f32();
+        s1 = peg$f33();
       }
       s0 = s1;
     }
@@ -2133,25 +2159,25 @@ function peg$parse(input, options) {
   function peg$parsepaidStatus() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 10) === peg$c40) {
-      s0 = peg$c40;
+    if (input.substr(peg$currPos, 10) === peg$c41) {
+      s0 = peg$c41;
       peg$currPos += 10;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c41) {
+      if (s1.toLowerCase() === peg$c42) {
         peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e46); }
+        if (peg$silentFails === 0) { peg$fail(peg$e47); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f33();
+        s1 = peg$f34();
       }
       s0 = s1;
     }
@@ -2163,24 +2189,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 12);
-    if (s0.toLowerCase() === peg$c42) {
+    if (s0.toLowerCase() === peg$c43) {
       peg$currPos += 12;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e48); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 13);
-      if (s1.toLowerCase() === peg$c43) {
+      if (s1.toLowerCase() === peg$c44) {
         peg$currPos += 13;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e48); }
+        if (peg$silentFails === 0) { peg$fail(peg$e49); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f34();
+        s1 = peg$f35();
       }
       s0 = s1;
     }
@@ -2193,15 +2219,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c44) {
+    if (s1.toLowerCase() === peg$c45) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f35();
+      s1 = peg$f36();
     }
     s0 = s1;
 
@@ -2213,15 +2239,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c45) {
+    if (s1.toLowerCase() === peg$c46) {
       peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e50); }
+      if (peg$silentFails === 0) { peg$fail(peg$e51); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f37();
     }
     s0 = s1;
 
@@ -2233,15 +2259,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c46) {
+    if (s1.toLowerCase() === peg$c47) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e51); }
+      if (peg$silentFails === 0) { peg$fail(peg$e52); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f37();
+      s1 = peg$f38();
     }
     s0 = s1;
 
@@ -2253,15 +2279,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c47) {
+    if (s1.toLowerCase() === peg$c48) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e52); }
+      if (peg$silentFails === 0) { peg$fail(peg$e53); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f39();
     }
     s0 = s1;
 
@@ -2271,25 +2297,25 @@ function peg$parse(input, options) {
   function peg$parsesortBy() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 6) === peg$c48) {
-      s0 = peg$c48;
+    if (input.substr(peg$currPos, 6) === peg$c49) {
+      s0 = peg$c49;
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e53); }
+      if (peg$silentFails === 0) { peg$fail(peg$e54); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 7);
-      if (s1.toLowerCase() === peg$c49) {
+      if (s1.toLowerCase() === peg$c50) {
         peg$currPos += 7;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e54); }
+        if (peg$silentFails === 0) { peg$fail(peg$e55); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f39();
+        s1 = peg$f40();
       }
       s0 = s1;
     }
@@ -2300,25 +2326,25 @@ function peg$parse(input, options) {
   function peg$parsesortOrder() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 9) === peg$c50) {
-      s0 = peg$c50;
+    if (input.substr(peg$currPos, 9) === peg$c51) {
+      s0 = peg$c51;
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e55); }
+      if (peg$silentFails === 0) { peg$fail(peg$e56); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c51) {
+      if (s1.toLowerCase() === peg$c52) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e56); }
+        if (peg$silentFails === 0) { peg$fail(peg$e57); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f40();
+        s1 = peg$f41();
       }
       s0 = s1;
     }
@@ -2329,25 +2355,25 @@ function peg$parse(input, options) {
   function peg$parsepolicyID() {
     var s0, s1;
 
-    if (input.substr(peg$currPos, 8) === peg$c52) {
-      s0 = peg$c52;
+    if (input.substr(peg$currPos, 8) === peg$c53) {
+      s0 = peg$c53;
       peg$currPos += 8;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e57); }
+      if (peg$silentFails === 0) { peg$fail(peg$e58); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 9);
-      if (s1.toLowerCase() === peg$c53) {
+      if (s1.toLowerCase() === peg$c54) {
         peg$currPos += 9;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e58); }
+        if (peg$silentFails === 0) { peg$fail(peg$e59); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f41();
+        s1 = peg$f42();
       }
       s0 = s1;
     }
@@ -2360,15 +2386,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c54) {
+    if (s1.toLowerCase() === peg$c55) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e59); }
+      if (peg$silentFails === 0) { peg$fail(peg$e60); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f43();
     }
     s0 = s1;
 
@@ -2380,15 +2406,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c55) {
+    if (s1.toLowerCase() === peg$c56) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e60); }
+      if (peg$silentFails === 0) { peg$fail(peg$e61); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f43();
+      s1 = peg$f44();
     }
     s0 = s1;
 
@@ -2400,15 +2426,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c56) {
+    if (s1.toLowerCase() === peg$c57) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e61); }
+      if (peg$silentFails === 0) { peg$fail(peg$e62); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f44();
+      s1 = peg$f45();
     }
     s0 = s1;
 
@@ -2420,15 +2446,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c57) {
+    if (s1.toLowerCase() === peg$c58) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e62); }
+      if (peg$silentFails === 0) { peg$fail(peg$e63); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f45();
+      s1 = peg$f46();
     }
     s0 = s1;
 
@@ -2440,15 +2466,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c58) {
+    if (s1.toLowerCase() === peg$c59) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e63); }
+      if (peg$silentFails === 0) { peg$fail(peg$e64); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f46();
+      s1 = peg$f47();
     }
     s0 = s1;
 
@@ -2460,15 +2486,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c59) {
+    if (s1.toLowerCase() === peg$c60) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e64); }
+      if (peg$silentFails === 0) { peg$fail(peg$e65); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f47();
+      s1 = peg$f48();
     }
     s0 = s1;
 
@@ -2479,24 +2505,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c60) {
+    if (s0.toLowerCase() === peg$c61) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e65); }
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c61) {
+      if (s1.toLowerCase() === peg$c62) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e66); }
+        if (peg$silentFails === 0) { peg$fail(peg$e67); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f48();
+        s1 = peg$f49();
       }
       s0 = s1;
     }
@@ -2509,15 +2535,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c62) {
+    if (s1.toLowerCase() === peg$c63) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e67); }
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f49();
+      s1 = peg$f50();
     }
     s0 = s1;
 
@@ -2529,15 +2555,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c63) {
+    if (s1.toLowerCase() === peg$c64) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f50();
+      s1 = peg$f51();
     }
     s0 = s1;
 
@@ -2549,15 +2575,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c64) {
+    if (s1.toLowerCase() === peg$c65) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e69); }
+      if (peg$silentFails === 0) { peg$fail(peg$e70); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f51();
+      s1 = peg$f52();
     }
     s0 = s1;
 
@@ -2568,24 +2594,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 15);
-    if (s0.toLowerCase() === peg$c65) {
+    if (s0.toLowerCase() === peg$c66) {
       peg$currPos += 15;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c66) {
+      if (s1.toLowerCase() === peg$c67) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f52();
+        s1 = peg$f53();
       }
       s0 = s1;
     }
@@ -2597,24 +2623,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 18);
-    if (s0.toLowerCase() === peg$c67) {
+    if (s0.toLowerCase() === peg$c68) {
       peg$currPos += 18;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 20);
-      if (s1.toLowerCase() === peg$c68) {
+      if (s1.toLowerCase() === peg$c69) {
         peg$currPos += 20;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e73); }
+        if (peg$silentFails === 0) { peg$fail(peg$e74); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f53();
+        s1 = peg$f54();
       }
       s0 = s1;
     }
@@ -2626,24 +2652,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c69) {
+    if (s0.toLowerCase() === peg$c70) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e74); }
+      if (peg$silentFails === 0) { peg$fail(peg$e75); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 18);
-      if (s1.toLowerCase() === peg$c70) {
+      if (s1.toLowerCase() === peg$c71) {
         peg$currPos += 18;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e75); }
+        if (peg$silentFails === 0) { peg$fail(peg$e76); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f54();
+        s1 = peg$f55();
       }
       s0 = s1;
     }
@@ -2656,15 +2682,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c71) {
+    if (s1.toLowerCase() === peg$c72) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e76); }
+      if (peg$silentFails === 0) { peg$fail(peg$e77); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f55();
+      s1 = peg$f56();
     }
     s0 = s1;
 
@@ -2675,24 +2701,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 9);
-    if (s0.toLowerCase() === peg$c72) {
+    if (s0.toLowerCase() === peg$c73) {
       peg$currPos += 9;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 10);
-      if (s1.toLowerCase() === peg$c73) {
+      if (s1.toLowerCase() === peg$c74) {
         peg$currPos += 10;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e78); }
+        if (peg$silentFails === 0) { peg$fail(peg$e79); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f56();
+        s1 = peg$f57();
       }
       s0 = s1;
     }
@@ -2705,15 +2731,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c74) {
+    if (s1.toLowerCase() === peg$c75) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f57();
+      s1 = peg$f58();
     }
     s0 = s1;
 
@@ -2725,15 +2751,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c75) {
+    if (s1.toLowerCase() === peg$c76) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f58();
+      s1 = peg$f59();
     }
     s0 = s1;
 
@@ -2745,15 +2771,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c76) {
+    if (s1.toLowerCase() === peg$c77) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f59();
+      s1 = peg$f60();
     }
     s0 = s1;
 
@@ -2765,15 +2791,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c77) {
+    if (s1.toLowerCase() === peg$c78) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f60();
+      s1 = peg$f61();
     }
     s0 = s1;
 
@@ -2784,24 +2810,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 14);
-    if (s0.toLowerCase() === peg$c78) {
+    if (s0.toLowerCase() === peg$c79) {
       peg$currPos += 14;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 15);
-      if (s1.toLowerCase() === peg$c79) {
+      if (s1.toLowerCase() === peg$c80) {
         peg$currPos += 15;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f61();
+        s1 = peg$f62();
       }
       s0 = s1;
     }
@@ -2813,24 +2839,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c80) {
+    if (s0.toLowerCase() === peg$c81) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c81) {
+      if (s1.toLowerCase() === peg$c82) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f62();
+        s1 = peg$f63();
       }
       s0 = s1;
     }
@@ -2842,24 +2868,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 13);
-    if (s0.toLowerCase() === peg$c82) {
+    if (s0.toLowerCase() === peg$c83) {
       peg$currPos += 13;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e87); }
+      if (peg$silentFails === 0) { peg$fail(peg$e88); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 14);
-      if (s1.toLowerCase() === peg$c83) {
+      if (s1.toLowerCase() === peg$c84) {
         peg$currPos += 14;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e88); }
+        if (peg$silentFails === 0) { peg$fail(peg$e89); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f63();
+        s1 = peg$f64();
       }
       s0 = s1;
     }
@@ -2871,24 +2897,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 16);
-    if (s0.toLowerCase() === peg$c84) {
+    if (s0.toLowerCase() === peg$c85) {
       peg$currPos += 16;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 17);
-      if (s1.toLowerCase() === peg$c85) {
+      if (s1.toLowerCase() === peg$c86) {
         peg$currPos += 17;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e90); }
+        if (peg$silentFails === 0) { peg$fail(peg$e91); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f64();
+        s1 = peg$f65();
       }
       s0 = s1;
     }
@@ -2901,15 +2927,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c86) {
+    if (s1.toLowerCase() === peg$c87) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f65();
+      s1 = peg$f66();
     }
     s0 = s1;
 
@@ -2921,15 +2947,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c87) {
+    if (s1.toLowerCase() === peg$c88) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f66();
+      s1 = peg$f67();
     }
     s0 = s1;
 
@@ -2941,15 +2967,15 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c88) {
+    if (s1.toLowerCase() === peg$c89) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e93); }
+      if (peg$silentFails === 0) { peg$fail(peg$e94); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f67();
+      s1 = peg$f68();
     }
     s0 = s1;
 
@@ -2961,7 +2987,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f68();
+    s1 = peg$f69();
     if (s1) {
       s1 = undefined;
     } else {
@@ -3096,11 +3122,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c89) {
+    if (s1.toLowerCase() === peg$c90) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e94); }
+      if (peg$silentFails === 0) { peg$fail(peg$e95); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3115,7 +3141,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f69();
+        s0 = peg$f70();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3133,19 +3159,19 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c90) {
+    if (s1.toLowerCase() === peg$c91) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e95); }
+      if (peg$silentFails === 0) { peg$fail(peg$e96); }
     }
     if (s1 === peg$FAILED) {
       s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c91) {
+      if (s1.toLowerCase() === peg$c92) {
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e96); }
+        if (peg$silentFails === 0) { peg$fail(peg$e97); }
       }
     }
     if (s1 !== peg$FAILED) {
@@ -3161,7 +3187,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f70();
+        s0 = peg$f71();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3179,11 +3205,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c79) {
+    if (s1.toLowerCase() === peg$c80) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3198,7 +3224,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f71();
+        s0 = peg$f72();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3216,11 +3242,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c92) {
+    if (s1.toLowerCase() === peg$c93) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e97); }
+      if (peg$silentFails === 0) { peg$fail(peg$e98); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3235,7 +3261,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f72();
+        s0 = peg$f73();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3253,11 +3279,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c23) {
+    if (s1.toLowerCase() === peg$c24) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3272,7 +3298,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f73();
+        s0 = peg$f74();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3290,11 +3316,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c93) {
+    if (s1.toLowerCase() === peg$c94) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e98); }
+      if (peg$silentFails === 0) { peg$fail(peg$e99); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3309,7 +3335,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f74();
+        s0 = peg$f75();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3327,11 +3353,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c43) {
+    if (s1.toLowerCase() === peg$c44) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3346,7 +3372,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f75();
+        s0 = peg$f76();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3364,11 +3390,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 12);
-    if (s1.toLowerCase() === peg$c27) {
+    if (s1.toLowerCase() === peg$c28) {
       peg$currPos += 12;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3383,7 +3409,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f76();
+        s0 = peg$f77();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3401,11 +3427,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c94) {
+    if (s1.toLowerCase() === peg$c95) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e99); }
+      if (peg$silentFails === 0) { peg$fail(peg$e100); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3420,7 +3446,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f77();
+        s0 = peg$f78();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3457,7 +3483,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f78();
+        s0 = peg$f79();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3475,11 +3501,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c95) {
+    if (s1.toLowerCase() === peg$c96) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e100); }
+      if (peg$silentFails === 0) { peg$fail(peg$e101); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3494,7 +3520,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f79();
+        s0 = peg$f80();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3519,7 +3545,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e101); }
+        if (peg$silentFails === 0) { peg$fail(peg$e102); }
       }
       if (s2 !== peg$FAILED) {
         s1 = [s1, s2];
@@ -3538,11 +3564,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c96) {
+    if (s1.toLowerCase() === peg$c97) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e102); }
+      if (peg$silentFails === 0) { peg$fail(peg$e103); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3557,7 +3583,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f80();
+        s0 = peg$f81();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3569,11 +3595,11 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 11);
-      if (s1.toLowerCase() === peg$c95) {
+      if (s1.toLowerCase() === peg$c96) {
         peg$currPos += 11;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e100); }
+        if (peg$silentFails === 0) { peg$fail(peg$e101); }
       }
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
@@ -3588,7 +3614,7 @@ function peg$parse(input, options) {
         }
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f81();
+          s0 = peg$f82();
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3607,11 +3633,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c97) {
+    if (s1.toLowerCase() === peg$c98) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e103); }
+      if (peg$silentFails === 0) { peg$fail(peg$e104); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3626,7 +3652,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f82();
+        s0 = peg$f83();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3644,11 +3670,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c98) {
+    if (s1.toLowerCase() === peg$c99) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e104); }
+      if (peg$silentFails === 0) { peg$fail(peg$e105); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3663,7 +3689,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f83();
+        s0 = peg$f84();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3681,11 +3707,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 22);
-    if (s1.toLowerCase() === peg$c99) {
+    if (s1.toLowerCase() === peg$c100) {
       peg$currPos += 22;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e105); }
+      if (peg$silentFails === 0) { peg$fail(peg$e106); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3700,7 +3726,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f84();
+        s0 = peg$f85();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3718,11 +3744,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c100) {
+    if (s1.toLowerCase() === peg$c101) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e106); }
+      if (peg$silentFails === 0) { peg$fail(peg$e107); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3737,7 +3763,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f85();
+        s0 = peg$f86();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3755,11 +3781,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c101) {
+    if (s1.toLowerCase() === peg$c102) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e107); }
+      if (peg$silentFails === 0) { peg$fail(peg$e108); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3774,7 +3800,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f86();
+        s0 = peg$f87();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3792,11 +3818,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c102) {
+    if (s1.toLowerCase() === peg$c103) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e108); }
+      if (peg$silentFails === 0) { peg$fail(peg$e109); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3811,7 +3837,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f87();
+        s0 = peg$f88();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3829,11 +3855,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c103) {
+    if (s1.toLowerCase() === peg$c104) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e109); }
+      if (peg$silentFails === 0) { peg$fail(peg$e110); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3848,7 +3874,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f88();
+        s0 = peg$f89();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3866,11 +3892,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c104) {
+    if (s1.toLowerCase() === peg$c105) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e110); }
+      if (peg$silentFails === 0) { peg$fail(peg$e111); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3885,7 +3911,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f89();
+        s0 = peg$f90();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3903,11 +3929,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 18);
-    if (s1.toLowerCase() === peg$c105) {
+    if (s1.toLowerCase() === peg$c106) {
       peg$currPos += 18;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e111); }
+      if (peg$silentFails === 0) { peg$fail(peg$e112); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3922,7 +3948,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f90();
+        s0 = peg$f91();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3940,11 +3966,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 15);
-    if (s1.toLowerCase() === peg$c106) {
+    if (s1.toLowerCase() === peg$c107) {
       peg$currPos += 15;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e112); }
+      if (peg$silentFails === 0) { peg$fail(peg$e113); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3959,7 +3985,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f91();
+        s0 = peg$f92();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3977,11 +4003,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 19);
-    if (s1.toLowerCase() === peg$c107) {
+    if (s1.toLowerCase() === peg$c108) {
       peg$currPos += 19;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e113); }
+      if (peg$silentFails === 0) { peg$fail(peg$e114); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3996,7 +4022,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f92();
+        s0 = peg$f93();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4014,11 +4040,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 20);
-    if (s1.toLowerCase() === peg$c108) {
+    if (s1.toLowerCase() === peg$c109) {
       peg$currPos += 20;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e114); }
+      if (peg$silentFails === 0) { peg$fail(peg$e115); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4033,7 +4059,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f93();
+        s0 = peg$f94();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4051,11 +4077,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 23);
-    if (s1.toLowerCase() === peg$c109) {
+    if (s1.toLowerCase() === peg$c110) {
       peg$currPos += 23;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e115); }
+      if (peg$silentFails === 0) { peg$fail(peg$e116); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4070,7 +4096,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f94();
+        s0 = peg$f95();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4088,11 +4114,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c83) {
+    if (s1.toLowerCase() === peg$c84) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4107,7 +4133,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f95();
+        s0 = peg$f96();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4125,11 +4151,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 17);
-    if (s1.toLowerCase() === peg$c85) {
+    if (s1.toLowerCase() === peg$c86) {
       peg$currPos += 17;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4144,7 +4170,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f96();
+        s0 = peg$f97();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4162,11 +4188,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c110) {
+    if (s1.toLowerCase() === peg$c111) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e116); }
+      if (peg$silentFails === 0) { peg$fail(peg$e117); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4181,7 +4207,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f97();
+        s0 = peg$f98();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4199,11 +4225,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c111) {
+    if (s1.toLowerCase() === peg$c112) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e117); }
+      if (peg$silentFails === 0) { peg$fail(peg$e118); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4218,7 +4244,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f98();
+        s0 = peg$f99();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4236,11 +4262,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 14);
-    if (s1.toLowerCase() === peg$c112) {
+    if (s1.toLowerCase() === peg$c113) {
       peg$currPos += 14;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e118); }
+      if (peg$silentFails === 0) { peg$fail(peg$e119); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4255,7 +4281,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f99();
+        s0 = peg$f100();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4273,11 +4299,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c113) {
+    if (s1.toLowerCase() === peg$c114) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e119); }
+      if (peg$silentFails === 0) { peg$fail(peg$e120); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4292,7 +4318,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f100();
+        s0 = peg$f101();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4310,11 +4336,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 11);
-    if (s1.toLowerCase() === peg$c114) {
+    if (s1.toLowerCase() === peg$c115) {
       peg$currPos += 11;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e120); }
+      if (peg$silentFails === 0) { peg$fail(peg$e121); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4329,7 +4355,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f101();
+        s0 = peg$f102();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4347,11 +4373,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c115) {
+    if (s1.toLowerCase() === peg$c116) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e121); }
+      if (peg$silentFails === 0) { peg$fail(peg$e122); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4366,7 +4392,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f102();
+        s0 = peg$f103();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4384,11 +4410,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 10);
-    if (s1.toLowerCase() === peg$c116) {
+    if (s1.toLowerCase() === peg$c117) {
       peg$currPos += 10;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e122); }
+      if (peg$silentFails === 0) { peg$fail(peg$e123); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4403,7 +4429,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f103();
+        s0 = peg$f104();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4421,11 +4447,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 13);
-    if (s1.toLowerCase() === peg$c117) {
+    if (s1.toLowerCase() === peg$c118) {
       peg$currPos += 13;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e123); }
+      if (peg$silentFails === 0) { peg$fail(peg$e124); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -4440,7 +4466,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f104();
+        s0 = peg$f105();
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4463,81 +4489,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e101); }
+      if (peg$silentFails === 0) { peg$fail(peg$e102); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f105();
+      s1 = peg$f106();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c118) {
-        s1 = peg$c118;
+      if (input.substr(peg$currPos, 2) === peg$c119) {
+        s1 = peg$c119;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e125); }
+        if (peg$silentFails === 0) { peg$fail(peg$e126); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f106();
+        s1 = peg$f107();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c119) {
-          s1 = peg$c119;
+        if (input.substr(peg$currPos, 2) === peg$c120) {
+          s1 = peg$c120;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e126); }
+          if (peg$silentFails === 0) { peg$fail(peg$e127); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f107();
+          s1 = peg$f108();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c120;
+            s1 = peg$c121;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e127); }
+            if (peg$silentFails === 0) { peg$fail(peg$e128); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f108();
+            s1 = peg$f109();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c121) {
-              s1 = peg$c121;
+            if (input.substr(peg$currPos, 2) === peg$c122) {
+              s1 = peg$c122;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e128); }
+              if (peg$silentFails === 0) { peg$fail(peg$e129); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f109();
+              s1 = peg$f110();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c122;
+                s1 = peg$c123;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e129); }
+                if (peg$silentFails === 0) { peg$fail(peg$e130); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f110();
+                s1 = peg$f111();
               }
               s0 = s1;
             }
@@ -4548,7 +4574,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e124); }
+      if (peg$silentFails === 0) { peg$fail(peg$e125); }
     }
 
     return s0;
@@ -4561,7 +4587,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f111(s1);
+      s1 = peg$f112(s1);
     }
     s0 = s1;
 
@@ -4573,11 +4599,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 92) {
-      s1 = peg$c123;
+      s1 = peg$c124;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e130); }
+      if (peg$silentFails === 0) { peg$fail(peg$e131); }
     }
     if (s1 !== peg$FAILED) {
       s2 = input.charAt(peg$currPos);
@@ -4585,11 +4611,11 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e131); }
+        if (peg$silentFails === 0) { peg$fail(peg$e132); }
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f112(s2);
+        s0 = peg$f113(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4615,7 +4641,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e133); }
+        if (peg$silentFails === 0) { peg$fail(peg$e134); }
       }
     }
     if (s2 !== peg$FAILED) {
@@ -4628,7 +4654,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e133); }
+            if (peg$silentFails === 0) { peg$fail(peg$e134); }
           }
         }
       }
@@ -4637,13 +4663,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f113(s1);
+      s1 = peg$f114(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e132); }
+      if (peg$silentFails === 0) { peg$fail(peg$e133); }
     }
 
     return s0;
@@ -4655,7 +4681,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f114();
+    s1 = peg$f115();
     s0 = s1;
 
     return s0;
@@ -4671,7 +4697,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e135); }
+      if (peg$silentFails === 0) { peg$fail(peg$e136); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -4680,12 +4706,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e135); }
+        if (peg$silentFails === 0) { peg$fail(peg$e136); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e134); }
+    if (peg$silentFails === 0) { peg$fail(peg$e135); }
 
     return s0;
   }
@@ -4695,7 +4721,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f115();
+    s1 = peg$f116();
     if (s1) {
       s1 = undefined;
     } else {
@@ -4732,7 +4758,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e137); }
+      if (peg$silentFails === 0) { peg$fail(peg$e138); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4741,7 +4767,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e137); }
+        if (peg$silentFails === 0) { peg$fail(peg$e138); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4749,7 +4775,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e138); }
+      if (peg$silentFails === 0) { peg$fail(peg$e139); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4760,7 +4786,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e139); }
+          if (peg$silentFails === 0) { peg$fail(peg$e140); }
         }
       }
       while (s4 !== peg$FAILED) {
@@ -4772,7 +4798,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e139); }
+            if (peg$silentFails === 0) { peg$fail(peg$e140); }
           }
         }
       }
@@ -4781,7 +4807,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e138); }
+        if (peg$silentFails === 0) { peg$fail(peg$e139); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -4790,7 +4816,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e133); }
+          if (peg$silentFails === 0) { peg$fail(peg$e134); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -4799,11 +4825,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e133); }
+            if (peg$silentFails === 0) { peg$fail(peg$e134); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f116(s1, s3, s5);
+        s0 = peg$f117(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4815,7 +4841,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e136); }
+      if (peg$silentFails === 0) { peg$fail(peg$e137); }
     }
 
     return s0;
@@ -4832,7 +4858,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e137); }
+      if (peg$silentFails === 0) { peg$fail(peg$e138); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -4841,7 +4867,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e137); }
+        if (peg$silentFails === 0) { peg$fail(peg$e138); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -4849,7 +4875,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e138); }
+      if (peg$silentFails === 0) { peg$fail(peg$e139); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -4860,7 +4886,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e139); }
+          if (peg$silentFails === 0) { peg$fail(peg$e140); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -4876,15 +4902,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c124;
+              s6 = peg$c125;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e140); }
+              if (peg$silentFails === 0) { peg$fail(peg$e141); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f117(s1);
+              s4 = peg$f118(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -4907,15 +4933,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c125;
+                s6 = peg$c126;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e141); }
+                if (peg$silentFails === 0) { peg$fail(peg$e142); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f118(s1);
+                s4 = peg$f119(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -4938,15 +4964,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c126;
+                  s6 = peg$c127;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e142); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e143); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f119(s1);
+                  s4 = peg$f120(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -4968,7 +4994,7 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e139); }
+            if (peg$silentFails === 0) { peg$fail(peg$e140); }
           }
           if (s4 === peg$FAILED) {
             s4 = peg$currPos;
@@ -4984,15 +5010,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8220) {
-                s6 = peg$c124;
+                s6 = peg$c125;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e140); }
+                if (peg$silentFails === 0) { peg$fail(peg$e141); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f117(s1);
+                s4 = peg$f118(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -5015,15 +5041,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 8221) {
-                  s6 = peg$c125;
+                  s6 = peg$c126;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e141); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e142); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f118(s1);
+                  s4 = peg$f119(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -5046,15 +5072,15 @@ function peg$parse(input, options) {
                 }
                 if (s5 !== peg$FAILED) {
                   if (input.charCodeAt(peg$currPos) === 34) {
-                    s6 = peg$c126;
+                    s6 = peg$c127;
                     peg$currPos++;
                   } else {
                     s6 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$e142); }
+                    if (peg$silentFails === 0) { peg$fail(peg$e143); }
                   }
                   if (s6 !== peg$FAILED) {
                     peg$savedPos = s4;
-                    s4 = peg$f119(s1);
+                    s4 = peg$f120(s1);
                   } else {
                     peg$currPos = s4;
                     s4 = peg$FAILED;
@@ -5071,7 +5097,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f120(s1, s3, s4);
+        s0 = peg$f121(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5083,7 +5109,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e136); }
+      if (peg$silentFails === 0) { peg$fail(peg$e137); }
     }
 
     return s0;
@@ -5098,7 +5124,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e138); }
+      if (peg$silentFails === 0) { peg$fail(peg$e139); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -5136,7 +5162,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e143); }
+      if (peg$silentFails === 0) { peg$fail(peg$e144); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -5145,7 +5171,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e143); }
+        if (peg$silentFails === 0) { peg$fail(peg$e144); }
       }
     }
     s2 = [];
@@ -5154,7 +5180,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e144); }
+      if (peg$silentFails === 0) { peg$fail(peg$e145); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -5163,7 +5189,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e144); }
+        if (peg$silentFails === 0) { peg$fail(peg$e145); }
       }
     }
     s3 = [];
@@ -5172,7 +5198,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e145); }
+      if (peg$silentFails === 0) { peg$fail(peg$e146); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -5181,7 +5207,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e145); }
+        if (peg$silentFails === 0) { peg$fail(peg$e146); }
       }
     }
     s4 = peg$parseoperator();
@@ -5200,7 +5226,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e146); }
+        if (peg$silentFails === 0) { peg$fail(peg$e147); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -5209,7 +5235,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e146); }
+          if (peg$silentFails === 0) { peg$fail(peg$e147); }
         }
       }
       s2 = peg$currPos;
@@ -5256,7 +5282,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e147); }
+          if (peg$silentFails === 0) { peg$fail(peg$e148); }
         }
       }
     }
@@ -5272,7 +5298,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e148); }
+      if (peg$silentFails === 0) { peg$fail(peg$e149); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 09585572ecd6..93b2a29b7c65 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -272,6 +272,7 @@ key "key"
       / groupCurrency
       / tag
       / category
+      / vendor
       / to
       / taxRate
       / cardID
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 6b42cf541fa6..eaf4f7ae0eb0 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -1333,6 +1333,7 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                     filterKey === FILTER_KEYS.EXPENSE_TYPE ||
                     filterKey === FILTER_KEYS.RECEIPT_TYPE ||
                     filterKey === FILTER_KEYS.TAG ||
+                    filterKey === FILTER_KEYS.VENDOR ||
                     filterKey === FILTER_KEYS.CURRENCY ||
                     filterKey === FILTER_KEYS.PURCHASE_CURRENCY ||
                     filterKey === FILTER_KEYS.FROM ||
@@ -1779,6 +1780,10 @@ function buildFilterFormValuesFromQuery(
                 .filter((name) => uniqueCategories.has(name))
                 .concat(hasEmptyCategoriesInFilter ? [CONST.SEARCH.CATEGORY_EMPTY_VALUE] : []);
         }
+        if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR) {
+            // Vendor names are matched by text on the server and the synced vendor lists load lazily, so the typed values are kept as-is.
+            filtersForm[addNegation(filterKey, isNegated)] = filterValues;
+        }
         if (filterKey === CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD) {
             filtersForm[filterKey] = filterValues
                 ?.map((filter) => {
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 13e142a428c7..d120395f79f9 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -92,7 +92,6 @@ import type {
     SearchYearGroup,
 } from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
-import arraysEqual from '@src/utils/arraysEqual';
 
 import type {Locale as DateFnsLocale} from 'date-fns';
 import type {TextStyle, ViewStyle} from 'react-native';
@@ -857,9 +856,6 @@ function getTransactionItemCommonFormattedProperties(
     };
 }
 
-/**
- * @private
- */
 function isReportEntry(key: string): key is ReportKey {
     return key.startsWith(ONYXKEYS.COLLECTION.REPORT);
 }
@@ -882,9 +878,6 @@ function isReportActionEntry(key: string): key is ReportActionKey {
     return key.startsWith(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
 }
 
-/**
- * @private
- */
 function isTransactionEntry(key: string): key is TransactionKey {
     return key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION);
 }
@@ -2453,6 +2446,8 @@ type CreateAndOpenSearchTransactionThreadParams = {
     isSelfTourViewed: boolean | undefined;
     hasCompletedGuidedSetupFlow: boolean | undefined;
 
+    delegateAccountID: number | undefined;
+
     /** Existing transaction thread report ID (childReportID), if any */
     IOUTransactionID?: string;
 
@@ -2476,6 +2471,7 @@ function createAndOpenSearchTransactionThread({
     personalDetails,
     isSelfTourViewed,
     hasCompletedGuidedSetupFlow,
+    delegateAccountID,
     IOUTransactionID,
     transactionPreviewData,
     shouldNavigate = true,
@@ -2495,7 +2491,7 @@ function createAndOpenSearchTransactionThread({
     const previewData = transactionPreviewData
         ? {...transactionPreviewData, hasTransactionThreadReport: true}
         : {hasTransaction: false, hasParentReport: false, hasParentReportAction: false, hasTransactionThreadReport: true};
-    setOptimisticDataForTransactionThreadPreview(item, previewData, getCurrencyDecimals, IOUTransactionID);
+    setOptimisticDataForTransactionThreadPreview(item, previewData, getCurrencyDecimals, delegateAccountID, IOUTransactionID);
 
     const hasActualTransactionThread = iouReportAction?.childReportID && iouReportAction?.childReportID !== CONST.FAKE_REPORT_ID;
     let transactionThreadReport;
@@ -4983,7 +4979,7 @@ function isSearchDataLoaded(searchResults: SearchResults | undefined, queryJSON:
     const hasResolved = searchResults?.data != null || searchResults?.errors != null || isTerminal;
     const hasResponseSortMetadata = searchResults?.search?.sortBy !== undefined && searchResults.search.sortOrder !== undefined;
     const hasMatchingRequestedHash = searchResults?.search?.hash === queryJSON?.hash;
-    // finallyData stores the requested hash when the request settles, so it remains authoritative even when cached data or old sort metadata remain.
+    // Search's finallyData and GetInsights' successData store the requested hash on response, so it remains authoritative even when cached data or old sort metadata remain.
     const canUseRequestedHash = isTerminal || !hasResponseSortMetadata;
     const hasMatchingHash = (canUseRequestedHash && hasMatchingRequestedHash) || searchResults?.search?.hash === responseAdjustedQueryHash;
 
@@ -5617,6 +5613,10 @@ const FILTER_VIEW_MAP = {
         labelKey: 'common.tag',
         icon: 'Tag',
     },
+    [CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR]: {
+        labelKey: 'common.vendor',
+        icon: 'Building',
+    },
     [CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE]: {
         labelKey: 'workspace.taxes.taxRate',
         icon: 'Percent',
@@ -5851,6 +5851,13 @@ function getDisplayValue(
             .join(', ');
     }
 
+    if (key === FILTER_KEYS.VENDOR || key === FILTER_KEYS.VENDOR_NOT) {
+        return form[key]
+            ?.sort((a, b) => sortOptionsWithEmptyValue(a, b, localeCompare))
+            .map((value) => (value === CONST.SEARCH.VENDOR_EMPTY_VALUE ? translate('search.noVendor') : value))
+            .join(', ');
+    }
+
     if (key === FILTER_KEYS.CURRENCY || key === FILTER_KEYS.CURRENCY_NOT || key === FILTER_KEYS.PURCHASE_CURRENCY || key === FILTER_KEYS.PURCHASE_CURRENCY_NOT) {
         return form[key]?.sort(localeCompare).join(', ');
     }
@@ -6568,8 +6575,11 @@ function getColumnsToShow({
     const allowedColumns: string[] = isExpenseReportView ? Object.values(CONST.SEARCH.REPORT_DETAILS_CUSTOM_COLUMNS) : Object.values(CONST.SEARCH.TYPE_CUSTOM_COLUMNS.EXPENSE);
     // The saved list outlives the vendor feature, so Vendor is dropped once no workspace has the feature anymore.
     const filteredVisibleColumns = visibleColumns.filter((column) => allowedColumns.includes(column) && (isVendorColumnAvailable || column !== CONST.SEARCH.TABLE_COLUMNS.VENDOR));
-    const isDefaultExpenseColumnSelection = arraysEqual(Object.values(CONST.SEARCH.TYPE_DEFAULT_COLUMNS.EXPENSE), filteredVisibleColumns);
-    const shouldUseCustomResult = !isDefaultExpenseColumnSelection && filteredVisibleColumns.length > 0;
+
+    // An explicit selection always wins, even when it happens to match the default set. Treating a
+    // default-looking selection as "no selection" would hand control back to the data-driven fallback
+    // below, which re-adds columns the user just turned off (e.g. Description on any expense that has one).
+    const shouldUseCustomResult = filteredVisibleColumns.length > 0;
 
     let customResult: SearchColumnType[] | undefined;
 
@@ -7112,6 +7122,7 @@ function shouldShowDeleteOption(
     currentSearchResults: SearchResults['data'] | undefined,
     currentUserAccountID: number,
     rules: OnyxCollection<OnyxTypes.Rule>,
+    cardList: OnyxEntry<OnyxTypes.CardList>,
     selectedReports: SelectedReports[] = [],
     searchDataType?: SearchDataTypes,
 ) {
@@ -7137,7 +7148,7 @@ function shouldShowDeleteOption(
                   }
               }
               const reportPolicy = currentSearchResults?.[`${ONYXKEYS.COLLECTION.POLICY}${fullReport.policyID}`];
-              return canDeleteMoneyRequestReport(fullReport, reportTransactions, reportActionsArray, currentUserAccountID, rules, reportPolicy, true);
+              return canDeleteMoneyRequestReport(fullReport, reportTransactions, reportActionsArray, currentUserAccountID, rules, reportPolicy, cardList, true);
           })
         : selectedTransactionsKeys.every((id) => {
               const transaction = currentSearchResults?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`] ?? selectedTransactions[id]?.transaction;
@@ -7152,7 +7163,7 @@ function shouldShowDeleteOption(
                   selectedTransactions[id].reportAction;
 
               const parentReportPolicy = currentSearchResults?.[`${ONYXKEYS.COLLECTION.POLICY}${parentReport?.policyID}`];
-              return canDeleteMoneyRequestReport(parentReport, [transaction], parentReportAction ? [parentReportAction] : [], currentUserAccountID, rules, parentReportPolicy);
+              return canDeleteMoneyRequestReport(parentReport, [transaction], parentReportAction ? [parentReportAction] : [], currentUserAccountID, rules, parentReportPolicy, cardList);
           });
 }
 
@@ -7270,6 +7281,8 @@ export {
     isTransactionQuarterGroupListItemType,
     isGroupedItemArray,
     isGroupEntry,
+    isReportEntry,
+    isTransactionEntry,
     isSearchResultsEmpty,
     isTransactionListItemType,
     isReportActionListItemType,
diff --git a/src/libs/SelectionListOrderUtils.ts b/src/libs/SelectionListOrderUtils.ts
index a5f9777dbe52..e9c2918cce46 100644
--- a/src/libs/SelectionListOrderUtils.ts
+++ b/src/libs/SelectionListOrderUtils.ts
@@ -1,7 +1,12 @@
 import CONST from '@src/CONST';
 
+/** Whether a list of `itemCount` items is long enough for the initial selection to be pinned to the top. */
+function shouldMoveInitialSelectionToTop(itemCount: number): boolean {
+    return itemCount >= CONST.STANDARD_LIST_ITEM_LIMIT;
+}
+
 function moveInitialSelectionToTop<T extends {value?: number | string}>(items: T[], initialSelectedValues: string[]): T[] {
-    if (initialSelectedValues.length === 0 || items.length < CONST.STANDARD_LIST_ITEM_LIMIT) {
+    if (initialSelectedValues.length === 0 || !shouldMoveInitialSelectionToTop(items.length)) {
         return items;
     }
 
@@ -22,3 +27,4 @@ function moveInitialSelectionToTop<T extends {value?: number | string}>(items: T
 }
 
 export default moveInitialSelectionToTop;
+export {shouldMoveInitialSelectionToTop};
diff --git a/src/libs/ShortMentionLogins.ts b/src/libs/ShortMentionLogins.ts
deleted file mode 100644
index 1be84f6768eb..000000000000
--- a/src/libs/ShortMentionLogins.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import ONYXKEYS from '@src/ONYXKEYS';
-
-import Onyx from 'react-native-onyx';
-
-/**
- * The logins of every known personal detail, in the shape `addDomainToShortMention` expects.
- *
- * Short mentions are resolved from non-React code (`getParsedComment` alone has around thirty
- * callers), so the list cannot come from a hook until those callers thread personal details in
- * themselves. It sits in its own file rather than next to the other personal details caches
- * because every subscription to `PERSONAL_DETAILS_LIST` is being removed one file at a time, and
- * adding a consumer to one someone is mid-way through deleting sets that work back.
- */
-let allPersonalDetailLogins: string[] = [];
-
-Onyx.connectWithoutView({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (personalDetailsList) => {
-        allPersonalDetailLogins = Object.values(personalDetailsList ?? {}).map((personalDetail) => personalDetail?.login ?? '');
-    },
-});
-
-function getAllPersonalDetailLogins(): string[] {
-    return allPersonalDetailLogins;
-}
-
-// eslint-disable-next-line import/prefer-default-export
-export {getAllPersonalDetailLogins};
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 42dd47f75f8a..956a15f5adcf 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -894,12 +894,15 @@ function getOptionData({
         personalDetails,
         policy,
         invoiceReceiverPolicy,
+        reportMetadata,
+        participantPersonalDetailListExcludeCurrentUser,
         policyTags,
         isReportArchived,
         privateIsArchived: !!reportNameValuePairs?.private_isArchived,
         conciergeReportID,
         reportAttributesDerived,
         visibleReportActionsData,
+        oneTransactionThreadReportID: reportAttributes?.oneTransactionThreadReportID,
         currentUserAccountID,
         currentUserLogin,
         isTrackIntentUser,
diff --git a/src/libs/StringUtils/index.ts b/src/libs/StringUtils/index.ts
index df1600ab7ad6..e0b61cb3c329 100644
--- a/src/libs/StringUtils/index.ts
+++ b/src/libs/StringUtils/index.ts
@@ -20,6 +20,14 @@ function sanitizeString(str: string): string {
     return deburr(str).toLowerCase().replaceAll(CONST.REGEX.NON_ALPHABETIC_AND_NON_LATIN_CHARS, '');
 }
 
+/**
+ * Converts non-breaking spaces to regular spaces and trims surrounding whitespace.
+ * Pasted names from docs and spreadsheets often include NBSP, which would otherwise fail uniqueness and empty checks.
+ */
+function sanitizeName(name: string): string {
+    return name.replaceAll(CONST.REGEX.NON_BREAKING_SPACE, ' ').trim();
+}
+
 /**
  *  Check if the string would be empty if all invisible characters were removed.
  */
@@ -244,6 +252,7 @@ function escapeRegExp(str: string): string {
 
 export default {
     sanitizeString,
+    sanitizeName,
     isEmptyString,
     removeInvisibleCharacters,
     normalize,
diff --git a/src/libs/TagUtils.ts b/src/libs/TagUtils.ts
index c40418dfda54..e1658641c244 100644
--- a/src/libs/TagUtils.ts
+++ b/src/libs/TagUtils.ts
@@ -1,7 +1,13 @@
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+
 import CONST from '@src/CONST';
+import type {PolicyTags} from '@src/types/onyx';
 
 import {Str} from 'expensify-common';
 
+import {escapeTagName} from './PolicyUtils';
+import StringUtils from './StringUtils';
+
 /**
  * Checks if a tag value is missing/empty
  * Similar to isCategoryMissing but for tags
@@ -29,4 +35,60 @@ function getDecodedTagName(tagName: string): string {
     return Str.htmlDecode(tagName);
 }
 
-export {isTagMissing, trimTag, getDecodedTagName};
+/** The reason a proposed tag name is invalid. Callers translate it via `getTagNameErrorMessage`. */
+type TagNameError =
+    | typeof CONST.INPUT_VALIDATION_ERRORS.REQUIRED
+    | typeof CONST.INPUT_VALIDATION_ERRORS.EXISTING
+    | typeof CONST.INPUT_VALIDATION_ERRORS.INVALID
+    | typeof CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+
+/**
+ * Validates a tag name against every rule (required, reserved, unique, length). This is the single
+ * source of truth shared by the create form, the RHP edit form, and inline table editing. Pass
+ * `currentName` (the decoded display name) when editing so renaming a tag to its own name isn't flagged
+ * as a duplicate. Uniqueness also matches HTML-encoded stored names such as `R&amp;D` vs `R&D`.
+ * Returns an error code, or undefined when the name is valid.
+ */
+function getTagNameError(tags: PolicyTags | undefined, newName: string, currentName?: string): TagNameError | undefined {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (StringUtils.isEmptyString(sanitized)) {
+        return CONST.INPUT_VALIDATION_ERRORS.REQUIRED;
+    }
+
+    // Tags are stored under their escaped name, so escape before the reserved-name, uniqueness, and length checks.
+    const escaped = escapeTagName(sanitized);
+
+    if (escaped === '0') {
+        return CONST.INPUT_VALIDATION_ERRORS.INVALID;
+    }
+
+    // Tag keys may be HTML-encoded, so uniqueness compares decoded names as well as the escaped storage key.
+    if (sanitized !== currentName && (tags?.[escaped] || Object.keys(tags ?? {}).some((name) => getDecodedTagName(name) === sanitized))) {
+        return CONST.INPUT_VALIDATION_ERRORS.EXISTING;
+    }
+
+    // Spread to count Unicode code points rather than UTF-16 code units.
+    if ([...escaped].length > CONST.API_TRANSACTION_TAG_MAX_LENGTH) {
+        return CONST.INPUT_VALIDATION_ERRORS.TOO_LONG;
+    }
+
+    return undefined;
+}
+
+/** Translates a {@link TagNameError} into a user-facing message for the given name. */
+function getTagNameErrorMessage(translate: LocaleContextProps['translate'], error: TagNameError, name: string): string {
+    switch (error) {
+        case CONST.INPUT_VALIDATION_ERRORS.REQUIRED:
+            return translate('workspace.tags.tagRequiredError');
+        case CONST.INPUT_VALIDATION_ERRORS.EXISTING:
+            return translate('workspace.tags.existingTagError');
+        case CONST.INPUT_VALIDATION_ERRORS.INVALID:
+            return translate('workspace.tags.invalidTagNameError');
+        case CONST.INPUT_VALIDATION_ERRORS.TOO_LONG:
+        default:
+            return translate('common.error.characterLimitExceedCounter', [...escapeTagName(StringUtils.sanitizeName(name))].length, CONST.API_TRANSACTION_TAG_MAX_LENGTH);
+    }
+}
+
+export {isTagMissing, trimTag, getDecodedTagName, getTagNameError, getTagNameErrorMessage};
diff --git a/src/libs/TransactionPreviewUtils.ts b/src/libs/TransactionPreviewUtils.ts
index 2636fe00df0f..748e413cc96c 100644
--- a/src/libs/TransactionPreviewUtils.ts
+++ b/src/libs/TransactionPreviewUtils.ts
@@ -43,6 +43,7 @@ import {
     isAmountMissing,
     isCreatedMissing,
     isDistanceRequest,
+    isFailedScanAmountPlaceholder,
     isFetchingWaypointsFromServer,
     isMerchantMissing,
     isOnHold,
@@ -316,6 +317,8 @@ function getTransactionPreviewTextAndTranslationPaths({
     let displayAmountText: TranslationPathOrText = isTransactionScanning ? {translationPath: 'iou.receiptStatusTitle'} : {text: convertToDisplayString(amount, requestCurrency)};
     if (isFetchingWaypoints && !requestAmount) {
         displayAmountText = {translationPath: 'iou.fieldPending'};
+    } else if (isFailedScanAmountPlaceholder(transaction, isMoneyRequestSettled)) {
+        displayAmountText = {text: ''};
     }
 
     const iouOriginalMessage: OnyxEntry<OnyxTypes.OriginalMessageIOU> = isMoneyRequestAction(action) ? (getOriginalMessage(action) ?? undefined) : undefined;
diff --git a/src/libs/TransactionThreadNavigationUtils.ts b/src/libs/TransactionThreadNavigationUtils.ts
index 93c90aa1b993..c609c7572efb 100644
--- a/src/libs/TransactionThreadNavigationUtils.ts
+++ b/src/libs/TransactionThreadNavigationUtils.ts
@@ -3,7 +3,7 @@ import type {IntroSelected, PersonalDetailsList, Report, ReportAction, Transacti
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {createTransactionThreadReport, setOptimisticTransactionThread} from './actions/Report';
-import {getIOUActionForReportID} from './ReportActionsUtils';
+import {getAllReportActions, getExpenseCreationIOUActionForTransactionID} from './ReportActionsUtils';
 import {findSelfDMReportID, getReportOrDraftReport} from './ReportUtils';
 import {isExpenseUnreported} from './TransactionUtils';
 
@@ -37,6 +37,20 @@ type ResolveReportContext = {
     hasCompletedGuidedSetupFlow: boolean | undefined;
 };
 
+/**
+ * The action that created an expense, looked up in a report's own actions.
+ *
+ * Deliberately not `getIOUActionForReportID`: paying, approving or rejecting an expense produces further IOU
+ * actions carrying the same `IOUTransactionID`, each with its own thread, and opening one of those shows a system
+ * message instead of the expense.
+ */
+function getExpenseCreationIOUActionForReportID(reportID: string | undefined, transactionID: string | undefined): OnyxEntry<ReportAction> {
+    if (!reportID || !transactionID) {
+        return undefined;
+    }
+    return getExpenseCreationIOUActionForTransactionID(Object.values(getAllReportActions(reportID)), transactionID);
+}
+
 /**
  * Resolves which report to open for a single expense, creating its transaction thread only if necessary.
  *
@@ -47,23 +61,21 @@ function getReportIDToOpenForExpense(expense: TransactionThreadNavigationDescrip
     const {transaction, reportID} = expense;
     const isUnreported = isExpenseUnreported(transaction);
 
-    // Unreported (tracked) expenses live in the self-DM; their transaction thread is the expense view to open,
-    // since report "0" does not exist. Prefer the snapshot-resolved thread, but fall back to local report actions
-    // so an optimistic (offline) expense — absent from the snapshot — still resolves to its real thread.
-    if (isUnreported) {
-        return expense.reportAction?.childReportID ?? getIOUActionForReportID(findSelfDMReportID(), transaction.transactionID)?.childReportID ?? reportID;
-    }
-
     // Prefer the transaction thread resolved from the Search snapshot. The main reportActions_ collection
-    // may be empty (e.g. right after clearing Onyx) so getIOUActionForReportID can fail and incorrectly
+    // may be empty (e.g. right after clearing Onyx) so the local lookup can fail and incorrectly
     // fall back to the whole parent expense report; the snapshot already carries the correct childReportID.
     if (expense.reportAction?.childReportID) {
         return expense.reportAction.childReportID;
     }
 
+    // An unreported (tracked) expense's IOU action lives in the self-DM, not under report "0", so that is where
+    // its thread has to be resolved from. Falling back to local report actions also lets an optimistic (offline)
+    // expense — absent from the snapshot — resolve to its real thread.
+    const iouActionReportID = isUnreported ? findSelfDMReportID() : reportID;
+
     // Prefer the live action from the main collection (it may carry a newer childReportID), fall back to the
     // snapshot action carried on the descriptor so a snapshot-only expense can still resolve/create its thread.
-    const iouAction = getIOUActionForReportID(reportID, transaction.transactionID) ?? expense.reportAction;
+    const iouAction = getExpenseCreationIOUActionForReportID(iouActionReportID, transaction.transactionID) ?? expense.reportAction;
     if (!iouAction) {
         return reportID;
     }
@@ -71,6 +83,10 @@ function getReportIDToOpenForExpense(expense: TransactionThreadNavigationDescrip
         return iouAction.childReportID;
     }
 
+    // No thread yet, so create one. An unreported expense used to return report "0" here instead, which is not a
+    // report that can be opened: the prev/next carousel enabled its arrow from the transaction alone and then had
+    // nowhere to navigate, so the press did nothing. createTransactionThreadReport recognizes an unreported
+    // transaction and parents the new thread to the self-DM.
     const transactionThreadReport = createTransactionThreadReport({
         introSelected: context.introSelected,
         conciergeChat: context.conciergeChat,
@@ -78,7 +94,9 @@ function getReportIDToOpenForExpense(expense: TransactionThreadNavigationDescrip
         hasCompletedGuidedSetupFlow: context.hasCompletedGuidedSetupFlow,
         currentUserLogin: context.currentUserEmail ?? '',
         currentUserAccountID: context.currentUserAccountID,
-        iouReport: getReportOrDraftReport(reportID) ?? expense.report,
+        // An unreported expense has no parent expense report to build the thread from; report "0" is a
+        // placeholder, not a row in the collection.
+        iouReport: isUnreported ? undefined : (getReportOrDraftReport(reportID) ?? expense.report),
         iouReportAction: iouAction,
         transaction,
         personalDetails: context.personalDetails,
diff --git a/src/libs/TransactionUtils/amountUtils.ts b/src/libs/TransactionUtils/amountUtils.ts
new file mode 100644
index 000000000000..e0101c29b742
--- /dev/null
+++ b/src/libs/TransactionUtils/amountUtils.ts
@@ -0,0 +1,47 @@
+import CONST from '@src/CONST';
+import type {Transaction} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+function hasValidModifiedAmount(transaction: OnyxEntry<Transaction> | null): boolean {
+    if (!transaction) {
+        return false;
+    }
+    // 0 is a valid modifiedAmount so we check all other falsy values
+    return transaction.modifiedAmount !== undefined && transaction.modifiedAmount !== null && transaction.modifiedAmount !== '';
+}
+
+function isFailedScanAmountPlaceholder(transaction: OnyxEntry<Transaction>, isReportSettled = false) {
+    // A failed Scan can temporarily become OPEN while another field is being edited. A newly submitted Scan
+    // with manually entered fields is also OPEN, but the server does not persist the draft's isAmountSet flag.
+    // Only treat OPEN as a placeholder while the amount is still unset in a draft or another field edit is pending.
+    const isOpenWithUnconfirmedAmount =
+        transaction?.receipt?.state === CONST.IOU.RECEIPT_STATE.OPEN &&
+        (transaction?.isAmountSet === false ||
+            !!transaction?.isMerchantSet ||
+            !!transaction?.isCreatedSet ||
+            !!transaction?.pendingFields?.merchant ||
+            !!transaction?.pendingFields?.created ||
+            !!transaction?.pendingFields?.currency);
+    return (
+        !isReportSettled &&
+        transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN &&
+        (transaction?.receipt?.state === CONST.IOU.RECEIPT_STATE.SCAN_FAILED || isOpenWithUnconfirmedAmount) &&
+        (transaction?.amount === 0 || transaction?.amount === undefined) &&
+        !hasValidModifiedAmount(transaction) &&
+        !transaction?.isAmountSet
+    );
+}
+
+function isAmountMissing(transaction: OnyxEntry<Transaction>, isFromExpenseReport = true) {
+    if (isFailedScanAmountPlaceholder(transaction)) {
+        return true;
+    }
+
+    if (isFromExpenseReport) {
+        return transaction?.amount === undefined && (transaction?.modifiedAmount === undefined || transaction?.modifiedAmount === '');
+    }
+    return (transaction?.amount === 0 || transaction?.amount === undefined) && !hasValidModifiedAmount(transaction);
+}
+
+export {hasValidModifiedAmount, isAmountMissing, isFailedScanAmountPlaceholder};
diff --git a/src/libs/TransactionUtils/buildOptimisticTransaction.ts b/src/libs/TransactionUtils/buildOptimisticTransaction.ts
new file mode 100644
index 000000000000..066242dae0d3
--- /dev/null
+++ b/src/libs/TransactionUtils/buildOptimisticTransaction.ts
@@ -0,0 +1,251 @@
+/**
+ * Builds the optimistic Transaction written to Onyx when an expense is created, before the server responds.
+ * Extracted from TransactionUtils/index.ts to keep that file smaller.
+ */
+import DateUtils from '@libs/DateUtils';
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import {rand64} from '@libs/NumberUtils';
+
+import CONST from '@src/CONST';
+import type {Policy, Transaction} from '@src/types/onyx';
+import type {Attendee, Participant, SplitExpense} from '@src/types/onyx/IOU';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {Comment, Receipt, Routes, TransactionCustomUnit, TransactionPendingFieldsKey, WaypointCollection} from '@src/types/onyx/Transaction';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import lodashSet from 'lodash/set';
+
+// This cycle import is safe because this file was extracted from TransactionUtils/index.ts, which re-exports it.
+// The functions imported here are pure helpers that aren't called at initialization time.
+// eslint-disable-next-line import/no-cycle
+import {isManualDistanceRequest, isOdometerDistanceRequest} from './index';
+
+type TransactionParams = {
+    /** Amount of the transaction, in cents */
+    amount: number;
+
+    modifiedAmount?: number;
+    modifiedMerchant?: string;
+    currency: string;
+    reportID: string | undefined;
+    comment?: string;
+    attendees?: Attendee[];
+    created?: string;
+    merchant?: string;
+    receipt?: OnyxEntry<Receipt>;
+
+    /** Receipt scan state for the optimistic transaction. Falls back to `receipt.state` when not set. */
+    receiptState?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
+    category?: string;
+    tag?: string;
+    taxCode?: string;
+    taxAmount?: number;
+    taxValue?: string;
+    billable?: boolean;
+    pendingFields?: Partial<Record<TransactionPendingFieldsKey, ValueOf<typeof CONST.RED_BRICK_ROAD_PENDING_ACTION>>>;
+    reimbursable?: boolean;
+    source?: string;
+    filename?: string;
+    customUnit?: TransactionCustomUnit;
+    splitExpenses?: SplitExpense[];
+    splitExpensesTotal?: number;
+    participants?: Participant[];
+    pendingAction?: PendingAction;
+    splitsStartDate?: string;
+    splitsEndDate?: string;
+    distance?: number;
+    customUnitRateID?: string;
+    waypoints?: WaypointCollection;
+    odometerStart?: number;
+    odometerEnd?: number;
+    routes?: Routes;
+    gpsCoordinates?: string;
+    type?: ValueOf<typeof CONST.TRANSACTION.TYPE>;
+    count?: number;
+    rate?: number;
+    unit?: ValueOf<typeof CONST.TIME_TRACKING.UNIT>;
+    commentType?: ValueOf<typeof CONST.TRANSACTION.TYPE>;
+};
+
+type BuildOptimisticTransactionParams = {
+    originalTransactionID?: string;
+
+    /** Reuse this ID when a distance expense already created an empty transaction */
+    existingTransactionID?: string;
+
+    existingTransaction?: OnyxEntry<Transaction>;
+    policy?: OnyxEntry<Policy>;
+    transactionParams: TransactionParams;
+    isDemoTransactionParam?: boolean;
+};
+
+/**
+ * Optimistically generate a transaction.
+ */
+function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): Transaction {
+    const {originalTransactionID = '', existingTransactionID, existingTransaction, policy, transactionParams, isDemoTransactionParam} = params;
+    const {
+        amount,
+        modifiedAmount,
+        modifiedMerchant,
+        currency,
+        reportID,
+        distance,
+        comment = '',
+        attendees = [],
+        created = '',
+        merchant = '',
+        receipt,
+        receiptState,
+        // Prevent RBR flip and transaction jump: initialize category to 'Uncategorized' instead of
+        // empty string so optimistic missing category violation isn't added then removed during backend sync
+        category = CONST.SEARCH.CATEGORY_DEFAULT_VALUE,
+        tag = '',
+        taxCode = '',
+        taxAmount = 0,
+        taxValue,
+        billable = false,
+        pendingFields,
+        reimbursable = true,
+        source = '',
+        filename = '',
+        customUnit,
+        splitExpenses,
+        splitsStartDate,
+        splitsEndDate,
+        splitExpensesTotal,
+        participants,
+        pendingAction = CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        customUnitRateID,
+        waypoints,
+        odometerStart,
+        odometerEnd,
+        routes,
+        type,
+        count,
+        rate,
+        unit,
+        commentType,
+    } = transactionParams;
+    // transactionIDs are random, positive, 64-bit numeric strings.
+    // Because JS can only handle 53-bit numbers, transactionIDs are strings in the front-end (just like reportActionID)
+    const transactionID = existingTransactionID ?? rand64();
+
+    const commentJSON: Comment = {comment, attendees};
+    if (odometerStart !== undefined) {
+        commentJSON.odometerStart = odometerStart;
+    }
+    if (odometerEnd !== undefined) {
+        commentJSON.odometerEnd = odometerEnd;
+    }
+    if (isDemoTransactionParam) {
+        commentJSON.isDemoTransaction = true;
+    }
+    if (source) {
+        commentJSON.source = source;
+    }
+    if (originalTransactionID) {
+        commentJSON.originalTransactionID = originalTransactionID;
+    }
+    if (splitExpenses) {
+        commentJSON.splitExpenses = splitExpenses;
+    }
+    if (splitsStartDate) {
+        commentJSON.splitsStartDate = splitsStartDate;
+    }
+    if (splitsEndDate) {
+        commentJSON.splitsEndDate = splitsEndDate;
+    }
+    if (splitExpensesTotal) {
+        commentJSON.splitExpensesTotal = splitExpensesTotal;
+    }
+    if (waypoints) {
+        commentJSON.waypoints = waypoints;
+    }
+    if (commentType) {
+        commentJSON.type = commentType;
+    }
+
+    const isMapDistanceTransaction = !!pendingFields?.waypoints || existingTransaction?.comment?.waypoints?.waypoint0;
+    const isManualDistanceTransaction = isManualDistanceRequest(existingTransaction);
+    const isOdometerDistanceTransaction = isOdometerDistanceRequest(existingTransaction);
+    if (isMapDistanceTransaction || isManualDistanceTransaction || isOdometerDistanceTransaction) {
+        // If customUnit is provided (e.g., for split expenses), use it directly
+        // Otherwise, build customUnit from distance parameter
+        if (customUnit) {
+            lodashSet(commentJSON, 'customUnit', customUnit);
+        } else {
+            const routeDistanceMeters = routes?.route0?.distance ?? existingTransaction?.routes?.route0?.distance;
+            lodashSet(commentJSON, 'customUnit', {...existingTransaction?.comment?.customUnit});
+            // Set the distance unit, which comes from the policy distance unit or the P2P rate data
+            lodashSet(commentJSON, 'customUnit.distanceUnit', DistanceRequestUtils.getUpdatedDistanceUnit({transaction: existingTransaction, policy}));
+            lodashSet(commentJSON, 'customUnit.quantity', distance);
+            if (customUnitRateID) {
+                lodashSet(commentJSON, 'customUnit.customUnitRateID', customUnitRateID);
+            }
+            lodashSet(commentJSON, 'customUnit.name', existingTransaction?.comment?.customUnit?.name ?? CONST.CUSTOM_UNITS.NAME_DISTANCE);
+            if (typeof routeDistanceMeters === 'number') {
+                lodashSet(commentJSON, 'customUnit.routeDistanceMeters', routeDistanceMeters);
+            }
+        }
+    }
+
+    const isPerDiemTransaction = !!pendingFields?.subRates;
+    if (isPerDiemTransaction) {
+        // Set the custom unit, which comes from the policy per diem rate data
+        lodashSet(commentJSON, 'customUnit', customUnit);
+    }
+
+    const isManualTransaction = !isPerDiemTransaction && !isMapDistanceTransaction && !isManualDistanceTransaction && !splitExpenses && !receipt?.source;
+    if (type === CONST.TRANSACTION.TYPE.TIME) {
+        commentJSON.units = {
+            count,
+            rate,
+            unit,
+        };
+        commentJSON.type = type;
+    }
+
+    return {
+        ...(!isEmptyObject(pendingFields) ? {pendingFields} : {}),
+        transactionID,
+        amount,
+        currency,
+        reportID,
+        comment: commentJSON,
+        merchant: merchant || (isManualTransaction ? CONST.TRANSACTION.DEFAULT_MERCHANT : CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT),
+        created: created || DateUtils.getDBTime(),
+        pendingAction,
+        receipt: receipt?.source
+            ? {
+                  source: receipt.source,
+                  filename: receipt?.name ?? filename,
+                  state: receiptState ?? receipt.state ?? CONST.IOU.RECEIPT_STATE.SCAN_READY,
+                  isTestDriveReceipt: receipt.isTestDriveReceipt,
+                  pageCount: receipt.pageCount,
+              }
+            : undefined,
+        hasEReceipt: existingTransaction?.hasEReceipt,
+        category,
+        tag,
+        taxCode,
+        taxAmount,
+        taxValue,
+        modifiedAmount,
+        modifiedMerchant,
+        billable,
+        reimbursable,
+        inserted: DateUtils.getDBTime(),
+        participants,
+        cardID: existingTransaction?.cardID,
+        cardName: existingTransaction?.cardName,
+        cardNumber: existingTransaction?.cardNumber,
+        ...(existingTransaction?.iouRequestType ? {iouRequestType: existingTransaction.iouRequestType} : {}),
+        routes,
+    };
+}
+
+export default buildOptimisticTransaction;
diff --git a/src/libs/TransactionUtils/duplicates.ts b/src/libs/TransactionUtils/duplicates.ts
new file mode 100644
index 000000000000..7097c3b79ebc
--- /dev/null
+++ b/src/libs/TransactionUtils/duplicates.ts
@@ -0,0 +1,469 @@
+/**
+ * Helpers for reviewing and merging duplicate expenses: comparing duplicate fields, checking whether duplicates can be merged,
+ * building the merge request params, and removing a transaction from duplicate-transaction violations.
+ * Extracted from TransactionUtils/index.ts to keep that file smaller.
+ */
+import type {MergeDuplicatesParams} from '@libs/API/parameters';
+import Log from '@libs/Log';
+import {getTaxByID, isMultiLevelTags as isMultiLevelTagsPolicyUtils, resolveCurrentTaxCode} from '@libs/PolicyUtils';
+import {getReportOrDraftReport, isOpenReport, isProcessingReport} from '@libs/ReportUtils';
+
+import type {UpdateMoneyRequestDataKeys} from '@userActions/IOU/UpdateMoneyRequest';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, PolicyCategories, PolicyTagLists, Report, ReviewDuplicates, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
+import type {OnyxData} from '@src/types/onyx/Request';
+import type {Comment} from '@src/types/onyx/Transaction';
+
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+
+import {SafeString} from 'expensify-common';
+import {deepEqual} from 'fast-equals';
+import Onyx from 'react-native-onyx';
+
+// This cycle import is safe because this file was extracted from TransactionUtils/index.ts, which re-exports it.
+// The functions imported here are pure helpers that aren't called at initialization time.
+// eslint-disable-next-line import/no-cycle
+import {getAmount, getCurrency, getDescription, getFormattedCreated, getMerchant, isManagedCardTransaction} from './index';
+
+type FieldsToCompare = Record<string, Array<keyof Transaction>>;
+type FieldsToChange = {
+    category?: Array<string | undefined>;
+    merchant?: Array<string | undefined>;
+    tag?: Array<string | undefined>;
+    description?: Array<Comment | undefined>;
+    taxCode?: Array<string | undefined>;
+    billable?: Array<boolean | undefined>;
+    reimbursable?: Array<boolean | undefined>;
+};
+
+/**
+ * Extracts a set of valid duplicate transaction IDs associated with a given transaction,
+ * excluding:
+ * - the transaction itself
+ * - duplicate IDs that appear more than once
+ * - duplicates referencing missing or invalid transactions
+ * - settled or approved transactions
+ *
+ * @param transactionID - The ID of the transaction being validated.
+ * @param transactionCollection - A collection of all transactions and their duplicates.
+ * @param currentTransactionViolations - The list of violations associated with this transaction.
+ * @returns A set of valid duplicate transaction IDs.
+ */
+function getValidDuplicateTransactionIDs(transactionID: string, transactionCollection: OnyxCollection<Transaction>, currentTransactionViolations: TransactionViolation[]): Set<string> {
+    const result = new Set<string>();
+    const seen = new Set<string>();
+    let foundDuplicateViolation = false;
+
+    if (!transactionCollection) {
+        return result;
+    }
+
+    for (const violation of currentTransactionViolations) {
+        if (violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION) {
+            continue;
+        }
+
+        // Skip further violations
+        if (foundDuplicateViolation) {
+            Log.warn(`Multiple duplicate violations found for transaction. Only one expected.`, {transactionID});
+            break;
+        }
+
+        foundDuplicateViolation = true;
+        const duplicatesIDs = violation.data?.duplicates ?? [];
+
+        const validTransactions: Transaction[] = [];
+
+        for (const duplicateID of duplicatesIDs) {
+            // Skip self-reference
+            if (duplicateID === transactionID || seen.has(duplicateID)) {
+                continue;
+            }
+            seen.add(duplicateID);
+
+            const transaction = transactionCollection?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${duplicateID}`];
+            if (!transaction?.transactionID) {
+                Log.warn(`Transaction does not exist or is invalid. Found in transaction.`, {duplicateID, transactionID});
+                continue;
+            }
+
+            validTransactions.push(transaction);
+        }
+
+        // Filter out transactions assumed that they have be reviewed by removing settled and approved transactions
+        const filtered = removeSettledAndApprovedTransactions(validTransactions);
+
+        for (const transaction of filtered) {
+            result.add(transaction.transactionID);
+        }
+    }
+
+    return result;
+}
+
+/**
+ * Adds onyx updates to the passed onyxData to update the DUPLICATED_TRANSACTION violation data
+ * by removing the passed transactionID from any violation that referenced it.
+ * @param onyxData - An object to store optimistic and failure updates.
+ * @param transactionID - The ID of the transaction being deleted or updated.
+ * @param transactions - A collection of all transactions and their duplicates.
+ * @param transactionViolations - The collection of the transaction violations including the duplicates violations.
+ *
+ */
+function removeTransactionFromDuplicateTransactionViolation(
+    onyxData: OnyxData<UpdateMoneyRequestDataKeys>,
+    transactionID: string,
+    transactions: OnyxCollection<Transaction>,
+    transactionViolations: OnyxCollection<TransactionViolations>,
+) {
+    if (!transactionID || !transactions || !transactionViolations) {
+        return;
+    }
+    const violations = transactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
+
+    if (!violations) {
+        return;
+    }
+
+    const duplicateIDs = getValidDuplicateTransactionIDs(transactionID, transactions, violations);
+
+    for (const duplicateID of duplicateIDs) {
+        const duplicateViolations = transactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`];
+
+        if (!duplicateViolations) {
+            continue;
+        }
+
+        const duplicateTransactionViolations = duplicateViolations.filter((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION);
+
+        if (duplicateTransactionViolations.length === 0) {
+            continue;
+        }
+
+        if (duplicateTransactionViolations.length > 1) {
+            Log.warn(`There are  duplicate transaction violations for transactionID. This should not happen.`, {duplicateTransactionViolations, duplicateID});
+            continue;
+        }
+
+        const duplicateTransactionViolation = duplicateTransactionViolations.at(0);
+        if (!duplicateTransactionViolation?.data?.duplicates) {
+            continue;
+        }
+
+        // If the transactionID is not in the duplicates list, we don't need to update the violation
+        const duplicateTransactionIDs = duplicateTransactionViolation.data.duplicates.filter((duplicateTransactionID) => duplicateTransactionID !== transactionID);
+        if (duplicateTransactionIDs.length === duplicateTransactionViolation.data.duplicates.length) {
+            continue;
+        }
+
+        const optimisticViolations = duplicateViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION);
+
+        if (duplicateTransactionIDs.length > 0) {
+            optimisticViolations.push({
+                ...duplicateTransactionViolation,
+                data: {
+                    ...duplicateTransactionViolation.data,
+                    duplicates: duplicateTransactionIDs,
+                },
+            });
+        }
+
+        const cleanedValue = optimisticViolations.length > 0 ? optimisticViolations : null;
+
+        onyxData.optimisticData?.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`,
+            value: cleanedValue,
+        });
+
+        // Re-apply the cleaned violations on success so that stale data from a
+        // queued command (e.g. OpenReport resolving between optimistic apply and
+        // the server response) doesn't re-introduce one-sided duplicate violations.
+        onyxData.successData?.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`,
+            value: cleanedValue,
+        });
+
+        onyxData.failureData?.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`,
+            value: duplicateViolations,
+        });
+    }
+}
+
+/**
+ * Whether a report is still editable for a duplicate merge, i.e. one that Auth's MergeTransactions command would
+ * accept. A report is mergeable when it is open, awaiting first-level approval, or unresolved (unreported expenses
+ * stay editable in Auth). Anything approved, closed (Submit & Close), or reimbursed is rejected server-side.
+ */
+function isReportMergeableForDuplicates(report: OnyxEntry<Report>): boolean {
+    return !report || isOpenReport(report) || isProcessingReport(report);
+}
+
+/**
+ * Keeps only transactions that Auth's MergeTransactions command would accept, so filtering here prevents sending a
+ * merge request that would fail server-side.
+ */
+function removeSettledAndApprovedTransactions(transactions: Array<OnyxEntry<Transaction>>): Transaction[] {
+    return transactions.filter((transaction) => !!transaction && isReportMergeableForDuplicates(getReportOrDraftReport(transaction.reportID))) as Transaction[];
+}
+
+/**
+ * Whether a duplicate merge can be submitted. Auth's MergeTransactions rejects the merge when the kept expense's
+ * report is no longer editable or when there are no duplicates left to merge, so callers should block the request
+ * in those cases.
+ */
+function canMergeDuplicates(keptReport: OnyxEntry<Report>, transactionIDList: string[]): boolean {
+    return isReportMergeableForDuplicates(keptReport) && transactionIDList.length > 0;
+}
+
+/**
+ * This function compares fields of duplicate transactions and determines which fields should be kept and which should be changed.
+ *
+ * @returns An object with two properties: 'keep' and 'change'.
+ * 'keep' is an object where each key is a field name and the value is the value of that field in the transaction that should be kept.
+ * 'change' is an object where each key is a field name and the value is an array of different values of that field in the duplicate transactions.
+ *
+ * The function works as follows:
+ * 1. It fetches the transaction violations for the given transaction ID.
+ * 2. It finds the duplicate transactions.
+ * 3. It creates two empty objects, 'keep' and 'change'.
+ * 4. It defines the fields to compare in the transactions.
+ * 5. It iterates over the fields to compare. For each field:
+ *    - If the field is 'description', it checks if all comments are equal, exist, or are empty. If so, it keeps the first transaction's comment. Otherwise, it finds the different values and adds them to 'change'.
+ *    - For other fields, it checks if all fields are equal. If so, it keeps the first transaction's field value. Otherwise, it finds the different values and adds them to 'change'.
+ * 6. It returns the 'keep' and 'change' objects.
+ */
+
+function compareDuplicateTransactionFields(
+    policyTags: PolicyTagLists,
+    reviewingTransaction: OnyxEntry<Transaction>,
+    duplicates: Array<OnyxEntry<Transaction>> | undefined,
+    report: OnyxEntry<Report>,
+    selectedTransactionID: string | undefined,
+    policy: OnyxEntry<Policy>,
+    policyCategories: OnyxEntry<PolicyCategories>,
+): {keep: Partial<ReviewDuplicates>; change: FieldsToChange} {
+    const reportID = report?.reportID;
+    const reviewingTransactionID = reviewingTransaction?.transactionID;
+    if (!reviewingTransactionID || !reportID) {
+        return {change: {}, keep: {}};
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const keep: Record<string, any> = {};
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const change: Record<string, any[]> = {};
+    if (!reviewingTransactionID || !reportID) {
+        return {keep, change};
+    }
+    const transactions = removeSettledAndApprovedTransactions([reviewingTransaction, ...(duplicates ?? [])]);
+
+    const fieldsToCompare: FieldsToCompare = {
+        merchant: ['modifiedMerchant', 'merchant'],
+        category: ['category'],
+        tag: ['tag'],
+        description: ['comment'],
+        taxCode: ['taxCode'],
+        billable: ['billable'],
+        reimbursable: ['reimbursable'],
+    };
+
+    // Helper function thats create an array of different values for a given key in the transactions
+    function getDifferentValues(items: Array<OnyxEntry<Transaction>>, keys: Array<keyof Transaction>) {
+        return [
+            ...new Set(
+                items
+                    .map((item) => {
+                        // Prioritize modifiedMerchant over merchant
+                        if (keys.includes('modifiedMerchant' as keyof Transaction) && keys.includes('merchant' as keyof Transaction)) {
+                            return getMerchant(item);
+                        }
+                        return keys.map((key) => item?.[key]);
+                    })
+                    .flat(),
+            ),
+        ];
+    }
+
+    // Helper function to check if all comments are equal
+    function areAllCommentsEqual(items: Array<OnyxEntry<Transaction>>, firstTransaction: OnyxEntry<Transaction>) {
+        return items.every((item) => deepEqual(getDescription(item), getDescription(firstTransaction)));
+    }
+
+    // Helper function to check if all fields are equal for a given key
+    function areAllFieldsEqual(items: Array<OnyxEntry<Transaction>>, keyExtractor: (item: OnyxEntry<Transaction>) => string) {
+        const firstTransaction = transactions.at(0);
+        return items.every((item) => keyExtractor(item) === keyExtractor(firstTransaction));
+    }
+
+    // Helper function to process changes
+    function processChanges(fieldName: string, items: Array<OnyxEntry<Transaction>>, keys: Array<keyof Transaction>) {
+        const differentValues = getDifferentValues(items, keys);
+        if (differentValues.length > 0) {
+            change[fieldName] = differentValues;
+        }
+    }
+
+    // The comment object needs to be stored only when selecting a specific transaction to keep.
+    // It contains details such as 'customUnit' and 'waypoints,' which remain unchanged during the review steps
+    // but are essential for displaying complete information on the confirmation page.
+    if (selectedTransactionID) {
+        const selectedTransaction = transactions.find((t) => t?.transactionID === selectedTransactionID);
+        keep.comment = selectedTransaction?.comment ?? {};
+    }
+
+    for (const fieldName in fieldsToCompare) {
+        if (Object.prototype.hasOwnProperty.call(fieldsToCompare, fieldName)) {
+            const keys = fieldsToCompare[fieldName];
+            const firstTransaction = transactions.at(0);
+            const isFirstTransactionCommentEmptyObject = typeof firstTransaction?.comment === 'object' && firstTransaction?.comment?.comment === '';
+
+            const areAllFieldsEqualForKey = areAllFieldsEqual(transactions, (item) => keys.map((key) => SafeString(item?.[key])).join('|'));
+            if (fieldName === 'description') {
+                const allCommentsAreEqual = areAllCommentsEqual(transactions, firstTransaction);
+                const allCommentsAreEmpty = isFirstTransactionCommentEmptyObject && transactions.every((item) => getDescription(item) === '');
+                if (allCommentsAreEqual || allCommentsAreEmpty) {
+                    keep[fieldName] = firstTransaction?.comment?.comment ?? firstTransaction?.comment;
+                } else {
+                    processChanges(fieldName, transactions, keys);
+                }
+            } else if (fieldName === 'merchant') {
+                if (areAllFieldsEqual(transactions, getMerchant)) {
+                    keep[fieldName] = getMerchant(firstTransaction);
+                } else {
+                    processChanges(fieldName, transactions, keys);
+                }
+            } else if (fieldName === 'taxCode') {
+                const differentValues = [
+                    ...new Set(
+                        getDifferentValues(transactions, keys).map((taxID) => {
+                            if (typeof taxID !== 'string') {
+                                return taxID;
+                            }
+                            return resolveCurrentTaxCode(policy, taxID);
+                        }),
+                    ),
+                ];
+                const validTaxes = differentValues?.filter((taxID) => {
+                    if (typeof taxID !== 'string') {
+                        return false;
+                    }
+                    const tax = getTaxByID(policy, taxID);
+                    return tax?.name && !tax.isDisabled && tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                });
+                const areAllTaxCodesEqual = areAllFieldsEqual(transactions, (item) => resolveCurrentTaxCode(policy, item?.taxCode ?? ''));
+
+                if (!areAllTaxCodesEqual && validTaxes.length > 1) {
+                    change[fieldName] = validTaxes;
+                } else {
+                    const taxCodeToKeep = firstTransaction?.taxCode;
+                    keep[fieldName] = taxCodeToKeep ? resolveCurrentTaxCode(policy, taxCodeToKeep) : taxCodeToKeep;
+                }
+            } else if (fieldName === 'category') {
+                const differentValues = getDifferentValues(transactions, keys);
+                const availableCategories = Object.values(policyCategories ?? {})
+                    .filter((category) => differentValues.includes(category.name) && category.enabled && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+                    .map((e) => e.name);
+
+                if (!areAllFieldsEqualForKey && policy?.areCategoriesEnabled && (availableCategories.length > 1 || (availableCategories.length === 1 && differentValues.includes('')))) {
+                    change[fieldName] = [...availableCategories, ...(differentValues.includes('') ? [''] : [])];
+                } else {
+                    keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
+                }
+            } else if (fieldName === 'tag') {
+                const isMultiLevelTags = isMultiLevelTagsPolicyUtils(policyTags);
+                if (isMultiLevelTags) {
+                    if (areAllFieldsEqualForKey || !policy?.areTagsEnabled) {
+                        keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
+                    } else {
+                        processChanges(fieldName, transactions, keys);
+                    }
+                } else {
+                    const differentValues = getDifferentValues(transactions, keys);
+                    const policyTagsObj = Object.values(Object.values(policyTags).at(0)?.tags ?? {});
+                    const availableTags = policyTagsObj
+                        .filter((tag) => differentValues.includes(tag.name) && tag.enabled && tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+                        .map((e) => e.name);
+                    if (!areAllFieldsEqualForKey && policy?.areTagsEnabled && (availableTags.length > 1 || (availableTags.length === 1 && differentValues.includes('')))) {
+                        change[fieldName] = [...availableTags, ...(differentValues.includes('') ? [''] : [])];
+                    } else {
+                        keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
+                    }
+                }
+            } else if (fieldName === 'reimbursable') {
+                // Managed card transactions are always non-reimbursable. The resolved reimbursable value is applied to
+                // the transaction that is kept, so we only force it to false — and hide the reimbursable review step —
+                // when that kept transaction is itself a managed card. We gate on the selected (kept) transaction rather
+                // than the reviewing transaction: the Review* pages recompute this from the thread's transaction (which
+                // may be the cash expense) while the kept transaction is the managed card, so gating on the reviewing
+                // transaction would re-add the reimbursable step on back navigation. Gating on any duplicate in the set
+                // would instead wrongly convert a kept cash expense to non-reimbursable.
+                const selectedTransaction = transactions.find((transactionItem) => transactionItem?.transactionID === selectedTransactionID) ?? firstTransaction;
+                if (isManagedCardTransaction(selectedTransaction)) {
+                    keep[fieldName] = false;
+                } else if (areAllFieldsEqualForKey) {
+                    keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
+                } else {
+                    processChanges(fieldName, transactions, keys);
+                }
+            } else if (areAllFieldsEqualForKey) {
+                keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
+            } else {
+                processChanges(fieldName, transactions, keys);
+            }
+        }
+    }
+
+    return {keep, change};
+}
+
+function buildNewTransactionAfterReviewingDuplicates(reviewDuplicateTransaction: OnyxEntry<ReviewDuplicates>, duplicatedTransaction: OnyxEntry<Transaction>): Partial<Transaction> {
+    const {duplicates, taxAmount, ...restReviewDuplicateTransaction} = reviewDuplicateTransaction ?? {};
+    const hasUpdatedTaxCode = reviewDuplicateTransaction?.taxCode !== undefined && reviewDuplicateTransaction?.taxCode !== duplicatedTransaction?.taxCode;
+
+    return {
+        ...duplicatedTransaction,
+        ...restReviewDuplicateTransaction,
+        modifiedMerchant: reviewDuplicateTransaction?.merchant,
+        merchant: reviewDuplicateTransaction?.merchant,
+        comment: {...reviewDuplicateTransaction?.comment, comment: reviewDuplicateTransaction?.description},
+        // If the taxCode changes, apply the reviewed tax amount and clear stale taxName/taxValue so MoneyRequestView derives them fresh from the policy.
+        ...(hasUpdatedTaxCode && {taxAmount, taxName: undefined, taxValue: undefined}),
+    };
+}
+
+function buildMergeDuplicatesParams(
+    reviewDuplicates: OnyxEntry<ReviewDuplicates>,
+    duplicatedTransactions: Array<OnyxEntry<Transaction>>,
+    originalTransaction: Partial<Transaction>,
+): MergeDuplicatesParams {
+    return {
+        amount: -getAmount(originalTransaction as OnyxEntry<Transaction>, true),
+        reportID: originalTransaction?.reportID,
+        receiptID: originalTransaction?.receipt?.receiptID ?? CONST.DEFAULT_NUMBER_ID,
+        currency: getCurrency(originalTransaction as OnyxEntry<Transaction>),
+        created: getFormattedCreated(originalTransaction as OnyxEntry<Transaction>),
+        transactionID: reviewDuplicates?.transactionID,
+        transactionIDList: removeSettledAndApprovedTransactions(duplicatedTransactions ?? []).map((transaction) => transaction.transactionID),
+        billable: reviewDuplicates?.billable ?? false,
+        reimbursable: reviewDuplicates?.reimbursable ?? false,
+        category: reviewDuplicates?.category ?? '',
+        tag: reviewDuplicates?.tag ?? '',
+        merchant: reviewDuplicates?.merchant ?? '',
+        comment: reviewDuplicates?.description ?? '',
+    };
+}
+
+export {
+    buildMergeDuplicatesParams,
+    buildNewTransactionAfterReviewingDuplicates,
+    canMergeDuplicates,
+    compareDuplicateTransactionFields,
+    removeSettledAndApprovedTransactions,
+    removeTransactionFromDuplicateTransactionViolation,
+};
diff --git a/src/libs/TransactionUtils/getUpdatedTransaction.ts b/src/libs/TransactionUtils/getUpdatedTransaction.ts
new file mode 100644
index 000000000000..8fe492c2469c
--- /dev/null
+++ b/src/libs/TransactionUtils/getUpdatedTransaction.ts
@@ -0,0 +1,606 @@
+/**
+ * Applies an expense edit (amount, merchant, distance, tax, etc.) to a Transaction and returns the updated copy,
+ * plus helpers for the cleared pending fields and the recalculated distance merchant.
+ * Extracted from TransactionUtils/index.ts to keep that file smaller.
+ */
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+
+import type {CurrencyListActionsContextType} from '@hooks/useCurrencyList';
+
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import type {CommuterExclusionData} from '@libs/DistanceRequestUtils';
+import {toLocaleDigit} from '@libs/LocaleDigitUtils';
+import {translateLocal} from '@libs/Localize';
+import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
+
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import type {Policy, Transaction} from '@src/types/onyx';
+import type {Unit} from '@src/types/onyx/Policy';
+import type {TransactionChanges} from '@src/types/onyx/Transaction';
+
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+
+import {deepEqual} from 'fast-equals';
+import lodashDeepClone from 'lodash/cloneDeep';
+import lodashSet from 'lodash/set';
+
+import {isFailedScanAmountPlaceholder} from './amountUtils';
+import getDistanceInMeters from './getDistanceInMeters';
+// This cycle import is safe because this file was extracted from TransactionUtils/index.ts, which re-exports it.
+// The functions imported here are pure helpers that aren't called at initialization time.
+// eslint-disable-next-line import/no-cycle
+import {
+    getCategoryTaxDetails,
+    getCurrency,
+    hasAppliedCommuterExclusion,
+    hasLocallyKnownDistance,
+    isDistanceRequest,
+    isFetchingWaypointsFromServer,
+    isManualDistanceRequest,
+    isOdometerDistanceRequest,
+    isScanRequest,
+} from './index';
+
+function getClearedPendingFields(transactionChanges: TransactionChanges) {
+    return {
+        ...Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null])),
+        ...(Object.hasOwn(transactionChanges, 'comment') && {comment: null}),
+        ...(Object.hasOwn(transactionChanges, 'created') && {created: null}),
+        ...(Object.hasOwn(transactionChanges, 'amount') && {amount: null}),
+        ...(Object.hasOwn(transactionChanges, 'currency') && {currency: null}),
+        ...(Object.hasOwn(transactionChanges, 'merchant') && {merchant: null}),
+        ...(Object.hasOwn(transactionChanges, 'waypoints') && {waypoints: null}),
+        ...(Object.hasOwn(transactionChanges, 'reimbursable') && {reimbursable: null}),
+        ...(Object.hasOwn(transactionChanges, 'billable') && {billable: null}),
+        ...(Object.hasOwn(transactionChanges, 'category') && {category: null}),
+        ...(Object.hasOwn(transactionChanges, 'tag') && {tag: null}),
+        ...(Object.hasOwn(transactionChanges, 'taxAmount') && {taxAmount: null}),
+        ...(Object.hasOwn(transactionChanges, 'taxCode') && {taxCode: null}),
+        ...(Object.hasOwn(transactionChanges, 'attendees') && {attendees: null}),
+        ...(Object.hasOwn(transactionChanges, 'distance') && {
+            quantity: null,
+            amount: null,
+            merchant: null,
+        }),
+    };
+}
+
+function getDistanceMerchantForTransaction({
+    transaction,
+    distanceInMeters,
+    unit,
+    rate,
+    currency,
+    translate,
+    getCurrencySymbol,
+    commuterExclusionData,
+}: {
+    transaction: OnyxEntry<Transaction>;
+    distanceInMeters: number;
+    unit: Unit | undefined;
+    rate: number | undefined;
+    currency: string;
+    translate: LocaleContextProps['translate'];
+    getCurrencySymbol: CurrencyListActionsContextType['getCurrencySymbol'];
+    commuterExclusionData?: CommuterExclusionData | null;
+}): string {
+    return DistanceRequestUtils.getDistanceMerchant(
+        true,
+        distanceInMeters,
+        unit,
+        rate,
+        currency,
+        translate,
+        (digit) => toLocaleDigit(IntlStore.getCurrentLocale(), digit),
+        getCurrencySymbol,
+        isManualDistanceRequest(transaction),
+        commuterExclusionData,
+    );
+}
+
+/**
+ * Build the distance merchant string (e.g. "5.00 mi @ $0.70 / mi") for a recalculated distance, using the
+ * imperative locale accessors the optimistic update paths below have to rely on.
+ */
+function getRecalculatedDistanceMerchant(
+    transaction: OnyxEntry<Transaction>,
+    distanceInMeters: number,
+    unit: Unit | undefined,
+    rate: number | undefined,
+    currency: string,
+    getCurrencySymbol: CurrencyListActionsContextType['getCurrencySymbol'],
+    commuterExclusionData?: CommuterExclusionData | null,
+): string {
+    return getDistanceMerchantForTransaction({
+        transaction,
+        distanceInMeters,
+        unit,
+        rate,
+        currency,
+        translate: translateLocal,
+        getCurrencySymbol,
+        commuterExclusionData,
+    });
+}
+
+/**
+ * Given the edit made to the expense, return an updated transaction object.
+ */
+function getUpdatedTransaction({
+    transaction,
+    transactionChanges,
+    isFromExpenseReport,
+    shouldUpdateReceiptState = true,
+    policy = undefined,
+    policies = undefined,
+    isSplitTransaction = false,
+    personalPolicyOutputCurrency,
+    getCurrencyDecimals,
+    getCurrencySymbol,
+}: {
+    transaction: Transaction;
+    transactionChanges: TransactionChanges;
+    isFromExpenseReport: boolean;
+    shouldUpdateReceiptState?: boolean;
+    policy?: OnyxEntry<Policy>;
+    policies?: OnyxCollection<Policy>;
+    isSplitTransaction?: boolean;
+    personalPolicyOutputCurrency: string | undefined;
+    getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'];
+    getCurrencySymbol: CurrencyListActionsContextType['getCurrencySymbol'];
+}): Transaction {
+    const isUnReportedExpense = transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+
+    // Only changing the first level fields so no need for deep clone now
+    const updatedTransaction = lodashDeepClone(transaction);
+    const shouldPreserveConfirmedScanZeroAmount =
+        isScanRequest(transaction) &&
+        transaction.receipt?.state === CONST.IOU.RECEIPT_STATE.OPEN &&
+        transaction.amount === 0 &&
+        !Object.hasOwn(transactionChanges, 'amount') &&
+        !isFailedScanAmountPlaceholder(transaction);
+    if (shouldPreserveConfirmedScanZeroAmount) {
+        updatedTransaction.isAmountSet = true;
+    }
+    let shouldStopSmartscan = false;
+
+    // The comment property does not have its modifiedComment counterpart
+    if (Object.hasOwn(transactionChanges, 'comment')) {
+        updatedTransaction.comment = {
+            ...updatedTransaction.comment,
+            comment: transactionChanges.comment,
+        };
+    }
+    if (Object.hasOwn(transactionChanges, 'created')) {
+        updatedTransaction.modifiedCreated = transactionChanges.created;
+        shouldStopSmartscan = true;
+    }
+    if (Object.hasOwn(transactionChanges, 'amount') && typeof transactionChanges.amount === 'number') {
+        updatedTransaction.modifiedAmount = isFromExpenseReport || isUnReportedExpense ? -transactionChanges.amount : transactionChanges.amount;
+        shouldStopSmartscan = true;
+    }
+    if (Object.hasOwn(transactionChanges, 'currency')) {
+        updatedTransaction.modifiedCurrency = transactionChanges.currency;
+        shouldStopSmartscan = true;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'merchant')) {
+        updatedTransaction.modifiedMerchant = transactionChanges.merchant;
+        shouldStopSmartscan = true;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'waypoints')) {
+        updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
+        // For draft split transactions, we don't want to set isLoading to true as all the split transactions are in draft state
+        if (!isSplitTransaction) {
+            updatedTransaction.isLoading = true;
+        }
+        shouldStopSmartscan = true;
+
+        // A manual-distance edit re-sends unchanged waypoints; when they truly didn't change, leave
+        // `amount`/`modifiedAmount` to the sibling `distance` branch instead of zeroing them here.
+        const waypointsActuallyChanged = !deepEqual(transactionChanges.waypoints, transaction?.comment?.waypoints);
+
+        if (waypointsActuallyChanged && !transactionChanges.routes?.route0?.geometry?.coordinates) {
+            // The waypoints were changed, but there is no route – it is pending from the BE and we should mark the fields as pending
+            updatedTransaction.amount = CONST.IOU.DEFAULT_AMOUNT;
+            updatedTransaction.modifiedAmount = CONST.IOU.DEFAULT_AMOUNT;
+            updatedTransaction.modifiedMerchant = translateLocal('iou.fieldPending');
+        } else if (transactionChanges.routes?.route0?.geometry?.coordinates) {
+            const mileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, personalPolicyOutputCurrency});
+            const {unit, rate} = mileageRate;
+
+            // Use route distance directly since waypoints changed and the route was recalculated.
+            // getDistanceInMeters prefers quantity which may hold a stale manually-edited value.
+            const selectedRouteKey = transactionChanges.selectedRouteKey ?? transaction?.comment?.selectedRouteKey;
+            const distanceInMeters =
+                (selectedRouteKey ? transactionChanges.routes?.[selectedRouteKey]?.distance : undefined) ??
+                transactionChanges.routes?.route0?.distance ??
+                getDistanceInMeters(transaction, unit);
+            // Sync customUnit.quantity + routeDistanceMeters to the recalculated route BEFORE computing the
+            // commuter exclusion below. Without the quantity sync the prior manually-edited value would linger
+            // and drive getDistanceInMeters (which prefers quantity over routes). getTransactionCommuterExclusionData
+            // also reads routeDistanceMeters off the transaction and re-emits it, so it must be set first — the
+            // whole customUnit is then replaced by that function's return value.
+            if (unit) {
+                lodashSet(updatedTransaction, 'comment.customUnit.quantity', roundToTwoDecimalPlaces(DistanceRequestUtils.convertDistanceUnit(distanceInMeters, unit)));
+                lodashSet(updatedTransaction, 'comment.customUnit.routeDistanceMeters', distanceInMeters);
+            }
+
+            const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
+                ? DistanceRequestUtils.getTransactionCommuterExclusionData({
+                      transaction: updatedTransaction,
+                      policy,
+                      storedCustomUnit: transaction?.comment?.customUnit,
+                      personalPolicyOutputCurrency,
+                      hasTripChanged: waypointsActuallyChanged,
+                  })
+                : undefined;
+
+            if (commuterExclusionTransactionData) {
+                lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
+            } else if (waypointsActuallyChanged) {
+                // The exclusion described the trip being replaced, so it goes with it rather than showing a deduction that no longer applies.
+                lodashSet(updatedTransaction, 'comment.customUnit.commuterExclusion', null);
+                lodashSet(updatedTransaction, 'comment.customUnit.reimbursableDistance', null);
+                lodashSet(updatedTransaction, 'comment.customUnit.commuterExclusionMethod', null);
+            }
+
+            const amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
+            const updatedAmount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
+            // Use the rate's resolved currency (which may come from personalPolicyOutputCurrency for a P2P expense),
+            // not transaction.currency, so the merchant symbol/rate and the recalculated amount stay in the same currency.
+            const updatedCurrency = mileageRate.currency ?? transaction.currency ?? CONST.CURRENCY.USD;
+            const updatedMerchant = getRecalculatedDistanceMerchant(
+                transaction,
+                distanceInMeters,
+                unit,
+                rate,
+                updatedCurrency,
+                getCurrencySymbol,
+                DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
+            );
+
+            updatedTransaction.amount = updatedAmount;
+            updatedTransaction.modifiedAmount = updatedAmount;
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+            if (getCurrency(updatedTransaction) !== updatedCurrency) {
+                updatedTransaction.modifiedCurrency = updatedCurrency;
+            }
+        }
+    }
+
+    if (Object.hasOwn(transactionChanges, 'reportID') && typeof transactionChanges.reportID === 'string') {
+        updatedTransaction.reportID = transactionChanges.reportID;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'routes')) {
+        updatedTransaction.routes = transactionChanges.routes;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'customUnitRateID')) {
+        lodashSet(updatedTransaction, 'comment.customUnit.customUnitRateID', transactionChanges.customUnitRateID);
+        lodashSet(updatedTransaction, 'comment.customUnit.defaultP2PRate', null);
+        shouldStopSmartscan = true;
+
+        const existingDistanceUnit = transaction?.comment?.customUnit?.distanceUnit;
+        const routeDistanceMeters = transaction?.comment?.customUnit?.routeDistanceMeters;
+        const quantity = transaction?.comment?.customUnit?.quantity;
+        const hasCommuterExclusion = hasAppliedCommuterExclusion(transaction);
+        // For transactions with an applied commuter exclusion, `quantity` is the route distance rounded
+        // to 2dp, so it differs from the exact conversion by at most 0.005. A gap larger than this rounding
+        // tolerance means the user manually edited the distance, so we must convert their quantity instead.
+        const ROUNDING_TOLERANCE = 0.01;
+        const isDistanceManuallyEdited =
+            hasCommuterExclusion &&
+            typeof routeDistanceMeters === 'number' &&
+            typeof quantity === 'number' &&
+            !!existingDistanceUnit &&
+            Math.abs(quantity - DistanceRequestUtils.convertDistanceUnit(routeDistanceMeters, existingDistanceUnit)) > ROUNDING_TOLERANCE;
+        const shouldUseExactRouteDistance = hasCommuterExclusion && typeof routeDistanceMeters === 'number' && !isDistanceManuallyEdited;
+
+        // Get the new distance unit from the rate's unit
+        const newDistanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction: updatedTransaction, policy});
+        lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', newDistanceUnit);
+
+        // If the distanceUnit is set and the rate is changed to one that has a different unit, convert the distance to the new unit.
+        // Skip conversion for odometer transactions — odometer readings are physical car readings and should be retained as-is.
+        if (existingDistanceUnit && newDistanceUnit !== existingDistanceUnit && !isOdometerDistanceRequest(transaction)) {
+            const conversionFactor = existingDistanceUnit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? CONST.CUSTOM_UNITS.MILES_TO_KILOMETERS : CONST.CUSTOM_UNITS.KILOMETERS_TO_MILES;
+            const distance = roundToTwoDecimalPlaces(
+                shouldUseExactRouteDistance ? DistanceRequestUtils.convertDistanceUnit(routeDistanceMeters, newDistanceUnit) : (quantity ?? 0) * conversionFactor,
+            );
+            lodashSet(updatedTransaction, 'comment.customUnit.quantity', distance);
+        }
+
+        if (!isFetchingWaypointsFromServer(transaction) || hasLocallyKnownDistance(transaction)) {
+            // When the waypoints are being fetched from the server and we have no local distance, we cannot
+            // recalculate the updated amount. Otherwise, recalculate the fields based on the new rate.
+            let updatedMileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, useTransactionDistanceUnit: false, personalPolicyOutputCurrency});
+
+            // The provided `policy` may not own the new rate, leaving the amount at 0. Fall back to
+            // resolving the rate across every policy the user belongs to.
+            if (!updatedMileageRate.rate && transactionChanges.customUnitRateID) {
+                const rateFromAnyPolicy = DistanceRequestUtils.getEnabledRateByCustomUnitRateIDFromAnyPolicy(transactionChanges.customUnitRateID, policies);
+                if (rateFromAnyPolicy?.rate) {
+                    updatedMileageRate = rateFromAnyPolicy;
+
+                    // The fallback rate wasn't known when the distance unit/quantity were set above from the
+                    // (rate-less) provided policy, so redo that conversion against the fallback rate's actual unit.
+                    if (rateFromAnyPolicy.unit && rateFromAnyPolicy.unit !== newDistanceUnit && !isOdometerDistanceRequest(transaction)) {
+                        lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', rateFromAnyPolicy.unit);
+                        const fallbackConversionFactor =
+                            newDistanceUnit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? CONST.CUSTOM_UNITS.MILES_TO_KILOMETERS : CONST.CUSTOM_UNITS.KILOMETERS_TO_MILES;
+                        const currentQuantity = updatedTransaction?.comment?.customUnit?.quantity ?? 0;
+                        const distance = shouldUseExactRouteDistance
+                            ? DistanceRequestUtils.convertDistanceUnit(routeDistanceMeters, rateFromAnyPolicy.unit)
+                            : currentQuantity * fallbackConversionFactor;
+                        lodashSet(updatedTransaction, 'comment.customUnit.quantity', roundToTwoDecimalPlaces(distance));
+                    }
+                }
+            }
+            const {unit, rate} = updatedMileageRate;
+
+            const distanceInMeters = getDistanceInMeters(updatedTransaction, unit);
+
+            // The commuter exclusion is expressed in distance units, so it has to be re-derived against the new
+            // rate's unit and the converted quantity. The amount and merchant then describe the reimbursable
+            // distance, matching what the backend stores for modifiedAmount/modifiedMerchant.
+            const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
+                ? DistanceRequestUtils.getTransactionCommuterExclusionData({
+                      transaction: updatedTransaction,
+                      policy,
+                      storedCustomUnit: transaction?.comment?.customUnit,
+                      personalPolicyOutputCurrency,
+                  })
+                : undefined;
+
+            if (commuterExclusionTransactionData) {
+                lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
+            }
+
+            const amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
+            const updatedAmount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
+            const updatedCurrency = updatedMileageRate.currency ?? CONST.CURRENCY.USD;
+            const updatedMerchant = getRecalculatedDistanceMerchant(
+                transaction,
+                distanceInMeters,
+                unit,
+                rate,
+                updatedCurrency,
+                getCurrencySymbol,
+                DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
+            );
+
+            updatedTransaction.amount = updatedAmount;
+            updatedTransaction.modifiedAmount = updatedAmount;
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+            updatedTransaction.modifiedCurrency = updatedCurrency;
+        }
+    }
+
+    if (Object.hasOwn(transactionChanges, 'taxAmount') && typeof transactionChanges.taxAmount === 'number') {
+        updatedTransaction.taxAmount = isFromExpenseReport ? -transactionChanges.taxAmount : transactionChanges.taxAmount;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'taxCode') && typeof transactionChanges.taxCode === 'string') {
+        updatedTransaction.taxCode = transactionChanges.taxCode;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'taxValue') && typeof transactionChanges.taxCode === 'string') {
+        updatedTransaction.taxValue = transactionChanges.taxValue;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'reimbursable') && typeof transactionChanges.reimbursable === 'boolean') {
+        updatedTransaction.reimbursable = transactionChanges.reimbursable;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'billable') && typeof transactionChanges.billable === 'boolean') {
+        updatedTransaction.billable = transactionChanges.billable;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'category') && typeof transactionChanges.category === 'string') {
+        updatedTransaction.category = transactionChanges.category;
+        const {categoryTaxCode, categoryTaxAmount, categoryTaxValue} = getCategoryTaxDetails(transactionChanges.category, transaction, policy, getCurrencyDecimals);
+        if (categoryTaxCode && categoryTaxAmount !== undefined && categoryTaxValue) {
+            updatedTransaction.taxCode = categoryTaxCode;
+            updatedTransaction.taxAmount = categoryTaxAmount;
+            updatedTransaction.taxValue = categoryTaxValue;
+        }
+    }
+
+    if (Object.hasOwn(transactionChanges, 'tag') && typeof transactionChanges.tag === 'string') {
+        updatedTransaction.tag = transactionChanges.tag;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'attendees')) {
+        updatedTransaction.comment = {
+            ...updatedTransaction.comment,
+            attendees: transactionChanges.attendees,
+        };
+        updatedTransaction.modifiedAttendees = transactionChanges?.attendees;
+    }
+
+    if (
+        shouldUpdateReceiptState &&
+        shouldStopSmartscan &&
+        transaction?.receipt &&
+        Object.keys(transaction.receipt).length > 0 &&
+        transaction?.receipt?.state !== CONST.IOU.RECEIPT_STATE.OPEN &&
+        updatedTransaction.receipt
+    ) {
+        updatedTransaction.receipt.state = CONST.IOU.RECEIPT_STATE.OPEN;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'distance') && typeof transactionChanges.distance === 'number') {
+        const distance = roundToTwoDecimalPlaces(transactionChanges.distance ?? 0);
+        // Capture before mutating quantity below; needed by the fallback amount computation.
+        const previousDistanceInMeters = getDistanceInMeters(transaction, transaction?.comment?.customUnit?.distanceUnit);
+
+        lodashSet(updatedTransaction, 'comment.customUnit.quantity', distance);
+        shouldStopSmartscan = true;
+
+        const updatedMileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, useTransactionDistanceUnit: false, personalPolicyOutputCurrency});
+        const {unit, rate} = updatedMileageRate;
+
+        // Sync the stored distanceUnit to the policy's current unit. The user's input on the Manual
+        // tab is already in this unit; without writing it back, the optimistic state carries a stale
+        // unit (e.g. "miles" when the workspace switched to km) and the display stays wrong until the
+        // BE response — which never lands offline.
+        if (unit) {
+            lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', unit);
+        }
+
+        const distanceInMeters = getDistanceInMeters(updatedTransaction, unit);
+        const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
+            ? DistanceRequestUtils.getTransactionCommuterExclusionData({
+                  transaction: updatedTransaction,
+                  policy,
+                  storedCustomUnit: transaction?.comment?.customUnit,
+                  personalPolicyOutputCurrency,
+              })
+            : undefined;
+
+        if (commuterExclusionTransactionData) {
+            lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
+        }
+
+        let amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
+        amount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
+        const updatedCurrency = updatedMileageRate.currency ?? CONST.CURRENCY.USD;
+        const updatedMerchant = getRecalculatedDistanceMerchant(
+            transaction,
+            distanceInMeters,
+            unit,
+            rate,
+            updatedCurrency,
+            getCurrencySymbol,
+            DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
+        );
+
+        // No locally resolvable rate (e.g. track expense without policy loaded) → scale the previous
+        // amount by the distance ratio so the optimistic value isn't 0. `modifiedAmount` is `""` for
+        // unedited transactions, so coerce via Number() and fall through to `amount`.
+        const previousAmount = Number(transaction?.modifiedAmount) || transaction?.amount || 0;
+        const useFallback = !rate && !!previousDistanceInMeters && !!previousAmount && !!distanceInMeters;
+        if (useFallback) {
+            updatedTransaction.modifiedAmount = Math.round(previousAmount * (distanceInMeters / previousDistanceInMeters));
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+            // Leave currency alone — without a resolvable rate we don't know the target currency.
+        } else {
+            updatedTransaction.modifiedAmount = amount;
+            updatedTransaction.modifiedMerchant = updatedMerchant;
+            updatedTransaction.modifiedCurrency = updatedCurrency;
+        }
+    }
+
+    // The user picked a different map route without touching the waypoints, so the routes are unchanged and only the
+    // distance the expense reads from them changes. Like the `distance` branch above this keeps `routes` intact, so
+    // the alternate routes the user can still switch between survive the edit.
+    // A manually typed distance always wins over the route distance, so skip this when both are being changed.
+    if (Object.hasOwn(transactionChanges, 'selectedRouteKey') && typeof transactionChanges.selectedRouteKey === 'string' && !Object.hasOwn(transactionChanges, 'distance')) {
+        const selectedRouteDistanceInMeters = updatedTransaction?.routes?.[transactionChanges.selectedRouteKey]?.distance;
+        lodashSet(updatedTransaction, 'comment.selectedRouteKey', transactionChanges.selectedRouteKey);
+        shouldStopSmartscan = true;
+
+        if (selectedRouteDistanceInMeters) {
+            const mileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, personalPolicyOutputCurrency});
+            const {unit, rate} = mileageRate;
+
+            // `getDistanceInMeters` prefers `customUnit.quantity`, so it has to follow the new route or the displayed
+            // distance would keep showing the previously selected route. This is done before the commuter exclusion is
+            // re-derived below, because that reads the quantity as the route distance to subtract the commute from.
+            if (unit) {
+                lodashSet(updatedTransaction, 'comment.customUnit.quantity', roundToTwoDecimalPlaces(DistanceRequestUtils.convertDistanceUnit(selectedRouteDistanceInMeters, unit)));
+                lodashSet(updatedTransaction, 'comment.customUnit.routeDistanceMeters', selectedRouteDistanceInMeters);
+            }
+
+            // The commute is excluded from the new route's distance the same way the distance/rate edits above do it,
+            // so the optimistic amount and the modified expense message charge only the reimbursable distance instead
+            // of the whole route. The stored `commuterExclusion`/`reimbursableDistance` also have to be recomputed or
+            // the distance field would keep describing the previously selected route's breakdown.
+            const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
+                ? DistanceRequestUtils.getTransactionCommuterExclusionData({
+                      transaction: updatedTransaction,
+                      policy,
+                      personalPolicyOutputCurrency,
+                  })
+                : undefined;
+
+            if (commuterExclusionTransactionData) {
+                lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
+            }
+
+            const amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(selectedRouteDistanceInMeters, unit, rate ?? 0);
+            const updatedAmount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
+            const updatedCurrency = mileageRate.currency ?? transaction.currency ?? CONST.CURRENCY.USD;
+
+            updatedTransaction.modifiedAmount = updatedAmount;
+            updatedTransaction.modifiedMerchant = getRecalculatedDistanceMerchant(
+                transaction,
+                selectedRouteDistanceInMeters,
+                unit,
+                rate,
+                updatedCurrency,
+                getCurrencySymbol,
+                DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
+            );
+
+            if (getCurrency(updatedTransaction) !== updatedCurrency) {
+                updatedTransaction.modifiedCurrency = updatedCurrency;
+            }
+        }
+    }
+
+    if (Object.hasOwn(transactionChanges, 'odometerStart') && typeof transactionChanges.odometerStart === 'number') {
+        lodashSet(updatedTransaction, 'comment.odometerStart', transactionChanges.odometerStart);
+    }
+
+    if (Object.hasOwn(transactionChanges, 'odometerEnd') && typeof transactionChanges.odometerEnd === 'number') {
+        lodashSet(updatedTransaction, 'comment.odometerEnd', transactionChanges.odometerEnd);
+    }
+
+    if (Object.hasOwn(transactionChanges, 'reportID')) {
+        updatedTransaction.reportID = transactionChanges.reportID;
+    }
+
+    // For distance split requests, if the amount is changed, we need to update the amount and merchant based on the new distance which we calculate before and save in transactionChanges
+    if (isSplitTransaction && isDistanceRequest(transaction) && transactionChanges.amount) {
+        const amount = transactionChanges.amount ?? Number(transaction.modifiedAmount) ?? transaction.amount ?? 0;
+        const updatedAmount = (isFromExpenseReport || isUnReportedExpense) && transactionChanges.amount ? -amount : amount;
+        updatedTransaction.amount = updatedAmount;
+        updatedTransaction.modifiedAmount = updatedAmount;
+        updatedTransaction.modifiedMerchant = transactionChanges.merchant;
+        lodashSet(updatedTransaction, 'comment.customUnit.quantity', transactionChanges.quantity ?? updatedTransaction?.comment?.customUnit?.quantity);
+        lodashSet(updatedTransaction, 'comment.customUnit.customUnitRateID', transactionChanges.customUnitRateID ?? updatedTransaction?.comment?.customUnit?.customUnitRateID);
+    }
+
+    updatedTransaction.pendingFields = {
+        ...(updatedTransaction?.pendingFields ?? {}),
+        ...(Object.hasOwn(transactionChanges, 'comment') && {comment: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'created') && {created: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'amount') && {amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'currency') && {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'merchant') && {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'waypoints') && {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'reimbursable') && {reimbursable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'billable') && {billable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'category') && {category: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'tag') && {tag: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'taxAmount') && {taxAmount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'taxCode') && {taxCode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'attendees') && {attendees: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'distance') && {
+            quantity: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+        }),
+        ...(Object.hasOwn(transactionChanges, 'odometerStart') && {odometerStart: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'odometerEnd') && {odometerEnd: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+    };
+
+    return updatedTransaction;
+}
+
+export {getClearedPendingFields, getDistanceMerchantForTransaction, getUpdatedTransaction};
diff --git a/src/libs/TransactionUtils/hasDistanceRouteErrors.ts b/src/libs/TransactionUtils/hasDistanceRouteErrors.ts
new file mode 100644
index 000000000000..c75171f20549
--- /dev/null
+++ b/src/libs/TransactionUtils/hasDistanceRouteErrors.ts
@@ -0,0 +1,13 @@
+import type {OnyxInputOrEntry, Transaction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+/**
+ * Whether the route of a distance expense failed. The stored receipt then describes a different trip, or the
+ * server never built one. This covers the route only, because `transaction.errors` also carries failures that
+ * say nothing about the receipt, such as a failed payment or an invalid rate.
+ */
+function hasDistanceRouteErrors(transaction: OnyxInputOrEntry<Transaction>): boolean {
+    return !isEmptyObject(transaction?.errorFields?.route) || !isEmptyObject(transaction?.errorFields?.waypoints);
+}
+
+export default hasDistanceRouteErrors;
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 5a8f37d9575b..042fcb8881a5 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -1,6 +1,3 @@
-/* eslint-disable max-lines */
-// TransactionUtils aggregates the shared transaction helpers, so its length grows with the number of utilities it collects rather than with any one
-// of them. Splitting it is a repo-wide refactor, so the rule is suppressed here the same way it is in ReportUtils, ReportActionsUtils and SearchUIUtils.
 import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import type {Coordinate} from '@components/MapView/MapViewTypes';
 import utils from '@components/MapView/utils';
@@ -9,160 +6,103 @@ import type {TransactionWithOptionalSearchFields} from '@components/TransactionI
 
 import type {CurrencyListActionsContextType} from '@hooks/useCurrencyList';
 
-import type {MergeDuplicatesParams} from '@libs/API/parameters';
 import {convertAttendeesToArray, normalizeAttendees} from '@libs/AttendeeUtils';
-import {isPersonalCard, isTravelCardTransaction} from '@libs/CardUtils';
-import {getCategoryDefaultTaxRate, isCategoryMissing} from '@libs/CategoryUtils';
-import {convertToBackendAmount} from '@libs/CurrencyUtils';
+import {isTravelCardTransaction} from '@libs/CardUtils';
+import {isCategoryMissing} from '@libs/CategoryUtils';
 import type {MachineDateFormat} from '@libs/DateUtils';
 import DateUtils from '@libs/DateUtils';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
-import type {CommuterExclusionData} from '@libs/DistanceRequestUtils';
-import {toLocaleDigit} from '@libs/LocaleDigitUtils';
-import {translateLocal} from '@libs/Localize';
-import Log from '@libs/Log';
-import {rand64, roundToTwoDecimalPlaces} from '@libs/NumberUtils';
+import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
 import {
     canSubmitPerDiemExpenseFromWorkspace,
     getCommaSeparatedTagNameWithSanitizedColons,
-    getDistanceRateCustomUnit,
-    getDistanceRateCustomUnitRate,
     getPerDiemCustomUnit,
-    getTaxByID,
     isAttendeeTrackingEnabled as isAttendeeTrackingEnabledForPolicy,
-    isInstantSubmitEnabled,
-    isMultiLevelTags as isMultiLevelTagsPolicyUtils,
-    isPolicyAdmin,
-    isPolicyMember as isPolicyMemberPolicyUtils,
-    resolveCurrentTaxCode,
 } from '@libs/PolicyUtils';
 import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
-import {
-    getReportOrDraftReport,
-    getReportTransactions,
-    getTransactionDetails,
-    isCurrentUserSubmitter,
-    isInvoiceReport,
-    isIOUReport,
-    isOpenExpenseReport,
-    isOpenReport,
-    isProcessingReport,
-    isReportManager,
-    isSettled,
-    isThread,
-} from '@libs/ReportUtils';
+import {getReportOrDraftReport, getReportTransactions, getTransactionDetails, isInvoiceReport, isIOUReport, isThread} from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
 import {isInvalidMerchantValue} from '@libs/ValidationUtils';
 
-import type {UpdateMoneyRequestDataKeys} from '@userActions/IOU/UpdateMoneyRequest';
-
 import type {IOURequestType, IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
-import IntlStore from '@src/languages/IntlStore';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {
-    Card,
-    CardList,
-    OnyxInputOrEntry,
-    PersonalDetails,
-    Policy,
-    PolicyCategories,
-    PolicyTagLists,
-    RecentWaypoint,
-    Report,
-    ReviewDuplicates,
-    TaxRate,
-    TaxRates,
-    Transaction,
-    TransactionViolation,
-    TransactionViolations,
-    ViolationName,
-} from '@src/types/onyx';
-import type {Attendee, DistanceExpenseType, Participant, SplitExpense} from '@src/types/onyx/IOU';
+import type {Card, CardList, OnyxInputOrEntry, PersonalDetails, Policy, RecentWaypoint, Report, Transaction} from '@src/types/onyx';
+import type {Attendee, DistanceExpenseType} from '@src/types/onyx/IOU';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
-import type {Unit} from '@src/types/onyx/Policy';
-import type {OnyxData} from '@src/types/onyx/Request';
-import type {
-    Comment,
-    Receipt,
-    Routes,
-    TransactionChanges,
-    TransactionCustomUnit,
-    TransactionPendingFieldsKey,
-    UnreportedTransaction,
-    Waypoint,
-    WaypointCollection,
-} from '@src/types/onyx/Transaction';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import type {Comment, UnreportedTransaction, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
 
 import type {Locale as DateFnsLocale} from 'date-fns';
 import type {NullishDeep, OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
 import {differenceInCalendarDays, format, isValid, parse, parseISO} from 'date-fns';
-import {SafeString, Str} from 'expensify-common';
+import {Str} from 'expensify-common';
 import {deepEqual} from 'fast-equals';
-import lodashDeepClone from 'lodash/cloneDeep';
-import lodashSet from 'lodash/set';
-import Onyx from 'react-native-onyx';
 
+import {hasValidModifiedAmount, isAmountMissing, isFailedScanAmountPlaceholder} from './amountUtils';
+// These cycle imports are safe because buildOptimisticTransaction, getUpdatedTransaction, and the duplicates and tax helpers were extracted from this file to keep it under the max-lines limit.
+// They import helper functions from this file, and this file re-exports them. Neither side calls the other at initialization time.
+// eslint-disable-next-line import/no-cycle
+import buildOptimisticTransaction from './buildOptimisticTransaction';
+// eslint-disable-next-line import/no-cycle
+import {
+    buildMergeDuplicatesParams,
+    buildNewTransactionAfterReviewingDuplicates,
+    canMergeDuplicates,
+    compareDuplicateTransactionFields,
+    removeSettledAndApprovedTransactions,
+    removeTransactionFromDuplicateTransactionViolation,
+} from './duplicates';
 import getDistanceInMeters from './getDistanceInMeters';
 import getSelectedRouteKey from './getSelectedRouteKey';
-
-type TransactionParams = {
-    amount: number;
-    modifiedAmount?: number;
-    modifiedMerchant?: string;
-    currency: string;
-    reportID: string | undefined;
-    comment?: string;
-    attendees?: Attendee[];
-    created?: string;
-    merchant?: string;
-    receipt?: OnyxEntry<Receipt>;
-
-    /** Receipt scan state for the optimistic transaction. Falls back to `receipt.state` when not set. */
-    receiptState?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
-    category?: string;
-    tag?: string;
-    taxCode?: string;
-    taxAmount?: number;
-    taxValue?: string;
-    billable?: boolean;
-    pendingFields?: Partial<Record<TransactionPendingFieldsKey, ValueOf<typeof CONST.RED_BRICK_ROAD_PENDING_ACTION>>>;
-    reimbursable?: boolean;
-    source?: string;
-    filename?: string;
-    customUnit?: TransactionCustomUnit;
-    splitExpenses?: SplitExpense[];
-    splitExpensesTotal?: number;
-    participants?: Participant[];
-    pendingAction?: PendingAction;
-    splitsStartDate?: string;
-    splitsEndDate?: string;
-    distance?: number;
-    customUnitRateID?: string;
-    waypoints?: WaypointCollection;
-    odometerStart?: number;
-    odometerEnd?: number;
-    routes?: Routes;
-    gpsCoordinates?: string;
-    type?: ValueOf<typeof CONST.TRANSACTION.TYPE>;
-    count?: number;
-    rate?: number;
-    unit?: ValueOf<typeof CONST.TIME_TRACKING.UNIT>;
-    commentType?: ValueOf<typeof CONST.TRANSACTION.TYPE>;
-};
-
-type BuildOptimisticTransactionParams = {
-    originalTransactionID?: string;
-    existingTransactionID?: string;
-    existingTransaction?: OnyxEntry<Transaction>;
-    policy?: OnyxEntry<Policy>;
-    transactionParams: TransactionParams;
-    isDemoTransactionParam?: boolean;
-};
+// eslint-disable-next-line import/no-cycle
+import {getClearedPendingFields, getDistanceMerchantForTransaction, getUpdatedTransaction} from './getUpdatedTransaction';
+// eslint-disable-next-line import/no-cycle
+import {
+    calculateTaxAmount,
+    getCalculatedTaxAmount,
+    getCategoryTaxDetails,
+    getDefaultTaxCode,
+    getDistanceRateTaxUpdates,
+    getEnabledTaxRateCount,
+    getTaxName,
+    getTaxRateTitle,
+    getTaxValue,
+    getWorkspaceTaxesSettingsName,
+    hasTaxRateWithMatchingValue,
+    transformedTaxRates,
+} from './tax';
+// eslint-disable-next-line import/no-cycle
+import {
+    allHavePendingRTERViolation,
+    getTransactionViolations,
+    getUnsuppressibleBrokenConnectionTransactionID,
+    getVisibleTransactionViolations,
+    hasAnyPendingRTERViolation,
+    hasAnyTransactionWithoutRTERViolation,
+    hasCustomUnitOutOfPolicyViolation,
+    hasDuplicateTransactions,
+    hasNoticeTypeViolation,
+    hasPendingRTERViolation,
+    hasPendingUI,
+    hasSubmissionBlockingViolationInList,
+    hasSubmissionBlockingViolationInReport,
+    hasSubmissionBlockingViolations,
+    hasTransactionBeenRejected,
+    hasViolation,
+    hasWarningTypeViolation,
+    isBrokenConnectionViolation,
+    isDuplicate,
+    isTransactionSubmittable,
+    isViolationDismissed,
+    mergeProhibitedViolations,
+    shouldShowBrokenConnectionViolation,
+    shouldShowBrokenConnectionViolationForMultipleTransactions,
+    shouldShowViolation,
+    shouldSuppressBrokenConnectionStatus,
+} from './violations';
 
 function isDeletedTransaction(transaction: {reportID?: string}): boolean {
     return transaction.reportID === CONST.REPORT.TRASH_REPORT_ID;
@@ -453,175 +393,6 @@ function isScanningTransaction(transaction: OnyxEntry<Transaction>): boolean {
     return (isScanRequest(transaction) && isMerchantMissing(transaction) && isAmountMissing(transaction)) || (isScanRequest(transaction) && isScanning(transaction));
 }
 
-/**
- * Optimistically generate a transaction.
- *
- * @param amount – in cents
- * @param [existingTransactionID] Reuse this ID when a distance expense already created an empty transaction.
- */
-function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): Transaction {
-    const {originalTransactionID = '', existingTransactionID, existingTransaction, policy, transactionParams, isDemoTransactionParam} = params;
-    const {
-        amount,
-        modifiedAmount,
-        modifiedMerchant,
-        currency,
-        reportID,
-        distance,
-        comment = '',
-        attendees = [],
-        created = '',
-        merchant = '',
-        receipt,
-        receiptState,
-        // Prevent RBR flip and transaction jump: initialize category to 'Uncategorized' instead of
-        // empty string so optimistic missing category violation isn't added then removed during backend sync
-        category = CONST.SEARCH.CATEGORY_DEFAULT_VALUE,
-        tag = '',
-        taxCode = '',
-        taxAmount = 0,
-        taxValue,
-        billable = false,
-        pendingFields,
-        reimbursable = true,
-        source = '',
-        filename = '',
-        customUnit,
-        splitExpenses,
-        splitsStartDate,
-        splitsEndDate,
-        splitExpensesTotal,
-        participants,
-        pendingAction = CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        customUnitRateID,
-        waypoints,
-        odometerStart,
-        odometerEnd,
-        routes,
-        type,
-        count,
-        rate,
-        unit,
-        commentType,
-    } = transactionParams;
-    // transactionIDs are random, positive, 64-bit numeric strings.
-    // Because JS can only handle 53-bit numbers, transactionIDs are strings in the front-end (just like reportActionID)
-    const transactionID = existingTransactionID ?? rand64();
-
-    const commentJSON: Comment = {comment, attendees};
-    if (odometerStart !== undefined) {
-        commentJSON.odometerStart = odometerStart;
-    }
-    if (odometerEnd !== undefined) {
-        commentJSON.odometerEnd = odometerEnd;
-    }
-    if (isDemoTransactionParam) {
-        commentJSON.isDemoTransaction = true;
-    }
-    if (source) {
-        commentJSON.source = source;
-    }
-    if (originalTransactionID) {
-        commentJSON.originalTransactionID = originalTransactionID;
-    }
-    if (splitExpenses) {
-        commentJSON.splitExpenses = splitExpenses;
-    }
-    if (splitsStartDate) {
-        commentJSON.splitsStartDate = splitsStartDate;
-    }
-    if (splitsEndDate) {
-        commentJSON.splitsEndDate = splitsEndDate;
-    }
-    if (splitExpensesTotal) {
-        commentJSON.splitExpensesTotal = splitExpensesTotal;
-    }
-    if (waypoints) {
-        commentJSON.waypoints = waypoints;
-    }
-    if (commentType) {
-        commentJSON.type = commentType;
-    }
-
-    const isMapDistanceTransaction = !!pendingFields?.waypoints || existingTransaction?.comment?.waypoints?.waypoint0;
-    const isManualDistanceTransaction = isManualDistanceRequest(existingTransaction);
-    const isOdometerDistanceTransaction = isOdometerDistanceRequest(existingTransaction);
-    if (isMapDistanceTransaction || isManualDistanceTransaction || isOdometerDistanceTransaction) {
-        // If customUnit is provided (e.g., for split expenses), use it directly
-        // Otherwise, build customUnit from distance parameter
-        if (customUnit) {
-            lodashSet(commentJSON, 'customUnit', customUnit);
-        } else {
-            const routeDistanceMeters = routes?.route0?.distance ?? existingTransaction?.routes?.route0?.distance;
-            lodashSet(commentJSON, 'customUnit', {...existingTransaction?.comment?.customUnit});
-            // Set the distance unit, which comes from the policy distance unit or the P2P rate data
-            lodashSet(commentJSON, 'customUnit.distanceUnit', DistanceRequestUtils.getUpdatedDistanceUnit({transaction: existingTransaction, policy}));
-            lodashSet(commentJSON, 'customUnit.quantity', distance);
-            if (customUnitRateID) {
-                lodashSet(commentJSON, 'customUnit.customUnitRateID', customUnitRateID);
-            }
-            lodashSet(commentJSON, 'customUnit.name', existingTransaction?.comment?.customUnit?.name ?? CONST.CUSTOM_UNITS.NAME_DISTANCE);
-            if (typeof routeDistanceMeters === 'number') {
-                lodashSet(commentJSON, 'customUnit.routeDistanceMeters', routeDistanceMeters);
-            }
-        }
-    }
-
-    const isPerDiemTransaction = !!pendingFields?.subRates;
-    if (isPerDiemTransaction) {
-        // Set the custom unit, which comes from the policy per diem rate data
-        lodashSet(commentJSON, 'customUnit', customUnit);
-    }
-
-    const isManualTransaction = !isPerDiemTransaction && !isMapDistanceTransaction && !isManualDistanceTransaction && !splitExpenses && !receipt?.source;
-    if (type === CONST.TRANSACTION.TYPE.TIME) {
-        commentJSON.units = {
-            count,
-            rate,
-            unit,
-        };
-        commentJSON.type = type;
-    }
-
-    return {
-        ...(!isEmptyObject(pendingFields) ? {pendingFields} : {}),
-        transactionID,
-        amount,
-        currency,
-        reportID,
-        comment: commentJSON,
-        merchant: merchant || (isManualTransaction ? CONST.TRANSACTION.DEFAULT_MERCHANT : CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT),
-        created: created || DateUtils.getDBTime(),
-        pendingAction,
-        receipt: receipt?.source
-            ? {
-                  source: receipt.source,
-                  filename: receipt?.name ?? filename,
-                  state: receiptState ?? receipt.state ?? CONST.IOU.RECEIPT_STATE.SCAN_READY,
-                  isTestDriveReceipt: receipt.isTestDriveReceipt,
-                  pageCount: receipt.pageCount,
-              }
-            : undefined,
-        hasEReceipt: existingTransaction?.hasEReceipt,
-        category,
-        tag,
-        taxCode,
-        taxAmount,
-        taxValue,
-        modifiedAmount,
-        modifiedMerchant,
-        billable,
-        reimbursable,
-        inserted: DateUtils.getDBTime(),
-        participants,
-        cardID: existingTransaction?.cardID,
-        cardName: existingTransaction?.cardName,
-        cardNumber: existingTransaction?.cardNumber,
-        ...(existingTransaction?.iouRequestType ? {iouRequestType: existingTransaction.iouRequestType} : {}),
-        routes,
-    };
-}
-
 /**
  * Check if the transaction has an Ereceipt
  */
@@ -689,20 +460,6 @@ function isPartialMerchant(merchant: string): boolean {
     return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
 }
 
-function isAmountMissing(transaction: OnyxEntry<Transaction>, isFromExpenseReport = true) {
-    if (isFromExpenseReport) {
-        return transaction?.amount === undefined && (transaction?.modifiedAmount === undefined || transaction?.modifiedAmount === '');
-    }
-    return (transaction?.amount === 0 || transaction?.amount === undefined) && (!transaction?.modifiedAmount || transaction?.modifiedAmount === 0 || transaction?.modifiedAmount === '');
-}
-
-function hasValidModifiedAmount(transaction: OnyxEntry<Transaction> | null): boolean {
-    if (!transaction) {
-        return false;
-    }
-    return transaction?.modifiedAmount !== undefined && transaction?.modifiedAmount !== null && transaction?.modifiedAmount !== '';
-}
-
 /**
  * Builds the optimistic transaction used when an IOU report is converted to an expense report.
  *
@@ -728,562 +485,11 @@ function isCreatedMissing(transaction: OnyxEntry<Transaction>) {
 
 function areRequiredFieldsEmpty(transaction: OnyxEntry<Transaction>, transactionReport: OnyxEntry<Report>): boolean {
     const isFromExpenseReport = transactionReport?.type === CONST.REPORT.TYPE.EXPENSE;
-    // A zero amount is a deliberate, valid choice for an unreported expense, so it isn't a missing field there. It is never
-    // a missing field on an expense report either, where only the merchant is checked.
-    const isZeroAmountAllowed = isFromExpenseReport || isExpenseUnreported(transaction);
-    return (isFromExpenseReport && isMerchantMissing(transaction)) || isCreatedMissing(transaction) || (!isZeroAmountAllowed && getAmount(transaction) === 0);
-}
-
-function getClearedPendingFields(transactionChanges: TransactionChanges) {
-    return {
-        ...Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null])),
-        ...(Object.hasOwn(transactionChanges, 'comment') && {comment: null}),
-        ...(Object.hasOwn(transactionChanges, 'created') && {created: null}),
-        ...(Object.hasOwn(transactionChanges, 'amount') && {amount: null}),
-        ...(Object.hasOwn(transactionChanges, 'currency') && {currency: null}),
-        ...(Object.hasOwn(transactionChanges, 'merchant') && {merchant: null}),
-        ...(Object.hasOwn(transactionChanges, 'waypoints') && {waypoints: null}),
-        ...(Object.hasOwn(transactionChanges, 'reimbursable') && {reimbursable: null}),
-        ...(Object.hasOwn(transactionChanges, 'billable') && {billable: null}),
-        ...(Object.hasOwn(transactionChanges, 'category') && {category: null}),
-        ...(Object.hasOwn(transactionChanges, 'tag') && {tag: null}),
-        ...(Object.hasOwn(transactionChanges, 'taxAmount') && {taxAmount: null}),
-        ...(Object.hasOwn(transactionChanges, 'taxCode') && {taxCode: null}),
-        ...(Object.hasOwn(transactionChanges, 'attendees') && {attendees: null}),
-        ...(Object.hasOwn(transactionChanges, 'distance') && {
-            quantity: null,
-            amount: null,
-            merchant: null,
-        }),
-    };
-}
-
-function getDistanceMerchantForTransaction({
-    transaction,
-    distanceInMeters,
-    unit,
-    rate,
-    currency,
-    translate,
-    getCurrencySymbol,
-    commuterExclusionData,
-}: {
-    transaction: OnyxEntry<Transaction>;
-    distanceInMeters: number;
-    unit: Unit | undefined;
-    rate: number | undefined;
-    currency: string;
-    translate: LocaleContextProps['translate'];
-    getCurrencySymbol: CurrencyListActionsContextType['getCurrencySymbol'];
-    commuterExclusionData?: CommuterExclusionData | null;
-}): string {
-    return DistanceRequestUtils.getDistanceMerchant(
-        true,
-        distanceInMeters,
-        unit,
-        rate,
-        currency,
-        translate,
-        (digit) => toLocaleDigit(IntlStore.getCurrentLocale(), digit),
-        getCurrencySymbol,
-        isManualDistanceRequest(transaction),
-        commuterExclusionData,
-    );
-}
-
-/**
- * Build the distance merchant string (e.g. "5.00 mi @ $0.70 / mi") for a recalculated distance, using the
- * imperative locale accessors the optimistic update paths below have to rely on.
- */
-function getRecalculatedDistanceMerchant(
-    transaction: OnyxEntry<Transaction>,
-    distanceInMeters: number,
-    unit: Unit | undefined,
-    rate: number | undefined,
-    currency: string,
-    getCurrencySymbol: CurrencyListActionsContextType['getCurrencySymbol'],
-    commuterExclusionData?: CommuterExclusionData | null,
-): string {
-    return getDistanceMerchantForTransaction({
-        transaction,
-        distanceInMeters,
-        unit,
-        rate,
-        currency,
-        translate: translateLocal,
-        getCurrencySymbol,
-        commuterExclusionData,
-    });
-}
-
-/**
- * Given the edit made to the expense, return an updated transaction object.
- */
-function getUpdatedTransaction({
-    transaction,
-    transactionChanges,
-    isFromExpenseReport,
-    shouldUpdateReceiptState = true,
-    policy = undefined,
-    policies = undefined,
-    isSplitTransaction = false,
-    personalPolicyOutputCurrency,
-    getCurrencyDecimals,
-    getCurrencySymbol,
-}: {
-    transaction: Transaction;
-    transactionChanges: TransactionChanges;
-    isFromExpenseReport: boolean;
-    shouldUpdateReceiptState?: boolean;
-    policy?: OnyxEntry<Policy>;
-    policies?: OnyxCollection<Policy>;
-    isSplitTransaction?: boolean;
-    personalPolicyOutputCurrency: string | undefined;
-    getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'];
-    getCurrencySymbol: CurrencyListActionsContextType['getCurrencySymbol'];
-}): Transaction {
-    const isUnReportedExpense = transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
-
-    // Only changing the first level fields so no need for deep clone now
-    const updatedTransaction = lodashDeepClone(transaction);
-    let shouldStopSmartscan = false;
-
-    // The comment property does not have its modifiedComment counterpart
-    if (Object.hasOwn(transactionChanges, 'comment')) {
-        updatedTransaction.comment = {
-            ...updatedTransaction.comment,
-            comment: transactionChanges.comment,
-        };
-    }
-    if (Object.hasOwn(transactionChanges, 'created')) {
-        updatedTransaction.modifiedCreated = transactionChanges.created;
-        shouldStopSmartscan = true;
-    }
-    if (Object.hasOwn(transactionChanges, 'amount') && typeof transactionChanges.amount === 'number') {
-        updatedTransaction.modifiedAmount = isFromExpenseReport || isUnReportedExpense ? -transactionChanges.amount : transactionChanges.amount;
-        shouldStopSmartscan = true;
-    }
-    if (Object.hasOwn(transactionChanges, 'currency')) {
-        updatedTransaction.modifiedCurrency = transactionChanges.currency;
-        shouldStopSmartscan = true;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'merchant')) {
-        updatedTransaction.modifiedMerchant = transactionChanges.merchant;
-        shouldStopSmartscan = true;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'waypoints')) {
-        updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
-        // For draft split transactions, we don't want to set isLoading to true as all the split transactions are in draft state
-        if (!isSplitTransaction) {
-            updatedTransaction.isLoading = true;
-        }
-        shouldStopSmartscan = true;
-
-        // A manual-distance edit re-sends unchanged waypoints; when they truly didn't change, leave
-        // `amount`/`modifiedAmount` to the sibling `distance` branch instead of zeroing them here.
-        const waypointsActuallyChanged = !deepEqual(transactionChanges.waypoints, transaction?.comment?.waypoints);
-
-        if (waypointsActuallyChanged && !transactionChanges.routes?.route0?.geometry?.coordinates) {
-            // The waypoints were changed, but there is no route – it is pending from the BE and we should mark the fields as pending
-            updatedTransaction.amount = CONST.IOU.DEFAULT_AMOUNT;
-            updatedTransaction.modifiedAmount = CONST.IOU.DEFAULT_AMOUNT;
-            updatedTransaction.modifiedMerchant = translateLocal('iou.fieldPending');
-        } else if (transactionChanges.routes?.route0?.geometry?.coordinates) {
-            const mileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, personalPolicyOutputCurrency});
-            const {unit, rate} = mileageRate;
-
-            // Use route distance directly since waypoints changed and the route was recalculated.
-            // getDistanceInMeters prefers quantity which may hold a stale manually-edited value.
-            const selectedRouteKey = transactionChanges.selectedRouteKey ?? transaction?.comment?.selectedRouteKey;
-            const distanceInMeters =
-                (selectedRouteKey ? transactionChanges.routes?.[selectedRouteKey]?.distance : undefined) ??
-                transactionChanges.routes?.route0?.distance ??
-                getDistanceInMeters(transaction, unit);
-            // Sync customUnit.quantity + routeDistanceMeters to the recalculated route BEFORE computing the
-            // commuter exclusion below. Without the quantity sync the prior manually-edited value would linger
-            // and drive getDistanceInMeters (which prefers quantity over routes). getTransactionCommuterExclusionData
-            // also reads routeDistanceMeters off the transaction and re-emits it, so it must be set first — the
-            // whole customUnit is then replaced by that function's return value.
-            if (unit) {
-                lodashSet(updatedTransaction, 'comment.customUnit.quantity', roundToTwoDecimalPlaces(DistanceRequestUtils.convertDistanceUnit(distanceInMeters, unit)));
-                lodashSet(updatedTransaction, 'comment.customUnit.routeDistanceMeters', distanceInMeters);
-            }
-
-            const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
-                ? DistanceRequestUtils.getTransactionCommuterExclusionData({
-                      transaction: updatedTransaction,
-                      policy,
-                      storedCustomUnit: transaction?.comment?.customUnit,
-                      personalPolicyOutputCurrency,
-                      hasTripChanged: waypointsActuallyChanged,
-                  })
-                : undefined;
-
-            if (commuterExclusionTransactionData) {
-                lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
-            } else if (waypointsActuallyChanged) {
-                // The exclusion described the trip being replaced, so it goes with it rather than showing a deduction that no longer applies.
-                lodashSet(updatedTransaction, 'comment.customUnit.commuterExclusion', null);
-                lodashSet(updatedTransaction, 'comment.customUnit.reimbursableDistance', null);
-                lodashSet(updatedTransaction, 'comment.customUnit.commuterExclusionMethod', null);
-            }
-
-            const amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
-            const updatedAmount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
-            // Use the rate's resolved currency (which may come from personalPolicyOutputCurrency for a P2P expense),
-            // not transaction.currency, so the merchant symbol/rate and the recalculated amount stay in the same currency.
-            const updatedCurrency = mileageRate.currency ?? transaction.currency ?? CONST.CURRENCY.USD;
-            const updatedMerchant = getRecalculatedDistanceMerchant(
-                transaction,
-                distanceInMeters,
-                unit,
-                rate,
-                updatedCurrency,
-                getCurrencySymbol,
-                DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
-            );
-
-            updatedTransaction.amount = updatedAmount;
-            updatedTransaction.modifiedAmount = updatedAmount;
-            updatedTransaction.modifiedMerchant = updatedMerchant;
-            if (getCurrency(updatedTransaction) !== updatedCurrency) {
-                updatedTransaction.modifiedCurrency = updatedCurrency;
-            }
-        }
-    }
-
-    if (Object.hasOwn(transactionChanges, 'reportID') && typeof transactionChanges.reportID === 'string') {
-        updatedTransaction.reportID = transactionChanges.reportID;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'routes')) {
-        updatedTransaction.routes = transactionChanges.routes;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'customUnitRateID')) {
-        lodashSet(updatedTransaction, 'comment.customUnit.customUnitRateID', transactionChanges.customUnitRateID);
-        lodashSet(updatedTransaction, 'comment.customUnit.defaultP2PRate', null);
-        shouldStopSmartscan = true;
-
-        const existingDistanceUnit = transaction?.comment?.customUnit?.distanceUnit;
-        const routeDistanceMeters = transaction?.comment?.customUnit?.routeDistanceMeters;
-        const quantity = transaction?.comment?.customUnit?.quantity;
-        const hasCommuterExclusion = hasAppliedCommuterExclusion(transaction);
-        // For transactions with an applied commuter exclusion, `quantity` is the route distance rounded
-        // to 2dp, so it differs from the exact conversion by at most 0.005. A gap larger than this rounding
-        // tolerance means the user manually edited the distance, so we must convert their quantity instead.
-        const ROUNDING_TOLERANCE = 0.01;
-        const isDistanceManuallyEdited =
-            hasCommuterExclusion &&
-            typeof routeDistanceMeters === 'number' &&
-            typeof quantity === 'number' &&
-            !!existingDistanceUnit &&
-            Math.abs(quantity - DistanceRequestUtils.convertDistanceUnit(routeDistanceMeters, existingDistanceUnit)) > ROUNDING_TOLERANCE;
-        const shouldUseExactRouteDistance = hasCommuterExclusion && typeof routeDistanceMeters === 'number' && !isDistanceManuallyEdited;
-
-        // Get the new distance unit from the rate's unit
-        const newDistanceUnit = DistanceRequestUtils.getUpdatedDistanceUnit({transaction: updatedTransaction, policy});
-        lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', newDistanceUnit);
-
-        // If the distanceUnit is set and the rate is changed to one that has a different unit, convert the distance to the new unit.
-        // Skip conversion for odometer transactions — odometer readings are physical car readings and should be retained as-is.
-        if (existingDistanceUnit && newDistanceUnit !== existingDistanceUnit && !isOdometerDistanceRequest(transaction)) {
-            const conversionFactor = existingDistanceUnit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? CONST.CUSTOM_UNITS.MILES_TO_KILOMETERS : CONST.CUSTOM_UNITS.KILOMETERS_TO_MILES;
-            const distance = roundToTwoDecimalPlaces(
-                shouldUseExactRouteDistance ? DistanceRequestUtils.convertDistanceUnit(routeDistanceMeters, newDistanceUnit) : (quantity ?? 0) * conversionFactor,
-            );
-            lodashSet(updatedTransaction, 'comment.customUnit.quantity', distance);
-        }
-
-        if (!isFetchingWaypointsFromServer(transaction) || hasLocallyKnownDistance(transaction)) {
-            // When the waypoints are being fetched from the server and we have no local distance, we cannot
-            // recalculate the updated amount. Otherwise, recalculate the fields based on the new rate.
-            let updatedMileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, useTransactionDistanceUnit: false, personalPolicyOutputCurrency});
-
-            // The provided `policy` may not own the new rate, leaving the amount at 0. Fall back to
-            // resolving the rate across every policy the user belongs to.
-            if (!updatedMileageRate.rate && transactionChanges.customUnitRateID) {
-                const rateFromAnyPolicy = DistanceRequestUtils.getEnabledRateByCustomUnitRateIDFromAnyPolicy(transactionChanges.customUnitRateID, policies);
-                if (rateFromAnyPolicy?.rate) {
-                    updatedMileageRate = rateFromAnyPolicy;
-
-                    // The fallback rate wasn't known when the distance unit/quantity were set above from the
-                    // (rate-less) provided policy, so redo that conversion against the fallback rate's actual unit.
-                    if (rateFromAnyPolicy.unit && rateFromAnyPolicy.unit !== newDistanceUnit && !isOdometerDistanceRequest(transaction)) {
-                        lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', rateFromAnyPolicy.unit);
-                        const fallbackConversionFactor =
-                            newDistanceUnit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? CONST.CUSTOM_UNITS.MILES_TO_KILOMETERS : CONST.CUSTOM_UNITS.KILOMETERS_TO_MILES;
-                        const currentQuantity = updatedTransaction?.comment?.customUnit?.quantity ?? 0;
-                        const distance = shouldUseExactRouteDistance
-                            ? DistanceRequestUtils.convertDistanceUnit(routeDistanceMeters, rateFromAnyPolicy.unit)
-                            : currentQuantity * fallbackConversionFactor;
-                        lodashSet(updatedTransaction, 'comment.customUnit.quantity', roundToTwoDecimalPlaces(distance));
-                    }
-                }
-            }
-            const {unit, rate} = updatedMileageRate;
-
-            const distanceInMeters = getDistanceInMeters(updatedTransaction, unit);
-
-            // The commuter exclusion is expressed in distance units, so it has to be re-derived against the new
-            // rate's unit and the converted quantity. The amount and merchant then describe the reimbursable
-            // distance, matching what the backend stores for modifiedAmount/modifiedMerchant.
-            const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
-                ? DistanceRequestUtils.getTransactionCommuterExclusionData({
-                      transaction: updatedTransaction,
-                      policy,
-                      storedCustomUnit: transaction?.comment?.customUnit,
-                      personalPolicyOutputCurrency,
-                  })
-                : undefined;
-
-            if (commuterExclusionTransactionData) {
-                lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
-            }
-
-            const amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
-            const updatedAmount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
-            const updatedCurrency = updatedMileageRate.currency ?? CONST.CURRENCY.USD;
-            const updatedMerchant = getRecalculatedDistanceMerchant(
-                transaction,
-                distanceInMeters,
-                unit,
-                rate,
-                updatedCurrency,
-                getCurrencySymbol,
-                DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
-            );
-
-            updatedTransaction.amount = updatedAmount;
-            updatedTransaction.modifiedAmount = updatedAmount;
-            updatedTransaction.modifiedMerchant = updatedMerchant;
-            updatedTransaction.modifiedCurrency = updatedCurrency;
-        }
-    }
-
-    if (Object.hasOwn(transactionChanges, 'taxAmount') && typeof transactionChanges.taxAmount === 'number') {
-        updatedTransaction.taxAmount = isFromExpenseReport ? -transactionChanges.taxAmount : transactionChanges.taxAmount;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'taxCode') && typeof transactionChanges.taxCode === 'string') {
-        updatedTransaction.taxCode = transactionChanges.taxCode;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'taxValue') && typeof transactionChanges.taxCode === 'string') {
-        updatedTransaction.taxValue = transactionChanges.taxValue;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'reimbursable') && typeof transactionChanges.reimbursable === 'boolean') {
-        updatedTransaction.reimbursable = transactionChanges.reimbursable;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'billable') && typeof transactionChanges.billable === 'boolean') {
-        updatedTransaction.billable = transactionChanges.billable;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'category') && typeof transactionChanges.category === 'string') {
-        updatedTransaction.category = transactionChanges.category;
-        const {categoryTaxCode, categoryTaxAmount, categoryTaxValue} = getCategoryTaxDetails(transactionChanges.category, transaction, policy, getCurrencyDecimals);
-        if (categoryTaxCode && categoryTaxAmount !== undefined && categoryTaxValue) {
-            updatedTransaction.taxCode = categoryTaxCode;
-            updatedTransaction.taxAmount = categoryTaxAmount;
-            updatedTransaction.taxValue = categoryTaxValue;
-        }
-    }
-
-    if (Object.hasOwn(transactionChanges, 'tag') && typeof transactionChanges.tag === 'string') {
-        updatedTransaction.tag = transactionChanges.tag;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'attendees')) {
-        updatedTransaction.comment = {
-            ...updatedTransaction.comment,
-            attendees: transactionChanges.attendees,
-        };
-        updatedTransaction.modifiedAttendees = transactionChanges?.attendees;
-    }
-
-    if (
-        shouldUpdateReceiptState &&
-        shouldStopSmartscan &&
-        transaction?.receipt &&
-        Object.keys(transaction.receipt).length > 0 &&
-        transaction?.receipt?.state !== CONST.IOU.RECEIPT_STATE.OPEN &&
-        updatedTransaction.receipt
-    ) {
-        updatedTransaction.receipt.state = CONST.IOU.RECEIPT_STATE.OPEN;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'distance') && typeof transactionChanges.distance === 'number') {
-        const distance = roundToTwoDecimalPlaces(transactionChanges.distance ?? 0);
-        // Capture before mutating quantity below; needed by the fallback amount computation.
-        const previousDistanceInMeters = getDistanceInMeters(transaction, transaction?.comment?.customUnit?.distanceUnit);
-
-        lodashSet(updatedTransaction, 'comment.customUnit.quantity', distance);
-        shouldStopSmartscan = true;
-
-        const updatedMileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, useTransactionDistanceUnit: false, personalPolicyOutputCurrency});
-        const {unit, rate} = updatedMileageRate;
-
-        // Sync the stored distanceUnit to the policy's current unit. The user's input on the Manual
-        // tab is already in this unit; without writing it back, the optimistic state carries a stale
-        // unit (e.g. "miles" when the workspace switched to km) and the display stays wrong until the
-        // BE response — which never lands offline.
-        if (unit) {
-            lodashSet(updatedTransaction, 'comment.customUnit.distanceUnit', unit);
-        }
-
-        const distanceInMeters = getDistanceInMeters(updatedTransaction, unit);
-        const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
-            ? DistanceRequestUtils.getTransactionCommuterExclusionData({
-                  transaction: updatedTransaction,
-                  policy,
-                  storedCustomUnit: transaction?.comment?.customUnit,
-                  personalPolicyOutputCurrency,
-              })
-            : undefined;
-
-        if (commuterExclusionTransactionData) {
-            lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
-        }
-
-        let amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
-        amount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
-        const updatedCurrency = updatedMileageRate.currency ?? CONST.CURRENCY.USD;
-        const updatedMerchant = getRecalculatedDistanceMerchant(
-            transaction,
-            distanceInMeters,
-            unit,
-            rate,
-            updatedCurrency,
-            getCurrencySymbol,
-            DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
-        );
-
-        // No locally resolvable rate (e.g. track expense without policy loaded) → scale the previous
-        // amount by the distance ratio so the optimistic value isn't 0. `modifiedAmount` is `""` for
-        // unedited transactions, so coerce via Number() and fall through to `amount`.
-        const previousAmount = Number(transaction?.modifiedAmount) || transaction?.amount || 0;
-        const useFallback = !rate && !!previousDistanceInMeters && !!previousAmount && !!distanceInMeters;
-        if (useFallback) {
-            updatedTransaction.modifiedAmount = Math.round(previousAmount * (distanceInMeters / previousDistanceInMeters));
-            updatedTransaction.modifiedMerchant = updatedMerchant;
-            // Leave currency alone — without a resolvable rate we don't know the target currency.
-        } else {
-            updatedTransaction.modifiedAmount = amount;
-            updatedTransaction.modifiedMerchant = updatedMerchant;
-            updatedTransaction.modifiedCurrency = updatedCurrency;
-        }
-    }
-
-    // The user picked a different map route without touching the waypoints, so the routes are unchanged and only the
-    // distance the expense reads from them changes. Like the `distance` branch above this keeps `routes` intact, so
-    // the alternate routes the user can still switch between survive the edit.
-    // A manually typed distance always wins over the route distance, so skip this when both are being changed.
-    if (Object.hasOwn(transactionChanges, 'selectedRouteKey') && typeof transactionChanges.selectedRouteKey === 'string' && !Object.hasOwn(transactionChanges, 'distance')) {
-        const selectedRouteDistanceInMeters = updatedTransaction?.routes?.[transactionChanges.selectedRouteKey]?.distance;
-        lodashSet(updatedTransaction, 'comment.selectedRouteKey', transactionChanges.selectedRouteKey);
-        shouldStopSmartscan = true;
-
-        if (selectedRouteDistanceInMeters) {
-            const mileageRate = DistanceRequestUtils.getRate({transaction: updatedTransaction, policy, personalPolicyOutputCurrency});
-            const {unit, rate} = mileageRate;
-
-            // `getDistanceInMeters` prefers `customUnit.quantity`, so it has to follow the new route or the displayed
-            // distance would keep showing the previously selected route. This is done before the commuter exclusion is
-            // re-derived below, because that reads the quantity as the route distance to subtract the commute from.
-            if (unit) {
-                lodashSet(updatedTransaction, 'comment.customUnit.quantity', roundToTwoDecimalPlaces(DistanceRequestUtils.convertDistanceUnit(selectedRouteDistanceInMeters, unit)));
-                lodashSet(updatedTransaction, 'comment.customUnit.routeDistanceMeters', selectedRouteDistanceInMeters);
-            }
-
-            // The commute is excluded from the new route's distance the same way the distance/rate edits above do it,
-            // so the optimistic amount and the modified expense message charge only the reimbursable distance instead
-            // of the whole route. The stored `commuterExclusion`/`reimbursableDistance` also have to be recomputed or
-            // the distance field would keep describing the previously selected route's breakdown.
-            const commuterExclusionTransactionData = hasAppliedCommuterExclusion(updatedTransaction)
-                ? DistanceRequestUtils.getTransactionCommuterExclusionData({
-                      transaction: updatedTransaction,
-                      policy,
-                      personalPolicyOutputCurrency,
-                  })
-                : undefined;
-
-            if (commuterExclusionTransactionData) {
-                lodashSet(updatedTransaction, 'comment.customUnit', commuterExclusionTransactionData.customUnit);
-            }
-
-            const amount = commuterExclusionTransactionData?.modifiedAmount ?? DistanceRequestUtils.getDistanceRequestAmount(selectedRouteDistanceInMeters, unit, rate ?? 0);
-            const updatedAmount = isFromExpenseReport || isUnReportedExpense ? -amount : amount;
-            const updatedCurrency = mileageRate.currency ?? transaction.currency ?? CONST.CURRENCY.USD;
-
-            updatedTransaction.modifiedAmount = updatedAmount;
-            updatedTransaction.modifiedMerchant = getRecalculatedDistanceMerchant(
-                transaction,
-                selectedRouteDistanceInMeters,
-                unit,
-                rate,
-                updatedCurrency,
-                getCurrencySymbol,
-                DistanceRequestUtils.getCommuterExclusionDisplayData(commuterExclusionTransactionData?.customUnit, unit),
-            );
-
-            if (getCurrency(updatedTransaction) !== updatedCurrency) {
-                updatedTransaction.modifiedCurrency = updatedCurrency;
-            }
-        }
-    }
-
-    if (Object.hasOwn(transactionChanges, 'odometerStart') && typeof transactionChanges.odometerStart === 'number') {
-        lodashSet(updatedTransaction, 'comment.odometerStart', transactionChanges.odometerStart);
-    }
-
-    if (Object.hasOwn(transactionChanges, 'odometerEnd') && typeof transactionChanges.odometerEnd === 'number') {
-        lodashSet(updatedTransaction, 'comment.odometerEnd', transactionChanges.odometerEnd);
-    }
-
-    if (Object.hasOwn(transactionChanges, 'reportID')) {
-        updatedTransaction.reportID = transactionChanges.reportID;
-    }
-
-    // For distance split requests, if the amount is changed, we need to update the amount and merchant based on the new distance which we calculate before and save in transactionChanges
-    if (isSplitTransaction && isDistanceRequest(transaction) && transactionChanges.amount) {
-        const amount = transactionChanges.amount ?? Number(transaction.modifiedAmount) ?? transaction.amount ?? 0;
-        const updatedAmount = (isFromExpenseReport || isUnReportedExpense) && transactionChanges.amount ? -amount : amount;
-        updatedTransaction.amount = updatedAmount;
-        updatedTransaction.modifiedAmount = updatedAmount;
-        updatedTransaction.modifiedMerchant = transactionChanges.merchant;
-        lodashSet(updatedTransaction, 'comment.customUnit.quantity', transactionChanges.quantity ?? updatedTransaction?.comment?.customUnit?.quantity);
-        lodashSet(updatedTransaction, 'comment.customUnit.customUnitRateID', transactionChanges.customUnitRateID ?? updatedTransaction?.comment?.customUnit?.customUnitRateID);
-    }
-
-    updatedTransaction.pendingFields = {
-        ...(updatedTransaction?.pendingFields ?? {}),
-        ...(Object.hasOwn(transactionChanges, 'comment') && {comment: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'created') && {created: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'amount') && {amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'currency') && {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'merchant') && {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'waypoints') && {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'reimbursable') && {reimbursable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'billable') && {billable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'category') && {category: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'tag') && {tag: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'taxAmount') && {taxAmount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'taxCode') && {taxCode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'attendees') && {attendees: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'distance') && {
-            quantity: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-            amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-            merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-        }),
-        ...(Object.hasOwn(transactionChanges, 'odometerStart') && {odometerStart: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'odometerEnd') && {odometerEnd: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-    };
+    const isUnreportedExpense = isExpenseUnreported(transaction);
+    const isZeroAmountAllowed = isFromExpenseReport || isUnreportedExpense;
+    const isMissingAmount = isFailedScanAmountPlaceholder(transaction) || (!isZeroAmountAllowed && isAmountMissing(transaction, false));
 
-    return updatedTransaction;
+    return (isFromExpenseReport && isMerchantMissing(transaction)) || isCreatedMissing(transaction) || isMissingAmount;
 }
 
 /**
@@ -1987,11 +1193,15 @@ function isReceiptBeingScanned(transaction: OnyxInputOrEntry<Transaction>): bool
 /**
  * Check if category is being analyzed (manual request creation or auto-categorization grace period)
  */
-function isCategoryBeingAnalyzed(transaction: OnyxEntry<Transaction>, report: OnyxEntry<Report>): boolean {
+function isCategoryBeingAnalyzed(transaction: OnyxEntry<Transaction>, report: OnyxEntry<Report>, policy?: OnyxEntry<Policy>): boolean {
     if (!transaction) {
         return false;
     }
 
+    if (policy?.autoCategorizeNewExpenses === false) {
+        return false;
+    }
+
     if (isExpenseUnreported(transaction)) {
         return false;
     }
@@ -2046,382 +1256,38 @@ function hasMissingSmartscanFields(transaction: OnyxInputOrEntry<Transaction>, t
 }
 
 /**
- * Get all transaction violations of the transaction with given transactionID.
- */
-function getTransactionViolations(
-    transaction: OnyxEntry<Transaction>,
-    transactionViolations: OnyxCollection<TransactionViolations>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    iouReportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-): TransactionViolations | undefined {
-    if (!transaction || !transactionViolations) {
-        return undefined;
-    }
-
-    const violations =
-        transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]?.filter(
-            (violation) => !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy),
-        ) ?? [];
-
-    return violations;
-}
-
-/**
- * Check if a transaction has been rejected
- */
-function hasTransactionBeenRejected(transactionViolations: OnyxEntry<TransactionViolations>): boolean {
-    return !!transactionViolations && transactionViolations.some((violation) => violation.name === CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE);
-}
-
-/**
- * Check if there is pending rter violation in transactionViolations.
+ * Check if the transaction has a defined route.
+ * Unlike getDistanceInMeters this ignores `routeDistanceMeters`: an earlier fetch's distance does not make the current route resolved.
  */
-function hasPendingRTERViolation(transactionViolations?: TransactionViolations | null): boolean {
-    return !!transactionViolations?.some(
-        (transactionViolation: TransactionViolation) =>
-            transactionViolation.name === CONST.VIOLATIONS.RTER && transactionViolation.data?.pendingPattern && !isBrokenConnectionViolation(transactionViolation),
-    );
+function hasRoute(transaction: OnyxEntry<Transaction>, isDistanceRequestType?: boolean): boolean {
+    return !!transaction?.routes?.route0?.geometry?.coordinates || (!!isDistanceRequestType && transaction?.comment?.customUnit?.quantity !== undefined);
 }
 
-/**
- * Check if any of the given transactions have a pending RTER violation that has not been dismissed (e.g. via mark-as-cash).
- */
-function hasAnyPendingRTERViolation(
-    transactions: Array<OnyxEntry<Transaction>>,
-    allTransactionViolations: OnyxCollection<TransactionViolations>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    report: OnyxEntry<Report>,
-    reportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-): boolean {
-    return transactions.some((t) => {
-        const filteredViolations = getTransactionViolations(t, allTransactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
-        return hasPendingRTERViolation(filteredViolations);
-    });
+function waypointHasValidAddress(waypoint: RecentWaypoint | Waypoint): boolean {
+    return !!waypoint?.address?.trim();
 }
 
-/**
- * Check if there is a custom unit out of policy violation in transactionViolations.
- */
-function hasCustomUnitOutOfPolicyViolation(transactionViolations?: TransactionViolations | null): boolean {
-    return !!transactionViolations?.some((violation) => violation.name === CONST.VIOLATIONS.CUSTOM_UNIT_OUT_OF_POLICY);
+function isWaypointNullIsland(waypoint: RecentWaypoint | Waypoint): boolean {
+    return waypoint.lat === 0 && waypoint.lng === 0;
 }
 
 /**
- * Check if there is broken connection violation.
+ * Converts the key of a waypoint to its index
  */
-function hasBrokenConnectionViolation(
-    transaction: Transaction,
-    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    report: OnyxEntry<Report>,
-    reportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-): boolean {
-    const violations = getTransactionViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
-    return !!violations?.find((violation) => isBrokenConnectionViolation(violation));
-}
-
-function isBrokenConnectionViolation(violation: TransactionViolation) {
-    return (
-        violation.name === CONST.VIOLATIONS.RTER &&
-        (violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION ||
-            violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_530 ||
-            violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_531 ||
-            violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_REAUTH)
-    );
+function getWaypointIndex(key: string): number {
+    return Number(key.replace('waypoint', ''));
 }
 
 /**
- * Suppresses the report-level status only when every broken connection belongs to a personal card.
- * Reports with company-card or retry-later violations must retain a status so their required action is visible.
+ * Filters the waypoints which are valid and returns those
  */
-function shouldSuppressBrokenConnectionStatus(brokenConnectionViolations: TransactionViolation[], cardList: OnyxEntry<CardList>) {
-    return (
-        brokenConnectionViolations.length > 0 &&
-        brokenConnectionViolations.every((violation) => {
-            if (violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_530 || violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_531) {
-                return false;
-            }
-
-            const cardID = violation.data?.cardID;
-            const card = cardID ? cardList?.[cardID] : undefined;
-            return !!card && isPersonalCard(card);
-        })
-    );
-}
-
-/** Returns a report transaction that has a broken connection status which must remain visible. */
-function getUnsuppressibleBrokenConnectionTransactionID(
-    transactions: Transaction[],
-    transactionViolations: OnyxCollection<TransactionViolations>,
-    cardList: OnyxEntry<CardList>,
-): string | undefined {
-    return transactions.find((transaction) => {
-        const brokenConnectionViolations = (transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`] ?? []).filter(isBrokenConnectionViolation);
-        return brokenConnectionViolations.length > 0 && !shouldSuppressBrokenConnectionStatus(brokenConnectionViolations, cardList);
-    })?.transactionID;
-}
+function getValidWaypoints(waypoints: WaypointCollection | undefined, reArrangeIndexes = false, areWaypointsForGpsDistanceRequest = false): WaypointCollection {
+    if (!waypoints) {
+        return {};
+    }
 
-function shouldShowBrokenConnectionViolationInternal(brokenConnectionViolations: TransactionViolation[], report: OnyxEntry<Report>, policy: OnyxEntry<Policy>) {
-    if (brokenConnectionViolations.length === 0) {
-        return false;
-    }
-
-    if (!isPolicyAdmin(policy) || isCurrentUserSubmitter(report)) {
-        return true;
-    }
-
-    if (isOpenExpenseReport(report)) {
-        return true;
-    }
-
-    return isProcessingReport(report) && isInstantSubmitEnabled(policy);
-}
-
-/**
- * Check if user should see broken connection violation warning based on violations list.
- */
-function shouldShowBrokenConnectionViolation(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, transactionViolations: TransactionViolation[]): boolean {
-    const brokenConnectionViolations = transactionViolations.filter((violation) => isBrokenConnectionViolation(violation));
-
-    return shouldShowBrokenConnectionViolationInternal(brokenConnectionViolations, report, policy);
-}
-
-/**
- * Check if user should see broken connection violation warning based on selected transactions. RTER violations stop being actionable once the report is paid, so they are hidden on settled reports.
- */
-function shouldShowBrokenConnectionViolationForMultipleTransactions(
-    transactions: Transaction[],
-    report: OnyxEntry<Report>,
-    reportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    transactionViolations: OnyxCollection<TransactionViolation[]>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-): boolean {
-    const brokenConnectionViolations = transactions.flatMap((transaction) => {
-        const violations = transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`] ?? [];
-
-        if (!transaction) {
-            return [];
-        }
-
-        return violations.filter((violation) => {
-            if (!isBrokenConnectionViolation(violation)) {
-                return false;
-            }
-
-            if (isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy)) {
-                return false;
-            }
-
-            return shouldShowViolation(report, policy, violation.name, currentUserEmail, currentUserAccountID, false, transaction);
-        });
-    });
-
-    return shouldShowBrokenConnectionViolationInternal(brokenConnectionViolations, report, policy);
-}
-
-/**
- * Merge prohibited violations into one violation.
- */
-function mergeProhibitedViolations(transactionViolations: TransactionViolations): TransactionViolations {
-    const prohibitedViolations = transactionViolations.filter((violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.PROHIBITED_EXPENSE);
-
-    if (prohibitedViolations.length === 0) {
-        return transactionViolations;
-    }
-
-    const prohibitedExpenses = prohibitedViolations.flatMap((violation: TransactionViolation) => violation.data?.prohibitedExpenseRule ?? []);
-    const mergedProhibitedViolations: TransactionViolation = {
-        name: CONST.VIOLATIONS.PROHIBITED_EXPENSE,
-        data: {
-            prohibitedExpenseRule: prohibitedExpenses,
-        },
-        type: CONST.VIOLATION_TYPES.VIOLATION,
-        showInReview: prohibitedViolations.some((v) => v.showInReview),
-    };
-
-    return [...transactionViolations.filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.PROHIBITED_EXPENSE), mergedProhibitedViolations];
-}
-
-/**
- * Returns transaction violations visible to the current user after applying dismiss/show filters
- * and merging prohibited-expense violations.
- */
-function getVisibleTransactionViolations(
-    transaction: OnyxEntry<Transaction>,
-    transactionViolations: TransactionViolations,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    iouReportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    shouldShowRterForSettledReport = true,
-): TransactionViolations {
-    return mergeProhibitedViolations(
-        transactionViolations.filter(
-            (violation) =>
-                !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy) &&
-                shouldShowViolation(iouReport, policy, violation.name, currentUserEmail, currentUserAccountID, shouldShowRterForSettledReport, transaction),
-        ),
-    );
-}
-
-/**
- * Check if the user should see the violation
- */
-function shouldShowViolation(
-    iouReport: OnyxEntry<Report>,
-    policy: OnyxEntry<Policy>,
-    violationName: ViolationName,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    shouldShowRterForSettledReport = true,
-    transaction?: OnyxEntry<Transaction>,
-): boolean {
-    const isSubmitter = isCurrentUserSubmitter(iouReport, currentUserAccountID);
-    const isPolicyMember = isPolicyMemberPolicyUtils(policy, currentUserEmail);
-    const isReportOpen = isOpenExpenseReport(iouReport);
-    if (violationName === CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE) {
-        return isSubmitter || isPolicyAdmin(policy);
-    }
-
-    // The violation is not saved in the backend cache, so it has to be re-evaluated here rather than trusted from
-    // whenever the expense was created or edited.
-    if (violationName === CONST.VIOLATIONS.FUTURE_DATE) {
-        // Without a transaction the rule cannot be evaluated, so show the violation rather than hiding one the
-        // backend reported.
-        if (!transaction) {
-            return true;
-        }
-        return DateUtils.isTransactionDateFuture(getCreated(transaction));
-    }
-
-    if (violationName === CONST.VIOLATIONS.OVER_AUTO_APPROVAL_LIMIT) {
-        // Submitters are not shown this notice because they cannot act on it, but a submitter who is also the report's
-        // approver is the person who has to approve it manually, so they still need to know why it was not auto-approved.
-        return isPolicyAdmin(policy) && (!isSubmitter || isReportManager(iouReport, currentUserAccountID)) && isProcessingReport(iouReport);
-    }
-
-    if (violationName === CONST.VIOLATIONS.RTER) {
-        return (isSubmitter || isInstantSubmitEnabled(policy)) && (shouldShowRterForSettledReport || !isSettled(iouReport));
-    }
-
-    if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) {
-        return isPolicyMember && !isSubmitter && !isReportOpen;
-    }
-
-    if (violationName === CONST.VIOLATIONS.MISSING_ATTENDEES) {
-        return isAttendeeTrackingEnabledForPolicy(policy);
-    }
-
-    if (violationName === CONST.VIOLATIONS.MISSING_CATEGORY && isCategoryBeingAnalyzed(transaction, iouReport)) {
-        return false;
-    }
-
-    if (violationName === CONST.VIOLATIONS.DUPLICATED_TRANSACTION && isIOUReport(iouReport)) {
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
- */
-function allHavePendingRTERViolation(
-    transactions: OnyxEntry<Transaction[]>,
-    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    report: OnyxEntry<Report>,
-    reportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-): boolean {
-    if (!transactions) {
-        return false;
-    }
-
-    const transactionsWithRTERViolations = transactions.map((transaction) => {
-        // Get violations not dismissed by current user
-        const filteredTransactionViolations = getTransactionViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy)?.filter(
-            (violation) =>
-                // Further filter to only violations visible to the current user
-                shouldShowViolation(report, policy, violation.name, currentUserEmail, currentUserAccountID, true, transaction),
-        );
-        // Check if there is pending rter violation in the filtered violations
-        return hasPendingRTERViolation(filteredTransactionViolations);
-    });
-    return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
-}
-
-/**
- * Check if there is any transaction without RTER violation within the given transactionIDs.
- */
-function hasAnyTransactionWithoutRTERViolation(
-    transactions: Transaction[],
-    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    report: OnyxEntry<Report>,
-    reportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-): boolean {
-    return (
-        transactions.length > 0 &&
-        transactions.some((transaction) => {
-            return !hasBrokenConnectionViolation(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
-        })
-    );
-}
-
-/**
- * Check if the transaction is pending or has a pending rter violation.
- */
-function hasPendingUI(transaction: OnyxEntry<Transaction>, transactionViolations?: TransactionViolations | null): boolean {
-    return isScanning(transaction) || isPending(transaction) || (!!transaction && hasPendingRTERViolation(transactionViolations));
-}
-
-/**
- * Check if the transaction has a defined route.
- * Unlike getDistanceInMeters this ignores `routeDistanceMeters`: an earlier fetch's distance does not make the current route resolved.
- */
-function hasRoute(transaction: OnyxEntry<Transaction>, isDistanceRequestType?: boolean): boolean {
-    return !!transaction?.routes?.route0?.geometry?.coordinates || (!!isDistanceRequestType && transaction?.comment?.customUnit?.quantity !== undefined);
-}
-
-function waypointHasValidAddress(waypoint: RecentWaypoint | Waypoint): boolean {
-    return !!waypoint?.address?.trim();
-}
-
-function isWaypointNullIsland(waypoint: RecentWaypoint | Waypoint): boolean {
-    return waypoint.lat === 0 && waypoint.lng === 0;
-}
-
-/**
- * Converts the key of a waypoint to its index
- */
-function getWaypointIndex(key: string): number {
-    return Number(key.replace('waypoint', ''));
-}
-
-/**
- * Filters the waypoints which are valid and returns those
- */
-function getValidWaypoints(waypoints: WaypointCollection | undefined, reArrangeIndexes = false, areWaypointsForGpsDistanceRequest = false): WaypointCollection {
-    if (!waypoints) {
-        return {};
-    }
-
-    if (areWaypointsForGpsDistanceRequest) {
-        return waypoints;
+    if (areWaypointsForGpsDistanceRequest) {
+        return waypoints;
     }
 
     const sortedIndexes = Object.keys(waypoints)
@@ -2480,38 +1346,6 @@ function getRecentTransactions(transactions: Record<string, string>, size = 2):
         .slice(0, size);
 }
 
-/**
- * Check if transaction has duplicatedTransaction violation.
- * @param transactionID - the transaction to check
- */
-function isDuplicate(
-    transaction: OnyxEntry<Transaction>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    iouReportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    transactionViolation: OnyxEntry<TransactionViolations>,
-): boolean {
-    if (!transaction || !shouldShowViolation(iouReport, policy, CONST.VIOLATIONS.DUPLICATED_TRANSACTION, currentUserEmail, currentUserAccountID, true, transaction)) {
-        return false;
-    }
-
-    const duplicatedTransactionViolation = transactionViolation?.find((violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION);
-    const hasDuplicatedTransactionViolation = !!duplicatedTransactionViolation;
-    const isDuplicatedTransactionViolationDismissed = isViolationDismissed(
-        transaction,
-        duplicatedTransactionViolation,
-        currentUserEmail,
-        currentUserAccountID,
-        iouReport,
-        iouReportOwnerLogin,
-        policy,
-    );
-
-    return hasDuplicatedTransactionViolation && !isDuplicatedTransactionViolationDismissed;
-}
-
 /**
  * Check if transaction is on hold
  */
@@ -2523,192 +1357,6 @@ function isOnHold(transaction: OnyxEntry<Transaction>): boolean {
     return !!transaction.comment?.hold;
 }
 
-/**
- * Checks if a violation is dismissed for the given transaction.
- */
-function isViolationDismissed(
-    transaction: OnyxEntry<Transaction>,
-    violation: TransactionViolation | undefined,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    iouReportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-): boolean {
-    if (!transaction || !violation) {
-        return false;
-    }
-
-    const violationDismissals = transaction.comment?.dismissedViolations?.[violation.name];
-    if (!violationDismissals) {
-        return false;
-    }
-
-    const dismissedByEmails = Object.keys(violationDismissals);
-
-    // Current user dismissed it themselves
-    if (dismissedByEmails.includes(currentUserEmail)) {
-        return true;
-    }
-
-    // RTER violations on instant submit reports only need to be dismissed by one person to be considered dismissed
-    if (violation.name === CONST.VIOLATIONS.RTER && policy && isInstantSubmitEnabled(policy)) {
-        return dismissedByEmails.length > 0;
-    }
-
-    // If the admin is looking at an open report, we check for both, submitter and admin.
-    if (!iouReport) {
-        return false;
-    }
-
-    const isSubmitter = iouReport.ownerAccountID === currentUserAccountID;
-    const shouldViewAsSubmitter = !isSubmitter && isOpenExpenseReport(iouReport);
-
-    if (shouldViewAsSubmitter && iouReportOwnerLogin && dismissedByEmails.includes(iouReportOwnerLogin)) {
-        return true;
-    }
-
-    return false;
-}
-
-/**
- * Checks if violations are supported for the given transaction
- */
-function doesTransactionSupportViolations(transaction: Transaction | undefined): transaction is Transaction {
-    if (!transaction) {
-        return false;
-    }
-    return true;
-}
-
-/**
- * Checks if any violations for the provided transaction are of type 'violation'
- */
-function hasViolation(
-    transaction: Transaction | undefined,
-    transactionViolations: TransactionViolation[] | OnyxCollection<TransactionViolation[]>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    iouReportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    showInReview?: boolean,
-): boolean {
-    if (!doesTransactionSupportViolations(transaction)) {
-        return false;
-    }
-    const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID];
-
-    return !!violations?.some(
-        (violation) =>
-            violation.type === CONST.VIOLATION_TYPES.VIOLATION &&
-            (showInReview === undefined || showInReview === (violation.showInReview ?? false)) &&
-            (violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION || !isIOUReport(iouReport)) &&
-            !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy),
-    );
-}
-
-function hasDuplicateTransactions(
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    ownerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    allTransactionViolations: OnyxCollection<TransactionViolation[]>,
-    reportTransactions: Transaction[],
-): boolean {
-    return (
-        reportTransactions.length > 0 &&
-        reportTransactions.some((transaction) =>
-            isDuplicate(
-                transaction,
-                currentUserEmail,
-                currentUserAccountID,
-                iouReport,
-                ownerLogin,
-                policy,
-                allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID],
-            ),
-        )
-    );
-}
-
-/**
- * Checks if any violations for the provided transaction are of type 'notice'
- */
-function hasNoticeTypeViolation(
-    transaction: OnyxEntry<Transaction>,
-    transactionViolations: TransactionViolation[] | OnyxCollection<TransactionViolation[]>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    iouReportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    showInReview?: boolean,
-): boolean {
-    if (!doesTransactionSupportViolations(transaction)) {
-        return false;
-    }
-    const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`];
-
-    return !!violations?.some(
-        (violation: TransactionViolation) =>
-            violation.type === CONST.VIOLATION_TYPES.NOTICE &&
-            (showInReview === undefined || showInReview === (violation.showInReview ?? false)) &&
-            !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy) &&
-            shouldShowViolation(iouReport, policy, violation.name, currentUserEmail, currentUserAccountID, true, transaction),
-    );
-}
-
-/**
- * Checks if any violations for the provided transaction are of type 'warning'
- */
-function hasWarningTypeViolation(
-    transaction: OnyxEntry<Transaction>,
-    transactionViolations: TransactionViolation[] | OnyxCollection<TransactionViolation[]>,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    iouReport: OnyxEntry<Report>,
-    iouReportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    showInReview?: boolean,
-): boolean {
-    if (!doesTransactionSupportViolations(transaction)) {
-        return false;
-    }
-    const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`];
-
-    const warningTypeViolations =
-        violations?.filter(
-            (violation: TransactionViolation) =>
-                violation.type === CONST.VIOLATION_TYPES.WARNING &&
-                (showInReview === undefined || showInReview === (violation.showInReview ?? false)) &&
-                !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy),
-        ) ?? [];
-
-    return warningTypeViolations.length > 0;
-}
-
-/**
- * Calculates tax amount from the given expense amount and tax percentage
- */
-function calculateTaxAmount(percentage: string | undefined, amount: number, decimals: number) {
-    if (!percentage) {
-        return 0;
-    }
-
-    const divisor = Number(percentage.slice(0, -1)) / 100 + 1;
-    const taxAmount = (amount - amount / divisor) / 100;
-    return parseFloat(taxAmount.toFixed(decimals));
-}
-
-/**
- * Calculates count of all tax enabled options
- */
-function getEnabledTaxRateCount(options: TaxRates) {
-    return Object.values(options).filter((option: TaxRate) => !option.isDisabled).length;
-}
-
 /**
  * Check if the customUnitRateID has a value default for P2P distance requests
  */
@@ -2757,562 +1405,6 @@ function getRateID(transaction: OnyxInputOrEntry<Transaction>): string {
     return transaction?.comment?.customUnit?.customUnitRateID ?? CONST.CUSTOM_UNITS.FAKE_P2P_ID;
 }
 
-/**
- * Gets the tax code based on the type of transaction and selected currency.
- * If it is distance request, then returns the tax code corresponding to the custom unit rate
- * Else returns policy default tax rate if transaction is in policy default currency, otherwise foreign default tax rate
- */
-function getDefaultTaxCode(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, currency?: string | undefined, newCustomUnitRateID?: string): string | undefined {
-    if (isDistanceRequest(transaction)) {
-        // When editing a distance rate, the draft transaction's customUnitRateID
-        // does not reflect the newly selected rate until setMoneyRequestDistanceRate is called, and the draft transaction's is updated.
-        // Therefore, to correctly determine the tax code for the selected rate, we must use the newly selected distance rate's customUnitRateID (newCustomUnitRateID)
-        // instead of relying on the transaction's current customUnitRateID.
-        const customUnitRateID = newCustomUnitRateID ?? getRateID(transaction) ?? '';
-        const customUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
-        const customUnit = getDistanceRateCustomUnit(policy);
-        if (!customUnitRate?.attributes?.taxRateExternalID && customUnit?.attributes?.taxEnabled) {
-            return policy?.taxRates?.defaultExternalID;
-        }
-        return customUnitRate?.attributes?.taxRateExternalID;
-    }
-    const defaultExternalID = policy?.taxRates?.defaultExternalID;
-    const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
-    return policy?.outputCurrency === (currency ?? getCurrency(transaction)) ? defaultExternalID : foreignTaxDefault;
-}
-
-/**
- * Transforms tax rates to a new object format - to add codes and new name with concatenated name and value.
- *
- * @param  policy - The policy which the user has access to and which the report is tied to.
- * @returns The transformed tax rates object.g
- */
-function transformedTaxRates(policy: OnyxEntry<Policy> | undefined, transaction?: OnyxEntry<Transaction>): Record<string, TaxRate> {
-    const taxRates = policy?.taxRates;
-    const defaultExternalID = taxRates?.defaultExternalID;
-
-    const defaultTaxCode = () => {
-        if (!transaction) {
-            return defaultExternalID;
-        }
-
-        return policy && getDefaultTaxCode(policy, transaction);
-    };
-    const getModifiedName = (data: TaxRate, code: string) => `${data.name} (${data.value})${defaultTaxCode() === code ? ` ${CONST.DOT_SEPARATOR} ${translateLocal('common.default')}` : ''}`;
-    const taxes = Object.fromEntries(Object.entries(taxRates?.taxes ?? {}).map(([code, data]) => [code, {...data, code, modifiedName: getModifiedName(data, code), name: data.name}]));
-    return taxes;
-}
-
-/**
- * Gets the tax value of a selected tax
- */
-function getTaxValue(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, taxCode: string) {
-    const resolvedTaxCode = resolveCurrentTaxCode(policy, taxCode);
-    return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === resolvedTaxCode)?.value;
-}
-
-/**
- * Computes tax amount, code, and value when a workspace distance expense uses a given mileage rate.
- */
-function getDistanceRateTaxUpdates(
-    policy: OnyxEntry<Policy>,
-    transaction: OnyxEntry<Transaction>,
-    customUnitRateID: string,
-    getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'],
-    distanceUnit?: Unit,
-): {taxAmount: number; taxCode: string; taxValue: string | undefined} {
-    const policyCustomUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
-    const defaultTaxCode = getDefaultTaxCode(policy, transaction, undefined, customUnitRateID) ?? '';
-    // We use || instead of ?? because taxRateExternalID may be an empty string, which should also trigger the fallback to the default tax code.
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const taxCode = policyCustomUnitRate?.attributes?.taxRateExternalID || defaultTaxCode;
-    const taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, getDistanceInMeters(transaction, distanceUnit ?? transaction?.comment?.customUnit?.distanceUnit));
-    const taxValue = taxCode ? getTaxValue(policy, transaction, taxCode) : undefined;
-    const mileageRates = DistanceRequestUtils.getMileageRates(policy);
-    const rateCurrency = mileageRates[customUnitRateID]?.currency ?? transaction?.currency ?? CONST.CURRENCY.USD;
-    const taxAmount = convertToBackendAmount(calculateTaxAmount(taxValue, taxableAmount, getCurrencyDecimals(rateCurrency)));
-
-    return {taxAmount, taxCode, taxValue};
-}
-
-/**
- * Returns the maximum allowed tax amount (in the smallest currency units) for a transaction,
- * i.e. the tax computed from the selected tax rate (or the policy default) and the expense amount.
- * Used to validate manually entered tax amounts so they can't exceed the calculated tax.
- */
-function getCalculatedTaxAmount(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, currency: string, decimals: number): number {
-    const taxableAmount = Math.abs(getAmount(transaction));
-    const taxCode = transaction?.taxCode ?? getDefaultTaxCode(policy, transaction, currency) ?? '';
-    const taxPercentage = getTaxValue(policy, transaction, taxCode) ?? '';
-    return convertToBackendAmount(calculateTaxAmount(taxPercentage, taxableAmount, decimals));
-}
-
-/**
- * Gets the tax name for Workspace Taxes Settings
- */
-function getWorkspaceTaxesSettingsName(policy: OnyxEntry<Policy>, taxCode: string) {
-    return Object.values(transformedTaxRates(policy)).find((taxRate) => taxRate.code === taxCode)?.modifiedName;
-}
-
-/**
- * Gets the name corresponding to the taxCode that is displayed to the user
- */
-function getTaxName(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, shouldFallbackToValue = false) {
-    const defaultTaxCode = getDefaultTaxCode(policy, transaction);
-
-    // Only fall back to the default tax code when tax tracking is enabled on the policy.
-    // When taxes are disabled and the user deletes a tax, taxCode becomes undefined (the API returns null, which Onyx strips).
-    // Without this check, getTaxName would fall back to defaultTaxCode and display the default tax rate instead of showing empty.
-    // We use || instead of ?? because taxCode may be an empty string, which should also trigger the fallback.
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const taxCodeToMatch = transaction?.taxCode || (policy?.tax?.trackingEnabled ? defaultTaxCode : undefined);
-    const resolvedTaxCode = taxCodeToMatch ? resolveCurrentTaxCode(policy, taxCodeToMatch) : taxCodeToMatch;
-    const taxRate = taxCodeToMatch ? Object.values(transformedTaxRates(policy, transaction)).find((rate) => rate.code === resolvedTaxCode) : undefined;
-
-    if (shouldFallbackToValue && transaction?.taxValue !== undefined && taxRate?.value !== transaction?.taxValue) {
-        return transaction?.taxValue;
-    }
-
-    return taxRate?.modifiedName;
-}
-
-/**
- * Checks if the tax rate with matching transaction's tax rate value exists in the policy tax rates
- */
-function hasTaxRateWithMatchingValue(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>) {
-    if (!policy || !transaction) {
-        return false;
-    }
-
-    const transactionTaxCode = getTaxCode(transaction);
-    const resolvedTaxCode = transactionTaxCode ? resolveCurrentTaxCode(policy, transactionTaxCode) : transactionTaxCode;
-    const transformedRates = transformedTaxRates(policy, transaction);
-    const taxRate = Object.values(transformedRates).find((rate) => rate.code === resolvedTaxCode);
-
-    if (!transaction?.taxValue) {
-        return !!taxRate;
-    }
-
-    return taxRate?.value === transaction?.taxValue;
-}
-
-/**
- * Gets the tax rate title for display, handling the case when moving expenses from track to submit
- */
-function getTaxRateTitle(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, isMovingFromTrackExpense: boolean, policyForMovingExpenses?: OnyxEntry<Policy>): string {
-    const currentTaxName = getTaxName(policy, transaction);
-
-    if (currentTaxName) {
-        // If moving from track expense show the tax name from the moving policy
-        if (isMovingFromTrackExpense && !hasTaxRateWithMatchingValue(policy, transaction)) {
-            return getTaxName(policyForMovingExpenses, transaction) ?? '';
-        }
-        return getTaxName(policy, transaction, true) ?? '';
-    }
-
-    // If no tax name on current policy but moving from track expense, use the moving policy
-    if (isMovingFromTrackExpense) {
-        return getTaxName(policyForMovingExpenses, transaction, true) ?? '';
-    }
-
-    return '';
-}
-
-type FieldsToCompare = Record<string, Array<keyof Transaction>>;
-type FieldsToChange = {
-    category?: Array<string | undefined>;
-    merchant?: Array<string | undefined>;
-    tag?: Array<string | undefined>;
-    description?: Array<Comment | undefined>;
-    taxCode?: Array<string | undefined>;
-    billable?: Array<boolean | undefined>;
-    reimbursable?: Array<boolean | undefined>;
-};
-
-/**
- * Extracts a set of valid duplicate transaction IDs associated with a given transaction,
- * excluding:
- * - the transaction itself
- * - duplicate IDs that appear more than once
- * - duplicates referencing missing or invalid transactions
- * - settled or approved transactions
- *
- * @param transactionID - The ID of the transaction being validated.
- * @param transactionCollection - A collection of all transactions and their duplicates.
- * @param currentTransactionViolations - The list of violations associated with this transaction.
- * @returns A set of valid duplicate transaction IDs.
- */
-function getValidDuplicateTransactionIDs(transactionID: string, transactionCollection: OnyxCollection<Transaction>, currentTransactionViolations: TransactionViolation[]): Set<string> {
-    const result = new Set<string>();
-    const seen = new Set<string>();
-    let foundDuplicateViolation = false;
-
-    if (!transactionCollection) {
-        return result;
-    }
-
-    for (const violation of currentTransactionViolations) {
-        if (violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION) {
-            continue;
-        }
-
-        // Skip further violations
-        if (foundDuplicateViolation) {
-            Log.warn(`Multiple duplicate violations found for transaction. Only one expected.`, {transactionID});
-            break;
-        }
-
-        foundDuplicateViolation = true;
-        const duplicatesIDs = violation.data?.duplicates ?? [];
-
-        const validTransactions: Transaction[] = [];
-
-        for (const duplicateID of duplicatesIDs) {
-            // Skip self-reference
-            if (duplicateID === transactionID || seen.has(duplicateID)) {
-                continue;
-            }
-            seen.add(duplicateID);
-
-            const transaction = transactionCollection?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${duplicateID}`];
-            if (!transaction?.transactionID) {
-                Log.warn(`Transaction does not exist or is invalid. Found in transaction.`, {duplicateID, transactionID});
-                continue;
-            }
-
-            validTransactions.push(transaction);
-        }
-
-        // Filter out transactions assumed that they have be reviewed by removing settled and approved transactions
-        const filtered = removeSettledAndApprovedTransactions(validTransactions);
-
-        for (const transaction of filtered) {
-            result.add(transaction.transactionID);
-        }
-    }
-
-    return result;
-}
-
-/**
- * Adds onyx updates to the passed onyxData to update the DUPLICATED_TRANSACTION violation data
- * by removing the passed transactionID from any violation that referenced it.
- * @param onyxData - An object to store optimistic and failure updates.
- * @param transactionID - The ID of the transaction being deleted or updated.
- * @param transactions - A collection of all transactions and their duplicates.
- * @param transactionViolations - The collection of the transaction violations including the duplicates violations.
- *
- */
-function removeTransactionFromDuplicateTransactionViolation(
-    onyxData: OnyxData<UpdateMoneyRequestDataKeys>,
-    transactionID: string,
-    transactions: OnyxCollection<Transaction>,
-    transactionViolations: OnyxCollection<TransactionViolations>,
-) {
-    if (!transactionID || !transactions || !transactionViolations) {
-        return;
-    }
-    const violations = transactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
-
-    if (!violations) {
-        return;
-    }
-
-    const duplicateIDs = getValidDuplicateTransactionIDs(transactionID, transactions, violations);
-
-    for (const duplicateID of duplicateIDs) {
-        const duplicateViolations = transactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`];
-
-        if (!duplicateViolations) {
-            continue;
-        }
-
-        const duplicateTransactionViolations = duplicateViolations.filter((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION);
-
-        if (duplicateTransactionViolations.length === 0) {
-            continue;
-        }
-
-        if (duplicateTransactionViolations.length > 1) {
-            Log.warn(`There are  duplicate transaction violations for transactionID. This should not happen.`, {duplicateTransactionViolations, duplicateID});
-            continue;
-        }
-
-        const duplicateTransactionViolation = duplicateTransactionViolations.at(0);
-        if (!duplicateTransactionViolation?.data?.duplicates) {
-            continue;
-        }
-
-        // If the transactionID is not in the duplicates list, we don't need to update the violation
-        const duplicateTransactionIDs = duplicateTransactionViolation.data.duplicates.filter((duplicateTransactionID) => duplicateTransactionID !== transactionID);
-        if (duplicateTransactionIDs.length === duplicateTransactionViolation.data.duplicates.length) {
-            continue;
-        }
-
-        const optimisticViolations = duplicateViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION);
-
-        if (duplicateTransactionIDs.length > 0) {
-            optimisticViolations.push({
-                ...duplicateTransactionViolation,
-                data: {
-                    ...duplicateTransactionViolation.data,
-                    duplicates: duplicateTransactionIDs,
-                },
-            });
-        }
-
-        const cleanedValue = optimisticViolations.length > 0 ? optimisticViolations : null;
-
-        onyxData.optimisticData?.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`,
-            value: cleanedValue,
-        });
-
-        // Re-apply the cleaned violations on success so that stale data from a
-        // queued command (e.g. OpenReport resolving between optimistic apply and
-        // the server response) doesn't re-introduce one-sided duplicate violations.
-        onyxData.successData?.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`,
-            value: cleanedValue,
-        });
-
-        onyxData.failureData?.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`,
-            value: duplicateViolations,
-        });
-    }
-}
-
-/**
- * Whether a report is still editable for a duplicate merge, i.e. one that Auth's MergeTransactions command would
- * accept. A report is mergeable when it is open, awaiting first-level approval, or unresolved (unreported expenses
- * stay editable in Auth). Anything approved, closed (Submit & Close), or reimbursed is rejected server-side.
- */
-function isReportMergeableForDuplicates(report: OnyxEntry<Report>): boolean {
-    return !report || isOpenReport(report) || isProcessingReport(report);
-}
-
-/**
- * Keeps only transactions that Auth's MergeTransactions command would accept, so filtering here prevents sending a
- * merge request that would fail server-side.
- */
-function removeSettledAndApprovedTransactions(transactions: Array<OnyxEntry<Transaction>>): Transaction[] {
-    return transactions.filter((transaction) => !!transaction && isReportMergeableForDuplicates(getReportOrDraftReport(transaction.reportID))) as Transaction[];
-}
-
-/**
- * Whether a duplicate merge can be submitted. Auth's MergeTransactions rejects the merge when the kept expense's
- * report is no longer editable or when there are no duplicates left to merge, so callers should block the request
- * in those cases.
- */
-function canMergeDuplicates(keptReport: OnyxEntry<Report>, transactionIDList: string[]): boolean {
-    return isReportMergeableForDuplicates(keptReport) && transactionIDList.length > 0;
-}
-
-/**
- * This function compares fields of duplicate transactions and determines which fields should be kept and which should be changed.
- *
- * @returns An object with two properties: 'keep' and 'change'.
- * 'keep' is an object where each key is a field name and the value is the value of that field in the transaction that should be kept.
- * 'change' is an object where each key is a field name and the value is an array of different values of that field in the duplicate transactions.
- *
- * The function works as follows:
- * 1. It fetches the transaction violations for the given transaction ID.
- * 2. It finds the duplicate transactions.
- * 3. It creates two empty objects, 'keep' and 'change'.
- * 4. It defines the fields to compare in the transactions.
- * 5. It iterates over the fields to compare. For each field:
- *    - If the field is 'description', it checks if all comments are equal, exist, or are empty. If so, it keeps the first transaction's comment. Otherwise, it finds the different values and adds them to 'change'.
- *    - For other fields, it checks if all fields are equal. If so, it keeps the first transaction's field value. Otherwise, it finds the different values and adds them to 'change'.
- * 6. It returns the 'keep' and 'change' objects.
- */
-
-function compareDuplicateTransactionFields(
-    policyTags: PolicyTagLists,
-    reviewingTransaction: OnyxEntry<Transaction>,
-    duplicates: Array<OnyxEntry<Transaction>> | undefined,
-    report: OnyxEntry<Report>,
-    selectedTransactionID: string | undefined,
-    policy: OnyxEntry<Policy>,
-    policyCategories: OnyxEntry<PolicyCategories>,
-): {keep: Partial<ReviewDuplicates>; change: FieldsToChange} {
-    const reportID = report?.reportID;
-    const reviewingTransactionID = reviewingTransaction?.transactionID;
-    if (!reviewingTransactionID || !reportID) {
-        return {change: {}, keep: {}};
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const keep: Record<string, any> = {};
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const change: Record<string, any[]> = {};
-    if (!reviewingTransactionID || !reportID) {
-        return {keep, change};
-    }
-    const transactions = removeSettledAndApprovedTransactions([reviewingTransaction, ...(duplicates ?? [])]);
-
-    const fieldsToCompare: FieldsToCompare = {
-        merchant: ['modifiedMerchant', 'merchant'],
-        category: ['category'],
-        tag: ['tag'],
-        description: ['comment'],
-        taxCode: ['taxCode'],
-        billable: ['billable'],
-        reimbursable: ['reimbursable'],
-    };
-
-    // Helper function thats create an array of different values for a given key in the transactions
-    function getDifferentValues(items: Array<OnyxEntry<Transaction>>, keys: Array<keyof Transaction>) {
-        return [
-            ...new Set(
-                items
-                    .map((item) => {
-                        // Prioritize modifiedMerchant over merchant
-                        if (keys.includes('modifiedMerchant' as keyof Transaction) && keys.includes('merchant' as keyof Transaction)) {
-                            return getMerchant(item);
-                        }
-                        return keys.map((key) => item?.[key]);
-                    })
-                    .flat(),
-            ),
-        ];
-    }
-
-    // Helper function to check if all comments are equal
-    function areAllCommentsEqual(items: Array<OnyxEntry<Transaction>>, firstTransaction: OnyxEntry<Transaction>) {
-        return items.every((item) => deepEqual(getDescription(item), getDescription(firstTransaction)));
-    }
-
-    // Helper function to check if all fields are equal for a given key
-    function areAllFieldsEqual(items: Array<OnyxEntry<Transaction>>, keyExtractor: (item: OnyxEntry<Transaction>) => string) {
-        const firstTransaction = transactions.at(0);
-        return items.every((item) => keyExtractor(item) === keyExtractor(firstTransaction));
-    }
-
-    // Helper function to process changes
-    function processChanges(fieldName: string, items: Array<OnyxEntry<Transaction>>, keys: Array<keyof Transaction>) {
-        const differentValues = getDifferentValues(items, keys);
-        if (differentValues.length > 0) {
-            change[fieldName] = differentValues;
-        }
-    }
-
-    // The comment object needs to be stored only when selecting a specific transaction to keep.
-    // It contains details such as 'customUnit' and 'waypoints,' which remain unchanged during the review steps
-    // but are essential for displaying complete information on the confirmation page.
-    if (selectedTransactionID) {
-        const selectedTransaction = transactions.find((t) => t?.transactionID === selectedTransactionID);
-        keep.comment = selectedTransaction?.comment ?? {};
-    }
-
-    for (const fieldName in fieldsToCompare) {
-        if (Object.prototype.hasOwnProperty.call(fieldsToCompare, fieldName)) {
-            const keys = fieldsToCompare[fieldName];
-            const firstTransaction = transactions.at(0);
-            const isFirstTransactionCommentEmptyObject = typeof firstTransaction?.comment === 'object' && firstTransaction?.comment?.comment === '';
-
-            const areAllFieldsEqualForKey = areAllFieldsEqual(transactions, (item) => keys.map((key) => SafeString(item?.[key])).join('|'));
-            if (fieldName === 'description') {
-                const allCommentsAreEqual = areAllCommentsEqual(transactions, firstTransaction);
-                const allCommentsAreEmpty = isFirstTransactionCommentEmptyObject && transactions.every((item) => getDescription(item) === '');
-                if (allCommentsAreEqual || allCommentsAreEmpty) {
-                    keep[fieldName] = firstTransaction?.comment?.comment ?? firstTransaction?.comment;
-                } else {
-                    processChanges(fieldName, transactions, keys);
-                }
-            } else if (fieldName === 'merchant') {
-                if (areAllFieldsEqual(transactions, getMerchant)) {
-                    keep[fieldName] = getMerchant(firstTransaction);
-                } else {
-                    processChanges(fieldName, transactions, keys);
-                }
-            } else if (fieldName === 'taxCode') {
-                const differentValues = [
-                    ...new Set(
-                        getDifferentValues(transactions, keys).map((taxID) => {
-                            if (typeof taxID !== 'string') {
-                                return taxID;
-                            }
-                            return resolveCurrentTaxCode(policy, taxID);
-                        }),
-                    ),
-                ];
-                const validTaxes = differentValues?.filter((taxID) => {
-                    if (typeof taxID !== 'string') {
-                        return false;
-                    }
-                    const tax = getTaxByID(policy, taxID);
-                    return tax?.name && !tax.isDisabled && tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                });
-                const areAllTaxCodesEqual = areAllFieldsEqual(transactions, (item) => resolveCurrentTaxCode(policy, item?.taxCode ?? ''));
-
-                if (!areAllTaxCodesEqual && validTaxes.length > 1) {
-                    change[fieldName] = validTaxes;
-                } else {
-                    const taxCodeToKeep = firstTransaction?.taxCode;
-                    keep[fieldName] = taxCodeToKeep ? resolveCurrentTaxCode(policy, taxCodeToKeep) : taxCodeToKeep;
-                }
-            } else if (fieldName === 'category') {
-                const differentValues = getDifferentValues(transactions, keys);
-                const availableCategories = Object.values(policyCategories ?? {})
-                    .filter((category) => differentValues.includes(category.name) && category.enabled && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
-                    .map((e) => e.name);
-
-                if (!areAllFieldsEqualForKey && policy?.areCategoriesEnabled && (availableCategories.length > 1 || (availableCategories.length === 1 && differentValues.includes('')))) {
-                    change[fieldName] = [...availableCategories, ...(differentValues.includes('') ? [''] : [])];
-                } else {
-                    keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
-                }
-            } else if (fieldName === 'tag') {
-                const isMultiLevelTags = isMultiLevelTagsPolicyUtils(policyTags);
-                if (isMultiLevelTags) {
-                    if (areAllFieldsEqualForKey || !policy?.areTagsEnabled) {
-                        keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
-                    } else {
-                        processChanges(fieldName, transactions, keys);
-                    }
-                } else {
-                    const differentValues = getDifferentValues(transactions, keys);
-                    const policyTagsObj = Object.values(Object.values(policyTags).at(0)?.tags ?? {});
-                    const availableTags = policyTagsObj
-                        .filter((tag) => differentValues.includes(tag.name) && tag.enabled && tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
-                        .map((e) => e.name);
-                    if (!areAllFieldsEqualForKey && policy?.areTagsEnabled && (availableTags.length > 1 || (availableTags.length === 1 && differentValues.includes('')))) {
-                        change[fieldName] = [...availableTags, ...(differentValues.includes('') ? [''] : [])];
-                    } else {
-                        keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
-                    }
-                }
-            } else if (fieldName === 'reimbursable') {
-                // Managed card transactions are always non-reimbursable. The resolved reimbursable value is applied to
-                // the transaction that is kept, so we only force it to false — and hide the reimbursable review step —
-                // when that kept transaction is itself a managed card. We gate on the selected (kept) transaction rather
-                // than the reviewing transaction: the Review* pages recompute this from the thread's transaction (which
-                // may be the cash expense) while the kept transaction is the managed card, so gating on the reviewing
-                // transaction would re-add the reimbursable step on back navigation. Gating on any duplicate in the set
-                // would instead wrongly convert a kept cash expense to non-reimbursable.
-                const selectedTransaction = transactions.find((transactionItem) => transactionItem?.transactionID === selectedTransactionID) ?? firstTransaction;
-                if (isManagedCardTransaction(selectedTransaction)) {
-                    keep[fieldName] = false;
-                } else if (areAllFieldsEqualForKey) {
-                    keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
-                } else {
-                    processChanges(fieldName, transactions, keys);
-                }
-            } else if (areAllFieldsEqualForKey) {
-                keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
-            } else {
-                processChanges(fieldName, transactions, keys);
-            }
-        }
-    }
-
-    return {keep, change};
-}
-
 function getTransactionID(report?: OnyxEntry<Report>): string | undefined {
     if (!report) {
         return;
@@ -3323,61 +1415,6 @@ function getTransactionID(report?: OnyxEntry<Report>): string | undefined {
     return IOUTransactionID;
 }
 
-function buildNewTransactionAfterReviewingDuplicates(reviewDuplicateTransaction: OnyxEntry<ReviewDuplicates>, duplicatedTransaction: OnyxEntry<Transaction>): Partial<Transaction> {
-    const {duplicates, taxAmount, ...restReviewDuplicateTransaction} = reviewDuplicateTransaction ?? {};
-    const hasUpdatedTaxCode = reviewDuplicateTransaction?.taxCode !== undefined && reviewDuplicateTransaction?.taxCode !== duplicatedTransaction?.taxCode;
-
-    return {
-        ...duplicatedTransaction,
-        ...restReviewDuplicateTransaction,
-        modifiedMerchant: reviewDuplicateTransaction?.merchant,
-        merchant: reviewDuplicateTransaction?.merchant,
-        comment: {...reviewDuplicateTransaction?.comment, comment: reviewDuplicateTransaction?.description},
-        // If the taxCode changes, apply the reviewed tax amount and clear stale taxName/taxValue so MoneyRequestView derives them fresh from the policy.
-        ...(hasUpdatedTaxCode && {taxAmount, taxName: undefined, taxValue: undefined}),
-    };
-}
-
-function buildMergeDuplicatesParams(
-    reviewDuplicates: OnyxEntry<ReviewDuplicates>,
-    duplicatedTransactions: Array<OnyxEntry<Transaction>>,
-    originalTransaction: Partial<Transaction>,
-): MergeDuplicatesParams {
-    return {
-        amount: -getAmount(originalTransaction as OnyxEntry<Transaction>, true),
-        reportID: originalTransaction?.reportID,
-        receiptID: originalTransaction?.receipt?.receiptID ?? CONST.DEFAULT_NUMBER_ID,
-        currency: getCurrency(originalTransaction as OnyxEntry<Transaction>),
-        created: getFormattedCreated(originalTransaction as OnyxEntry<Transaction>),
-        transactionID: reviewDuplicates?.transactionID,
-        transactionIDList: removeSettledAndApprovedTransactions(duplicatedTransactions ?? []).map((transaction) => transaction.transactionID),
-        billable: reviewDuplicates?.billable ?? false,
-        reimbursable: reviewDuplicates?.reimbursable ?? false,
-        category: reviewDuplicates?.category ?? '',
-        tag: reviewDuplicates?.tag ?? '',
-        merchant: reviewDuplicates?.merchant ?? '',
-        comment: reviewDuplicates?.description ?? '',
-    };
-}
-
-function getCategoryTaxDetails(category: string, transaction: OnyxEntry<Transaction>, policy: OnyxEntry<Policy>, getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals']) {
-    const taxRules = policy?.rules?.expenseRules?.filter((rule) => rule.tax);
-    if (!taxRules || taxRules?.length === 0 || isDistanceRequest(transaction)) {
-        return {categoryTaxCode: undefined, categoryTaxAmount: undefined, categoryTaxValue: undefined};
-    }
-
-    const defaultTaxCode = getDefaultTaxCode(policy, transaction, getCurrency(transaction));
-    const categoryTaxCode = getCategoryDefaultTaxRate(taxRules, category, defaultTaxCode);
-    const categoryTaxPercentage = getTaxValue(policy, transaction, categoryTaxCode ?? '');
-    let categoryTaxAmount;
-
-    if (categoryTaxPercentage) {
-        categoryTaxAmount = convertToBackendAmount(calculateTaxAmount(categoryTaxPercentage, getAmount(transaction), getCurrencyDecimals(getCurrency(transaction))));
-    }
-
-    return {categoryTaxCode, categoryTaxAmount, categoryTaxValue: categoryTaxPercentage};
-}
-
 /**
  * Return the sorted list transactions of an iou report
  */
@@ -3630,81 +1667,6 @@ function isUnreportedManagedCardTransaction(transaction?: Transaction): boolean
     return isExpenseUnreported(transaction) && isManagedCardTransaction(transaction);
 }
 
-/**
- * Returns true if the violation should block report submission.
- */
-function isSubmissionBlockingViolation(violation: TransactionViolation): boolean {
-    return violation.name === CONST.VIOLATIONS.SMARTSCAN_FAILED || violation.name === CONST.VIOLATIONS.NO_ROUTE;
-}
-
-/**
- * Returns true if the transaction has at least one violation that should block report submission.
- */
-function hasSubmissionBlockingViolationInList(violations: TransactionViolation[] | null | undefined): boolean {
-    return !!violations?.some(isSubmissionBlockingViolation);
-}
-
-/**
- * Returns true if any report transaction has a violation that should block report submission.
- * Allows callers to use an optimistic violation list for one transaction before it is written to Onyx.
- */
-function hasSubmissionBlockingViolationInReport(
-    transactions: Array<OnyxEntry<Transaction>>,
-    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
-    optimisticTransactionID?: string,
-    optimisticViolations?: TransactionViolations | null,
-): boolean {
-    return transactions.some((transaction) => {
-        if (!transaction) {
-            return false;
-        }
-
-        const violations =
-            transaction.transactionID === optimisticTransactionID
-                ? optimisticViolations
-                : transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`];
-
-        return hasSubmissionBlockingViolationInList(violations);
-    });
-}
-
-/**
- * Returns true if a transaction have violations that should block report submission.
- */
-function hasSubmissionBlockingViolations(
-    transaction: Transaction,
-    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
-    currentUserEmail: string,
-    currentUserAccountID: number,
-    report: OnyxEntry<Report>,
-    reportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-): boolean {
-    const violations = getTransactionViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
-    return hasSubmissionBlockingViolationInList(violations);
-}
-
-function isTransactionSubmittable(
-    transaction: Transaction,
-    report: OnyxEntry<Report>,
-    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
-    currentUserEmail: string | undefined,
-    currentUserAccountID: number | undefined,
-    reportOwnerLogin: string | undefined,
-    policy: OnyxEntry<Policy>,
-    isTransactionScanning: (transactionToCheck: OnyxEntry<Transaction>) => boolean = isScanning,
-): boolean {
-    if (isTransactionScanning(transaction) || (isExpensifyCardTransaction(transaction) && isPending(transaction)) || hasSmartScanFailedWithMissingFields([transaction], report)) {
-        return false;
-    }
-
-    if (transactionViolations && currentUserEmail && currentUserAccountID !== undefined) {
-        return !hasSubmissionBlockingViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
-    }
-
-    return true;
-}
-
 /**
  * Check if the initial transaction should be reused for the current file being processed.
  */
@@ -3824,6 +1786,14 @@ function hasManualDistanceOverride(transaction: OnyxInputOrEntry<Transaction>):
     return !quantityMatchesDistance(selectedRouteDistanceInMeters) && !(routeDistanceMeters && quantityMatchesDistance(routeDistanceMeters));
 }
 
+function isTransactionOwner(transaction: OnyxEntry<Transaction>, cardList: OnyxEntry<CardList>) {
+    /**
+     * The transaction should belong to the current user if its card is in Onyx. Note that cash transactions are also
+     * linked to a "cash card".
+     */
+    return !!cardList?.[transaction?.cardID ?? CONST.DEFAULT_NUMBER_ID];
+}
+
 export {
     buildOptimisticTransaction,
     calculateTaxAmount,
@@ -4004,12 +1974,14 @@ export {
     isDistanceTypeRequest,
     recalculateUnreportedTransactionDetails,
     hasSmartScanFailedWithMissingFields,
+    isFailedScanAmountPlaceholder,
     isScanFailedTransactionMovedOnPayment,
     shouldSplitScanFailedTransactions,
     isDeletedTransaction,
     getDistanceRequestType,
     isUnreportedManagedCardTransaction,
     getReservationNights,
+    isTransactionOwner,
 };
 
 export type {ManuallyEnteredScanFields};
diff --git a/src/libs/TransactionUtils/tax.ts b/src/libs/TransactionUtils/tax.ts
new file mode 100644
index 000000000000..f9bcb4938c55
--- /dev/null
+++ b/src/libs/TransactionUtils/tax.ts
@@ -0,0 +1,238 @@
+/**
+ * Helpers for an expense's tax: resolving the default and category tax rates, calculating the tax amount,
+ * and building the tax names and titles shown in the UI.
+ * Extracted from TransactionUtils/index.ts to keep that file smaller.
+ */
+import type {CurrencyListActionsContextType} from '@hooks/useCurrencyList';
+
+import {getCategoryDefaultTaxRate} from '@libs/CategoryUtils';
+import {convertToBackendAmount} from '@libs/CurrencyUtils';
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import {translateLocal} from '@libs/Localize';
+import {getDistanceRateCustomUnit, getDistanceRateCustomUnitRate, resolveCurrentTaxCode} from '@libs/PolicyUtils';
+
+import CONST from '@src/CONST';
+import type {Policy, TaxRate, TaxRates, Transaction} from '@src/types/onyx';
+import type {Unit} from '@src/types/onyx/Policy';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import getDistanceInMeters from './getDistanceInMeters';
+// This cycle import is safe because this file was extracted from TransactionUtils/index.ts, which re-exports it.
+// The functions imported here are pure helpers that aren't called at initialization time.
+// eslint-disable-next-line import/no-cycle
+import {getAmount, getCurrency, getRateID, getTaxCode, isDistanceRequest} from './index';
+
+/**
+ * Calculates tax amount from the given expense amount and tax percentage
+ */
+function calculateTaxAmount(percentage: string | undefined, amount: number, decimals: number) {
+    if (!percentage) {
+        return 0;
+    }
+
+    const divisor = Number(percentage.slice(0, -1)) / 100 + 1;
+    const taxAmount = (amount - amount / divisor) / 100;
+    return parseFloat(taxAmount.toFixed(decimals));
+}
+
+/**
+ * Calculates count of all tax enabled options
+ */
+function getEnabledTaxRateCount(options: TaxRates) {
+    return Object.values(options).filter((option: TaxRate) => !option.isDisabled).length;
+}
+
+/**
+ * Gets the tax code based on the type of transaction and selected currency.
+ * If it is distance request, then returns the tax code corresponding to the custom unit rate
+ * Else returns policy default tax rate if transaction is in policy default currency, otherwise foreign default tax rate
+ */
+function getDefaultTaxCode(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, currency?: string | undefined, newCustomUnitRateID?: string): string | undefined {
+    if (isDistanceRequest(transaction)) {
+        // When editing a distance rate, the draft transaction's customUnitRateID
+        // does not reflect the newly selected rate until setMoneyRequestDistanceRate is called, and the draft transaction's is updated.
+        // Therefore, to correctly determine the tax code for the selected rate, we must use the newly selected distance rate's customUnitRateID (newCustomUnitRateID)
+        // instead of relying on the transaction's current customUnitRateID.
+        const customUnitRateID = newCustomUnitRateID ?? getRateID(transaction) ?? '';
+        const customUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
+        const customUnit = getDistanceRateCustomUnit(policy);
+        if (!customUnitRate?.attributes?.taxRateExternalID && customUnit?.attributes?.taxEnabled) {
+            return policy?.taxRates?.defaultExternalID;
+        }
+        return customUnitRate?.attributes?.taxRateExternalID;
+    }
+    const defaultExternalID = policy?.taxRates?.defaultExternalID;
+    const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
+    return policy?.outputCurrency === (currency ?? getCurrency(transaction)) ? defaultExternalID : foreignTaxDefault;
+}
+
+/**
+ * Transforms tax rates to a new object format - to add codes and new name with concatenated name and value.
+ *
+ * @param  policy - The policy which the user has access to and which the report is tied to.
+ * @returns The transformed tax rates object.g
+ */
+function transformedTaxRates(policy: OnyxEntry<Policy> | undefined, transaction?: OnyxEntry<Transaction>): Record<string, TaxRate> {
+    const taxRates = policy?.taxRates;
+    const defaultExternalID = taxRates?.defaultExternalID;
+
+    const defaultTaxCode = () => {
+        if (!transaction) {
+            return defaultExternalID;
+        }
+
+        return policy && getDefaultTaxCode(policy, transaction);
+    };
+    const getModifiedName = (data: TaxRate, code: string) => `${data.name} (${data.value})${defaultTaxCode() === code ? ` ${CONST.DOT_SEPARATOR} ${translateLocal('common.default')}` : ''}`;
+    const taxes = Object.fromEntries(Object.entries(taxRates?.taxes ?? {}).map(([code, data]) => [code, {...data, code, modifiedName: getModifiedName(data, code), name: data.name}]));
+    return taxes;
+}
+
+/**
+ * Gets the tax value of a selected tax
+ */
+function getTaxValue(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, taxCode: string) {
+    const resolvedTaxCode = resolveCurrentTaxCode(policy, taxCode);
+    return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === resolvedTaxCode)?.value;
+}
+
+/**
+ * Computes tax amount, code, and value when a workspace distance expense uses a given mileage rate.
+ */
+function getDistanceRateTaxUpdates(
+    policy: OnyxEntry<Policy>,
+    transaction: OnyxEntry<Transaction>,
+    customUnitRateID: string,
+    getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'],
+    distanceUnit?: Unit,
+): {taxAmount: number; taxCode: string; taxValue: string | undefined} {
+    const policyCustomUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
+    const defaultTaxCode = getDefaultTaxCode(policy, transaction, undefined, customUnitRateID) ?? '';
+    // We use || instead of ?? because taxRateExternalID may be an empty string, which should also trigger the fallback to the default tax code.
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const taxCode = policyCustomUnitRate?.attributes?.taxRateExternalID || defaultTaxCode;
+    const taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, getDistanceInMeters(transaction, distanceUnit ?? transaction?.comment?.customUnit?.distanceUnit));
+    const taxValue = taxCode ? getTaxValue(policy, transaction, taxCode) : undefined;
+    const mileageRates = DistanceRequestUtils.getMileageRates(policy);
+    const rateCurrency = mileageRates[customUnitRateID]?.currency ?? transaction?.currency ?? CONST.CURRENCY.USD;
+    const taxAmount = convertToBackendAmount(calculateTaxAmount(taxValue, taxableAmount, getCurrencyDecimals(rateCurrency)));
+
+    return {taxAmount, taxCode, taxValue};
+}
+
+/**
+ * Returns the maximum allowed tax amount (in the smallest currency units) for a transaction,
+ * i.e. the tax computed from the selected tax rate (or the policy default) and the expense amount.
+ * Used to validate manually entered tax amounts so they can't exceed the calculated tax.
+ */
+function getCalculatedTaxAmount(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, currency: string, decimals: number): number {
+    const taxableAmount = Math.abs(getAmount(transaction));
+    const taxCode = transaction?.taxCode ?? getDefaultTaxCode(policy, transaction, currency) ?? '';
+    const taxPercentage = getTaxValue(policy, transaction, taxCode) ?? '';
+    return convertToBackendAmount(calculateTaxAmount(taxPercentage, taxableAmount, decimals));
+}
+
+/**
+ * Gets the tax name for Workspace Taxes Settings
+ */
+function getWorkspaceTaxesSettingsName(policy: OnyxEntry<Policy>, taxCode: string) {
+    return Object.values(transformedTaxRates(policy)).find((taxRate) => taxRate.code === taxCode)?.modifiedName;
+}
+
+/**
+ * Gets the name corresponding to the taxCode that is displayed to the user
+ */
+function getTaxName(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, shouldFallbackToValue = false) {
+    const defaultTaxCode = getDefaultTaxCode(policy, transaction);
+
+    // Only fall back to the default tax code when tax tracking is enabled on the policy.
+    // When taxes are disabled and the user deletes a tax, taxCode becomes undefined (the API returns null, which Onyx strips).
+    // Without this check, getTaxName would fall back to defaultTaxCode and display the default tax rate instead of showing empty.
+    // We use || instead of ?? because taxCode may be an empty string, which should also trigger the fallback.
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const taxCodeToMatch = transaction?.taxCode || (policy?.tax?.trackingEnabled ? defaultTaxCode : undefined);
+    const resolvedTaxCode = taxCodeToMatch ? resolveCurrentTaxCode(policy, taxCodeToMatch) : taxCodeToMatch;
+    const taxRate = taxCodeToMatch ? Object.values(transformedTaxRates(policy, transaction)).find((rate) => rate.code === resolvedTaxCode) : undefined;
+
+    if (shouldFallbackToValue && transaction?.taxValue !== undefined && taxRate?.value !== transaction?.taxValue) {
+        return transaction?.taxValue;
+    }
+
+    return taxRate?.modifiedName;
+}
+
+/**
+ * Checks if the tax rate with matching transaction's tax rate value exists in the policy tax rates
+ */
+function hasTaxRateWithMatchingValue(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>) {
+    if (!policy || !transaction) {
+        return false;
+    }
+
+    const transactionTaxCode = getTaxCode(transaction);
+    const resolvedTaxCode = transactionTaxCode ? resolveCurrentTaxCode(policy, transactionTaxCode) : transactionTaxCode;
+    const transformedRates = transformedTaxRates(policy, transaction);
+    const taxRate = Object.values(transformedRates).find((rate) => rate.code === resolvedTaxCode);
+
+    if (!transaction?.taxValue) {
+        return !!taxRate;
+    }
+
+    return taxRate?.value === transaction?.taxValue;
+}
+
+/**
+ * Gets the tax rate title for display, handling the case when moving expenses from track to submit
+ */
+function getTaxRateTitle(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, isMovingFromTrackExpense: boolean, policyForMovingExpenses?: OnyxEntry<Policy>): string {
+    const currentTaxName = getTaxName(policy, transaction);
+
+    if (currentTaxName) {
+        // If moving from track expense show the tax name from the moving policy
+        if (isMovingFromTrackExpense && !hasTaxRateWithMatchingValue(policy, transaction)) {
+            return getTaxName(policyForMovingExpenses, transaction) ?? '';
+        }
+        return getTaxName(policy, transaction, true) ?? '';
+    }
+
+    // If no tax name on current policy but moving from track expense, use the moving policy
+    if (isMovingFromTrackExpense) {
+        return getTaxName(policyForMovingExpenses, transaction, true) ?? '';
+    }
+
+    return '';
+}
+
+function getCategoryTaxDetails(category: string, transaction: OnyxEntry<Transaction>, policy: OnyxEntry<Policy>, getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals']) {
+    const taxRules = policy?.rules?.expenseRules?.filter((rule) => rule.tax);
+    if (!taxRules || taxRules?.length === 0 || isDistanceRequest(transaction)) {
+        return {categoryTaxCode: undefined, categoryTaxAmount: undefined, categoryTaxValue: undefined};
+    }
+
+    const defaultTaxCode = getDefaultTaxCode(policy, transaction, getCurrency(transaction));
+    const categoryTaxCode = getCategoryDefaultTaxRate(taxRules, category, defaultTaxCode);
+    const categoryTaxPercentage = getTaxValue(policy, transaction, categoryTaxCode ?? '');
+    let categoryTaxAmount;
+
+    if (categoryTaxPercentage) {
+        categoryTaxAmount = convertToBackendAmount(calculateTaxAmount(categoryTaxPercentage, getAmount(transaction), getCurrencyDecimals(getCurrency(transaction))));
+    }
+
+    return {categoryTaxCode, categoryTaxAmount, categoryTaxValue: categoryTaxPercentage};
+}
+
+export {
+    calculateTaxAmount,
+    getCalculatedTaxAmount,
+    getCategoryTaxDetails,
+    getDefaultTaxCode,
+    getDistanceRateTaxUpdates,
+    getEnabledTaxRateCount,
+    getTaxName,
+    getTaxRateTitle,
+    getTaxValue,
+    getWorkspaceTaxesSettingsName,
+    hasTaxRateWithMatchingValue,
+    transformedTaxRates,
+};
diff --git a/src/libs/TransactionUtils/violations.ts b/src/libs/TransactionUtils/violations.ts
new file mode 100644
index 000000000000..940d0508e586
--- /dev/null
+++ b/src/libs/TransactionUtils/violations.ts
@@ -0,0 +1,665 @@
+/**
+ * Helpers that read, filter, and check transaction violations (RTER, broken connection, duplicates,
+ * notice/warning types, and submission-blocking violations).
+ */
+import {isPersonalCard} from '@libs/CardUtils';
+import DateUtils from '@libs/DateUtils';
+import {isAttendeeTrackingEnabled as isAttendeeTrackingEnabledForPolicy, isInstantSubmitEnabled, isPolicyAdmin, isPolicyMember as isPolicyMemberPolicyUtils} from '@libs/PolicyUtils';
+import {isCurrentUserSubmitter, isIOUReport, isOpenExpenseReport, isProcessingReport, isReportManager, isSettled} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {CardList, Policy, Report, Transaction, TransactionViolation, TransactionViolations, ViolationName} from '@src/types/onyx';
+
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+
+// This cycle import is safe because this file was extracted from TransactionUtils/index.ts, which re-exports it.
+// The functions imported here are pure helpers that aren't called at initialization time.
+// eslint-disable-next-line import/no-cycle
+import {getCreated, hasSmartScanFailedWithMissingFields, isCategoryBeingAnalyzed, isExpensifyCardTransaction, isPending, isScanning} from './index';
+
+/**
+ * Get all transaction violations of the transaction with given transactionID.
+ */
+function getTransactionViolations(
+    transaction: OnyxEntry<Transaction>,
+    transactionViolations: OnyxCollection<TransactionViolations>,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    iouReportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+): TransactionViolations | undefined {
+    if (!transaction || !transactionViolations) {
+        return undefined;
+    }
+
+    const violations =
+        transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]?.filter(
+            (violation) => !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy),
+        ) ?? [];
+
+    return violations;
+}
+
+/**
+ * Check if a transaction has been rejected
+ */
+function hasTransactionBeenRejected(transactionViolations: OnyxEntry<TransactionViolations>): boolean {
+    return !!transactionViolations && transactionViolations.some((violation) => violation.name === CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE);
+}
+
+/**
+ * Check if there is pending rter violation in transactionViolations.
+ */
+function hasPendingRTERViolation(transactionViolations?: TransactionViolations | null): boolean {
+    return !!transactionViolations?.some(
+        (transactionViolation: TransactionViolation) =>
+            transactionViolation.name === CONST.VIOLATIONS.RTER && transactionViolation.data?.pendingPattern && !isBrokenConnectionViolation(transactionViolation),
+    );
+}
+
+/**
+ * Check if any of the given transactions have a pending RTER violation that has not been dismissed (e.g. via mark-as-cash).
+ */
+function hasAnyPendingRTERViolation(
+    transactions: Array<OnyxEntry<Transaction>>,
+    allTransactionViolations: OnyxCollection<TransactionViolations>,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    report: OnyxEntry<Report>,
+    reportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+): boolean {
+    return transactions.some((t) => {
+        const filteredViolations = getTransactionViolations(t, allTransactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
+        return hasPendingRTERViolation(filteredViolations);
+    });
+}
+
+/**
+ * Check if there is a custom unit out of policy violation in transactionViolations.
+ */
+function hasCustomUnitOutOfPolicyViolation(transactionViolations?: TransactionViolations | null): boolean {
+    return !!transactionViolations?.some((violation) => violation.name === CONST.VIOLATIONS.CUSTOM_UNIT_OUT_OF_POLICY);
+}
+
+/**
+ * Check if there is broken connection violation.
+ */
+function hasBrokenConnectionViolation(
+    transaction: Transaction,
+    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    report: OnyxEntry<Report>,
+    reportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+): boolean {
+    const violations = getTransactionViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
+    return !!violations?.find((violation) => isBrokenConnectionViolation(violation));
+}
+
+function isBrokenConnectionViolation(violation: TransactionViolation) {
+    return (
+        violation.name === CONST.VIOLATIONS.RTER &&
+        (violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION ||
+            violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_530 ||
+            violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_531 ||
+            violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_REAUTH)
+    );
+}
+
+/**
+ * Suppresses the report-level status only when every broken connection belongs to a personal card.
+ * Reports with company-card or retry-later violations must retain a status so their required action is visible.
+ */
+function shouldSuppressBrokenConnectionStatus(brokenConnectionViolations: TransactionViolation[], cardList: OnyxEntry<CardList>) {
+    return (
+        brokenConnectionViolations.length > 0 &&
+        brokenConnectionViolations.every((violation) => {
+            if (violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_530 || violation.data?.rterType === CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION_531) {
+                return false;
+            }
+
+            const cardID = violation.data?.cardID;
+            const card = cardID ? cardList?.[cardID] : undefined;
+            return !!card && isPersonalCard(card);
+        })
+    );
+}
+
+/** Returns a report transaction that has a broken connection status which must remain visible. */
+function getUnsuppressibleBrokenConnectionTransactionID(
+    transactions: Transaction[],
+    transactionViolations: OnyxCollection<TransactionViolations>,
+    cardList: OnyxEntry<CardList>,
+): string | undefined {
+    return transactions.find((transaction) => {
+        const brokenConnectionViolations = (transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`] ?? []).filter(isBrokenConnectionViolation);
+        return brokenConnectionViolations.length > 0 && !shouldSuppressBrokenConnectionStatus(brokenConnectionViolations, cardList);
+    })?.transactionID;
+}
+
+function shouldShowBrokenConnectionViolationInternal(brokenConnectionViolations: TransactionViolation[], report: OnyxEntry<Report>, policy: OnyxEntry<Policy>) {
+    if (brokenConnectionViolations.length === 0) {
+        return false;
+    }
+
+    if (!isPolicyAdmin(policy) || isCurrentUserSubmitter(report)) {
+        return true;
+    }
+
+    if (isOpenExpenseReport(report)) {
+        return true;
+    }
+
+    return isProcessingReport(report) && isInstantSubmitEnabled(policy);
+}
+
+/**
+ * Check if user should see broken connection violation warning based on violations list.
+ */
+function shouldShowBrokenConnectionViolation(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, transactionViolations: TransactionViolation[]): boolean {
+    const brokenConnectionViolations = transactionViolations.filter((violation) => isBrokenConnectionViolation(violation));
+
+    return shouldShowBrokenConnectionViolationInternal(brokenConnectionViolations, report, policy);
+}
+
+/**
+ * Check if user should see broken connection violation warning based on selected transactions. RTER violations stop being actionable once the report is paid, so they are hidden on settled reports.
+ */
+function shouldShowBrokenConnectionViolationForMultipleTransactions(
+    transactions: Transaction[],
+    report: OnyxEntry<Report>,
+    reportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    transactionViolations: OnyxCollection<TransactionViolation[]>,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+): boolean {
+    const brokenConnectionViolations = transactions.flatMap((transaction) => {
+        const violations = transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`] ?? [];
+
+        if (!transaction) {
+            return [];
+        }
+
+        return violations.filter((violation) => {
+            if (!isBrokenConnectionViolation(violation)) {
+                return false;
+            }
+
+            if (isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy)) {
+                return false;
+            }
+
+            return shouldShowViolation(report, policy, violation.name, currentUserEmail, currentUserAccountID, false, transaction);
+        });
+    });
+
+    return shouldShowBrokenConnectionViolationInternal(brokenConnectionViolations, report, policy);
+}
+
+/**
+ * Merge prohibited violations into one violation.
+ */
+function mergeProhibitedViolations(transactionViolations: TransactionViolations): TransactionViolations {
+    const prohibitedViolations = transactionViolations.filter((violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.PROHIBITED_EXPENSE);
+
+    if (prohibitedViolations.length === 0) {
+        return transactionViolations;
+    }
+
+    const prohibitedExpenses = prohibitedViolations.flatMap((violation: TransactionViolation) => violation.data?.prohibitedExpenseRule ?? []);
+    const mergedProhibitedViolations: TransactionViolation = {
+        name: CONST.VIOLATIONS.PROHIBITED_EXPENSE,
+        data: {
+            prohibitedExpenseRule: prohibitedExpenses,
+        },
+        type: CONST.VIOLATION_TYPES.VIOLATION,
+        showInReview: prohibitedViolations.some((v) => v.showInReview),
+    };
+
+    return [...transactionViolations.filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.PROHIBITED_EXPENSE), mergedProhibitedViolations];
+}
+
+/**
+ * Returns transaction violations visible to the current user after applying dismiss/show filters
+ * and merging prohibited-expense violations.
+ */
+function getVisibleTransactionViolations(
+    transaction: OnyxEntry<Transaction>,
+    transactionViolations: TransactionViolations,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    iouReportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    shouldShowRterForSettledReport = true,
+): TransactionViolations {
+    return mergeProhibitedViolations(
+        transactionViolations.filter(
+            (violation) =>
+                !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy) &&
+                shouldShowViolation(iouReport, policy, violation.name, currentUserEmail, currentUserAccountID, shouldShowRterForSettledReport, transaction),
+        ),
+    );
+}
+
+/**
+ * Check if the user should see the violation
+ */
+function shouldShowViolation(
+    iouReport: OnyxEntry<Report>,
+    policy: OnyxEntry<Policy>,
+    violationName: ViolationName,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    shouldShowRterForSettledReport = true,
+    transaction?: OnyxEntry<Transaction>,
+): boolean {
+    const isSubmitter = isCurrentUserSubmitter(iouReport, currentUserAccountID);
+    const isPolicyMember = isPolicyMemberPolicyUtils(policy, currentUserEmail);
+    const isReportOpen = isOpenExpenseReport(iouReport);
+    if (violationName === CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE) {
+        return isSubmitter || isPolicyAdmin(policy);
+    }
+
+    // The violation is not saved in the backend cache, so it has to be re-evaluated here rather than trusted from
+    // whenever the expense was created or edited.
+    if (violationName === CONST.VIOLATIONS.FUTURE_DATE) {
+        // Without a transaction the rule cannot be evaluated, so show the violation rather than hiding one the
+        // backend reported.
+        if (!transaction) {
+            return true;
+        }
+        return DateUtils.isTransactionDateFuture(getCreated(transaction));
+    }
+
+    if (violationName === CONST.VIOLATIONS.OVER_AUTO_APPROVAL_LIMIT) {
+        // Submitters are not shown this notice because they cannot act on it, but a submitter who is also the report's
+        // approver is the person who has to approve it manually, so they still need to know why it was not auto-approved.
+        return isPolicyAdmin(policy) && (!isSubmitter || isReportManager(iouReport, currentUserAccountID)) && isProcessingReport(iouReport);
+    }
+
+    if (violationName === CONST.VIOLATIONS.RTER) {
+        return (isSubmitter || isInstantSubmitEnabled(policy)) && (shouldShowRterForSettledReport || !isSettled(iouReport));
+    }
+
+    if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) {
+        return isPolicyMember && !isSubmitter && !isReportOpen;
+    }
+
+    if (violationName === CONST.VIOLATIONS.MISSING_ATTENDEES) {
+        return isAttendeeTrackingEnabledForPolicy(policy);
+    }
+
+    if (violationName === CONST.VIOLATIONS.MISSING_CATEGORY && isCategoryBeingAnalyzed(transaction, iouReport, policy)) {
+        return false;
+    }
+
+    if (violationName === CONST.VIOLATIONS.DUPLICATED_TRANSACTION && isIOUReport(iouReport)) {
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
+ */
+function allHavePendingRTERViolation(
+    transactions: OnyxEntry<Transaction[]>,
+    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    report: OnyxEntry<Report>,
+    reportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+): boolean {
+    if (!transactions) {
+        return false;
+    }
+
+    const transactionsWithRTERViolations = transactions.map((transaction) => {
+        // Get violations not dismissed by current user
+        const filteredTransactionViolations = getTransactionViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy)?.filter(
+            (violation) =>
+                // Further filter to only violations visible to the current user
+                shouldShowViolation(report, policy, violation.name, currentUserEmail, currentUserAccountID, true, transaction),
+        );
+        // Check if there is pending rter violation in the filtered violations
+        return hasPendingRTERViolation(filteredTransactionViolations);
+    });
+    return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
+}
+
+/**
+ * Check if there is any transaction without RTER violation within the given transactionIDs.
+ */
+function hasAnyTransactionWithoutRTERViolation(
+    transactions: Transaction[],
+    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    report: OnyxEntry<Report>,
+    reportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+): boolean {
+    return (
+        transactions.length > 0 &&
+        transactions.some((transaction) => {
+            return !hasBrokenConnectionViolation(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
+        })
+    );
+}
+
+/**
+ * Check if the transaction is pending or has a pending rter violation.
+ */
+function hasPendingUI(transaction: OnyxEntry<Transaction>, transactionViolations?: TransactionViolations | null): boolean {
+    return isScanning(transaction) || isPending(transaction) || (!!transaction && hasPendingRTERViolation(transactionViolations));
+}
+
+/**
+ * Check if transaction has duplicatedTransaction violation.
+ * @param transactionID - the transaction to check
+ */
+function isDuplicate(
+    transaction: OnyxEntry<Transaction>,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    iouReportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    transactionViolation: OnyxEntry<TransactionViolations>,
+): boolean {
+    if (!transaction || !shouldShowViolation(iouReport, policy, CONST.VIOLATIONS.DUPLICATED_TRANSACTION, currentUserEmail, currentUserAccountID, true, transaction)) {
+        return false;
+    }
+
+    const duplicatedTransactionViolation = transactionViolation?.find((violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION);
+    const hasDuplicatedTransactionViolation = !!duplicatedTransactionViolation;
+    const isDuplicatedTransactionViolationDismissed = isViolationDismissed(
+        transaction,
+        duplicatedTransactionViolation,
+        currentUserEmail,
+        currentUserAccountID,
+        iouReport,
+        iouReportOwnerLogin,
+        policy,
+    );
+
+    return hasDuplicatedTransactionViolation && !isDuplicatedTransactionViolationDismissed;
+}
+
+/**
+ * Checks if a violation is dismissed for the given transaction.
+ */
+function isViolationDismissed(
+    transaction: OnyxEntry<Transaction>,
+    violation: TransactionViolation | undefined,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    iouReportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+): boolean {
+    if (!transaction || !violation) {
+        return false;
+    }
+
+    const violationDismissals = transaction.comment?.dismissedViolations?.[violation.name];
+    if (!violationDismissals) {
+        return false;
+    }
+
+    const dismissedByEmails = Object.keys(violationDismissals);
+
+    // Current user dismissed it themselves
+    if (dismissedByEmails.includes(currentUserEmail)) {
+        return true;
+    }
+
+    // RTER violations on instant submit reports only need to be dismissed by one person to be considered dismissed
+    if (violation.name === CONST.VIOLATIONS.RTER && policy && isInstantSubmitEnabled(policy)) {
+        return dismissedByEmails.length > 0;
+    }
+
+    // If the admin is looking at an open report, we check for both, submitter and admin.
+    if (!iouReport) {
+        return false;
+    }
+
+    const isSubmitter = iouReport.ownerAccountID === currentUserAccountID;
+    const shouldViewAsSubmitter = !isSubmitter && isOpenExpenseReport(iouReport);
+
+    if (shouldViewAsSubmitter && iouReportOwnerLogin && dismissedByEmails.includes(iouReportOwnerLogin)) {
+        return true;
+    }
+
+    return false;
+}
+
+/**
+ * Checks if violations are supported for the given transaction
+ */
+function doesTransactionSupportViolations(transaction: Transaction | undefined): transaction is Transaction {
+    if (!transaction) {
+        return false;
+    }
+    return true;
+}
+
+/**
+ * Checks if any violations for the provided transaction are of type 'violation'
+ */
+function hasViolation(
+    transaction: Transaction | undefined,
+    transactionViolations: TransactionViolation[] | OnyxCollection<TransactionViolation[]>,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    iouReportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    showInReview?: boolean,
+): boolean {
+    if (!doesTransactionSupportViolations(transaction)) {
+        return false;
+    }
+    const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID];
+
+    return !!violations?.some(
+        (violation) =>
+            violation.type === CONST.VIOLATION_TYPES.VIOLATION &&
+            (showInReview === undefined || showInReview === (violation.showInReview ?? false)) &&
+            (violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION || !isIOUReport(iouReport)) &&
+            !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy),
+    );
+}
+
+function hasDuplicateTransactions(
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    ownerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    allTransactionViolations: OnyxCollection<TransactionViolation[]>,
+    reportTransactions: Transaction[],
+): boolean {
+    return (
+        reportTransactions.length > 0 &&
+        reportTransactions.some((transaction) =>
+            isDuplicate(
+                transaction,
+                currentUserEmail,
+                currentUserAccountID,
+                iouReport,
+                ownerLogin,
+                policy,
+                allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID],
+            ),
+        )
+    );
+}
+
+/**
+ * Checks if any violations for the provided transaction are of type 'notice'
+ */
+function hasNoticeTypeViolation(
+    transaction: OnyxEntry<Transaction>,
+    transactionViolations: TransactionViolation[] | OnyxCollection<TransactionViolation[]>,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    iouReportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    showInReview?: boolean,
+): boolean {
+    if (!doesTransactionSupportViolations(transaction)) {
+        return false;
+    }
+    const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`];
+
+    return !!violations?.some(
+        (violation: TransactionViolation) =>
+            violation.type === CONST.VIOLATION_TYPES.NOTICE &&
+            (showInReview === undefined || showInReview === (violation.showInReview ?? false)) &&
+            !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy) &&
+            shouldShowViolation(iouReport, policy, violation.name, currentUserEmail, currentUserAccountID, true, transaction),
+    );
+}
+
+/**
+ * Checks if any violations for the provided transaction are of type 'warning'
+ */
+function hasWarningTypeViolation(
+    transaction: OnyxEntry<Transaction>,
+    transactionViolations: TransactionViolation[] | OnyxCollection<TransactionViolation[]>,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    iouReport: OnyxEntry<Report>,
+    iouReportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    showInReview?: boolean,
+): boolean {
+    if (!doesTransactionSupportViolations(transaction)) {
+        return false;
+    }
+    const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`];
+
+    const warningTypeViolations =
+        violations?.filter(
+            (violation: TransactionViolation) =>
+                violation.type === CONST.VIOLATION_TYPES.WARNING &&
+                (showInReview === undefined || showInReview === (violation.showInReview ?? false)) &&
+                !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, iouReportOwnerLogin, policy),
+        ) ?? [];
+
+    return warningTypeViolations.length > 0;
+}
+
+/**
+ * Returns true if the violation should block report submission.
+ */
+function isSubmissionBlockingViolation(violation: TransactionViolation): boolean {
+    return violation.name === CONST.VIOLATIONS.SMARTSCAN_FAILED || violation.name === CONST.VIOLATIONS.NO_ROUTE;
+}
+
+/**
+ * Returns true if the transaction has at least one violation that should block report submission.
+ */
+function hasSubmissionBlockingViolationInList(violations: TransactionViolation[] | null | undefined): boolean {
+    return !!violations?.some(isSubmissionBlockingViolation);
+}
+
+/**
+ * Returns true if any report transaction has a violation that should block report submission.
+ * Allows callers to use an optimistic violation list for one transaction before it is written to Onyx.
+ */
+function hasSubmissionBlockingViolationInReport(
+    transactions: Array<OnyxEntry<Transaction>>,
+    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
+    optimisticTransactionID?: string,
+    optimisticViolations?: TransactionViolations | null,
+): boolean {
+    return transactions.some((transaction) => {
+        if (!transaction) {
+            return false;
+        }
+
+        const violations =
+            transaction.transactionID === optimisticTransactionID
+                ? optimisticViolations
+                : transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`];
+
+        return hasSubmissionBlockingViolationInList(violations);
+    });
+}
+
+/**
+ * Returns true if a transaction have violations that should block report submission.
+ */
+function hasSubmissionBlockingViolations(
+    transaction: Transaction,
+    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
+    currentUserEmail: string,
+    currentUserAccountID: number,
+    report: OnyxEntry<Report>,
+    reportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+): boolean {
+    const violations = getTransactionViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
+    return hasSubmissionBlockingViolationInList(violations);
+}
+
+function isTransactionSubmittable(
+    transaction: Transaction,
+    report: OnyxEntry<Report>,
+    transactionViolations: OnyxCollection<TransactionViolations> | undefined,
+    currentUserEmail: string | undefined,
+    currentUserAccountID: number | undefined,
+    reportOwnerLogin: string | undefined,
+    policy: OnyxEntry<Policy>,
+    isTransactionScanning: (transactionToCheck: OnyxEntry<Transaction>) => boolean = isScanning,
+): boolean {
+    if (isTransactionScanning(transaction) || (isExpensifyCardTransaction(transaction) && isPending(transaction)) || hasSmartScanFailedWithMissingFields([transaction], report)) {
+        return false;
+    }
+
+    if (transactionViolations && currentUserEmail && currentUserAccountID !== undefined) {
+        return !hasSubmissionBlockingViolations(transaction, transactionViolations, currentUserEmail, currentUserAccountID, report, reportOwnerLogin, policy);
+    }
+
+    return true;
+}
+
+export {
+    allHavePendingRTERViolation,
+    getTransactionViolations,
+    getUnsuppressibleBrokenConnectionTransactionID,
+    getVisibleTransactionViolations,
+    hasAnyPendingRTERViolation,
+    hasAnyTransactionWithoutRTERViolation,
+    hasCustomUnitOutOfPolicyViolation,
+    hasDuplicateTransactions,
+    hasNoticeTypeViolation,
+    hasPendingRTERViolation,
+    hasPendingUI,
+    hasSubmissionBlockingViolationInList,
+    hasSubmissionBlockingViolationInReport,
+    hasSubmissionBlockingViolations,
+    hasTransactionBeenRejected,
+    hasViolation,
+    hasWarningTypeViolation,
+    isBrokenConnectionViolation,
+    isDuplicate,
+    isTransactionSubmittable,
+    isViolationDismissed,
+    mergeProhibitedViolations,
+    shouldShowBrokenConnectionViolation,
+    shouldShowBrokenConnectionViolationForMultipleTransactions,
+    shouldShowViolation,
+    shouldSuppressBrokenConnectionStatus,
+};
diff --git a/src/libs/TripReservationUtils.ts b/src/libs/TripReservationUtils.ts
index efd982c62ca5..b52529b486df 100644
--- a/src/libs/TripReservationUtils.ts
+++ b/src/libs/TripReservationUtils.ts
@@ -394,7 +394,7 @@ function getRailReservations(pnr: Pnr, travelers: PnrTraveler[]): ReservationIte
             const travelerIdx = ticket.passengerRefs.at(legIndex)!;
             const travelerInfo = pnrData.passengerInfos.at(travelerIdx);
 
-            const traveler = findTravelerInfo(travelers, travelerInfo?.userOrgId.userId.id);
+            const traveler = findTravelerInfo(travelers, travelerInfo?.userOrgId?.userId?.id);
 
             reservationList.push({
                 reservationIndex: legIndex,
diff --git a/src/libs/WorkArrangementUtils.ts b/src/libs/WorkArrangementUtils.ts
new file mode 100644
index 000000000000..5a46ab7d8e7b
--- /dev/null
+++ b/src/libs/WorkArrangementUtils.ts
@@ -0,0 +1,11 @@
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+
+function getEffectiveWorkArrangement(memberArrangement: boolean | undefined, workspaceArrangement: boolean | undefined): boolean {
+    return memberArrangement ?? workspaceArrangement ?? false;
+}
+
+function getWorkArrangementLabel(translate: LocalizedTranslate, isOfficeBased: boolean): string {
+    return translate(isOfficeBased ? 'workspace.people.officeBased' : 'workspace.people.noRegularWorkspace');
+}
+
+export {getEffectiveWorkArrangement, getWorkArrangementLabel};
diff --git a/src/libs/WorkflowUtils.ts b/src/libs/WorkflowUtils.ts
index 44b238ca3908..8deaaf220613 100644
--- a/src/libs/WorkflowUtils.ts
+++ b/src/libs/WorkflowUtils.ts
@@ -9,20 +9,14 @@ import type {Route} from '@src/ROUTES';
 import type {BankAccountList} from '@src/types/onyx';
 import type {ApprovalWorkflowOnyx, Approver, Member} from '@src/types/onyx/ApprovalWorkflow';
 import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
-import type {
-    ApprovalWorkflowAction,
-    ApprovalWorkflowActions,
-    ApprovalWorkflowFilter,
-    ApprovalWorkflowFilterComparison,
-    ApprovalWorkflowRule,
-    ApprovalWorkflowTriggers,
-} from '@src/types/onyx/ApprovalWorkflowRules';
+import type {ApprovalWorkflowActions, ApprovalWorkflowRule, ApprovalWorkflowTriggers} from '@src/types/onyx/ApprovalWorkflowRules';
 import type {PersonalDetailsList} from '@src/types/onyx/PersonalDetails';
 import type PersonalDetails from '@src/types/onyx/PersonalDetails';
 import type Policy from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
 import type {PolicyEmployeeList} from '@src/types/onyx/PolicyEmployee';
 import type Rule from '@src/types/onyx/Rule';
+import type {RuleFilter, RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
@@ -34,6 +28,7 @@ import {getConnectedHRProvider, getHRAdvancedModeFinalApprover, getHRFinalApprov
 import {getConnectedATSProvider, isAnyRecruitingReadOnlyWorkflowMode} from './merge/RecruitingUtils';
 import {rand64} from './NumberUtils';
 import {getDefaultApprover, isExpensifyTeam, shouldFilterExpensifyTeam} from './PolicyUtils';
+import {fromIndexMap, isApprovalWorkflowRule, isRuleFilterComparison, toIndexMap} from './RuleUtils';
 
 const INITIAL_APPROVAL_WORKFLOW: ApprovalWorkflowOnyx = {
     members: [],
@@ -781,51 +776,48 @@ function mergeWorkflowMembersWithAvailableMembers(workflowMembers: Member[], all
     return [...workflowMembers, ...additionalMembers];
 }
 
+/**
+ * True when `memberEmails` includes every workspace member. A workflow with these members leaves every other
+ * workflow empty, so it is the only workflow left and has to be the default one.
+ */
+function includesEveryWorkspaceMember(memberEmails: Array<string | null | undefined>, employeeList: PolicyEmployeeList | undefined): boolean {
+    const memberEmailSet = new Set(memberEmails);
+    const workspaceMembers = Object.values(employeeList ?? {}).filter((employee) => !!employee.email && employee.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    return workspaceMembers.length > 0 && workspaceMembers.every((employee) => memberEmailSet.has(employee.email));
+}
+
 type ApprovalWorkflowRulesDiff = Record<string, ApprovalWorkflowRule | null>;
 
-function buildComparison(
-    left: ApprovalWorkflowFilterComparison['left'],
-    operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>,
-    right: ApprovalWorkflowFilterComparison['right'],
-): ApprovalWorkflowFilterComparison {
+function buildComparison(left: RuleFilterComparison['left'], operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>, right: RuleFilterComparison['right']): RuleFilterComparison {
     return {operator, left, right};
 }
 
-function buildAnd(left: ApprovalWorkflowFilter['left'], right: ApprovalWorkflowFilter['right']): ApprovalWorkflowFilter {
+function buildAnd(left: RuleFilter['left'], right: RuleFilter['right']): RuleFilter {
     return {operator: CONST.SEARCH.SYNTAX_OPERATORS.AND, left, right};
 }
 
-function buildSubmitterFilter(memberEmails: string[]): ApprovalWorkflowFilterComparison {
+function buildSubmitterFilter(memberEmails: string[]): RuleFilterComparison {
     return buildComparison(CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, [...memberEmails]);
 }
 
-function buildToComparison(email: string): ApprovalWorkflowFilterComparison {
+function buildToComparison(email: string): RuleFilterComparison {
     return buildComparison(CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, email);
 }
 
-/**
- * The index-keyed object shape the rules API uses for lists (`['a', 'b'] -> {'1': 'a', '2': 'b'}`). The indices
- * start at 1 because PHP decodes a 0-keyed JSON object as a list and re-encodes it as a JSON array, which loses
- * the object shape the rules API expects.
- */
-function toIndexMap<T>(values: T[]): Record<string, T> {
-    return Object.fromEntries(values.map((value, index) => [String(index + 1), value]));
-}
-
 function buildSubmitTriggers(): ApprovalWorkflowTriggers {
-    return toIndexMap([CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT]);
+    return toIndexMap([CONST.RULES.TRIGGERS.REPORT_SUBMIT]);
 }
 
 function buildApproveTriggers(): ApprovalWorkflowTriggers {
-    return toIndexMap([CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE]);
+    return toIndexMap([CONST.RULES.TRIGGERS.REPORT_APPROVE]);
 }
 
 function buildForwardActions(approver: string): ApprovalWorkflowActions {
-    return toIndexMap([{name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver}]);
+    return toIndexMap([{name: CONST.RULES.ACTIONS.FORWARD_TO, approver}]);
 }
 
 function buildApproveActions(): ApprovalWorkflowActions {
-    return toIndexMap([{name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.APPROVE_REPORT}]);
+    return toIndexMap([{name: CONST.RULES.ACTIONS.APPROVE_REPORT}]);
 }
 
 /**
@@ -938,39 +930,25 @@ function buildApprovalWorkflowRules(approvalWorkflow: ApprovalWorkflow): Approva
     return dedupedRules.map((rule) => ({...rule, isDefaultApprovalWorkflow: true}));
 }
 
-/**
- * True when this node is a single comparison like `from = alice@expensify.com`, rather than an `AND` that
- * joins two other nodes.
- *
- * Both look the same (`{operator, left, right}`), so the giveaway is `left`: a comparison points at a field
- * name, an `AND` points at another node.
- */
-function isComparisonLeaf(node: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison | undefined): node is ApprovalWorkflowFilterComparison {
-    return !!node && typeof node.left === 'string';
-}
-
 /** True when a comparison node targets the `from` field with an equality operator. */
-function isSubmitterFilter(node: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison): boolean {
-    return isComparisonLeaf(node) && node.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO && node.left === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM;
+function isSubmitterFilter(node: RuleFilterNode): boolean {
+    return isRuleFilterComparison(node) && node.operator === CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO && node.left === CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM;
 }
 
 /** Return the first comparison leaf in the filter tree whose `left` field matches. */
-function getFilter(node: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison | undefined, leftKey: string): ApprovalWorkflowFilterComparison | undefined {
+function getFilter(node: RuleFilterNode | undefined, leftKey: string): RuleFilterComparison | undefined {
     if (!node) {
         return undefined;
     }
-    if (isComparisonLeaf(node)) {
+    if (isRuleFilterComparison(node)) {
         return node.left === leftKey ? node : undefined;
     }
     return getFilter(node.left, leftKey) ?? getFilter(node.right, leftKey);
 }
 
 /** Rebuild a filter tree, replacing every comparison leaf with the result of `mapLeaf`. */
-function mapFilters(
-    node: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison,
-    mapLeaf: (leaf: ApprovalWorkflowFilterComparison) => ApprovalWorkflowFilterComparison,
-): ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison {
-    if (isComparisonLeaf(node)) {
+function mapFilters(node: RuleFilterNode, mapLeaf: (leaf: RuleFilterComparison) => RuleFilterComparison): RuleFilterNode {
+    if (isRuleFilterComparison(node)) {
         return mapLeaf(node);
     }
     return {...node, left: mapFilters(node.left, mapLeaf), right: mapFilters(node.right, mapLeaf)};
@@ -1016,11 +994,11 @@ function sortObjectKeysDeep(value: unknown): unknown {
  * which is what we look for when deciding whether to merge two workflows into a shared rule.
  */
 function getRuleShape(rule: ApprovalWorkflowRule): string {
-    const stripFromValues = (node: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison | undefined): unknown => {
+    const stripFromValues = (node: RuleFilterNode | undefined): unknown => {
         if (!node) {
             return node;
         }
-        if (isComparisonLeaf(node)) {
+        if (isRuleFilterComparison(node)) {
             if (isSubmitterFilter(node)) {
                 return {operator: node.operator, left: node.left};
             }
@@ -1280,29 +1258,19 @@ function applyApprovalWorkflowRulesDiff(existingRules: Record<string, ApprovalWo
     return result;
 }
 
-/** The triggers of a rule as a flat list. */
-function getRuleTriggers(rule: ApprovalWorkflowRule): Array<ValueOf<typeof CONST.RULES.APPROVAL_WORKFLOW.TRIGGER>> {
-    return Object.values(rule.triggers ?? {});
-}
-
-/** The actions of a rule as a flat list. */
-function getRuleActions(rule: ApprovalWorkflowRule): ApprovalWorkflowAction[] {
-    return Object.values(rule.actions ?? {});
-}
-
 /** True when the rule fires on report submission. */
 function isSubmitRule(rule: ApprovalWorkflowRule): boolean {
-    return getRuleTriggers(rule).includes(CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT);
+    return fromIndexMap(rule.triggers).includes(CONST.RULES.TRIGGERS.REPORT_SUBMIT);
 }
 
 /** True when the rule approves (finalizes) the report. */
 function isApproveReportRule(rule: ApprovalWorkflowRule): boolean {
-    return getRuleActions(rule).some((action) => action.name === CONST.RULES.APPROVAL_WORKFLOW.ACTION.APPROVE_REPORT);
+    return fromIndexMap(rule.actions).some((action) => action.name === CONST.RULES.ACTIONS.APPROVE_REPORT);
 }
 
 /** The approver a `ForwardTo` rule routes to, if any. */
 function getForwardApprover(rule: ApprovalWorkflowRule): string | undefined {
-    return getRuleActions(rule).find((action) => action.name === CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO)?.approver;
+    return fromIndexMap(rule.actions).find((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)?.approver;
 }
 
 /**
@@ -1515,14 +1483,14 @@ function getApprovalWorkflowRulesForPolicy(rulesCollection: OnyxCollection<Rule>
     const result: Record<string, ApprovalWorkflowRule> = {};
 
     for (const [onyxKey, rule] of Object.entries(filterRulesForPolicy(rulesCollection, policyID))) {
-        if (!rule || rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+        if (!rule || rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isApprovalWorkflowRule(rule)) {
             continue;
         }
         const ruleID = onyxKey.slice(ONYXKEYS.COLLECTION.RULE.length);
         result[ruleID] = {
-            triggers: toIndexMap(Object.values(rule.triggers ?? {})),
+            triggers: toIndexMap(fromIndexMap(rule.triggers)),
             filters: rule.filters,
-            actions: toIndexMap(Object.values(rule.actions ?? {})),
+            actions: toIndexMap(fromIndexMap(rule.actions)),
             ...(rule.isDefaultApprovalWorkflow ? {isDefaultApprovalWorkflow: true} : {}),
         };
     }
@@ -1597,6 +1565,9 @@ type WorkflowGroup = {
     chain: Approver[];
     members: Member[];
     isDefault: boolean;
+
+    /** Whether rules route these members, rather than `employeeList`. */
+    hasRuleBasedChain: boolean;
     pendingAction: ApprovalWorkflow['pendingAction'];
 };
 
@@ -1716,10 +1687,33 @@ function convertApprovalWorkflowRulesToWorkflows({
             chain,
             members: pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? [member] : [],
             isDefault: isDefaultWorkflowChain,
+            hasRuleBasedChain,
             pendingAction: workflowPendingAction,
         });
     }
 
+    // Once rules declare the default workflow, it is the only default one. A member no rule covers is routed by
+    // `employeeList` instead, so starting at the default approver only puts them in it when `employeeList` sends them
+    // down its exact chain. Rules that declare two different default chains keep a single default too, preferring the
+    // one that starts at the default approver.
+    const ruleBasedDefaultGroups = Array.from(groupedByWorkflowKey.values()).filter((group) => group.isDefault && group.hasRuleBasedChain);
+    const ruleBasedDefaultGroup = ruleBasedDefaultGroups.find((group) => group.chain.at(0)?.email === defaultApprover) ?? ruleBasedDefaultGroups.at(0);
+    if (ruleBasedDefaultGroup) {
+        const defaultChainKey = getApproverChainKey(ruleBasedDefaultGroup.chain);
+        for (const [workflowKey, group] of groupedByWorkflowKey) {
+            if (group === ruleBasedDefaultGroup || !group.isDefault) {
+                continue;
+            }
+            if (!group.hasRuleBasedChain && getApproverChainKey(group.chain) === defaultChainKey) {
+                ruleBasedDefaultGroup.members.push(...group.members);
+                ruleBasedDefaultGroup.pendingAction = group.pendingAction ?? ruleBasedDefaultGroup.pendingAction;
+                groupedByWorkflowKey.delete(workflowKey);
+                continue;
+            }
+            group.isDefault = false;
+        }
+    }
+
     const workflowGroups = Array.from(groupedByWorkflowKey.values());
 
     if (!workflowGroups.some((group) => group.isDefault)) {
@@ -1761,6 +1755,7 @@ function convertApprovalWorkflowRulesToWorkflows({
 }
 
 export {
+    addMembersToRule,
     applyApprovalWorkflowRulesDiff,
     getApproverChainKey,
     buildApprovalWorkflowRules,
@@ -1778,6 +1773,7 @@ export {
     getRulesSubmitterToWorkflowKey,
     getWorkflowMemberEmails,
     hasRuleBasedDefaultWorkflow,
+    includesEveryWorkspaceMember,
     isApprovalWorkflowLockedByIntegration,
     getEligibleExistingBusinessBankAccounts,
     getOpenConnectedToPolicyBusinessBankAccounts,
diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts
index be4afeb19268..5e0b27f08d08 100644
--- a/src/libs/actions/App.ts
+++ b/src/libs/actions/App.ts
@@ -1,19 +1,12 @@
-import type {LocalizedTranslate} from '@components/LocaleContextProvider';
-
 import * as API from '@libs/API';
 import type {GetMissingOnyxMessagesParams, HandleRestrictedEventParams, OpenAppParams, ReconnectAppParams, UpdatePreferredLocaleParams} from '@libs/API/parameters';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import clearWorkboxRecoveryCaches from '@libs/clearWorkboxRecoveryCaches';
 import {getLastFullReconnectTimeToRecord} from '@libs/FullReconnectUtils';
 import Log from '@libs/Log';
-import getCurrentUrl from '@libs/Navigation/currentUrl';
-import willRouteNavigateToRHP from '@libs/Navigation/helpers/willRouteNavigateToRHP';
-import WorkspaceCreationReveal from '@libs/Navigation/helpers/WorkspaceCreationReveal';
 import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
-import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import {isPublicRoom, isValidReport} from '@libs/ReportUtils';
 import {sanitizeUrlForLogging} from '@libs/sanitizeLogParams';
-import {isLoggingInAsNewUser as isLoggingInAsNewUserSessionUtils} from '@libs/SessionUtils';
 import {clearSoundAssetsCache} from '@libs/Sound';
 import {cancelAllSpans, endSpan, getSpan, startSpan} from '@libs/telemetry/activeSpans';
 import {logReceiptQueueSnapshot} from '@libs/telemetry/ReceiptObservability';
@@ -22,7 +15,6 @@ import CONST from '@src/CONST';
 import getPathFromState from '@src/libs/Navigation/helpers/getPathFromState';
 import type {OnyxKey} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type Locale from '@src/types/onyx/Locale';
@@ -33,16 +25,12 @@ import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 
 // Issue - https://github.com/Expensify/App/issues/26719
 import {findFocusedRoute} from '@react-navigation/native';
-import {Str} from 'expensify-common';
 import {AppState} from 'react-native';
 import Onyx from 'react-native-onyx';
 
-import type {PolicyOwner} from './Policy/Policy';
-
 import clearOnyxAndSeedFullReconnect from './clearOnyxAndSeedFullReconnect';
 import {setShouldForceOffline} from './Network';
 import {getAll, rollbackOngoingRequest, save} from './PersistedRequests';
-import {createDraftInitialWorkspace, createWorkspace, generateDefaultWorkspaceName, generatePolicyID} from './Policy/Policy';
 
 type PolicyParamsForOpenOrReconnect = {
     policyIDList: string[];
@@ -450,10 +438,16 @@ function openApp(shouldKeepPublicRooms = false, allReportsWithDraftComments?: Re
         }
         endSpan(CONST.TELEMETRY.SPAN_NAVIGATION.APP_OPEN);
     });
+    loadPersonalDetails();
 
     return openAppPromise;
 }
 
+function loadPersonalDetails() {
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method -- API.read would wait for OpenApp, so it cannot run in parallel
+    API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.LOAD_PERSONAL_DETAILS, null);
+}
+
 /**
  * Fetches data when the app reconnects to the network
  * @param [updateIDFrom] the ID of the Onyx update that we want to start fetching from
@@ -504,6 +498,9 @@ function reconnectApp(updateIDFrom: OnyxEntry<number> = 0) {
             }
             endSpan(CONST.TELEMETRY.SPAN_NAVIGATION.APP_OPEN);
         });
+        if (isFullReconnect) {
+            loadPersonalDetails();
+        }
 
         return reconnectAppPromise;
     });
@@ -591,339 +588,6 @@ function getMissingOnyxUpdates(updateIDFrom = 0, updateIDTo: number | string = 0
     return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES, parameters, getOnyxDataForOpenOrReconnect());
 }
 
-type PolicyType = typeof CONST.POLICY.TYPE.TEAM | typeof CONST.POLICY.TYPE.CORPORATE;
-
-type CreateWorkspaceWithPolicyDraftParams = {
-    isSelfTourViewed: boolean | undefined;
-    introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
-    policyOwner?: PolicyOwner;
-    policyName: string;
-    transitionFromOldDot?: boolean;
-    makeMeAdmin?: boolean;
-    backTo?: string;
-    policyID?: string;
-    currency: string;
-    file?: File;
-    routeToNavigateAfterCreate?: Route;
-    lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType;
-    activePolicy: OnyxEntry<OnyxTypes.Policy>;
-    conciergeChat: OnyxEntry<OnyxTypes.Report>;
-    currentUserAccountIDParam: number;
-    currentUserEmailParam: string;
-    shouldCreateControlPolicy?: boolean;
-    type?: PolicyType;
-    hasActiveAdminPolicies: boolean;
-    hasOwnedPaidPolicy: boolean;
-    isAnnualSubscription?: boolean;
-    /** AccountID of the delegate acting on behalf of the current user */
-    delegateAccountID: number | undefined;
-};
-
-/**
- * Create a new draft workspace and navigate to it
- */
-function createWorkspaceWithPolicyDraftAndNavigateToIt(params: CreateWorkspaceWithPolicyDraftParams) {
-    const {
-        introSelected,
-        policyOwner,
-        policyName,
-        transitionFromOldDot = false,
-        makeMeAdmin = false,
-        backTo = '',
-        policyID = '',
-        currency,
-        file,
-        routeToNavigateAfterCreate,
-        lastUsedPaymentMethod,
-        activePolicy,
-        conciergeChat,
-        currentUserAccountIDParam,
-        currentUserEmailParam,
-        shouldCreateControlPolicy,
-        type,
-        isSelfTourViewed,
-        hasActiveAdminPolicies,
-        hasOwnedPaidPolicy,
-        isAnnualSubscription = false,
-        delegateAccountID,
-    } = params;
-
-    const policyIDWithDefault = policyID || generatePolicyID();
-    createDraftInitialWorkspace({
-        introSelected,
-        workspaceName: policyName,
-        currentUserAccountID: currentUserAccountIDParam,
-        currentUserEmail: currentUserEmailParam,
-        currency,
-        policyID: policyIDWithDefault,
-        makeMeAdmin,
-        file,
-        type,
-    });
-    Navigation.isNavigationReady().then(() => {
-        if (transitionFromOldDot) {
-            // We must call goBack() to remove the /transition route from history
-            Navigation.goBack();
-        }
-        const routeToNavigate = routeToNavigateAfterCreate ?? ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithDefault, backTo);
-        savePolicyDraftByNewWorkspace({
-            policyID: policyIDWithDefault,
-            policyName,
-            policyOwner,
-            makeMeAdmin,
-            currency,
-            file,
-            lastUsedPaymentMethod,
-            introSelected,
-            activePolicy,
-            conciergeChat,
-            currentUserAccountIDParam,
-            currentUserEmailParam,
-            allReportsParam: allReports,
-            shouldCreateControlPolicy,
-            type,
-            isSelfTourViewed,
-            hasActiveAdminPolicies,
-            hasOwnedPaidPolicy,
-            isAnnualSubscription,
-            delegateAccountID,
-        });
-
-        if (transitionFromOldDot) {
-            Navigation.navigate(routeToNavigate);
-        } else if (Navigation.isTopmostRouteModalScreen()) {
-            // `revealRouteBeforeDismissingModal` only works for fullscreen targets. Modal targets
-            // (e.g. workspace confirmation success) still need to open after the current RHP closes.
-            if (willRouteNavigateToRHP(routeToNavigate)) {
-                Navigation.dismissModal({
-                    afterTransition: () => Navigation.navigate(routeToNavigate),
-                });
-                return;
-            }
-
-            WorkspaceCreationReveal.beginRevealUnderRHP();
-            Navigation.revealRouteBeforeDismissingModal(routeToNavigate);
-        } else {
-            Navigation.navigate(routeToNavigate, {forceReplace: true});
-        }
-    });
-}
-
-function createWorkspaceWithPolicyDraft(params: CreateWorkspaceWithPolicyDraftParams) {
-    const {
-        introSelected,
-        policyName,
-        makeMeAdmin = false,
-        policyID = '',
-        currency,
-        file,
-        lastUsedPaymentMethod,
-        activePolicy,
-        conciergeChat,
-        currentUserAccountIDParam,
-        currentUserEmailParam,
-        shouldCreateControlPolicy,
-        isSelfTourViewed,
-        hasActiveAdminPolicies,
-        delegateAccountID,
-        hasOwnedPaidPolicy,
-    } = params;
-
-    createDraftInitialWorkspace({
-        introSelected,
-        workspaceName: policyName,
-        currentUserAccountID: currentUserAccountIDParam,
-        currentUserEmail: currentUserEmailParam,
-        currency,
-        policyID,
-        makeMeAdmin,
-        file,
-    });
-    savePolicyDraftByNewWorkspace({
-        policyID,
-        policyName,
-        makeMeAdmin,
-        currency,
-        file,
-        lastUsedPaymentMethod,
-        introSelected,
-        activePolicy,
-        conciergeChat,
-        currentUserAccountIDParam,
-        currentUserEmailParam,
-        allReportsParam: allReports,
-        shouldCreateControlPolicy,
-        isSelfTourViewed,
-        hasActiveAdminPolicies,
-        delegateAccountID,
-        hasOwnedPaidPolicy,
-    });
-}
-
-type SavePolicyDraftByNewWorkspaceParams = {
-    isSelfTourViewed: boolean | undefined;
-    policyID?: string;
-    policyName: string;
-    policyOwner?: PolicyOwner;
-    makeMeAdmin?: boolean;
-    currency?: string;
-    file?: File;
-    lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType;
-    introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
-    activePolicy: OnyxEntry<OnyxTypes.Policy>;
-    conciergeChat: OnyxEntry<OnyxTypes.Report>;
-    currentUserAccountIDParam: number;
-    currentUserEmailParam: string;
-    allReportsParam: OnyxCollection<OnyxTypes.Report>;
-    shouldCreateControlPolicy?: boolean;
-    type?: PolicyType;
-    hasActiveAdminPolicies: boolean;
-    hasOwnedPaidPolicy: boolean;
-    isAnnualSubscription?: boolean;
-    delegateAccountID: number | undefined;
-};
-
-/**
- * Create a new workspace and delete the draft
- */
-function savePolicyDraftByNewWorkspace({
-    policyID,
-    policyName,
-    policyOwner,
-    makeMeAdmin = false,
-    currency = '',
-    file,
-    lastUsedPaymentMethod,
-    introSelected,
-    activePolicy,
-    conciergeChat,
-    currentUserAccountIDParam,
-    currentUserEmailParam,
-    allReportsParam,
-    shouldCreateControlPolicy,
-    type,
-    isSelfTourViewed,
-    hasActiveAdminPolicies,
-    hasOwnedPaidPolicy,
-    isAnnualSubscription = false,
-    delegateAccountID,
-}: SavePolicyDraftByNewWorkspaceParams) {
-    createWorkspace({
-        policyOwner,
-        makeMeAdmin,
-        policyName,
-        policyID,
-        engagementChoice: isTrackOnboardingChoice(introSelected?.choice) ? CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE : CONST.ONBOARDING_CHOICES.MANAGE_TEAM,
-        currency,
-        file,
-        lastUsedPaymentMethod,
-        introSelected,
-        activePolicy,
-        conciergeChat,
-        currentUserAccountIDParam,
-        currentUserEmailParam,
-        allReportsParam,
-        shouldCreateControlPolicy,
-        type,
-        isSelfTourViewed,
-        hasActiveAdminPolicies,
-        hasOwnedPaidPolicy,
-        isAnnualSubscription,
-        delegateAccountID,
-    });
-}
-
-/**
- * This action runs when the Navigator is ready and the current route changes
- *
- * currentPath should be the path as reported by the NavigationContainer
- *
- * The transition link contains an exitTo param that contains the route to
- * navigate to after the user is signed in. A user can transition from OldDot
- * with a different account than the one they are currently signed in with, so
- * we only navigate if they are not signing in as a new user. Once they are
- * signed in as that new user, this action will run again and the navigation
- * will occur.
-
- * When the exitTo route is 'workspace/new', we create a new
- * workspace and navigate to it
- */
-type SetUpPoliciesAndNavigateParams = {
-    session: OnyxEntry<OnyxTypes.Session>;
-    introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
-    currency: string;
-    activePolicy: OnyxEntry<OnyxTypes.Policy>;
-    isSelfTourViewed: boolean | undefined;
-    hasActiveAdminPolicies: boolean;
-    lastWorkspaceNumber: number | undefined;
-    translate: LocalizedTranslate;
-    conciergeChat: OnyxEntry<OnyxTypes.Report>;
-    policyOwnerAccountID: number | undefined;
-    policyOwnerDisplayName: string | undefined;
-    hasOwnedPaidPolicy: boolean;
-    delegateAccountID: number | undefined;
-};
-
-function setUpPoliciesAndNavigate({
-    session,
-    introSelected,
-    currency,
-    activePolicy,
-    isSelfTourViewed,
-    hasActiveAdminPolicies,
-    hasOwnedPaidPolicy,
-    lastWorkspaceNumber,
-    translate,
-    conciergeChat,
-    policyOwnerAccountID,
-    policyOwnerDisplayName,
-    delegateAccountID,
-}: SetUpPoliciesAndNavigateParams) {
-    const currentUrl = getCurrentUrl();
-    if (!session || !currentUrl?.includes('exitTo')) {
-        return;
-    }
-
-    const isLoggingInAsNewUser = !!session.email && isLoggingInAsNewUserSessionUtils(currentUrl, session.email);
-    const url = new URL(currentUrl);
-    const exitTo = url.searchParams.get('exitTo') as Route | null;
-
-    // Approved Accountants and Guides can enter a flow where they make a workspace for other users,
-    // and those are passed as a search parameter when using transition links
-    const policyOwnerEmail = url.searchParams.get('ownerEmail') ?? session.email ?? '';
-    const makeMeAdmin = !!url.searchParams.get('makeMeAdmin');
-    const policyName = url.searchParams.get('policyName') ?? '';
-
-    // Sign out the current user if we're transitioning with a different user
-    const isTransitioning = Str.startsWith(url.pathname, Str.normalizeUrl(ROUTES.TRANSITION_BETWEEN_APPS));
-
-    const shouldCreateFreePolicy = !isLoggingInAsNewUser && isTransitioning && exitTo === ROUTES.WORKSPACE_NEW;
-    if (shouldCreateFreePolicy) {
-        createWorkspaceWithPolicyDraftAndNavigateToIt({
-            introSelected,
-            currency,
-            policyOwner: {email: policyOwnerEmail, accountID: policyOwnerAccountID},
-            policyName: policyName || generateDefaultWorkspaceName(policyOwnerEmail, policyOwnerDisplayName, lastWorkspaceNumber, translate),
-            transitionFromOldDot: true,
-            makeMeAdmin,
-            activePolicy,
-            conciergeChat,
-            currentUserAccountIDParam: currentSessionData.accountID ?? CONST.DEFAULT_NUMBER_ID,
-            currentUserEmailParam: currentSessionData.email ?? '',
-            isSelfTourViewed,
-            hasActiveAdminPolicies,
-            delegateAccountID,
-            hasOwnedPaidPolicy,
-        });
-        return;
-    }
-    if (!isLoggingInAsNewUser && exitTo) {
-        Navigation.waitForProtectedRoutes().then(() => {
-            Navigation.navigate(exitTo);
-        });
-    }
-}
-
 function handleRestrictedEvent(eventName: string) {
     const parameters: HandleRestrictedEventParams = {eventName};
 
@@ -957,8 +621,9 @@ function clearOnyxAndResetApp(shouldNavigateToHomepage?: boolean) {
     const sequentialQueue = getAll();
 
     Navigation.clearPreloadedRoutes();
-    // Seed LAST_FULL_RECONNECT_TIME so subscribeToFullReconnect doesn't fire a duplicate
-    // ReconnectApp once the openApp() below lands NVP_RECONNECT_APP_IF_FULL_RECONNECT_BEFORE.
+    // The helper seeds the loading state and LAST_FULL_RECONNECT_TIME so consumers cannot evaluate transient
+    // post-clear state and subscribeToFullReconnect doesn't fire a duplicate ReconnectApp once the
+    // openApp() below lands NVP_RECONNECT_APP_IF_FULL_RECONNECT_BEFORE.
     const resetPromise = clearWorkboxRecoveryCaches().then(() =>
         clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE)
             .then(() => {
@@ -1033,7 +698,6 @@ export {
     setLocale,
     setSidebarLoaded,
     saveCurrentPathBeforeBackground,
-    setUpPoliciesAndNavigate,
     openApp,
     reconnectApp,
     loadPostDataForOpenOrReconnect,
@@ -1042,9 +706,7 @@ export {
     getMissingOnyxUpdates,
     finalReconnectAppAfterActivatingReliableUpdates,
     reconnectAppWithSideEffects,
-    createWorkspaceWithPolicyDraftAndNavigateToIt,
     updateLastVisitedPath,
-    createWorkspaceWithPolicyDraft,
     updateLastRoute,
     setIsUsingImportedState,
     clearOnyxAndResetApp,
diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts
index 637f61a402e2..05ffb257f766 100644
--- a/src/libs/actions/BankAccounts.ts
+++ b/src/libs/actions/BankAccounts.ts
@@ -1802,7 +1802,7 @@ function initiateBankAccountUnlock(bankAccountID: number, conciergeReportID: str
                       {
                           onyxMethod: Onyx.METHOD.MERGE,
                           key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeReportID}` as const,
-                          value: {[optimisticReportActionID]: {pendingAction: null}},
+                          value: {[optimisticReportActionID]: {pendingAction: null, isOptimisticAction: null}},
                       },
                   ]
                 : []),
diff --git a/src/libs/actions/Card.ts b/src/libs/actions/Card.ts
index ec5b1886c832..006e33721d3b 100644
--- a/src/libs/actions/Card.ts
+++ b/src/libs/actions/Card.ts
@@ -25,7 +25,7 @@ import type {
 } from '@libs/API/parameters';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import type {CardProgramKey} from '@libs/CardUtils';
-import {getTranslationKeyForLimitType} from '@libs/CardUtils';
+import {getDisplayedExpensifyCardLimitType, getTranslationKeyForLimitType} from '@libs/CardUtils';
 import {convertToShortDisplayString} from '@libs/CurrencyUtils';
 import DateUtils from '@libs/DateUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
@@ -1125,19 +1125,47 @@ function updateExpensifyCardTitle(workspaceAccountID: number, cardID: number, ne
     API.write(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_TITLE, parameters, {optimisticData, successData, failureData});
 }
 
-function updateExpensifyCardLimitType(
-    workspaceAccountID: number,
-    cardID: number,
-    newLimitType: CardLimitType,
-    timeZone: SelectedTimezone | undefined,
-    oldCardNameValuePairs?: Card['nameValuePairs'],
-    validFrom?: string,
-    validThru?: string,
-    shouldClearValidityDates?: boolean,
-) {
+type UpdateExpensifyCardLimitTypeActionParams = {
+    workspaceAccountID: number;
+    cardID: number;
+    newLimitType: CardLimitType;
+    timeZone?: SelectedTimezone;
+    oldCardNameValuePairs?: Card['nameValuePairs'];
+    validFrom?: string;
+    validThru?: string;
+    shouldClearValidityDates?: boolean;
+    /** Leave existing validity dates unchanged. Used by inline table edits. */
+    shouldSkipValidityDateUpdate?: boolean;
+};
+
+function updateExpensifyCardLimitType({
+    workspaceAccountID,
+    cardID,
+    newLimitType,
+    timeZone,
+    oldCardNameValuePairs,
+    validFrom,
+    validThru,
+    shouldClearValidityDates,
+    shouldSkipValidityDateUpdate = false,
+}: UpdateExpensifyCardLimitTypeActionParams) {
     const normalizedValidFrom = validFrom ? DateUtils.normalizeDateToStartOfDay(validFrom, timeZone) : undefined;
     const normalizedValidThru = validThru ? DateUtils.normalizeDateToEndOfDay(validThru, timeZone) : undefined;
 
+    const pendingFields = {
+        limitType: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+        ...(shouldSkipValidityDateUpdate
+            ? {}
+            : {
+                  validFrom: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                  validThru: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+              }),
+    };
+    const clearedPendingFields = {
+        limitType: null,
+        ...(shouldSkipValidityDateUpdate ? {} : {validFrom: null, validThru: null}),
+    };
+
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1146,13 +1174,13 @@ function updateExpensifyCardLimitType(
                 [cardID]: {
                     nameValuePairs: {
                         limitType: newLimitType,
-                        pendingFields: {
-                            limitType: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                            validFrom: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                            validThru: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                        },
-                        validFrom: shouldClearValidityDates ? null : normalizedValidFrom,
-                        validThru: shouldClearValidityDates ? null : normalizedValidThru,
+                        pendingFields,
+                        ...(shouldSkipValidityDateUpdate
+                            ? {}
+                            : {
+                                  validFrom: shouldClearValidityDates ? null : normalizedValidFrom,
+                                  validThru: shouldClearValidityDates ? null : normalizedValidThru,
+                              }),
                     },
                     pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                     pendingFields: {availableSpend: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
@@ -1171,7 +1199,7 @@ function updateExpensifyCardLimitType(
                 [cardID]: {
                     isLoading: false,
                     nameValuePairs: {
-                        pendingFields: {limitType: null, validFrom: null, validThru: null},
+                        pendingFields: clearedPendingFields,
                     },
                     pendingAction: null,
                     pendingFields: {availableSpend: null},
@@ -1188,9 +1216,13 @@ function updateExpensifyCardLimitType(
                 [cardID]: {
                     nameValuePairs: {
                         limitType: oldCardNameValuePairs?.limitType,
-                        validFrom: oldCardNameValuePairs?.validFrom,
-                        validThru: oldCardNameValuePairs?.validThru,
-                        pendingFields: {limitType: null, validFrom: null, validThru: null},
+                        pendingFields: clearedPendingFields,
+                        ...(shouldSkipValidityDateUpdate
+                            ? {}
+                            : {
+                                  validFrom: oldCardNameValuePairs?.validFrom,
+                                  validThru: oldCardNameValuePairs?.validThru,
+                              }),
                     },
                     pendingFields: {availableSpend: null},
                     pendingAction: null,
@@ -1204,9 +1236,13 @@ function updateExpensifyCardLimitType(
     const parameters: UpdateExpensifyCardLimitTypeParams = {
         cardID,
         limitType: newLimitType,
-        validFrom: normalizedValidFrom,
-        validThru: normalizedValidThru,
-        clearValidityDates: shouldClearValidityDates,
+        ...(shouldSkipValidityDateUpdate
+            ? {}
+            : {
+                  validFrom: normalizedValidFrom,
+                  validThru: normalizedValidThru,
+                  clearValidityDates: shouldClearValidityDates,
+              }),
     };
 
     API.write(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT_TYPE, parameters, {optimisticData, successData, failureData});
@@ -1974,13 +2010,16 @@ type ExportExpensifyCardListToCSVParams = {
     /** Settlement / card program currency for limit amounts */
     settlementCurrency: string;
 
+    /** Policy default limit type, used for cards that have none stored so the export matches the card list */
+    defaultLimitType: CardLimitType;
+
     translate: LocalizedTranslate;
 
     /** Formats a phone-number login for display in the current locale */
     formatPhoneNumber: LocaleContextProps['formatPhoneNumber'];
 };
 
-function exportExpensifyCardListToCSV({policyID, cards, personalDetailsList, settlementCurrency, translate, formatPhoneNumber}: ExportExpensifyCardListToCSVParams) {
+function exportExpensifyCardListToCSV({policyID, cards, personalDetailsList, settlementCurrency, defaultLimitType, translate, formatPhoneNumber}: ExportExpensifyCardListToCSVParams) {
     if (cards.length === 0) {
         return;
     }
@@ -2001,7 +2040,7 @@ function exportExpensifyCardListToCSV({policyID, cards, personalDetailsList, set
         const ownerNameColumn = getCardholderNameForCSV(card, personalDetailsList, translate, formatPhoneNumber);
         const lastFourColumn = card.lastFourPAN ?? '';
         const typeColumn = card.nameValuePairs?.isVirtual ? translate('workspace.expensifyCard.virtual') : translate('workspace.expensifyCard.physical');
-        const limitTypeColumn = translate(getTranslationKeyForLimitType(card.nameValuePairs?.limitType));
+        const limitTypeColumn = translate(getTranslationKeyForLimitType(getDisplayedExpensifyCardLimitType(card.nameValuePairs?.limitType, defaultLimitType)));
         const limitAmount = card.nameValuePairs?.unapprovedExpenseLimit ?? 0;
         const limitColumn = convertToShortDisplayString(limitAmount, settlementCurrency);
 
diff --git a/src/libs/actions/CompanyCards.ts b/src/libs/actions/CompanyCards.ts
index 5f1d57feb92a..4cd704248ba5 100644
--- a/src/libs/actions/CompanyCards.ts
+++ b/src/libs/actions/CompanyCards.ts
@@ -217,6 +217,10 @@ function clearAddNewCardFlow() {
     });
 }
 
+function clearAddNewCompanyCardErrors() {
+    Onyx.merge(ONYXKEYS.ADD_NEW_COMPANY_CARD, {errors: null});
+}
+
 function addNewCompanyCardsFeed(
     policyID: string | undefined,
     workspaceAccountID: number,
@@ -819,7 +823,7 @@ function updateCompanyCardName(domainOrWorkspaceAccountID: number, cardID: strin
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES,
-            value: {[cardID]: oldCardTitle},
+            value: {[cardID]: oldCardTitle ?? null},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1492,6 +1496,7 @@ export {
     clearCompanyCardErrorField,
     setAddNewCompanyCardStepAndData,
     clearAddNewCardFlow,
+    clearAddNewCompanyCardErrors,
     setAssignCardStepAndData,
     clearAssignCardStepAndData,
     openPolicyAddCardFeedPage,
diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index e51bbde3128b..22933490a251 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -61,18 +61,9 @@ const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [
     ONYXKEYS.PERSONAL_DETAILS_LIST,
 ];
 
-/**
- * Atomically reset Onyx for a delegate-access transition. The IS_LOADING_APP=true
- * seed is delegate-specific: without it, consumers observe HAS_LOADED_APP=true and
- * IS_LOADING_APP=undefined together, which looks like a stuck app and triggers
- * DelegateAccessHandler's recovery effect, queueing a duplicate openApp.
- *
- * The reconnect-time seed is handled by clearOnyxAndSeedFullReconnect.
- */
+/** Atomically reset Onyx for a delegate-access transition. */
 function clearOnyxForDelegateTransition(): Promise<void> {
-    return clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_DELEGATE_ACCESS, {
-        [ONYXKEYS.IS_LOADING_APP]: true,
-    });
+    return clearOnyxAndSeedFullReconnect(KEYS_TO_PRESERVE_DELEGATE_ACCESS);
 }
 
 type WithDelegatedAccess = {
@@ -161,7 +152,7 @@ function connect({email, delegatedAccess, credentials, session, activePolicyID,
     Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, credentials ?? {});
     Onyx.set(ONYXKEYS.STASHED_SESSION, session ?? {});
 
-    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT | typeof ONYXKEYS.IS_SWITCHING_TO_DELEGATOR>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
@@ -175,6 +166,11 @@ function connect({email, delegatedAccess, credentials, session, activePolicyID,
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.IS_SWITCHING_TO_DELEGATOR,
+            value: true,
+        },
     ];
 
     const successData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
@@ -193,7 +189,7 @@ function connect({email, delegatedAccess, credentials, session, activePolicyID,
         },
     ];
 
-    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT>> = [
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.ACCOUNT | typeof ONYXKEYS.IS_SWITCHING_TO_DELEGATOR>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
@@ -207,6 +203,11 @@ function connect({email, delegatedAccess, credentials, session, activePolicyID,
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.IS_SWITCHING_TO_DELEGATOR,
+            value: false,
+        },
     ];
 
     // We need to access the authToken directly from the response to update the session
diff --git a/src/libs/actions/EarlyRenewalOffer.ts b/src/libs/actions/EarlyRenewalOffer.ts
new file mode 100644
index 000000000000..45586ea26e93
--- /dev/null
+++ b/src/libs/actions/EarlyRenewalOffer.ts
@@ -0,0 +1,57 @@
+import {write} from '@libs/API';
+import type {AcceptEarlyRenewalOfferParams} from '@libs/API/parameters';
+import {WRITE_COMMANDS} from '@libs/API/types';
+import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type {OnyxUpdate} from 'react-native-onyx';
+
+import Onyx from 'react-native-onyx';
+
+/** Auth resets the eligibility on success, which removes the offer from Home and Subscription. */
+function acceptEarlyRenewalOffer(offerID: string) {
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY,
+            value: {
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                errors: null,
+            },
+        },
+    ];
+
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY,
+            value: {pendingAction: null},
+        },
+    ];
+
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY,
+            value: {
+                pendingAction: null,
+                errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+            },
+        },
+    ];
+
+    const parameters: AcceptEarlyRenewalOfferParams = {offerID};
+    write(WRITE_COMMANDS.ACCEPT_EARLY_RENEWAL_OFFER, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
+}
+
+function clearEarlyRenewalOfferErrors() {
+    Onyx.merge(ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY, {errors: null});
+}
+
+export {acceptEarlyRenewalOffer, clearEarlyRenewalOfferErrors};
diff --git a/src/libs/actions/HomePage.ts b/src/libs/actions/HomePage.ts
new file mode 100644
index 000000000000..4cb6ad07f733
--- /dev/null
+++ b/src/libs/actions/HomePage.ts
@@ -0,0 +1,9 @@
+import {read} from '@libs/API';
+import {READ_COMMANDS} from '@libs/API/types';
+
+/** Fetches the Home data that can change after the app has loaded, such as the early renewal offer. */
+function openHomePage() {
+    read(READ_COMMANDS.OPEN_HOME_PAGE, null);
+}
+
+export default openHomePage;
diff --git a/src/libs/actions/IOU/BulkEdit.ts b/src/libs/actions/IOU/BulkEdit.ts
index 72481035c3a2..0d32f1a489fc 100644
--- a/src/libs/actions/IOU/BulkEdit.ts
+++ b/src/libs/actions/IOU/BulkEdit.ts
@@ -33,6 +33,7 @@ import {
     getTaxValue,
     getUpdatedTransaction,
     isDistanceRequest,
+    isFailedScanAmountPlaceholder,
     isOnHold,
     isSplitChildTransaction,
     shouldShowAttendees,
@@ -129,7 +130,12 @@ function removeUnchangedBulkEditFields(
         const currentValue = currentDetails[field as keyof TransactionDetails];
 
         const hasChanged = field === CONST.EDIT_REQUEST_FIELD.ATTENDEES ? !deepEqual(nextValue, currentValue) : nextValue !== currentValue;
-        if (hasChanged) {
+        // A failed-scan placeholder amount must always be treated as changed so that bulk-confirming the same
+        // displayed value (e.g. re-entering 0) still submits and clears the scan-failure error, mirroring the
+        // no-op bypass already used in IOUAmountSubmission.ts and TotalCell.tsx.
+        const isFailedScanAmountEdit = field === 'amount' && isFailedScanAmountPlaceholder(transaction);
+
+        if (isFailedScanAmountEdit || hasChanged) {
             filteredChanges = {
                 ...filteredChanges,
                 [field]: nextValue,
@@ -329,33 +335,27 @@ function updateMultipleMoneyRequests({
         if (changes.category !== undefined && supportsExpenseFields && canEditField(CONST.EDIT_REQUEST_FIELD.CATEGORY)) {
             transactionChanges.category = changes.category;
         }
+
+        // Use bulkEditTagChanges to save tag changes. changes.tag is only for display.
         const editedTagIndexes = bulkEditTagChanges ? Object.keys(bulkEditTagChanges) : [];
-        if ((changes.tag || editedTagIndexes.length > 0) && supportsExpenseFields && canEditField(CONST.EDIT_REQUEST_FIELD.TAG)) {
-            if (editedTagIndexes.length > 0) {
-                // Rebuild the tag from THIS transaction's own tag so levels the user didn't touch are
-                // preserved, instead of overwriting every level with one shared common-prefix string.
-                // Apply each edited level in ascending order because editing a parent may clear its
-                // dependent children, and pass an empty currentTag so the selected value is always a
-                // fresh selection at that level rather than a per-transaction deselect.
-                const transactionPolicyTagList = policyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${transactionPolicy?.id}`];
-                const transactionHasDependentTags = hasDependentTags(transactionPolicy, transactionPolicyTagList);
-                const transactionHasMultipleTagLists = transactionPolicy?.hasMultipleTagLists ?? false;
-                let reconstructedTag = transaction.tag ?? '';
-                for (const editedIndex of editedTagIndexes.map(Number).sort((first, second) => first - second)) {
-                    reconstructedTag = getUpdatedTransactionTag({
-                        transactionTag: reconstructedTag,
-                        selectedTagName: bulkEditTagChanges?.[editedIndex] ?? '',
-                        currentTag: '',
-                        tagListIndex: editedIndex,
-                        policyTags: transactionPolicyTagList,
-                        hasDependentTags: transactionHasDependentTags,
-                        hasMultipleTagLists: transactionHasMultipleTagLists,
-                    });
-                }
-                transactionChanges.tag = reconstructedTag;
-            } else {
-                transactionChanges.tag = changes.tag;
+        if (editedTagIndexes.length > 0 && supportsExpenseFields && canEditField(CONST.EDIT_REQUEST_FIELD.TAG)) {
+            // Rebuild from each transaction's own tag to keep the unchanged levels. Apply each edited level in order.
+            const transactionPolicyTagList = policyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${transactionPolicy?.id}`];
+            const transactionHasDependentTags = hasDependentTags(transactionPolicy, transactionPolicyTagList);
+            const transactionHasMultipleTagLists = transactionPolicy?.hasMultipleTagLists ?? false;
+            let reconstructedTag = transaction.tag ?? '';
+            for (const editedIndex of editedTagIndexes.map(Number).sort((first, second) => first - second)) {
+                reconstructedTag = getUpdatedTransactionTag({
+                    transactionTag: reconstructedTag,
+                    selectedTagName: bulkEditTagChanges?.[editedIndex] ?? '',
+                    currentTag: '',
+                    tagListIndex: editedIndex,
+                    policyTags: transactionPolicyTagList,
+                    hasDependentTags: transactionHasDependentTags,
+                    hasMultipleTagLists: transactionHasMultipleTagLists,
+                });
             }
+            transactionChanges.tag = reconstructedTag;
         }
         if (changes.comment && canEditField(CONST.EDIT_REQUEST_FIELD.DESCRIPTION)) {
             transactionChanges.comment = getParsedComment(changes.comment);
diff --git a/src/libs/actions/IOU/DeleteMoneyRequest.ts b/src/libs/actions/IOU/DeleteMoneyRequest.ts
index 85c41fad56eb..6b19898ce3c9 100644
--- a/src/libs/actions/IOU/DeleteMoneyRequest.ts
+++ b/src/libs/actions/IOU/DeleteMoneyRequest.ts
@@ -48,7 +48,7 @@ import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxInputValue, OnyxUpdate}
 import cloneDeep from 'lodash/cloneDeep';
 import Onyx from 'react-native-onyx';
 
-import {getAllReportActionsFromIOU, getAllReportNameValuePairs, getAllReports, getAllTransactions, getAllTransactionViolations} from '.';
+import {getAllReportActionsFromIOU, getAllReportNameValuePairs, getAllTransactions, getAllTransactionViolations} from '.';
 import {getReportPreviewReportAction, maybeUpdateReportNameForFormulaTitle} from './MoneyRequestBuilder';
 import {getGroupPendingDeleteOnyxUpdate} from './SearchUpdate';
 
@@ -69,7 +69,7 @@ type PrepareToCleanUpMoneyRequestResult = {
 
 type DeleteMoneyRequestFunctionParams = {
     transactionID: string | undefined;
-    reportAction: OnyxTypes.ReportAction;
+    reportAction: OnyxTypes.ReportAction | undefined;
     transactions: OnyxCollection<OnyxTypes.Transaction>;
     violations: OnyxCollection<OnyxTypes.TransactionViolations>;
     iouReport: OnyxEntry<OnyxTypes.Report>;
@@ -95,7 +95,7 @@ type DeleteMoneyRequestFunctionParams = {
 
 type PrepareToCleanUpMoneyRequestParams = {
     transactionID: string;
-    reportAction: OnyxTypes.ReportAction;
+    reportAction: OnyxTypes.ReportAction | undefined;
     transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
     iouReport: OnyxEntry<OnyxTypes.Report>;
     iouReportTransactions?: OnyxTypes.Transaction[];
@@ -144,25 +144,29 @@ function prepareToCleanUpMoneyRequest({
     const shouldDeleteTransactionThread = !!transactionThreadReport?.reportID;
 
     // STEP 3: Update the IOU reportAction and decide if the iouReport should be deleted. We delete the iouReport if there are no visible comments left in the report.
-    const updatedReportAction = {
-        [reportAction.reportActionID]: {
-            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-            previousMessage: reportAction.message,
-            message: [
-                {
-                    type: 'COMMENT',
-                    html: '',
-                    text: '',
-                    isEdited: true,
-                    isDeletedParentAction: shouldDeleteTransactionThread,
-                },
-            ],
-            originalMessage: {
-                IOUTransactionID: shouldRemoveIOUTransactionID ? null : transactionID,
-            },
-            errors: null,
-        },
-    } as Record<string, NullishDeep<OnyxTypes.ReportAction>>;
+    const updatedReportAction = (
+        reportAction
+            ? {
+                  [reportAction.reportActionID]: {
+                      pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                      previousMessage: reportAction.message,
+                      message: [
+                          {
+                              type: 'COMMENT',
+                              html: '',
+                              text: '',
+                              isEdited: true,
+                              isDeletedParentAction: shouldDeleteTransactionThread,
+                          },
+                      ],
+                      originalMessage: {
+                          IOUTransactionID: shouldRemoveIOUTransactionID ? null : transactionID,
+                      },
+                      errors: null,
+                  },
+              }
+            : {}
+    ) as Record<string, NullishDeep<OnyxTypes.ReportAction>>;
 
     let canUserPerformWriteAction = true;
     if (chatReport) {
@@ -175,7 +179,7 @@ function prepareToCleanUpMoneyRequest({
     if (shouldDeleteIOUReport) {
         for (const [reportActionID, reportActionData] of Object.entries(iouReportActions ?? {})) {
             if (
-                reportAction.reportActionID === reportActionID ||
+                reportAction?.reportActionID === reportActionID ||
                 reportActionData.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
                 reportActionData.actionName === 'CREATED' ||
                 !reportActionData.message ||
@@ -186,7 +190,7 @@ function prepareToCleanUpMoneyRequest({
 
             updatedReportAction[reportActionID] = {
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                previousMessage: reportAction.message,
+                previousMessage: reportAction?.message,
                 message: [
                     {
                         type: 'COMMENT',
@@ -264,16 +268,9 @@ function prepareToCleanUpMoneyRequest({
     } else if (iouReport && !canEditTotal) {
         updatedIOUReport = {...iouReport};
     } else {
-        updatedIOUReport = updateIOUOwnerAndTotal(
-            iouReport,
-            reportAction.actorAccountID ?? CONST.DEFAULT_NUMBER_ID,
-            amountDiff,
-            currency,
-            true,
-            false,
-            isTransactionOnHold,
-            unheldAmountDiff,
-        );
+        // Without an IOU action, treat the report owner as the requester
+        const actorAccountID = reportAction ? reportAction.actorAccountID : iouReport?.ownerAccountID;
+        updatedIOUReport = updateIOUOwnerAndTotal(iouReport, actorAccountID ?? CONST.DEFAULT_NUMBER_ID, amountDiff, currency, true, false, isTransactionOnHold, unheldAmountDiff);
         // Match `updateIOUOwnerAndTotal`'s early-return guard so future refactors of that helper don't silently flip this flag.
         didUpdateOptimisticTotal = !!iouReport && currency === iouReport.currency;
     }
@@ -352,7 +349,7 @@ function prepareToCleanUpMoneyRequest({
  */
 function getNavigationUrlOnMoneyRequestDelete(
     transactionID: string | undefined,
-    reportAction: OnyxTypes.ReportAction,
+    reportAction: OnyxTypes.ReportAction | undefined,
     transactionThreadReport: OnyxEntry<OnyxTypes.Report>,
     iouReport: OnyxEntry<OnyxTypes.Report>,
     chatReport: OnyxEntry<OnyxTypes.Report>,
@@ -641,23 +638,32 @@ function getCleanUpTransactionThreadReportOnyxData({
     shouldAddUpdatedReportPreviewActionToOnyxData = true,
     currentUserAccountID,
     transactionThread: transactionThreadParam,
-    iouReport: iouReportParam,
-    chatReport: chatReportParam,
+    iouReport,
+    chatReport,
     transactionThreadReportActionsParam,
 }: {
     transactionThreadID?: string;
     shouldDeleteTransactionThread: boolean;
-    reportAction?: ReportAction;
     isChatIOUReportArchived?: boolean;
     updatedReportPreviewAction?: ReportAction;
     shouldAddUpdatedReportPreviewActionToOnyxData?: boolean;
     currentUserAccountID: number;
     transactionThread?: OnyxEntry<OnyxTypes.Report>;
-    iouReport?: OnyxEntry<OnyxTypes.Report>;
-    chatReport?: OnyxEntry<OnyxTypes.Report>;
     transactionThreadReportActionsParam?: OnyxEntry<OnyxTypes.ReportActions>;
-}) {
-    const allReports = getAllReports();
+} &
+    // IouReport and chatReport is required when reportAction is passed. As reportAction can be optional, this union gives better type check
+    (
+        | {
+              reportAction: ReportAction;
+              iouReport: OnyxEntry<OnyxTypes.Report>;
+              chatReport: OnyxEntry<OnyxTypes.Report>;
+          }
+        | {
+              reportAction?: undefined;
+              iouReport?: OnyxEntry<OnyxTypes.Report>;
+              chatReport?: OnyxEntry<OnyxTypes.Report>;
+          }
+    )) {
     const allReportNameValuePairs = getAllReportNameValuePairs();
 
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [];
@@ -668,7 +674,7 @@ function getCleanUpTransactionThreadReportOnyxData({
         let transactionThread = null;
         let transactionThreadReportActions = null;
         if (transactionThreadID) {
-            transactionThread = transactionThreadParam ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`] ?? null;
+            transactionThread = transactionThreadParam ?? null;
             transactionThreadReportActions = transactionThreadReportActionsParam ?? null;
         }
 
@@ -718,8 +724,6 @@ function getCleanUpTransactionThreadReportOnyxData({
 
     // Update the child comment visible count for reportPreviewAction.
     const iouReportID = isMoneyRequestAction(reportAction) ? reportAction?.reportID : undefined;
-    const iouReport = iouReportParam ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
-    const chatReport = chatReportParam ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`];
     const originalReportPreviewAction = getReportPreviewReportAction(chatReport?.reportID, iouReport?.reportID) ?? undefined;
     let reportPreviewAction = updatedReportPreviewAction ?? originalReportPreviewAction;
     if (
@@ -985,6 +989,9 @@ function deleteMoneyRequest({
         reportAction,
         isChatIOUReportArchived,
         currentUserAccountID,
+        transactionThread: transactionThreadReport,
+        iouReport,
+        chatReport,
         transactionThreadReportActionsParam: transactionThreadReportActions,
     });
     optimisticData.push(...cleanUpTransactionThreadReportOnyxData.optimisticData);
@@ -999,11 +1006,13 @@ function deleteMoneyRequest({
             : {
                   onyxMethod: Onyx.METHOD.MERGE,
                   key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
-                  value: {
-                      [reportAction.reportActionID]: {
-                          pendingAction: null,
-                      },
-                  },
+                  value: reportAction
+                      ? {
+                            [reportAction.reportActionID]: {
+                                pendingAction: null,
+                            },
+                        }
+                      : {},
               },
     ];
 
@@ -1057,7 +1066,7 @@ function deleteMoneyRequest({
     const originalReportActionsUpdate = {} as Record<string, Partial<OnyxTypes.ReportAction>>;
     if (shouldDeleteIOUReport) {
         for (const action of Object.values(iouReportActions ?? {})) {
-            if (action.reportActionID === reportAction.reportActionID) {
+            if (action.reportActionID === reportAction?.reportActionID) {
                 continue;
             }
             originalReportActionsUpdate[action.reportActionID] = {
@@ -1073,11 +1082,13 @@ function deleteMoneyRequest({
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
             value: {
                 ...originalReportActionsUpdate,
-                [reportAction.reportActionID]: {
-                    ...reportAction,
-                    pendingAction: null,
-                    errors: getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericDeleteFailureMessage', errorKey),
-                },
+                ...(reportAction && {
+                    [reportAction.reportActionID]: {
+                        ...reportAction,
+                        pendingAction: null,
+                        errors: getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericDeleteFailureMessage', errorKey),
+                    },
+                }),
             },
         });
 
@@ -1130,7 +1141,7 @@ function deleteMoneyRequest({
 
     const parameters: DeleteMoneyRequestParams = {
         transactionID,
-        reportActionID: reportAction.reportActionID,
+        reportActionID: reportAction?.reportActionID,
     };
 
     // A group row in a grouped search outlives its child transactions, so flagging the group's own snapshot entry
diff --git a/src/libs/actions/IOU/Duplicate.ts b/src/libs/actions/IOU/Duplicate.ts
index 83de6000ea0b..3e09a912d1b0 100644
--- a/src/libs/actions/IOU/Duplicate.ts
+++ b/src/libs/actions/IOU/Duplicate.ts
@@ -10,6 +10,7 @@ import {WRITE_COMMANDS} from '@libs/API/types';
 import DateUtils from '@libs/DateUtils';
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import {getExistingTransactionID} from '@libs/IOUUtils';
+import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import * as NumberUtils from '@libs/NumberUtils';
 import Parser from '@libs/Parser';
 import {getReimbursementChoice, isInstantSubmitEnabled, isPolicyAccessible, isSubmitAndClose} from '@libs/PolicyUtils';
@@ -66,10 +67,11 @@ import type {PerDiemExpenseInformation} from './PerDiem';
 import type {CreateDistanceRequestInformation} from './Split';
 import type {CreateTrackExpenseParams} from './TrackExpense';
 
-import {getAllTransactions, getCurrentUserAccountIDFromSession} from '.';
+import {getAllTransactions, getCurrentUserAccountIDFromSession, getIOUAndChatReportForIOUAction} from '.';
 import {getCleanUpTransactionThreadReportOnyxData} from './DeleteMoneyRequest';
 import {getMoneyRequestParticipantsFromReport} from './MoneyRequest';
 import {submitPerDiemExpense} from './PerDiem';
+import signalExpenseAddedGrowl from './signalExpenseAddedGrowl';
 import {createDistanceRequest} from './Split';
 import {requestMoney, trackExpense} from './TrackExpense';
 
@@ -306,9 +308,7 @@ function mergeDuplicates({
         for (const [index, iouAction] of actions.entries()) {
             const transactionThreadID = iouAction.childReportID;
             const transactionThread = allReportsList?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`];
-            const iouReportID = isMoneyRequestAction(iouAction) ? iouAction?.reportID : undefined;
-            const iouReport = allReportsList?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
-            const chatReport = allReportsList?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`];
+            const {chatReport, iouReport} = getIOUAndChatReportForIOUAction(iouAction, allReportsList);
             const cleanUp = getCleanUpTransactionThreadReportOnyxData({
                 transactionThreadID,
                 shouldDeleteTransactionThread: !!transactionThreadID,
@@ -1371,6 +1371,7 @@ function bulkDuplicateExpenses({
 
     // A copy of an unreported expense is tracked, so only an expense that lands on the report can submit it.
     const lastReportBoundIndex = targetPolicy ? transactionsToDuplicate.findLastIndex((t) => !!t.reportID && t.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID) : -1;
+    let lastDuplicateTransactionID: string | undefined;
 
     for (let i = 0; i < transactionsToDuplicate.length; i++) {
         const item = transactionsToDuplicate.at(i);
@@ -1442,6 +1443,9 @@ function bulkDuplicateExpenses({
         if (result?.iouReport) {
             optimisticIOUReport = result.iouReport;
         }
+        if (result?.transactionID) {
+            lastDuplicateTransactionID = result.transactionID;
+        }
 
         if (currentTargetReport && !currentTargetReport.iouReportID) {
             currentTargetReport = {...currentTargetReport, iouReportID: currentOptimisticIOUReportID};
@@ -1449,6 +1453,9 @@ function bulkDuplicateExpenses({
     }
 
     playSound(SOUNDS.DONE);
+    if (isSearchTopmostFullScreenRoute()) {
+        signalExpenseAddedGrowl(lastDuplicateTransactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    }
 }
 
 type BulkDuplicateReportsParams = {
diff --git a/src/libs/actions/IOU/Hold.ts b/src/libs/actions/IOU/Hold.ts
index db0a67b47519..af8ed7c87d6b 100644
--- a/src/libs/actions/IOU/Hold.ts
+++ b/src/libs/actions/IOU/Hold.ts
@@ -46,27 +46,36 @@ import Onyx from 'react-native-onyx';
 
 import {getAllReports, getAllTransactions} from '.';
 
-type PutOnHoldOptions = {
-    rules: OnyxCollection<OnyxTypes.Rule>;
-    ancestors?: Ancestor[];
-};
-
 /**
  * Put expense on HOLD
  */
-function putOnHold(
-    transactionID: string,
-    comment: string,
-    initialReportID: string | undefined,
-    isOffline: boolean,
-    currentUserLogin: string,
-    currentUserAccountID: number,
-    transactionViolations: OnyxEntry<OnyxTypes.TransactionViolations>,
-    isTrackIntentUser: boolean | undefined,
-    delegateAccountID: number | undefined,
-    {rules, ancestors = []}: PutOnHoldOptions,
-) {
-    const allTransactions = getAllTransactions();
+function putOnHold({
+    transactionID,
+    transaction,
+    comment,
+    initialReportID,
+    isOffline,
+    currentUserLogin,
+    currentUserAccountID,
+    transactionViolations,
+    isTrackIntentUser,
+    delegateAccountID,
+    rules,
+    ancestors = [],
+}: {
+    transactionID: string;
+    transaction: OnyxEntry<OnyxTypes.Transaction>;
+    comment: string;
+    initialReportID: string | undefined;
+    isOffline: boolean;
+    currentUserLogin: string;
+    currentUserAccountID: number;
+    transactionViolations: OnyxEntry<OnyxTypes.TransactionViolations>;
+    isTrackIntentUser: boolean | undefined;
+    delegateAccountID: number | undefined;
+    rules: OnyxCollection<OnyxTypes.Rule>;
+    ancestors?: Ancestor[];
+}) {
     const allReports = getAllReports();
 
     const currentTime = DateUtils.getDBTime();
@@ -75,7 +84,6 @@ function putOnHold(
     const createdReportActionComment = buildOptimisticHoldReportActionComment(comment, delegateAccountID, DateUtils.addMillisecondsFromDateTime(currentTime, 1));
     const newViolation = {name: CONST.VIOLATIONS.HOLD, type: CONST.VIOLATION_TYPES.VIOLATION, showInReview: true};
     const updatedViolations = [...(transactionViolations ?? []), newViolation];
-    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`];
     const iouAction = getIOUActionForReportID(transaction?.reportID, transactionID);
     let transactionThreadReport: OnyxTypes.Report;
@@ -354,22 +362,53 @@ function putOnHold(
     Navigation.setNavigationActionToMicrotaskQueue(() => notifyNewAction(currentReportID, undefined, true));
 }
 
-function putTransactionsOnHold(
-    transactionsID: string[],
-    comment: string,
-    reportID: string,
-    isOffline: boolean,
-    currentUserLogin: string,
-    currentUserAccountID: number,
-    allTransactionViolations: OnyxCollection<OnyxTypes.TransactionViolations>,
-    isTrackIntentUser: boolean | undefined,
-    delegateAccountID: number | undefined,
-    {rules, ancestors = []}: PutOnHoldOptions,
-) {
+function putTransactionsOnHold({
+    transactionsID,
+    comment,
+    reportID,
+    isOffline,
+    currentUserLogin,
+    currentUserAccountID,
+    allTransactionViolations,
+    transactions,
+    isTrackIntentUser,
+    delegateAccountID,
+    rules,
+    ancestors = [],
+}: {
+    transactionsID: string[];
+    comment: string;
+    reportID: string;
+    isOffline: boolean;
+    currentUserLogin: string;
+    currentUserAccountID: number;
+    allTransactionViolations: OnyxCollection<OnyxTypes.TransactionViolations>;
+    transactions: OnyxTypes.Transaction[];
+    isTrackIntentUser: boolean | undefined;
+    delegateAccountID: number | undefined;
+    rules: OnyxCollection<OnyxTypes.Rule>;
+    ancestors?: Ancestor[];
+}) {
+    const transactionsByID = new Map(transactions.map((t) => [t.transactionID, t]));
+
     for (const transactionID of transactionsID) {
         const {childReportID} = getIOUActionForReportID(reportID, transactionID) ?? {};
         const transactionViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
-        putOnHold(transactionID, comment, childReportID, isOffline, currentUserLogin, currentUserAccountID, transactionViolations, isTrackIntentUser, delegateAccountID, {rules, ancestors});
+        const transaction = transactionsByID.get(transactionID);
+        putOnHold({
+            transactionID,
+            transaction,
+            comment,
+            initialReportID: childReportID,
+            isOffline,
+            currentUserLogin,
+            currentUserAccountID,
+            transactionViolations,
+            isTrackIntentUser,
+            delegateAccountID,
+            rules,
+            ancestors,
+        });
     }
 }
 
diff --git a/src/libs/actions/IOU/MoneyRequest.ts b/src/libs/actions/IOU/MoneyRequest.ts
index 3bf01009563e..794a08ee9e93 100644
--- a/src/libs/actions/IOU/MoneyRequest.ts
+++ b/src/libs/actions/IOU/MoneyRequest.ts
@@ -338,6 +338,7 @@ type InitMoneyRequestParams = {
     report: OnyxEntry<Report>;
     parentReport: OnyxEntry<Report>;
     currentDate: string | undefined;
+    overrideCurrency?: string;
     lastSelectedDistanceRates?: OnyxEntry<LastSelectedDistanceRates>;
     isTrackDistanceExpense?: boolean;
     hasOnlyPersonalPolicies: boolean;
@@ -368,6 +369,7 @@ function initMoneyRequest({
     report,
     parentReport,
     currentDate,
+    overrideCurrency,
     lastSelectedDistanceRates,
     hasOnlyPersonalPolicies,
     draftTransactionIDs,
@@ -375,7 +377,7 @@ function initMoneyRequest({
 }: InitMoneyRequestParams) {
     // Generate a brand new transactionID
     const newTransactionID = CONST.IOU.OPTIMISTIC_TRANSACTION_ID;
-    const currency = policy?.outputCurrency ?? personalPolicy?.outputCurrency ?? CONST.CURRENCY.USD;
+    const currency = overrideCurrency ?? policy?.outputCurrency ?? personalPolicy?.outputCurrency ?? CONST.CURRENCY.USD;
 
     const created = currentDate ?? format(new Date(), 'yyyy-MM-dd');
 
diff --git a/src/libs/actions/IOU/MoneyRequestBuilder.ts b/src/libs/actions/IOU/MoneyRequestBuilder.ts
index 5ef2ccad87a9..ed0df998d921 100644
--- a/src/libs/actions/IOU/MoneyRequestBuilder.ts
+++ b/src/libs/actions/IOU/MoneyRequestBuilder.ts
@@ -14,6 +14,7 @@ import {rand64} from '@libs/NumberUtils';
 import {buildPersonalDetailsUpdate} from '@libs/PersonalDetailsUtils';
 import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
 import {getDistanceRateCustomUnit, getReimbursementChoice, hasDependentTags, isGroupPolicy} from '@libs/PolicyUtils';
+import ReceiptStorage from '@libs/ReceiptStorage';
 import {getOriginalMessage, getReportActionHtml, getReportActionText, isReportPreviewAction} from '@libs/ReportActionsUtils';
 import type {OptimisticChatReport, OptimisticCreatedReportAction, OptimisticIOUReportAction} from '@libs/ReportUtils';
 import {
@@ -460,7 +461,9 @@ function buildOnyxDataForTestDriveIOU(
 
 function getTransactionWithPreservedLocalReceiptSource(transaction: OnyxTypes.Transaction, isScanRequest: boolean): OnyxTypes.Transaction {
     if (isScanRequest && isLocalFile(transaction.receipt?.source)) {
-        return {...transaction, receipt: {...transaction.receipt, localSource: String(transaction.receipt?.source)}};
+        const localSource = String(transaction.receipt?.source);
+        ReceiptStorage.retain(localSource);
+        return {...transaction, receipt: {...transaction.receipt, localSource}};
     }
     return transaction;
 }
diff --git a/src/libs/actions/IOU/NavigationHelpers.ts b/src/libs/actions/IOU/NavigationHelpers.ts
deleted file mode 100644
index 913a80c8a8eb..000000000000
--- a/src/libs/actions/IOU/NavigationHelpers.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopmostSplitNavigator';
-import navigateAfterExpenseCreate from '@libs/Navigation/helpers/navigateAfterExpenseCreate';
-
-import {mergeTransactionIdsHighlightOnSearchRoute} from '@userActions/Transaction';
-
-import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
-
-import {getAllTransactions} from './index';
-
-/**
- * Marks a transaction for highlight on the Search page when the expense was created
- * from the global create button and the user is not on the Inbox tab.
- */
-function highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate: boolean | undefined, transactionID: string | undefined, dataType: SearchDataTypes) {
-    if (!isFromGlobalCreate || isReportTopmostSplitNavigator() || !transactionID) {
-        return;
-    }
-    mergeTransactionIdsHighlightOnSearchRoute(dataType, {[transactionID]: true});
-}
-
-/**
- * Helper to navigate after an expense is created in order to standardize the post‑creation experience
- * when creating an expense from the global create button.
- * If the expense is created from the global create button then:
- * - If it is created on the inbox tab, it will open the chat report containing that expense.
- * - If it is created elsewhere, it will navigate to Reports > Expense and highlight the newly created expense.
- */
-function handleNavigateAfterExpenseCreate({
-    activeReportID,
-    transactionID,
-    isFromGlobalCreate,
-    isInvoice,
-    shouldAddPendingNewTransactionIDs = false,
-    shouldNavigate = true,
-}: {
-    activeReportID?: string;
-    transactionID?: string;
-    isFromGlobalCreate?: boolean;
-    isInvoice?: boolean;
-    shouldAddPendingNewTransactionIDs?: boolean;
-    shouldNavigate?: boolean;
-}) {
-    const hasMultipleTransactions = Object.values(getAllTransactions()).filter((transaction) => transaction?.reportID === activeReportID).length > 0;
-    navigateAfterExpenseCreate({activeReportID, transactionID, isFromGlobalCreate, isInvoice, hasMultipleTransactions, shouldAddPendingNewTransactionIDs, shouldNavigate});
-}
-
-export {handleNavigateAfterExpenseCreate, highlightTransactionOnSearchRouteIfNeeded};
diff --git a/src/libs/actions/IOU/PayMoneyRequest.ts b/src/libs/actions/IOU/PayMoneyRequest.ts
index 680d75654b37..99c9210f4a54 100644
--- a/src/libs/actions/IOU/PayMoneyRequest.ts
+++ b/src/libs/actions/IOU/PayMoneyRequest.ts
@@ -226,8 +226,6 @@ function getPayMoneyRequestParams({
             conciergeChat,
             companySize: introSelected?.companySize as OnboardingCompanySize,
             isSelfTourViewed,
-            // hasActiveAdminPolicies is only needed if lastUsedPaymentMethod is passed
-            hasActiveAdminPolicies: undefined,
             delegateAccountID,
             // This workspace is created by the invoice payment command, which does not apply CreatePolicy's
             // paid-workspace check, so the #admins room keeps starting out pinned here.
diff --git a/src/libs/actions/IOU/PerDiem.ts b/src/libs/actions/IOU/PerDiem.ts
index 29423ffc82f0..100373b9eb71 100644
--- a/src/libs/actions/IOU/PerDiem.ts
+++ b/src/libs/actions/IOU/PerDiem.ts
@@ -68,8 +68,8 @@ import {
     mergePolicyRecentlyUsedCategories,
     mergePolicyRecentlyUsedCurrencies,
 } from './MoneyRequestBuilder';
-import {highlightTransactionOnSearchRouteIfNeeded} from './NavigationHelpers';
 import resolveWriteBarrier from './resolveWriteBarrier';
+import signalExpenseAddedGrowl from './signalExpenseAddedGrowl';
 
 function removeSubrate(transaction: OnyxEntry<OnyxTypes.Transaction>, currentIndex: string) {
     // Index comes from the route params and is a string
@@ -1199,7 +1199,9 @@ function submitPerDiemExpense(submitPerDiemExpenseInformation: PerDiemExpenseInf
         {onWriteStarted: () => notifyNewAction(notifyReportID ?? chatReport.reportID, undefined, participantParams.payeeAccountID === currentUserAccountIDParam)},
     );
 
-    highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, transaction.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    if (isFromGlobalCreate) {
+        signalExpenseAddedGrowl(transaction.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    }
 
     return {iouReport, transactionID: transaction.transactionID};
 }
@@ -1222,7 +1224,7 @@ function submitPerDiemExpenseForSelfDM(submitPerDiemExpenseInformation: PerDiemE
         getCurrencyDecimals,
         writeBarrier,
     } = submitPerDiemExpenseInformation;
-    const {currency, comment = '', category, tag, created, customUnit, attendees, billable, reimbursable} = transactionParams;
+    const {currency, comment = '', category, tag, created, customUnit, attendees, billable, reimbursable, isFromGlobalCreate} = transactionParams;
 
     if (isEmptyObject(policy) || !hasCompletePerDiemCustomUnit(customUnit)) {
         return;
@@ -1282,6 +1284,10 @@ function submitPerDiemExpenseForSelfDM(submitPerDiemExpenseInformation: PerDiemE
         resolveWriteBarrier({writeBarrier, optimisticWatchKey: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`}),
         {onWriteStarted: () => notifyNewAction(chatReport.reportID, undefined, true)},
     );
+
+    if (isFromGlobalCreate) {
+        signalExpenseAddedGrowl(transaction.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    }
 }
 
 export {
diff --git a/src/libs/actions/IOU/Receipt.ts b/src/libs/actions/IOU/Receipt.ts
index d454e683772a..d8849726b19b 100644
--- a/src/libs/actions/IOU/Receipt.ts
+++ b/src/libs/actions/IOU/Receipt.ts
@@ -22,7 +22,7 @@ import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type {SearchResultDataType} from '@src/types/onyx/SearchResults';
-import type {ReceiptSource} from '@src/types/onyx/Transaction';
+import type {Receipt, ReceiptSource} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {NullishDeep, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
@@ -407,9 +407,12 @@ function replaceReceipt({
         );
     }
 
+    const receipt: Receipt = file;
+    receipt.source = source;
+
     const parameters: ReplaceReceiptParams = {
         transactionID,
-        receipt: file,
+        receipt,
         receiptState: state,
         isSameReceipt,
         reportActionID: optimisticReceiptAddedAction?.reportActionID,
@@ -429,6 +432,7 @@ function setMoneyRequestReceipt(
     thumbnail?: string,
     receiptTraceId?: string,
 ) {
+    ReceiptStorage.retain(source);
     Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
         // isTestReceipt = false and isTestDriveReceipt = false are being converted to null because we don't really need to store it in Onyx in those cases
         receipt: {source, filename, type: type ?? '', isTestReceipt: isTestReceipt ? true : null, isTestDriveReceipt: isTestDriveReceipt ? true : null, thumbnail, receiptTraceId},
diff --git a/src/libs/actions/IOU/SearchUpdate.ts b/src/libs/actions/IOU/SearchUpdate.ts
index 3e3ef95cf906..2a19d175e85e 100644
--- a/src/libs/actions/IOU/SearchUpdate.ts
+++ b/src/libs/actions/IOU/SearchUpdate.ts
@@ -18,7 +18,7 @@ import type {NullishDeep, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 
 import Onyx from 'react-native-onyx';
 
-import {getAllSnapshots, getCurrentUserPersonalDetails, getSearchQueryByHash} from './index';
+import {getAllSnapshots, getCurrentUserPersonalDetails} from './index';
 
 type ExpenseReportStatusPredicate = (expenseReport: OnyxEntry<OnyxTypes.Report>, transactionReportID?: string) => boolean;
 
@@ -124,9 +124,9 @@ function shouldOptimisticallyUpdateSearch(
 
 /**
  * The default Spend > Expenses and Reports pages render from the canned suggested-search snapshots
- * (`type:expense` / `type:expense_report`). Those hashes are normally added to SEARCH_QUERY_BY_HASH
- * only as a side effect of the `search()` action when the page is actually opened (see Search.ts).
- * If the user never opened the page before going offline, that hash is absent from the map, so the
+ * (`type:expense` / `type:expense_report`). Those snapshots normally get their `search.inputQuery`
+ * only from the `search()` action when the page is actually opened (see Search.ts).
+ * If the user never opened the page before going offline, that snapshot has no recorded query, so the
  * fan-out loop in `getSearchOnyxUpdate` never patches the snapshot the page reads and it stays empty.
  *
  * These canned queries are deterministic and don't depend on a visit, so we register their hashes here
@@ -187,8 +187,11 @@ function getSearchOnyxUpdate({
         ...transaction,
         // Onyx.merge can't clear a key by spreading `undefined`, so a stale snapshot `modifiedMerchant` (e.g. the
         // `(none)`/`Expense` placeholder a self-DM split inherits) would win over `merchant` in `isMerchantMissing`
-        // and show a false "Missing Merchant". Clear it with `null` unless it's a genuine user edit (#99500).
-        modifiedMerchant: hasGenuineModifiedMerchant ? transaction.modifiedMerchant : null,
+        // and show a false "Missing Merchant". Clear it with `''` unless it's a genuine user edit (#99500).
+        modifiedMerchant: hasGenuineModifiedMerchant ? transaction.modifiedMerchant : '',
+        modifiedAmount: transaction.modifiedAmount ?? '',
+        modifiedCurrency: transaction.modifiedCurrency ?? '',
+        modifiedCreated: transaction.modifiedCreated ?? transaction.created,
     };
     if (policy) {
         baseSnapshotData[`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`] = policy;
@@ -339,13 +342,26 @@ function getSearchOnyxUpdate({
 
     // 2. Update every other loaded snapshot whose recorded query also matches this transaction.
     //    This catches cases like creating an expense from a chat while a `from:<me>` filter or
-    //    `groupBy:from` view is loaded but not the currently active search. The hash→query map is
-    //    stored in a dedicated Onyx key (not on the snapshot) so SEARCH API responses can't wipe it.
-    //    The deterministic default canned hashes (see getDefaultSearchQueriesByHash) are merged in so the
-    //    default Spend > Expenses / Reports pages are patched even when they were never visited. Onyx-recorded
+    //    `groupBy:from` view is loaded but not the currently active search. Each snapshot records the
+    //    query it was searched with in `search.inputQuery` (see Search.ts), so an evicted snapshot drops out on its own.
+    //    The deterministic default canned hashes (see getDefaultSearchQueriesByHash) are also patched so the
+    //    default Spend > Expenses / Reports pages are patched even when they were never visited. Recorded
     //    queries take precedence so a real visited entry is never shadowed by the canned default.
-    const queryByHash = {...getDefaultSearchQueriesByHash(), ...getSearchQueryByHash()};
-    for (const [hashString, queryString] of Object.entries(queryByHash)) {
+    const defaultQueriesByHash = getDefaultSearchQueriesByHash();
+    const snapshotPrefixLength = ONYXKEYS.COLLECTION.SNAPSHOT.length;
+    for (const [snapshotKey, snapshot] of Object.entries(allSnapshots)) {
+        const inputQuery = snapshot?.search?.inputQuery;
+        if (!inputQuery) {
+            continue;
+        }
+        delete defaultQueriesByHash[snapshotKey.slice(snapshotPrefixLength)];
+        const queryJSON = buildSearchQueryJSON(inputQuery);
+        if (!queryJSON) {
+            continue;
+        }
+        writeForQuery(queryJSON, snapshot);
+    }
+    for (const [hashString, queryString] of Object.entries(defaultQueriesByHash)) {
         if (!queryString) {
             continue;
         }
diff --git a/src/libs/actions/IOU/SendInvoice.ts b/src/libs/actions/IOU/SendInvoice.ts
index 15fdd2b74b97..a7d479a61134 100644
--- a/src/libs/actions/IOU/SendInvoice.ts
+++ b/src/libs/actions/IOU/SendInvoice.ts
@@ -45,9 +45,9 @@ import type BasePolicyParams from './types/BasePolicyParams';
 
 import {getAllPersonalDetails} from '.';
 import {getReceiptError, mergePolicyRecentlyUsedCategories, mergePolicyRecentlyUsedCurrencies} from './MoneyRequestBuilder';
-import {highlightTransactionOnSearchRouteIfNeeded} from './NavigationHelpers';
 import resolveWriteBarrier from './resolveWriteBarrier';
 import {getSearchOnyxUpdate} from './SearchUpdate';
+import signalExpenseAddedGrowl from './signalExpenseAddedGrowl';
 
 type SendInvoiceInformation = {
     senderWorkspaceID: string | undefined;
@@ -876,7 +876,9 @@ function sendInvoice({
         onWriteStarted: () => notifyNewAction(invoiceRoom.reportID, undefined, true),
     });
 
-    highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, transactionID, CONST.SEARCH.DATA_TYPES.INVOICE);
+    if (isFromGlobalCreate) {
+        signalExpenseAddedGrowl(transactionID, CONST.SEARCH.DATA_TYPES.INVOICE);
+    }
 }
 
 export {getReceiverType, getSendInvoiceInformation, sendInvoice};
diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts
index c678691e4142..eb7636d81ede 100644
--- a/src/libs/actions/IOU/Split.ts
+++ b/src/libs/actions/IOU/Split.ts
@@ -87,9 +87,9 @@ import {
     mergePolicyRecentlyUsedCategories,
     mergePolicyRecentlyUsedCurrencies,
 } from './MoneyRequestBuilder';
-import {highlightTransactionOnSearchRouteIfNeeded} from './NavigationHelpers';
 import {addPendingNewTransactionIDs, isOneToTwoTransactionTransition} from './PendingNewTransactions';
 import resolveWriteBarrier from './resolveWriteBarrier';
+import signalExpenseAddedGrowl from './signalExpenseAddedGrowl';
 
 type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
 
@@ -2378,7 +2378,9 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
         {onWriteStarted: isMoneyRequestReport ? undefined : () => notifyNewAction(activeReportID, undefined, true)},
     );
 
-    highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, parameters.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    if (isFromGlobalCreate && iouType !== CONST.IOU.TYPE.SPLIT) {
+        signalExpenseAddedGrowl(parameters.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    }
 
     return {iouReport: distanceIouReport, chatReportID: parameters.chatReportID, transactionID: parameters.transactionID};
 }
diff --git a/src/libs/actions/IOU/SplitExpenseItems.ts b/src/libs/actions/IOU/SplitExpenseItems.ts
index d403d3d8870d..673025b85888 100644
--- a/src/libs/actions/IOU/SplitExpenseItems.ts
+++ b/src/libs/actions/IOU/SplitExpenseItems.ts
@@ -78,13 +78,14 @@ function getDistanceMerchantFromDistance(
  *
  * When the field is not locked (the two "default" modes), the split keeps inheriting the parent's value.
  *
- * Managed-card transactions are always non-reimbursable and their reimbursable control is hidden in the split
- * editor, so they must stay `false` even under a locked "Always reimbursable" policy. Otherwise the split
- * would be submitted as reimbursable with no way for the user to correct it.
+ * Managed-card transactions always inherit the parent's value. The workspace "Always …" modes only apply to cash
+ * expenses, while a card expense's reimbursable value is set at import by the card feed's reimbursable preference.
+ * Their reimbursable control is hidden in the split editor, so the split must keep that stored value rather than
+ * the policy default or a hardcoded `false`.
  */
 function getSplitReimbursable(policy: OnyxEntry<OnyxTypes.Policy>, parentReimbursable: boolean | undefined, transaction: OnyxEntry<OnyxTypes.Transaction>): boolean | undefined {
     if (isManagedCardTransaction(transaction)) {
-        return false;
+        return parentReimbursable;
     }
     if (policy?.disabledFields?.reimbursable === true) {
         return policy.defaultReimbursable;
diff --git a/src/libs/actions/IOU/SplitTransactionUpdate.ts b/src/libs/actions/IOU/SplitTransactionUpdate.ts
index 4311e3cbcb88..cf648a8f364d 100644
--- a/src/libs/actions/IOU/SplitTransactionUpdate.ts
+++ b/src/libs/actions/IOU/SplitTransactionUpdate.ts
@@ -46,7 +46,6 @@ import {
     navigateBackOnDeleteTransaction,
     updateOptimisticParentReportAction,
 } from '@libs/ReportUtils';
-import {getCurrentSearchQueryJSON} from '@libs/SearchQueryUtils';
 import {isTracking, setPendingSubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
 import {
     getChildTransactions,
@@ -57,7 +56,6 @@ import {
 } from '@libs/TransactionUtils';
 
 import {setDeleteTransactionNavigateBackUrl} from '@userActions/Report';
-import {mergeTransactionIdsHighlightOnSearchRoute} from '@userActions/Transaction';
 import {removeDraftSplitTransaction} from '@userActions/TransactionEdit';
 
 import CONST from '@src/CONST';
@@ -81,9 +79,10 @@ import type {BuildOnyxDataForMoneyRequestKeys, MoneyRequestInformationParams} fr
 import type {UpdateMoneyRequestDataKeys} from './UpdateMoneyRequest';
 
 import {getCleanUpTransactionThreadReportOnyxData} from './DeleteMoneyRequest';
-import {getAllReports} from './index';
+import {getAllReports, getIOUAndChatReportForIOUAction} from './index';
 import {getMoneyRequestParticipantsFromReport} from './MoneyRequest';
 import {getMoneyRequestInformation, getReportPreviewReportAction} from './MoneyRequestBuilder';
+import signalExpenseAddedGrowl from './signalExpenseAddedGrowl';
 import {getDeleteTrackExpenseInformation} from './TrackExpense';
 import {getUpdateMoneyRequestParams} from './UpdateMoneyRequest';
 
@@ -1423,18 +1422,22 @@ function updateSplitTransactions({
             reportAction: currentReportAction,
             isChatReportArchived: undefined,
             currentUserAccountID: currentUserPersonalDetails.accountID,
+            transactionThread: allReportsList?.[`${ONYXKEYS.COLLECTION.REPORT}${currentReportAction?.childReportID}`],
             transactionThreadReportActions: allReportActionsList?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentReportAction?.childReportID}`],
             shouldRemoveIOUTransaction: isReportArchived || undeletedTransaction?.transactionID === forceDeleteSplitTransactionID,
         });
 
         // getDeleteTrackExpenseInformation only handles deleting the transaction report thread, so we need to update the report preview action here
         if (originalReportPreviewAction) {
+            const {iouReport: currentActionIOUReport, chatReport: currentActionChatReport} = getIOUAndChatReportForIOUAction(currentReportAction, allReportsList);
             const cleanUpTransactionThreadReportOnyxData = getCleanUpTransactionThreadReportOnyxData({
                 shouldDeleteTransactionThread: false,
                 reportAction: currentReportAction,
                 updatedReportPreviewAction: (updatedReportPreviewAction ?? originalReportPreviewAction) as OnyxTypes.ReportAction,
                 shouldAddUpdatedReportPreviewActionToOnyxData: false,
                 currentUserAccountID: currentUserPersonalDetails.accountID,
+                iouReport: currentActionIOUReport,
+                chatReport: currentActionChatReport,
                 // shouldDeleteTransactionThread is false, so the transaction-thread report actions are never read here.
                 transactionThreadReportActionsParam: undefined,
             });
@@ -1680,6 +1683,7 @@ function updateSplitTransactions({
                         },
                     }),
                 };
+                const {iouReport: iouActionIOUReport, chatReport: iouActionChatReport} = getIOUAndChatReportForIOUAction(iouActionToCleanUp, allReportsList);
 
                 const {optimisticData, successData, failureData} = getCleanUpTransactionThreadReportOnyxData({
                     transactionThreadID: iouActionToCleanUp.childReportID,
@@ -1687,6 +1691,9 @@ function updateSplitTransactions({
                     reportAction: iouActionToCleanUp,
                     updatedReportPreviewAction: updatedReportPreviewAction as OnyxTypes.ReportAction,
                     currentUserAccountID: currentUserPersonalDetails.accountID,
+                    transactionThread: allReportsList?.[`${ONYXKEYS.COLLECTION.REPORT}${iouActionToCleanUp.childReportID}`],
+                    iouReport: iouActionIOUReport,
+                    chatReport: iouActionChatReport,
                     transactionThreadReportActionsParam: allReportActionsList?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouActionToCleanUp.childReportID}`],
                 });
 
@@ -2118,34 +2125,13 @@ function updateSplitTransactionsFromSplitExpensesFlow(params: UpdateSplitTransac
 
     const targetReportID = params.expenseReport?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);
 
-    // Register newly created split transaction IDs so they briefly highlight on the Search/Spend page.
-    // The Search page reads TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE, which highlights matching rows
-    // optimistically without waiting for a server re-search. Unlike the auto-detect path in
-    // useSearchHighlightAndScroll (skipped while offline), this makes the highlight work offline too.
-    // Reverse splits create no new transactions, and existing children are already in the list, so both are skipped.
-    function registerSearchRouteHighlight() {
-        if (!isSearchPageTopmostFullScreenRoute || isReverseSplitOperation) {
-            return;
-        }
-        const currentSearchType = getCurrentSearchQueryJSON()?.type;
-        if (!currentSearchType) {
-            return;
-        }
-        const newTransactionIDsToHighlight: Record<string, boolean> = {};
-        for (const transactionID of getNewSplitTransactionIDs()) {
-            newTransactionIDsToHighlight[transactionID] = true;
-        }
-        if (isEmptyObject(newTransactionIDsToHighlight)) {
-            return;
-        }
-        mergeTransactionIdsHighlightOnSearchRoute(currentSearchType, newTransactionIDsToHighlight);
-    }
-
     if (isSearchPageTopmostFullScreenRoute || !params.transactionReport?.parentReportID) {
-        registerSearchRouteHighlight();
         // Returns to Search, not the expense report, so rail flags would sit unconsumed and highlight stale rows the
-        // next time that report is opened from the Inbox. registerSearchRouteHighlight above covers this page instead.
+        // next time that report is opened from the Inbox.
         updateSplitTransactions({...params, isFromSplitExpensesFlow: true, shouldSkipReportHighlightRail: true});
+        if (isSearchPageTopmostFullScreenRoute && !isReverseSplitOperation) {
+            signalExpenseAddedGrowl(getNewSplitTransactionIDs().at(-1), CONST.SEARCH.DATA_TYPES.EXPENSE);
+        }
 
         if (!isSelfDMSplit) {
             Navigation.navigateBackToLastSuperWideRHPScreen();
@@ -2189,11 +2175,16 @@ function updateSplitTransactionsFromSplitExpensesFlow(params: UpdateSplitTransac
         setPendingSubmitFollowUpAction(CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.DISMISS_MODAL_AND_OPEN_REPORT, targetReportID);
     }
 
+    // When the transaction thread is the topmost report (e.g. it was opened directly from the "Expense added" growl,
+    // without the expense report beneath it), replace it instead of removing it and pushing the expense report after the
+    // dismissal animation - otherwise the stack empties down to the chat report and it flashes into view in between.
+    const shouldReplaceTransactionThread = !!transactionThreadReportID && Navigation.getTopmostReportId() === transactionThreadReportID;
+
     popReportsSplitNavigatorToReport(targetReportID);
-    Navigation.dismissModalWithReport({reportID: targetReportID});
+    Navigation.dismissModalWithReport({reportID: targetReportID}, navigationRef, {forceReplace: shouldReplaceTransactionThread});
     requestAnimationFrame(() => {
         updateSplitTransactions({...params, isFromSplitExpensesFlow: true});
-        if (!transactionThreadReportScreen?.key) {
+        if (shouldReplaceTransactionThread || !transactionThreadReportScreen?.key) {
             return;
         }
         Navigation.removeScreenByKey(transactionThreadReportScreen.key);
diff --git a/src/libs/actions/IOU/TrackExpense.ts b/src/libs/actions/IOU/TrackExpense.ts
index 9273669a14e2..9d460ac14b93 100644
--- a/src/libs/actions/IOU/TrackExpense.ts
+++ b/src/libs/actions/IOU/TrackExpense.ts
@@ -132,10 +132,10 @@ import {
     getReportPreviewReportAction,
     getTransactionWithPreservedLocalReceiptSource,
 } from './MoneyRequestBuilder';
-import {highlightTransactionOnSearchRouteIfNeeded} from './NavigationHelpers';
 import {addPendingNewTransactionIDs, isOneToTwoTransactionTransition} from './PendingNewTransactions';
 import resolveWriteBarrier, {IMMEDIATE} from './resolveWriteBarrier';
 import {getSearchOnyxUpdate} from './SearchUpdate';
+import signalExpenseAddedGrowl from './signalExpenseAddedGrowl';
 
 type TrackExpenseInformation = {
     createdWorkspaceParams?: CreateWorkspaceParams;
@@ -670,7 +670,7 @@ type GetDeleteTrackExpenseInformationParams = {
     actionableWhisperReportActionID?: string;
     resolution?: string;
     shouldRemoveIOUTransaction?: boolean;
-    transactionThread?: OnyxEntry<OnyxTypes.Report>;
+    transactionThread: OnyxEntry<OnyxTypes.Report>;
 };
 
 function getDeleteTrackExpenseInformation({
@@ -1046,8 +1046,6 @@ function getTrackExpenseInformation(params: GetTrackExpenseInformationParams): T
             introSelected,
             activePolicy,
             conciergeChat,
-            // hasActiveAdminPolicies is only needed if lastUsedPaymentMethod is passed
-            hasActiveAdminPolicies: undefined,
             // This workspace is created by AddTrackedExpenseToPolicy, which does not apply CreatePolicy's
             // paid-workspace check, so the #admins room keeps starting out pinned here.
             hasOwnedPaidPolicy: undefined,
@@ -1276,6 +1274,7 @@ const getConvertTrackedExpenseInformation = (
         currentUserAccountID,
         // isMovingTransactionFromTrackExpense is true, so the transaction thread is never deleted and these report actions are unused here.
         transactionThreadReportActions: undefined,
+        transactionThread: undefined,
         shouldDeleteTransactionFromOnyx: false,
         isMovingTransactionFromTrackExpense: true,
         actionableWhisperReportActionID,
@@ -1661,7 +1660,7 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac
 /**
  * Submit expense to another user
  */
-function requestMoney(requestMoneyInformation: RequestMoneyInformation): {iouReport?: OnyxTypes.Report} {
+function requestMoney(requestMoneyInformation: RequestMoneyInformation): {iouReport?: OnyxTypes.Report; transactionID?: string} {
     const {
         report,
         existingIOUReport,
@@ -2000,11 +1999,11 @@ function requestMoney(requestMoneyInformation: RequestMoneyInformation): {iouRep
 
     deferredAPIWrite?.();
 
-    if (!requestMoneyInformation.isRetry) {
-        highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, transaction.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    if (!requestMoneyInformation.isRetry && isFromGlobalCreate) {
+        signalExpenseAddedGrowl(transaction.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
     }
 
-    return {iouReport};
+    return {iouReport, transactionID: transaction.transactionID};
 }
 
 /**
@@ -2963,13 +2962,15 @@ function trackExpense(params: CreateTrackExpenseParams) {
         }
     }
 
-    if (!params.isRetry) {
-        highlightTransactionOnSearchRouteIfNeeded(isFromGlobalCreate, transaction?.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
+    if (!params.isRetry && isFromGlobalCreate) {
+        signalExpenseAddedGrowl(transaction?.transactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
     }
 
     if (!isNotificationDeferredToWrite) {
         notifyTrackedAction();
     }
+
+    return {iouReport, transactionID: transaction?.transactionID};
 }
 
 /**
@@ -3057,11 +3058,11 @@ function deleteTrackExpense({
         isSingleTransactionView,
     );
 
+    const allReports = getAllReports();
+    const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportAction.childReportID}`];
+
     // STEP 1: Get all collections we're updating
     if (!isSelfDM(chatReport)) {
-        const allReports = getAllReports();
-        const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportAction.childReportID}`];
-
         deleteMoneyRequest({
             transactionID,
             reportAction,
@@ -3092,6 +3093,7 @@ function deleteTrackExpense({
         isChatReportArchived,
         currentUserAccountID,
         transactionThreadReportActions,
+        transactionThread: transactionThreadReport,
         actionableWhisperReportActionID,
         resolution: CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
         shouldRemoveIOUTransaction: false,
diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts
index 52eaecfaad3f..3a0530e0f44c 100644
--- a/src/libs/actions/IOU/index.ts
+++ b/src/libs/actions/IOU/index.ts
@@ -1,3 +1,6 @@
+import {getAllPersonalDetails as getAllPersonalDetailsFromStore, getPersonalDetail} from '@libs/PersonalDetailsStore';
+import {isMoneyRequestAction} from '@libs/ReportActionsUtils';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
@@ -7,14 +10,6 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import Onyx from 'react-native-onyx';
 
-let allPersonalDetails: OnyxTypes.PersonalDetailsList = {};
-Onyx.connect({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (value) => {
-        allPersonalDetails = value ?? {};
-    },
-});
-
 let allTransactions: NonNullable<OnyxCollection<OnyxTypes.Transaction>> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
@@ -74,14 +69,6 @@ Onyx.connect({
     },
 });
 
-let deprecatedCurrentUserPersonalDetails: OnyxEntry<OnyxTypes.PersonalDetails>;
-Onyx.connect({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (value) => {
-        deprecatedCurrentUserPersonalDetails = value?.[deprecatedUserAccountID] ?? undefined;
-    },
-});
-
 let allReportActions: OnyxCollection<OnyxTypes.ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
@@ -100,41 +87,17 @@ Onyx.connectWithoutView({
     callback: (value) => (recentAttendees = value),
 });
 
-let searchQueryByHash: Record<string, string> = {};
-Onyx.connect({
-    key: ONYXKEYS.SEARCH_QUERY_BY_HASH,
-    callback: (value) => {
-        searchQueryByHash = value ?? {};
-    },
-});
-
 let allSnapshots: OnyxCollection<OnyxTypes.SearchResults> = {};
-let knownSnapshotHashes = new Set<string>();
-Onyx.connect({
+// Expense actions run outside React and use this cache to optimistically update loaded searches without a view subscription.
+Onyx.connectWithoutView({
     key: ONYXKEYS.COLLECTION.SNAPSHOT,
     callback: (value) => {
         allSnapshots = value ?? {};
-        // Keep SEARCH_QUERY_BY_HASH bounded by mirroring the snapshot collection's lifecycle:
-        // when a snapshot disappears, drop its query entry so the map can never outgrow it.
-        const snapshotPrefixLength = ONYXKEYS.COLLECTION.SNAPSHOT.length;
-        const currentHashes = new Set(Object.keys(allSnapshots).map((k) => k.slice(snapshotPrefixLength)));
-        // Reconcile against persisted SEARCH_QUERY_BY_HASH too, so entries whose snapshots were evicted
-        // before this JS session get pruned on first sync (not just hashes seen since startup).
-        const candidates = new Set<string>([...knownSnapshotHashes, ...Object.keys(searchQueryByHash)]);
-        const removed = [...candidates].filter((h) => !currentHashes.has(h));
-        if (removed.length > 0) {
-            const evictions: Record<string, string | null> = {};
-            for (const h of removed) {
-                evictions[h] = null;
-            }
-            Onyx.merge(ONYXKEYS.SEARCH_QUERY_BY_HASH, evictions);
-        }
-        knownSnapshotHashes = currentHashes;
     },
 });
 
 function getAllPersonalDetails(): OnyxTypes.PersonalDetailsList {
-    return allPersonalDetails;
+    return getAllPersonalDetailsFromStore();
 }
 
 function getAllTransactions(): NonNullable<OnyxCollection<OnyxTypes.Transaction>> {
@@ -166,7 +129,7 @@ function getAllTransactionDrafts(): NonNullable<OnyxCollection<OnyxTypes.Transac
 }
 
 function getCurrentUserPersonalDetails(): OnyxEntry<OnyxTypes.PersonalDetails> {
-    return deprecatedCurrentUserPersonalDetails;
+    return getPersonalDetail(deprecatedUserAccountID);
 }
 
 function getCurrentUserAccountIDFromSession(): number {
@@ -181,8 +144,10 @@ function getAllSnapshots(): OnyxCollection<OnyxTypes.SearchResults> {
     return allSnapshots;
 }
 
-function getSearchQueryByHash(): Record<string, string> {
-    return searchQueryByHash;
+function getIOUAndChatReportForIOUAction(reportAction: OnyxEntry<OnyxTypes.ReportAction>, reports: OnyxCollection<OnyxTypes.Report>) {
+    const iouReportID = isMoneyRequestAction(reportAction) ? reportAction.reportID : undefined;
+    const iouReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`];
+    return {iouReport, chatReport: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`]};
 }
 
 export {
@@ -198,5 +163,5 @@ export {
     getCurrentUserAccountIDFromSession,
     getRecentAttendees,
     getAllSnapshots,
-    getSearchQueryByHash,
+    getIOUAndChatReportForIOUAction,
 };
diff --git a/src/libs/actions/IOU/signalExpenseAddedGrowl.ts b/src/libs/actions/IOU/signalExpenseAddedGrowl.ts
new file mode 100644
index 000000000000..a34b6cbcfa35
--- /dev/null
+++ b/src/libs/actions/IOU/signalExpenseAddedGrowl.ts
@@ -0,0 +1,16 @@
+import {mergeExpenseAddedGrowlTransactionIDs} from '@userActions/Transaction';
+
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+
+/**
+ * Queues the "Expense added" growl (toast) for a newly-created transaction. Signal whenever the flow leaves the
+ * user somewhere other than the expense's report - the growl suppresses itself if they end up on that report.
+ */
+function signalExpenseAddedGrowl(transactionID: string | undefined, dataType: SearchDataTypes) {
+    if (!transactionID) {
+        return;
+    }
+    mergeExpenseAddedGrowlTransactionIDs({[transactionID]: dataType});
+}
+
+export default signalExpenseAddedGrowl;
diff --git a/src/libs/actions/Insights.ts b/src/libs/actions/Insights.ts
index 259b88e685b5..785bd6edfc72 100644
--- a/src/libs/actions/Insights.ts
+++ b/src/libs/actions/Insights.ts
@@ -1,7 +1,9 @@
-import {read} from '@libs/API';
+import {makeRequestWithSideEffects, waitForWrites} from '@libs/API';
 import {READ_COMMANDS} from '@libs/API/types';
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+import Log from '@libs/Log';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {InsightsDashboardID, InsightsSearchKey} from '@src/types/onyx';
 
@@ -18,6 +20,7 @@ function getInsights(dashboard: InsightsDashboardID, hash: number, jsonQuery: st
             key,
             value: {
                 errors: null,
+                responseJsonCode: null,
             },
         },
         ...snapshotHashes.map<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SNAPSHOT>>((snapshotHash) => ({
@@ -34,12 +37,38 @@ function getInsights(dashboard: InsightsDashboardID, hash: number, jsonQuery: st
             onyxMethod: Onyx.METHOD.MERGE,
             key,
             value: {
+                // NO_RESPONSE stands for no server answer, a real error code from the response overwrites it
+                responseJsonCode: CONST.JSON_CODE.NO_RESPONSE,
                 errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
             },
         },
     ];
 
-    read(READ_COMMANDS.GET_INSIGHTS, {jsonQuery}, {optimisticData, failureData});
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SNAPSHOT>> = snapshotHashes.map((snapshotHash) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${snapshotHash}`,
+        value: {
+            search: {state: CONST.SEARCH.SNAPSHOT_STATE.LOADED, type: CONST.SEARCH.DATA_TYPES.EXPENSE, hash: snapshotHash},
+        },
+    }));
+
+    waitForWrites(READ_COMMANDS.GET_INSIGHTS).then(() =>
+        // API.read() hides the response code and network rejections, which are needed to tell backend errors from failed requests, same as Search
+        makeRequestWithSideEffects(READ_COMMANDS.GET_INSIGHTS, {jsonQuery}, {optimisticData, successData, failureData})
+            .then((result) => {
+                if (typeof result?.jsonCode !== 'number' || result.jsonCode === CONST.JSON_CODE.SUCCESS) {
+                    return;
+                }
+                Onyx.merge(key, {responseJsonCode: result.jsonCode}).catch((error: unknown) => Log.hmmm('[Insights] failed to store the GetInsights response code', {error: String(error)}));
+            })
+            .catch((error: unknown) => {
+                // A network-level rejection never reaches SaveResponseInOnyx, so failureData has to be applied here
+                Log.hmmm('[Insights] GetInsights request failed', {
+                    error: String(error),
+                });
+                return Onyx.update(failureData);
+            }),
+    );
 }
 
 function setInsightsFilters(searchKey: InsightsSearchKey, query: string) {
diff --git a/src/libs/actions/Link.ts b/src/libs/actions/Link.ts
index 20c6d389aee0..d5a11aa7765a 100644
--- a/src/libs/actions/Link.ts
+++ b/src/libs/actions/Link.ts
@@ -32,7 +32,7 @@ import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import {hasCompletedGuidedSetupFlowSelector} from '@src/selectors/Onboarding';
-import type {IntroSelected, Report, ReportNameValuePairs} from '@src/types/onyx';
+import type {IntroSelected, PersonalDetailsList, Report, ReportNameValuePairs} from '@src/types/onyx';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
@@ -433,6 +433,7 @@ function openReportFromDeepLink(
     isSelfTourViewed: boolean | undefined,
     callerAccountID: number,
     reportNameValuePairs: OnyxCollection<ReportNameValuePairs>,
+    conciergePersonalDetails: OnyxEntry<PersonalDetailsList>,
 ) {
     const reportID = getReportIDFromLink(url);
 
@@ -606,7 +607,7 @@ function openReportFromDeepLink(
                                     Navigation.navigate(lastAccessedReportRoute, {forceReplace: Navigation.getTopmostReportId() === reportID, waitForTransition: true});
                                     return;
                                 }
-                                navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+                                navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
                                 return;
                             }
 
diff --git a/src/libs/actions/MergeTransaction.ts b/src/libs/actions/MergeTransaction.ts
index ffea761fdb02..2854b98a6b4c 100644
--- a/src/libs/actions/MergeTransaction.ts
+++ b/src/libs/actions/MergeTransaction.ts
@@ -431,6 +431,8 @@ type MergeTransactionRequestParams = {
     getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'];
     getCurrencySymbol: CurrencyListActionsContextType['getCurrencySymbol'];
     sourceIOUActionThreadReport: OnyxEntry<Report>;
+    sourceActionIOUReport: OnyxEntry<Report>;
+    sourceActionChatReport: OnyxEntry<Report>;
     rules: OnyxCollection<Rule>;
     isVendorMatchingBetaEnabled: boolean | undefined;
 };
@@ -468,6 +470,8 @@ function mergeTransactionRequest({
     getCurrencyDecimals,
     getCurrencySymbol,
     sourceIOUActionThreadReport,
+    sourceActionIOUReport,
+    sourceActionChatReport,
     rules,
     isVendorMatchingBetaEnabled,
 }: MergeTransactionRequestParams) {
@@ -643,6 +647,8 @@ function mergeTransactionRequest({
                 shouldDeleteTransactionThread,
                 reportAction: sourceIOUAction,
                 currentUserAccountID: currentUserAccountIDParam,
+                iouReport: sourceActionIOUReport,
+                chatReport: sourceActionChatReport,
                 transactionThread: sourceIOUActionThreadReport,
                 transactionThreadReportActionsParam: sourceTransactionThreadReportActions,
             });
@@ -738,8 +744,7 @@ function mergeTransactionRequest({
             participants: [],
             transactionID: mergeTransaction.targetTransactionID,
             iouReportID: mergeTransaction.reportID,
-            // delegateAccountIDParam: will be threaded in PR 11; buildOptimisticIOUReportAction falls back to module-level Onyx.connect value (https://github.com/Expensify/App/issues/66425)
-            delegateAccountIDParam: undefined,
+            delegateAccountIDParam: delegateAccountID,
             getCurrencyDecimals,
         });
 
diff --git a/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts b/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts
index fc92d6cefa8a..4ea4fabd9560 100644
--- a/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts
+++ b/src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts
@@ -8,11 +8,13 @@ import cardFeedErrorsConfig from './configs/cardFeedErrors';
 import guideAccountIDsConfig from './configs/guideAccountIDs';
 import loginToAccountIDMapConfig from './configs/loginToAccountIDMap';
 import nonPersonalAndWorkspaceCardListConfig from './configs/nonPersonalAndWorkspaceCardList';
+import oneOnOneChatReportIDsConfig from './configs/oneOnOneChatReportIDs';
 import outstandingReportsByPolicyIDConfig from './configs/outstandingReportsByPolicyID';
 import personalAndWorkspaceCardListConfig from './configs/personalAndWorkspaceCardList';
 import reportAttributesConfig from './configs/reportAttributes';
 import reportTransactionsAndViolationsConfig from './configs/reportTransactionsAndViolations';
 import sortedReportActionsConfig from './configs/sortedReportActions';
+import spendDataSignatureConfig from './configs/spendDataSignature';
 import visibleReportActionsConfig from './configs/visibleReportActions';
 
 /**
@@ -30,6 +32,8 @@ const ONYX_DERIVED_VALUES = {
     [ONYXKEYS.DERIVED.RAM_ONLY_SORTED_REPORT_ACTIONS]: sortedReportActionsConfig,
     [ONYXKEYS.DERIVED.LOGIN_TO_ACCOUNT_ID_MAP]: loginToAccountIDMapConfig,
     [ONYXKEYS.DERIVED.GUIDE_ACCOUNT_IDS]: guideAccountIDsConfig,
+    [ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE]: spendDataSignatureConfig,
+    [ONYXKEYS.DERIVED.ONE_ON_ONE_CHAT_REPORT_IDS]: oneOnOneChatReportIDsConfig,
 } as const satisfies {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     [Key in ValueOf<typeof ONYXKEYS.DERIVED>]: OnyxDerivedValueConfig<Key, any>;
diff --git a/src/libs/actions/OnyxDerived/configs/oneOnOneChatReportIDs.ts b/src/libs/actions/OnyxDerived/configs/oneOnOneChatReportIDs.ts
new file mode 100644
index 000000000000..0b3289116fdd
--- /dev/null
+++ b/src/libs/actions/OnyxDerived/configs/oneOnOneChatReportIDs.ts
@@ -0,0 +1,105 @@
+import {getParticipantsChatKey, isOneOnOneChat, isSystemChat} from '@libs/ReportUtils';
+
+import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OneOnOneChatReportIDsDerivedValue} from '@src/types/onyx';
+import type Report from '@src/types/onyx/Report';
+
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+
+function getIndexableParticipantsKey(report: OnyxEntry<Report>, currentUserAccountID: number): string | undefined {
+    if (!report?.reportID || (!isOneOnOneChat(report, currentUserAccountID) && !isSystemChat(report))) {
+        return undefined;
+    }
+    return getParticipantsChatKey(Object.keys(report.participants ?? {}).map(Number));
+}
+
+/**
+ * The first report in collection order wins a key, matching `getChatByParticipants`. When `keysToFind` is passed,
+ * only those keys are looked up.
+ */
+function buildIndex(reports: NonNullable<OnyxCollection<Report>>, currentUserAccountID: number, keysToFind?: Set<string>): OneOnOneChatReportIDsDerivedValue['reportIDs'] {
+    const index: OneOnOneChatReportIDsDerivedValue['reportIDs'] = {};
+    for (const report of Object.values(reports)) {
+        const participantsKey = getIndexableParticipantsKey(report, currentUserAccountID);
+        if (!participantsKey || !report?.reportID || index[participantsKey] || (keysToFind && !keysToFind.has(participantsKey))) {
+            continue;
+        }
+        index[participantsKey] = report.reportID;
+    }
+    return index;
+}
+
+/**
+ * Indexes 1:1 and system chats by participant set.
+ *
+ * Reports are keyed by reportID, so `getChatByParticipants` has to walk the whole collection to find a chat by its
+ * participants. This index answers the same question with a lookup. Group chats are excluded because
+ * `getChatByParticipants` only returns those behind `shouldIncludeGroupChats`.
+ *
+ * All state lives in the derived value; nothing is kept in module scope between computes.
+ */
+export default createOnyxDerivedValueConfig({
+    key: ONYXKEYS.DERIVED.ONE_ON_ONE_CHAT_REPORT_IDS,
+    // `isOneOnOneChat` needs the current accountID to tell a DM from a group chat, so SESSION has to be a
+    // dependency. Without it the index gets built before the ID arrives and every two-participant DM is missing.
+    dependencies: [ONYXKEYS.COLLECTION.REPORT, ONYXKEYS.SESSION],
+    compute: ([reports, session], {sourceValues, currentValue}) => {
+        const currentUserAccountID = session?.accountID;
+
+        // Without the accountID every DM looks like a group chat, so an index built now would be thrown away.
+        if (!reports || !currentUserAccountID) {
+            return {reportIDs: {}};
+        }
+
+        // The first flush after a reload has no `sourceValues`. The restored index can disagree with the restored
+        // reports, because the two are written separately and reports that change before the subscriptions connect
+        // never show up in a delta, so it is rebuilt rather than trusted.
+        if (!currentValue || !sourceValues || currentValue.accountID !== currentUserAccountID) {
+            return {reportIDs: buildIndex(reports, currentUserAccountID), accountID: currentUserAccountID};
+        }
+
+        const reportUpdates = sourceValues[ONYXKEYS.COLLECTION.REPORT];
+        if (!reportUpdates) {
+            return currentValue;
+        }
+
+        const updatedIndex: OneOnOneChatReportIDsDerivedValue['reportIDs'] = {...currentValue.reportIDs};
+        let keyByReportID: Record<string, string> | undefined;
+        // Keys whose report left, refilled from `reports` after the loop. The server's `preexistingReportID`
+        // replacement keeps an optimistic DM and the real one on the same participants for a moment, so dropping the
+        // key would lose the chat that remains.
+        const keysToRefill = new Set<string>();
+
+        for (const reportKey of Object.keys(reportUpdates)) {
+            const reportID = reportKey.slice(ONYXKEYS.COLLECTION.REPORT.length);
+            // From the full collection, because a delta entry carries only the changed fields.
+            const nextKey = getIndexableParticipantsKey(reports[reportKey], currentUserAccountID);
+
+            if (nextKey && updatedIndex[nextKey] === reportID) {
+                continue;
+            }
+
+            keyByReportID ??= Object.fromEntries(Object.entries(updatedIndex).map(([participantsKey, id]) => [id, participantsKey]));
+            const previousKey = keyByReportID[reportID];
+            if (previousKey) {
+                delete updatedIndex[previousKey];
+                delete keyByReportID[reportID];
+                keysToRefill.add(previousKey);
+            }
+
+            if (!nextKey || updatedIndex[nextKey] || keysToRefill.has(nextKey)) {
+                continue;
+            }
+            updatedIndex[nextKey] = reportID;
+            keyByReportID[reportID] = nextKey;
+        }
+
+        if (keysToRefill.size === 0) {
+            return {reportIDs: updatedIndex, accountID: currentUserAccountID};
+        }
+
+        return {reportIDs: {...updatedIndex, ...buildIndex(reports, currentUserAccountID, keysToRefill)}, accountID: currentUserAccountID};
+    },
+});
diff --git a/src/libs/actions/OnyxDerived/configs/spendDataSignature.ts b/src/libs/actions/OnyxDerived/configs/spendDataSignature.ts
new file mode 100644
index 000000000000..dd484baff3ba
--- /dev/null
+++ b/src/libs/actions/OnyxDerived/configs/spendDataSignature.ts
@@ -0,0 +1,129 @@
+import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig';
+import {hasKeyTriggeredCompute} from '@userActions/OnyxDerived/utils';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Transaction} from '@src/types/onyx';
+
+import type {OnyxCollection} from 'react-native-onyx';
+
+/**
+ * Counters that move when spend data changes. Nothing patches the Home snapshots, so the cards watch
+ * these instead of fetching on every screen focus.
+ */
+const EMPTY_SIGNATURE = {expenses: 0, cardExpenses: 0};
+
+/** What the last compute saw: the counted fields, plus the card, which a later delete needs. */
+type SeenTransaction = {
+    fingerprint: string;
+    cardFingerprint: string;
+    cardID: number | undefined;
+};
+
+// The map stays out of Onyx: it is not data, and it would write tens of thousands of entries to disk.
+let lastSeenTransactions: Record<string, SeenTransaction> = {};
+
+let hasBaseline = false;
+
+/** Fields the card totals read. Edits land in the `modified` versions, so both are read. */
+function getCardFingerprint(transaction: Transaction | undefined): string {
+    if (!transaction) {
+        return '';
+    }
+    return [
+        transaction.amount,
+        transaction.modifiedAmount,
+        transaction.created,
+        transaction.modifiedCreated,
+        transaction.currency,
+        transaction.modifiedCurrency,
+        transaction.cardID,
+        transaction.reportID,
+    ].join('|');
+}
+
+/**
+ * The card fields, plus what the other cards filter or group by: reimbursable, merchant and category.
+ * The pending flag moves it again once the server accepts a write, since a refetch sent before that can miss it.
+ * A new expense sets `pendingAction`, an edit only sets `pendingFields`.
+ */
+function getFingerprint(transaction: Transaction | undefined, cardFingerprint: string): string {
+    if (!transaction) {
+        return '';
+    }
+    const hasPendingWrite = !!transaction.pendingAction || Object.values(transaction.pendingFields ?? {}).some((pendingField) => !!pendingField);
+    return [cardFingerprint, transaction.reimbursable, transaction.merchant, transaction.modifiedMerchant, transaction.category, hasPendingWrite].join('|');
+}
+
+function getSeenTransaction(transaction: Transaction | undefined): SeenTransaction {
+    const cardFingerprint = getCardFingerprint(transaction);
+    return {fingerprint: getFingerprint(transaction, cardFingerprint), cardFingerprint, cardID: transaction?.cardID};
+}
+
+function rebuildBaseline(transactions: OnyxCollection<Transaction> | undefined) {
+    lastSeenTransactions = {};
+    hasBaseline = true;
+    for (const [key, transaction] of Object.entries(transactions ?? {})) {
+        lastSeenTransactions[key] = getSeenTransaction(transaction);
+    }
+}
+
+export default createOnyxDerivedValueConfig({
+    key: ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE,
+    dependencies: [ONYXKEYS.COLLECTION.TRANSACTION, ONYXKEYS.CARD_LIST],
+    compute: ([transactions, cardList], {sourceValues, currentValue, triggeredKeys}) => {
+        const transactionUpdates = sourceValues?.[ONYXKEYS.COLLECTION.TRANSACTION];
+
+        if (!transactionUpdates) {
+            // Rebuilding reads every expense, so only do it on the first load or when expenses changed without a list
+            // of what changed. `!hasBaseline` forces the first build, since the first run may name only the card list.
+            if (!hasBaseline || hasKeyTriggeredCompute(ONYXKEYS.COLLECTION.TRANSACTION, triggeredKeys)) {
+                rebuildBaseline(transactions);
+            }
+            return currentValue ?? EMPTY_SIGNATURE;
+        }
+
+        let hasChangedExpense = false;
+        let hasChangedCardExpense = false;
+
+        for (const key of Object.keys(transactionUpdates)) {
+            const transaction = transactions?.[key];
+            const lastSeen = lastSeenTransactions[key];
+
+            // Nothing was counted for this key, so its removal changes no total.
+            if (!transaction && !lastSeen) {
+                continue;
+            }
+
+            const seen = getSeenTransaction(transaction);
+            if (seen.fingerprint === lastSeen?.fingerprint) {
+                continue;
+            }
+            hasChangedExpense = true;
+
+            const cardID = transaction?.cardID ?? lastSeen?.cardID;
+            if (cardID !== undefined && !!cardList?.[String(cardID)] && seen.cardFingerprint !== lastSeen?.cardFingerprint) {
+                hasChangedCardExpense = true;
+            }
+
+            if (!transaction) {
+                delete lastSeenTransactions[key];
+            } else {
+                lastSeenTransactions[key] = seen;
+            }
+        }
+
+        if (!hasChangedExpense) {
+            return currentValue ?? EMPTY_SIGNATURE;
+        }
+
+        const previous = currentValue ?? EMPTY_SIGNATURE;
+        return {
+            expenses: previous.expenses + 1,
+            cardExpenses: hasChangedCardExpense ? previous.cardExpenses + 1 : previous.cardExpenses,
+        };
+    },
+    onReset: () => {
+        lastSeenTransactions = {};
+        hasBaseline = false;
+    },
+});
diff --git a/src/libs/actions/OnyxDerived/index.ts b/src/libs/actions/OnyxDerived/index.ts
index f2c9b14e81a1..cfe1ec657075 100644
--- a/src/libs/actions/OnyxDerived/index.ts
+++ b/src/libs/actions/OnyxDerived/index.ts
@@ -27,6 +27,20 @@ import type {DerivedValueContext} from './types';
 import ONYX_DERIVED_VALUES from './ONYX_DERIVED_VALUES';
 import {setDerivedValue} from './utils';
 
+// Derived values that share a collection dependency get the same snapshot from one write and usually diff it against
+// the same baseline, so the first one's delta is reused. One slot per collection, so no chain of old snapshots is kept.
+const lastCollectionDeltas = new Map<OnyxKey, {current: OnyxCollection<unknown>; previous: OnyxCollection<unknown>; delta: OnyxCollection<unknown> | undefined}>();
+
+function getSharedCollectionDelta(collectionKey: OnyxKey, current: OnyxCollection<unknown>, previous: OnyxCollection<unknown>): OnyxCollection<unknown> | undefined {
+    const cached = lastCollectionDeltas.get(collectionKey);
+    if (cached && cached.current === current && cached.previous === previous) {
+        return cached.delta;
+    }
+    const delta = getCollectionDelta<unknown>(current, previous);
+    lastCollectionDeltas.set(collectionKey, {current, previous, delta});
+    return delta;
+}
+
 /**
  * Initialize all Onyx derived values, store them in Onyx, and setup listeners to update them when dependencies change.
  * Using connectWithoutView in this function since this is only executed once while initializing the App.
@@ -105,6 +119,7 @@ function init() {
                 derivedValue = undefined;
                 hasFlushedOnce = false;
                 lastFlushedCollectionValues.length = 0;
+                lastCollectionDeltas.clear();
                 onReset?.();
             };
 
@@ -124,6 +139,7 @@ function init() {
                     parentSpan,
                     // A span with no parent is sent as its own transaction, one per recompute.
                     onlyIfParent: true,
+                    forceTransaction: false,
                     attributes: {derivedKey: key, triggeredKeys: [...triggeredKeys].join(','), [CONST.TELEMETRY.ATTRIBUTE_IS_STARTUP]: !!startupSpan},
                 });
 
@@ -170,7 +186,7 @@ function init() {
                         const dependencyOnyxKey = dependencies[index];
                         if (OnyxKeys.isCollectionKey(dependencyOnyxKey)) {
                             const currentValue = readCollectionDependency(index);
-                            const delta = getCollectionDelta<unknown>(currentValue, lastFlushedCollectionValues.at(index));
+                            const delta = getSharedCollectionDelta(dependencyOnyxKey, currentValue, lastFlushedCollectionValues.at(index));
                             stagedBaselines.push([index, currentValue]);
                             if (delta !== undefined) {
                                 sourceValues ??= {};
diff --git a/src/libs/actions/PersonalDetails.ts b/src/libs/actions/PersonalDetails.ts
index 93b3f043f0ca..7581d5438325 100644
--- a/src/libs/actions/PersonalDetails.ts
+++ b/src/libs/actions/PersonalDetails.ts
@@ -626,6 +626,11 @@ function setPersonalDetailsAndRevealExpensifyCard(
         })
             .then((response) => {
                 if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
+                    if (response?.jsonCode === CONST.JSON_CODE.TOO_MANY_REQUESTS) {
+                        // eslint-disable-next-line prefer-promise-reject-errors
+                        reject('validateCodeForm.error.tooManyAttempts');
+                        return;
+                    }
                     if (response?.jsonCode === CONST.JSON_CODE.INCORRECT_VALIDATE_CODE) {
                         // eslint-disable-next-line prefer-promise-reject-errors
                         reject('validateCodeForm.error.incorrectSecurityCode');
diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts
index 24dc2a7a577c..67fae0d7ad80 100644
--- a/src/libs/actions/Policy/Category.ts
+++ b/src/libs/actions/Policy/Category.ts
@@ -51,6 +51,8 @@ import type {PartialDeep} from 'type-fest';
 import lodashCloneDeep from 'lodash/cloneDeep';
 import Onyx from 'react-native-onyx';
 
+import {buildOptimisticPolicyCategories} from './OptimisticPolicyCategoriesAndMccGroups';
+
 type CreatePolicyCategoryParams = {
     policyID: string;
     categoryName: string;
@@ -118,160 +120,6 @@ function appendSetupCategoriesOnboardingData(
     return onyxData;
 }
 
-function buildOptimisticPolicyWithExistingCategories(policyID: string, categories: PolicyCategories) {
-    const categoriesValues = Object.values(categories);
-    const optimisticCategoryMap = categoriesValues.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
-        if (category.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
-            return acc;
-        }
-        acc[category.name] = {
-            ...category,
-            errors: null,
-            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        };
-        return acc;
-    }, {});
-
-    const successCategoryMap = categoriesValues.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
-        acc[category.name] = {
-            errors: null,
-            pendingAction: null,
-        };
-        return acc;
-    }, {});
-
-    const failureCategoryMap = categoriesValues.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
-        acc[category.name] = {
-            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.createFailureMessage'),
-        };
-        return acc;
-    }, {});
-
-    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT> = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: optimisticCategoryMap,
-            },
-            {
-                onyxMethod: Onyx.METHOD.SET,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
-                value: null,
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: successCategoryMap,
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: failureCategoryMap,
-            },
-        ],
-    };
-
-    return onyxData;
-}
-
-function buildOptimisticPolicyCategories(policyID: string, categories: readonly string[]) {
-    const optimisticCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
-        acc[category] = {
-            name: category,
-            enabled: true,
-            errors: null,
-            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        };
-        return acc;
-    }, {});
-
-    const successCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
-        acc[category] = {
-            errors: null,
-            pendingAction: null,
-        };
-        return acc;
-    }, {});
-
-    const failureCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
-        acc[category] = {
-            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.createFailureMessage'),
-        };
-        return acc;
-    }, {});
-
-    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT> = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: optimisticCategoryMap,
-            },
-            {
-                onyxMethod: Onyx.METHOD.SET,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
-                value: null,
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: successCategoryMap,
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: failureCategoryMap,
-            },
-        ],
-    };
-
-    return onyxData;
-}
-
-type DefaultMccGroupID = keyof typeof CONST.POLICY.DEFAULT_MCC_GROUPS;
-
-const DEFAULT_MCC_GROUP: Record<string, MccGroup> = Object.fromEntries(
-    Object.entries(CONST.POLICY.DEFAULT_MCC_GROUPS).map(([groupID, definition]) => [
-        groupID,
-        {
-            ...definition,
-            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        },
-    ]),
-);
-
-function buildOptimisticMccGroup() {
-    const optimisticMccGroup: Record<'mccGroup', Record<string, MccGroup>> = {
-        mccGroup: Object.fromEntries(Object.entries(DEFAULT_MCC_GROUP).map(([groupID, group]) => [groupID, {...group}])),
-    };
-
-    const successMccGroup: Record<'mccGroup', Record<string, Partial<MccGroup>>> = {mccGroup: {}};
-    for (const key of Object.keys(optimisticMccGroup.mccGroup)) {
-        successMccGroup.mccGroup[key] = {pendingAction: null};
-    }
-
-    const mccGroupData = {
-        optimisticData: optimisticMccGroup,
-        successData: successMccGroup,
-        failureData: {mccGroup: null},
-    };
-
-    return mccGroupData;
-}
-
-function isDefaultMccGroupID(groupID: string): groupID is DefaultMccGroupID {
-    return Object.hasOwn(CONST.POLICY.DEFAULT_MCC_GROUPS, groupID);
-}
-
 /**
  * Picks the right translation key for an import result. The four cases (neither, added only, updated
  * only, both) live here rather than in the translation files so each key carries a single `count` and
@@ -318,7 +166,46 @@ function getPolicyCategories(policyID: string) {
         policyID,
     };
 
-    API.read(READ_COMMANDS.GET_POLICY_CATEGORIES, params);
+    type CategoriesLoadingKey = typeof ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE;
+    const loadingStateKey = `${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE}${policyID}` as const;
+
+    const optimisticData: Array<OnyxUpdate<CategoriesLoadingKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: loadingStateKey,
+            value: {isLoading: true},
+        },
+    ];
+
+    // `hasOnceLoaded` is only ever written here, so a read that never landed leaves the policy eligible for a retry.
+    // The collection existing in Onyx cannot stand in for this: it may hold only the category already on the expense.
+    const successData: Array<OnyxUpdate<CategoriesLoadingKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: loadingStateKey,
+            value: {isLoading: false, hasOnceLoaded: true},
+        },
+    ];
+
+    const failureData: Array<OnyxUpdate<CategoriesLoadingKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: loadingStateKey,
+            value: {isLoading: false},
+        },
+    ];
+
+    API.read(READ_COMMANDS.GET_POLICY_CATEGORIES, params, {optimisticData, successData, failureData});
+}
+
+/**
+ * Clears the in-flight flag for a policy's categories read.
+ *
+ * A read cut off by a disconnect never gets a response, so its `failureData` never applies and `isLoading` would stay
+ * true for the rest of the session, blocking every retry. Callers clear it on reconnect.
+ */
+function clearPolicyCategoriesLoadingState(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE}${policyID}`, {isLoading: false});
 }
 
 function setWorkspaceCategoryEnabled({
@@ -910,7 +797,12 @@ async function importPolicyCategories(policyID: string, categories: PolicyCatego
                 existing.enabled !== category.enabled ||
                 (existing['GL Code'] ?? '') !== (category['GL Code'] ?? '') ||
                 ('maxAmountNoReceipt' in category && existing.maxAmountNoReceipt !== category.maxAmountNoReceipt) ||
-                ('maxAmountNoItemizedReceipt' in category && existing.maxAmountNoItemizedReceipt !== category.maxAmountNoItemizedReceipt)
+                ('maxAmountNoItemizedReceipt' in category && existing.maxAmountNoItemizedReceipt !== category.maxAmountNoItemizedReceipt) ||
+                ('Payroll Code' in category && (existing['Payroll Code'] ?? '') !== (category['Payroll Code'] ?? '')) ||
+                ('areCommentsRequired' in category && !!existing.areCommentsRequired !== !!category.areCommentsRequired) ||
+                ('commentHint' in category && (existing.commentHint ?? '') !== (category.commentHint ?? '')) ||
+                ('expenseLimitType' in category && existing.expenseLimitType !== category.expenseLimitType) ||
+                ('maxExpenseAmount' in category && existing.maxExpenseAmount !== category.maxExpenseAmount)
             ) {
                 acc.updated++;
             }
@@ -932,6 +824,12 @@ async function importPolicyCategories(policyID: string, categories: PolicyCatego
                 'GL Code': String(category['GL Code']),
                 ...('maxAmountNoReceipt' in category && {maxAmountNoReceipt: category.maxAmountNoReceipt}),
                 ...('maxAmountNoItemizedReceipt' in category && {maxAmountNoItemizedReceipt: category.maxAmountNoItemizedReceipt}),
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                ...('Payroll Code' in category && {'Payroll Code': String(category['Payroll Code'])}),
+                ...('areCommentsRequired' in category && {areCommentsRequired: category.areCommentsRequired}),
+                ...('commentHint' in category && {commentHint: category.commentHint}),
+                ...('expenseLimitType' in category && {expenseLimitType: category.expenseLimitType}),
+                ...('maxExpenseAmount' in category && {maxExpenseAmount: category.maxExpenseAmount}),
             })),
         ),
     };
@@ -1298,6 +1196,62 @@ function setWorkspaceRequiresCategory(policyData: PolicyData, requiresCategory:
     API.write(WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY, parameters, onyxData);
 }
 
+function setPolicyAutoCategorizeNewExpenses(policyID: string, enabled: boolean) {
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY> = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    autoCategorizeNewExpenses: enabled,
+                    errorFields: {
+                        autoCategorizeNewExpenses: null,
+                    },
+                    pendingFields: {
+                        autoCategorizeNewExpenses: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    errorFields: {
+                        autoCategorizeNewExpenses: null,
+                    },
+                    pendingFields: {
+                        autoCategorizeNewExpenses: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    autoCategorizeNewExpenses: !enabled,
+                    errorFields: {
+                        autoCategorizeNewExpenses: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.updateFailureMessage'),
+                    },
+                    pendingFields: {
+                        autoCategorizeNewExpenses: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        enabled,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_AUTO_CATEGORIZE_NEW_EXPENSES, parameters, onyxData);
+}
+
 function setPolicyShowCategoryGLCodes(policyID: string | undefined, showCategoryGLCodes: boolean) {
     if (!policyID) {
         return;
@@ -2141,10 +2095,6 @@ function setPolicyCategoryAttendeesRequired(policyID: string, categoryName: stri
 }
 
 export {
-    buildOptimisticPolicyCategories,
-    buildOptimisticMccGroup,
-    DEFAULT_MCC_GROUP,
-    isDefaultMccGroupID,
     clearCategoryErrors,
     deletePolicyCategoryTax,
     deletePolicyCategoryTaxes,
@@ -2153,6 +2103,7 @@ export {
     downloadCategoriesCSV,
     enablePolicyCategories,
     getPolicyCategories,
+    clearPolicyCategoriesLoadingState,
     importPolicyCategories,
     openPolicyCategoriesPage,
     removePolicyCategoryReceiptsRequired,
@@ -2162,7 +2113,6 @@ export {
     setPolicyCategoryApprover,
     setPolicyCategoryAttendeesRequired,
     setPolicyCategoryDescriptionRequired,
-    buildOptimisticPolicyWithExistingCategories,
     setPolicyCategoryGLCode,
     setPolicyCategoryMaxAmount,
     setPolicyCategoryPayrollCode,
@@ -2175,5 +2125,6 @@ export {
     setWorkspaceCategoryDescriptionHint,
     setWorkspaceCategoryEnabled,
     setWorkspaceRequiresCategory,
+    setPolicyAutoCategorizeNewExpenses,
     setPolicyShowCategoryGLCodes,
 };
diff --git a/src/libs/actions/Policy/CopyPolicySettings.ts b/src/libs/actions/Policy/CopyPolicySettings.ts
index 57ce88875666..80da4bc3d3c2 100644
--- a/src/libs/actions/Policy/CopyPolicySettings.ts
+++ b/src/libs/actions/Policy/CopyPolicySettings.ts
@@ -2,12 +2,13 @@ import {write} from '@libs/API';
 import type {CopyPolicySettingsParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+import {buildCopiedExpenseDefaultRules} from '@libs/ExpenseDefaultRuleUtils';
 import {hasExplicitFlagAmount} from '@libs/FlagForReviewRulesUtils';
 import {categoryHasAnyRequireFieldsRule} from '@libs/RequireFieldsRulesUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {CopyPolicySettings as CopyPolicySettingsState, Policy, PolicyCategories, PolicyTagLists, PolicyCategory} from '@src/types/onyx';
+import type {CopyPolicySettings as CopyPolicySettingsState, Policy, PolicyCategories, PolicyTagLists, PolicyCategory, Rule} from '@src/types/onyx';
 import type {CustomUnit, PolicyFeatureName, Rate} from '@src/types/onyx/Policy';
 
 import type {OnyxCollection, OnyxUpdate} from 'react-native-onyx';
@@ -64,7 +65,9 @@ const PARTS_TO_POLICY_FIELDS = {
         'shouldShowAutoReimbursementLimitOption',
         'customRules',
     ],
-    codingRules: ['rules'],
+    // Merchant rules are copied into the `rules_` collection rather than onto the policy, so this part patches
+    // no policy field. It stays listed because the map has to cover every part.
+    codingRules: [],
     distanceRates: ['areDistanceRatesEnabled', 'customUnits'],
     perDiem: ['arePerDiemRatesEnabled', 'customUnits'],
     invoices: ['areInvoicesEnabled', 'areInvoiceFieldsEnabled', 'invoice', 'fieldList'],
@@ -84,8 +87,8 @@ type PolicyFieldsForPart = (typeof PARTS_TO_POLICY_FIELDS)[Part][number];
  * given target can't access. Parts with no plan/feature gate (e.g. overview, members) are omitted.
  *
  * This is intentionally separate from `PARTS_TO_POLICY_FIELDS`: that map lists every Onyx field a
- * part copies, where the feature toggle isn't reliably identifiable (e.g. `codingRules` copies the
- * `rules` field, not the `areRulesEnabled` feature; `timeTracking`/`receiptPartners` copy no fields).
+ * part copies, and several parts copy no policy field at all (`codingRules` copies into the `rules_`
+ * collection, `timeTracking`/`receiptPartners` are patched separately).
  */
 const PART_TO_POLICY_FEATURE: Partial<Record<Part, PolicyFeatureName>> = {
     reports: CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED,
@@ -312,9 +315,6 @@ function buildPolicyFieldPatch(sourcePolicy: Policy, targetPolicy: Policy, parts
             if (field === 'fieldList') {
                 continue;
             }
-            if (part === 'codingRules' && field === 'rules') {
-                continue;
-            }
             // The PARTS_TO_POLICY_FIELDS values are typed as keyof Policy, so this assignment is safe.
             (patch as Record<string, unknown>)[field] = sourcePolicy[field as keyof Policy];
         }
@@ -358,6 +358,7 @@ type CopyPolicySettingsOnyxKeys =
     | typeof ONYXKEYS.COLLECTION.POLICY
     | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES
     | typeof ONYXKEYS.COLLECTION.POLICY_TAGS
+    | typeof ONYXKEYS.COLLECTION.RULE
     | typeof ONYXKEYS.COPY_POLICY_SETTINGS
     | typeof ONYXKEYS.NVP_BULK_POLICY_COPY_SETTINGS;
 
@@ -367,6 +368,7 @@ function buildCopyPolicySettingsData(
     parts: Part[],
     allPolicyCategories: OnyxCollection<PolicyCategories>,
     allPolicyTags: OnyxCollection<PolicyTagLists>,
+    allRules: OnyxCollection<Rule>,
 ): {
     optimisticData: Array<OnyxUpdate<CopyPolicySettingsOnyxKeys>>;
     successData: Array<OnyxUpdate<CopyPolicySettingsOnyxKeys>>;
@@ -407,18 +409,6 @@ function buildCopyPolicySettingsData(
     const sourceTagsKey = `${ONYXKEYS.COLLECTION.POLICY_TAGS}${sourcePolicy.id}` as const;
     const sourceCategories = allPolicyCategories?.[sourceCategoriesKey] ?? {};
     const sourceTags = allPolicyTags?.[sourceTagsKey] ?? {};
-    const filterPendingDeleteData = <T>(data?: Record<string, T>): Record<string, T> | undefined =>
-        data
-            ? (Object.fromEntries(
-                  Object.entries(data).filter(([, value]) => {
-                      if (!value || typeof value !== 'object' || !('pendingAction' in value)) {
-                          return true;
-                      }
-                      return value.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                  }),
-              ) as Record<string, T>)
-            : undefined;
-    const codingRulesWithoutPendingDelete = filterPendingDeleteData(sourcePolicy.rules?.codingRules);
 
     for (const targetPolicy of targetPolicies) {
         const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${targetPolicy.id}` as const;
@@ -427,14 +417,15 @@ function buildCopyPolicySettingsData(
         const timeTrackingPatch = isTimeTrackingSelected ? buildTimeTrackingPatch(sourcePolicy) : undefined;
         const travelSettingsPatch = isTravelSelected ? buildTravelSettingsPatch(sourcePolicy, targetPolicy) : undefined;
         const receiptPartnersPatch = isReceiptPartnersSelected ? buildReceiptPartnersPatch(sourcePolicy) : undefined;
-        const codingRulesPatch = isCodingRulesSelected
-            ? {
-                  rules: {
-                      ...targetPolicy.rules,
-                      codingRules: codingRulesWithoutPendingDelete,
-                  },
-              }
-            : {};
+        // Merchant rules live in their own collection, so each target policy gets its own copies rather than
+        // a shared blob on the policy object. The server mints its own IDs, so the optimistic copies are dropped on success.
+        const copiedRules = isCodingRulesSelected ? buildCopiedExpenseDefaultRules(allRules, sourcePolicy.id, targetPolicy.id) : {};
+        for (const [ruleID, rule] of Object.entries(copiedRules)) {
+            const ruleKey = `${ONYXKEYS.COLLECTION.RULE}${ruleID}` as const;
+            optimisticData.push({onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: rule});
+            successData.push({onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: null});
+            failureData.push({onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: null});
+        }
 
         // Step 1+2: SET the full policy with patched fields overlaid.
         // We use SET (not MERGE) because Onyx.merge deep-merges nested objects — source
@@ -456,7 +447,6 @@ function buildCopyPolicySettingsData(
                     : {}),
                 ...(travelSettingsPatch ?? {}),
                 ...(receiptPartnersPatch ? {receiptPartners: receiptPartnersPatch.receiptPartners} : {}),
-                ...codingRulesPatch,
                 pendingFields: {...targetPolicy.pendingFields, ...pendingFields, ...timeTrackingPendingFields, ...receiptPartnersPendingFields},
             },
         });
@@ -583,8 +573,9 @@ function copyPolicySettings(
     parts: Part[],
     allPolicyCategories: OnyxCollection<PolicyCategories>,
     allPolicyTags: OnyxCollection<PolicyTagLists>,
+    allRules: OnyxCollection<Rule>,
 ): void {
-    const {optimisticData, successData, failureData} = buildCopyPolicySettingsData(sourcePolicy, targetPolicies, parts, allPolicyCategories, allPolicyTags);
+    const {optimisticData, successData, failureData} = buildCopyPolicySettingsData(sourcePolicy, targetPolicies, parts, allPolicyCategories, allPolicyTags, allRules);
 
     const params: CopyPolicySettingsParams = {
         policyID: sourcePolicy.id,
diff --git a/src/libs/actions/Policy/CreateWorkspaceFlow.ts b/src/libs/actions/Policy/CreateWorkspaceFlow.ts
new file mode 100644
index 000000000000..a9e18e992f8a
--- /dev/null
+++ b/src/libs/actions/Policy/CreateWorkspaceFlow.ts
@@ -0,0 +1,348 @@
+/**
+ * Workspace-creation starters kept outside `App.ts` so that `App.ts` does not import the policy action module and close an import cycle.
+ */
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+
+import getCurrentUrl from '@libs/Navigation/currentUrl';
+import willRouteNavigateToRHP from '@libs/Navigation/helpers/willRouteNavigateToRHP';
+import WorkspaceCreationReveal from '@libs/Navigation/helpers/WorkspaceCreationReveal';
+import Navigation from '@libs/Navigation/Navigation';
+import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
+import {isLoggingInAsNewUser as isLoggingInAsNewUserSessionUtils} from '@libs/SessionUtils';
+
+import CONST from '@src/CONST';
+import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import {Str} from 'expensify-common';
+
+import type {PolicyOwner} from './PolicyDraft';
+
+import {createWorkspace} from './Policy';
+import {createDraftInitialWorkspace, generateDefaultWorkspaceName, generatePolicyID} from './PolicyDraft';
+
+type PolicyType = typeof CONST.POLICY.TYPE.TEAM | typeof CONST.POLICY.TYPE.CORPORATE;
+
+type CreateWorkspaceWithPolicyDraftParams = {
+    isSelfTourViewed: boolean | undefined;
+    introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
+    policyOwner?: PolicyOwner;
+    policyName: string;
+    transitionFromOldDot?: boolean;
+    makeMeAdmin?: boolean;
+    backTo?: string;
+    policyID?: string;
+    currency: string;
+    file?: File;
+    routeToNavigateAfterCreate?: Route;
+    activePolicy: OnyxEntry<OnyxTypes.Policy>;
+    conciergeChat: OnyxEntry<OnyxTypes.Report>;
+    currentUserAccountIDParam: number;
+    currentUserEmailParam: string;
+    shouldCreateControlPolicy?: boolean;
+    type?: PolicyType;
+    hasActiveAdminPolicies: boolean;
+    hasOwnedPaidPolicy: boolean;
+    isAnnualSubscription?: boolean;
+    /** AccountID of the delegate acting on behalf of the current user */
+    delegateAccountID: number | undefined;
+};
+
+/**
+ * Create a new draft workspace and navigate to it
+ */
+function createWorkspaceWithPolicyDraftAndNavigateToIt(params: CreateWorkspaceWithPolicyDraftParams) {
+    const {
+        introSelected,
+        policyOwner,
+        policyName,
+        transitionFromOldDot = false,
+        makeMeAdmin = false,
+        backTo = '',
+        policyID = '',
+        currency,
+        file,
+        routeToNavigateAfterCreate,
+        activePolicy,
+        conciergeChat,
+        currentUserAccountIDParam,
+        currentUserEmailParam,
+        shouldCreateControlPolicy,
+        type,
+        isSelfTourViewed,
+        hasActiveAdminPolicies,
+        hasOwnedPaidPolicy,
+        isAnnualSubscription = false,
+        delegateAccountID,
+    } = params;
+
+    const policyIDWithDefault = policyID || generatePolicyID();
+    createDraftInitialWorkspace({
+        introSelected,
+        workspaceName: policyName,
+        currentUserAccountID: currentUserAccountIDParam,
+        currentUserEmail: currentUserEmailParam,
+        currency,
+        policyID: policyIDWithDefault,
+        makeMeAdmin,
+        file,
+        type,
+    });
+    Navigation.isNavigationReady().then(() => {
+        if (transitionFromOldDot) {
+            // We must call goBack() to remove the /transition route from history
+            Navigation.goBack();
+        }
+        const routeToNavigate = routeToNavigateAfterCreate ?? ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithDefault, backTo);
+        savePolicyDraftByNewWorkspace({
+            policyID: policyIDWithDefault,
+            policyName,
+            policyOwner,
+            makeMeAdmin,
+            currency,
+            file,
+            introSelected,
+            activePolicy,
+            conciergeChat,
+            currentUserAccountIDParam,
+            currentUserEmailParam,
+            shouldCreateControlPolicy,
+            type,
+            isSelfTourViewed,
+            hasActiveAdminPolicies,
+            hasOwnedPaidPolicy,
+            isAnnualSubscription,
+            delegateAccountID,
+        });
+
+        if (transitionFromOldDot) {
+            Navigation.navigate(routeToNavigate);
+        } else if (Navigation.isTopmostRouteModalScreen()) {
+            // `revealRouteBeforeDismissingModal` only works for fullscreen targets. Modal targets
+            // (e.g. workspace confirmation success) still need to open after the current RHP closes.
+            if (willRouteNavigateToRHP(routeToNavigate)) {
+                Navigation.dismissModal({
+                    afterTransition: () => Navigation.navigate(routeToNavigate),
+                });
+                return;
+            }
+
+            WorkspaceCreationReveal.beginRevealUnderRHP();
+            Navigation.revealRouteBeforeDismissingModal(routeToNavigate);
+        } else {
+            Navigation.navigate(routeToNavigate, {forceReplace: true});
+        }
+    });
+}
+
+function createWorkspaceWithPolicyDraft(params: CreateWorkspaceWithPolicyDraftParams) {
+    const {
+        introSelected,
+        policyName,
+        makeMeAdmin = false,
+        policyID = '',
+        currency,
+        file,
+        activePolicy,
+        conciergeChat,
+        currentUserAccountIDParam,
+        currentUserEmailParam,
+        shouldCreateControlPolicy,
+        isSelfTourViewed,
+        hasActiveAdminPolicies,
+        delegateAccountID,
+        hasOwnedPaidPolicy,
+    } = params;
+
+    createDraftInitialWorkspace({
+        introSelected,
+        workspaceName: policyName,
+        currentUserAccountID: currentUserAccountIDParam,
+        currentUserEmail: currentUserEmailParam,
+        currency,
+        policyID,
+        makeMeAdmin,
+        file,
+    });
+    savePolicyDraftByNewWorkspace({
+        policyID,
+        policyName,
+        makeMeAdmin,
+        currency,
+        file,
+        introSelected,
+        activePolicy,
+        conciergeChat,
+        currentUserAccountIDParam,
+        currentUserEmailParam,
+        shouldCreateControlPolicy,
+        isSelfTourViewed,
+        hasActiveAdminPolicies,
+        delegateAccountID,
+        hasOwnedPaidPolicy,
+    });
+}
+
+type SavePolicyDraftByNewWorkspaceParams = {
+    isSelfTourViewed: boolean | undefined;
+    policyID?: string;
+    policyName: string;
+    policyOwner?: PolicyOwner;
+    makeMeAdmin?: boolean;
+    currency?: string;
+    file?: File;
+    introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
+    activePolicy: OnyxEntry<OnyxTypes.Policy>;
+    conciergeChat: OnyxEntry<OnyxTypes.Report>;
+    currentUserAccountIDParam: number;
+    currentUserEmailParam: string;
+    shouldCreateControlPolicy?: boolean;
+    type?: PolicyType;
+    hasActiveAdminPolicies: boolean;
+    hasOwnedPaidPolicy: boolean;
+    isAnnualSubscription?: boolean;
+    delegateAccountID: number | undefined;
+};
+
+/**
+ * Create a new workspace and delete the draft
+ */
+function savePolicyDraftByNewWorkspace({
+    policyID,
+    policyName,
+    policyOwner,
+    makeMeAdmin = false,
+    currency = '',
+    file,
+    introSelected,
+    activePolicy,
+    conciergeChat,
+    currentUserAccountIDParam,
+    currentUserEmailParam,
+    shouldCreateControlPolicy,
+    type,
+    isSelfTourViewed,
+    hasActiveAdminPolicies,
+    hasOwnedPaidPolicy,
+    isAnnualSubscription = false,
+    delegateAccountID,
+}: SavePolicyDraftByNewWorkspaceParams) {
+    createWorkspace({
+        policyOwner,
+        makeMeAdmin,
+        policyName,
+        policyID,
+        engagementChoice: isTrackOnboardingChoice(introSelected?.choice) ? CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE : CONST.ONBOARDING_CHOICES.MANAGE_TEAM,
+        currency,
+        file,
+        introSelected,
+        activePolicy,
+        conciergeChat,
+        currentUserAccountIDParam,
+        currentUserEmailParam,
+        shouldCreateControlPolicy,
+        type,
+        isSelfTourViewed,
+        hasActiveAdminPolicies,
+        hasOwnedPaidPolicy,
+        isAnnualSubscription,
+        delegateAccountID,
+    });
+}
+
+/**
+ * This action runs when the Navigator is ready and the current route changes
+ *
+ * currentPath should be the path as reported by the NavigationContainer
+ *
+ * The transition link contains an exitTo param that contains the route to
+ * navigate to after the user is signed in. A user can transition from OldDot
+ * with a different account than the one they are currently signed in with, so
+ * we only navigate if they are not signing in as a new user. Once they are
+ * signed in as that new user, this action will run again and the navigation
+ * will occur.
+
+ * When the exitTo route is 'workspace/new', we create a new
+ * workspace and navigate to it
+ */
+type SetUpPoliciesAndNavigateParams = {
+    session: OnyxEntry<OnyxTypes.Session>;
+    introSelected: OnyxEntry<OnyxTypes.IntroSelected>;
+    currency: string;
+    activePolicy: OnyxEntry<OnyxTypes.Policy>;
+    isSelfTourViewed: boolean | undefined;
+    hasActiveAdminPolicies: boolean;
+    lastWorkspaceNumber: number | undefined;
+    translate: LocalizedTranslate;
+    conciergeChat: OnyxEntry<OnyxTypes.Report>;
+    policyOwnerAccountID: number | undefined;
+    policyOwnerDisplayName: string | undefined;
+    hasOwnedPaidPolicy: boolean;
+    delegateAccountID: number | undefined;
+};
+
+function setUpPoliciesAndNavigate({
+    session,
+    introSelected,
+    currency,
+    activePolicy,
+    isSelfTourViewed,
+    hasActiveAdminPolicies,
+    hasOwnedPaidPolicy,
+    lastWorkspaceNumber,
+    translate,
+    conciergeChat,
+    policyOwnerAccountID,
+    policyOwnerDisplayName,
+    delegateAccountID,
+}: SetUpPoliciesAndNavigateParams) {
+    const currentUrl = getCurrentUrl();
+    if (!session || !currentUrl?.includes('exitTo')) {
+        return;
+    }
+
+    const isLoggingInAsNewUser = !!session.email && isLoggingInAsNewUserSessionUtils(currentUrl, session.email);
+    const url = new URL(currentUrl);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the exitTo query param holds a route path coming from a transition link
+    const exitTo = url.searchParams.get('exitTo') as Route | null;
+
+    // Approved Accountants and Guides can enter a flow where they make a workspace for other users,
+    // and those are passed as a search parameter when using transition links
+    const policyOwnerEmail = url.searchParams.get('ownerEmail') ?? session.email ?? '';
+    const makeMeAdmin = !!url.searchParams.get('makeMeAdmin');
+    const policyName = url.searchParams.get('policyName') ?? '';
+
+    // Sign out the current user if we're transitioning with a different user
+    const isTransitioning = Str.startsWith(url.pathname, Str.normalizeUrl(ROUTES.TRANSITION_BETWEEN_APPS));
+
+    const shouldCreateFreePolicy = !isLoggingInAsNewUser && isTransitioning && exitTo === ROUTES.WORKSPACE_NEW;
+    if (shouldCreateFreePolicy) {
+        createWorkspaceWithPolicyDraftAndNavigateToIt({
+            introSelected,
+            currency,
+            policyOwner: {email: policyOwnerEmail, accountID: policyOwnerAccountID},
+            policyName: policyName || generateDefaultWorkspaceName(policyOwnerEmail, policyOwnerDisplayName, lastWorkspaceNumber, translate),
+            transitionFromOldDot: true,
+            makeMeAdmin,
+            activePolicy,
+            conciergeChat,
+            currentUserAccountIDParam: session.accountID ?? CONST.DEFAULT_NUMBER_ID,
+            currentUserEmailParam: session.email ?? '',
+            isSelfTourViewed,
+            hasActiveAdminPolicies,
+            delegateAccountID,
+            hasOwnedPaidPolicy,
+        });
+        return;
+    }
+    if (!isLoggingInAsNewUser && exitTo) {
+        Navigation.waitForProtectedRoutes().then(() => {
+            Navigation.navigate(exitTo);
+        });
+    }
+}
+
+export {createWorkspaceWithPolicyDraft, createWorkspaceWithPolicyDraftAndNavigateToIt, setUpPoliciesAndNavigate};
diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
index 8022dda15b06..81ab3be24593 100644
--- a/src/libs/actions/Policy/DistanceRate.ts
+++ b/src/libs/actions/Policy/DistanceRate.ts
@@ -1,3 +1,5 @@
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+
 import * as API from '@libs/API';
 import type {
     CreatePolicyDistanceRateParams,
@@ -5,6 +7,7 @@ import type {
     DisablePolicyCommuterExclusionsParams,
     EnablePolicyDistanceRatesParams,
     OpenPolicyDistanceRatesPageParams,
+    SetEmployeeWorkArrangementParams,
     SetPolicyCommuterExclusionsParams,
     SetPolicyDistanceRatesEnabledParams,
     SetPolicyDistanceRatesUnitParams,
@@ -14,20 +17,24 @@ import type {
     UpdatePolicyDistanceRateValueParams,
 } from '@libs/API/parameters';
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import DateUtils from '@libs/DateUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import Log from '@libs/Log';
+import {rand64} from '@libs/NumberUtils';
 import {buildOnyxDataForPolicyDistanceRateUpdates, getExpectedUnitForCurrency} from '@libs/PolicyDistanceRatesUtils';
 import {goBackWhenEnableFeature, removePendingFieldsFromCustomUnit} from '@libs/PolicyUtils';
+import {getRoom} from '@libs/ReportUtils';
+import {getWorkArrangementLabel} from '@libs/WorkArrangementUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {GovernmentMileageRate, TransactionViolation} from '@src/types/onyx';
+import type {GovernmentMileageRate, PersonalDetailsList, Policy, PolicyEmployee, ReportAction, TransactionViolation} from '@src/types/onyx';
 import type {ErrorFields} from '@src/types/onyx/OnyxCommon';
 import type {CommuterExclusions, CustomUnit, Rate} from '@src/types/onyx/Policy';
 import type {OnyxData} from '@src/types/onyx/Request';
 
-import type {NullishDeep, OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
 import Onyx from 'react-native-onyx';
@@ -636,6 +643,147 @@ function disablePolicyCommuterExclusions(policyID: string, previousCommuterExclu
     API.write(WRITE_COMMANDS.DISABLE_POLICY_COMMUTER_EXCLUSIONS, parameters, onyxData);
 }
 
+type WorkArrangementMemberUpdate = {
+    /** The account ID of the workspace member being updated. */
+    accountID: number;
+    /** The member's login, used as the employeeList key and in the changelog action. */
+    email: string;
+    /** The member's display name, used in the changelog message. */
+    name: string;
+    /** The member's previous office arrangement, used to restore it if the update fails. */
+    previousHasOfficeWorkArrangement: boolean | undefined;
+    /** The ID assigned to this member's optimistic changelog action. */
+    optimisticReportActionID: string;
+};
+
+/**
+ * Set the work arrangement (office-based or no regular workspace) for one or more policy members.
+ * The single command covers both individual and bulk updates: employeeAccountIDList carries every
+ * affected accountID, and one optimistic member work arrangement changelog action is
+ * created per member in the workspace admins room.
+ */
+function setEmployeeWorkArrangement(
+    policy: OnyxEntry<Policy>,
+    employeeAccountIDList: number[],
+    isOffice: boolean,
+    personalDetails: OnyxEntry<PersonalDetailsList>,
+    translate: LocalizedTranslate,
+) {
+    const policyID = policy?.id;
+    if (!policyID) {
+        return;
+    }
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+
+    const newLabel = getWorkArrangementLabel(translate, isOffice);
+    const updates: WorkArrangementMemberUpdate[] = [];
+    for (const accountID of employeeAccountIDList) {
+        const personalDetail = personalDetails?.[accountID];
+        const login = personalDetail?.login;
+        if (!login) {
+            continue;
+        }
+        const employee = policy?.employeeList?.[login];
+        if (!employee) {
+            continue;
+        }
+        const previousHasOfficeWorkArrangement = employee.hasOfficeWorkArrangement;
+        if (previousHasOfficeWorkArrangement === isOffice) {
+            continue;
+        }
+        updates.push({
+            accountID,
+            email: login,
+            name: personalDetail?.displayName ?? login,
+            previousHasOfficeWorkArrangement,
+            optimisticReportActionID: rand64(),
+        });
+    }
+
+    if (updates.length === 0) {
+        return;
+    }
+
+    const created = DateUtils.getDBTime();
+    const employeeListOptimisticUpdate: Record<string, Pick<PolicyEmployee, 'hasOfficeWorkArrangement' | 'pendingAction'>> = {};
+    const employeeListSuccessUpdate: Record<string, Pick<PolicyEmployee, 'pendingAction'>> = {};
+    const employeeListFailureUpdate: Record<string, NullishDeep<PolicyEmployee>> = {};
+    for (const update of updates) {
+        employeeListOptimisticUpdate[update.email] = {hasOfficeWorkArrangement: isOffice, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+        employeeListSuccessUpdate[update.email] = {pendingAction: null};
+        employeeListFailureUpdate[update.email] = {
+            hasOfficeWorkArrangement: update.previousHasOfficeWorkArrangement ?? null,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.editor.genericFailureMessage'),
+        };
+    }
+
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {employeeList: employeeListOptimisticUpdate},
+        },
+    ];
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {employeeList: employeeListSuccessUpdate},
+        },
+    ];
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {employeeList: employeeListFailureUpdate},
+        },
+    ];
+
+    const adminsRoom = getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, policyID);
+    if (adminsRoom?.reportID) {
+        const reportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsRoom.reportID}` as const;
+        const optimisticReportActions: Record<string, ReportAction> = {};
+        const successReportActions: Record<string, Pick<ReportAction, 'pendingAction'>> = {};
+        const failureReportActions: Record<string, null> = {};
+        for (const update of updates) {
+            const previousLabel = getWorkArrangementLabel(translate, update.previousHasOfficeWorkArrangement ?? false);
+            const text = translate('workspaceActions.updatedMemberWorkArrangement', {displayName: update.name, newArrangement: newLabel, oldArrangement: previousLabel});
+            optimisticReportActions[update.optimisticReportActionID] = {
+                reportActionID: update.optimisticReportActionID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT,
+                created,
+                shouldShow: true,
+                automatic: false,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                message: [
+                    {
+                        type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+                        html: `<muted-text>${text}</muted-text>`,
+                        text,
+                    },
+                ],
+                originalMessage: {
+                    accountID: update.accountID,
+                    email: update.email,
+                    name: update.name,
+                    newValue: isOffice,
+                    oldValue: update.previousHasOfficeWorkArrangement ?? false,
+                },
+            };
+            successReportActions[update.optimisticReportActionID] = {pendingAction: null};
+            failureReportActions[update.optimisticReportActionID] = null;
+        }
+        optimisticData.push({onyxMethod: Onyx.METHOD.MERGE, key: reportActionsKey, value: optimisticReportActions});
+        successData.push({onyxMethod: Onyx.METHOD.MERGE, key: reportActionsKey, value: successReportActions});
+        failureData.push({onyxMethod: Onyx.METHOD.MERGE, key: reportActionsKey, value: failureReportActions});
+    }
+
+    const parameters: SetEmployeeWorkArrangementParams = {policyID, employeeAccountIDList: updates.map((update) => update.accountID).join(','), isOffice};
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS> = {optimisticData, successData, failureData};
+    API.write(WRITE_COMMANDS.SET_EMPLOYEE_WORK_ARRANGEMENT, parameters, onyxData);
+}
+
 /**
  * Turn the "Require GPS or map entry" setting on or off for a policy. When it's on, the manual and odometer
  * distance flows are unavailable because neither can produce a mapped route.
@@ -861,6 +1009,7 @@ export {
     setPolicyCommuterExclusions,
     disablePolicyCommuterExclusions,
     clearPolicyCommuterExclusionsErrors,
+    setEmployeeWorkArrangement,
     setPolicyRequireMapOrGPS,
     clearPolicyRequireMapOrGPSErrors,
     setWorkspaceDistanceAutoUpdate,
diff --git a/src/libs/actions/Policy/InlineEdit.ts b/src/libs/actions/Policy/InlineEdit.ts
new file mode 100644
index 000000000000..191ef1181974
--- /dev/null
+++ b/src/libs/actions/Policy/InlineEdit.ts
@@ -0,0 +1,230 @@
+/**
+ * Validate-and-delegate helpers for inline edits on workspace settings tables.
+ * Table pages call these instead of the canonical Policy/Card actions so sanitization
+ * and no-op checks stay in one place. Persistence and rollback stay in those actions.
+ */
+import type PolicyData from '@hooks/usePolicyData/types';
+
+import {getCardNameError, getExpensifyCardLimitError, getExpensifyCardNewAvailableSpend, shouldShowExpensifyCardFixedLimitType} from '@libs/CardUtils';
+import {getCategoryNameError, getDecodedCategoryName} from '@libs/CategoryUtils';
+import {convertToBackendAmount} from '@libs/CurrencyUtils';
+import {getDistanceRateNameError, getDistanceRateValueError} from '@libs/PolicyDistanceRatesUtils';
+import {getPerDiemAmountError, getPerDiemNameError} from '@libs/PolicyPerDiemUtils';
+import {getCleanedTagName, getTagList} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
+import {getTagNameError} from '@libs/TagUtils';
+
+import {updateExpensifyCardLimit, updateExpensifyCardLimitType, updateExpensifyCardTitle} from '@userActions/Card';
+import {updateCompanyCardName} from '@userActions/CompanyCards';
+
+import CONST from '@src/CONST';
+import type {Card, Policy} from '@src/types/onyx';
+import type {CardLimitType} from '@src/types/onyx/Card';
+import type {CompanyCardFeedWithNumber} from '@src/types/onyx/CardFeeds';
+import type {CustomUnit, Rate} from '@src/types/onyx/Policy';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+
+import {renamePolicyCategory} from './Category';
+import {updatePolicyDistanceRateName, updatePolicyDistanceRateValue} from './DistanceRate';
+import {updateWorkspaceMembersRole} from './Member';
+import {editPerDiemRateAmount, editPerDiemRateDestination, editPerDiemRateSubrate} from './PerDiem';
+import {renamePolicyTag} from './Tag';
+
+function renameCategoryInline(policyData: PolicyData, currentName: string, newName: string, isVendorMatchingBetaEnabled: boolean | undefined): void {
+    const sanitized = StringUtils.sanitizeName(newName);
+    const currentDisplayName = getDecodedCategoryName(currentName);
+
+    if (sanitized === currentDisplayName || getCategoryNameError(policyData.categories, newName, currentDisplayName)) {
+        return;
+    }
+
+    renamePolicyCategory(policyData, {oldName: currentName, newName: sanitized}, isVendorMatchingBetaEnabled);
+}
+
+function renameTagInline(policyData: PolicyData, oldName: string, newName: string, isVendorMatchingBetaEnabled: boolean | undefined): void {
+    const sanitized = StringUtils.sanitizeName(newName);
+    const currentDisplayName = getCleanedTagName(oldName);
+    const {tags} = getTagList(policyData.tags, 0);
+
+    if (sanitized === currentDisplayName || getTagNameError(tags, newName, currentDisplayName)) {
+        return;
+    }
+
+    renamePolicyTag(policyData, {oldName, newName: sanitized}, 0, isVendorMatchingBetaEnabled);
+}
+
+function renameCompanyCardInline(domainOrWorkspaceAccountID: number, cardID: string, newName: string, bankName: CompanyCardFeedWithNumber, displayedName: string, storedName?: string): void {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (sanitized === displayedName || getCardNameError(newName)) {
+        return;
+    }
+
+    updateCompanyCardName(domainOrWorkspaceAccountID, cardID, sanitized, bankName, storedName);
+}
+
+function renameExpensifyCardInline(workspaceAccountID: number, cardID: number, newName: string, currentName: string): void {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (sanitized === currentName || getCardNameError(newName)) {
+        return;
+    }
+
+    updateExpensifyCardTitle(workspaceAccountID, cardID, sanitized, currentName);
+}
+
+function renameDistanceRateInline(policyID: string, customUnit: CustomUnit, rate: Rate, newName: string): void {
+    const sanitized = StringUtils.sanitizeName(newName);
+    const currentName = rate.name ?? '';
+    const existingRateNames = Object.values(customUnit.rates ?? {}).map((existingRate) => existingRate.name ?? '');
+
+    if (sanitized === currentName || getDistanceRateNameError(existingRateNames, newName, currentName)) {
+        return;
+    }
+
+    updatePolicyDistanceRateName(policyID, customUnit, [{...rate, name: sanitized}]);
+}
+
+function updateDistanceRateValueInline(policyID: string, customUnit: CustomUnit, rate: Rate, newRate: string, toLocaleDigit: (arg: string) => string): void {
+    if (getDistanceRateValueError(newRate, toLocaleDigit)) {
+        return;
+    }
+
+    const currentRateValue = (parseFloat((rate.rate ?? 0).toString()) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET).toFixed(CONST.MAX_TAX_RATE_DECIMAL_PLACES);
+    if (Number(newRate).toFixed(CONST.MAX_TAX_RATE_DECIMAL_PLACES) === currentRateValue) {
+        return;
+    }
+
+    updatePolicyDistanceRateValue(policyID, customUnit, [{...rate, rate: Number(newRate) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET}]);
+}
+
+function updateMemberRoleInline(policy: OnyxEntry<Policy>, memberLogin: string, accountID: number, currentRole: string | undefined, newRole: ValueOf<typeof CONST.POLICY.ROLE>): void {
+    if (!memberLogin || newRole === currentRole) {
+        return;
+    }
+
+    updateWorkspaceMembersRole(policy, [memberLogin], [accountID], newRole);
+}
+
+/**
+ * Whether an inline limit-type edit is persistable. The table page uses this to skip the confirm
+ * modal for types the write path would no-op (unchanged, Single Use on physical, or Fixed when hidden).
+ */
+function canUpdateExpensifyCardLimitTypeInline(card: Card, newLimitType: CardLimitType, fallbackLimitType?: CardLimitType): boolean {
+    if (newLimitType === card.nameValuePairs?.limitType) {
+        return false;
+    }
+
+    if (newLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE && !card.nameValuePairs?.isVirtual) {
+        return false;
+    }
+
+    return newLimitType !== CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED || shouldShowExpensifyCardFixedLimitType(card, fallbackLimitType);
+}
+
+function updateExpensifyCardLimitTypeInline(workspaceAccountID: number, card: Card, newLimitType: CardLimitType, fallbackLimitType?: CardLimitType): void {
+    if (!canUpdateExpensifyCardLimitTypeInline(card, newLimitType, fallbackLimitType)) {
+        return;
+    }
+
+    // Leave existing validity dates unchanged. Stored dates are UTC timestamps, not picker strings.
+    updateExpensifyCardLimitType({
+        workspaceAccountID,
+        cardID: card.cardID,
+        newLimitType,
+        oldCardNameValuePairs: card.nameValuePairs,
+        shouldSkipValidityDateUpdate: true,
+    });
+}
+
+/**
+ * Cents to persist from an inline dollar-string edit, or undefined when the value is invalid or unchanged.
+ * The table page uses this to skip the confirm modal; the write path uses the same result so both stay in sync.
+ */
+function getExpensifyCardLimitInlineUpdate(card: Card, newLimit: string): number | undefined {
+    if (getExpensifyCardLimitError(newLimit)) {
+        return;
+    }
+
+    const nextLimit = convertToBackendAmount(Number(newLimit));
+    if (nextLimit === (card.nameValuePairs?.unapprovedExpenseLimit ?? 0)) {
+        return;
+    }
+
+    return nextLimit;
+}
+
+/**
+ * Updates an Expensify card limit from an inline table edit. `newLimit` is the dollar amount as a string.
+ */
+function updateExpensifyCardLimitInline(workspaceAccountID: number, card: Card, newLimit: string): void {
+    const nextLimit = getExpensifyCardLimitInlineUpdate(card, newLimit);
+    if (nextLimit === undefined) {
+        return;
+    }
+
+    updateExpensifyCardLimit(
+        workspaceAccountID,
+        card.cardID,
+        nextLimit,
+        getExpensifyCardNewAvailableSpend(card, nextLimit),
+        card.nameValuePairs?.unapprovedExpenseLimit ?? 0,
+        card.availableSpend,
+        card.nameValuePairs?.isVirtual,
+    );
+}
+
+function renamePerDiemDestinationInline(policyID: string, rateID: string, customUnit: CustomUnit | undefined, currentName: string, newName: string): void {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (sanitized === currentName || getPerDiemNameError(newName)) {
+        return;
+    }
+
+    editPerDiemRateDestination(policyID, rateID, customUnit, sanitized);
+}
+
+function renamePerDiemSubrateInline(policyID: string, rateID: string, subRateID: string, customUnit: CustomUnit | undefined, currentName: string, newName: string): void {
+    const sanitized = StringUtils.sanitizeName(newName);
+
+    if (sanitized === currentName || getPerDiemNameError(newName)) {
+        return;
+    }
+
+    editPerDiemRateSubrate(policyID, rateID, subRateID, customUnit, sanitized);
+}
+
+/**
+ * Updates a per diem amount from an inline table edit. `newAmount` is the frontend dollar string.
+ */
+function updatePerDiemAmountInline(policyID: string, rateID: string, subRateID: string, customUnit: CustomUnit | undefined, currentRate: number, newAmount: string): void {
+    if (getPerDiemAmountError(newAmount)) {
+        return;
+    }
+
+    const backendAmount = convertToBackendAmount(Number(newAmount));
+    if (backendAmount === currentRate) {
+        return;
+    }
+
+    editPerDiemRateAmount(policyID, rateID, subRateID, customUnit, backendAmount);
+}
+
+export {
+    renameCategoryInline,
+    renameTagInline,
+    renameCompanyCardInline,
+    renameExpensifyCardInline,
+    renameDistanceRateInline,
+    updateDistanceRateValueInline,
+    updateMemberRoleInline,
+    canUpdateExpensifyCardLimitTypeInline,
+    getExpensifyCardLimitInlineUpdate,
+    updateExpensifyCardLimitTypeInline,
+    updateExpensifyCardLimitInline,
+    renamePerDiemDestinationInline,
+    renamePerDiemSubrateInline,
+    updatePerDiemAmountInline,
+};
diff --git a/src/libs/actions/Policy/OptimisticPolicyCategoriesAndMccGroups.ts b/src/libs/actions/Policy/OptimisticPolicyCategoriesAndMccGroups.ts
new file mode 100644
index 000000000000..b641cfa9f55a
--- /dev/null
+++ b/src/libs/actions/Policy/OptimisticPolicyCategoriesAndMccGroups.ts
@@ -0,0 +1,165 @@
+import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {PolicyCategories, PolicyCategory} from '@src/types/onyx';
+import type {MccGroup} from '@src/types/onyx/Policy';
+import type {OnyxData} from '@src/types/onyx/Request';
+
+import Onyx from 'react-native-onyx';
+
+function buildOptimisticPolicyWithExistingCategories(policyID: string, categories: PolicyCategories) {
+    const categoriesValues = Object.values(categories);
+    const optimisticCategoryMap = categoriesValues.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        if (category.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+            return acc;
+        }
+        acc[category.name] = {
+            ...category,
+            errors: null,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        };
+        return acc;
+    }, {});
+
+    const successCategoryMap = categoriesValues.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category.name] = {
+            errors: null,
+            pendingAction: null,
+        };
+        return acc;
+    }, {});
+
+    const failureCategoryMap = categoriesValues.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category.name] = {
+            errors: getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.createFailureMessage'),
+        };
+        return acc;
+    }, {});
+
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT> = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: optimisticCategoryMap,
+            },
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
+                value: null,
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: successCategoryMap,
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: failureCategoryMap,
+            },
+        ],
+    };
+
+    return onyxData;
+}
+
+function buildOptimisticPolicyCategories(policyID: string, categories: readonly string[]) {
+    const optimisticCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category] = {
+            name: category,
+            enabled: true,
+            errors: null,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        };
+        return acc;
+    }, {});
+
+    const successCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category] = {
+            errors: null,
+            pendingAction: null,
+        };
+        return acc;
+    }, {});
+
+    const failureCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category] = {
+            errors: getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.createFailureMessage'),
+        };
+        return acc;
+    }, {});
+
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT> = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: optimisticCategoryMap,
+            },
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
+                value: null,
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: successCategoryMap,
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: failureCategoryMap,
+            },
+        ],
+    };
+
+    return onyxData;
+}
+
+const DEFAULT_MCC_GROUP: Record<string, MccGroup> = Object.fromEntries(
+    Object.entries(CONST.POLICY.DEFAULT_MCC_GROUPS).map(([groupID, definition]) => [
+        groupID,
+        {
+            ...definition,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        },
+    ]),
+);
+
+type DefaultMccGroupID = keyof typeof CONST.POLICY.DEFAULT_MCC_GROUPS;
+
+function isDefaultMccGroupID(groupID: string): groupID is DefaultMccGroupID {
+    return Object.hasOwn(CONST.POLICY.DEFAULT_MCC_GROUPS, groupID);
+}
+
+function buildOptimisticMccGroup() {
+    const optimisticMccGroup: Record<'mccGroup', Record<string, MccGroup>> = {
+        mccGroup: Object.fromEntries(Object.entries(DEFAULT_MCC_GROUP).map(([groupID, group]) => [groupID, {...group}])),
+    };
+
+    const successMccGroup: Record<'mccGroup', Record<string, Partial<MccGroup>>> = {mccGroup: {}};
+    for (const key of Object.keys(optimisticMccGroup.mccGroup)) {
+        successMccGroup.mccGroup[key] = {pendingAction: null};
+    }
+
+    const mccGroupData = {
+        optimisticData: optimisticMccGroup,
+        successData: successMccGroup,
+        failureData: {mccGroup: null},
+    };
+
+    return mccGroupData;
+}
+
+export {buildOptimisticMccGroup, buildOptimisticPolicyCategories, buildOptimisticPolicyWithExistingCategories, DEFAULT_MCC_GROUP, isDefaultMccGroupID};
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index fa0b82ebe2cd..80ac4cc931f9 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -84,13 +84,13 @@ import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import DateUtils from '@libs/DateUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import {buildCopiedExpenseDefaultRules} from '@libs/ExpenseDefaultRuleUtils';
 import {createFile, splitExtensionFromFileName} from '@libs/fileDownload/FileUtils';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import getWorkspaceCreatedAnalyticsEvent from '@libs/getWorkspaceCreatedAnalyticsEvent';
 import GoogleTagManager from '@libs/GoogleTagManager';
 import Log from '@libs/Log';
 import {buildOptimisticNextStep} from '@libs/NextStepUtils';
-import * as NumberUtils from '@libs/NumberUtils';
 import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PhoneNumber from '@libs/PhoneNumber';
@@ -104,6 +104,7 @@ import {
     navigateToExpensifyCardPage,
 } from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import {isApprovalWorkflowRule} from '@libs/RuleUtils';
 import {getNegatedAmountTransaction} from '@libs/TransactionUtils';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 
@@ -149,7 +150,6 @@ import type {
     AutoReportingOffset,
     CompanyAddress,
     CreatableWorkspaceType,
-    CustomUnit,
     NetSuiteCustomList,
     NetSuiteCustomSegment,
     PolicyReportField,
@@ -170,10 +170,19 @@ import type {TupleToUnion, ValueOf} from 'type-fest';
 import {formatInTimeZone} from 'date-fns-tz';
 import {addDays} from 'date-fns/addDays';
 import {subMinutes} from 'date-fns/subMinutes';
-import {PUBLIC_DOMAINS_SET, Str} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 
-import {buildOptimisticMccGroup, buildOptimisticPolicyCategories, buildOptimisticPolicyWithExistingCategories} from './Category';
+import type {PolicyOwner} from './PolicyDraft';
+
+import {buildOptimisticMccGroup, buildOptimisticPolicyCategories, buildOptimisticPolicyWithExistingCategories} from './OptimisticPolicyCategoriesAndMccGroups';
+import {
+    buildOptimisticDistanceRateCustomUnits,
+    createDraftInitialWorkspace,
+    generateCustomUnitID,
+    generateDefaultWorkspaceName,
+    generatePolicyID,
+    getDisplayNameForWorkspace,
+} from './PolicyDraft';
 
 type ReportCreationData = Record<
     string,
@@ -211,13 +220,6 @@ type CreatePolicyExpenseChatsParams = {
     doesPersonalDetailExistByAccountID: Record<number, boolean>;
 };
 
-type OptimisticCustomUnits = {
-    customUnits: Record<string, CustomUnit>;
-    customUnitID: string;
-    customUnitRateID: string;
-    outputCurrency: string;
-};
-
 type WorkspaceFromIOUCreationData = {
     policyID: string;
     workspaceChatReportID: string;
@@ -253,11 +255,6 @@ type CurrentUser = {
     avatar?: AvatarSource;
 };
 
-type PolicyOwner = {
-    email: string | undefined;
-    accountID: number | undefined;
-};
-
 type BuildPolicyDataOptions = {
     policyOwner?: PolicyOwner;
     makeMeAdmin?: boolean;
@@ -273,7 +270,6 @@ type BuildPolicyDataOptions = {
     userReportedIntegrationName?: string;
     isAnnualSubscription?: boolean;
     featuresMap?: Array<Pick<Feature, 'id' | 'enabled' | 'enabledByDefault' | 'requiresUpdate'>>;
-    lastUsedPaymentMethod?: LastPaymentMethodType;
     // `doesPersonalDetailExist` is threaded from the caller's useOnyx(PERSONAL_DETAILS_LIST) so createPolicyExpenseChats
     // doesn't read the deprecated module-level copy. It's paired with the participant so it's required whenever an admin is added.
     adminParticipant?: {participant: Participant; doesPersonalDetailExist: boolean};
@@ -282,7 +278,6 @@ type BuildPolicyDataOptions = {
     activePolicy: OnyxEntry<Policy>;
     currentUserAccountIDParam: number;
     currentUserEmailParam: string;
-    allReportsParam?: OnyxCollection<Report>;
     conciergeChat: OnyxEntry<Report>;
     onboardingPurposeSelected?: OnboardingPurpose;
     shouldAddGuideWelcomeMessage?: boolean;
@@ -290,7 +285,6 @@ type BuildPolicyDataOptions = {
     type?: CreatableWorkspaceType;
     // TODO: Make it required once we complete refactoring the buildPolicyData function to use isSelfTourViewed. Refactor issue: https://github.com/Expensify/App/issues/66424
     isSelfTourViewed?: boolean;
-    hasActiveAdminPolicies: boolean | undefined;
     /** AccountID of the delegate acting on behalf of the current user */
     delegateAccountID: number | undefined;
     /** Whether the current user already owns a paid workspace. CreatePolicy leaves the #admins room unpinned when they do. */
@@ -301,6 +295,8 @@ type BuildPolicyDataOptions = {
 // TODO: Remove this type once we complete refactoring the buildPolicyData function to use isSelfTourViewed. Refactor issue: https://github.com/Expensify/App/issues/66424
 type CreateWorkspaceDataOptions = Omit<BuildPolicyDataOptions, 'isSelfTourViewed'> & {
     isSelfTourViewed: boolean | undefined;
+    /** Only read by createWorkspace (first-workspace GTM event). buildPolicyData no longer consumes it. */
+    hasActiveAdminPolicies: boolean | undefined;
 };
 
 type DuplicatePolicyDataOptions = {
@@ -314,6 +310,7 @@ type DuplicatePolicyDataOptions = {
     file?: File | CustomRNImageManipulatorResult;
     policyCategories?: PolicyCategories;
     localCurrency: string;
+    rules?: OnyxCollection<Rule>;
     personalDetailsByLogins?: PersonalDetailsByLogin;
 };
 
@@ -1116,7 +1113,9 @@ function setWorkspaceApprovalMode(
 
     if (approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL && rules) {
         for (const [ruleKey, rule] of Object.entries(rules)) {
-            if (!rule || rule.scope !== CONST.RULES.SCOPE.POLICY || rule.scopeID !== policyID) {
+            // The rules collection holds every kind of rule, so only the approval workflow ones are removed here.
+            // Expense default rules on the same policy have nothing to do with approvals and have to survive.
+            if (!rule || rule.scope !== CONST.RULES.SCOPE.POLICY || rule.scopeID !== policyID || !isApprovalWorkflowRule(rule)) {
                 continue;
             }
             const ruleID = ruleKey.slice(ONYXKEYS.COLLECTION.RULE.length);
@@ -2482,178 +2481,6 @@ function clearDuplicateWorkspace() {
     Onyx.set(ONYXKEYS.DUPLICATE_WORKSPACE, {});
 }
 
-function getDisplayNameForWorkspace(email: string, userDisplayName: string | undefined, localeTranslate: LocalizedTranslate) {
-    const emailParts = email.split('@');
-    const domain = emailParts.at(1) ?? '';
-    const isSMSDomain = `@${domain}` === CONST.SMS.DOMAIN;
-    if (isSMSDomain) {
-        return localeTranslate('workspace.new.myGroupWorkspace', {});
-    }
-
-    if (!PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) {
-        return Str.UCFirst(domain.split('.').at(0) ?? '');
-    }
-
-    const displayName = userDisplayName?.trim();
-    if (displayName) {
-        return Str.UCFirst(displayName);
-    }
-
-    const username = emailParts.at(0) ?? '';
-    return Str.UCFirst(username);
-}
-
-/**
- * Generate a policy name based on an email and the last workspace number.
- */
-function generateDefaultWorkspaceName(email: string, displayName: string | undefined, lastWorkspaceNumber: number | undefined, localeTranslate: LocalizedTranslate): string {
-    const emailParts = email.split('@');
-    if (emailParts?.length !== 2) {
-        return '';
-    }
-    const domain = emailParts.at(1) ?? '';
-    const isSMSDomain = `@${domain}` === CONST.SMS.DOMAIN;
-
-    if (isSMSDomain) {
-        return localeTranslate('workspace.new.myGroupWorkspace', {workspaceNumber: lastWorkspaceNumber !== undefined ? lastWorkspaceNumber + 1 : undefined});
-    }
-
-    const displayNameForWorkspace = getDisplayNameForWorkspace(email, displayName, localeTranslate);
-
-    return localeTranslate('workspace.new.workspaceName', displayNameForWorkspace, lastWorkspaceNumber !== undefined ? lastWorkspaceNumber + 1 : undefined);
-}
-
-/**
- * Returns a client generated 16 character hexadecimal value for the policyID
- */
-function generatePolicyID(): string {
-    return NumberUtils.generateHexadecimalValue(16);
-}
-
-/**
- * Returns a client generated 13 character hexadecimal value for a custom unit ID
- */
-function generateCustomUnitID(): string {
-    return NumberUtils.generateHexadecimalValue(13);
-}
-
-function buildOptimisticDistanceRateCustomUnits(currencyParam: string | undefined): OptimisticCustomUnits {
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- Disabling this line for safeness as nullish coalescing works only if the value is undefined or null
-    const currency = currencyParam || CONST.CURRENCY.USD;
-    const customUnitID = generateCustomUnitID();
-    const customUnitRateID = generateCustomUnitID();
-
-    const customUnits: Record<string, CustomUnit> = {
-        [customUnitID]: {
-            customUnitID,
-            name: CONST.CUSTOM_UNITS.NAME_DISTANCE,
-            attributes: {
-                unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
-            },
-            rates: {
-                [customUnitRateID]: {
-                    customUnitRateID,
-                    name: CONST.CUSTOM_UNITS.DEFAULT_RATE,
-                    rate: CONST.CUSTOM_UNITS.MILEAGE_IRS_RATE * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
-                    enabled: true,
-                    currency,
-                },
-            },
-        },
-    };
-
-    return {
-        customUnits,
-        customUnitID,
-        customUnitRateID,
-        outputCurrency: currency,
-    };
-}
-
-type CreateDraftInitialWorkspaceParams = {
-    introSelected: OnyxEntry<IntroSelected>;
-    workspaceName: string;
-    currentUserAccountID: number;
-    currentUserEmail: string;
-    currency: string | undefined;
-    policyID?: string;
-    makeMeAdmin?: boolean;
-    file?: File;
-    type?: CreatableWorkspaceType;
-    isAnnualSubscription?: boolean;
-};
-
-/**
- * Optimistically creates a Policy Draft for a new workspace
- */
-function createDraftInitialWorkspace({
-    introSelected,
-    workspaceName,
-    currentUserAccountID,
-    currentUserEmail,
-    currency,
-    policyID = generatePolicyID(),
-    makeMeAdmin = false,
-    file,
-    type = CONST.POLICY.TYPE.TEAM,
-    isAnnualSubscription = false,
-}: CreateDraftInitialWorkspaceParams) {
-    const {customUnits, outputCurrency} = buildOptimisticDistanceRateCustomUnits(currency);
-    const shouldEnableWorkflowsByDefault =
-        !introSelected?.choice || introSelected.choice === CONST.ONBOARDING_CHOICES.MANAGE_TEAM || introSelected.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
-
-    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY_DRAFTS>> = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
-            value: {
-                id: policyID,
-                type: type || (isAnnualSubscription ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM),
-                name: workspaceName,
-                role: CONST.POLICY.ROLE.ADMIN,
-                owner: currentUserEmail,
-                ownerAccountID: currentUserAccountID,
-                areCategoriesEnabled: true,
-                approver: currentUserEmail,
-                areCompanyCardsEnabled: true,
-                areExpensifyCardsEnabled: false,
-                outputCurrency,
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                customUnits,
-                makeMeAdmin,
-                autoReporting: true,
-                autoReportingFrequency: shouldEnableWorkflowsByDefault ? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE : CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
-                avatarURL: file?.uri ?? null,
-                harvesting: {
-                    enabled: !shouldEnableWorkflowsByDefault,
-                },
-                originalFileName: file?.name,
-                employeeList: {
-                    [currentUserEmail]: {
-                        submitsTo: currentUserEmail,
-                        email: currentUserEmail,
-                        role: CONST.POLICY.ROLE.ADMIN,
-                        errors: {},
-                    },
-                },
-                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
-                pendingFields: {
-                    autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                    approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                    reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                areWorkflowsEnabled: shouldEnableWorkflowsByDefault,
-                defaultBillable: false,
-                defaultReimbursable: true,
-                disabledFields: {defaultBillable: true, reimbursable: false},
-                requiresCategory: true,
-            },
-        },
-    ];
-
-    Onyx.update(optimisticData);
-}
-
 type BuildPolicyDataKeys =
     | typeof ONYXKEYS.COLLECTION.POLICY
     | typeof ONYXKEYS.COLLECTION.REPORT_METADATA
@@ -2668,7 +2495,6 @@ type BuildPolicyDataKeys =
     | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES
     | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT
     | typeof ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS
-    | typeof ONYXKEYS.NVP_LAST_PAYMENT_METHOD
     | typeof ONYXKEYS.PERSONAL_DETAILS_LIST;
 
 function getRoleForNewWorkspaceMember(isSubmitWorkspace: boolean, makeMeAdmin: boolean): ValueOf<typeof CONST.POLICY.ROLE> {
@@ -2756,20 +2582,17 @@ function buildPolicyData(options: BuildPolicyDataOptions): OnyxData<BuildPolicyD
         userReportedIntegrationName,
         isAnnualSubscription = false,
         featuresMap,
-        lastUsedPaymentMethod,
         adminParticipant,
         hasOutstandingChildRequest = true,
         introSelected,
         activePolicy,
         currentUserAccountIDParam,
         currentUserEmailParam,
-        allReportsParam,
         shouldAddGuideWelcomeMessage = true,
         onboardingPurposeSelected,
         shouldCreateControlPolicy = false,
         type,
         isSelfTourViewed,
-        hasActiveAdminPolicies,
         delegateAccountID,
         hasOwnedPaidPolicy,
         personalTrackGoal,
@@ -3014,7 +2837,6 @@ function buildPolicyData(options: BuildPolicyDataOptions): OnyxData<BuildPolicyD
             | typeof ONYXKEYS.COLLECTION.REPORT
             | typeof ONYXKEYS.COLLECTION.REPORT_METADATA
             | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS
-            | typeof ONYXKEYS.NVP_LAST_PAYMENT_METHOD
             | typeof ONYXKEYS.NVP_ONBOARDING
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT
@@ -3177,30 +2999,6 @@ function buildPolicyData(options: BuildPolicyDataOptions): OnyxData<BuildPolicyD
         successData.push(...optimisticCategoriesData.successData);
     }
 
-    if (!hasActiveAdminPolicies && lastUsedPaymentMethod) {
-        for (const report of Object.values(allReportsParam ?? {})) {
-            if (report?.type !== CONST.REPORT.TYPE.IOU) {
-                continue;
-            }
-
-            if (lastUsedPaymentMethod?.iou?.name || !report?.policyID) {
-                continue;
-            }
-
-            successData.push({
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
-                value: {
-                    [report?.policyID]: {
-                        iou: {
-                            name: policyID,
-                        },
-                    },
-                },
-            });
-        }
-    }
-
     // We need to clone the file to prevent non-indexable errors.
     const clonedFile = file ? (createFile(file) as File) : undefined;
 
@@ -3491,7 +3289,6 @@ function buildOptimisticDuplicatePolicy(
     const isPerDiemFeatureSelected = duplicatedParts?.perDiem;
     const isOverviewFeatureSelected = duplicatedParts?.overview;
     const isTravelFeatureSelected = duplicatedParts?.travel;
-    const isCodingRulesFeatureSelected = duplicatedParts?.codingRules;
     const duplicatedOutputCurrency = isOverviewFeatureSelected ? sourcePolicy?.outputCurrency : duplicatedLocalCurrency;
 
     const filterPendingDeleteData = <T>(data?: Record<string, T>): Record<string, T> | undefined =>
@@ -3506,7 +3303,6 @@ function buildOptimisticDuplicatePolicy(
               ) as Record<string, T>)
             : undefined;
 
-    const codingRulesWithoutPendingDelete = filterPendingDeleteData(sourcePolicy?.rules?.codingRules);
     const willCopyRulesDocument = isOverviewFeatureSelected && !!sourcePolicy?.rulesDocumentURL;
     const employeeListWithoutPendingDelete = filterPendingDeleteData(sourcePolicy?.employeeList);
     const fieldListWithoutPendingDelete = filterPendingDeleteData(sourcePolicy?.fieldList);
@@ -3554,7 +3350,7 @@ function buildOptimisticDuplicatePolicy(
             customUnitRateID: duplicatedCustomUnitRateID,
         }),
         taxRates: isTaxesFeatureSelected ? taxRatesWithoutPendingDelete : undefined,
-        rules: isCodingRulesFeatureSelected ? {codingRules: codingRulesWithoutPendingDelete} : undefined,
+        rules: undefined,
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         pendingFields: {
             autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
@@ -3592,6 +3388,7 @@ function buildDuplicatePolicyData(policy: Policy, options: DuplicatePolicyDataOp
         localCurrency,
         currentUserAccountID,
         currentUserEmail,
+        rules,
         personalDetailsByLogins,
     } = options;
 
@@ -3636,6 +3433,7 @@ function buildDuplicatePolicyData(policy: Policy, options: DuplicatePolicyDataOp
             | typeof ONYXKEYS.COLLECTION.REPORT_DRAFT
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT
+            | typeof ONYXKEYS.COLLECTION.RULE
         >
     > = [
         {
@@ -3713,6 +3511,7 @@ function buildDuplicatePolicyData(policy: Policy, options: DuplicatePolicyDataOp
             | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT
+            | typeof ONYXKEYS.COLLECTION.RULE
         >
     > = [
         {
@@ -3799,6 +3598,7 @@ function buildDuplicatePolicyData(policy: Policy, options: DuplicatePolicyDataOp
             | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES
             | typeof ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT
+            | typeof ONYXKEYS.COLLECTION.RULE
         >
     > = [
         {
@@ -3841,6 +3641,17 @@ function buildDuplicatePolicyData(policy: Policy, options: DuplicatePolicyDataOp
         successData.push(...optimisticCategoriesData.successData);
     }
 
+    // Merchant rules are their own collection keyed per rule, and each rule names the policy it belongs to,
+    // so the duplicate gets fresh rules rather than a copy of the source's. The server mints its own IDs,
+    // which is why the optimistic copies are dropped once it responds.
+    const copiedRules = parts?.codingRules ? buildCopiedExpenseDefaultRules(rules, policy?.id, targetPolicyID) : {};
+    for (const [ruleID, rule] of Object.entries(copiedRules)) {
+        const ruleKey = `${ONYXKEYS.COLLECTION.RULE}${ruleID}` as const;
+        optimisticData.push({onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: rule});
+        successData.push({onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: null});
+        failureData.push({onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: null});
+    }
+
     // We need to clone the file to prevent non-indexable errors.
     const clonedFile = file ? createFile(file as File) : undefined;
 
@@ -4731,7 +4542,8 @@ function createWorkspaceFromIOUPayment({
     // Next we need to convert the IOU report to Expense report.
     // We need to change:
     // - report type
-    // - change the sign of the report total
+    // - change the sign of every total column (`total` plus the reimbursable/non-reimbursable and unheld siblings),
+    //   because the Total on screen is read from `reimbursableTotal` in preference to `total`
     // - update its policyID and policyName
     // - update the chatReportID to point to the new expense chat
     // - recompute reportName so the header and the policy expense chat preview don't show the stale "IOU" name
@@ -4742,7 +4554,7 @@ function createWorkspaceFromIOUPayment({
         policyID,
         policyName: workspaceName,
         type: CONST.REPORT.TYPE.EXPENSE,
-        total: -(iouReport?.total ?? 0),
+        ...ReportUtils.getNegatedReportTotals(iouReport),
         fieldList: newWorkspace.fieldList,
     };
 
diff --git a/src/libs/actions/Policy/PolicyDraft.ts b/src/libs/actions/Policy/PolicyDraft.ts
new file mode 100644
index 000000000000..0d3c28c802ae
--- /dev/null
+++ b/src/libs/actions/Policy/PolicyDraft.ts
@@ -0,0 +1,204 @@
+/**
+ * Draft-workspace builders kept outside `Policy.ts` so callers that only need them do not import the policy action module, which
+ * pulls in `ReportUtils`, `PolicyUtils` and the task action layer and closes an import cycle.
+ */
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+
+import {generateHexadecimalValue} from '@libs/NumberUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {IntroSelected} from '@src/types/onyx';
+import type {CreatableWorkspaceType, CustomUnit} from '@src/types/onyx/Policy';
+
+import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+
+import {PUBLIC_DOMAINS_SET, Str} from 'expensify-common';
+import Onyx from 'react-native-onyx';
+
+type PolicyOwner = {
+    email: string | undefined;
+    accountID: number | undefined;
+};
+
+type OptimisticCustomUnits = {
+    customUnits: Record<string, CustomUnit>;
+    customUnitID: string;
+    customUnitRateID: string;
+    outputCurrency: string;
+};
+
+function getDisplayNameForWorkspace(email: string, userDisplayName: string | undefined, localeTranslate: LocalizedTranslate) {
+    const emailParts = email.split('@');
+    const domain = emailParts.at(1) ?? '';
+    const isSMSDomain = `@${domain}` === CONST.SMS.DOMAIN;
+    if (isSMSDomain) {
+        return localeTranslate('workspace.new.myGroupWorkspace', {});
+    }
+
+    if (!PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) {
+        return Str.UCFirst(domain.split('.').at(0) ?? '');
+    }
+
+    const displayName = userDisplayName?.trim();
+    if (displayName) {
+        return Str.UCFirst(displayName);
+    }
+
+    const username = emailParts.at(0) ?? '';
+    return Str.UCFirst(username);
+}
+
+/**
+ * Generate a policy name based on an email and the last workspace number.
+ */
+function generateDefaultWorkspaceName(email: string, displayName: string | undefined, lastWorkspaceNumber: number | undefined, localeTranslate: LocalizedTranslate): string {
+    const emailParts = email.split('@');
+    if (emailParts?.length !== 2) {
+        return '';
+    }
+    const domain = emailParts.at(1) ?? '';
+    const isSMSDomain = `@${domain}` === CONST.SMS.DOMAIN;
+
+    if (isSMSDomain) {
+        return localeTranslate('workspace.new.myGroupWorkspace', {workspaceNumber: lastWorkspaceNumber !== undefined ? lastWorkspaceNumber + 1 : undefined});
+    }
+
+    const displayNameForWorkspace = getDisplayNameForWorkspace(email, displayName, localeTranslate);
+
+    return localeTranslate('workspace.new.workspaceName', displayNameForWorkspace, lastWorkspaceNumber !== undefined ? lastWorkspaceNumber + 1 : undefined);
+}
+
+/**
+ * Returns a client generated 16 character hexadecimal value for the policyID
+ */
+function generatePolicyID(): string {
+    return generateHexadecimalValue(16);
+}
+
+/**
+ * Returns a client generated 13 character hexadecimal value for a custom unit ID
+ */
+function generateCustomUnitID(): string {
+    return generateHexadecimalValue(13);
+}
+
+function buildOptimisticDistanceRateCustomUnits(currencyParam: string | undefined): OptimisticCustomUnits {
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- Disabling this line for safeness as nullish coalescing works only if the value is undefined or null
+    const currency = currencyParam || CONST.CURRENCY.USD;
+    const customUnitID = generateCustomUnitID();
+    const customUnitRateID = generateCustomUnitID();
+
+    const customUnits: Record<string, CustomUnit> = {
+        [customUnitID]: {
+            customUnitID,
+            name: CONST.CUSTOM_UNITS.NAME_DISTANCE,
+            attributes: {
+                unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+            },
+            rates: {
+                [customUnitRateID]: {
+                    customUnitRateID,
+                    name: CONST.CUSTOM_UNITS.DEFAULT_RATE,
+                    rate: CONST.CUSTOM_UNITS.MILEAGE_IRS_RATE * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
+                    enabled: true,
+                    currency,
+                },
+            },
+        },
+    };
+
+    return {
+        customUnits,
+        customUnitID,
+        customUnitRateID,
+        outputCurrency: currency,
+    };
+}
+
+type CreateDraftInitialWorkspaceParams = {
+    introSelected: OnyxEntry<IntroSelected>;
+    workspaceName: string;
+    currentUserAccountID: number;
+    currentUserEmail: string;
+    currency: string | undefined;
+    policyID?: string;
+    makeMeAdmin?: boolean;
+    file?: File;
+    type?: CreatableWorkspaceType;
+    isAnnualSubscription?: boolean;
+};
+
+/**
+ * Optimistically creates a Policy Draft for a new workspace
+ */
+function createDraftInitialWorkspace({
+    introSelected,
+    workspaceName,
+    currentUserAccountID,
+    currentUserEmail,
+    currency,
+    policyID = generatePolicyID(),
+    makeMeAdmin = false,
+    file,
+    type = CONST.POLICY.TYPE.TEAM,
+    isAnnualSubscription = false,
+}: CreateDraftInitialWorkspaceParams) {
+    const {customUnits, outputCurrency} = buildOptimisticDistanceRateCustomUnits(currency);
+    const shouldEnableWorkflowsByDefault =
+        !introSelected?.choice || introSelected.choice === CONST.ONBOARDING_CHOICES.MANAGE_TEAM || introSelected.choice === CONST.ONBOARDING_CHOICES.LOOKING_AROUND;
+
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY_DRAFTS>> = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
+            value: {
+                id: policyID,
+                type: type || (isAnnualSubscription ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM),
+                name: workspaceName,
+                role: CONST.POLICY.ROLE.ADMIN,
+                owner: currentUserEmail,
+                ownerAccountID: currentUserAccountID,
+                areCategoriesEnabled: true,
+                approver: currentUserEmail,
+                areCompanyCardsEnabled: true,
+                areExpensifyCardsEnabled: false,
+                outputCurrency,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                customUnits,
+                makeMeAdmin,
+                autoReporting: true,
+                autoReportingFrequency: shouldEnableWorkflowsByDefault ? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE : CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
+                avatarURL: file?.uri ?? null,
+                harvesting: {
+                    enabled: !shouldEnableWorkflowsByDefault,
+                },
+                originalFileName: file?.name,
+                employeeList: {
+                    [currentUserEmail]: {
+                        submitsTo: currentUserEmail,
+                        email: currentUserEmail,
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        errors: {},
+                    },
+                },
+                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+                pendingFields: {
+                    autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                areWorkflowsEnabled: shouldEnableWorkflowsByDefault,
+                defaultBillable: false,
+                defaultReimbursable: true,
+                disabledFields: {defaultBillable: true, reimbursable: false},
+                requiresCategory: true,
+            },
+        },
+    ];
+
+    Onyx.update(optimisticData);
+}
+
+export type {PolicyOwner};
+export {buildOptimisticDistanceRateCustomUnits, createDraftInitialWorkspace, generateCustomUnitID, generateDefaultWorkspaceName, generatePolicyID, getDisplayNameForWorkspace};
diff --git a/src/libs/actions/Policy/Rules.ts b/src/libs/actions/Policy/Rules.ts
index ecfc94346434..197ece413bd5 100644
--- a/src/libs/actions/Policy/Rules.ts
+++ b/src/libs/actions/Policy/Rules.ts
@@ -1,4 +1,6 @@
 import {getImportFailedFinalModal} from '@libs/actions/ImportSpreadsheet';
+// Namespace import on purpose. `rulesdir/no-api-side-effects-method` only matches member calls, so importing
+// `makeRequestWithSideEffects` by name would quietly switch that guardrail off.
 import * as API from '@libs/API';
 import type {
     AddPolicyAgentRuleParams,
@@ -10,18 +12,21 @@ import type {
 import type OpenPolicyRulesPageParams from '@libs/API/parameters/OpenPolicyRulesPageParams';
 import type SetPolicyCodingRuleParams from '@libs/API/parameters/SetPolicyCodingRuleParams';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
-import * as ErrorUtils from '@libs/ErrorUtils';
+import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+import {buildMerchantRule, isExpenseDefaultTaxValue} from '@libs/ExpenseDefaultRuleUtils';
+import type {BuiltMerchantRule, MerchantRuleFormValues} from '@libs/ExpenseDefaultRuleUtils';
 import Log from '@libs/Log';
-import * as NumberUtils from '@libs/NumberUtils';
-import Parser from '@libs/Parser';
+import {getIsOffline} from '@libs/NetworkState';
+import {rand64} from '@libs/NumberUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {MerchantRuleForm} from '@src/types/form';
+import type {ExpenseDefaultAction} from '@src/types/onyx/ExpenseDefaultRules';
 import type {ImportFinalModal} from '@src/types/onyx/ImportedSpreadsheet';
 import type Policy from '@src/types/onyx/Policy';
-import type {AgentRule, CodingRule, CodingRuleFilter, CodingRuleTax} from '@src/types/onyx/Policy';
+import type {AgentRule, CodingRule, CodingRuleFilter} from '@src/types/onyx/Policy';
 import type {OnyxData} from '@src/types/onyx/Request';
+import type Rule from '@src/types/onyx/Rule';
 
 import type {OnyxUpdate} from 'react-native-onyx';
 
@@ -31,91 +36,146 @@ import Onyx from 'react-native-onyx';
 type ImportedMerchantRule = Omit<CodingRule, 'ruleID' | 'pendingAction' | 'errors'>;
 
 /**
- * Builds the tax object from a tax key and policy
+ * Builds the `codingRuleValue` sent to `SetPolicyCodingRule`. Writes go through the legacy command rather than
+ * `SetRule` because it dual-writes into both `policy.rules.codingRules` and the `rules_` collection, while
+ * `SetRule` only writes the new collection. Older clients read `codingRules`, so writing only the new collection
+ * would silently stop them seeing rules created or edited on a newer client. This whole path goes away once the
+ * minimum supported version reads the `rules_` collection.
+ *
+ * This reads the built rule rather than the form so the optimistic Onyx value and the saved rule share one
+ * definition of what an empty field is. Reading the form separately let a padded merchant, a whitespace-only
+ * description, or a tax selected before the rates loaded reach the server after the rule had already dropped it.
  */
-function buildTaxObject(taxKey: string | undefined, policy: Policy | undefined): CodingRuleTax | undefined {
-    if (!taxKey || !policy?.taxRates?.taxes) {
-        return undefined;
+function buildLegacyCodingRule(ruleValue: BuiltMerchantRule, ruleID: string, created: string): Partial<CodingRule> {
+    const {FIELD} = CONST.RULES.EXPENSE_DEFAULT;
+    const {ACTIONS: ACTION} = CONST.RULES;
+
+    const valuesByField = new Map<string, ExpenseDefaultAction['value']>();
+    for (const action of Object.values(ruleValue.actions)) {
+        if (action.name !== ACTION.SET) {
+            continue;
+        }
+        valuesByField.set(action.field, action.value);
     }
 
-    const tax = policy.taxRates.taxes[taxKey];
-    if (!tax) {
-        return undefined;
-    }
+    const getStringValue = (field: string): string | undefined => {
+        const value = valuesByField.get(field);
+        return typeof value === 'string' ? value : undefined;
+    };
+    const getBooleanValue = (field: string): boolean | undefined => {
+        const value = valuesByField.get(field);
+        return typeof value === 'boolean' ? value : undefined;
+    };
+
+    const taxValue = valuesByField.get(FIELD.TAX);
+    const tax = isExpenseDefaultTaxValue(taxValue) ? taxValue : undefined;
+    const merchant = getStringValue(FIELD.MERCHANT);
+    const category = getStringValue(FIELD.CATEGORY);
+    const tag = getStringValue(FIELD.TAG);
+    const vendorID = getStringValue(FIELD.VENDOR_ID);
+    const comment = getStringValue(FIELD.COMMENT);
+    const reimbursable = getBooleanValue(FIELD.REIMBURSABLE);
+    const billable = getBooleanValue(FIELD.BILLABLE);
+
+    const {left, operator, right} = ruleValue.filters;
 
     return {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        field_id_TAX: {
-            externalID: taxKey,
-            value: tax.value,
-            name: tax.name,
+        ruleID,
+        filters: {
+            left,
+            operator,
+            right: typeof right === 'string' ? right : String(right),
         },
+        ...(merchant && {merchant}),
+        ...(category && {category}),
+        ...(tag && {tag}),
+        ...(tax && {tax}),
+        ...(vendorID && {vendorID}),
+        ...(comment && {comment}),
+        ...(reimbursable !== undefined && {reimbursable}),
+        ...(billable !== undefined && {billable}),
+        created,
     };
 }
 
+/** How long a `GetRules` read may stay marked in flight before the flag is treated as stale. */
+const RULES_FETCH_TIMEOUT_MS = 30 * 1000;
+
+let staleRulesFetchTimeoutID: ReturnType<typeof setTimeout> | undefined;
+
 /**
- * Converts a markdown comment to HTML using Parser.replace().
- * Returns null if the comment is empty or undefined.
+ * Fetches every rule the user has access to. The response SETs the whole `rules_` collection.
+ *
+ * Two flags rather than one: the in-flight flag is set before the request so a second screen mounting
+ * during it waits instead of sending its own, and so a deep linked editor can hold off on rendering
+ * not-found. The fetched flag is only set once the collection has actually arrived.
  */
-function convertCommentToHTML(comment: string | undefined): string | null {
-    if (!comment) {
-        return null;
+function getRules() {
+    // A read is discarded rather than queued when there is no connectivity, and a discarded request applies
+    // neither its success nor its failure data. Sending one offline would leave the in-flight flag set for the
+    // rest of the session, which blocks every later fetch.
+    if (getIsOffline()) {
+        return;
     }
-    return Parser.replace(comment);
-}
 
-/**
- * Maps form fields to rule properties with null for empty values.
- * Used for Onyx to properly remove cleared fields during merge.
- */
-function mapFormFieldsToRuleForOnyx(form: MerchantRuleForm, policy: Policy | undefined) {
-    return {
-        merchant: form.merchant || null,
-        category: form.category || null,
-        tag: form.tag || null,
-        tax: buildTaxObject(form.tax, policy) ?? null,
-        vendorID: form.vendorID || null,
-        comment: convertCommentToHTML(form.comment),
-        reimbursable: form.reimbursable ?? null,
-        billable: form.billable ?? null,
-    };
+    type RulesFetchKey = typeof ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED | typeof ONYXKEYS.RAM_ONLY_IS_LOADING_RULES;
+
+    const optimisticData: Array<OnyxUpdate<RulesFetchKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.RAM_ONLY_IS_LOADING_RULES,
+            value: true,
+        },
+    ];
+    const successData: Array<OnyxUpdate<RulesFetchKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.RAM_ONLY_IS_LOADING_RULES,
+            value: false,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED,
+            value: true,
+        },
+    ];
+    const failureData: Array<OnyxUpdate<RulesFetchKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.RAM_ONLY_IS_LOADING_RULES,
+            value: false,
+        },
+        {
+            // A failed attempt still counts as one. Left false, the prefetch hook sees a fetch as needed again the
+            // moment the in-flight flag clears, so a server error retries for as long as the screen stays mounted.
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED,
+            value: true,
+        },
+    ];
+
+    API.read(READ_COMMANDS.GET_RULES, {}, {optimisticData, successData, failureData});
+
+    // A read that throws, which is what a 5xx, a 429 or a socket error does, applies neither its success nor its
+    // failure data, and `API.read` reports nothing back to the caller. Without a bound the in-flight flag would
+    // outlive its request and block every later fetch for the session. Clearing a flag that is already false once
+    // the response has landed costs nothing, so the timer runs either way.
+    clearTimeout(staleRulesFetchTimeoutID);
+    staleRulesFetchTimeoutID = setTimeout(() => {
+        Onyx.set(ONYXKEYS.RAM_ONLY_IS_LOADING_RULES, false);
+    }, RULES_FETCH_TIMEOUT_MS);
 }
 
 /**
- * Maps form fields to rule properties, omitting empty values.
- * Used for API to avoid sending null values.
+ * Clears the fetch flags so the next screen that needs the collection fetches it again.
+ *
+ * A read that never settles, such as one sent as the connection drops, applies neither its success nor its
+ * failure data, which leaves the in-flight flag set and blocks every later fetch. Connectivity returning is the
+ * point at which that stale state is known to be wrong.
  */
-function mapFormFieldsToRuleForAPI(form: MerchantRuleForm, policy: Policy | undefined): Partial<CodingRule> {
-    const rule: Partial<CodingRule> = {};
-
-    if (form.merchant) {
-        rule.merchant = form.merchant;
-    }
-    if (form.category) {
-        rule.category = form.category;
-    }
-    if (form.tag) {
-        rule.tag = form.tag;
-    }
-    const tax = buildTaxObject(form.tax, policy);
-    if (tax) {
-        rule.tax = tax;
-    }
-    if (form.vendorID) {
-        rule.vendorID = form.vendorID;
-    }
-    const commentHTML = convertCommentToHTML(form.comment);
-    if (commentHTML) {
-        rule.comment = commentHTML;
-    }
-    if (form.reimbursable !== undefined) {
-        rule.reimbursable = form.reimbursable;
-    }
-    if (form.billable !== undefined) {
-        rule.billable = form.billable;
-    }
-
-    return rule;
+function resetRulesFetchState() {
+    Onyx.set(ONYXKEYS.RAM_ONLY_IS_LOADING_RULES, false);
+    Onyx.set(ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED, false);
 }
 
 /**
@@ -168,104 +228,56 @@ function getAgentRuleSuggestions(policyID: string | undefined) {
 }
 
 /**
- * Creates or updates a coding rule for the given policy
- * @param policyID - The ID of the policy to create/update the rule for
- * @param form - The form data for the merchant rule
- * @param policy - The policy object (needed to build tax data)
- * @param ruleID - Optional existing rule ID for updates
- * @param shouldUpdateMatchingTransactions - Whether to update transactions that match the rule
+ * Creates or updates a merchant rule. Editing a rule reuses its `ruleID`, since the rules engine has no separate update command.
+ * @param policyID - The ID of the policy the rule belongs to
+ * @param formValues - The merchant rule editor's values
+ * @param policy - Used to resolve the selected tax rate
+ * @param ruleID - The ID of the rule being edited, or undefined to create one
+ * @param existingRule - The rule being edited, restored on failure
+ * @param shouldUpdateMatchingTransactions - Whether to apply the rule to transactions that already match it
  */
-function setPolicyCodingRule(policyID: string, form: MerchantRuleForm, policy: Policy | undefined, ruleID?: string, shouldUpdateMatchingTransactions = false) {
-    if (!policyID || !form.merchantToMatch) {
-        Log.warn('Invalid params for setPolicyCodingRule', {policyID, merchantToMatch: form.merchantToMatch});
+function setMerchantRule(
+    policyID: string,
+    formValues: Partial<MerchantRuleFormValues>,
+    policy: Policy | undefined,
+    ruleID?: string,
+    existingRule?: Rule,
+    shouldUpdateMatchingTransactions = false,
+) {
+    const ruleValue = buildMerchantRule(formValues, policy);
+
+    if (!policyID || !ruleValue) {
+        Log.warn('Invalid params for setMerchantRule', {policyID, merchantToMatch: formValues.merchantToMatch});
         return;
     }
 
     const isEditing = !!ruleID;
-    const existingRule = isEditing ? policy?.rules?.codingRules?.[ruleID] : undefined;
-
-    // Build rule with nulls for Onyx (to remove cleared fields) and without nulls for API
-    const ruleFieldsForOnyx = mapFormFieldsToRuleForOnyx(form, policy);
-    const ruleFieldsForAPI = mapFormFieldsToRuleForAPI(form, policy);
-
-    const targetRuleID = ruleID ?? NumberUtils.rand64();
-    const operator = form.matchType ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
+    const targetRuleID = ruleID ?? rand64();
+    const ruleKey = `${ONYXKEYS.COLLECTION.RULE}${targetRuleID}` as const;
     const created = existingRule?.created ?? new Date().toISOString();
 
-    const pendingAction = isEditing ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
-    const ruleForOnyx = {
-        ruleID: targetRuleID,
-        filters: {
-            left: 'merchant',
-            operator,
-            right: form.merchantToMatch,
-        },
-        ...ruleFieldsForOnyx,
+    const optimisticRule: Rule = {
+        ...ruleValue,
+        scope: CONST.RULES.SCOPE.POLICY,
+        scopeID: policyID,
+        priority: CONST.RULES.EXPENSE_DEFAULT.PRIORITY,
         created,
-        pendingAction,
+        pendingAction: isEditing ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
     };
 
-    // Rule for API (excludes null values)
-    const ruleForAPI: Partial<CodingRule> = {
-        ruleID: targetRuleID,
-        filters: {
-            left: 'merchant',
-            operator,
-            right: form.merchantToMatch,
-        },
-        ...ruleFieldsForAPI,
-        created,
-    };
-
-    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
-
-    // On failure: for new rules, remove the optimistic rule; for edits, restore the original rule
-    const failureRuleValue = isEditing ? existingRule : null;
-
-    const onyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: policyKey,
-                value: {
-                    rules: {
-                        codingRules: {
-                            [targetRuleID]: ruleForOnyx,
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: policyKey,
-                value: {
-                    rules: {
-                        codingRules: {
-                            [targetRuleID]: {
-                                pendingAction: null,
-                                errors: null,
-                            },
-                        },
-                    },
-                },
-            },
-        ],
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.RULE> = {
+        // SET rather than MERGE: clearing a field removes its action, and a merge would leave the stale one behind.
+        optimisticData: [{onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: {...optimisticRule, errors: null}}],
+        successData: [{onyxMethod: Onyx.METHOD.MERGE, key: ruleKey, value: {pendingAction: null, errors: null}}],
         failureData: [
             {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: policyKey,
+                onyxMethod: Onyx.METHOD.SET,
+                key: ruleKey,
+                // Keep the rule visible with its error so the admin can retry or dismiss it, restoring the pre-edit value.
                 value: {
-                    rules: {
-                        codingRules: {
-                            [targetRuleID]: {
-                                ...failureRuleValue,
-                                pendingAction: isEditing ? null : CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
-                            },
-                        },
-                    },
+                    ...(isEditing && existingRule ? existingRule : optimisticRule),
+                    pendingAction: isEditing ? null : CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
                 },
             },
         ],
@@ -274,7 +286,7 @@ function setPolicyCodingRule(policyID: string, form: MerchantRuleForm, policy: P
     const parameters: SetPolicyCodingRuleParams = {
         policyID,
         codingRuleID: targetRuleID,
-        codingRuleValue: JSON.stringify(ruleForAPI),
+        codingRuleValue: JSON.stringify(buildLegacyCodingRule(ruleValue, targetRuleID, created)),
         shouldUpdateMatchingTransactions,
     };
 
@@ -351,69 +363,34 @@ function getTransactionsMatchingCodingRule(policyID: string, filters: CodingRule
 }
 
 /**
- * Deletes a coding rule from the given policy
- * @param policyID - The ID of the policy to delete the rule from
+ * Deletes a merchant rule
+ * @param policyID - The ID of the policy the rule belongs to
  * @param ruleID - The ID of the rule to delete
+ * @param rule - The rule being deleted, restored on failure
  */
-function deletePolicyCodingRule(policy: Policy, ruleID: string) {
-    if (!policy.id || !ruleID) {
-        Log.warn('Invalid params for deletePolicyCodingRule');
+function deleteMerchantRule(policyID: string, ruleID: string, rule: Rule | undefined) {
+    if (!policyID || !ruleID) {
+        Log.warn('Invalid params for deleteMerchantRule', {policyID, ruleID});
         return;
     }
 
-    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policy.id}` as const;
-    const existingRule = policy.rules?.codingRules?.[ruleID];
+    const ruleKey = `${ONYXKEYS.COLLECTION.RULE}${ruleID}` as const;
 
-    const onyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: policyKey,
-                value: {
-                    rules: {
-                        codingRules: {
-                            [ruleID]: {
-                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                            },
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: policyKey,
-                value: {
-                    rules: {
-                        codingRules: {
-                            [ruleID]: null,
-                        },
-                    },
-                },
-            },
-        ],
+    const onyxData: OnyxData<typeof ONYXKEYS.COLLECTION.RULE> = {
+        optimisticData: [{onyxMethod: Onyx.METHOD.MERGE, key: ruleKey, value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, errors: null}}],
+        successData: [{onyxMethod: Onyx.METHOD.SET, key: ruleKey, value: null}],
         failureData: [
             {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: policyKey,
-                value: {
-                    rules: {
-                        codingRules: {
-                            [ruleID]: {
-                                ...existingRule,
-                                pendingAction: null,
-                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
-                            },
-                        },
-                    },
-                },
+                onyxMethod: Onyx.METHOD.SET,
+                key: ruleKey,
+                value: rule ? {...rule, pendingAction: null, errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')} : null,
             },
         ],
     };
 
+    // An empty codingRuleValue tells SetPolicyCodingRule to delete rather than upsert the rule.
     const parameters: SetPolicyCodingRuleParams = {
-        policyID: policy.id,
+        policyID,
         codingRuleID: ruleID,
         codingRuleValue: '',
         shouldUpdateMatchingTransactions: false,
@@ -474,7 +451,7 @@ function addPolicyAgentRule(policyID: string, agentRuleID: string, prompt: strin
                         agentRules: {
                             [agentRuleID]: {
                                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
                             },
                         },
                     },
@@ -547,7 +524,7 @@ function updatePolicyAgentRule(policyID: string, agentRuleID: string, prompt: st
                                 prompt: previousPrompt,
                                 title: previousTitle ?? null,
                                 pendingAction: null,
-                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
                             },
                         },
                     },
@@ -613,7 +590,7 @@ function deletePolicyAgentRule(policy: Policy, agentRuleID: string) {
                             [agentRuleID]: {
                                 ...existingRule,
                                 pendingAction: null,
-                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
                             },
                         },
                     },
@@ -630,33 +607,20 @@ function deletePolicyAgentRule(policy: Policy, agentRuleID: string) {
     API.write(WRITE_COMMANDS.DELETE_POLICY_AGENT_RULE, parameters, onyxData);
 }
 
-function clearPolicyCodingRuleErrors(policyID: string, ruleID: string, rule: CodingRule | undefined) {
+function clearMerchantRuleErrors(ruleID: string, rule: Rule | undefined) {
     if (!rule) {
         return;
     }
 
-    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    const ruleKey = `${ONYXKEYS.COLLECTION.RULE}${ruleID}` as const;
 
+    // A rule that never made it to the server has nothing to keep once its error is dismissed.
     if (rule.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
-        Onyx.merge(policyKey, {
-            rules: {
-                codingRules: {
-                    [ruleID]: null,
-                },
-            },
-        });
+        Onyx.set(ruleKey, null);
         return;
     }
 
-    Onyx.merge(policyKey, {
-        rules: {
-            codingRules: {
-                [ruleID]: {
-                    errors: null,
-                },
-            },
-        },
-    });
+    Onyx.merge(ruleKey, {errors: null});
 }
 
 function clearPolicyAgentRuleErrors(policyID: string, agentRuleID: string, agentRule: AgentRule | undefined) {
@@ -691,16 +655,16 @@ function clearPolicyAgentRuleErrors(policyID: string, agentRuleID: string, agent
 export {
     openPolicyRulesPage,
     getAgentRuleSuggestions,
-    mapFormFieldsToRuleForOnyx,
-    mapFormFieldsToRuleForAPI,
-    setPolicyCodingRule,
+    getRules,
+    resetRulesFetchState,
+    setMerchantRule,
     importMerchantRulesSpreadsheet,
-    deletePolicyCodingRule,
+    deleteMerchantRule,
     getTransactionsMatchingCodingRule,
     addPolicyAgentRule,
     updatePolicyAgentRule,
     deletePolicyAgentRule,
-    clearPolicyCodingRuleErrors,
+    clearMerchantRuleErrors,
     clearPolicyAgentRuleErrors,
 };
 export type {ImportedMerchantRule};
diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
index a3c1e5260c85..1de9238e9b14 100644
--- a/src/libs/actions/Policy/Tag.ts
+++ b/src/libs/actions/Policy/Tag.ts
@@ -80,7 +80,46 @@ function openPolicyTagsPage(policyID: string) {
         policyID,
     };
 
-    API.read(READ_COMMANDS.OPEN_POLICY_TAGS_PAGE, params);
+    type TagsLoadingKey = typeof ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE;
+    const loadingStateKey = `${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE}${policyID}` as const;
+
+    const optimisticData: Array<OnyxUpdate<TagsLoadingKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: loadingStateKey,
+            value: {isLoading: true},
+        },
+    ];
+
+    // `hasOnceLoaded` is only ever written here, so a read that never landed leaves the policy eligible for a retry.
+    // The collection existing in Onyx cannot stand in for this: it may hold only the tag already on the expense.
+    const successData: Array<OnyxUpdate<TagsLoadingKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: loadingStateKey,
+            value: {isLoading: false, hasOnceLoaded: true},
+        },
+    ];
+
+    const failureData: Array<OnyxUpdate<TagsLoadingKey>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: loadingStateKey,
+            value: {isLoading: false},
+        },
+    ];
+
+    API.read(READ_COMMANDS.OPEN_POLICY_TAGS_PAGE, params, {optimisticData, successData, failureData});
+}
+
+/**
+ * Clears the in-flight flag for a policy's tags read.
+ *
+ * A read cut off by a disconnect never gets a response, so its `failureData` never applies and `isLoading` would stay
+ * true for the rest of the session, blocking every retry. Callers clear it on reconnect.
+ */
+function clearPolicyTagsLoadingState(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE}${policyID}`, {isLoading: false});
 }
 
 type BuildOptimisticPolicyRecentlyUsedTagsProps = {
@@ -1482,6 +1521,7 @@ export {
     deletePolicyTags,
     enablePolicyTags,
     openPolicyTagsPage,
+    clearPolicyTagsLoadingState,
     renamePolicyTag,
     renamePolicyTagList,
     setWorkspaceTagEnabled,
diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 862425100c7e..fcf980837f6c 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -90,6 +90,7 @@ import capturePageHTML from '@libs/PageHTMLCapture';
 import {prunePagesToNewestWindow} from '@libs/PaginationUtils';
 import Parser from '@libs/Parser';
 import {getParsedMessageWithShortMentions} from '@libs/ParsingUtils';
+import {getAllPersonalDetails} from '@libs/PersonalDetailsStore';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import {isMapOrGPSRequired} from '@libs/PolicyDistanceRatesUtils';
 import {
@@ -138,6 +139,7 @@ import {
     getChildReportNotificationPreference,
     getDefaultNotificationPreferenceForReport,
     getLastVisibleMessage,
+    getNegatedReportTotals,
     getNextApproverAccountID,
     getOptimisticDataForAncestors,
     getOriginalReportID,
@@ -228,6 +230,7 @@ import type {
     AnyRequest,
     Attachment,
     BankAccountList,
+    CardList,
     IntroSelected,
     InvitedEmailsToAccountIDs,
     NewGroupChatDraft,
@@ -461,6 +464,7 @@ type MergeReportsProps = {
     hash?: number;
     bankAccountList: OnyxEntry<BankAccountList>;
     rules: OnyxCollection<Rule>;
+    cardList: OnyxEntry<CardList>;
     isTrackIntentUser: boolean | undefined;
     personalPolicyOutputCurrency: string | undefined;
     selfDMReportActions: OnyxEntry<ReportActions>;
@@ -540,14 +544,6 @@ function flagReportNavigatedAway(reportID: string | undefined) {
     reportsNavigatedAwayFrom.add(reportID);
 }
 
-let allPersonalDetails: OnyxEntry<PersonalDetailsList> = {};
-Onyx.connect({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (value) => {
-        allPersonalDetails = value ?? {};
-    },
-});
-
 /**
  * Builds a partial PersonalDetailsList containing only the records passed in. Skips entries with no accountID.
  */
@@ -1984,8 +1980,8 @@ function openReport(params: OpenReportActionParams) {
 
         let emailCreatingAction: string = CONST.REPORT.OWNER_EMAIL_FAKE;
         if (newReportObject.ownerAccountID && newReportObject.ownerAccountID !== CONST.REPORT.OWNER_ACCOUNT_ID_FAKE) {
-            // TODO: allPersonalDetails fallback should be removed in follow-up PRs https://github.com/Expensify/App/issues/73656
-            emailCreatingAction = (personalDetails ?? allPersonalDetails)?.[newReportObject.ownerAccountID]?.login ?? '';
+            // TODO: getAllPersonalDetails() fallback should be removed in follow-up PRs https://github.com/Expensify/App/issues/73656
+            emailCreatingAction = (personalDetails ?? getAllPersonalDetails())?.[newReportObject.ownerAccountID]?.login ?? '';
         }
         const optimisticCreatedAction = buildOptimisticCreatedReportAction({emailCreatingAction});
         optimisticData.push(
@@ -2023,8 +2019,8 @@ function openReport(params: OpenReportActionParams) {
         const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins(participantLoginList);
         for (const [index, login] of participantLoginList.entries()) {
             const accountID = participantAccountIDs.at(index) ?? -1;
-            // TODO: allPersonalDetails fallback should be removed in follow-up PRs https://github.com/Expensify/App/issues/73656
-            const isOptimisticAccount = !(personalDetails ?? allPersonalDetails)?.[accountID];
+            // TODO: getAllPersonalDetails() fallback should be removed in follow-up PRs https://github.com/Expensify/App/issues/73656
+            const isOptimisticAccount = !(personalDetails ?? getAllPersonalDetails())?.[accountID];
 
             if (!isOptimisticAccount) {
                 continue;
@@ -3666,6 +3662,7 @@ function editReportComment(
     currentUserLogin: string,
     personalDetails: OnyxEntry<PersonalDetailsList>,
     videoAttributeCache?: Record<string, string>,
+    reportIDToName?: Record<string, string>,
 ) {
     const originalReportID = originalReport?.reportID;
     if (!originalReportID || !originalReportAction) {
@@ -3678,7 +3675,7 @@ function editReportComment(
     // https://github.com/Expensify/App/issues/9090
     // https://github.com/Expensify/App/issues/13221
     const originalCommentHTML = ReportActionsUtils.getReportActionHtml(originalReportAction);
-    const originalCommentMarkdown = Parser.htmlToMarkdown(originalCommentHTML ?? '').trim();
+    const originalCommentMarkdown = Parser.htmlToMarkdown(originalCommentHTML ?? '', {reportIDToName}).trim();
     const shouldRemoveQueuedAttachment = isUploadingAttachmentRemovedFromDraft(textForNewComment, originalCommentHTML);
     const draftForNewComment = replaceLocalAttachmentReferences(textForNewComment, originalCommentHTML, originalReportAction.reportActionID);
 
@@ -4459,9 +4456,12 @@ type NavigateToConciergeChatParams = {
     /** The report action to open the Concierge chat on. */
     reportActionID?: string;
 
-    // TODO: personalDetails should be a required field in follow-up PRs https://github.com/Expensify/App/issues/73656
-    /** Personal details used to build the Concierge chat when it does not exist yet. */
-    personalDetails?: OnyxEntry<PersonalDetailsList>;
+    /**
+     * Personal details used to build the Concierge chat when it does not exist yet. Only Concierge's record is read, so
+     * callers should pass a list narrowed to it (see `usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE])`) instead of
+     * subscribing to the whole personal details list.
+     */
+    conciergePersonalDetails: OnyxEntry<PersonalDetailsList>;
 
     /**
      * The report the user was viewing when they opened Concierge from the side-pane button (native). Threaded onto
@@ -4482,7 +4482,7 @@ function navigateToConciergeChat({
     checkIfCurrentPageActive = () => true,
     linkToOptions,
     reportActionID,
-    personalDetails,
+    conciergePersonalDetails,
     sourceReportID,
 }: NavigateToConciergeChatParams): Promise<void> {
     // If conciergeReportID contains a concierge report ID, we navigate to the concierge chat using the stored report ID.
@@ -4499,7 +4499,11 @@ function navigateToConciergeChat({
             }
             navigateToAndOpenReport({
                 userLogins: [CONST.EMAIL.CONCIERGE],
-                personalDetails,
+                // The list was captured before onServerDataReady(), so it can be stale when OpenApp only just loaded Concierge.
+                // When Concierge is missing from it, pass undefined so openReport reads the live list instead of treating Concierge
+                // as a new account and merging an optimistic personal detail over the real one.
+                // TODO: Remove this fallback together with the allPersonalDetails Onyx.connect https://github.com/Expensify/App/issues/73656
+                personalDetails: conciergePersonalDetails?.[CONST.ACCOUNT_ID.CONCIERGE] ? conciergePersonalDetails : undefined,
                 currentUserAccountID,
                 introSelected,
                 // The Concierge chat does not exist yet on this path (it is being created here), so there is no report to thread.
@@ -4996,7 +5000,7 @@ function navigateToConciergeChatAndDeleteReport(
         isSelfTourViewed,
         shouldDismissModal: false,
         linkToOptions: {afterTransition: () => deleteReport(reportID, shouldDeleteChildReports)},
-        personalDetails,
+        conciergePersonalDetails: personalDetails,
     });
 }
 
@@ -5282,6 +5286,7 @@ function navigateToMostRecentReport(
     currentUserAccountID: number,
     introSelected: OnyxEntry<IntroSelected>,
     isSelfTourViewed: boolean | undefined,
+    personalDetails: OnyxEntry<PersonalDetailsList>,
     lastAccessedReportID?: string,
 ) {
     if (lastAccessedReportID) {
@@ -5302,7 +5307,15 @@ function navigateToMostRecentReport(
             Navigation.goBack();
         }
 
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false, linkToOptions: {forceReplace: true}});
+        navigateToConciergeChat({
+            conciergeReportID,
+            introSelected,
+            currentUserAccountID,
+            isSelfTourViewed,
+            conciergePersonalDetails: personalDetails,
+            shouldDismissModal: false,
+            linkToOptions: {forceReplace: true},
+        });
     }
 }
 
@@ -5346,6 +5359,7 @@ function leaveGroupChat(
     conciergeReportID: string | undefined,
     introSelected: OnyxEntry<IntroSelected>,
     isSelfTourViewed: boolean | undefined,
+    personalDetails: OnyxEntry<PersonalDetailsList>,
     lastAccessedReportID?: string,
 ) {
     const reportID = report.reportID;
@@ -5397,7 +5411,7 @@ function leaveGroupChat(
     if (isSearchTopmostFullScreenRoute()) {
         Navigation.revealRouteBeforeDismissingModal(getReportRouteForCurrentContext({reportID}));
     } else {
-        navigateToMostRecentReport(report, conciergeReportID, currentUserAccountID, introSelected, isSelfTourViewed, lastAccessedReportID);
+        navigateToMostRecentReport(report, conciergeReportID, currentUserAccountID, introSelected, isSelfTourViewed, personalDetails, lastAccessedReportID);
     }
     API.write(WRITE_COMMANDS.LEAVE_GROUP_CHAT, {reportID}, {optimisticData, successData, failureData});
 }
@@ -5409,6 +5423,7 @@ function leaveRoom(
     conciergeReportID: string | undefined,
     introSelected: OnyxEntry<IntroSelected>,
     isSelfTourViewed: boolean | undefined,
+    personalDetails: OnyxEntry<PersonalDetailsList>,
     isWorkspaceMemberLeavingWorkspaceRoom = false,
     lastAccessedReportID?: string,
 ) {
@@ -5522,7 +5537,7 @@ function leaveRoom(
         return;
     }
     // In other cases, the report is deleted and we should move the user to another report.
-    navigateToMostRecentReport(report, conciergeReportID, currentUserAccountID, introSelected, isSelfTourViewed, lastAccessedReportID);
+    navigateToMostRecentReport(report, conciergeReportID, currentUserAccountID, introSelected, isSelfTourViewed, personalDetails, lastAccessedReportID);
 }
 
 function buildInviteToRoomOnyxData(
@@ -6159,18 +6174,22 @@ async function completeOnboarding({
         personalTrackGoal,
     };
 
-    if (shouldWaitForRHPVariantInitialization) {
+    // Side-effect requests are never queued or retried, so offline we fall through to API.write.
+    // Checked twice because waitForWrites also resolves when the connection drops mid-wait.
+    if (shouldWaitForRHPVariantInitialization && !isOfflineNetwork()) {
         // Wait for the workspace to be created before completing the guided setup
         await waitForWrites(SIDE_EFFECT_REQUEST_COMMANDS.COMPLETE_GUIDED_SETUP);
 
-        // Pop onboarding nested stack after waiting so the modal doesn't rewind to step 1
-        // during the wait. Must run before the API call so useLinking processes each step
-        // pop before the optimistic data unmounts the modal.
-        resetOnboardingStackToRoot();
+        if (!isOfflineNetwork()) {
+            // Pop onboarding nested stack after waiting so the modal doesn't rewind to step 1
+            // during the wait. Must run before the API call so useLinking processes each step
+            // pop before the optimistic data unmounts the modal.
+            resetOnboardingStackToRoot();
 
-        // We need to access the nvp_onboardingRHPVariant directly from the response to redirect the user to the correct page
-        // eslint-disable-next-line rulesdir/no-api-side-effects-method
-        return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.COMPLETE_GUIDED_SETUP, parameters, {optimisticData, successData, failureData});
+            // We need to access the nvp_onboardingRHPVariant directly from the response to redirect the user to the correct page
+            // eslint-disable-next-line rulesdir/no-api-side-effects-method
+            return API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.COMPLETE_GUIDED_SETUP, parameters, {optimisticData, successData, failureData});
+        }
     }
 
     // Pop onboarding nested stack just before the API write so useLinking removes browser
@@ -6264,6 +6283,11 @@ function performServerSearch(searchInput: string, policyID?: string, isUserSearc
     const searchLoadingKey = isUserSearch ? ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_USERS : ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS;
     // We are not getting isOffline from components as useEffect change will re-trigger the search on network change
     const isOffline = isOfflineNetwork();
+
+    if (!policyID && !isUserSearch) {
+        Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, null);
+    }
+
     if (isOffline || !searchInput.trim().length) {
         Onyx.set(searchLoadingKey, false);
         return;
@@ -7652,7 +7676,7 @@ function convertIOUReportToExpenseReport(
         policyName: policy.name,
         parentReportID: optimisticPolicyExpenseChatReportID,
         type: CONST.REPORT.TYPE.EXPENSE,
-        total: -(iouReport?.total ?? 0),
+        ...getNegatedReportTotals(iouReport),
     };
 
     const nextApproverAccountID = getNextApproverAccountID(iouReport, rules, true);
@@ -8311,6 +8335,7 @@ function buildOptimisticChangePolicyData({
     // Only include transactions that match the destination currency (their amounts can be used directly)
     if (sourceCurrency && destinationCurrency && sourceCurrency !== destinationCurrency) {
         let newTotal = 0;
+        let newUnheldTotal = 0;
         let newNonReimbursableTotal = 0;
         let newUnheldNonReimbursableTotal = 0;
         let newReimbursableTotal = 0;
@@ -8323,6 +8348,12 @@ function buildOptimisticChangePolicyData({
             if (transactionCurrency === destinationCurrency) {
                 const transactionAmount = getAmount(transaction, true);
                 newTotal -= transactionAmount;
+                // `unheldTotal` is the signed sum of the transactions that are not on hold, so it has to be
+                // recomputed here too. `getNonHeldAndFullAmount` prefers it over the derived sum, so leaving the
+                // old-currency value behind would show the hold and Pay amounts in the source currency.
+                if (!isOnHold(transaction)) {
+                    newUnheldTotal -= transactionAmount;
+                }
                 if (!transaction.reimbursable) {
                     newNonReimbursableTotal -= transactionAmount;
                 } else {
@@ -8343,6 +8374,7 @@ function buildOptimisticChangePolicyData({
             value: {
                 currency: destinationCurrency,
                 total: newTotal,
+                unheldTotal: newUnheldTotal,
                 nonReimbursableTotal: newNonReimbursableTotal,
                 unheldNonReimbursableTotal: newUnheldNonReimbursableTotal,
                 reimbursableTotal: newReimbursableTotal,
@@ -8368,6 +8400,7 @@ function buildOptimisticChangePolicyData({
             value: {
                 currency: report.currency,
                 total: report.total,
+                unheldTotal: report.unheldTotal,
                 nonReimbursableTotal: report.nonReimbursableTotal,
                 unheldNonReimbursableTotal: report.unheldNonReimbursableTotal,
                 reimbursableTotal: report.reimbursableTotal,
@@ -8753,6 +8786,7 @@ function mergeReports({
     allReports: allReportsParam,
     allReportActions = {},
     rules,
+    cardList,
     isTrackIntentUser,
     personalPolicyOutputCurrency,
     selfDMReportActions,
@@ -8787,6 +8821,7 @@ function mergeReports({
         reports,
         rules,
         skippedReportIDs: sourceReportIDs,
+        cardList,
         isTrackIntentUser,
         personalPolicyOutputCurrency,
         selfDMReportActions,
@@ -8801,6 +8836,7 @@ function mergeReports({
         failureData: moveFailureData = [],
         transactionIDToReportActionAndThreadData = {},
         updatedReportTotals,
+        updatedReportUnheldTotals,
         updatedReportTransactionCounts,
         updatedReportNonReimbursableTotals,
         updatedReportUnheldNonReimbursableTotals,
@@ -8914,6 +8950,7 @@ function mergeReports({
             optimisticSnapshotData[`${ONYXKEYS.COLLECTION.REPORT}${destinationReportID}`] = {
                 ...destinationReport,
                 total: updatedReportTotals?.[destinationReportID] ?? destinationReport.total,
+                unheldTotal: updatedReportUnheldTotals?.[destinationReportID] ?? destinationReport.unheldTotal,
                 transactionCount: updatedReportTransactionCounts?.[destinationReportID] ?? destinationReport.transactionCount,
                 reimbursableTotal: updatedReportReimbursableTotals?.[destinationReportID] ?? destinationReport.reimbursableTotal,
                 unheldReimbursableTotal: updatedReportUnheldReimbursableTotals?.[destinationReportID] ?? destinationReport.unheldReimbursableTotal,
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 430b67dc5938..55331b75f16f 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -18,6 +18,7 @@ import type {
     OpenSearchPageParams,
     OpenSearchTagFiltersPageParams,
     OpenSearchTagFiltersPageResponse,
+    QueueBulkMarkAsExportedParams,
     QueueExportSearchItemsToCSVParams,
     QueueExportSearchWithTemplateParams,
     ReportExportParams,
@@ -793,6 +794,12 @@ function getOnyxLoadingData(
     const isSearchRequest = isSearchAPI && !!queryJSON;
     const type = queryJSON?.type;
 
+    // Record the query string on the snapshot itself so IOU optimistic updates can later apply to every loaded
+    // snapshot whose query matches. Living on the snapshot means it is evicted together with it. It is written
+    // optimistically so snapshots first opened offline carry it, and again in finallyData because the SEARCH
+    // response can replace `snapshot.search`.
+    const inputQuery = isSearchRequest ? queryJSON.inputQuery : undefined;
+
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SNAPSHOT>> = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -801,6 +808,7 @@ function getOnyxLoadingData(
                 search: {
                     ...(isSearchAPI && shouldShowLoading && {isLoading: true}),
                     ...(isSearchRequest && {state: CONST.SEARCH.SNAPSHOT_STATE.LOADING}),
+                    ...(inputQuery && {inputQuery}),
                     ...(offset !== undefined ? {offset} : {}),
                     ...(shouldClearTotals ? {count: null, reportCount: null, total: null, currency: null} : {}),
                 },
@@ -817,14 +825,6 @@ function getOnyxLoadingData(
         },
     ];
 
-    // Side effect: record this query string under SEARCH_QUERY_BY_HASH so IOU optimistic updates
-    // can later fan to every loaded snapshot whose query matches. Done here (not via optimisticData)
-    // because this function's return type only allows snapshot keys; the matching eviction lives
-    // in the SNAPSHOT subscription in IOU/index.ts.
-    if (queryJSON?.inputQuery) {
-        Onyx.merge(ONYXKEYS.SEARCH_QUERY_BY_HASH, {[hash]: queryJSON.inputQuery});
-    }
-
     // finallyData runs for every HTTP response, including 460 responses that deliberately skip failureData.
     // It owns the terminal request state, while failureData separately records whether the request failed.
     const finallyData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.SNAPSHOT>> = [
@@ -835,6 +835,7 @@ function getOnyxLoadingData(
                 search: {
                     ...(isSearchAPI && {isLoading: false}),
                     ...(isSearchRequest && {state: CONST.SEARCH.SNAPSHOT_STATE.LOADED, type, hash}),
+                    ...(inputQuery && {inputQuery}),
                 },
             },
         },
@@ -850,10 +851,7 @@ function getOnyxLoadingData(
                 search: {
                     type,
                     ...(isSearchAPI && {isLoading: false}),
-                    // NO_RESPONSE stands for "failed with no usable response code", which covers a network-level rejection
-                    // that never reaches the server. A real HTTP failure overwrites it below once the response lands. Every
-                    // write of `errors` carries a code this way, so the error view never has to guess.
-                    ...(isSearchRequest && {hash, responseJsonCode: CONST.JSON_CODE.NO_RESPONSE}),
+                    ...(isSearchRequest && {hash}),
                 },
                 errors: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
             },
@@ -1080,6 +1078,34 @@ function openSearchCategoryFiltersPage() {
     read(READ_COMMANDS.OPEN_SEARCH_CATEGORY_FILTERS_PAGE, null, {optimisticData, successData, finallyData});
 }
 
+function openSearchVendorFiltersPage() {
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA,
+            value: true,
+        },
+    ];
+
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.IS_SEARCH_FILTERS_VENDOR_DATA_LOADED,
+            value: true,
+        },
+    ];
+
+    const finallyData: Array<OnyxUpdate<typeof ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA,
+            value: false,
+        },
+    ];
+
+    read(READ_COMMANDS.OPEN_SEARCH_VENDOR_FILTERS_PAGE, null, {optimisticData, successData, finallyData});
+}
+
 /**
  * Fetches a page of tag filter search results from the server.
  * Returns pagination metadata (hasMore, nextCursor) for infinite scroll.
@@ -1367,8 +1393,9 @@ function search({
 
                 // Store the failing code alongside the errors it produced. The snapshot is the only place this
                 // survives a reload, and the error view needs it to tell an invalid query apart from a retryable one.
-                if (typeof result?.jsonCode === 'number' && result.jsonCode !== CONST.JSON_CODE.SUCCESS) {
-                    Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}`, {search: {responseJsonCode: result.jsonCode}}).catch((error: unknown) =>
+                if (result !== undefined && result.jsonCode !== CONST.JSON_CODE.SUCCESS) {
+                    const responseJsonCode = typeof result.jsonCode === 'number' ? result.jsonCode : CONST.JSON_CODE.NO_RESPONSE;
+                    Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}`, {search: {responseJsonCode}}).catch((error: unknown) =>
                         Log.hmmm('[Search] failed to store the search response code', {error: String(error)}),
                     );
                 }
@@ -1408,8 +1435,16 @@ function search({
             .catch(async (error) => {
                 // A network-level rejection (no HTTP response at all, e.g. offline/timeout) never reaches
                 // SaveResponseInOnyx, so nothing else applies failureData/finallyData for it. Apply both here so
-                // the snapshot records the error and still reaches the terminal `loaded` state.
-                await Onyx.update(failureData ?? []);
+                // the snapshot records the error and still reaches the terminal `loaded` state. NO_RESPONSE stands for
+                // "failed with no usable response code", which is exactly this case.
+                await Onyx.update([
+                    ...(failureData ?? []),
+                    {
+                        onyxMethod: Onyx.METHOD.MERGE,
+                        key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}`,
+                        value: {search: {responseJsonCode: CONST.JSON_CODE.NO_RESPONSE}},
+                    },
+                ]);
                 await Onyx.update(finallyData ?? []);
                 throw error;
             })
@@ -2151,6 +2186,17 @@ function queueBulkPayReports(jsonQuery: string) {
     write(WRITE_COMMANDS.QUEUE_BULK_PAY_REPORTS, {jsonQuery});
 }
 
+/**
+ * Queues a manual bulk "Mark as exported" for every report matching the given search query on the given connection.
+ * The backend pages through all matches itself, so this covers reports beyond the currently loaded page(s) when
+ * "Select all" is checked in Search. connectionName scopes the resolved reports to a single accounting connection,
+ * since the button is per-integration and must never mix connections. qboIntegrationAlias further disambiguates an
+ * Intuit Enterprise Suite connection from a regular QBO connection, since both share the same connectionName.
+ */
+function queueBulkMarkAsExported(jsonQuery: string, connectionName: ConnectionName, qboIntegrationAlias?: QueueBulkMarkAsExportedParams['qboIntegrationAlias']) {
+    write(WRITE_COMMANDS.QUEUE_BULK_MARK_AS_EXPORTED, {jsonQuery, connectionName, qboIntegrationAlias});
+}
+
 /** Export templates pre-grouped for the Export menus: each group is sorted alphabetically and rendered with a divider between groups */
 type ExportTemplateGroups = {
     /** Custom templates (custom integrations + account/policy in-app templates) */
@@ -2513,6 +2559,7 @@ function setOptimisticDataForTransactionThreadPreview(
     item: TransactionListItemType,
     transactionPreviewData: TransactionPreviewData,
     getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'],
+    delegateAccountID: number | undefined,
     IOUTransactionID?: string,
 ) {
     const {reportID, report, amount, currency, transactionID, created, policyID, from} = item;
@@ -2544,8 +2591,7 @@ function setOptimisticDataForTransactionThreadPreview(
             linkedExpenseReportAction: {
                 childReportID: IOUTransactionID,
             } as ReportAction,
-            // delegateAccountIDParam: will be threaded in PR 15; buildOptimisticIOUReportAction falls back to module-level Onyx.connect value (https://github.com/Expensify/App/issues/66425)
-            delegateAccountIDParam: undefined,
+            delegateAccountIDParam: delegateAccountID,
             getCurrencyDecimals,
         });
         optimisticIOUAction.pendingAction = undefined;
@@ -2586,6 +2632,7 @@ export {
     queueExportSearchItemsToCSV,
     queueExportSearchWithTemplate,
     queueBulkPayReports,
+    queueBulkMarkAsExported,
     updateAdvancedFilters,
     setSearchContext,
     deleteSavedSearch,
@@ -2610,6 +2657,7 @@ export {
     handlePreventSearchAPI,
     openSearchCardFiltersPage,
     openSearchCategoryFiltersPage,
+    openSearchVendorFiltersPage,
     openSearchTagFiltersPage,
     setSearchTagFiltersPagination,
     clearSearchTagFiltersState,
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 1cdf9b92c187..9b0635d88726 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -21,6 +21,7 @@ import type SignInUserParams from '@libs/API/parameters/SignInUserParams';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import asyncOpenURL from '@libs/asyncOpenURL';
 import buildOldDotURL from '@libs/buildOldDotURL';
+import {hasAuthToken} from '@libs/CurrentUserStore';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import FraudProtection from '@libs/FraudProtection';
 import getPlatform from '@libs/getPlatform';
@@ -334,13 +335,6 @@ function hasStashedSession(stashedSessionParam: Session | undefined, stashedCred
     return !!(stashedSessionParam?.authToken && stashedCredentialsParam?.autoGeneratedLogin && stashedCredentialsParam.autoGeneratedLogin !== '');
 }
 
-/**
- * Checks if the user has authToken
- */
-function hasAuthToken(): boolean {
-    return !!deprecatedSession.authToken;
-}
-
 /**
  * Indicates if the session which creation date is in parameter is expired
  * @param sessionCreationDate the session creation date timestamp
@@ -892,7 +886,7 @@ function beginGoogleSignIn(token: string | null, preferredLocale: Locale | undef
  * Will create a temporary login for the user in the passed authenticate response which is used when
  * re-authenticating after an authToken expires.
  */
-function signInWithShortLivedAuthToken(authToken: string, isSAML = false, exitTo?: string) {
+function signInWithShortLivedAuthToken(authToken: string, isSAML: boolean, exitTo: string | undefined, login: string | undefined) {
     const {optimisticData, failureData, finallyData} = getShortLivedLoginParams(false, isSAML);
     const authMethod = isSAML ? CONST.AUTH_METHOD.SAML : CONST.AUTH_METHOD.SHORT_LIVED_AUTH_TOKEN;
     // Set the in-flight guard synchronously, before awaiting device info. optimisticData below (which also sets this key)
@@ -909,7 +903,6 @@ function signInWithShortLivedAuthToken(authToken: string, isSAML = false, exitTo
         return;
     }
 
-    const login = credentials.login;
     // waitForUserSignIn keeps a single resolver that openReportFromDeepLink may already hold, so wait on the routes instead.
     Navigation.waitForProtectedRoutes().then(() => {
         // A failed sign-in leaves this waiting, so a later sign-in by another account must not land on this page.
@@ -1510,6 +1503,9 @@ function validateTwoFactorAuth(twoFactorAuthCode: string, shouldClearData: boole
                 [ONYXKEYS.NVP_ONBOARDING]: {
                     hasCompletedGuidedSetupFlow: false,
                 },
+                // openApp() is intentionally deferred until the user dismisses the success screen,
+                // so this flow must remain outside the global loading state in the meantime.
+                [ONYXKEYS.IS_LOADING_APP]: false,
             });
             return;
         }
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 57c4092f7dae..3543a9d09289 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -13,13 +13,12 @@ import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTop
 import Navigation from '@libs/Navigation/Navigation';
 import {getDBTimeWithSkew} from '@libs/NetworkState';
 import {addDomainToShortMention} from '@libs/ParsingUtils';
-import {getPersonalDetailByLogin} from '@libs/PersonalDetailsStore';
+import {getAllPersonalDetailLogins, getPersonalDetailByLogin} from '@libs/PersonalDetailsStore';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import {getReportName} from '@libs/ReportNameUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import {buildOptimisticSnapshotData} from '@libs/SearchQueryUtils';
-import {getAllPersonalDetailLogins} from '@libs/ShortMentionLogins';
 import playSound, {SOUNDS} from '@libs/Sound';
 import type {AvatarSource} from '@libs/UserAvatarUtils';
 import {generateAccountID} from '@libs/UserUtils';
diff --git a/src/libs/actions/TaxRate.ts b/src/libs/actions/TaxRate.ts
index 485e975b456d..2d56c8f39272 100644
--- a/src/libs/actions/TaxRate.ts
+++ b/src/libs/actions/TaxRate.ts
@@ -22,7 +22,7 @@ import INPUT_IDS from '@src/types/form/WorkspaceNewTaxForm';
 import {default as INPUT_IDS_TAX_CODE} from '@src/types/form/WorkspaceTaxCodeForm';
 import type {Policy, TaxRate, TaxRates} from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
-import type {CustomUnit, Rate} from '@src/types/onyx/Policy';
+import type {CustomUnit, ExpenseRule, Rate} from '@src/types/onyx/Policy';
 import type {OnyxData} from '@src/types/onyx/Request';
 
 import type {NullishDeep, OnyxEntry} from 'react-native-onyx';
@@ -550,7 +550,18 @@ function setPolicyTaxCode(
     oldForeignTaxDefault: string | undefined,
     oldDefaultExternalID: string | undefined,
     distanceRateCustomUnit: CustomUnit | undefined,
+    expenseRules: ExpenseRule[] = [],
 ) {
+    const hasExpenseRuleWithOldTaxCode = expenseRules.some((rule) => rule.tax?.field_id_TAX?.externalID === oldTaxCode);
+    const optimisticExpenseRules = expenseRules.map((rule) => {
+        if (rule.tax?.field_id_TAX?.externalID !== oldTaxCode) {
+            return rule;
+        }
+
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        return {...rule, tax: {field_id_TAX: {...rule.tax.field_id_TAX, externalID: newTaxCode}}};
+    });
+
     const optimisticDistanceRateCustomUnit = distanceRateCustomUnit && {
         ...distanceRateCustomUnit,
         rates: {
@@ -598,6 +609,7 @@ function setPolicyTaxCode(
                         },
                     },
                     ...(!!distanceRateCustomUnit && {customUnits: {[distanceRateCustomUnit.customUnitID]: optimisticDistanceRateCustomUnit}}),
+                    ...(hasExpenseRuleWithOldTaxCode && {rules: {expenseRules: optimisticExpenseRules}}),
                 },
             },
         ],
@@ -646,6 +658,7 @@ function setPolicyTaxCode(
                         },
                     },
                     ...(!!distanceRateCustomUnit && {customUnits: {[distanceRateCustomUnit.customUnitID]: distanceRateCustomUnit}}),
+                    ...(hasExpenseRuleWithOldTaxCode && {rules: {expenseRules}}),
                 },
             },
         ],
diff --git a/src/libs/actions/TestTool.ts b/src/libs/actions/TestTool.ts
index f77ae36772d9..4b1839a30a33 100644
--- a/src/libs/actions/TestTool.ts
+++ b/src/libs/actions/TestTool.ts
@@ -5,21 +5,16 @@ import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
 
 import throttle from 'lodash/throttle';
 
 import {close} from './Modal';
 
-/**
- * Get the backTo parameter from the current test tools modal route
- */
+/** Only the screen the URL built carries a backTo, so take it from the first one that has it. */
 function getBackToParam(): Route | undefined {
-    const route = navigationRef.current?.getCurrentRoute();
-    if (route?.name === SCREENS.TEST_TOOLS_MODAL.ROOT && route.params) {
-        return (route.params as {backTo?: Route}).backTo;
-    }
-    return undefined;
+    const modalRoute = navigationRef.current?.getRootState()?.routes.find((route) => route.name === NAVIGATORS.TEST_TOOLS_MODAL_NAVIGATOR);
+    const screenWithBackTo = modalRoute?.state?.routes?.find((route) => !!(route.params as {backTo?: Route} | undefined)?.backTo);
+    return (screenWithBackTo?.params as {backTo?: Route} | undefined)?.backTo;
 }
 
 /**
@@ -34,8 +29,12 @@ const throttledToggle = throttle(
         if (currentRoute.includes(ROUTES.TEST_TOOLS_MODAL.route)) {
             if (backTo) {
                 Navigation.goBack(backTo);
-            } else {
-                Navigation.goBack();
+                return;
+            }
+            // dismissModal() would not close this modal: the public root is a plain platform stack that never handles DISMISS_MODAL.
+            const rootKey = navigationRef.current?.getRootState()?.key;
+            if (rootKey) {
+                Navigation.pop(rootKey);
             }
             return;
         }
diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index 3f1aac512d84..69cf6c220fa6 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -59,7 +59,7 @@ import {
     isManualDistanceRequest,
     isOdometerDistanceRequest,
     isOnHold,
-    isSplitContainerTransaction,
+    isTransactionOwner,
     shouldClearConvertedAmount,
     waypointHasValidAddress,
 } from '@libs/TransactionUtils';
@@ -69,6 +69,7 @@ import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {
+    CardList,
     PersonalDetails,
     Policy,
     PolicyCategories,
@@ -92,12 +93,10 @@ import type TransactionState from '@src/types/utils/TransactionStateType';
 
 import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxKey, OnyxUpdate} from 'react-native-onyx';
 
-import {originalTransactionIDSelector} from '@selectors/Transaction';
 import {getUnixTime} from 'date-fns';
 import lodashClone from 'lodash/clone';
 import Onyx from 'react-native-onyx';
 
-import {getAllTransactions} from './IOU';
 import {getSearchOnyxUpdate} from './IOU/SearchUpdate';
 
 type SaveWaypointProps = {
@@ -737,11 +736,9 @@ function clearError(transactionID: string) {
  * Clears a transaction's error and, when it is a split child whose original is still the hidden split
  * container (`SPLIT_REPORT_ID`), clears the original's error too
  */
-function clearErrorWithOriginalTransactionError(transactionID: string) {
+function clearErrorWithOriginalTransactionError(transactionID: string, originalTransactionID: string | undefined, isOriginalTransactionSplitContainer: boolean | undefined) {
     clearError(transactionID);
-    const transactions = getAllTransactions();
-    const originalTransactionID = originalTransactionIDSelector(transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]);
-    if (!originalTransactionID || !isSplitContainerTransaction(transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`])) {
+    if (!originalTransactionID || !isOriginalTransactionSplitContainer) {
         return;
     }
     clearError(originalTransactionID);
@@ -874,6 +871,7 @@ type ChangeTransactionsReportProps = {
     allTransactionViolation?: OnyxCollection<TransactionViolation[]>;
     reports: OnyxCollection<Report>;
     rules: OnyxCollection<Rule>;
+    cardList: OnyxEntry<CardList>;
     /** Report IDs that should be skipped when generating Onyx updates (e.g. because they are being deleted) */
     skippedReportIDs?: string[];
     isTrackIntentUser: boolean | undefined;
@@ -908,11 +906,13 @@ function getChangeTransactionsReportOnyxData({
     getCurrencyDecimals,
     getCurrencySymbol,
     isVendorMatchingBetaEnabled,
+    cardList,
 }: ChangeTransactionsReportProps) {
     const reportID = newReport?.reportID ?? CONST.REPORT.UNREPORTED_REPORT_ID;
 
     const transactionIDToReportActionAndThreadData: Record<string, TransactionThreadInfo> = {};
     const updatedReportTotals: Record<string, number> = {};
+    const updatedReportUnheldTotals: Record<string, number> = {};
     const updatedReportTransactionCounts: Record<string, number> = {};
     const updatedReportNonReimbursableTotals: Record<string, number> = {};
     const updatedReportUnheldNonReimbursableTotals: Record<string, number> = {};
@@ -1085,6 +1085,7 @@ function getChangeTransactionsReportOnyxData({
     };
     const clearAccumulatedReportTotals = (reportIDToUpdate: string) => {
         delete updatedReportTotals[reportIDToUpdate];
+        delete updatedReportUnheldTotals[reportIDToUpdate];
         delete updatedReportNonReimbursableTotals[reportIDToUpdate];
         delete updatedReportUnheldNonReimbursableTotals[reportIDToUpdate];
         delete updatedReportReimbursableTotals[reportIDToUpdate];
@@ -1146,11 +1147,11 @@ function getChangeTransactionsReportOnyxData({
         const sourceCurrency = oldReport?.currency;
         const shouldClearAmount = shouldClearConvertedAmount(transaction, sourceCurrency, destinationCurrency);
 
-        const isUnreported = reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+        const isUnreporting = reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
         const optimisticMoneyRequestReportActionID = rand64();
 
         const originalMessage = getOriginalMessage(oldIOUAction) as OriginalMessageIOU;
-        const actionType = isUnreported ? CONST.IOU.REPORT_ACTION_TYPE.TRACK : CONST.IOU.REPORT_ACTION_TYPE.CREATE;
+        const actionType = isUnreporting ? CONST.IOU.REPORT_ACTION_TYPE.TRACK : CONST.IOU.REPORT_ACTION_TYPE.CREATE;
         const newIOUAction = {
             ...oldIOUAction,
             reportID,
@@ -1169,7 +1170,7 @@ function getChangeTransactionsReportOnyxData({
             }),
         };
 
-        const comment = isUnreported ? {...transaction.comment, hold: null} : transaction.comment;
+        const comment = isUnreporting ? {...transaction.comment, hold: null} : transaction.comment;
 
         const shouldCopyOriginalAmount = transaction.originalAmount !== undefined && transaction.originalAmount !== transaction.amount;
         const shouldCopyOriginalCurrency = transaction.originalCurrency !== undefined && transaction.originalCurrency !== transaction.currency;
@@ -1219,7 +1220,7 @@ function getChangeTransactionsReportOnyxData({
         // Clear all violations for the transaction when moving to self DM report.
         // Also keep duplicate-partner violations cleaned on success so stale queued
         // responses cannot re-introduce one-sided duplicate warnings after reconnect.
-        if (isUnreported) {
+        if (isUnreporting) {
             const duplicateTransactionIDs = currentTransactionViolations[transaction.transactionID]?.find((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION)?.data
                 ?.duplicates;
             if (duplicateTransactionIDs) {
@@ -1438,7 +1439,6 @@ function getChangeTransactionsReportOnyxData({
         // 3. Keep track of the new report totals
         // Source report uses original transaction details (expense is being removed at its original amount)
         // Target report uses transactionForViolations (expense arrives with the updated rate/amount after auto-selecting workspace rate)
-        const targetReportID = isUnreported ? selfDMReportID : reportID;
         const {amount: sourceTransactionAmount = 0, currency: sourceTransactionCurrency} = getTransactionDetails(transaction, undefined, undefined, allowNegative) ?? {};
         const {amount: targetTransactionAmount = 0, currency: targetTransactionCurrency} = getTransactionDetails(transactionForViolations, undefined, undefined, allowNegative) ?? {};
         const resolvedTargetTransactionCurrency = targetTransactionCurrency ?? transaction.currency;
@@ -1453,6 +1453,7 @@ function getChangeTransactionsReportOnyxData({
             if (willBeEmpty) {
                 clearStaleReportState(oldReportID);
                 updatedReportTotals[oldReportID] = 0;
+                updatedReportUnheldTotals[oldReportID] = 0;
                 updatedReportNonReimbursableTotals[oldReportID] = 0;
                 updatedReportUnheldNonReimbursableTotals[oldReportID] = 0;
                 updatedReportStateNums[oldReportID] = CONST.REPORT.STATE_NUM.OPEN;
@@ -1463,6 +1464,14 @@ function getChangeTransactionsReportOnyxData({
                 const currentTotal = updatedReportTotals[oldReportID] ?? oldReportTotal;
                 updatedReportTotals[oldReportID] = currentTotal + sourceTransactionAmount;
 
+                // `unheldTotal` only tracks transactions that are not on hold, so a held expense leaving the report
+                // does not change it. `getNonHeldAndFullAmount` reads it in preference to the derived sum, so it is
+                // only updated when already set; writing it for a report that lacks it would replace the derived sum.
+                const currentUnheldTotal = updatedReportUnheldTotals[oldReportID] ?? oldReport?.unheldTotal;
+                if (typeof currentUnheldTotal === 'number') {
+                    updatedReportUnheldTotals[oldReportID] = currentUnheldTotal + (!isOnHold(transaction) ? sourceTransactionAmount : 0);
+                }
+
                 const currentNonReimbursableTotal = updatedReportNonReimbursableTotals[oldReportID] ?? oldReport?.nonReimbursableTotal ?? 0;
                 updatedReportNonReimbursableTotals[oldReportID] = currentNonReimbursableTotal + (transaction?.reimbursable ? 0 : sourceTransactionAmount);
 
@@ -1478,6 +1487,10 @@ function getChangeTransactionsReportOnyxData({
             }
         }
 
+        const isOwner = isTransactionOwner(transaction, cardList);
+        const targetReportID = isOwner && isUnreporting ? selfDMReportID : reportID;
+        const isUnreportingSomeoneElsesTransaction = !isOwner && isUnreporting;
+
         if (targetReportID) {
             const targetReportKey = `${ONYXKEYS.COLLECTION.REPORT}${targetReportID}`;
             const targetReport =
@@ -1492,6 +1505,11 @@ function getChangeTransactionsReportOnyxData({
                 const currentTotal = updatedReportTotals[targetReportID] ?? targetReport?.total ?? 0;
                 updatedReportTotals[targetReportID] = currentTotal - targetTransactionAmount;
 
+                const currentUnheldTotal = updatedReportUnheldTotals[targetReportID] ?? targetReport?.unheldTotal;
+                if (typeof currentUnheldTotal === 'number') {
+                    updatedReportUnheldTotals[targetReportID] = currentUnheldTotal - (!isOnHold(transaction) ? targetTransactionAmount : 0);
+                }
+
                 const currentNonReimbursableTotal = updatedReportNonReimbursableTotals[targetReportID] ?? targetReport?.nonReimbursableTotal ?? 0;
                 updatedReportNonReimbursableTotals[targetReportID] = currentNonReimbursableTotal - (transactionReimbursable ? 0 : targetTransactionAmount);
 
@@ -1510,6 +1528,11 @@ function getChangeTransactionsReportOnyxData({
                 const currentTotal = updatedReportTotals[targetReportID] ?? targetReport?.total ?? 0;
                 updatedReportTotals[targetReportID] = currentTotal + convertedAmount;
 
+                const currentUnheldTotal = updatedReportUnheldTotals[targetReportID] ?? targetReport?.unheldTotal;
+                if (typeof currentUnheldTotal === 'number') {
+                    updatedReportUnheldTotals[targetReportID] = currentUnheldTotal + (!isOnHold(transaction) ? convertedAmount : 0);
+                }
+
                 const currentNonReimbursableTotal = updatedReportNonReimbursableTotals[targetReportID] ?? targetReport?.nonReimbursableTotal ?? 0;
                 updatedReportNonReimbursableTotals[targetReportID] = currentNonReimbursableTotal + (transactionReimbursable ? 0 : convertedAmount);
 
@@ -1531,13 +1554,31 @@ function getChangeTransactionsReportOnyxData({
         // 4. Optimistically update the IOU action reportID
         const trackExpenseActionableWhisper = isUnreportedExpense ? getTrackExpenseActionableWhisper(transaction.transactionID, selfDMReportID, selfDMReportActions) : undefined;
 
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetReportID}`,
-            value: {
-                [newIOUAction.reportActionID]: newIOUAction,
-            },
-        });
+        if (targetReportID) {
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetReportID}`,
+                value: {
+                    [newIOUAction.reportActionID]: newIOUAction,
+                },
+            });
+
+            successData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetReportID}`,
+                value: {
+                    [newIOUAction.reportActionID]: {pendingAction: null},
+                },
+            });
+
+            failureData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetReportID}`,
+                value: {
+                    [newIOUAction.reportActionID]: null,
+                },
+            });
+        }
 
         if (oldIOUAction && !skippedReportIDsSet.has(isUnreportedExpense ? (selfDMReportID ?? CONST.REPORT.UNREPORTED_REPORT_ID) : oldReportID)) {
             optimisticData.push({
@@ -1569,20 +1610,6 @@ function getChangeTransactionsReportOnyxData({
             });
         }
 
-        successData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetReportID}`,
-            value: {
-                [newIOUAction.reportActionID]: {pendingAction: null},
-            },
-        });
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetReportID}`,
-            value: {
-                [newIOUAction.reportActionID]: null,
-            },
-        });
         if (oldIOUAction && !skippedReportIDsSet.has(isUnreportedExpense ? (selfDMReportID ?? CONST.REPORT.UNREPORTED_REPORT_ID) : oldReportID)) {
             failureData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -1594,21 +1621,37 @@ function getChangeTransactionsReportOnyxData({
             });
         }
 
+        // 5. Optimistically update the transaction thread and all threads in the transaction thread
         const shouldRemoveOtherParticipants = !isManagedCardTransaction(transaction);
         const childReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${newIOUAction.childReportID}`];
         if (childReport) {
-            const participants = childReport.participants;
-            // 5. Optimistically update the transaction thread and all threads in the transaction thread
-            optimisticData.push({
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.REPORT}${newIOUAction.childReportID}`,
-                value: {
-                    parentReportID: targetReportID,
-                    parentReportActionID: optimisticMoneyRequestReportActionID,
-                    policyID: reportID !== CONST.REPORT.UNREPORTED_REPORT_ID && newReport ? newReport.policyID : CONST.POLICY.ID_FAKE,
-                    participants: isUnreported && shouldRemoveOtherParticipants ? {[accountID]: participants?.[accountID]} : participants,
-                },
-            });
+            if (targetReportID) {
+                const participants = childReport.participants;
+                optimisticData.push({
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${newIOUAction.childReportID}`,
+                    value: {
+                        parentReportID: targetReportID,
+                        chatReportID: targetReportID,
+                        parentReportActionID: optimisticMoneyRequestReportActionID,
+                        policyID: reportID !== CONST.REPORT.UNREPORTED_REPORT_ID && newReport ? newReport.policyID : CONST.POLICY.ID_FAKE,
+                        participants: isUnreporting && shouldRemoveOtherParticipants ? {[accountID]: participants?.[accountID]} : participants,
+                    },
+                });
+            } else {
+                // We're unreporting someone else's expense and moving it to their selfDM, so we can clear the
+                // transaction thread from Onyx since we're losing access to that.
+                optimisticData.push({
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${newIOUAction.childReportID}`,
+                    value: null,
+                });
+                failureData.push({
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${newIOUAction.childReportID}`,
+                    value: childReport,
+                });
+            }
         }
 
         if (oldIOUAction) {
@@ -1617,6 +1660,7 @@ function getChangeTransactionsReportOnyxData({
                 key: `${ONYXKEYS.COLLECTION.REPORT}${oldIOUAction.childReportID}`,
                 value: {
                     parentReportID: isUnreportedExpense ? selfDMReportID : oldReportID,
+                    chatReportID: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${oldIOUAction.childReportID}`]?.chatReportID,
                     parentReportActionID: oldIOUAction.reportActionID,
                     policyID: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${oldIOUAction.childReportID}`]?.policyID,
                 },
@@ -1626,7 +1670,7 @@ function getChangeTransactionsReportOnyxData({
         // 6. (Optional) Create transactionThread if it doesn't exist
         let transactionThreadReportID = newIOUAction.childReportID;
         let transactionThreadCreatedReportActionID;
-        if (!transactionThreadReportID) {
+        if (!transactionThreadReportID && targetReportID) {
             const optimisticTransactionThread = buildTransactionThread(newIOUAction, reportID === CONST.REPORT.UNREPORTED_REPORT_ID ? undefined : newReport, accountID);
             const optimisticCreatedActionForTransactionThread = buildOptimisticCreatedReportAction({emailCreatingAction: email ?? ''});
             transactionThreadReportID = optimisticTransactionThread.reportID;
@@ -1685,10 +1729,12 @@ function getChangeTransactionsReportOnyxData({
 
         // 7. Add MOVED_TRANSACTION or UNREPORTED_TRANSACTION report actions
         let movedAction;
-        if (reportID === CONST.REPORT.UNREPORTED_REPORT_ID) {
-            movedAction = buildOptimisticUnreportedTransactionAction(transactionThreadReportID, oldReportID);
-        } else if (!isOpenReport(newReport)) {
-            movedAction = buildOptimisticMovedTransactionAction(transactionThreadReportID, oldReportID);
+        if (!isUnreportingSomeoneElsesTransaction) {
+            if (reportID === CONST.REPORT.UNREPORTED_REPORT_ID) {
+                movedAction = buildOptimisticUnreportedTransactionAction(transactionThreadReportID, oldReportID);
+            } else if (!isOpenReport(newReport)) {
+                movedAction = buildOptimisticMovedTransactionAction(transactionThreadReportID, oldReportID);
+            }
         }
 
         if (movedAction) {
@@ -1738,7 +1784,7 @@ function getChangeTransactionsReportOnyxData({
         const searchTransaction = {
             ...transactionForViolations,
             reportID,
-            comment: isUnreported ? {...transactionForViolations.comment, hold: null} : transactionForViolations.comment,
+            comment: isUnreporting ? {...transactionForViolations.comment, hold: null} : transactionForViolations.comment,
             originalAmount: shouldCopyOriginalAmount ? transaction.originalAmount : undefined,
             originalCurrency: shouldCopyOriginalCurrency ? transaction.originalCurrency : undefined,
             reimbursable: transactionReimbursable,
@@ -1760,9 +1806,9 @@ function getChangeTransactionsReportOnyxData({
                 accountID,
                 login: email,
             },
-            iouReport: isUnreported ? undefined : newReport,
+            iouReport: isUnreporting ? undefined : newReport,
             iouAction: searchIOUAction,
-            policy: isUnreported ? undefined : policy,
+            policy: isUnreporting ? undefined : policy,
             transactionThreadReportID,
             previousMoneyRequestAction:
                 oldIOUAction && previousActionReportID && !skippedReportIDsSet.has(previousActionReportID)
@@ -1780,7 +1826,7 @@ function getChangeTransactionsReportOnyxData({
         }
 
         // Build unhold report action only when moving to unreported (self DM) report
-        if (isUnreported && isOnHold(transaction)) {
+        if (isUnreporting && isOwner && isOnHold(transaction)) {
             const unHoldAction = buildOptimisticUnHoldReportAction(delegateAccountID);
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -1828,6 +1874,22 @@ function getChangeTransactionsReportOnyxData({
             value: {total: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.total},
         });
     }
+    for (const [reportIDToUpdate, unheldTotal] of Object.entries(updatedReportUnheldTotals)) {
+        if (skippedReportIDsSet.has(reportIDToUpdate)) {
+            continue;
+        }
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`,
+            value: {unheldTotal},
+        });
+
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`,
+            value: {unheldTotal: reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportIDToUpdate}`]?.unheldTotal},
+        });
+    }
     for (const [reportIDToUpdate, transactionCount] of Object.entries(updatedReportTransactionCounts)) {
         if (skippedReportIDsSet.has(reportIDToUpdate)) {
             continue;
@@ -2070,6 +2132,7 @@ function getChangeTransactionsReportOnyxData({
         transactionIDToReportActionAndThreadData,
         transactionIDToUpdatedCustomUnitRateID,
         updatedReportTotals,
+        updatedReportUnheldTotals,
         updatedReportTransactionCounts,
         updatedReportNonReimbursableTotals,
         updatedReportUnheldNonReimbursableTotals,
@@ -2201,8 +2264,8 @@ function getDefaultP2PMileageRate() {
     API.read(READ_COMMANDS.GET_DEFAULT_P2P_MILEAGE_RATE, null);
 }
 
-function mergeTransactionIdsHighlightOnSearchRoute(type: SearchDataTypes, data: Record<string, boolean> | null) {
-    return Onyx.merge(ONYXKEYS.TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE, {[type]: data});
+function mergeExpenseAddedGrowlTransactionIDs(data: Record<string, SearchDataTypes | null>) {
+    return Onyx.merge(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS, data);
 }
 
 function getDuplicateTransactionDetails(transactionID?: string) {
@@ -2240,7 +2303,7 @@ export {
     getChangeTransactionsReportOnyxData,
     setTransactionReport,
     getDefaultP2PMileageRate,
-    mergeTransactionIdsHighlightOnSearchRoute,
+    mergeExpenseAddedGrowlTransactionIDs,
     getDuplicateTransactionDetails,
     setSelectedRoute,
 };
diff --git a/src/libs/actions/TransactionInlineEdit.ts b/src/libs/actions/TransactionInlineEdit.ts
index b24f77147d52..a420fbc5c23b 100644
--- a/src/libs/actions/TransactionInlineEdit.ts
+++ b/src/libs/actions/TransactionInlineEdit.ts
@@ -328,7 +328,7 @@ function editTransactionAmountInline(params: TransactionInlineEditParams, newAmo
     const iouParams = getIouParamsForTransaction(params);
 
     // Keep the existing currency — only the amount is changing from the search table
-    const currency = iouParams.transaction?.modifiedCurrency ?? iouParams.transaction?.currency ?? CONST.CURRENCY.USD;
+    const currency = getCurrency(iouParams.transaction);
     // Recalculate tax from the existing tax code and the new amount
     const taxCode = resolveCurrentTaxCode(iouParams.policy, iouParams.transaction?.taxCode ?? '');
     const taxPercentage = getTaxValue(iouParams.policy, iouParams.transaction, taxCode) ?? '';
@@ -456,14 +456,18 @@ function getTransactionEditPermissions({
             if (!policy?.areCategoriesEnabled && isCategoryMissing(transaction?.category)) {
                 return false;
             }
+            // An absent categories collection only means the lazy-loaded account has not fetched them yet, so treat it
+            // as unknown and keep the cell editable. Otherwise the edit icon stays hidden on an expense with a missing
+            // category, so CategoryPicker never mounts to backfill the list.
+            const areCategoriesEnabledButUnloaded = !!policy?.areCategoriesEnabled && policyCategories === undefined;
             // Matches MoneyRequestView's shouldShowCategory logic
             // For policy expenses, check if there's a category or enabled options
             if (isGroupPolicy(policy)) {
-                return !!(transaction?.category ?? '') || hasEnabledOptions(policyCategories ?? {});
+                return !!(transaction?.category ?? '') || areCategoriesEnabledButUnloaded || hasEnabledOptions(policyCategories ?? {});
             }
             // For unreported expenses, disable inline category editing while workspace selection is required.
             if (isUnreported) {
-                return !shouldSelectPolicyForUnreported && hasEnabledOptions(policyCategories ?? {});
+                return !shouldSelectPolicyForUnreported && (areCategoriesEnabledButUnloaded || hasEnabledOptions(policyCategories ?? {}));
             }
         }
 
@@ -472,7 +476,11 @@ function getTransactionEditPermissions({
             if (isMultiLevelTags(policyTags)) {
                 return false;
             }
-            return !!transaction?.tag || hasEnabledTags(getTagLists(policyTags));
+            // Same reasoning as categories above, so TagPicker can mount and backfill. If the tags turn out to be
+            // multi-level once they arrive, the check above flips this back to false and usePopoverEditState closes
+            // the open popover.
+            const areTagsEnabledButUnloaded = !!policy?.areTagsEnabled && policyTags === undefined;
+            return !!transaction?.tag || areTagsEnabledButUnloaded || hasEnabledTags(getTagLists(policyTags));
         }
 
         return (
diff --git a/src/libs/actions/TransactionThreadNavigation.ts b/src/libs/actions/TransactionThreadNavigation.ts
index e84373b19b47..026ec10e4d70 100644
--- a/src/libs/actions/TransactionThreadNavigation.ts
+++ b/src/libs/actions/TransactionThreadNavigation.ts
@@ -15,11 +15,66 @@ import Onyx from 'react-native-onyx';
  * (e.g. the Home "Recently added" section) where the sibling transactions are not guaranteed to live in the
  * main Onyx collections, so the prev/next navigation can't re-derive the thread report from them. When the map
  * is provided, navigation resolves (and lazily creates) each sibling's thread on demand from its descriptor.
+ *
+ * The carousel is a single global value written by several different screens (the Spend page's flat expense
+ * list, a report's own transaction list, the Home "Recently added" widget, duplicate review). To keep those
+ * writers from clobbering each other, every writer stamps the list with a `source` that identifies it, and
+ * only ever refreshes or clears a carousel it still owns. Ownership lives in module state rather than Onyx
+ * because it only ever arbitrates writes within a single JS session.
+ */
+
+/**
+ * Identities for the screens that can seed the carousel. Every writer stamps its list with one of these so it
+ * can later refresh or clear only a carousel it still owns.
  */
+const CAROUSEL_SOURCE = {
+    /** A report's own transaction list */
+    report: (reportID: string | undefined) => `report:${reportID}`,
+
+    /**
+     * A row pressed inside a report's transaction list. Distinct from `report` so that the list tearing down
+     * behind the opened expense doesn't clear the carousel it just handed to that expense.
+     */
+    reportRow: (reportID: string | undefined) => `reportRow:${reportID}`,
+
+    /** A search results list (the Spend page and its grouped variants) */
+    search: (hash: number | undefined) => `search:${hash}`,
+
+    /** The Home "Recently added" widget */
+    homeRecentlyAdded: 'home:recentlyAdded',
+
+    /** The Home "Review X expenses" row */
+    homeReviewFlagged: 'home:reviewFlagged',
+
+    /** A transaction row pressed inside a report preview in a chat */
+    reportPreview: (reportID: string | undefined) => `reportPreview:${reportID}`,
+
+    /** The duplicate-review flow */
+    duplicateReview: (transactionID: string | undefined) => `duplicateReview:${transactionID}`,
+} as const;
 
 let lastSetIDs: string[] | null = null;
+let lastSetSource: string | null = null;
+let lastSetSnapshotHash: number | null = null;
 let lastSetDescriptors: Record<string, TransactionThreadNavigationDescriptor> | null = null;
 
+type SetActiveTransactionIDsOptions = {
+    /**
+     * Stable identity of the screen that owns this carousel, e.g. `search:<hash>` or `report:<reportID>`.
+     * Writers pass their own source so they can later refresh or clear the carousel only while they still own it.
+     */
+    source?: string;
+
+    /**
+     * Hash of the search snapshot backing these IDs. The carousel falls back to that snapshot when a sibling
+     * hasn't landed in the live Onyx collections yet.
+     */
+    snapshotHash?: number;
+
+    /** Optional map of transactionID -> sibling descriptor for snapshot-backed flows. */
+    descriptors?: Record<string, TransactionThreadNavigationDescriptor>;
+};
+
 function areDescriptorMapsEqual(a: Record<string, TransactionThreadNavigationDescriptor> | null, b: Record<string, TransactionThreadNavigationDescriptor> | null) {
     if (a === b) {
         return true;
@@ -44,38 +99,130 @@ function areDescriptorMapsEqual(a: Record<string, TransactionThreadNavigationDes
     });
 }
 
+function areIDListsEqual(a: string[] | null, b: string[] | null) {
+    if (a === b) {
+        return true;
+    }
+    if (!a || !b) {
+        return false;
+    }
+    return a.length === b.length && a.every((id, index) => id === b.at(index));
+}
+
 /**
- * Idempotent: skips the Onyx write when the IDs and the descriptor map haven't changed.
+ * Idempotent: skips the Onyx write when the IDs, source, snapshot hash, and descriptor map haven't changed.
  * This lets callers (e.g. useEffect in MoneyRequestReportTransactionList) fire
  * freely without worrying about referential equality of the input array.
  */
-function setActiveTransactionIDs(ids: string[], siblingDescriptorsByTransactionID?: Record<string, TransactionThreadNavigationDescriptor>) {
-    const nextDescriptors = siblingDescriptorsByTransactionID ?? null;
-    const sameIDs = lastSetIDs?.length === ids.length && lastSetIDs.every((id, i) => id === ids.at(i));
-    const isUnchanged = sameIDs && areDescriptorMapsEqual(lastSetDescriptors, nextDescriptors);
+function setActiveTransactionIDs(ids: string[], {source, snapshotHash, descriptors}: SetActiveTransactionIDsOptions = {}) {
+    const nextSource = source ?? null;
+    const nextSnapshotHash = snapshotHash ?? null;
+    const nextDescriptors = descriptors ?? null;
+    const isUnchanged =
+        areIDListsEqual(lastSetIDs, ids) && lastSetSource === nextSource && lastSetSnapshotHash === nextSnapshotHash && areDescriptorMapsEqual(lastSetDescriptors, nextDescriptors);
     // Track the newest array even when the write is skipped: callers compare this reference by identity to tell
     // "my seed is still active" from "someone re-seeded after me", and a stale one makes a newer seed look older.
     lastSetIDs = ids;
+    lastSetSource = nextSource;
+    lastSetSnapshotHash = nextSnapshotHash;
     lastSetDescriptors = nextDescriptors;
     if (isUnchanged) {
         return Promise.resolve();
     }
-    return Promise.all([Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, ids), Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS, nextDescriptors)]);
+    return Promise.all([
+        Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, ids),
+        Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH, nextSnapshotHash),
+        Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS, nextDescriptors),
+    ]);
 }
 
 /**
- * Returns the currently active transaction IDs and sibling descriptors. Used by screens that would otherwise
- * take over the carousel context (e.g. a money request report opened on top of an existing transaction thread)
- * so they can detect a snapshot-backed carousel (one with descriptors) and avoid clobbering it.
+ * Returns the currently active transaction IDs, their owner, the backing snapshot hash, and sibling descriptors.
+ * Used by screens that would otherwise take over the carousel context (e.g. a money request report opened on top
+ * of an existing transaction thread) so they can detect a snapshot-backed carousel (one with descriptors) and
+ * avoid clobbering it. It returns every field `setActiveTransactionIDs` accepts so a screen that temporarily
+ * takes the carousel over (duplicate review) can hand the previous owner's carousel back intact.
  */
-function getActiveTransactionIDs(): {ids: string[] | null; descriptors: Record<string, TransactionThreadNavigationDescriptor> | null} {
-    return {ids: lastSetIDs, descriptors: lastSetDescriptors};
+function getActiveTransactionIDs(): {
+    ids: string[] | null;
+    descriptors: Record<string, TransactionThreadNavigationDescriptor> | null;
+    source: string | null;
+    snapshotHash: number | null;
+} {
+    return {ids: lastSetIDs, descriptors: lastSetDescriptors, source: lastSetSource, snapshotHash: lastSetSnapshotHash};
+}
+
+/**
+ * Whether a writer that stays mounted behind the RHP (e.g. the Spend page's list under an open expense) should
+ * push a refreshed list into the carousel.
+ *
+ * It may only do so when it still owns the carousel, or when nothing owns it yet. Once the user drills into a
+ * screen that seeds its own carousel, such as a report's transaction list, that screen becomes the owner and the
+ * background list must leave it alone until the user comes back out to it.
+ */
+function shouldRefreshActiveTransactionIDs(source: string, ids: string[]): boolean {
+    if (!lastSetIDs?.length) {
+        // Nothing to defer to: only seed a carousel for a list there is actually something to page through.
+        return ids.length > 1;
+    }
+
+    if (!lastSetSource) {
+        return !areIDListsEqual(lastSetIDs, ids);
+    }
+    if (lastSetSource !== source) {
+        return false;
+    }
+
+    return !areIDListsEqual(lastSetIDs, ids);
 }
 
 function clearActiveTransactionIDs() {
     lastSetIDs = null;
+    lastSetSource = null;
+    lastSetSnapshotHash = null;
     lastSetDescriptors = null;
-    return Promise.all([Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, null), Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS, null)]);
+    return Promise.all([
+        Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, null),
+        Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH, null),
+        Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS, null),
+    ]);
+}
+
+/**
+ * Clears the carousel only when `source` still owns it.
+ *
+ * A writer that unmounts must not wipe a carousel another screen has since taken over. That is how the arrows
+ * used to vanish when a screen re-seeded the list while the previous owner was tearing down.
+ */
+function clearActiveTransactionIDsForSource(source: string) {
+    if (lastSetSource !== source) {
+        return Promise.resolve();
+    }
+    return clearActiveTransactionIDs();
+}
+
+/**
+ * Gives up ownership of the carousel without clearing it, for a writer that unmounts while the list it seeded is
+ * still driving the arrows of an expense open on top of it.
+ *
+ * Search is keyed by its query hash, so re-sorting or re-filtering unmounts one list and mounts another. Clearing
+ * on the way out stripped the open expense's arrows until the replacement finished loading, and left them gone for
+ * good when the new results no longer contained that expense. Dropping only the stamp keeps the arrows working in
+ * the meantime and lets the replacement take the carousel over once it has results of its own.
+ */
+function disownActiveTransactionIDs(source: string) {
+    if (lastSetSource !== source) {
+        return;
+    }
+    lastSetSource = null;
 }
 
-export {setActiveTransactionIDs, clearActiveTransactionIDs, getActiveTransactionIDs};
+export {
+    setActiveTransactionIDs,
+    clearActiveTransactionIDs,
+    clearActiveTransactionIDsForSource,
+    disownActiveTransactionIDs,
+    getActiveTransactionIDs,
+    shouldRefreshActiveTransactionIDs,
+    CAROUSEL_SOURCE,
+};
diff --git a/src/libs/actions/UpdateRequired.ts b/src/libs/actions/UpdateRequired/index.native.ts
similarity index 100%
rename from src/libs/actions/UpdateRequired.ts
rename to src/libs/actions/UpdateRequired/index.native.ts
diff --git a/src/libs/actions/UpdateRequired/index.ts b/src/libs/actions/UpdateRequired/index.ts
new file mode 100644
index 000000000000..b65a3f37fe41
--- /dev/null
+++ b/src/libs/actions/UpdateRequired/index.ts
@@ -0,0 +1,54 @@
+import clearWorkboxRecoveryCaches from '@libs/clearWorkboxRecoveryCaches';
+import Log from '@libs/Log';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+import pkg from '../../../../package.json';
+
+// Many requests can get a 426 at once, and the Log command itself can get one. Only the first 426 should reload or alert.
+let hasHandledUpdateRequired = false;
+
+/**
+ * Returns true only if a reload attempt for this bundle version was recorded. The stored version matching the running one means
+ * the last reload didn't get a new bundle. A later deploy changes the version, so it gets its own reload.
+ */
+function markReloadAttempted(): boolean {
+    try {
+        if (sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.UPDATE_REQUIRED_RELOADED_VERSION) === pkg.version) {
+            return false;
+        }
+        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.UPDATE_REQUIRED_RELOADED_VERSION, pkg.version);
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+/**
+ * Web should always serve the latest version, so a 426 usually means the browser loaded an old bundle from its cache.
+ * The app version is baked into the bundle, so the request can only be retried with a new bundle: clear the caches and reload,
+ * and show the Update Required screen if the same bundle version still gets a 426 afterwards.
+ */
+function alertUser() {
+    if (hasHandledUpdateRequired) {
+        return;
+    }
+
+    hasHandledUpdateRequired = true;
+
+    if (markReloadAttempted()) {
+        clearWorkboxRecoveryCaches().then(() => window.location.reload());
+        return;
+    }
+
+    Log.alert('[UpdateRequired] Got a 426 on web after clearing the cache and reloading', {appVersion: pkg.version});
+    Onyx.set(ONYXKEYS.RAM_ONLY_UPDATE_REQUIRED, true);
+}
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    alertUser,
+};
diff --git a/src/libs/actions/Welcome/index.ts b/src/libs/actions/Welcome/index.ts
index 2c98d1722d4b..cd0fba5fbe8a 100644
--- a/src/libs/actions/Welcome/index.ts
+++ b/src/libs/actions/Welcome/index.ts
@@ -101,6 +101,10 @@ function updateOnboardingValuesAndNavigation(onboardingValues: Onboarding | unde
     });
 }
 
+function setOnboardingShouldValidate(shouldValidate: boolean) {
+    Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {shouldValidate});
+}
+
 function setOnboardingMergeAccountStepValue(value: boolean, skipped = false) {
     Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {isMergeAccountStepCompleted: value, isMergeAccountStepSkipped: skipped});
 }
@@ -227,6 +231,7 @@ export {
     setOnboardingCompanySize,
     setSelfTourViewed,
     setOnboardingMergeAccountStepValue,
+    setOnboardingShouldValidate,
     updateOnboardingValuesAndNavigation,
     setOnboardingUserReportedIntegration,
     setOnboardingAccountingEnabled,
diff --git a/src/libs/actions/Workflow.ts b/src/libs/actions/Workflow.ts
index 0f1aa7cd1384..8b2ceee4c901 100644
--- a/src/libs/actions/Workflow.ts
+++ b/src/libs/actions/Workflow.ts
@@ -5,6 +5,7 @@ import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import {getDefaultApprover} from '@libs/PolicyUtils';
 import type {ApprovalWorkflowRulesDiff} from '@libs/WorkflowUtils';
 import {
+    addMembersToRule,
     applyApprovalWorkflowRulesDiff,
     buildApprovalWorkflowRules,
     buildApprovalWorkflowRulesForSave,
@@ -14,6 +15,7 @@ import {
     getOverLimitForwardsToDisplayName,
     getWorkflowMemberEmails,
     hasRuleBasedDefaultWorkflow,
+    includesEveryWorkspaceMember,
     mergeWorkflowMembersWithAvailableMembers,
     reconcileApprovalWorkflowRulesForCreate,
     reconcileApprovalWorkflowRulesForEdit,
@@ -65,10 +67,15 @@ function createApprovalWorkflow({approvalWorkflow, policy, addExpenseApprovalsTa
 
     const previousEmployeeList = Object.fromEntries(Object.entries(policy.employeeList ?? {}).map(([key, value]) => [key, {...value, pendingAction: null}]));
     const previousApprovalMode = policy.approvalMode;
+    const previousDefaultApprover = getDefaultApprover(policy);
+    const firstApprover = approvalWorkflow.approvers.at(0)?.email;
+
+    // A default workflow's first approver is the policy's default approver, which only needs sending when it changes
+    const newDefaultApprover = approvalWorkflow.isDefault && firstApprover !== previousDefaultApprover ? firstApprover : undefined;
     const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList, approvalWorkflow, type: CONST.APPROVAL_WORKFLOW.TYPE.CREATE});
 
-    // If there are no changes to the employees list, we can exit early
-    if (isEmptyObject(updatedEmployees)) {
+    // If there are no changes to the employees list or the default approver, we can exit early
+    if (isEmptyObject(updatedEmployees) && !newDefaultApprover) {
         return;
     }
 
@@ -84,6 +91,7 @@ function createApprovalWorkflow({approvalWorkflow, policy, addExpenseApprovalsTa
             value: {
                 employeeList: updatedEmployees,
                 approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                ...(newDefaultApprover ? {approver: newDefaultApprover} : {}),
             },
         },
     ];
@@ -95,6 +103,7 @@ function createApprovalWorkflow({approvalWorkflow, policy, addExpenseApprovalsTa
             value: {
                 employeeList: previousEmployeeList,
                 approvalMode: previousApprovalMode,
+                ...(newDefaultApprover ? {approver: previousDefaultApprover} : {}),
             },
         },
     ];
@@ -109,7 +118,7 @@ function createApprovalWorkflow({approvalWorkflow, policy, addExpenseApprovalsTa
         },
     ];
 
-    const parameters: CreateWorkspaceApprovalParams = {policyID: policy.id, employees: JSON.stringify(Object.values(updatedEmployees))};
+    const parameters: CreateWorkspaceApprovalParams = {policyID: policy.id, employees: JSON.stringify(Object.values(updatedEmployees)), defaultApprover: newDefaultApprover};
     write(WRITE_COMMANDS.CREATE_WORKSPACE_APPROVAL, parameters, {optimisticData, failureData, successData});
 
     if (
@@ -378,6 +387,7 @@ function createApprovalWorkflowRules({approvalWorkflow, policy, addExpenseApprov
     const rulesDiff = {...removeDiff, ...createDiff};
 
     setApprovalWorkflowRules({policyID: policy.id, rulesDiff, previousRules: rules});
+    updatePolicyDefaultApprover(approvalWorkflow, policy);
 
     if (
         addExpenseApprovalsTaskReport &&
@@ -416,10 +426,13 @@ type UpdateApprovalWorkflowRulesParams = {
     initialApprovalWorkflow: ApprovalWorkflow;
     policy: OnyxEntry<Policy>;
     rules: OnyxCollection<Rule>;
+
+    /** The policy's default workflow, which members taken out of this workflow go back to. */
+    defaultApprovalWorkflow?: ApprovalWorkflow;
 };
 
 /** Update an existing workflow using the rules-based backend structure. */
-function updateApprovalWorkflowRules({approvalWorkflow, initialApprovalWorkflow, policy, rules}: UpdateApprovalWorkflowRulesParams) {
+function updateApprovalWorkflowRules({approvalWorkflow, initialApprovalWorkflow, policy, rules, defaultApprovalWorkflow}: UpdateApprovalWorkflowRulesParams) {
     if (!policy) {
         return;
     }
@@ -446,20 +459,29 @@ function updateApprovalWorkflowRules({approvalWorkflow, initialApprovalWorkflow,
     });
     const chainDiff = reconcileApprovalWorkflowRulesForEdit(newRules, newMemberEmails, {existingRules: rulesAfterMembers});
 
-    const rulesDiff = {...removeFromOthersDiff, ...memberDiff, ...chainDiff};
+    // 4. Members taken out of this workflow go back to the default workflow.
+    const returnToDefaultDiff = buildReturnToDefaultWorkflowDiff({
+        approvalWorkflow: {...initialApprovalWorkflow, members: initialApprovalWorkflow.members.filter((member) => !newMemberEmails.includes(member.email))},
+        defaultApprovalWorkflow,
+        existingRules: applyApprovalWorkflowRulesDiff(rulesAfterMembers, chainDiff),
+        employees: policy.employeeList ?? {},
+        defaultApprover: getDefaultApprover(policy),
+    });
+
+    const rulesDiff = {...removeFromOthersDiff, ...memberDiff, ...chainDiff, ...returnToDefaultDiff};
 
     setApprovalWorkflowRules({policyID: policy.id, rulesDiff, previousRules: rules});
     updatePolicyDefaultApprover(approvalWorkflow, policy);
 }
 
 type BuildReturnToDefaultWorkflowDiffParams = {
-    /** The workflow being deleted, whose members are returning to the default workflow. */
+    /** The workflow these members are leaving, because it is deleted or they are taken out of it, listing only them. */
     approvalWorkflow: ApprovalWorkflow;
 
     /** The policy's default workflow, or undefined when the page couldn't resolve one. */
     defaultApprovalWorkflow: ApprovalWorkflow | undefined;
 
-    /** The policy's rules with the deleted workflow's rules already taken out. */
+    /** The policy's rules with these members already taken out of the workflow they are leaving. */
     existingRules: Record<string, ApprovalWorkflowRule>;
 
     /** The policy's employees, used to check where these members would fall back to without rules. */
@@ -470,7 +492,7 @@ type BuildReturnToDefaultWorkflowDiffParams = {
 };
 
 /**
- * List a deleted workflow's members in the default workflow's rules.
+ * List the members leaving a workflow in the default workflow's rules.
  */
 function buildReturnToDefaultWorkflowDiff({
     approvalWorkflow,
@@ -492,18 +514,28 @@ function buildReturnToDefaultWorkflowDiff({
         return foldDiff;
     }
 
+    // A policy has a single default workflow, so when its rules route differently from the chain we were handed, the
+    // members still join those rules. New rules declaring themselves default would stand up a second default workflow.
+    if (hasRuleBasedDefault) {
+        return Object.fromEntries(
+            Object.entries(existingRules)
+                .filter(([, rule]) => !!rule.isDefaultApprovalWorkflow)
+                .map(([ruleID, rule]) => [ruleID, addMembersToRule(rule, memberEmails)]),
+        );
+    }
+
     if (memberEmails.every((email) => employees[email]?.submitsTo === defaultApprover)) {
         return {};
     }
 
-    return hasRuleBasedDefault ? foldDiff : reconcileApprovalWorkflowRulesForCreate(buildDefaultRules(true), memberEmails, {existingRules});
+    return reconcileApprovalWorkflowRulesForCreate(buildDefaultRules(true), memberEmails, {existingRules});
 }
 
 /**
  * Delete an approval workflow using the rules-based backend structure.
  *
- * Returns false without calling the API when this policy has no rules covering the workflow's members, so the
- * caller can fall back to the `employeeList` path.
+ * Returns false without calling the API when neither the workflow's members nor the default workflow have rules, so
+ * the caller can fall back to the `employeeList` path.
  */
 function removeApprovalWorkflowRules(approvalWorkflow: ApprovalWorkflow, policy: OnyxEntry<Policy>, rules: OnyxCollection<Rule>, defaultApprovalWorkflow?: ApprovalWorkflow): boolean {
     if (!policy) {
@@ -514,7 +546,9 @@ function removeApprovalWorkflowRules(approvalWorkflow: ApprovalWorkflow, policy:
     const memberEmails = getWorkflowMemberEmails(approvalWorkflow.members);
     const removeDiff = reconcileApprovalWorkflowRulesForRemove(memberEmails, {existingRules});
 
-    if (isEmptyObject(removeDiff)) {
+    // Members no rule covers still join a rule-backed default workflow through its rules, since the backend rejects
+    // `employeeList` routing changes once a policy's approvals are rule-based.
+    if (isEmptyObject(removeDiff) && !hasRuleBasedDefaultWorkflow(existingRules)) {
         return false;
     }
 
@@ -630,10 +664,22 @@ type SelectApprovalWorkflowForEditParams = {
     approvers?: Approver[];
     /** Identity anchor of the member whose workflow is being edited, preserved across sub-page back routes. */
     memberEmail?: string;
+    /** The policy's default workflow, where members taken out of this workflow go back to. */
+    defaultApprovalWorkflow?: ApprovalWorkflow;
+    /** Set by the "+N more" shortcut, which skips the Edit RHP, so the members page knows to save the workflow itself. */
+    isFastEdit?: boolean;
 };
 
 /** Commits a workflow to onyx in EDIT mode so any sub-page can be entered directly, skipping the Edit RHP. */
-function selectApprovalWorkflowForEdit({workflow, defaultWorkflowMembers, usedApproverEmails, approvers, memberEmail}: SelectApprovalWorkflowForEditParams) {
+function selectApprovalWorkflowForEdit({
+    workflow,
+    defaultWorkflowMembers,
+    usedApproverEmails,
+    approvers,
+    memberEmail,
+    defaultApprovalWorkflow,
+    isFastEdit,
+}: SelectApprovalWorkflowForEditParams) {
     setApprovalWorkflow({
         ...workflow,
         approvers: approvers ?? workflow.approvers,
@@ -642,7 +688,10 @@ function selectApprovalWorkflowForEdit({workflow, defaultWorkflowMembers, usedAp
         action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
         errors: null,
         originalApprovers: workflow.approvers,
+        originalMembers: workflow.members,
+        defaultApprovalWorkflow,
         memberEmail,
+        isFastEdit,
     });
 }
 
@@ -650,6 +699,36 @@ function clearApprovalWorkflow() {
     Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, null);
 }
 
+type SaveFastEditApprovalWorkflowParams = {
+    approvalWorkflow: ApprovalWorkflowOnyx;
+    policy: OnyxEntry<Policy>;
+    rules: OnyxCollection<Rule>;
+    isMultipleApproversBetaEnabled: boolean;
+};
+
+/** Saves the member changes made through the "+N more" shortcut and discards the draft, since no edit page will. */
+function saveFastEditApprovalWorkflow({approvalWorkflow, policy, rules, isMultipleApproversBetaEnabled}: SaveFastEditApprovalWorkflowParams) {
+    // A workflow with everyone in it leaves every other workflow empty, so it becomes the default one
+    const isDefault = approvalWorkflow.isDefault || includesEveryWorkspaceMember(getWorkflowMemberEmails(approvalWorkflow.members), policy?.employeeList);
+    const workflow: ApprovalWorkflow = {...approvalWorkflow, isDefault, approvers: approvalWorkflow.approvers.filter((approver): approver is Approver => !!approver)};
+    const originalMembers = approvalWorkflow.originalMembers ?? [];
+
+    if (isMultipleApproversBetaEnabled) {
+        updateApprovalWorkflowRules({
+            approvalWorkflow: workflow,
+            initialApprovalWorkflow: {...workflow, members: originalMembers},
+            policy,
+            rules,
+            defaultApprovalWorkflow: approvalWorkflow.defaultApprovalWorkflow,
+        });
+    } else {
+        const membersToRemove = originalMembers.filter((originalMember) => !workflow.members.some((member) => member.email === originalMember.email));
+        updateApprovalWorkflow(workflow, membersToRemove, [], policy);
+    }
+
+    clearApprovalWorkflow();
+}
+
 type ApprovalWorkflowOnyxValidated = Omit<ApprovalWorkflowOnyx, 'approvers'> & {approvers: Approver[]};
 
 /**
@@ -706,6 +785,7 @@ export {
     clearApprovalWorkflowApprover,
     clearApprovalWorkflowApprovers,
     clearApprovalWorkflow,
+    saveFastEditApprovalWorkflow,
     validateApprovalWorkflow,
     setApprovalWorkflowIsInitialFlow,
 };
diff --git a/src/libs/actions/__mocks__/App.ts b/src/libs/actions/__mocks__/App.ts
index 3413beba145c..5cbda3e30da3 100644
--- a/src/libs/actions/__mocks__/App.ts
+++ b/src/libs/actions/__mocks__/App.ts
@@ -11,17 +11,7 @@ jest.mock('@libs/actions/OnyxUpdates');
 jest.mock('@libs/actions/OnyxUpdateManager/utils/applyUpdates');
 
 const AppImplementation = jest.requireActual<typeof AppImport>('@libs/actions/App');
-const {
-    setLocale,
-    setSidebarLoaded,
-    setUpPoliciesAndNavigate,
-    openApp,
-    handleRestrictedEvent,
-    finalReconnectAppAfterActivatingReliableUpdates,
-    createWorkspaceWithPolicyDraftAndNavigateToIt,
-    updateLastVisitedPath,
-    KEYS_TO_PRESERVE,
-} = AppImplementation;
+const {setLocale, setSidebarLoaded, openApp, handleRestrictedEvent, finalReconnectAppAfterActivatingReliableUpdates, updateLastVisitedPath, KEYS_TO_PRESERVE} = AppImplementation;
 
 type AppMockValues<TKey extends OnyxKey = never> = {
     missingOnyxUpdatesToBeApplied: Array<OnyxUpdatesFromServer<TKey>> | undefined;
@@ -85,11 +75,9 @@ export {
     // Actual App implementation
     setLocale,
     setSidebarLoaded,
-    setUpPoliciesAndNavigate,
     openApp,
     handleRestrictedEvent,
     finalReconnectAppAfterActivatingReliableUpdates,
-    createWorkspaceWithPolicyDraftAndNavigateToIt,
     updateLastVisitedPath,
     KEYS_TO_PRESERVE,
 };
diff --git a/src/libs/actions/clearOnyxAndSeedFullReconnect.ts b/src/libs/actions/clearOnyxAndSeedFullReconnect.ts
index 35748063bd47..f49dee20db6f 100644
--- a/src/libs/actions/clearOnyxAndSeedFullReconnect.ts
+++ b/src/libs/actions/clearOnyxAndSeedFullReconnect.ts
@@ -15,9 +15,11 @@ import Onyx from 'react-native-onyx';
  * response.onyxData before successData, so without the seed the timestamp would
  * still be empty when the comparison runs and trigger a duplicate reconnect.
  *
- * Pass `extraSeeds` to seed additional keys atomically with the timestamp (e.g.
- * IS_LOADING_APP=true for delegate transitions). Seeded keys are appended to the
- * preserve list automatically so they survive the clear.
+ * The reset marks the app as loading so consumers cannot evaluate transient
+ * post-clear state before the next OpenApp hydrates it. Pass `extraSeeds` to
+ * override that default or seed additional keys atomically with the timestamp.
+ * Seeded keys are appended to the preserve list automatically so they survive
+ * the clear.
  */
 async function clearOnyxAndSeedFullReconnect(keysToPreserve: OnyxKey[], extraSeeds?: OnyxMultiSetInput): Promise<void> {
     // Any Onyx reset can preserve or replace SESSION/CREDENTIALS while dropping account-scoped data.
@@ -25,6 +27,7 @@ async function clearOnyxAndSeedFullReconnect(keysToPreserve: OnyxKey[], extraSee
     await clearPrefetchOnAppStart();
 
     const seeds: OnyxMultiSetInput = {
+        [ONYXKEYS.IS_LOADING_APP]: true,
         ...extraSeeds,
         [ONYXKEYS.LAST_FULL_RECONNECT_TIME]: DateUtils.getDBTime(),
     };
diff --git a/src/libs/actions/connections/BusinessCentral.ts b/src/libs/actions/connections/BusinessCentral.ts
index 2a61d5b80b63..54fb41ba061d 100644
--- a/src/libs/actions/connections/BusinessCentral.ts
+++ b/src/libs/actions/connections/BusinessCentral.ts
@@ -2,8 +2,16 @@ import {write} from '@libs/API';
 import type {
     ConnectPolicyToBusinessCentralParams,
     UpdateBusinessCentralCompanyParams,
+    UpdateBusinessCentralDefaultVendorParams,
     UpdateBusinessCentralEnableNewCategoriesParams,
+    UpdateBusinessCentralExportDateParams,
+    UpdateBusinessCentralExporterParams,
     UpdateBusinessCentralFieldMappingParams,
+    UpdateBusinessCentralNonreimbursableAccountParams,
+    UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams,
+    UpdateBusinessCentralPaymentMethodParams,
+    UpdateBusinessCentralReimbursableAccountParams,
+    UpdateBusinessCentralReimbursableExpensesExportDestinationParams,
     UpdateBusinessCentralSyncItemsParams,
     UpdateBusinessCentralSyncTaxRatesParams,
 } from '@libs/API/parameters';
@@ -12,7 +20,7 @@ import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {BusinessCentralCoding, BusinessCentralCodingOfflineFeedbackKeys} from '@src/types/onyx/Policy';
+import type {BusinessCentralCoding, BusinessCentralCodingOfflineFeedbackKeys, BusinessCentralExport} from '@src/types/onyx/Policy';
 
 import type {OnyxUpdate} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
@@ -299,6 +307,149 @@ function updateBusinessCentralFieldMapping(policyID: string, dimensionCode: stri
     write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_FIELD_MAPPING, parameters, onyxData);
 }
 
+/**
+ * Builds the Onyx updates for a change to one export setting. The pending and error state lives under the setting's own key.
+ */
+function prepareBusinessCentralExportOnyxData<TSettingName extends keyof BusinessCentralExport>(
+    policyID: string,
+    settingName: TSettingName,
+    settingValue: BusinessCentralExport[TSettingName],
+    oldSettingValue: BusinessCentralExport[TSettingName] | null,
+) {
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL]: {
+                        config: {
+                            export: {
+                                [settingName]: settingValue,
+                            },
+                            pendingFields: {
+                                [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL]: {
+                        config: {
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL]: {
+                        config: {
+                            export: {
+                                [settingName]: oldSettingValue,
+                            },
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, successData, failureData};
+}
+
+function updateBusinessCentralExporter(policyID: string, email: BusinessCentralExport['exporter'], oldEmail?: BusinessCentralExport['exporter']) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.EXPORTER, email, oldEmail ?? null);
+    const parameters: UpdateBusinessCentralExporterParams = {policyID, email};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_EXPORTER, parameters, onyxData);
+}
+
+function updateBusinessCentralExportDate(policyID: string, value: BusinessCentralExport['exportDate'], oldValue?: BusinessCentralExport['exportDate']) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.EXPORT_DATE, value, oldValue ?? null);
+    const parameters: UpdateBusinessCentralExportDateParams = {policyID, value};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_EXPORT_DATE, parameters, onyxData);
+}
+
+function updateBusinessCentralReimbursableExpensesExportDestination(policyID: string, value: BusinessCentralExport['reimbursable'], oldValue?: BusinessCentralExport['reimbursable']) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE, value, oldValue ?? null);
+    const parameters: UpdateBusinessCentralReimbursableExpensesExportDestinationParams = {policyID, value};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, parameters, onyxData);
+}
+
+function updateBusinessCentralNonReimbursableExpensesExportDestination(
+    policyID: string,
+    value: BusinessCentralExport['nonReimbursable'],
+    oldValue?: BusinessCentralExport['nonReimbursable'],
+) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE, value, oldValue ?? null);
+    const parameters: UpdateBusinessCentralNonreimbursableExpensesExportDestinationParams = {policyID, value};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION, parameters, onyxData);
+}
+
+function updateBusinessCentralReimbursableAccount(
+    policyID: string,
+    bankAccountID: BusinessCentralExport['reimbursableAccount'],
+    oldBankAccountID?: BusinessCentralExport['reimbursableAccount'],
+) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT, bankAccountID, oldBankAccountID ?? null);
+    const parameters: UpdateBusinessCentralReimbursableAccountParams = {policyID, value: bankAccountID};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_ACCOUNT, parameters, onyxData);
+}
+
+function updateBusinessCentralNonReimbursableAccount(
+    policyID: string,
+    bankAccountID: BusinessCentralExport['nonReimbursableAccount'],
+    oldBankAccountID?: BusinessCentralExport['nonReimbursableAccount'],
+) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE_ACCOUNT, bankAccountID, oldBankAccountID ?? null);
+    const parameters: UpdateBusinessCentralNonreimbursableAccountParams = {policyID, value: bankAccountID};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_ACCOUNT, parameters, onyxData);
+}
+
+function updateBusinessCentralDefaultVendor(policyID: string, vendorID: BusinessCentralExport['defaultVendorID'], oldVendorID?: BusinessCentralExport['defaultVendorID']) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID, vendorID, oldVendorID ?? null);
+    const parameters: UpdateBusinessCentralDefaultVendorParams = {policyID, vendorID};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_DEFAULT_VENDOR, parameters, onyxData);
+}
+
+/** An empty `paymentMethodCode` clears the payment method. */
+function updateBusinessCentralPaymentMethod(
+    policyID: string,
+    paymentMethodCode: BusinessCentralExport['paymentMethodCode'],
+    oldPaymentMethodCode?: BusinessCentralExport['paymentMethodCode'],
+) {
+    const onyxData = prepareBusinessCentralExportOnyxData(policyID, CONST.BUSINESS_CENTRAL_CONFIG.PAYMENT_METHOD_CODE, paymentMethodCode, oldPaymentMethodCode ?? null);
+    const parameters: UpdateBusinessCentralPaymentMethodParams = {policyID, value: paymentMethodCode};
+    write(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_PAYMENT_METHOD, parameters, onyxData);
+}
+
 export {
     connectToBusinessCentral,
     clearBusinessCentralErrorField,
@@ -307,4 +458,12 @@ export {
     updateBusinessCentralSyncTaxRates,
     updateBusinessCentralSyncItems,
     updateBusinessCentralFieldMapping,
+    updateBusinessCentralExporter,
+    updateBusinessCentralExportDate,
+    updateBusinessCentralReimbursableExpensesExportDestination,
+    updateBusinessCentralNonReimbursableExpensesExportDestination,
+    updateBusinessCentralReimbursableAccount,
+    updateBusinessCentralNonReimbursableAccount,
+    updateBusinessCentralDefaultVendor,
+    updateBusinessCentralPaymentMethod,
 };
diff --git a/src/libs/actions/connections/Campfire.ts b/src/libs/actions/connections/Campfire.ts
index abda05f4425b..9047fce7b5c0 100644
--- a/src/libs/actions/connections/Campfire.ts
+++ b/src/libs/actions/connections/Campfire.ts
@@ -4,11 +4,13 @@ import type {
     UpdateCampfireAccountingMethodParams,
     UpdateCampfireAutoSyncParams,
     UpdateCampfireBillPaymentAccountParams,
+    UpdateCampfireCardProgramAccountParams,
     UpdateCampfireCreditCardAccountParams,
     UpdateCampfireDefaultVendorParams,
     UpdateCampfireEnableNewCategoriesParams,
     UpdateCampfireExportDateParams,
     UpdateCampfireExporterParams,
+    UpdateCampfireExportToMultipleAccountsParams,
     UpdateCampfireFieldMappingParams,
     UpdateCampfireSettlementsAccountParams,
     UpdateCampfireSubsidiaryParams,
@@ -509,6 +511,88 @@ function prepareCampfireSyncOnyxData<TSettingName extends keyof CampfireSync>(
     return {optimisticData, successData, failureData};
 }
 
+function prepareCampfireCardProgramAccountOnyxData(
+    policyID: string,
+    feedKey: keyof CampfireExport['cardProgramAccounts'],
+    accountID: ValueOf<CampfireExport['cardProgramAccounts']>,
+    oldAccountID?: ValueOf<CampfireExport['cardProgramAccounts']> | null,
+) {
+    const cardProgramAccountOfflineFeedbackKey = `${CONST.CAMPFIRE_CONFIG.CARD_PROGRAM_ACCOUNT_PREFIX}${feedKey}`;
+
+    const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    campfire: {
+                        config: {
+                            export: {
+                                cardProgramAccounts: {
+                                    // An empty accountID string implies clearing the custom account
+                                    [feedKey]: accountID || null,
+                                },
+                            },
+                            pendingFields: {
+                                [cardProgramAccountOfflineFeedbackKey]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [cardProgramAccountOfflineFeedbackKey]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    campfire: {
+                        config: {
+                            pendingFields: {
+                                [cardProgramAccountOfflineFeedbackKey]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    campfire: {
+                        config: {
+                            export: {
+                                cardProgramAccounts: {
+                                    [feedKey]: oldAccountID ?? null,
+                                },
+                            },
+                            pendingFields: {
+                                [cardProgramAccountOfflineFeedbackKey]: null,
+                            },
+                            errorFields: {
+                                [cardProgramAccountOfflineFeedbackKey]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, successData, failureData};
+}
+
 function updateCampfireSubsidiary(policyID: string, subsidiaryID: CampfireConnectionsConfig['subsidiaryID'], oldSubsidiaryID?: CampfireConnectionsConfig['subsidiaryID']) {
     const onyxData = prepareCampfireOnyxData(policyID, CONST.CAMPFIRE_CONFIG.SUBSIDIARY_ID, subsidiaryID, oldSubsidiaryID ?? null);
     const params: UpdateCampfireSubsidiaryParams = {
@@ -694,6 +778,30 @@ function updateCampfireTravelInvoicingPayableAccount(
     write(WRITE_COMMANDS.UPDATE_CAMPFIRE_TRAVEL_INVOICING_PAYABLE_ACCOUNT, parameters, onyxData);
 }
 
+function updateCampfireExportToMultipleAccounts(policyID: string, enabled: CampfireExport['exportToMultipleAccounts'], oldEnabled?: CampfireExport['exportToMultipleAccounts']) {
+    const onyxData = prepareCampfireExportOnyxData(policyID, CONST.CAMPFIRE_CONFIG.EXPORT_TO_MULTIPLE_ACCOUNTS, enabled, oldEnabled ?? null);
+    const parameters: UpdateCampfireExportToMultipleAccountsParams = {
+        policyID,
+        enabled,
+    };
+    write(WRITE_COMMANDS.UPDATE_CAMPFIRE_EXPORT_TO_MULTIPLE_ACCOUNTS, parameters, onyxData);
+}
+
+function updateCampfireCardProgramAccount(
+    policyID: string,
+    feedKey: keyof CampfireExport['cardProgramAccounts'],
+    cardProgramAccountID: ValueOf<CampfireExport['cardProgramAccounts']>,
+    oldCardProgramAccountID?: ValueOf<CampfireExport['cardProgramAccounts']>,
+) {
+    const onyxData = prepareCampfireCardProgramAccountOnyxData(policyID, feedKey, cardProgramAccountID, oldCardProgramAccountID ?? null);
+    const parameters: UpdateCampfireCardProgramAccountParams = {
+        policyID,
+        feedKey,
+        cardProgramAccountID,
+    };
+    write(WRITE_COMMANDS.UPDATE_CAMPFIRE_CARD_PROGRAM_ACCOUNT, parameters, onyxData);
+}
+
 export {
     connectToCampfire,
     clearCampfireErrorField,
@@ -714,4 +822,6 @@ export {
     updateCampfireSyncTravelInvoicingSettlements,
     updateCampfireTravelInvoicingSettlementsAccount,
     updateCampfireTravelInvoicingPayableAccount,
+    updateCampfireExportToMultipleAccounts,
+    updateCampfireCardProgramAccount,
 };
diff --git a/src/libs/compoundParamsKey.ts b/src/libs/compoundParamsKey.ts
index be770c79821b..4daa1cf487ca 100644
--- a/src/libs/compoundParamsKey.ts
+++ b/src/libs/compoundParamsKey.ts
@@ -6,6 +6,17 @@ const COMPOUND_KEY_DELIMITER = '\x00';
 // Placeholder so JSON.stringify can't collapse an array containing undefined into an array containing null.
 const UNDEFINED_PLACEHOLDER = '\u0000undefined';
 
+// Keep nested and top-level keys in the same stable UTF-16 code-unit order.
+function compareEntryKeys([a]: readonly [string, unknown], [b]: readonly [string, unknown]): number {
+    if (a < b) {
+        return -1;
+    }
+    if (a > b) {
+        return 1;
+    }
+    return 0;
+}
+
 // URL-rehydrated params are always strings; PUSH_PARAMS dispatches may use numbers/booleans.
 // Top-level undefined is dropped by the caller's filter; nested undefined is preserved via UNDEFINED_PLACEHOLDER. This is asymmetric but inert because URL params are flat.
 // Assumes JSON-serializable params — non-plain objects (Date/RegExp) collapse to {} via Object.entries, acceptable since PUSH_PARAMS only carries URL-backed params.
@@ -24,17 +35,8 @@ function normalizeForKey(value: unknown): unknown {
     }
     if (typeof value === 'object') {
         // Recursively sort so differently-ordered nested keys produce the same compound.
-        const entries = Object.entries(value as Record<string, unknown>)
-            .sort(([a], [b]) => {
-                if (a < b) {
-                    return -1;
-                }
-                if (a > b) {
-                    return 1;
-                }
-                return 0;
-            })
-            .map(([k, v]) => [k, normalizeForKey(v)]);
+        const objectEntries: Array<[string, unknown]> = Object.entries(value);
+        const entries = objectEntries.sort(compareEntryKeys).map(([k, v]) => [k, normalizeForKey(v)]);
         return Object.fromEntries(entries);
     }
     return value;
@@ -49,18 +51,11 @@ function compoundParamsKey(routeKey: string, params: unknown): string {
         return `${routeKey}${COMPOUND_KEY_DELIMITER}${JSON.stringify(normalizeForKey(params))}`;
     }
     // Explicit-undefined fields must match path-rehydrated (omitted) params.
-    const entries = Object.entries(params as Record<string, unknown>)
+    const objectEntries: Array<[string, unknown]> = Object.entries(params);
+    const entries = objectEntries
         .filter(([, value]) => value !== undefined)
         .map(([k, v]) => [k, normalizeForKey(v)] as const)
-        .sort(([a], [b]) => {
-            if (a < b) {
-                return -1;
-            }
-            if (a > b) {
-                return 1;
-            }
-            return 0;
-        });
+        .sort(compareEntryKeys);
     return `${routeKey}${COMPOUND_KEY_DELIMITER}${JSON.stringify(entries)}`;
 }
 
diff --git a/src/libs/getSelectionListPopoverContentHeight.ts b/src/libs/getSelectionListPopoverContentHeight.ts
new file mode 100644
index 000000000000..b7265a56b238
--- /dev/null
+++ b/src/libs/getSelectionListPopoverContentHeight.ts
@@ -0,0 +1,23 @@
+import variables from '@styles/variables';
+
+type SelectionListPopoverContentHeightParams = {
+    /** How many options the pop-over should be tall enough to show without scrolling */
+    optionCount: number;
+
+    /** Whether the list shows its search input, which sits above the options */
+    isSearchable?: boolean;
+
+    /** Height of a single option. Defaults to the standard selection list row */
+    optionHeight?: number;
+};
+
+/**
+ * Height a pop-over needs to show `optionCount` options without scrolling. Estimated rather than measured, so it
+ * opens at its final size instead of resizing after layout, the same way `getSelectionListPopoverHeight` does for
+ * the Spend filters, which also carry a title, header and apply button this does not.
+ */
+function getSelectionListPopoverContentHeight({optionCount, isSearchable = true, optionHeight = variables.optionRowHeight}: SelectionListPopoverContentHeightParams): number {
+    return optionCount * optionHeight + (isSearchable ? variables.popoverSearchInputHeight : 0) + variables.popoverVerticalPadding;
+}
+
+export default getSelectionListPopoverContentHeight;
diff --git a/src/libs/hasRenderableChildren.ts b/src/libs/hasRenderableChildren.ts
new file mode 100644
index 000000000000..d2c5e80ed948
--- /dev/null
+++ b/src/libs/hasRenderableChildren.ts
@@ -0,0 +1,14 @@
+import type {ReactNode} from 'react';
+
+import React from 'react';
+
+/**
+ * Whether `children` would render anything. Unlike `!!children`, it treats sibling conditionals that all
+ * came out empty (`[false, null, '']`) as no children.
+ */
+function hasRenderableChildren(children: ReactNode): boolean {
+    // `toArray` drops `null`, `undefined` and booleans, but keeps empty strings
+    return React.Children.toArray(children).some((child) => child !== '');
+}
+
+export default hasRenderableChildren;
diff --git a/src/libs/importSpreadsheetUtils.ts b/src/libs/importSpreadsheetUtils.ts
index 35fe28a0cac0..859d7ef4f251 100644
--- a/src/libs/importSpreadsheetUtils.ts
+++ b/src/libs/importSpreadsheetUtils.ts
@@ -59,6 +59,7 @@ function findColumnName(header: string, columnRoles?: ColumnRole[]): string {
         case 'payrollid':
         case 'payrolls':
         case 'payrol':
+        case 'payrollcode':
         case 'customfield2':
             attribute = CONST.CSV_IMPORT_COLUMNS.CUSTOM_FIELD_2;
             break;
@@ -191,11 +192,32 @@ function findColumnName(header: string, columnRoles?: ColumnRole[]): string {
 
         case 'itemisedreceiptrequirement':
         case 'itemizedreceiptrequirement':
+        case 'itemisedreceiptsrequired':
+        case 'itemizedreceiptsrequired':
         case 'requireitemizedreceiptsover':
         case 'maxamountnoitemizedreceipt':
             attribute = CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_ITEMIZED_RECEIPT;
             break;
 
+        case 'comments':
+        case 'requiredescription':
+            attribute = CONST.CSV_IMPORT_COLUMNS.ARE_COMMENTS_REQUIRED;
+            break;
+
+        case 'commenthint':
+        case 'descriptionhint':
+            attribute = CONST.CSV_IMPORT_COLUMNS.COMMENT_HINT;
+            break;
+
+        case 'maxexpenseamount':
+        case 'flagamountsover':
+            attribute = CONST.CSV_IMPORT_COLUMNS.MAX_EXPENSE_AMOUNT;
+            break;
+
+        case 'expenselimittype':
+            attribute = CONST.CSV_IMPORT_COLUMNS.EXPENSE_LIMIT_TYPE;
+            break;
+
         default:
             break;
     }
@@ -219,6 +241,10 @@ function findColumnName(header: string, columnRoles?: ColumnRole[]): string {
             if (attribute === CONST.CSV_IMPORT_COLUMNS.MERCHANT && columnRoles.some((role) => role.value === CONST.CSV_IMPORT_COLUMNS.UPDATED_MERCHANT)) {
                 return CONST.CSV_IMPORT_COLUMNS.UPDATED_MERCHANT;
             }
+            // Payroll headers map to the members-import CUSTOM_FIELD_2 role, but the categories import offers PAYROLL_CODE instead.
+            if (attribute === CONST.CSV_IMPORT_COLUMNS.CUSTOM_FIELD_2 && columnRoles.some((role) => role.value === CONST.CSV_IMPORT_COLUMNS.PAYROLL_CODE)) {
+                return CONST.CSV_IMPORT_COLUMNS.PAYROLL_CODE;
+            }
             // Only tag-like headers remap from NAME to TAG, so headers like "Name" or "Customer" stay
             // unmapped in contexts without a NAME role instead of silently becoming a tag column.
             if (attribute === CONST.CSV_IMPORT_COLUMNS.NAME && ['tag', 'tags'].includes(formattedHeader) && columnRoles.some((role) => role.value === CONST.CSV_IMPORT_COLUMNS.TAG)) {
diff --git a/src/libs/migrateOnyx.ts b/src/libs/migrateOnyx.ts
index 848d9f3fc287..b8b41baee663 100644
--- a/src/libs/migrateOnyx.ts
+++ b/src/libs/migrateOnyx.ts
@@ -3,6 +3,7 @@ import CONST from '@src/CONST';
 import Log from './Log';
 import ConvertGpsPointsTo2DArray from './migrations/ConvertGpsPointsTo2DArray';
 import MoveFilesOutOfDocuments from './migrations/MoveFilesOutOfDocuments';
+import MoveSearchQueryByHashToSnapshots from './migrations/MoveSearchQueryByHashToSnapshots';
 import ReplaceShouldUseStagingServerWithActiveServer from './migrations/ReplaceShouldUseStagingServerWithActiveServer';
 import {endSpan, getSpan, startSpan} from './telemetry/activeSpans';
 
@@ -18,7 +19,12 @@ export default function () {
         });
 
         // Add all migrations to an array so they are executed in order
-        const migrationPromises: Array<() => Promise<void>> = [ConvertGpsPointsTo2DArray, MoveFilesOutOfDocuments, ReplaceShouldUseStagingServerWithActiveServer];
+        const migrationPromises: Array<() => Promise<void>> = [
+            ConvertGpsPointsTo2DArray,
+            MoveFilesOutOfDocuments,
+            ReplaceShouldUseStagingServerWithActiveServer,
+            MoveSearchQueryByHashToSnapshots,
+        ];
 
         // Reduce all promises down to a single promise. All promises run in a linear fashion, waiting for the
         // previous promise to finish before moving onto the next one.
diff --git a/src/libs/migrations/MoveSearchQueryByHashToSnapshots.ts b/src/libs/migrations/MoveSearchQueryByHashToSnapshots.ts
new file mode 100644
index 000000000000..44d4ffa897c8
--- /dev/null
+++ b/src/libs/migrations/MoveSearchQueryByHashToSnapshots.ts
@@ -0,0 +1,36 @@
+/* eslint-disable @typescript-eslint/no-deprecated -- draining SEARCH_QUERY_BY_HASH is this file's entire purpose */
+import Log from '@libs/Log';
+import readOnceOnyxValue from '@libs/readOnceOnyxValue';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type {OnyxUpdate} from 'react-native-onyx';
+
+import Onyx from 'react-native-onyx';
+
+/**
+ * Snapshots cached by older versions only have their query in SEARCH_QUERY_BY_HASH. Copy it onto `search.inputQuery`
+ * so optimistic expenses keep reaching them. Hashes without a cached snapshot are dropped, so no partial snapshot is created.
+ */
+export default async function MoveSearchQueryByHashToSnapshots(): Promise<void> {
+    const searchQueryByHash = await readOnceOnyxValue(ONYXKEYS.SEARCH_QUERY_BY_HASH);
+    if (searchQueryByHash === undefined) {
+        return;
+    }
+
+    const snapshots = await readOnceOnyxValue(ONYXKEYS.COLLECTION.SNAPSHOT);
+    const updates: Array<OnyxUpdate<typeof ONYXKEYS.SEARCH_QUERY_BY_HASH | typeof ONYXKEYS.COLLECTION.SNAPSHOT>> = [
+        {onyxMethod: Onyx.METHOD.SET, key: ONYXKEYS.SEARCH_QUERY_BY_HASH, value: null},
+    ];
+    for (const [hash, inputQuery] of Object.entries(searchQueryByHash)) {
+        const snapshotKey = `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}` as const;
+        const snapshot = snapshots?.[snapshotKey];
+        if (!inputQuery || !snapshot?.search || snapshot.search.inputQuery) {
+            continue;
+        }
+        updates.push({onyxMethod: Onyx.METHOD.MERGE, key: snapshotKey, value: {search: {inputQuery}}});
+    }
+
+    await Onyx.update(updates);
+    Log.info('[Migrate Onyx] Ran MoveSearchQueryByHashToSnapshots migration');
+}
diff --git a/src/libs/migrations/ReplaceShouldUseStagingServerWithActiveServer.ts b/src/libs/migrations/ReplaceShouldUseStagingServerWithActiveServer.ts
index 6b1f04eafa74..91e7cdbb57b4 100644
--- a/src/libs/migrations/ReplaceShouldUseStagingServerWithActiveServer.ts
+++ b/src/libs/migrations/ReplaceShouldUseStagingServerWithActiveServer.ts
@@ -1,38 +1,26 @@
 /* eslint-disable @typescript-eslint/no-deprecated -- draining SHOULD_USE_STAGING_SERVER is this file's entire purpose */
 import Log from '@libs/Log';
+import readOnceOnyxValue from '@libs/readOnceOnyxValue';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-import type {OnyxKey, OnyxMultiSetInput, OnyxValue} from 'react-native-onyx';
+import type {OnyxMultiSetInput} from 'react-native-onyx';
 
 import Onyx from 'react-native-onyx';
 
-/** Onyx has no promise-based read. */
-function readOnce<TKey extends OnyxKey>(key: TKey): Promise<OnyxValue<TKey>> {
-    return new Promise((resolve) => {
-        const connection = Onyx.connectWithoutView({
-            key,
-            callback: (value) => {
-                Onyx.disconnect(connection);
-                resolve(value);
-            },
-        });
-    });
-}
-
 /**
  * A missing legacy key must write NOTHING: `resolveActiveServer` derives the environment default from
  * `value === undefined`, so seeding 'production' would pin every staging and adhoc build to production.
  */
 export default async function ReplaceShouldUseStagingServerWithActiveServer(): Promise<void> {
-    const shouldUseStagingServer = await readOnce(ONYXKEYS.SHOULD_USE_STAGING_SERVER);
+    const shouldUseStagingServer = await readOnceOnyxValue(ONYXKEYS.SHOULD_USE_STAGING_SERVER);
     if (shouldUseStagingServer === undefined) {
         return;
     }
 
     const updates: OnyxMultiSetInput = {[ONYXKEYS.SHOULD_USE_STAGING_SERVER]: null};
-    if ((await readOnce(ONYXKEYS.ACTIVE_SERVER)) === undefined) {
+    if ((await readOnceOnyxValue(ONYXKEYS.ACTIVE_SERVER)) === undefined) {
         updates[ONYXKEYS.ACTIVE_SERVER] = shouldUseStagingServer ? CONST.SERVER.STAGING : CONST.SERVER.PRODUCTION;
     }
 
diff --git a/src/libs/navigateAfterOnboarding.ts b/src/libs/navigateAfterOnboarding.ts
index dc05430a908f..e3bde32c60d2 100644
--- a/src/libs/navigateAfterOnboarding.ts
+++ b/src/libs/navigateAfterOnboarding.ts
@@ -93,6 +93,16 @@ function navigateAfterOnboarding(
     const navigationOptions = options?.afterTransition ? {afterTransition: options.afterTransition} : undefined;
     const variantOverride = options?.variantOverride;
     const variant = variantOverride ?? onboardingRHPVariant;
+
+    // The homePageNoRHP arm of the onboarding experiment lands on Home without opening the side panel, at every company size,
+    // so it is handled before the variants that are limited to micro companies or that open the side panel.
+    if (variant === CONST.ONBOARDING_RHP_VARIANT.HOME_PAGE_NO_RHP) {
+        if (!isReportTopmostSplitNavigator()) {
+            Navigation.navigate(ROUTES.HOME, navigationOptions);
+        }
+        return;
+    }
+
     if (isSmallScreenWidth && variant === CONST.ONBOARDING_RHP_VARIANT.TRACK_EXPENSES_WITH_CONCIERGE) {
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeReportID), navigationOptions);
         return;
diff --git a/src/libs/prepareRequestPayload/index.native.ts b/src/libs/prepareRequestPayload/index.native.ts
index 24fd3910f569..eb613f45289b 100644
--- a/src/libs/prepareRequestPayload/index.native.ts
+++ b/src/libs/prepareRequestPayload/index.native.ts
@@ -1,13 +1,35 @@
 import {checkFileExistsWithReason} from '@libs/fileDownload/checkFileExists';
 import {readFileAsync} from '@libs/fileDownload/FileUtils';
+import getReceiptsUploadFolderPath from '@libs/getReceiptsUploadFolderPath';
 import ReceiptStorage from '@libs/ReceiptStorage';
 import {logReceiptDropped} from '@libs/telemetry/ReceiptObservability';
 import validateFormDataParameter from '@libs/validateFormDataParameter';
 
 import type {Receipt} from '@src/types/onyx/Transaction';
 
+import RNFS from 'react-native-fs';
+
 import type PrepareRequestPayload from './types';
 
+async function getReceiptsFolderState(): Promise<{exists: boolean; entryCount?: number}> {
+    let folderPath: string;
+    try {
+        folderPath = getReceiptsUploadFolderPath();
+        if (!(await RNFS.exists(folderPath))) {
+            return {exists: false};
+        }
+    } catch {
+        return {exists: false};
+    }
+
+    try {
+        const entries = await RNFS.readDir(folderPath);
+        return {exists: true, entryCount: entries.length};
+    } catch {
+        return {exists: true};
+    }
+}
+
 /**
  * Prepares the request payload (body) for a given command and data.
  * This function is specifically designed for native platforms (IOS and Android) to handle the regeneration of blob files. It ensures that files, such as receipts, are properly read and appended to the FormData object before the request is sent.
@@ -38,8 +60,9 @@ const prepareRequestPayload: PrepareRequestPayload = (command, data, initiatedOf
                     return checkFileExistsWithReason(localUri).then(({exists, error}) => {
                         if (!exists) {
                             const transactionID = typeof data.transactionID === 'string' ? data.transactionID : undefined;
-                            logReceiptDropped({receiptTraceId, transactionID, command, source, fileName: name, statError: error});
-                            return;
+                            return getReceiptsFolderState().then((receiptsFolder) => {
+                                logReceiptDropped({receiptTraceId, transactionID, command, source, localUri, fileName: name, statError: error, receiptsFolder});
+                            });
                         }
                         const receiptFormData = {
                             uri: localUri,
diff --git a/src/libs/readOnceOnyxValue.ts b/src/libs/readOnceOnyxValue.ts
new file mode 100644
index 000000000000..794048e6d59f
--- /dev/null
+++ b/src/libs/readOnceOnyxValue.ts
@@ -0,0 +1,18 @@
+import type {OnyxKey, OnyxValue} from 'react-native-onyx';
+
+import Onyx from 'react-native-onyx';
+
+/** Onyx has no promise-based read. */
+function readOnceOnyxValue<TKey extends OnyxKey>(key: TKey): Promise<OnyxValue<TKey>> {
+    return new Promise((resolve) => {
+        const connection = Onyx.connectWithoutView({
+            key,
+            callback: (value) => {
+                Onyx.disconnect(connection);
+                resolve(value);
+            },
+        });
+    });
+}
+
+export default readOnceOnyxValue;
diff --git a/src/pages/Insights/resolveChartData.ts b/src/libs/resolveInsightsChartData.ts
similarity index 51%
rename from src/pages/Insights/resolveChartData.ts
rename to src/libs/resolveInsightsChartData.ts
index 398a1f1fe3b7..85b98bca944e 100644
--- a/src/pages/Insights/resolveChartData.ts
+++ b/src/libs/resolveInsightsChartData.ts
@@ -1,34 +1,34 @@
-import type {GroupedItem} from '@components/Search/types';
+import type {GroupedItem, SearchQueryJSON} from '@components/Search/types';
 
-import type {InsightsDashboard} from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
-import type {InsightsChartSpec} from './dashboardSpecs';
+import {isSearchDataLoaded} from './SearchUIUtils';
 
 const INSIGHTS_CHART_STATE = {
     LOADING: 'loading',
     READY: 'ready',
     EMPTY: 'empty',
     ERROR: 'error',
+    OFFLINE: 'offline',
 } as const;
 
 type InsightsChartState = ValueOf<typeof INSIGHTS_CHART_STATE>;
 
 type ResolveInsightsChartDataParams = {
-    /** The chart to resolve, as its dashboard declares it */
-    chart: InsightsChartSpec;
-
-    /** The dashboard's stored record, which says what was asked for and what came back */
-    dashboard: OnyxEntry<InsightsDashboard>;
-
-    /** The snapshot the record names for this chart */
+    /** The snapshot stored under the chart's own query, which GetInsights or Search can fill */
     snapshot: OnyxEntry<SearchResults>;
 
+    /** The chart's own query, which says whether the snapshot answers it */
+    queryJSON?: Readonly<SearchQueryJSON>;
+
     /** The snapshot's rows, grouped and sorted the way the chart plots them */
     sortedData: GroupedItem[] | undefined;
+
+    /** Whether the device is offline, so a chart with nothing stored can't expect data to arrive */
+    isOffline?: boolean;
 };
 
 type InsightsChartData = {
@@ -38,17 +38,20 @@ type InsightsChartData = {
     state: InsightsChartState;
 };
 
-/** Resolves one chart's rows and state from the snapshot the dashboard record named for it. */
-function resolveInsightsChartData({chart, dashboard, snapshot, sortedData}: ResolveInsightsChartDataParams): InsightsChartData {
-    if (Object.keys(snapshot?.errors ?? {}).length > 0) {
-        return {data: [], state: INSIGHTS_CHART_STATE.ERROR};
+/** Resolves one chart's rows and state from its snapshot, whether GetInsights or Search loaded it. */
+function resolveInsightsChartData({snapshot, queryJSON, sortedData, isOffline = false}: ResolveInsightsChartDataParams): InsightsChartData {
+    const isLoaded = isSearchDataLoaded(snapshot, queryJSON);
+    const hasErrors = Object.keys(snapshot?.errors ?? {}).length > 0;
+
+    if (isOffline && (!isLoaded || hasErrors)) {
+        return {data: [], state: INSIGHTS_CHART_STATE.OFFLINE};
     }
 
-    if (!dashboard?.graphs?.[chart.graphKey]?.snapshotHash) {
-        return {data: [], state: dashboard?.inputQuery ? INSIGHTS_CHART_STATE.EMPTY : INSIGHTS_CHART_STATE.LOADING};
+    if (hasErrors) {
+        return {data: [], state: INSIGHTS_CHART_STATE.ERROR};
     }
 
-    if (!snapshot?.data) {
+    if (!isLoaded) {
         return {data: [], state: INSIGHTS_CHART_STATE.LOADING};
     }
 
@@ -60,4 +63,3 @@ function resolveInsightsChartData({chart, dashboard, snapshot, sortedData}: Reso
 }
 
 export {INSIGHTS_CHART_STATE, resolveInsightsChartData};
-export type {InsightsChartData};
diff --git a/src/libs/shouldSkipDeepLinkNavigation/common.ts b/src/libs/shouldSkipDeepLinkNavigation/common.ts
new file mode 100644
index 000000000000..8e3a27a9c9c6
--- /dev/null
+++ b/src/libs/shouldSkipDeepLinkNavigation/common.ts
@@ -0,0 +1,13 @@
+import ROUTES from '@src/ROUTES';
+
+/**
+ * The test tools modal is app state surfaced in the URL, not a destination. Replaying it after sign-in
+ * reopens the modal on top of whatever the user actually landed on. Matches the nested server page too,
+ * since its path starts with the modal's.
+ */
+function isTestToolsRoute(route: string) {
+    return route.includes(ROUTES.TEST_TOOLS_MODAL.route);
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export {isTestToolsRoute};
diff --git a/src/libs/shouldSkipDeepLinkNavigation/index.ts b/src/libs/shouldSkipDeepLinkNavigation/index.ts
index 8a2d8035507f..70fd7c9c48da 100644
--- a/src/libs/shouldSkipDeepLinkNavigation/index.ts
+++ b/src/libs/shouldSkipDeepLinkNavigation/index.ts
@@ -1,5 +1,5 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import {isTestToolsRoute} from './common';
+
 export default function shouldSkipDeepLinkNavigation(route: string) {
-    // no-op for all other platforms
-    return false;
+    return isTestToolsRoute(route);
 }
diff --git a/src/libs/shouldSkipDeepLinkNavigation/index.web.ts b/src/libs/shouldSkipDeepLinkNavigation/index.web.ts
index ffbd861257fa..62d3d20e9f87 100644
--- a/src/libs/shouldSkipDeepLinkNavigation/index.web.ts
+++ b/src/libs/shouldSkipDeepLinkNavigation/index.web.ts
@@ -1,5 +1,7 @@
 import ROUTES, {VERIFY_ACCOUNT} from '@src/ROUTES';
 
+import {isTestToolsRoute} from './common';
+
 export default function shouldSkipDeepLinkNavigation(route: string) {
     // When deep-linking to desktop app with `transition` route we don't want to call navigate
     // on the route because it will display an infinite loading indicator.
@@ -11,5 +13,5 @@ export default function shouldSkipDeepLinkNavigation(route: string) {
         return true;
     }
 
-    return false;
+    return isTestToolsRoute(route);
 }
diff --git a/src/libs/sortAlphabetically.ts b/src/libs/sortAlphabetically.ts
new file mode 100644
index 000000000000..decab07ce857
--- /dev/null
+++ b/src/libs/sortAlphabetically.ts
@@ -0,0 +1,7 @@
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+
+function sortAlphabetically<T extends Partial<Record<TKey, string | undefined>>, TKey extends keyof T>(items: T[], key: TKey, localeCompare: LocaleContextProps['localeCompare']): T[] {
+    return items.sort((a, b) => localeCompare(a[key]?.toLowerCase() ?? '', b[key]?.toLowerCase() ?? ''));
+}
+
+export default sortAlphabetically;
diff --git a/src/libs/telemetry/ReceiptObservability.ts b/src/libs/telemetry/ReceiptObservability.ts
index 7064f3f70cb1..b6c7d594bea4 100644
--- a/src/libs/telemetry/ReceiptObservability.ts
+++ b/src/libs/telemetry/ReceiptObservability.ts
@@ -69,6 +69,7 @@ const RECEIPT_BEARING_COMMANDS = new Set<string>([
     WRITE_COMMANDS.CATEGORIZE_TRACKED_EXPENSE,
     WRITE_COMMANDS.SHARE_TRACKED_EXPENSE,
     WRITE_COMMANDS.ADD_TRACKED_EXPENSE_TO_POLICY,
+    WRITE_COMMANDS.CREATE_DISTANCE_REQUEST,
 ]);
 
 /** When each receipt was enqueued, keyed by transaction id, so a snapshot can report how long it has waited. */
@@ -178,23 +179,27 @@ function logReceiptEnqueued({receiptTraceId, transactionID, command, persistedQu
 /**
  * Records the dropped milestone: the receipt file was gone when we built the upload payload, so the request goes out
  * without it. Logged at alert level on the [Receipt] spine so it reaches Sentry and joins the capture, submit, and
- * enqueue lines by receiptTraceId. source and fileName are for the raw device log only; they are not whitelisted, so
- * they never reach Sentry.
+ * enqueue lines by receiptTraceId. source, localUri and fileName are for the raw device log only; they are not
+ * whitelisted, so they never reach Sentry.
  */
 function logReceiptDropped({
     receiptTraceId,
     transactionID,
     command,
     source,
+    localUri,
     fileName,
     statError,
+    receiptsFolder,
 }: {
     receiptTraceId: string | undefined;
     transactionID: string | undefined;
     command: string;
     source: string | undefined;
+    localUri: string | undefined;
     fileName: string | undefined;
     statError: {message: string; code?: string} | undefined;
+    receiptsFolder: {exists: boolean; entryCount?: number};
 }) {
     Log.alert(`${RECEIPT_LOG_PREFIX} dropped`, {
         event: 'dropped',
@@ -202,9 +207,12 @@ function logReceiptDropped({
         transactionID,
         command,
         source,
+        localUri,
         fileName,
         statErrorCode: statError?.code,
         statError: statError?.message,
+        receiptsFolderExists: String(receiptsFolder.exists),
+        receiptsFolderEntryCount: receiptsFolder.entryCount,
     });
 }
 
diff --git a/src/libs/telemetry/TelemetrySynchronizer.ts b/src/libs/telemetry/TelemetrySynchronizer.ts
index d8ad2124603b..1555ea8bbf3a 100644
--- a/src/libs/telemetry/TelemetrySynchronizer.ts
+++ b/src/libs/telemetry/TelemetrySynchronizer.ts
@@ -14,6 +14,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import * as Sentry from '@sentry/react-native';
 import Onyx from 'react-native-onyx';
 
+import getAccountSizeTier from './accountSizeTier';
 import {cleanupCrashDiagnostics, initializeCrashDiagnostics} from './crashDiagnostics';
 import {cleanupDatabaseSizeTracking, requestDatabaseSizeRemeasurement} from './databaseSizeTracker';
 import {clearGlobalSpanAttributes, setGlobalSpanAttribute} from './globalSpanAttributes';
@@ -99,6 +100,7 @@ Onyx.connectWithoutView({
             return;
         }
         // An account can have zero transactions, which Onyx delivers as undefined. Count it as 0 so the zero cohort stays in the data.
+        // Keep a value that arrives before the session too, on cold start this collection can hydrate first and the callback will not run again.
         const transactionsCount = Object.keys(value ?? {}).length;
         sendTransactionsCount(transactionsCount);
         requestDatabaseSizeRemeasurement(transactionsCount);
@@ -113,59 +115,6 @@ Onyx.connectWithoutView({
     },
 });
 
-/**
- * Buckets policy count into cohorts for Sentry tagging
- */
-function bucketPolicyCount(count: number): string {
-    if (count <= 1) {
-        return '0-1';
-    }
-    if (count <= 10) {
-        return '2-10';
-    }
-    if (count <= 50) {
-        return '11-50';
-    }
-    if (count <= 100) {
-        return '51-100';
-    }
-    if (count <= 250) {
-        return '101-250';
-    }
-    if (count <= 500) {
-        return '251-500';
-    }
-    if (count <= 1000) {
-        return '501-1000';
-    }
-    return '1000+';
-}
-
-/**
- * Buckets report count into cohorts for Sentry tagging
- */
-function bucketReportCount(count: number): string {
-    if (count <= 60) {
-        return '0-60';
-    }
-    if (count <= 300) {
-        return '61-300';
-    }
-    if (count <= 1000) {
-        return '301-1000';
-    }
-    if (count <= 2500) {
-        return '1001-2500';
-    }
-    if (count <= 5000) {
-        return '2501-5000';
-    }
-    if (count <= 10000) {
-        return '5001-10000';
-    }
-    return '10000+';
-}
-
 function handleAccountChange() {
     clearGlobalSpanAttributes();
     activePolicyID = undefined;
@@ -189,9 +138,8 @@ function sendPoliciesContext() {
         }
     }
 
-    const policiesCountBucket = bucketPolicyCount(activePolicies.length);
     Sentry.setTag(CONST.TELEMETRY.TAGS.ACTIVE_POLICY, activePolicyID);
-    Sentry.setTag(CONST.TELEMETRY.TAGS.POLICIES_COUNT, policiesCountBucket);
+    Sentry.setTag(CONST.TELEMETRY.TAGS.POLICIES_COUNT, getAccountSizeTier(CONST.TELEMETRY.TAGS.POLICIES_COUNT, activePolicies.length));
     Sentry.setTag(CONST.TELEMETRY.TAGS.USER_ROLE, userRole);
     Sentry.setContext(CONST.TELEMETRY.CONTEXT_POLICIES, {activePolicyID, activePolicies});
     setGlobalSpanAttribute(CONST.TELEMETRY.ATTRIBUTE_POLICIES_COUNT_RAW, activePolicies.length);
@@ -206,19 +154,17 @@ function sendTryNewDotCohortTag() {
 }
 
 function sendReportsCount(reportsCount: number) {
-    const reportsCountBucket = bucketReportCount(reportsCount);
-    Sentry.setTag(CONST.TELEMETRY.TAGS.REPORTS_COUNT, reportsCountBucket);
+    Sentry.setTag(CONST.TELEMETRY.TAGS.REPORTS_COUNT, getAccountSizeTier(CONST.TELEMETRY.TAGS.REPORTS_COUNT, reportsCount));
     setGlobalSpanAttribute(CONST.TELEMETRY.ATTRIBUTE_REPORTS_COUNT_RAW, reportsCount);
 }
 
 function sendPersonalDetailsCount(personalDetailsCount: number) {
-    const personalDetailsCountBucket = bucketReportCount(personalDetailsCount);
-    Sentry.setTag(CONST.TELEMETRY.TAGS.PERSONAL_DETAILS_COUNT, personalDetailsCountBucket);
+    Sentry.setTag(CONST.TELEMETRY.TAGS.PERSONAL_DETAILS_COUNT, getAccountSizeTier(CONST.TELEMETRY.TAGS.PERSONAL_DETAILS_COUNT, personalDetailsCount));
     setGlobalSpanAttribute(CONST.TELEMETRY.ATTRIBUTE_PERSONAL_DETAILS_COUNT_RAW, personalDetailsCount);
 }
 
 function sendTransactionsCount(transactionsCount: number) {
-    // Attribute only for now. The bucketed tag comes once borders can be derived from this data (https://github.com/Expensify/App/issues/98432).
+    Sentry.setTag(CONST.TELEMETRY.TAGS.TRANSACTIONS_COUNT, getAccountSizeTier(CONST.TELEMETRY.TAGS.TRANSACTIONS_COUNT, transactionsCount));
     setGlobalSpanAttribute(CONST.TELEMETRY.ATTRIBUTE_TRANSACTIONS_COUNT_RAW, transactionsCount);
 }
 
diff --git a/src/libs/telemetry/accountSizeTier.ts b/src/libs/telemetry/accountSizeTier.ts
new file mode 100644
index 000000000000..59151e76a58a
--- /dev/null
+++ b/src/libs/telemetry/accountSizeTier.ts
@@ -0,0 +1,32 @@
+/**
+ * Buckets the account size counts and the database size into the tier values used by the Sentry tags.
+ */
+import CONST from '@src/CONST';
+
+import type {ValueOf} from 'type-fest';
+
+type SizeTier = ValueOf<typeof CONST.TELEMETRY.SIZE_TIER>;
+
+// Two or three borders, so the last tier is always one of the four tier values
+type Borders = readonly [number, number] | readonly [number, number, number];
+
+// Inclusive upper bounds of small, medium and large. Anything above the last one is xlarge (or large for tags with two borders).
+const BORDERS = {
+    [CONST.TELEMETRY.TAGS.REPORTS_COUNT]: [25, 250, 1000],
+    [CONST.TELEMETRY.TAGS.TRANSACTIONS_COUNT]: [25, 250, 1000],
+    [CONST.TELEMETRY.TAGS.PERSONAL_DETAILS_COUNT]: [100, 1000],
+    [CONST.TELEMETRY.TAGS.POLICIES_COUNT]: [1, 2, 10],
+    [CONST.TELEMETRY.TAGS.DB_SIZE]: [5_000_000, 20_000_000, 50_000_000],
+} as const satisfies Record<string, Borders>;
+
+type AccountSizeTag = keyof typeof BORDERS;
+
+const TIERS: SizeTier[] = [CONST.TELEMETRY.SIZE_TIER.SMALL, CONST.TELEMETRY.SIZE_TIER.MEDIUM, CONST.TELEMETRY.SIZE_TIER.LARGE, CONST.TELEMETRY.SIZE_TIER.XLARGE];
+
+function getAccountSizeTier(tag: AccountSizeTag, value: number): SizeTier {
+    const borders = BORDERS[tag];
+    const index = borders.findIndex((border) => value <= border);
+    return TIERS[index === -1 ? borders.length : index];
+}
+
+export default getAccountSizeTier;
diff --git a/src/libs/telemetry/activeSpans.ts b/src/libs/telemetry/activeSpans.ts
index f079b6b6a956..fcfab76b7e4e 100644
--- a/src/libs/telemetry/activeSpans.ts
+++ b/src/libs/telemetry/activeSpans.ts
@@ -39,7 +39,9 @@ function startSpan(spanId: string, options: StartSpanOptions) {
         spanOptions: options,
         timestamp: Date.now(),
     });
-    const span = Sentry.startInactiveSpan(options);
+    // Sentry adopts the scope's active span when no parent is given, and a tap's idle span teardown force-ends live
+    // children. `forceTransaction` keeps the span out of that child list while preserving the trace link.
+    const span = Sentry.startInactiveSpan({...options, forceTransaction: options.forceTransaction ?? !options.parentSpan});
 
     const startTimeForLog = getPerformanceStartTimeForLog(options.startTime);
 
diff --git a/src/libs/telemetry/databaseSizeTracker.ts b/src/libs/telemetry/databaseSizeTracker.ts
index 9884ebfe40fd..8021f19dd34a 100644
--- a/src/libs/telemetry/databaseSizeTracker.ts
+++ b/src/libs/telemetry/databaseSizeTracker.ts
@@ -4,14 +4,16 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {DatabaseSizeMeasurement} from '@src/types/onyx';
 
+import * as Sentry from '@sentry/react-native';
 import debounce from 'lodash/debounce';
 import Onyx from 'react-native-onyx';
 
+import getAccountSizeTier from './accountSizeTier';
 import measureDatabaseSize from './databaseSize';
 import {getGlobalSpanAttributes, setGlobalSpanAttribute} from './globalSpanAttributes';
 
 /**
- * Keeps the db_size_bytes/db_size_source global span attributes up to date and persists each measurement,
+ * Keeps the db_size tag and the db_size_bytes/db_size_source global span attributes up to date and persists each measurement,
  * so that on the next app start the spans (including the startup span) carry the last known size right away.
  */
 
@@ -29,6 +31,7 @@ function applyMeasurement(measurement: DatabaseSizeMeasurement) {
         return;
     }
     setGlobalSpanAttribute(CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_BYTES, measurement.bytes);
+    Sentry.setTag(CONST.TELEMETRY.TAGS.DB_SIZE, getAccountSizeTier(CONST.TELEMETRY.TAGS.DB_SIZE, measurement.bytes));
 }
 
 // connectWithoutView: module-level telemetry logic, no UI. The persisted measurement lets startup spans carry a size before this session measures one.
diff --git a/src/libs/telemetry/forwardLogsToSentry.ts b/src/libs/telemetry/forwardLogsToSentry.ts
index 173600f8a68c..1b80896126bb 100644
--- a/src/libs/telemetry/forwardLogsToSentry.ts
+++ b/src/libs/telemetry/forwardLogsToSentry.ts
@@ -32,7 +32,7 @@ const PARAMETERS_WHITELIST: ReadonlyArray<string | RegExp> = [
 /**
  * Only log lines whose message contains one of these prefixes are forwarded to Sentry.
  */
-const FORWARDED_LOG_PREFIXES = ['[MFA]', '[OnyxUpdateManagerError]', '[Receipt]', '[PDFStall]', '[OpenReportStall]', '[withNavigationFallback]'] as const;
+const FORWARDED_LOG_PREFIXES = ['[MFA]', '[OnyxUpdateManagerError]', '[Receipt]', '[PDFStall]', '[OpenReportStall]', '[withNavigationFallback]', '[UpdateRequired]'] as const;
 
 type ForwardedLogPrefix = TupleToUnion<typeof FORWARDED_LOG_PREFIXES>;
 
@@ -61,6 +61,9 @@ const PREFIX_SCOPED_PARAMETERS_WHITELIST = new Map<ForwardedLogPrefix, ReadonlyA
             'isSourceInDurableFolder',
             'msSinceEnqueued',
             'pendingReceiptCount',
+            'isOffline',
+            'receiptsFolderExists',
+            'receiptsFolderEntryCount',
         ],
     ],
     ['[PDFStall]', ['reportID']],
diff --git a/src/libs/telemetry/submitFollowUpAction.ts b/src/libs/telemetry/submitFollowUpAction.ts
index 8cbb576573cc..bb66919ebdae 100644
--- a/src/libs/telemetry/submitFollowUpAction.ts
+++ b/src/libs/telemetry/submitFollowUpAction.ts
@@ -87,7 +87,7 @@ function isSameFlowUpdate(pending: NonNullable<PendingSubmitFollowUpAction>, fol
         return true;
     }
     // The fast path (pre-insert) sets NAVIGATE_TO_SEARCH before createTransaction runs.
-    // handleNavigateAfterExpenseCreate may later call with DISMISS_MODAL_ONLY because it
+    // navigateAfterExpenseCreate may later call with DISMISS_MODAL_ONLY because it
     // sees the Search page as already on top. Treat this as same-flow - keep the original.
     return pending.followUpAction === CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.NAVIGATE_TO_SEARCH && followUpAction === CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.DISMISS_MODAL_ONLY;
 }
@@ -105,7 +105,7 @@ function setPendingSubmitFollowUpAction(followUpAction: SubmitFollowUpAction, re
     if (pending !== null && span && isSameFlowUpdate(pending, followUpAction, reportID)) {
         // Same flow: only update when the new action is a genuine refinement (e.g.
         // DISMISS_MODAL_ONLY -> DISMISS_MODAL_AND_OPEN_REPORT). When the fast path set
-        // NAVIGATE_TO_SEARCH and handleNavigateAfterExpenseCreate later calls with
+        // NAVIGATE_TO_SEARCH and navigateAfterExpenseCreate later calls with
         // DISMISS_MODAL_ONLY (because Search is already on top), preserve the original
         // action so telemetry correctly reflects the pre-insert path.
         const isRefinement =
diff --git a/src/pages/ConciergePage.tsx b/src/pages/ConciergePage.tsx
index 4da5d32af0cb..6e71630490af 100644
--- a/src/pages/ConciergePage.tsx
+++ b/src/pages/ConciergePage.tsx
@@ -4,6 +4,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 
 import useContentHeaderHeight from '@hooks/useContentHeaderHeight';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {navigateToConciergeChat} from '@libs/actions/Report';
@@ -31,6 +32,7 @@ function ConciergePage() {
     const [isLoadingReportData = true] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
 
     useFocusEffect(
@@ -46,6 +48,7 @@ function ConciergePage() {
                         introSelected,
                         currentUserAccountID: session.accountID ?? CONST.DEFAULT_NUMBER_ID,
                         isSelfTourViewed,
+                        conciergePersonalDetails,
                         shouldDismissModal: true,
                         checkIfCurrentPageActive: () => !isUnmounted.current,
                     });
@@ -53,7 +56,7 @@ function ConciergePage() {
             } else {
                 Navigation.navigate(ROUTES.INBOX);
             }
-        }, [session, isLoadingReportData, conciergeReportID, introSelected, isSelfTourViewed]),
+        }, [session, isLoadingReportData, conciergeReportID, introSelected, isSelfTourViewed, conciergePersonalDetails]),
     );
 
     useEffect(() => {
diff --git a/src/pages/Debug/Report/DebugReportActions.tsx b/src/pages/Debug/Report/DebugReportActions.tsx
index 10f4203445a0..756ea5c47e49 100644
--- a/src/pages/Debug/Report/DebugReportActions.tsx
+++ b/src/pages/Debug/Report/DebugReportActions.tsx
@@ -6,6 +6,7 @@ import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelec
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -41,7 +42,7 @@ function DebugReportActions({reportID}: DebugReportActionsProps) {
     const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`);
     const isReportArchived = useReportIsArchived(reportID);
     const ifUserCanPerformWriteAction = canUserPerformWriteAction(report, isReportArchived);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const derivedReportName = useDerivedReportNameByReportID(report?.reportID);
 
@@ -102,8 +103,9 @@ function DebugReportActions({reportID}: DebugReportActionsProps) {
                 text: getReportActionDebugText(reportAction),
                 alternateText: `${reportAction.reportActionID} | ${datetimeToCalendarTime(reportAction.created, false, false)}`,
                 keyForList: reportAction.reportActionID,
+                titleStyles: styles.fontWeightNormal,
             }));
-    }, [sortedAllReportActions, debouncedSearchValue, getReportActionDebugText, datetimeToCalendarTime]);
+    }, [sortedAllReportActions, debouncedSearchValue, getReportActionDebugText, datetimeToCalendarTime, styles.fontWeightNormal]);
 
     const textInputOptions = useMemo(
         () => ({
@@ -127,7 +129,6 @@ function DebugReportActions({reportID}: DebugReportActionsProps) {
             </Button>
             <SelectionList
                 data={searchedReportActions}
-                style={{listItemTitleStyles: styles.fontWeightNormal}}
                 textInputOptions={textInputOptions}
                 onSelectRow={(item) => Navigation.navigate(ROUTES.DEBUG_REPORT_ACTION.getRoute(reportID, item.reportActionID))}
                 ListItem={SingleSelectListItem}
diff --git a/src/pages/Debug/Report/DebugReportPage.tsx b/src/pages/Debug/Report/DebugReportPage.tsx
index 79e09dee9fb9..67b5ea28066d 100644
--- a/src/pages/Debug/Report/DebugReportPage.tsx
+++ b/src/pages/Debug/Report/DebugReportPage.tsx
@@ -9,6 +9,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import {useDerivedIsEmptyReport} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -40,7 +41,6 @@ import type {ReportAttributesDerivedValue} from '@src/types/onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
-import {conciergePersonalDetailSelector, personalDetailsSelector} from '@selectors/PersonalDetails';
 import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
 
@@ -87,8 +87,8 @@ function DebugReportPage({
     });
     const currentUserPersonalDetail = useCurrentUserPersonalDetails();
     const {accountID: currentUserAccountID, login: currentUserLogin} = currentUserPersonalDetail;
-    const [conciergePersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: conciergePersonalDetailSelector});
-    const [reportOwnerPersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsSelector(report?.ownerAccountID)});
+    const [conciergePersonalDetail] = usePersonalDetail(CONST.ACCOUNT_ID.CONCIERGE);
+    const [reportOwnerPersonalDetail] = usePersonalDetail(report?.ownerAccountID);
     const transactionID = DebugUtils.getTransactionID(report, reportActions);
     const isReportArchived = useReportIsArchived(reportID);
     const [guideAccountIDs] = useOnyx(ONYXKEYS.DERIVED.GUIDE_ACCOUNT_IDS);
diff --git a/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx b/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx
index 80732fcf8417..95d47595016c 100644
--- a/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx
+++ b/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx
@@ -112,6 +112,7 @@ function DynamicNewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelec
     const [policiesWithEmptyReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: policiesWithEmptyReportsForAccountSelector});
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
 
     const navigateToNewReport = (optimisticReportID: string) => {
         if (isRHPOnReportInSearch) {
@@ -155,6 +156,7 @@ function DynamicNewReportWorkspaceSelectionPage({route}: NewReportWorkspaceSelec
                     allTransactionViolation: transactionViolations,
                     reports: reportsForCall,
                     rules,
+                    cardList,
                     isTrackIntentUser,
                     personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
                     selfDMReportActions,
diff --git a/src/pages/DynamicReportChangeWorkspacePage.tsx b/src/pages/DynamicReportChangeWorkspacePage.tsx
index 1cb59a166d0f..8367aa5ce07a 100644
--- a/src/pages/DynamicReportChangeWorkspacePage.tsx
+++ b/src/pages/DynamicReportChangeWorkspacePage.tsx
@@ -21,6 +21,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useParentReportAction from '@hooks/useParentReportAction';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useReportTransactions from '@hooks/useReportTransactions';
 import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals';
@@ -52,12 +53,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {doesPersonalDetailExistSelector, personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type {DismissedProductTraining} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {doesPersonalDetailExist, loginSelector} from '@selectors/PersonalDetails';
 import React, {useState} from 'react';
 import {View} from 'react-native';
 
@@ -94,9 +95,9 @@ function DynamicReportChangeWorkspacePage({report}: DynamicReportChangeWorkspace
     const isReportLastVisibleArchived = useReportIsArchived(report?.parentReportID);
     const ownerAccountID = report?.ownerAccountID;
     const managerID = report?.managerID;
-    const [submitterLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(ownerAccountID)});
-    const [doesSubmitterPersonalDetailExist] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: doesPersonalDetailExistSelector(ownerAccountID)});
-    const [managerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(managerID)});
+    const [submitterLogin] = usePersonalDetail(ownerAccountID, loginSelector);
+    const [hasSubmitterPersonalDetail = false] = usePersonalDetail(ownerAccountID, doesPersonalDetailExist);
+    const [managerLogin] = usePersonalDetail(managerID, loginSelector);
     const shouldShowLoadingIndicator = isAppLoadPending && !isOffline;
     const {isBetaEnabled} = usePermissions();
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
@@ -165,7 +166,7 @@ function DynamicReportChangeWorkspacePage({report}: DynamicReportChangeWorkspace
                 reportPreviewAction,
                 session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
                 submitterLogin,
-                doesSubmitterPersonalDetailExist ?? false,
+                hasSubmitterPersonalDetail,
                 getCurrencyDecimals,
                 rules,
                 reportTransactions,
diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx
new file mode 100644
index 000000000000..1d643d0186c6
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/ReportDetailsAvatar.tsx
@@ -0,0 +1,136 @@
+import UserAvatar from '@components/Avatar/UserAvatar';
+import AvatarWithImagePicker from '@components/AvatarWithImagePicker';
+import ReportHeaderAvatars from '@components/ReportHeaderAvatars';
+import RoomHeaderAvatars from '@components/RoomHeaderAvatars';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import Navigation from '@libs/Navigation/Navigation';
+import {isPolicyAdmin as isPolicyAdminUtil} from '@libs/PolicyUtils';
+import {
+    getIcons,
+    getParticipantsList,
+    isChatRoom as isChatRoomUtil,
+    isChatThread as isChatThreadUtil,
+    isGroupChat as isGroupChatUtil,
+    isPolicyExpenseChat as isPolicyExpenseChatUtil,
+    isThread as isThreadUtil,
+    isUserCreatedPolicyRoom as isUserCreatedPolicyRoomUtil,
+} from '@libs/ReportUtils';
+import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils';
+
+import {clearAvatarErrors, updateGroupChatAvatar} from '@userActions/Report';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData';
+import type {Report} from '@src/types/onyx';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type ReportDetailsAvatarProps = {
+    reportID: string;
+};
+
+type ReportDetailsAvatarContentProps = {
+    report: Report;
+};
+
+function ReportDetailsAvatarContent({report}: ReportDetailsAvatarContentProps) {
+    const reportID = report.reportID;
+    const {translate, formatPhoneNumber} = useLocalize();
+    const styles = useThemeStyles();
+    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Camera']);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`);
+    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [pendingDeleteMemberAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {selector: pendingDeleteMemberAccountIDsSelector});
+    const [personalDetails] = useAllPersonalDetails();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const currentUserAccountID = currentUserPersonalDetails?.accountID;
+    const isReportArchived = useReportIsArchived(reportID);
+
+    const isPolicyAdmin = isPolicyAdminUtil(policy);
+    const isPolicyExpenseChat = isPolicyExpenseChatUtil(report);
+    const isChatRoom = isChatRoomUtil(report);
+    const isUserCreatedPolicyRoom = isUserCreatedPolicyRoomUtil(report);
+    const isChatThread = isChatThreadUtil(report);
+    const isGroupChat = isGroupChatUtil(report);
+    const isThread = isThreadUtil(report);
+    const shouldOpenRoomMembersPage = isUserCreatedPolicyRoom || isChatThread || (isPolicyExpenseChat && isPolicyAdmin);
+    const participants = getParticipantsList(report, personalDetails, shouldOpenRoomMembersPage);
+
+    const icons = getIcons(report, formatPhoneNumber, translate, personalDetails, null, '', -1, policy, undefined, isReportArchived, pendingDeleteMemberAccountIDs, conciergeReportID);
+
+    if (isChatRoom && !isThread) {
+        return (
+            <View style={styles.mb3}>
+                <RoomHeaderAvatars
+                    icons={icons}
+                    report={report}
+                    policy={policy}
+                    participants={participants}
+                    currentUserAccountID={currentUserAccountID}
+                />
+            </View>
+        );
+    }
+    if (!isGroupChat || isThread) {
+        return (
+            <View style={styles.mb3}>
+                <ReportHeaderAvatars reportID={report.reportID} />
+            </View>
+        );
+    }
+
+    const groupChatIcon = icons.at(0);
+    const groupChatAvatarSource = groupChatIcon?.source;
+    const groupChatAvatar = groupChatAvatarSource ? (
+        <UserAvatar
+            source={groupChatAvatarSource}
+            size={CONST.AVATAR_SIZE.XXXX_LARGE}
+            accountID={getAccountIDFromAvatarID(groupChatIcon?.id)}
+            fallbackIcon={groupChatIcon?.fallbackIcon}
+        />
+    ) : null;
+
+    return (
+        <AvatarWithImagePicker
+            source={groupChatAvatarSource}
+            avatar={groupChatAvatar}
+            isUsingDefaultAvatar={!report.avatarUrl}
+            onViewPhotoPress={() => Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(report.reportID))}
+            onImageRemoved={() => {
+                // Calling this without a file will remove the avatar
+                updateGroupChatAvatar(report.reportID, report.avatarUrl);
+            }}
+            onImageSelected={(file) => updateGroupChatAvatar(report.reportID, report.avatarUrl, file)}
+            editIcon={expensifyIcons.Camera}
+            editIconStyle={styles.smallEditIconAccount}
+            pendingAction={report.pendingFields?.avatar ?? undefined}
+            errors={report.errorFields?.avatar ?? null}
+            errorRowStyles={styles.mt6}
+            onErrorClose={() => clearAvatarErrors(report.reportID)}
+            style={[styles.w100, styles.mb3]}
+        />
+    );
+}
+
+function ReportDetailsAvatar({reportID}: ReportDetailsAvatarProps) {
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+
+    if (!report?.reportID) {
+        return null;
+    }
+
+    return <ReportDetailsAvatarContent report={report} />;
+}
+
+export default ReportDetailsAvatar;
diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsDescription.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsDescription.tsx
new file mode 100644
index 000000000000..38a7712154c8
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/ReportDetailsDescription.tsx
@@ -0,0 +1,69 @@
+import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import Navigation from '@libs/Navigation/Navigation';
+import {canEditReportDescription as canEditReportDescriptionUtil, getReportDescription, isChatRoom as isChatRoomUtil, isTaskReport as isTaskReportUtil} from '@libs/ReportUtils';
+
+import {canModifyTask} from '@userActions/Task';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
+
+import React from 'react';
+
+type ReportDetailsDescriptionProps = {
+    reportID: string;
+};
+
+function ReportDetailsDescription({reportID}: ReportDetailsDescriptionProps) {
+    const {translate} = useLocalize();
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`);
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const currentUserAccountID = currentUserPersonalDetails?.accountID;
+    const isParentReportArchived = useReportIsArchived(parentReport?.reportID);
+
+    if (!report?.reportID) {
+        return null;
+    }
+
+    const isChatRoom = isChatRoomUtil(report);
+    const isTaskReport = isTaskReportUtil(report);
+    const isTaskModifiable = canModifyTask(report, currentUserAccountID, isParentReportArchived);
+    const canEditReportDescription = canEditReportDescriptionUtil(report, policy);
+    const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '') && (isTaskReport ? isTaskModifiable : true);
+
+    if (!shouldShowReportDescription) {
+        return null;
+    }
+
+    const mentionReportContextValue = {currentReportID: report.reportID, exactlyMatch: true};
+
+    return (
+        <OfflineWithFeedback pendingAction={report.pendingFields?.description}>
+            <MentionReportContext.Provider value={mentionReportContextValue}>
+                <MenuItem.Root onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DESCRIPTION.path))}>
+                    <MenuItem.Row>
+                        <MenuItemField.Content name={translate('reportDescriptionPage.roomDescription')}>
+                            {!!getReportDescription(report) && <MenuItem.FieldValueHTML characterLimit={100}>{getReportDescription(report)}</MenuItem.FieldValueHTML>}
+                        </MenuItemField.Content>
+                        <MenuItem.Trailing>
+                            <MenuItem.Chevron />
+                        </MenuItem.Trailing>
+                    </MenuItem.Row>
+                </MenuItem.Root>
+            </MentionReportContext.Provider>
+        </OfflineWithFeedback>
+    );
+}
+
+export default ReportDetailsDescription;
diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsNameSection.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsNameSection.tsx
new file mode 100644
index 000000000000..a9a74b039c76
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/ReportDetailsNameSection.tsx
@@ -0,0 +1,140 @@
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useParentReportAction from '@hooks/useParentReportAction';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import Navigation from '@libs/Navigation/Navigation';
+import {
+    getChatRoomSubtitle,
+    getPolicyName,
+    isDefaultRoom as isDefaultRoomUtil,
+    isExpenseReport as isExpenseReportUtil,
+    isGroupChat as isGroupChatUtil,
+    isInvoiceRoom as isInvoiceRoomUtil,
+    isInvoiceReport as isInvoiceReportUtil,
+    isMoneyRequest as isMoneyRequestUtil,
+    isMoneyRequestReport as isMoneyRequestReportUtil,
+    isPolicyExpenseChat as isPolicyExpenseChatUtil,
+    isThread as isThreadUtil,
+    isTrackExpenseReportNew as isTrackExpenseReportUtil,
+    isUserCreatedPolicyRoom as isUserCreatedPolicyRoomUtil,
+    isWorkspaceChat as isWorkspaceChatUtil,
+    shouldDisableRename as shouldDisableRenameUtil,
+} from '@libs/ReportUtils';
+import StringUtils from '@libs/StringUtils';
+
+import {clearPolicyRoomNameErrors} from '@userActions/Report';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type {Report} from '@src/types/onyx';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import getReportDetailsCaseID from './getReportDetailsCaseID';
+import {CASES} from './types';
+import useReportDetailsReportName from './useReportDetailsReportName';
+
+type ReportDetailsNameSectionProps = {
+    reportID: string;
+};
+
+type ReportDetailsNameSectionContentProps = {
+    report: Report;
+};
+
+function ReportDetailsNameSectionContent({report}: ReportDetailsNameSectionContentProps) {
+    const reportID = report.reportID;
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`);
+    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const parentReportAction = useParentReportAction(report);
+    const isReportArchived = useReportIsArchived(reportID);
+    const {reportName} = useReportDetailsReportName(report, parentReport, parentReportAction);
+
+    const isGroupChat = isGroupChatUtil(report);
+    const isThread = isThreadUtil(report);
+    const isWorkspaceChat = isWorkspaceChatUtil(report.chatType ?? '');
+    const shouldDisableRename = shouldDisableRenameUtil(report, isReportArchived);
+    const chatRoomSubtitle = getChatRoomSubtitle(report, policy, conciergeReportID, translate, rules, false, isReportArchived) ?? '';
+    const additionalRoomDetails =
+        isExpenseReportUtil(report) || isPolicyExpenseChatUtil(report) || isInvoiceRoomUtil(report) ? chatRoomSubtitle : `${translate('threads.in')} ${chatRoomSubtitle}`;
+    const caseID = getReportDetailsCaseID({
+        isMoneyRequestReport: isMoneyRequestReportUtil(report),
+        isInvoiceReport: isInvoiceReportUtil(report),
+        isMoneyRequest: isMoneyRequestUtil(report),
+        isTrackExpenseReport: isTrackExpenseReportUtil(report, parentReport, parentReportAction),
+    });
+
+    let roomDescription: string | undefined;
+    if (caseID === CASES.MONEY_REQUEST) {
+        roomDescription = translate('common.name');
+    } else if (isGroupChat) {
+        roomDescription = translate('newRoomPage.groupName');
+    } else {
+        roomDescription = translate('newRoomPage.roomName');
+    }
+
+    const shouldDisplayGroupWorkspaceAsPushRow = !isThread && (isGroupChat || isUserCreatedPolicyRoomUtil(report) || isDefaultRoomUtil(report));
+
+    return (
+        <OfflineWithFeedback
+            pendingAction={report.pendingFields?.reportName}
+            errors={report.errorFields?.reportName ?? null}
+            errorRowStyles={[styles.ph5]}
+            onClose={() => clearPolicyRoomNameErrors(report.reportID)}
+        >
+            <View style={[styles.flex1, !shouldDisableRename && styles.mt3]}>
+                <MenuItemWithTopDescription
+                    shouldShowRightIcon={!shouldDisableRename}
+                    interactive={!shouldDisableRename}
+                    title={StringUtils.lineBreaksToSpaces(reportName)}
+                    titleStyle={[styles.newKansasLarge, !shouldDisplayGroupWorkspaceAsPushRow && styles.textAlignCenter]}
+                    titleContainerStyle={!shouldDisplayGroupWorkspaceAsPushRow && styles.alignItemsCenter}
+                    shouldCheckActionAllowedOnPress={false}
+                    description={shouldDisplayGroupWorkspaceAsPushRow ? roomDescription : ''}
+                    furtherDetails={chatRoomSubtitle && !isGroupChat && !shouldDisplayGroupWorkspaceAsPushRow ? additionalRoomDetails : ''}
+                    furtherDetailsNumberOfLines={isWorkspaceChat ? 0 : undefined}
+                    furtherDetailsStyle={isWorkspaceChat ? [styles.textAlignCenter, styles.breakWord] : undefined}
+                    onPress={() => {
+                        Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_SETTINGS_NAME.path));
+                    }}
+                    numberOfLinesTitle={isThread ? 2 : 0}
+                    shouldBreakWord
+                />
+                {shouldDisplayGroupWorkspaceAsPushRow && !isGroupChat && (
+                    <MenuItemWithTopDescription
+                        shouldShowRightIcon={false}
+                        interactive={false}
+                        description={translate('workspace.common.workspace')}
+                        title={getPolicyName({report, unavailableTranslation: translate('workspace.common.unavailable')})}
+                        numberOfLinesTitle={2}
+                        shouldBreakWord
+                    />
+                )}
+            </View>
+        </OfflineWithFeedback>
+    );
+}
+
+/** Name row, plus the workspace row for rooms, rendered for every report that is not an expense, invoice or money request report */
+function ReportDetailsNameSection({reportID}: ReportDetailsNameSectionProps) {
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+
+    if (!report?.reportID) {
+        return null;
+    }
+
+    return <ReportDetailsNameSectionContent report={report} />;
+}
+
+export default ReportDetailsNameSection;
diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx
new file mode 100644
index 000000000000..0f08de1f9fdd
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/ReportDetailsPromotedActions.tsx
@@ -0,0 +1,46 @@
+import type {PromotedAction} from '@components/PromotedActionsBar';
+import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBar';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useOnyx from '@hooks/useOnyx';
+import useParentReportAction from '@hooks/useParentReportAction';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {canJoinChat} from '@libs/ReportUtils';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import React from 'react';
+
+type ReportDetailsPromotedActionsProps = {
+    reportID: string;
+};
+
+function ReportDetailsPromotedActions({reportID}: ReportDetailsPromotedActionsProps) {
+    const styles = useThemeStyles();
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`);
+    const parentReportAction = useParentReportAction(report);
+    const isReportArchived = useReportIsArchived(reportID);
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const currentUserAccountID = currentUserPersonalDetails?.accountID;
+
+    if (!report?.reportID) {
+        return null;
+    }
+
+    const canJoin = canJoinChat(report, parentReportAction, policy, parentReport, isReportArchived);
+
+    const promotedActions: PromotedAction[] = [...(canJoin ? [PromotedActions.join(report, currentUserAccountID)] : []), PromotedActions.pin(report), PromotedActions.share()];
+
+    return (
+        <PromotedActionsBar
+            containerStyle={styles.mt5}
+            promotedActions={promotedActions}
+        />
+    );
+}
+
+export default ReportDetailsPromotedActions;
diff --git a/src/pages/DynamicReportDetailsPage/ReportDetailsTitleSection.tsx b/src/pages/DynamicReportDetailsPage/ReportDetailsTitleSection.tsx
new file mode 100644
index 000000000000..d28c4df3a0e4
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/ReportDetailsTitleSection.tsx
@@ -0,0 +1,156 @@
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import ParentNavigationSubtitle from '@components/ParentNavigationSubtitle';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useParentReportAction from '@hooks/useParentReportAction';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import Navigation from '@libs/Navigation/Navigation';
+import {
+    canEditReportTitle,
+    getAvailableReportFields,
+    getParentNavigationSubtitle,
+    getReportFieldKey,
+    isInvoiceReport as isInvoiceReportUtil,
+    isMoneyRequest as isMoneyRequestUtil,
+    isMoneyRequestReport as isMoneyRequestReportUtil,
+    isReportFieldDisabled,
+    isReportFieldOfTypeTitle,
+    isTaskReport as isTaskReportUtil,
+    isTrackExpenseReportNew as isTrackExpenseReportUtil,
+} from '@libs/ReportUtils';
+
+import {clearPolicyRoomNameErrors} from '@userActions/Report';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type * as OnyxTypes from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+import React from 'react';
+import {View} from 'react-native';
+
+import getReportDetailsCaseID from './getReportDetailsCaseID';
+import {CASES} from './types';
+import useReportDetailsReportName from './useReportDetailsReportName';
+
+type ReportDetailsTitleSectionProps = {
+    reportID: string;
+};
+
+type ReportDetailsTitleSectionContentProps = {
+    report: OnyxTypes.Report;
+};
+
+function ReportDetailsTitleSectionContent({report}: ReportDetailsTitleSectionContentProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const currentUserAccountID = currentUserPersonalDetails?.accountID;
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`);
+    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const parentReportAction = useParentReportAction(report);
+    const isParentReportArchived = useReportIsArchived(parentReport?.reportID);
+    const {reportName, derivedParentReportName} = useReportDetailsReportName(report, parentReport, parentReportAction);
+
+    const isMoneyRequestReport = isMoneyRequestReportUtil(report);
+    const isInvoiceReport = isInvoiceReportUtil(report);
+    const isMoneyRequest = isMoneyRequestUtil(report);
+    const isTaskReport = isTaskReportUtil(report);
+    const caseID = getReportDetailsCaseID({
+        isMoneyRequestReport,
+        isInvoiceReport,
+        isMoneyRequest,
+        isTrackExpenseReport: isTrackExpenseReportUtil(report, parentReport, parentReportAction),
+    });
+    const parentNavigationSubtitleData = getParentNavigationSubtitle(report, policy, conciergeReportID, translate, derivedParentReportName, isParentReportArchived);
+
+    const titleField: OnyxTypes.PolicyReportField | undefined = (() => {
+        const fields = getAvailableReportFields(report, Object.values(policy?.fieldList ?? {}));
+        return fields.find((reportField) => isReportFieldOfTypeTitle(reportField));
+    })();
+    const fieldKey = getReportFieldKey(titleField?.fieldID);
+    const isFieldDisabled = isReportFieldDisabled(report, titleField, policy, rules);
+
+    const shouldShowEditableTitleField = caseID !== CASES.MONEY_REQUEST && canEditReportTitle(report, policy, currentUserAccountID, rules);
+
+    const shouldShowFurtherDetailsContent =
+        !isEmptyObject(parentNavigationSubtitleData) && (shouldShowEditableTitleField || isMoneyRequestReport || isInvoiceReport || isMoneyRequest || isTaskReport);
+
+    return (
+        <>
+            <OfflineWithFeedback
+                pendingAction={report.pendingFields?.reportName}
+                errors={report.errorFields?.reportName ?? null}
+                errorRowStyles={styles.ph5}
+                key={`menuItem-${fieldKey}`}
+                onClose={() => clearPolicyRoomNameErrors(report.reportID)}
+            >
+                <View style={[styles.flex1]}>
+                    <MenuItemWithTopDescription
+                        shouldShowRightIcon={shouldShowEditableTitleField && !isFieldDisabled}
+                        interactive={shouldShowEditableTitleField && !isFieldDisabled}
+                        title={reportName}
+                        titleStyle={styles.newKansasLarge}
+                        shouldCheckActionAllowedOnPress={false}
+                        description={translate('task.title')}
+                        onPress={
+                            shouldShowEditableTitleField && report.policyID
+                                ? () => {
+                                      if (!report.policyID) {
+                                          return;
+                                      }
+
+                                      Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.EDIT_REPORT_FIELD.getRoute(report.policyID, CONST.REPORT_FIELD_TITLE_FIELD_ID)));
+                                  }
+                                : undefined
+                        }
+                    />
+                </View>
+            </OfflineWithFeedback>
+            {shouldShowFurtherDetailsContent && (
+                <MenuItemWithTopDescription
+                    shouldShowRightIcon={false}
+                    interactive={false}
+                    titleComponent={
+                        <ParentNavigationSubtitle
+                            parentNavigationSubtitleData={parentNavigationSubtitleData}
+                            reportID={report.reportID}
+                            parentReportID={report.parentReportID}
+                            parentReportActionID={report.parentReportActionID}
+                            pressableStyles={[styles.mt1, styles.mw100]}
+                            textStyles={[styles.popoverMenuText, styles.flexShrink1, styles.preWrap, styles.mw100]}
+                            subtitleNumberOfLines={2}
+                            shouldShowFromPrefix={false}
+                            openParentReportInCurrentTab
+                        />
+                    }
+                    description={translate('threads.from')}
+                    descriptionTextStyle={[styles.mutedNormalTextLabel, styles.mb1]}
+                    shouldCheckActionAllowedOnPress={false}
+                />
+            )}
+        </>
+    );
+}
+
+/** Title row backed by the workspace title report field, plus the "From" row, rendered for expense, invoice and money request reports */
+function ReportDetailsTitleSection({reportID}: ReportDetailsTitleSectionProps) {
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+
+    if (!report?.reportID) {
+        return null;
+    }
+
+    return <ReportDetailsTitleSectionContent report={report} />;
+}
+
+export default ReportDetailsTitleSection;
diff --git a/src/pages/DynamicReportDetailsPage/getReportDetailsCaseID.ts b/src/pages/DynamicReportDetailsPage/getReportDetailsCaseID.ts
new file mode 100644
index 000000000000..a416a37741f7
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/getReportDetailsCaseID.ts
@@ -0,0 +1,28 @@
+/**
+ * Picks which header DynamicReportDetailsPage renders (HeaderView, MoneyRequestHeader or MoneyReportHeader) from the report's type flags.
+ */
+import type {CaseID} from './types';
+
+import {CASES} from './types';
+
+type ReportDetailsCaseFlags = {
+    isMoneyRequestReport: boolean;
+    isInvoiceReport: boolean;
+    isMoneyRequest: boolean;
+    isTrackExpenseReport: boolean;
+};
+
+function getReportDetailsCaseID({isMoneyRequestReport, isInvoiceReport, isMoneyRequest, isTrackExpenseReport}: ReportDetailsCaseFlags): CaseID {
+    if (isMoneyRequestReport || isInvoiceReport) {
+        // 3. MoneyReportHeader
+        return CASES.MONEY_REPORT;
+    }
+    if (isMoneyRequest || isTrackExpenseReport) {
+        // 2. MoneyRequestHeader
+        return CASES.MONEY_REQUEST;
+    }
+    // 1. HeaderView
+    return CASES.DEFAULT;
+}
+
+export default getReportDetailsCaseID;
diff --git a/src/pages/DynamicReportDetailsPage.tsx b/src/pages/DynamicReportDetailsPage/index.tsx
similarity index 72%
rename from src/pages/DynamicReportDetailsPage.tsx
rename to src/pages/DynamicReportDetailsPage/index.tsx
index 5d5279eeea25..c834a2239c09 100644
--- a/src/pages/DynamicReportDetailsPage.tsx
+++ b/src/pages/DynamicReportDetailsPage/index.tsx
@@ -1,18 +1,9 @@
-import UserAvatar from '@components/Avatar/UserAvatar';
-import AvatarWithImagePicker from '@components/AvatarWithImagePicker';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext';
 import MenuItem from '@components/MenuItem';
 import MenuItemAction from '@components/MenuItem/presets/MenuItemAction';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
-import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import ParentNavigationSubtitle from '@components/ParentNavigationSubtitle';
-import type {PromotedAction} from '@components/PromotedActionsBar';
-import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBar';
-import ReportHeaderAvatars from '@components/ReportHeaderAvatars';
-import RoomHeaderAvatars from '@components/RoomHeaderAvatars';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import {useSearchSelectionActions} from '@components/Search/SearchContext';
@@ -35,8 +26,8 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
 import useParentReportAction from '@hooks/useParentReportAction';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePreferredPolicy from '@hooks/usePreferredPolicy';
-import {useDerivedReportNamesByReportIDs} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useReportTransactionsCollection from '@hooks/useReportTransactionsCollection';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -51,32 +42,18 @@ import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import type {ReportDetailsNavigatorParamList, RightModalNavigatorParamList} from '@libs/Navigation/types';
-import Parser from '@libs/Parser';
 import Permissions from '@libs/Permissions';
 import {isPolicyAdmin as isPolicyAdminUtil, isPolicyEmployee as isPolicyEmployeeUtil, shouldShowPolicy} from '@libs/PolicyUtils';
 import {getOneTransactionThreadReportID, getOriginalMessage, getTrackExpenseActionableWhisper, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
-import {getReportNameFromNames} from '@libs/ReportAttributesUtils';
-import {getReportName} from '@libs/ReportNameUtils';
 import {
-    canDeleteCardTransactionByLiabilityType,
+    canDeleteCardTransaction,
     canDeleteTransaction,
-    canEditReportDescription as canEditReportDescriptionUtil,
-    canEditReportTitle,
-    canJoinChat,
     canLeaveChat,
     canWriteInReport,
     findLastAccessedReport,
-    getAvailableReportFields,
-    getChatRoomSubtitle,
-    getIcons,
     getOriginalReportID,
-    getParentNavigationSubtitle,
     getParticipantsAccountIDsForDisplay,
     getParticipantsList,
-    getPolicyName,
-    getReportDescription,
-    getReportFieldKey,
-    getReportForHeader,
     isArchivedNonExpenseReport,
     isCanceledTaskReport as isCanceledTaskReportUtil,
     isChatRoom as isChatRoomUtil,
@@ -85,67 +62,46 @@ import {
     isCompletedTaskReport,
     isConciergeChatReport,
     isDefaultRoom as isDefaultRoomUtil,
-    isExpenseReport as isExpenseReportUtil,
     isFinancialReportsForBusinesses as isFinancialReportsForBusinessesUtil,
     isGroupChat as isGroupChatUtil,
     isHiddenForCurrentUser,
     isInvoiceReport as isInvoiceReportUtil,
-    isInvoiceRoom as isInvoiceRoomUtil,
     isMoneyRequest as isMoneyRequestUtil,
     isMoneyRequestReport as isMoneyRequestReportUtil,
     isPolicyExpenseChat as isPolicyExpenseChatUtil,
     isPublicRoom as isPublicRoomUtil,
-    isReportFieldDisabled,
-    isReportFieldOfTypeTitle,
     isRootGroupChat as isRootGroupChatUtil,
     isSelfDM as isSelfDMUtil,
     isSystemChat as isSystemChatUtil,
     isTaskReport as isTaskReportUtil,
-    isThread as isThreadUtil,
     isTrackExpenseReportNew as isTrackExpenseReportUtil,
     isUserCreatedPolicyRoom as isUserCreatedPolicyRoomUtil,
-    isWorkspaceChat as isWorkspaceChatUtil,
     isWorkspaceMemberLeavingWorkspaceRoom as isWorkspaceMemberLeavingWorkspaceRoomUtil,
     navigateBackOnDeleteTransaction,
     navigateToPrivateNotes,
-    shouldDisableRename as shouldDisableRenameUtil,
 } from '@libs/ReportUtils';
-import StringUtils from '@libs/StringUtils';
-import {getDeleteConfirmationPrompt, getDeleteExpenseTitle, getOriginalTransactionWithSplitInfo, isDemoTransaction} from '@libs/TransactionUtils';
-import {getAccountIDFromAvatarID} from '@libs/UserAvatarUtils';
+import {getDeleteConfirmationPrompt, getDeleteExpenseTitle, getOriginalTransactionWithSplitInfo, isDemoTransaction, isManagedCardTransaction} from '@libs/TransactionUtils';
+
+import type {WithReportOrNotFoundProps} from '@pages/inbox/report/withReportOrNotFound';
+import withReportOrNotFound from '@pages/inbox/report/withReportOrNotFound';
 
 import {getNavigationUrlOnMoneyRequestDelete} from '@userActions/IOU/DeleteMoneyRequest';
 import {createDraftTransactionAndNavigateToParticipantSelector} from '@userActions/IOU/StartExpenseFlows';
 import {deleteTrackExpense, getNavigationUrlAfterTrackExpenseDelete} from '@userActions/IOU/TrackExpense';
-import {
-    clearAvatarErrors,
-    clearPolicyRoomNameErrors,
-    getReportPrivateNote,
-    hasErrorInPrivateNotes,
-    leaveGroupChat,
-    leaveRoom,
-    setDeleteTransactionNavigateBackUrl,
-    updateGroupChatAvatar,
-} from '@userActions/Report';
+import {getReportPrivateNote, hasErrorInPrivateNotes, leaveGroupChat, leaveRoom, setDeleteTransactionNavigateBackUrl} from '@userActions/Report';
 import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 import {canActionTask, canModifyTask, reopenTask} from '@userActions/Task';
 import {deleteTask} from '@userActions/TaskDeletion';
 
 import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
-import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData';
 import type * as OnyxTypes from '@src/types/onyx';
-import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import type IconAsset from '@src/types/utils/IconAsset';
 
-import type {StyleProp, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
 
 import {StackActions, useFocusEffect} from '@react-navigation/native';
 import {delegateEmailSelector} from '@selectors/Account';
@@ -155,34 +111,20 @@ import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft';
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 
-import type {WithReportOrNotFoundProps} from './inbox/report/withReportOrNotFound';
+import type {DynamicReportDetailsPageMenuItem} from './types';
 
-import withReportOrNotFound from './inbox/report/withReportOrNotFound';
-
-type DynamicReportDetailsPageMenuItem = {
-    key: DeepValueOf<typeof CONST.REPORT_DETAILS_MENU_ITEM>;
-    translationKey: TranslationPaths;
-    icon: IconAsset;
-    isAnonymousAction: boolean;
-    action: () => void;
-    brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
-    subtitle?: number;
-    shouldShowRightIcon?: boolean;
-    subtitleStyle?: StyleProp<ViewStyle>;
-};
+import getReportDetailsCaseID from './getReportDetailsCaseID';
+import ReportDetailsAvatar from './ReportDetailsAvatar';
+import ReportDetailsDescription from './ReportDetailsDescription';
+import ReportDetailsNameSection from './ReportDetailsNameSection';
+import ReportDetailsPromotedActions from './ReportDetailsPromotedActions';
+import ReportDetailsTitleSection from './ReportDetailsTitleSection';
+import {CASES} from './types';
 
 type DynamicReportDetailsPageProps = WithReportOrNotFoundProps & PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_ROOT>;
 
-const CASES = {
-    DEFAULT: 'default',
-    MONEY_REQUEST: 'money_request',
-    MONEY_REPORT: 'money_report',
-};
-
-type CaseID = ValueOf<typeof CASES>;
-
 function DynamicReportDetailsPage({policy, report, route, reportMetadata, reportLoadingState}: DynamicReportDetailsPageProps) {
-    const {translate, formatPhoneNumber} = useLocalize();
+    const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {isRestrictedToPreferredPolicy, preferredPolicyID} = usePreferredPolicy();
     const activePolicy = useActivePolicy();
@@ -199,7 +141,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
         'Building',
         'Exit',
         'Bug',
-        'Camera',
         'Trashcan',
         'ArrowSplit',
         'Hashtag',
@@ -220,7 +161,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
     const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`);
     const [guideAccountIDs] = useOnyx(ONYXKEYS.DERIVED.GUIDE_ACCOUNT_IDS);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
-    const [pendingDeleteMemberAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report?.reportID}`, {selector: pendingDeleteMemberAccountIDsSelector});
 
     const {reportActions} = usePaginatedReportActions(report.reportID);
     const [reportActionsForOriginalReportID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`);
@@ -237,7 +177,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
 
     const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transactionThreadReportID)}`);
     const [isDebugModeEnabled = false] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
@@ -254,11 +194,8 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
     const [filteredPoliciesInfo] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: filteredPoliciesInfoSelector});
     const [preferredPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(preferredPolicyID)}`, {selector: billingRestrictionPolicySelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const {showConfirmModal} = useConfirmModal();
-    const reportForHeader = getReportForHeader(report, parentReport);
-    const derivedReportNames = useDerivedReportNamesByReportIDs([report?.parentReportID, reportForHeader?.reportID]);
-    const derivedParentReportName = getReportNameFromNames(derivedReportNames, report?.parentReportID);
-    const derivedHeaderReportName = getReportNameFromNames(derivedReportNames, reportForHeader?.reportID);
     const isPolicyAdmin = isPolicyAdminUtil(policy);
     const isPolicyEmployee = isPolicyEmployeeUtil(report?.policyID, policy);
     const isPolicyExpenseChat = isPolicyExpenseChatUtil(report);
@@ -270,7 +207,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
     const isMoneyRequest = isMoneyRequestUtil(report);
     const isInvoiceReport = isInvoiceReportUtil(report);
     const isFinancialReportsForBusinesses = isFinancialReportsForBusinessesUtil(report);
-    const isInvoiceRoom = isInvoiceRoomUtil(report);
     const isTaskReport = isTaskReportUtil(report);
     const isSelfDM = isSelfDMUtil(report);
     const isTrackExpenseReport = isTrackExpenseReportUtil(report, parentReport, parentReportAction);
@@ -278,39 +214,21 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
     const isParentReportArchived = useReportIsArchived(parentReport?.reportID);
     const isTaskModifiable = canModifyTask(report, currentUserAccountID, isParentReportArchived);
     const isTaskActionable = canActionTask(report, parentReportAction, currentUserAccountID, parentReport, isParentReportArchived);
-    const canEditReportDescription = canEditReportDescriptionUtil(report, policy);
-    const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '') && (isTaskReport ? isTaskModifiable : true);
     const isExpenseReport = isMoneyRequestReport || isInvoiceReport || isMoneyRequest;
     const isSingleTransactionView = isMoneyRequest || isTrackExpenseReport;
     const isSelfDMTrackExpenseReport = isTrackExpenseReport && isSelfDMUtil(parentReport);
     const isReportArchived = useReportIsArchived(report?.reportID);
     const isArchivedRoom = isArchivedNonExpenseReport(report, isReportArchived);
-    const shouldDisableRename = shouldDisableRenameUtil(report, isReportArchived);
-    const parentNavigationSubtitleData = getParentNavigationSubtitle(report, policy, conciergeReportID, translate, derivedParentReportName, isParentReportArchived);
     const base62ReportID = getBase62ReportID(Number(report.reportID));
     const ancestors = useAncestors(report);
 
-    const subtitle = getChatRoomSubtitle(report, policy, conciergeReportID, translate, rules, false, isReportArchived);
-    const chatRoomSubtitle = subtitle ?? '';
-
     const isSystemChat = isSystemChatUtil(report);
     const isGroupChat = isGroupChatUtil(report);
     const isRootGroupChat = isRootGroupChatUtil(report, isReportArchived);
-    const isThread = isThreadUtil(report);
     const shouldOpenRoomMembersPage = isUserCreatedPolicyRoom || isChatThread || (isPolicyExpenseChat && isPolicyAdmin);
     const participants = getParticipantsList(report, personalDetails, shouldOpenRoomMembersPage);
 
-    let caseID: CaseID;
-    if (isMoneyRequestReport || isInvoiceReport) {
-        // 3. MoneyReportHeader
-        caseID = CASES.MONEY_REPORT;
-    } else if (isSingleTransactionView) {
-        // 2. MoneyRequestHeader
-        caseID = CASES.MONEY_REQUEST;
-    } else {
-        // 1. HeaderView
-        caseID = CASES.DEFAULT;
-    }
+    const caseID = getReportDetailsCaseID({isMoneyRequestReport, isInvoiceReport, isMoneyRequest, isTrackExpenseReport});
 
     // Get the active chat members by filtering out the pending members with delete action
     const activeChatMembers = participants.flatMap((accountID) => {
@@ -344,15 +262,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
     const isMoneyRequestReportArchived = useReportIsArchived(moneyRequestReport?.reportID);
     const [moneyRequestReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(moneyRequestReport?.reportID)}`);
 
-    const shouldShowTaskDeleteButton =
-        isTaskReport &&
-        !isCanceledTaskReport &&
-        canWriteInReport(report) &&
-        report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED &&
-        !isClosedReport(report) &&
-        isTaskModifiable &&
-        isTaskActionable;
-    const canDeleteRequest = isActionOwner && (canDeleteTransaction(moneyRequestReport, rules, isMoneyRequestReportArchived) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
     const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
     const [iouTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransactionID)}`);
     const [iouOriginalTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransaction?.comment?.originalTransactionID)}`);
@@ -364,8 +273,21 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
         reportActions: requestParentReportAction ? [requestParentReportAction] : [],
         policy,
     });
-    const isCardTransactionCanBeDeleted = canDeleteCardTransactionByLiabilityType(iouTransaction);
-    const shouldShowDeleteButton = shouldShowTaskDeleteButton || (canDeleteRequest && isCardTransactionCanBeDeleted) || isDemoTransaction(iouTransaction);
+
+    const shouldShowTaskDeleteButton =
+        isTaskReport &&
+        !isCanceledTaskReport &&
+        canWriteInReport(report) &&
+        report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED &&
+        !isClosedReport(report) &&
+        isTaskModifiable &&
+        isTaskActionable;
+    const canDeleteRequest =
+        (isActionOwner || (isPolicyAdmin && isManagedCardTransaction(iouTransaction))) &&
+        (canDeleteTransaction(moneyRequestReport, rules, isMoneyRequestReportArchived) || isSelfDMTrackExpenseReport) &&
+        !isDeletedParentAction;
+    const shouldShowDeleteButton = shouldShowTaskDeleteButton || (canDeleteRequest && canDeleteCardTransaction(iouTransaction, policy, cardList)) || isDemoTransaction(iouTransaction);
+
     const shouldShowEditSplitOnDeleteAction = iouTransactionID ? shouldOpenSplitExpenseEditFlowOnDelete([iouTransactionID]) : false;
     let deleteMenuItemTitle = translate('reportActionContextMenu.deleteAction', requestParentReportAction);
     if (shouldShowEditSplitOnDeleteAction) {
@@ -373,7 +295,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
     } else if (caseID === CASES.DEFAULT) {
         deleteMenuItemTitle = translate('common.delete');
     }
-    const isWorkspaceChat = isWorkspaceChatUtil(report?.chatType ?? '');
 
     useEffect(() => {
         // Do not fetch private notes if the feature is disabled, isLoadingPrivateNotes is already defined, the network is offline, or if the report is a self DM.
@@ -388,12 +309,21 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
         // Resolve on tap from the module-scoped copies so this large page does not subscribe to whole collections.
         const lastAccessedReportID = findLastAccessedReport(false, guideAccountIDs, false, report.reportID)?.reportID;
         if (isRootGroupChat) {
-            leaveGroupChat(report, quickAction?.chatReportID?.toString() === report.reportID, currentUserAccountID, conciergeReportID, introSelected, isSelfTourViewed, lastAccessedReportID);
+            leaveGroupChat(
+                report,
+                quickAction?.chatReportID?.toString() === report.reportID,
+                currentUserAccountID,
+                conciergeReportID,
+                introSelected,
+                isSelfTourViewed,
+                personalDetails,
+                lastAccessedReportID,
+            );
             return;
         }
 
         const isWorkspaceMemberLeavingWorkspaceRoom = isWorkspaceMemberLeavingWorkspaceRoomUtil(report, isPolicyEmployee, isPolicyAdmin);
-        leaveRoom(report, currentUserAccountID, conciergeReportID, introSelected, isSelfTourViewed, isWorkspaceMemberLeavingWorkspaceRoom, lastAccessedReportID);
+        leaveRoom(report, currentUserAccountID, conciergeReportID, introSelected, isSelfTourViewed, personalDetails, isWorkspaceMemberLeavingWorkspaceRoom, lastAccessedReportID);
     };
 
     const showLastMemberLeavingModal = async () => {
@@ -422,20 +352,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
     const shouldShowGoToRoom = (isChatRoom || isPolicyExpenseChat) && !isRoomCurrentlyOpen;
     const shouldShowGoToWorkspace = shouldShowPolicy(policy, false, currentUserEmail) && !policy?.isJoinRequestPending && !shouldShowGoToRoom;
 
-    const shouldParseFullTitle = parentReportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && !isGroupChat;
-    const rawReportName = getReportName(reportForHeader, derivedHeaderReportName);
-    const reportName = shouldParseFullTitle ? Parser.htmlToText(rawReportName) : rawReportName;
-    const additionalRoomDetails = isExpenseReportUtil(report) || isPolicyExpenseChat || isInvoiceRoom ? chatRoomSubtitle : `${translate('threads.in')} ${chatRoomSubtitle}`;
-
-    let roomDescription: string | undefined;
-    if (caseID === CASES.MONEY_REQUEST) {
-        roomDescription = translate('common.name');
-    } else if (isGroupChat) {
-        roomDescription = translate('newRoomPage.groupName');
-    } else {
-        roomDescription = translate('newRoomPage.roomName');
-    }
-
     const shouldShowNotificationPref = !isMoneyRequestReport && !isHiddenForCurrentUser(report);
     const shouldShowWriteCapability = !isMoneyRequestReport;
     const shouldShowMenuItem = shouldShowNotificationPref || shouldShowWriteCapability || (!!report?.visibility && report.chatType !== CONST.REPORT.CHAT_TYPE.INVOICE);
@@ -722,185 +638,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
         return items;
     })();
 
-    const icons = getIcons(report, formatPhoneNumber, translate, personalDetails, null, '', -1, policy, undefined, isReportArchived, pendingDeleteMemberAccountIDs, conciergeReportID);
-
-    const renderedAvatar = (() => {
-        if (isChatRoom && !isThread) {
-            return (
-                <View style={styles.mb3}>
-                    <RoomHeaderAvatars
-                        icons={icons}
-                        report={report}
-                        policy={policy}
-                        participants={participants}
-                        currentUserAccountID={currentUserAccountID}
-                    />
-                </View>
-            );
-        }
-        if (!isGroupChat || isThread) {
-            return (
-                <View style={styles.mb3}>
-                    <ReportHeaderAvatars reportID={report?.reportID ?? moneyRequestReport?.reportID} />
-                </View>
-            );
-        }
-
-        const groupChatIcon = icons.at(0);
-        const groupChatAvatarSource = groupChatIcon?.source;
-        const groupChatAvatar = groupChatAvatarSource ? (
-            <UserAvatar
-                source={groupChatAvatarSource}
-                size={CONST.AVATAR_SIZE.XXXX_LARGE}
-                accountID={getAccountIDFromAvatarID(groupChatIcon?.id)}
-                fallbackIcon={groupChatIcon?.fallbackIcon}
-            />
-        ) : null;
-
-        return (
-            <AvatarWithImagePicker
-                source={groupChatAvatarSource}
-                avatar={groupChatAvatar}
-                isUsingDefaultAvatar={!report.avatarUrl}
-                onViewPhotoPress={() => Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(report.reportID))}
-                onImageRemoved={() => {
-                    // Calling this without a file will remove the avatar
-                    updateGroupChatAvatar(report.reportID, report.avatarUrl);
-                }}
-                onImageSelected={(file) => updateGroupChatAvatar(report.reportID, report.avatarUrl, file)}
-                editIcon={expensifyIcons.Camera}
-                editIconStyle={styles.smallEditIconAccount}
-                pendingAction={report.pendingFields?.avatar ?? undefined}
-                errors={report.errorFields?.avatar ?? null}
-                errorRowStyles={styles.mt6}
-                onErrorClose={() => clearAvatarErrors(report.reportID)}
-                style={[styles.w100, styles.mb3]}
-            />
-        );
-    })();
-
-    const canJoin = canJoinChat(report, parentReportAction, policy, parentReport, !!reportNameValuePairs?.private_isArchived);
-
-    const promotedActions = (() => {
-        const result: PromotedAction[] = [];
-
-        if (canJoin) {
-            result.push(PromotedActions.join(report, currentUserAccountID));
-        }
-
-        if (report) {
-            result.push(PromotedActions.pin(report));
-        }
-
-        result.push(PromotedActions.share());
-
-        return result;
-    })();
-
-    const shouldDisplayGroupWorkspaceAsPushRow = !isThread && (isGroupChat || isUserCreatedPolicyRoom || isDefaultRoom);
-    const nameSectionGroupWorkspace = (
-        <OfflineWithFeedback
-            pendingAction={report?.pendingFields?.reportName}
-            errors={report?.errorFields?.reportName ?? null}
-            errorRowStyles={[styles.ph5]}
-            onClose={() => clearPolicyRoomNameErrors(report?.reportID)}
-        >
-            <View style={[styles.flex1, !shouldDisableRename && styles.mt3]}>
-                <MenuItemWithTopDescription
-                    shouldShowRightIcon={!shouldDisableRename}
-                    interactive={!shouldDisableRename}
-                    title={StringUtils.lineBreaksToSpaces(reportName)}
-                    titleStyle={[styles.newKansasLarge, !shouldDisplayGroupWorkspaceAsPushRow && styles.textAlignCenter]}
-                    titleContainerStyle={!shouldDisplayGroupWorkspaceAsPushRow && styles.alignItemsCenter}
-                    shouldCheckActionAllowedOnPress={false}
-                    description={shouldDisplayGroupWorkspaceAsPushRow ? roomDescription : ''}
-                    furtherDetails={chatRoomSubtitle && !isGroupChat && !shouldDisplayGroupWorkspaceAsPushRow ? additionalRoomDetails : ''}
-                    furtherDetailsNumberOfLines={isWorkspaceChat ? 0 : undefined}
-                    furtherDetailsStyle={isWorkspaceChat ? [styles.textAlignCenter, styles.breakWord] : undefined}
-                    onPress={() => {
-                        Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_SETTINGS_NAME.path));
-                    }}
-                    numberOfLinesTitle={isThread ? 2 : 0}
-                    shouldBreakWord
-                />
-                {shouldDisplayGroupWorkspaceAsPushRow && !isGroupChat && (
-                    <MenuItemWithTopDescription
-                        shouldShowRightIcon={false}
-                        interactive={false}
-                        description={translate('workspace.common.workspace')}
-                        title={getPolicyName({report, unavailableTranslation: translate('workspace.common.unavailable')})}
-                        numberOfLinesTitle={2}
-                        shouldBreakWord
-                    />
-                )}
-            </View>
-        </OfflineWithFeedback>
-    );
-
-    const titleField: OnyxTypes.PolicyReportField | undefined = (() => {
-        const fields = getAvailableReportFields(report, Object.values(policy?.fieldList ?? {}));
-        return fields.find((reportField) => isReportFieldOfTypeTitle(reportField));
-    })();
-    const fieldKey = getReportFieldKey(titleField?.fieldID);
-    const isFieldDisabled = isReportFieldDisabled(report, titleField, policy, rules);
-
-    const shouldShowEditableTitleField = caseID !== CASES.MONEY_REQUEST && canEditReportTitle(report, policy, currentUserAccountID, rules);
-
-    const nameSectionFurtherDetailsContent = (
-        <MenuItemWithTopDescription
-            shouldShowRightIcon={false}
-            interactive={false}
-            titleComponent={
-                <ParentNavigationSubtitle
-                    parentNavigationSubtitleData={parentNavigationSubtitleData}
-                    reportID={report?.reportID}
-                    parentReportID={report?.parentReportID}
-                    parentReportActionID={report?.parentReportActionID}
-                    pressableStyles={[styles.mt1, styles.mw100]}
-                    textStyles={[styles.popoverMenuText, styles.flexShrink1, styles.preWrap, styles.mw100]}
-                    subtitleNumberOfLines={2}
-                    shouldShowFromPrefix={false}
-                    openParentReportInCurrentTab
-                />
-            }
-            description={translate('threads.from')}
-            descriptionTextStyle={[styles.mutedNormalTextLabel, styles.mb1]}
-            shouldCheckActionAllowedOnPress={false}
-        />
-    );
-
-    const nameSectionTitleField = (
-        <OfflineWithFeedback
-            pendingAction={report.pendingFields?.reportName}
-            errors={report.errorFields?.reportName ?? null}
-            errorRowStyles={styles.ph5}
-            key={`menuItem-${fieldKey}`}
-            onClose={() => clearPolicyRoomNameErrors(report.reportID)}
-        >
-            <View style={[styles.flex1]}>
-                <MenuItemWithTopDescription
-                    shouldShowRightIcon={shouldShowEditableTitleField && !isFieldDisabled}
-                    interactive={shouldShowEditableTitleField && !isFieldDisabled}
-                    title={reportName}
-                    titleStyle={styles.newKansasLarge}
-                    shouldCheckActionAllowedOnPress={false}
-                    description={translate('task.title')}
-                    onPress={
-                        shouldShowEditableTitleField && report.policyID
-                            ? () => {
-                                  if (!report?.policyID) {
-                                      return;
-                                  }
-
-                                  Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.EDIT_REPORT_FIELD.getRoute(report.policyID, CONST.REPORT_FIELD_TITLE_FIELD_ID)));
-                              }
-                            : undefined
-                    }
-                />
-            </View>
-        </OfflineWithFeedback>
-    );
-
     const deleteTransaction = () => {
         if (caseID === CASES.DEFAULT) {
             deleteTask(
@@ -1063,11 +800,6 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
         });
     };
 
-    const mentionReportContextValue = {currentReportID: report.reportID, exactlyMatch: true};
-
-    const shouldShowFurtherDetailsContent =
-        !isEmptyObject(parentNavigationSubtitleData) && (shouldShowEditableTitleField || isMoneyRequestReport || isInvoiceReport || isMoneyRequest || isTaskReport);
-
     return (
         <ScreenWrapper testID="DynamicReportDetailsPage">
             <FullPageNotFoundView shouldShow={isEmptyObject(report)}>
@@ -1076,29 +808,12 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
                     onBackButtonPress={() => Navigation.goBack(navigateBackFromReportDetailsPath)}
                 />
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
-                    <View style={[styles.reportDetailsTitleContainer, styles.pb0]}>{renderedAvatar}</View>
-                    {isExpenseReport && nameSectionTitleField}
-                    {isExpenseReport && shouldShowFurtherDetailsContent && nameSectionFurtherDetailsContent}
-
-                    {!isExpenseReport && nameSectionGroupWorkspace}
-
-                    {shouldShowReportDescription && (
-                        <OfflineWithFeedback pendingAction={report.pendingFields?.description}>
-                            <MentionReportContext.Provider value={mentionReportContextValue}>
-                                <MenuItemWithTopDescription
-                                    shouldShowRightIcon
-                                    interactive
-                                    title={getReportDescription(report)}
-                                    shouldRenderAsHTML
-                                    shouldTruncateTitle
-                                    characterLimit={100}
-                                    shouldCheckActionAllowedOnPress={false}
-                                    description={translate('reportDescriptionPage.roomDescription')}
-                                    onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.REPORT_DESCRIPTION.path))}
-                                />
-                            </MentionReportContext.Provider>
-                        </OfflineWithFeedback>
-                    )}
+                    <View style={[styles.reportDetailsTitleContainer, styles.pb0]}>
+                        <ReportDetailsAvatar reportID={report.reportID} />
+                    </View>
+                    {isExpenseReport ? <ReportDetailsTitleSection reportID={report.reportID} /> : <ReportDetailsNameSection reportID={report.reportID} />}
+
+                    <ReportDetailsDescription reportID={report.reportID} />
 
                     {isFinancialReportsForBusinesses && (
                         <>
@@ -1121,10 +836,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report
                         </>
                     )}
 
-                    <PromotedActionsBar
-                        containerStyle={styles.mt5}
-                        promotedActions={promotedActions}
-                    />
+                    <ReportDetailsPromotedActions reportID={report.reportID} />
 
                     {menuItems.map((item) => (
                         <MenuItem
diff --git a/src/pages/DynamicReportDetailsPage/types.ts b/src/pages/DynamicReportDetailsPage/types.ts
new file mode 100644
index 000000000000..443255091062
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/types.ts
@@ -0,0 +1,30 @@
+import type CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+import type {StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+
+type DynamicReportDetailsPageMenuItem = {
+    key: DeepValueOf<typeof CONST.REPORT_DETAILS_MENU_ITEM>;
+    translationKey: TranslationPaths;
+    icon: IconAsset;
+    isAnonymousAction: boolean;
+    action: () => void;
+    brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
+    subtitle?: number;
+    shouldShowRightIcon?: boolean;
+    subtitleStyle?: StyleProp<ViewStyle>;
+};
+
+const CASES = {
+    DEFAULT: 'default',
+    MONEY_REQUEST: 'money_request',
+    MONEY_REPORT: 'money_report',
+};
+
+type CaseID = ValueOf<typeof CASES>;
+
+export {CASES};
+export type {CaseID, DynamicReportDetailsPageMenuItem};
diff --git a/src/pages/DynamicReportDetailsPage/useReportDetailsReportName.ts b/src/pages/DynamicReportDetailsPage/useReportDetailsReportName.ts
new file mode 100644
index 000000000000..504ff25b2fce
--- /dev/null
+++ b/src/pages/DynamicReportDetailsPage/useReportDetailsReportName.ts
@@ -0,0 +1,31 @@
+import {useDerivedReportNamesByReportIDs} from '@hooks/useReportAttributes';
+
+import Parser from '@libs/Parser';
+import {getReportNameFromNames} from '@libs/ReportAttributesUtils';
+import {getReportName} from '@libs/ReportNameUtils';
+import {getReportForHeader, isGroupChat} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import type {Report, ReportAction} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+/**
+ * Resolves the name shown on the details page and the derived name of the parent report from the REPORT_ATTRIBUTES
+ * derived value. Owning the derived-value subscription here means only the name and title rows re-render when report
+ * names change.
+ */
+function useReportDetailsReportName(report: OnyxEntry<Report>, parentReport: OnyxEntry<Report>, parentReportAction: OnyxEntry<ReportAction>) {
+    const reportForHeader = getReportForHeader(report, parentReport);
+    const derivedReportNames = useDerivedReportNamesByReportIDs([report?.parentReportID, reportForHeader?.reportID]);
+    const derivedParentReportName = getReportNameFromNames(derivedReportNames, report?.parentReportID);
+    const derivedHeaderReportName = getReportNameFromNames(derivedReportNames, reportForHeader?.reportID);
+
+    const shouldParseFullTitle = parentReportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && !isGroupChat(report);
+    const rawReportName = getReportName(reportForHeader, derivedHeaderReportName);
+    const reportName = shouldParseFullTitle ? Parser.htmlToText(rawReportName) : rawReportName;
+
+    return {reportName, derivedParentReportName};
+}
+
+export default useReportDetailsReportName;
diff --git a/src/pages/DynamicRoomMemberDetailsPage.tsx b/src/pages/DynamicRoomMemberDetailsPage.tsx
index ca69466a2041..bb0261e09fd0 100644
--- a/src/pages/DynamicRoomMemberDetailsPage.tsx
+++ b/src/pages/DynamicRoomMemberDetailsPage.tsx
@@ -21,7 +21,7 @@ import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/crea
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {RoomMembersNavigatorParamList} from '@libs/Navigation/types';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
-import {isPolicyAdmin} from '@libs/PolicyUtils';
+import {isRoomMemberProtectedByPolicyRole} from '@libs/PolicyUtils';
 import {isPolicyExpenseChat} from '@libs/ReportUtils';
 
 import Navigation from '@navigation/Navigation';
@@ -59,7 +59,10 @@ function DynamicRoomMemberDetailsPage({report, route}: DynamicRoomMemberDetailsP
     const displayName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: details, translate, formatPhoneNumber});
     const isSelectedMemberCurrentUser = accountID === currentUserPersonalDetails?.accountID;
     const isSelectedMemberOwner = accountID === report.ownerAccountID;
-    const shouldDisableRemoveUser = (isPolicyExpenseChat(report) && isPolicyAdmin(policy, details.login)) || isSelectedMemberCurrentUser || isSelectedMemberOwner;
+    // Check the selected member's own role on the policy, not the viewer's, and fail closed when their login is missing.
+    // Kept in sync with the members list through the shared helper.
+    const isSelectedMemberProtectedByPolicyRole = isRoomMemberProtectedByPolicyRole(policy, details.login, accountID);
+    const shouldDisableRemoveUser = (isPolicyExpenseChat(report) && isSelectedMemberProtectedByPolicyRole) || isSelectedMemberCurrentUser || isSelectedMemberOwner;
     const askForConfirmationToRemove = () => {
         showConfirmModal({
             buttonVariant: CONST.BUTTON_VARIANT.DANGER,
diff --git a/src/pages/DynamicRoomMembersPage.tsx b/src/pages/DynamicRoomMembersPage.tsx
index 209bc8da2ced..c4f428bbf5e0 100644
--- a/src/pages/DynamicRoomMembersPage.tsx
+++ b/src/pages/DynamicRoomMembersPage.tsx
@@ -19,6 +19,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -34,7 +35,7 @@ import type {RoomMembersNavigatorParamList} from '@libs/Navigation/types';
 import {isPersonalDetailsReady} from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
-import {isPolicyAdmin, isPolicyEmployee as isPolicyEmployeeUtils} from '@libs/PolicyUtils';
+import {isPolicyEmployee as isPolicyEmployeeUtils, isRoomMemberProtectedByPolicyRole} from '@libs/PolicyUtils';
 import {getReportAction} from '@libs/ReportActionsUtils';
 import {getReportName} from '@libs/ReportNameUtils';
 import {
@@ -54,7 +55,6 @@ import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsSelector} from '@src/selectors/PersonalDetails';
 import type {PersonalDetails} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
@@ -114,8 +114,7 @@ function DynamicRoomMembersPage({report, policy}: DynamicRoomMembersPageProps) {
 
     const [selectedMembers, setSelectedMembers] = useFilteredSelection(personalDetailsParticipants, shouldIncludeMember);
     const firstSelectedMember = selectedMembers?.at(0);
-    const firstSelectedMemberSelector = useMemo(() => personalDetailsSelector(firstSelectedMember), [firstSelectedMember]);
-    const [firstSelectedMemberDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: firstSelectedMemberSelector});
+    const [firstSelectedMemberDetails] = usePersonalDetail(firstSelectedMember);
 
     const clearTableSelection = useCallback(() => {
         setSelectedMembers((prevSelectedMembers) => (prevSelectedMembers.length > 0 ? [] : prevSelectedMembers));
@@ -214,10 +213,12 @@ function DynamicRoomMembersPage({report, policy}: DynamicRoomMembersPageProps) {
                 continue;
             }
             const pendingChatMember = reportMetadata?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
-            const isAdmin = isPolicyAdmin(policy, details.login);
+            // Check the listed member's own role on the policy, not the viewer's, and fail closed when their login is
+            // missing. Kept in sync with the member details page through the shared helper.
+            const isProtectedByPolicyRole = isRoomMemberProtectedByPolicyRole(policy, details.login, accountID);
             const isDisabled = pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || details.isOptimisticPersonalDetail;
             const isSelectionDisabled =
-                (isPolicyExpenseChat && isAdmin) ||
+                (isPolicyExpenseChat && isProtectedByPolicyRole) ||
                 accountID === session?.accountID ||
                 pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
                 details.accountID === report.ownerAccountID;
diff --git a/src/pages/Insights/InsightsDashboard.tsx b/src/pages/Insights/InsightsDashboard.tsx
index 943dfa433a3e..ee11a1be7697 100644
--- a/src/pages/Insights/InsightsDashboard.tsx
+++ b/src/pages/Insights/InsightsDashboard.tsx
@@ -9,14 +9,19 @@ import ScrollView from '@components/ScrollView';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useMultipleSnapshots from '@hooks/useMultipleSnapshots';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getInsights} from '@libs/actions/Insights';
 
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {InsightsDashboardID} from '@src/types/onyx';
 
@@ -25,7 +30,7 @@ import React, {useEffect, useEffectEvent} from 'react';
 import {View} from 'react-native';
 
 import type {InsightsFilters} from './insightsFilters';
-import type {InsightsDashboardState} from './resolveDashboardState';
+import type {InsightsDashboardChart, InsightsDashboardState} from './resolveDashboardState';
 
 import InsightsChartWidget from './charts/InsightsChartWidget';
 import InsightsPageControls from './controls/InsightsPageControls';
@@ -37,12 +42,11 @@ import InsightsNoExpensesState from './states/InsightsNoExpensesState';
 import useInsightsFilters from './useInsightsFilters';
 
 type InsightsDashboardContentProps = {
-    dashboardID: InsightsDashboardID;
-
-    /** Hash of the dashboard-wide query, which the record every chart reads is stored under */
-    hash: number | undefined;
-
     state: InsightsDashboardState;
+    headlineChart: InsightsDashboardChart;
+
+    /** Charts in the grid below the headline, left out when no workspace in scope is eligible for them */
+    supportingCharts: InsightsDashboardChart[];
 
     /** Page-level filters every chart on the dashboard is narrowed by */
     filters: InsightsFilters;
@@ -54,23 +58,36 @@ type InsightsDashboardContentProps = {
     onGroupByChange: (groupBy: InsightsFilters['groupBy']) => void;
 };
 
-function InsightsDashboardContent({dashboardID, hash, state, filters, onRetry, onGroupByChange}: InsightsDashboardContentProps) {
+function InsightsDashboardContent({state, headlineChart, supportingCharts, filters, onRetry, onGroupByChange}: InsightsDashboardContentProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {login} = useCurrentUserPersonalDetails();
     const icons = useMemoizedLazyExpensifyIcons(['OfflineCloud']);
-    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
 
-    if (state === INSIGHTS_DASHBOARD_STATE.ERROR) {
+    const didRequestFail = state === INSIGHTS_DASHBOARD_STATE.ERROR || state === INSIGHTS_DASHBOARD_STATE.STALE;
+
+    if (didRequestFail) {
+        const failureViewByState = {
+            [INSIGHTS_DASHBOARD_STATE.STALE]: {
+                title: translate('search.searchResults.staleResults.title'),
+                subtitle: translate('search.searchResults.staleResults.subtitle'),
+                illustration: 'ChartSync',
+                illustrationWidth: variables.iconSizeUltraLarge,
+                illustrationHeight: variables.iconSizeUltraLarge,
+                buttonTranslationKey: 'search.searchResults.staleResults.buttonText',
+            },
+            [INSIGHTS_DASHBOARD_STATE.ERROR]: {
+                title: translate('errorPage.title', {isBreakLine: shouldUseNarrowLayout}),
+                subtitle: translate('errorPage.subtitle'),
+                buttonTranslationKey: 'common.tryAgain',
+            },
+        } as const;
         return (
             <FullPageErrorView
                 shouldShow
-                title={translate('errorPage.title', {isBreakLine: shouldUseNarrowLayout})}
-                subtitle={translate('errorPage.subtitle')}
-                buttonTranslationKey="common.tryAgain"
                 onButtonPress={onRetry}
+                {...failureViewByState[state]}
             />
         );
     }
@@ -99,22 +116,20 @@ function InsightsDashboardContent({dashboardID, hash, state, filters, onRetry, o
         );
     }
 
-    const {headlineChart, supportingCharts} = INSIGHTS_DASHBOARD_SPECS[dashboardID];
-    const visibleCharts = getVisibleCharts(supportingCharts, policies, filters.policyIDs, login);
-
     // Wide layout stacks the cards in two independent columns, so a short card doesn't leave a gap under it
-    const columns = shouldUseNarrowLayout ? [visibleCharts] : [visibleCharts.filter((chart, index) => index % 2 === 0), visibleCharts.filter((chart, index) => index % 2 === 1)];
+    const columns = shouldUseNarrowLayout ? [supportingCharts] : [supportingCharts.filter((chart, index) => index % 2 === 0), supportingCharts.filter((chart, index) => index % 2 === 1)];
 
     return (
         <ScrollView
+            style={styles.insightsDashboardScrollView}
             contentContainerStyle={[styles.flexGrow1, styles.ph5, styles.pb5]}
             addBottomSafeAreaPadding
         >
             <View style={styles.insightsDashboardLayout}>
                 <InsightsChartWidget
-                    dashboardID={dashboardID}
-                    hash={hash}
-                    chart={headlineChart}
+                    chart={headlineChart.chart}
+                    queryJSON={headlineChart.queryJSON}
+                    snapshot={headlineChart.snapshot}
                     filters={filters}
                     onRetry={onRetry}
                     onGroupByChange={onGroupByChange}
@@ -126,12 +141,12 @@ function InsightsDashboardContent({dashboardID, hash, state, filters, onRetry, o
                             key={columnIndex}
                             style={[styles.flex1, styles.insightsChartColumn]}
                         >
-                            {columnCharts.map((chart) => (
+                            {columnCharts.map(({chart, queryJSON, snapshot}) => (
                                 <InsightsChartWidget
                                     key={chart.graphKey}
-                                    dashboardID={dashboardID}
-                                    hash={hash}
                                     chart={chart}
+                                    queryJSON={queryJSON}
+                                    snapshot={snapshot}
                                     filters={filters}
                                     onRetry={onRetry}
                                 />
@@ -148,9 +163,12 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const isFocused = useIsFocused();
+    const {login} = useCurrentUserPersonalDetails();
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const {filters, defaultFilters, isResolved, setFilters} = useInsightsFilters(dashboardID);
+    const {isBetaEnabled} = usePermissions();
 
-    const query = isResolved ? buildInsightsJsonQuery(dashboardID, filters) : undefined;
+    const query = isResolved ? buildInsightsJsonQuery(dashboardID, filters, isBetaEnabled(CONST.BETAS.INSIGHTS_COMPARE)) : undefined;
     const jsonQuery = query?.jsonQuery;
     const hash = query?.hash;
 
@@ -173,8 +191,19 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     }, [dashboardID, jsonQuery, hash, isFocused, isOffline]);
 
     const [dashboard] = useOnyx(`${ONYXKEYS.COLLECTION.INSIGHTS}${dashboardID}_${hash}`);
-    const [headlineSnapshot] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${dashboard?.graphs?.[INSIGHTS_DASHBOARD_SPECS[dashboardID].headlineChart.graphKey]?.snapshotHash}`);
-    const state = getDashboardState(dashboard, isOffline, headlineSnapshot);
+    const {headlineChart: headlineSpec, supportingCharts: supportingSpecs} = INSIGHTS_DASHBOARD_SPECS[dashboardID];
+    const eligibleCharts = getVisibleCharts(supportingSpecs, policies, filters.policyIDs, login);
+    // Until the filters resolve, the charts have no query to read data for, so they show their loading state
+    const visibleChartQueries = query
+        ? [query.headlineChart, ...query.supportingCharts.filter(({chart}) => eligibleCharts.includes(chart))]
+        : [headlineSpec, ...eligibleCharts].map((chart) => ({chart, queryJSON: undefined}));
+    const snapshots = useMultipleSnapshots(visibleChartQueries.flatMap(({queryJSON}) => (queryJSON ? [String(queryJSON.hash)] : [])));
+    const charts: InsightsDashboardChart[] = visibleChartQueries.map((chartQuery) => ({
+        ...chartQuery,
+        snapshot: chartQuery.queryJSON ? snapshots[chartQuery.queryJSON.hash] : undefined,
+    }));
+    const [headlineChart, ...supportingCharts] = charts;
+    const state = getDashboardState(dashboard, isOffline, charts);
 
     return (
         <ScreenWrapper
@@ -195,9 +224,9 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
                 />
             )}
             <InsightsDashboardContent
-                dashboardID={dashboardID}
-                hash={hash}
                 state={state}
+                headlineChart={headlineChart}
+                supportingCharts={supportingCharts}
                 filters={filters}
                 onRetry={requestDashboard}
                 onGroupByChange={(groupBy) => setFilters({groupBy})}
diff --git a/src/pages/Insights/charts/InsightsChartWidget.tsx b/src/pages/Insights/charts/InsightsChartWidget.tsx
index 5cfbbb54b906..31012cb23eab 100644
--- a/src/pages/Insights/charts/InsightsChartWidget.tsx
+++ b/src/pages/Insights/charts/InsightsChartWidget.tsx
@@ -1,26 +1,31 @@
 import {buildViewOnSpendQuery} from '@components/Search/chartDrillDown';
 import ChartEmptyState from '@components/Search/ChartEmptyState';
 import ChartErrorState from '@components/Search/ChartErrorState';
+import ChartOfflineState from '@components/Search/ChartOfflineState';
+import useGroupedItems from '@components/Search/hooks/useGroupedItems';
 import SearchChartView from '@components/Search/SearchChartView';
+import type {SearchQueryJSON} from '@components/Search/types';
 import WidgetContainer from '@components/WidgetContainer';
 import WidgetHeaderMenu from '@components/WidgetHeaderMenu';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
+import {INSIGHTS_CHART_STATE, resolveInsightsChartData} from '@libs/resolveInsightsChartData';
 
 import InsightsGroupByDropdown from '@pages/Insights/controls/InsightsGroupByDropdown';
 import type {InsightsChartSpec} from '@pages/Insights/dashboardSpecs';
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
-import {INSIGHTS_CHART_STATE} from '@pages/Insights/resolveChartData';
-import useInsightsChartData from '@pages/Insights/useInsightsChartData';
 
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import type {InsightsDashboardID} from '@src/types/onyx';
+import type {SearchResults} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
 
 import React from 'react';
 import {View} from 'react-native';
@@ -28,16 +33,17 @@ import {View} from 'react-native';
 import InsightsDataTable from './InsightsDataTable';
 
 type InsightsChartWidgetProps = {
-    dashboardID: InsightsDashboardID;
-
     chart: InsightsChartSpec;
 
+    /** The chart's own query, with the page's filters applied */
+    queryJSON: Readonly<SearchQueryJSON> | undefined;
+
+    /** The snapshot stored under the chart's own query */
+    snapshot: OnyxEntry<SearchResults>;
+
     /** Page-level filters every chart on the dashboard is narrowed by */
     filters: InsightsFilters;
 
-    /** Hash of the dashboard-wide query, which the record naming this chart's snapshot is stored under */
-    hash: number | undefined;
-
     /** Called by the retry button to request the dashboard again */
     onRetry: () => void;
 
@@ -45,21 +51,19 @@ type InsightsChartWidgetProps = {
     onGroupByChange?: (groupBy: InsightsFilters['groupBy']) => void;
 };
 
-function InsightsChartWidget({dashboardID, hash, chart, filters, onRetry, onGroupByChange}: InsightsChartWidgetProps) {
+function InsightsChartWidget({chart, queryJSON, snapshot, filters, onRetry, onGroupByChange}: InsightsChartWidgetProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const icons = useMemoizedLazyExpensifyIcons(['Expand']);
 
-    const {queryJSON, data, state} = useInsightsChartData(dashboardID, hash, chart, filters);
-    const groupBy = queryJSON?.groupBy;
+    const {isOffline} = useNetwork();
+    const sortedData = useGroupedItems(snapshot, queryJSON);
+    const {data, state} = resolveInsightsChartData({snapshot, queryJSON, sortedData, isOffline});
+    const groupBy = chart.groupBy ?? filters.groupBy;
     const isLoading = state === INSIGHTS_CHART_STATE.LOADING;
     const shouldShowTable = chart.view === CONST.SEARCH.VIEW.BAR || chart.view === CONST.SEARCH.VIEW.PIE;
 
-    if (!queryJSON || !groupBy) {
-        return null;
-    }
-
     const groupByControl = onGroupByChange ? (
         <InsightsGroupByDropdown
             groupBy={filters.groupBy}
@@ -68,7 +72,7 @@ function InsightsChartWidget({dashboardID, hash, chart, filters, onRetry, onGrou
     ) : null;
 
     const headerMenu =
-        state === INSIGHTS_CHART_STATE.READY || isLoading ? (
+        !!queryJSON && (state === INSIGHTS_CHART_STATE.READY || isLoading) ? (
             <WidgetHeaderMenu
                 testID={`insightsChartMenu-${chart.graphKey}`}
                 sentryLabel="InsightsChartMenu"
@@ -95,6 +99,7 @@ function InsightsChartWidget({dashboardID, hash, chart, filters, onRetry, onGrou
                 ) : null
             }
         >
+            {state === INSIGHTS_CHART_STATE.OFFLINE && <ChartOfflineState />}
             {state === INSIGHTS_CHART_STATE.ERROR && <ChartErrorState onRetry={onRetry} />}
             {state === INSIGHTS_CHART_STATE.EMPTY && <ChartEmptyState testID={`insightsChartEmptyState-${chart.graphKey}`} />}
             {(state === INSIGHTS_CHART_STATE.LOADING || state === INSIGHTS_CHART_STATE.READY) && (
diff --git a/src/pages/Insights/charts/InsightsDataTable.tsx b/src/pages/Insights/charts/InsightsDataTable.tsx
index 6520e6f5bdb2..f89b54d27b5f 100644
--- a/src/pages/Insights/charts/InsightsDataTable.tsx
+++ b/src/pages/Insights/charts/InsightsDataTable.tsx
@@ -2,6 +2,7 @@ import UserAvatar from '@components/Avatar/UserAvatar';
 import type {TransactionCardGroupListItemType, TransactionMemberGroupListItemType} from '@components/Search/SearchList/ListItem/types';
 import type {ChartView, GroupedItem, SearchChartDataRow, SearchGroupBy} from '@components/Search/types';
 import Text from '@components/Text';
+import TextWithTooltip from '@components/TextWithTooltip';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
@@ -87,13 +88,15 @@ function InsightsDataTable({rows, view, groupBy, isLoading}: InsightsDataTablePr
                             />
                         )}
                         <View style={[styles.flex1, styles.flexColumn, styles.gap1, styles.alignSelfStretch]}>
-                            <Text numberOfLines={1}>{point.label}</Text>
-                            <Text
-                                numberOfLines={1}
+                            <TextWithTooltip
+                                text={point.label}
+                                shouldShowTooltip
+                            />
+                            <TextWithTooltip
+                                text={translate('iou.expenseCount', {count: item.count})}
                                 style={styles.mutedNormalTextLabel}
-                            >
-                                {translate('iou.expenseCount', {count: item.count})}
-                            </Text>
+                                shouldShowTooltip
+                            />
                         </View>
                         <View style={[styles.flexColumn, styles.alignItemsEnd, styles.gap1, styles.alignSelfStretch]}>
                             <Text>{convertToDisplayString(item.total ?? 0, item.currency)}</Text>
diff --git a/src/pages/Insights/controls/InsightsCompareControl.tsx b/src/pages/Insights/controls/InsightsCompareControl.tsx
new file mode 100644
index 000000000000..a1f90596ec26
--- /dev/null
+++ b/src/pages/Insights/controls/InsightsCompareControl.tsx
@@ -0,0 +1,47 @@
+import DropdownButton from '@components/Search/FilterDropdowns/DropdownButton';
+import type {PopoverComponentProps} from '@components/Search/FilterDropdowns/FilterPopupButton';
+import SingleSelectPopup from '@components/Search/FilterDropdowns/SingleSelectPopup';
+import type {SearchCompareMode} from '@components/Search/types';
+
+import useLocalize from '@hooks/useLocalize';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+import type {InsightsControlProps} from './insightsControls';
+
+import INSIGHTS_CONTROL_ANCHOR_ALIGNMENT from './insightsControls';
+
+function InsightsCompareControl({value, onChange}: InsightsControlProps<SearchCompareMode | undefined>) {
+    const {translate} = useLocalize();
+    const label = translate('insightsPage.compare.label');
+
+    const items = [
+        {text: translate('insightsPage.compare.previousPeriod'), value: CONST.SEARCH.COMPARE.PREVIOUS_PERIOD},
+        {text: translate('insightsPage.compare.average'), value: CONST.SEARCH.COMPARE.AVERAGE},
+    ];
+    const selectedItem = items.find((item) => item.value === value);
+
+    const comparePopover = ({closeOverlay}: PopoverComponentProps) => (
+        <SingleSelectPopup
+            label={label}
+            items={items}
+            value={selectedItem}
+            closeOverlay={closeOverlay}
+            onChange={(item) => onChange(item?.value)}
+        />
+    );
+
+    return (
+        <DropdownButton
+            label={label}
+            value={selectedItem?.text ?? null}
+            sentryLabel={CONST.SENTRY_LABEL.INSIGHTS.CONTROL_COMPARE}
+            popoverAnchorAlignment={INSIGHTS_CONTROL_ANCHOR_ALIGNMENT}
+            PopoverComponent={comparePopover}
+        />
+    );
+}
+
+export default InsightsCompareControl;
diff --git a/src/pages/Insights/controls/InsightsPageControls.tsx b/src/pages/Insights/controls/InsightsPageControls.tsx
index 92d8877d854b..74686c574e40 100644
--- a/src/pages/Insights/controls/InsightsPageControls.tsx
+++ b/src/pages/Insights/controls/InsightsPageControls.tsx
@@ -1,13 +1,17 @@
 import ScrollView from '@components/ScrollView';
 
+import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
 
+import CONST from '@src/CONST';
+
 import React from 'react';
 import {View} from 'react-native';
 
+import InsightsCompareControl from './InsightsCompareControl';
 import InsightsDateControl from './InsightsDateControl';
 import InsightsGroupCurrencyControl from './InsightsGroupCurrencyControl';
 import InsightsWorkspaceControl from './InsightsWorkspaceControl';
@@ -25,6 +29,7 @@ type InsightsPageControlsProps = {
 function InsightsPageControls({filters, defaultFilters, onChange}: InsightsPageControlsProps) {
     const styles = useThemeStyles();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isBetaEnabled} = usePermissions();
 
     const controls = (
         <>
@@ -32,6 +37,12 @@ function InsightsPageControls({filters, defaultFilters, onChange}: InsightsPageC
                 value={filters.date}
                 onChange={(date) => onChange({date})}
             />
+            {isBetaEnabled(CONST.BETAS.INSIGHTS_COMPARE) && (
+                <InsightsCompareControl
+                    value={filters.compare}
+                    onChange={(compare) => onChange({compare})}
+                />
+            )}
             <InsightsWorkspaceControl
                 value={filters.policyIDs}
                 onChange={(policyIDs) => onChange({policyIDs})}
@@ -50,7 +61,7 @@ function InsightsPageControls({filters, defaultFilters, onChange}: InsightsPageC
                 horizontal
                 showsHorizontalScrollIndicator={false}
                 keyboardShouldPersistTaps="always"
-                style={[styles.flexGrow0, styles.flexShrink0, styles.pb3]}
+                style={[styles.flexGrow0, styles.flexShrink0, styles.pb5]}
                 contentContainerStyle={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.ph5]}
             >
                 {controls}
@@ -58,7 +69,11 @@ function InsightsPageControls({filters, defaultFilters, onChange}: InsightsPageC
         );
     }
 
-    return <View style={[styles.flexRow, styles.flexWrap, styles.alignItemsCenter, styles.justifyContentEnd, styles.gap2, styles.ph5, styles.pb3]}>{controls}</View>;
+    return (
+        <View style={[styles.ph5, styles.pb5, styles.insightsPageControlsContainer]}>
+            <View style={[styles.centeredContentWidthLimiter, styles.flexRow, styles.flexWrap, styles.alignItemsCenter, styles.justifyContentEnd, styles.gap2]}>{controls}</View>
+        </View>
+    );
 }
 
 export default InsightsPageControls;
diff --git a/src/pages/Insights/dashboardSpecs.ts b/src/pages/Insights/dashboardSpecs.ts
index 78f8022f1827..baf4a6a7d7cc 100644
--- a/src/pages/Insights/dashboardSpecs.ts
+++ b/src/pages/Insights/dashboardSpecs.ts
@@ -13,7 +13,7 @@ import type {InsightsDashboardID, InsightsGraphKey, InsightsSearchKey, Policy} f
 import type {OnyxCollection} from 'react-native-onyx';
 
 type InsightsChartSpec = {
-    /** Slot the chart finds its snapshot hash under in the stored dashboard's `graphs` */
+    /** Slot the request names the chart's snapshot under, and the response's `graphs` confirms it in */
     graphKey: InsightsGraphKey;
     titleKey: TranslationPaths;
     view: ChartView;
diff --git a/src/pages/Insights/insightsFilterParsing.ts b/src/pages/Insights/insightsFilterParsing.ts
index 72a078da2ae1..924bb47b34aa 100644
--- a/src/pages/Insights/insightsFilterParsing.ts
+++ b/src/pages/Insights/insightsFilterParsing.ts
@@ -42,6 +42,10 @@ function parseGroupBy(queryJSON: SearchQueryJSON): Pick<InsightsFilters, 'groupB
     return groupBy ? {groupBy} : undefined;
 }
 
+function parseCompare(queryJSON: SearchQueryJSON): Pick<InsightsFilters, 'compare'> | undefined {
+    return queryJSON.compare ? {compare: queryJSON.compare} : undefined;
+}
+
 /** Reads a dashboard's stored selections. Anything the query doesn't carry is left out, so the caller's defaults show through. */
 function parseInsightsFilters(query: string | undefined): Partial<InsightsFilters> {
     const queryJSON = query ? buildSearchQueryJSON(query) : undefined;
@@ -54,6 +58,7 @@ function parseInsightsFilters(query: string | undefined): Partial<InsightsFilter
         ...parsePolicyIDs(queryJSON),
         ...parseGroupCurrency(queryJSON),
         ...parseGroupBy(queryJSON),
+        ...parseCompare(queryJSON),
     };
 }
 
diff --git a/src/pages/Insights/insightsFilters.ts b/src/pages/Insights/insightsFilters.ts
index f1ecec9e2385..2131fea686bf 100644
--- a/src/pages/Insights/insightsFilters.ts
+++ b/src/pages/Insights/insightsFilters.ts
@@ -1,4 +1,4 @@
-import type {SearchDatePreset} from '@components/Search/types';
+import type {SearchCompareMode, SearchDatePreset} from '@components/Search/types';
 
 import CONST from '@src/CONST';
 
@@ -10,10 +10,18 @@ type InsightsFilters = {
     policyIDs: string[];
 
     /** Time bucket the headline chart aggregates into. */
-    groupBy: typeof CONST.SEARCH.GROUP_BY.WEEK | typeof CONST.SEARCH.GROUP_BY.MONTH | typeof CONST.SEARCH.GROUP_BY.QUARTER | typeof CONST.SEARCH.GROUP_BY.YEAR;
+    groupBy:
+        | typeof CONST.SEARCH.GROUP_BY.DAY
+        | typeof CONST.SEARCH.GROUP_BY.WEEK
+        | typeof CONST.SEARCH.GROUP_BY.MONTH
+        | typeof CONST.SEARCH.GROUP_BY.QUARTER
+        | typeof CONST.SEARCH.GROUP_BY.YEAR;
 
     /** Currency every amount is converted to, so graphs can sum across workspaces. */
     groupCurrency: string;
+
+    /** What the period on screen is drawn against, or nothing when the charts show it alone. */
+    compare?: SearchCompareMode;
 };
 
 const DEFAULT_INSIGHTS_FILTERS: Omit<InsightsFilters, 'groupCurrency'> = {
@@ -22,7 +30,7 @@ const DEFAULT_INSIGHTS_FILTERS: Omit<InsightsFilters, 'groupCurrency'> = {
     groupBy: CONST.SEARCH.GROUP_BY.MONTH,
 };
 
-const INSIGHTS_GROUP_BY_OPTIONS = [CONST.SEARCH.GROUP_BY.WEEK, CONST.SEARCH.GROUP_BY.MONTH, CONST.SEARCH.GROUP_BY.QUARTER, CONST.SEARCH.GROUP_BY.YEAR] as const;
+const INSIGHTS_GROUP_BY_OPTIONS = [CONST.SEARCH.GROUP_BY.DAY, CONST.SEARCH.GROUP_BY.WEEK, CONST.SEARCH.GROUP_BY.MONTH, CONST.SEARCH.GROUP_BY.QUARTER, CONST.SEARCH.GROUP_BY.YEAR] as const;
 
 export type {InsightsFilters};
 export {INSIGHTS_GROUP_BY_OPTIONS};
diff --git a/src/pages/Insights/insightsQueries.ts b/src/pages/Insights/insightsQueries.ts
index a1fbecf19597..fe61577ac23b 100644
--- a/src/pages/Insights/insightsQueries.ts
+++ b/src/pages/Insights/insightsQueries.ts
@@ -1,7 +1,8 @@
-import type {SearchQueryString} from '@components/Search/types';
+import type {SearchCompareMode, SearchQueryJSON, SearchQueryString} from '@components/Search/types';
 
 import {buildQueryStringFromFilterFormValues, buildSearchQueryJSON, getRangeQueryValue} from '@libs/SearchQueryUtils';
 
+import CONST from '@src/CONST';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import type {InsightsDashboard, InsightsDashboardID, InsightsGraphKey} from '@src/types/onyx';
 
@@ -10,6 +11,9 @@ import type {InsightsFilters} from './insightsFilters';
 
 import INSIGHTS_DASHBOARD_SPECS from './dashboardSpecs';
 
+/** How many periods before the selected date range the Average mode spans (Typical on the ranking charts) */
+const COMPARE_TYPICAL_PERIOD_COUNT = 1;
+
 /** Builds the date filter in the shape a search query is built from. */
 function buildDateFormValues(date: InsightsFilters['date']): Partial<SearchAdvancedFiltersForm> {
     if ('preset' in date) {
@@ -32,44 +36,77 @@ function buildFilterFormValues(filters: InsightsFilters): Partial<SearchAdvanced
 
 /** Builds the dashboard-wide query the whole page is narrowed by. */
 function buildInsightsQueryString(filters: InsightsFilters): SearchQueryString {
-    return buildQueryStringFromFilterFormValues({...buildFilterFormValues(filters), groupBy: filters.groupBy});
+    return buildQueryStringFromFilterFormValues({...buildFilterFormValues(filters), groupBy: filters.groupBy, compare: filters.compare});
 }
 
 /** Builds a chart's query with the page's filters applied. */
-function applyInsightsFilters(chart: InsightsChartSpec, filters: InsightsFilters): SearchQueryString {
+function applyInsightsFilters(chart: InsightsChartSpec, filters: InsightsFilters, compare?: SearchCompareMode): SearchQueryString {
     return buildQueryStringFromFilterFormValues(
-        {...buildFilterFormValues(filters), groupBy: chart.groupBy ?? filters.groupBy, view: chart.view},
+        {...buildFilterFormValues(filters), groupBy: chart.groupBy ?? filters.groupBy, view: chart.view, compare},
         {sortBy: chart.sortBy, sortOrder: chart.sortOrder, limit: chart.limit},
     );
 }
 
-/** Returns the chart's graph slot paired with its snapshot hash. */
-function buildSnapshotHashEntries(chart: InsightsChartSpec, filters: InsightsFilters): Array<[InsightsGraphKey, {snapshotHash: number}]> {
-    const snapshotHash = buildSearchQueryJSON(applyInsightsFilters(chart, filters))?.hash;
-    return snapshotHash ? [[chart.graphKey, {snapshotHash}]] : [];
+type InsightsChartQuery = {
+    chart: InsightsChartSpec;
+    queryJSON: Readonly<SearchQueryJSON> | undefined;
+};
+
+type InsightsGraphHashes = {
+    snapshotHash: number;
+    previousPeriodSnapshotHash?: number;
+    averageSnapshotHash?: number;
+};
+type InsightsGraphHashEntry = [InsightsGraphKey, InsightsGraphHashes];
+
+/** Returns the chart's graph slot paired with the hashes its current period, previous period and average are stored under. */
+function buildSnapshotHashEntry({chart, queryJSON}: InsightsChartQuery, filters: InsightsFilters, shouldIncludeComparisons: boolean): InsightsGraphHashEntry | undefined {
+    const snapshotHash = queryJSON?.hash;
+    if (!snapshotHash) {
+        return undefined;
+    }
+    if (!shouldIncludeComparisons) {
+        return [chart.graphKey, {snapshotHash}];
+    }
+
+    const previousPeriodSnapshotHash = buildSearchQueryJSON(applyInsightsFilters(chart, filters, CONST.SEARCH.COMPARE.PREVIOUS_PERIOD))?.hash;
+    const averageSnapshotHash = buildSearchQueryJSON(applyInsightsFilters(chart, filters, CONST.SEARCH.COMPARE.AVERAGE))?.hash;
+    if (!previousPeriodSnapshotHash || !averageSnapshotHash) {
+        return undefined;
+    }
+
+    return [chart.graphKey, {snapshotHash, previousPeriodSnapshotHash, averageSnapshotHash}];
 }
 
 type InsightsQuery = {
     /** Request payload for GetInsights. */
     jsonQuery: string;
 
-    /** Hash of the dashboard-wide query, which the response is stored under so every set of filters keeps its own dashboard entry. */
+    /** Hash of the dashboard-wide query, which the response is stored under so every set of filters keeps its own dashboard entry. Leaves out the comparison, since every response carries all of them. */
     hash: number;
 
     /** Hashes of the snapshots the graphs are stored under. */
     snapshotHashes: number[];
+
+    headlineChart: InsightsChartQuery;
+    supportingCharts: InsightsChartQuery[];
 };
 
-/** Builds one request for the whole dashboard: the shared filters query plus the snapshot hash each graph's data is stored under. */
-function buildInsightsJsonQuery(dashboard: InsightsDashboardID, filters: InsightsFilters): InsightsQuery | undefined {
-    const inputQuery = buildInsightsQueryString(filters);
+/** Builds one request for the whole dashboard, naming each graph's snapshots by its chart's query hashes, and returns those chart queries to read the snapshots back with. */
+function buildInsightsJsonQuery(dashboard: InsightsDashboardID, filters: InsightsFilters, shouldIncludeComparisons: boolean): InsightsQuery | undefined {
+    const inputQuery = buildInsightsQueryString({...filters, compare: undefined});
     const queryJSON = buildSearchQueryJSON(inputQuery);
     if (!queryJSON) {
         return undefined;
     }
 
-    const {searchKey, headlineChart, supportingCharts} = INSIGHTS_DASHBOARD_SPECS[dashboard];
-    const graphEntries = [...buildSnapshotHashEntries(headlineChart, filters), ...supportingCharts.flatMap((chart) => buildSnapshotHashEntries(chart, filters))];
+    const spec = INSIGHTS_DASHBOARD_SPECS[dashboard];
+    const buildChartQuery = (chart: InsightsChartSpec): InsightsChartQuery => ({chart, queryJSON: buildSearchQueryJSON(applyInsightsFilters(chart, filters))});
+    const headlineChart = buildChartQuery(spec.headlineChart);
+    const supportingCharts = spec.supportingCharts.map(buildChartQuery);
+    const graphEntries = [headlineChart, ...supportingCharts]
+        .map((chartQuery) => buildSnapshotHashEntry(chartQuery, filters, shouldIncludeComparisons))
+        .filter((entry): entry is InsightsGraphHashEntry => !!entry);
     const insightsHashes: InsightsDashboard['graphs'] = Object.fromEntries(graphEntries);
 
     return {
@@ -78,14 +115,17 @@ function buildInsightsJsonQuery(dashboard: InsightsDashboardID, filters: Insight
             groupBy: queryJSON.groupBy,
             filters: queryJSON.filters,
             inputQuery,
-            searchKey,
+            searchKey: spec.searchKey,
             insightsHashes,
+            numberOfPeriods: shouldIncludeComparisons ? COMPARE_TYPICAL_PERIOD_COUNT : undefined,
         }),
         hash: queryJSON.hash,
-        snapshotHashes: graphEntries.map(([, {snapshotHash}]) => snapshotHash),
+        snapshotHashes: graphEntries.flatMap(([, hashes]) => Object.values(hashes).filter((hash): hash is number => hash !== undefined)),
+        headlineChart,
+        supportingCharts,
     };
 }
 
 export {applyInsightsFilters, buildDateFormValues, buildInsightsQueryString};
-export type {InsightsQuery};
+export type {InsightsChartQuery, InsightsQuery};
 export default buildInsightsJsonQuery;
diff --git a/src/pages/Insights/resolveDashboardState.ts b/src/pages/Insights/resolveDashboardState.ts
index dd94be91b91d..65be897e50c9 100644
--- a/src/pages/Insights/resolveDashboardState.ts
+++ b/src/pages/Insights/resolveDashboardState.ts
@@ -1,15 +1,20 @@
-import {isGroupEntry} from '@libs/SearchUIUtils';
+import {isGroupEntry, isSearchDataLoaded} from '@libs/SearchUIUtils';
 
+import CONST from '@src/CONST';
 import type {InsightsDashboard} from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
+import type {InsightsChartQuery} from './insightsQueries';
+
 const INSIGHTS_DASHBOARD_STATE = {
     READY: 'ready',
     LOADING: 'loading',
     ERROR: 'error',
+    STALE: 'stale',
     OFFLINE: 'offline',
     EMPTY: 'empty',
     NO_EXPENSES: 'noExpenses',
@@ -17,28 +22,40 @@ const INSIGHTS_DASHBOARD_STATE = {
 
 type InsightsDashboardState = ValueOf<typeof INSIGHTS_DASHBOARD_STATE>;
 
-/** Resolves the page's state from the record stored for the query on screen, which the key it is read under already scopes. */
-function getDashboardState(dashboard: OnyxEntry<InsightsDashboard>, isOffline: boolean, headlineSnapshot: OnyxEntry<SearchResults>): InsightsDashboardState {
-    // Only a response sets `inputQuery`, so until one lands the record holds nothing to draw.
-    const isDataLoaded = !!dashboard?.inputQuery;
+type InsightsDashboardChart = InsightsChartQuery & {
+    snapshot: OnyxEntry<SearchResults>;
+};
+
+/** Resolves the page's state from the dashboard record and the snapshot of every chart on screen. */
+function getDashboardState(dashboard: OnyxEntry<InsightsDashboard>, isOffline: boolean, charts: InsightsDashboardChart[]): InsightsDashboardState {
+    // Only a GetInsights response sets `inputQuery`.
+    const hasDashboardResponse = !!dashboard?.inputQuery;
+    const chartStates = charts.map(({snapshot, queryJSON}) => {
+        const isLoaded = isSearchDataLoaded(snapshot, queryJSON) && isEmptyObject(snapshot?.errors);
+        return {isLoaded, hasRows: isLoaded && Object.keys(snapshot?.data ?? {}).some(isGroupEntry)};
+    });
+    const hasLoadedChart = chartStates.some(({isLoaded}) => isLoaded);
 
-    if (isOffline && !isDataLoaded) {
+    if (isOffline && !hasLoadedChart && dashboard?.hasResults !== false) {
         return INSIGHTS_DASHBOARD_STATE.OFFLINE;
     }
     if (!isOffline && Object.keys(dashboard?.errors ?? {}).length > 0) {
-        return INSIGHTS_DASHBOARD_STATE.ERROR;
+        return dashboard?.responseJsonCode === CONST.JSON_CODE.NO_RESPONSE ? INSIGHTS_DASHBOARD_STATE.STALE : INSIGHTS_DASHBOARD_STATE.ERROR;
     }
-    if (!isDataLoaded) {
+    if (!hasDashboardResponse && !hasLoadedChart) {
         return INSIGHTS_DASHBOARD_STATE.LOADING;
     }
+    if (chartStates.some(({hasRows}) => hasRows)) {
+        return INSIGHTS_DASHBOARD_STATE.READY;
+    }
     if (dashboard?.hasResults === false) {
         return INSIGHTS_DASHBOARD_STATE.NO_EXPENSES;
     }
-    if (headlineSnapshot?.data && !Object.keys(headlineSnapshot.data).some(isGroupEntry)) {
+    if (chartStates.every(({isLoaded}) => isLoaded)) {
         return INSIGHTS_DASHBOARD_STATE.EMPTY;
     }
     return INSIGHTS_DASHBOARD_STATE.READY;
 }
 
 export {INSIGHTS_DASHBOARD_STATE, getDashboardState};
-export type {InsightsDashboardState};
+export type {InsightsDashboardState, InsightsDashboardChart};
diff --git a/src/pages/Insights/useInsightsChartData.ts b/src/pages/Insights/useInsightsChartData.ts
deleted file mode 100644
index bdfd2016a323..000000000000
--- a/src/pages/Insights/useInsightsChartData.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import useGroupedItems from '@components/Search/hooks/useGroupedItems';
-import type {SearchQueryJSON} from '@components/Search/types';
-
-import useOnyx from '@hooks/useOnyx';
-
-import {buildSearchQueryJSON} from '@libs/SearchQueryUtils';
-
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {InsightsDashboardID} from '@src/types/onyx';
-
-import type {InsightsChartSpec} from './dashboardSpecs';
-import type {InsightsFilters} from './insightsFilters';
-import type {InsightsChartData} from './resolveChartData';
-
-import {applyInsightsFilters} from './insightsQueries';
-import {resolveInsightsChartData} from './resolveChartData';
-
-/** Resolves one chart's data from the snapshot the dashboard record names for it. */
-function useInsightsChartData(
-    dashboardID: InsightsDashboardID,
-    hash: number | undefined,
-    chart: InsightsChartSpec,
-    filters: InsightsFilters,
-): InsightsChartData & {queryJSON: Readonly<SearchQueryJSON> | undefined} {
-    const queryJSON = buildSearchQueryJSON(applyInsightsFilters(chart, filters));
-    const [dashboard] = useOnyx(`${ONYXKEYS.COLLECTION.INSIGHTS}${dashboardID}_${hash}`);
-    const [snapshot] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${dashboard?.graphs?.[chart.graphKey]?.snapshotHash}`);
-    const sortedData = useGroupedItems(snapshot, queryJSON);
-
-    return {queryJSON, ...resolveInsightsChartData({chart, dashboard, snapshot, sortedData})};
-}
-
-export default useInsightsChartData;
diff --git a/src/pages/LogInWithShortLivedAuthTokenPage.tsx b/src/pages/LogInWithShortLivedAuthTokenPage.tsx
index c37ac14866f9..3a7d93beffc8 100644
--- a/src/pages/LogInWithShortLivedAuthTokenPage.tsx
+++ b/src/pages/LogInWithShortLivedAuthTokenPage.tsx
@@ -26,12 +26,14 @@ type LogInWithShortLivedAuthTokenPageProps = PlatformStackScreenProps<PublicScre
 function LogInWithShortLivedAuthTokenPage({route}: LogInWithShortLivedAuthTokenPageProps) {
     const {shortLivedAuthToken = '', shortLivedToken = '', authTokenType, exitTo, error, isSAML = false} = route?.params ?? {};
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [credentials, credentialsMetadata] = useOnyx(ONYXKEYS.CREDENTIALS);
     const [lastVisitedPath, lastVisitedPathMetadata] = useOnyx(ONYXKEYS.LAST_VISITED_PATH);
-    const isLoadingLastVisitedPath = isLoadingOnyxValue(lastVisitedPathMetadata);
+    const isLoadingSignInData = isLoadingOnyxValue(lastVisitedPathMetadata, ...(isSAML ? [credentialsMetadata] : []));
 
     useEffect(() => {
-        // Only a forced SAML re-auth keeps a last visited path, so it has to be read before the sign-in starts.
-        if (isLoadingLastVisitedPath) {
+        // Only a forced SAML re-auth keeps a last visited path, so it has to be read (along with the credentials
+        // the sign-in compares against) before the sign-in starts.
+        if (isLoadingSignInData) {
             return;
         }
 
@@ -57,7 +59,7 @@ function LogInWithShortLivedAuthTokenPage({route}: LogInWithShortLivedAuthTokenP
         // A forced SAML re-auth leaves account.isLoading true until this sign-in, so it must not block a SAML token.
         if (token && (isSAML || !account?.isLoading)) {
             Log.info('LogInWithShortLivedAuthTokenPage - Successfully received shortLivedAuthToken. Signing in...');
-            signInWithShortLivedAuthToken(token, isSAML, isSAML ? lastVisitedPath : undefined);
+            signInWithShortLivedAuthToken(token, isSAML, isSAML ? lastVisitedPath : undefined, credentials?.login);
             // For SAML sign-ins, navigate to HOME explicitly since the SAML flow
             // doesn't use exitTo deep link routing. For non-SAML flows, let the
             // navigation system handle exitTo routing naturally via setUpPoliciesAndNavigate.
@@ -82,11 +84,11 @@ function LogInWithShortLivedAuthTokenPage({route}: LogInWithShortLivedAuthTokenP
                 Navigation.navigate(exitTo as Route);
             });
         }
-        // Runs once the route and the last visited path are known, later Onyx changes must not restart the sign-in.
+        // Runs once the route, the credentials and the last visited path are known, later Onyx changes must not restart the sign-in.
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [route, isLoadingLastVisitedPath]);
+    }, [route, isLoadingSignInData]);
 
-    if (account?.isLoading || isLoadingLastVisitedPath) {
+    if (account?.isLoading || isLoadingSignInData) {
         return <FullScreenLoadingIndicator />;
     }
 
diff --git a/src/pages/LogOutPreviousUserPage.tsx b/src/pages/LogOutPreviousUserPage.tsx
index 9ac0b47ce8ca..0bf187abac7b 100644
--- a/src/pages/LogOutPreviousUserPage.tsx
+++ b/src/pages/LogOutPreviousUserPage.tsx
@@ -74,7 +74,7 @@ function LogOutPreviousUserPage({route}: LogOutPreviousUserPageProps) {
 
         // Even if the user was already authenticated in NewDot, we need to reauthenticate them with shortLivedAuthToken,
         // because the old authToken stored in Onyx may be invalid.
-        signInWithShortLivedAuthToken(shortLivedAuthToken);
+        signInWithShortLivedAuthToken(shortLivedAuthToken, false, undefined, undefined);
 
         // We only want to run this effect once on mount (when the page first loads after transitioning from OldDot)
         // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/src/pages/NewChatPage/index.tsx b/src/pages/NewChatPage/index.tsx
index dbf931272150..ab68345bd1ee 100755
--- a/src/pages/NewChatPage/index.tsx
+++ b/src/pages/NewChatPage/index.tsx
@@ -174,7 +174,7 @@ function NewChatPage({ref}: NewChatPageProps) {
         !!userToInvite,
         debouncedSearchTerm.trim(),
         countryCode,
-        selectedOptions.some((participant) => doesPersonalDetailMatchSearchTerm(participant, currentUserAccountID, cleanSearchTerm)),
+        selectedOptions.some((participant) => doesPersonalDetailMatchSearchTerm(participant, currentUserAccountID, cleanSearchTerm, translate)),
     );
 
     // Selected rows are marked in place by the hook (isSelected), so the checkmark stays with the row instead of jumping to the top.
@@ -189,7 +189,9 @@ function NewChatPage({ref}: NewChatPageProps) {
     // to keep them visible and easy to deselect. The one already shown as the current invite row is excluded to avoid a duplicate.
     const selectedSection = selectedOptions.filter(
         (option) =>
-            !!option.isOptimisticAccount && !(userToInvite && option.login === userToInvite.login) && doesPersonalDetailMatchSearchTerm(option, currentUserAccountID, cleanSearchTerm),
+            !!option.isOptimisticAccount &&
+            !(userToInvite && option.login === userToInvite.login) &&
+            doesPersonalDetailMatchSearchTerm(option, currentUserAccountID, cleanSearchTerm, translate),
     );
 
     if (selectedSection.length) {
diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
index c6b8a5fbb0ce..f64d8ba35e82 100644
--- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
+++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx
@@ -175,18 +175,16 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount
                 // Keep the selected fill on hover.
                 hoverStyle={isSelected ? undefined : styles.hoveredComponentBG}
                 style={[
-                    styles.onboardingAccountingItem,
-                    isSmallScreenWidth ? styles.onboardingAccountingItemNarrow : styles.onboardingAccountingItemWide,
-                    isSelected && styles.onboardingAccountingItemSelected,
+                    styles.onboardingTile,
+                    isSmallScreenWidth && !isInLandscapeMode ? styles.onboardingTileNarrow : styles.onboardingAccountingItemWide,
+                    isSelected && styles.onboardingTileSelected,
                 ]}
             >
-                {/* Square to match the mocks, but a radio because only one option can be picked. */}
                 <RadioButton
                     isChecked={isSelected}
                     onPress={() => handleIntegrationSelect(optionKey)}
                     accessibilityLabel={label}
-                    containerBorderRadius={variables.componentBorderRadiusSmall}
-                    wrapperStyle={styles.onboardingAccountingItemSelectionButton}
+                    wrapperStyle={styles.onboardingTileSelectionButton}
                 />
                 <Icon
                     src={isOtherOption ? illustrations.Pencil : expensifyIcons[accountingIntegrationDetails[optionKey].iconName]}
diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
index 66997c844b0d..88aa7a655167 100644
--- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
+++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx
@@ -111,9 +111,10 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
                     text: translate(`onboarding.employees.${companySize}`),
                     keyForList: companySize,
                     isSelected: companySize === selectedCompanySize,
+                    itemStyle: onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8] : [],
                 };
             });
-    }, [translate, selectedCompanySize, onboardingValues?.signupQualifier]);
+    }, [translate, selectedCompanySize, onboardingValues?.signupQualifier, onboardingIsMediumOrLargerScreenWidth, styles.pl8, styles.pr8]);
 
     const submitCompanySize = () => {
         if (!selectedCompanySize) {
@@ -170,7 +171,6 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
                 shouldUpdateFocusedIndex
                 ListItem={SingleSelectListItem}
                 footerContent={footerContent}
-                style={{listItemWrapperStyle: onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8] : []}}
             />
         </ScreenWrapper>
     );
diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
index ff155f566d65..6a2dd31c3122 100644
--- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
+++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx
@@ -29,6 +29,8 @@ import type {OnboardingFeatureMapItem} from '@libs/actions/Welcome/OnboardingFea
 import Navigation from '@libs/Navigation/Navigation';
 import {isGroupPolicy, isPolicyAdmin} from '@libs/PolicyUtils';
 
+import variables from '@styles/variables';
+
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -46,7 +48,7 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
 
     // We need to use isSmallScreenWidth, see navigateAfterOnboarding function comment
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
-    const {onboardingIsMediumOrLargerScreenWidth, isSmallScreenWidth} = useResponsiveLayout();
+    const {onboardingIsMediumOrLargerScreenWidth, isSmallScreenWidth, isInLandscapeMode} = useResponsiveLayout();
     const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID);
     const [onboardingInterestedFeaturesMap] = useOnyx(ONYXKEYS.ONBOARDING_INTERESTED_FEATURES_MAP);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
@@ -60,27 +62,82 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
         return ONBOARDING_FEATURES.map((feature) => {
             switch (feature.id) {
                 case CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.categories.title'), icon: illustrations.FolderOpen};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.categories.title'),
+                        subtitle: translate('workspace.moreFeatures.categories.subtitle'),
+                        icon: illustrations.FolderOpen,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.connections.title'), icon: illustrations.Accounting};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.connections.title'),
+                        subtitle: translate('workspace.moreFeatures.connections.subtitle'),
+                        icon: illustrations.Accounting,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.companyCards.title'), icon: illustrations.CompanyCard};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.companyCards.title'),
+                        subtitle: translate('workspace.moreFeatures.companyCards.subtitle'),
+                        icon: illustrations.CompanyCard,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.workflows.title'), icon: illustrations.Workflows};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.workflows.title'),
+                        subtitle: translate('workspace.moreFeatures.workflows.subtitle'),
+                        icon: illustrations.Workflows,
+                    };
                 case CONST.POLICY.MORE_FEATURES.IS_TRAVEL_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.travel.title'), icon: illustrations.Luggage};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.travel.title'),
+                        subtitle: translate('workspace.moreFeatures.travel.subtitle'),
+                        icon: illustrations.Luggage,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.rules.title'), icon: illustrations.Rules};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.rules.title'),
+                        subtitle: translate('workspace.moreFeatures.rules.subtitle'),
+                        icon: illustrations.Rules,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.distanceRates.title'), icon: illustrations.Car};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.distanceRates.title'),
+                        subtitle: translate('workspace.moreFeatures.distanceRates.subtitle'),
+                        icon: illustrations.Car,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.expensifyCard.title'), icon: illustrations.HandCard};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.expensifyCard.title'),
+                        subtitle: translate('workspace.moreFeatures.expensifyCard.subtitle'),
+                        icon: illustrations.HandCard,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.tags.title'), icon: illustrations.Tag};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.tags.title'),
+                        subtitle: translate('workspace.moreFeatures.tags.subtitle'),
+                        icon: illustrations.Tag,
+                    };
                 case CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.perDiem.title'), icon: illustrations.PerDiem};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.perDiem.title'),
+                        subtitle: translate('workspace.moreFeatures.perDiem.subtitle'),
+                        icon: illustrations.PerDiem,
+                    };
                 case CONST.POLICY.MORE_FEATURES.IS_TIME_TRACKING_ENABLED:
-                    return {...feature, title: translate('workspace.moreFeatures.timeTracking.title'), icon: illustrations.Clock};
+                    return {
+                        ...feature,
+                        title: translate('workspace.moreFeatures.timeTracking.title'),
+                        subtitle: translate('workspace.moreFeatures.timeTracking.subtitle'),
+                        icon: illustrations.Clock,
+                    };
                 default:
                     return {...feature, title: feature.id, icon: illustrations.FolderOpen};
             }
@@ -139,11 +196,12 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
         await completeOnboardingFlow({featuresMap});
     }, [completeOnboardingFlow, features, isAccountingEnabled, selectedFeatures]);
 
-    // Create items for enabled features
+    // Create items for enabled features, title-only per the mocks
     const enabledFeatures: Feature[] = features
         .filter((feature) => !!feature.enabledByDefault || feature.id === CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED)
         .map((feature) => ({
             ...feature,
+            subtitle: undefined,
         }));
 
     // Create items for features they may be interested in
@@ -191,33 +249,34 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
                     }}
                     accessibilityLabel={item.title}
                     accessible={false}
-                    hoverStyle={styles.hoveredComponentBG}
+                    // Keep the selected fill on hover.
+                    hoverStyle={isSelected ? undefined : styles.hoveredComponentBG}
                     style={[
-                        styles.onboardingInterestedFeaturesItem,
-                        // 48.5% handles the gap between columns and keeps items aligned when the scrollbar appears
-                        isSmallScreenWidth ? styles.flexBasis100 : {flexBasis: '48.5%', maxWidth: '48.5%'},
+                        styles.onboardingTile,
+                        isSmallScreenWidth && !isInLandscapeMode ? styles.onboardingTileNarrow : styles.onboardingInterestedFeaturesItemWide,
+                        isSelected && styles.onboardingTileSelected,
                     ]}
                     sentryLabel={CONST.SENTRY_LABEL.ONBOARDING.INTERESTED_FEATURES_ITEM}
                 >
-                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3]}>
-                        <Icon
-                            src={item.icon}
-                            width={48}
-                            height={48}
-                        />
-                        <Text style={[styles.textStrong]}>{item.title}</Text>
-                    </View>
                     <Checkbox
                         accessibilityLabel={item.title}
                         isChecked={isSelected}
                         onPress={() => {
                             handleFeatureSelect(item.id);
                         }}
+                        wrapperStyle={styles.onboardingTileSelectionButton}
+                    />
+                    <Icon
+                        src={item.icon}
+                        width={variables.iconSizeExtraLarge}
+                        height={variables.iconSizeExtraLarge}
                     />
+                    <Text style={[styles.textStrong, styles.textAlignCenter, styles.mt2]}>{item.title}</Text>
+                    {!!item.subtitle && <Text style={[styles.textLabelSupporting, styles.textAlignCenter, styles.mt1]}>{item.subtitle}</Text>}
                 </PressableWithoutFeedback>
             );
         },
-        [styles, isSmallScreenWidth, selectedFeatures, handleFeatureSelect],
+        [styles, isSmallScreenWidth, isInLandscapeMode, selectedFeatures, handleFeatureSelect],
     );
 
     const renderSection = useCallback(
diff --git a/src/pages/OnboardingInterestedFeatures/types.ts b/src/pages/OnboardingInterestedFeatures/types.ts
index 4f90bf7413ad..18effacf3987 100644
--- a/src/pages/OnboardingInterestedFeatures/types.ts
+++ b/src/pages/OnboardingInterestedFeatures/types.ts
@@ -13,6 +13,7 @@ type BaseOnboardingInterestedFeaturesProps = OnboardingInterestedFeaturesProps &
 type Feature = {
     id: string;
     title: string;
+    subtitle?: string;
     icon: IconAsset;
     enabledByDefault?: boolean;
     requiresUpdate?: boolean;
diff --git a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
index abbd950d3aa7..6775d535eee3 100644
--- a/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
+++ b/src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
@@ -25,7 +25,7 @@ import getOperatingSystem from '@libs/getOperatingSystem';
 import Navigation from '@libs/Navigation/Navigation';
 
 import {AddWorkEmail} from '@userActions/Session';
-import {addWorkEmailFormError, clearWorkEmailFormErrors, setOnboardingErrorMessage, setOnboardingMergeAccountStepValue} from '@userActions/Welcome';
+import {addWorkEmailFormError, clearWorkEmailFormErrors, setOnboardingErrorMessage, setOnboardingMergeAccountStepValue, setOnboardingShouldValidate} from '@userActions/Welcome';
 
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -35,7 +35,6 @@ import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/OnboardingWorkEmailForm';
 import type IconAsset from '@src/types/utils/IconAsset';
 
-import {useIsFocused} from '@react-navigation/native';
 import {hasCompletedGuidedSetupFlowSelector} from '@selectors/Onboarding';
 import {PUBLIC_DOMAINS_SET, Str} from 'expensify-common';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
@@ -73,7 +72,6 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
     const {isOffline} = useNetwork();
     const ICON_SIZE = 48;
     const operatingSystem = getOperatingSystem();
-    const isFocused = useIsFocused();
 
     useEffect(() => {
         setOnboardingErrorMessage(null);
@@ -106,7 +104,9 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         setOnboardingErrorMessage(null);
 
         if (onboardingValues?.shouldValidate) {
-            Navigation.navigate(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute());
+            // Replace instead of push so this screen unmounts. Left mounted, its effect re-runs once the merge response
+            // updates the account and pushes a second copy of the remaining flow.
+            Navigation.navigate(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute(), {forceReplace: true});
             return;
         }
 
@@ -118,14 +118,21 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         onboardingValues?.shouldValidate,
         isVsb,
         isSmb,
-        isFocused,
         onboardingValues?.isMergeAccountStepCompleted,
         onboardingValues?.isMergeAccountStepSkipped,
     ]);
 
-    const submitWorkEmail = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM>) => {
-        AddWorkEmail(values[INPUT_IDS.ONBOARDING_WORK_EMAIL].trim());
-    }, []);
+    const submitWorkEmail = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM>) => {
+        const submittedWorkEmail = values[INPUT_IDS.ONBOARDING_WORK_EMAIL].trim();
+
+        // AddWorkEmail already made this the account's login, and resending it would merge the account into itself, so restore the shouldValidate: false that going back cleared
+        if (session?.email && submittedWorkEmail.toLowerCase() === session.email.toLowerCase()) {
+            setOnboardingShouldValidate(false);
+            return;
+        }
+
+        AddWorkEmail(submittedWorkEmail);
+    };
 
     useEffect(() => {
         if (!onboardingErrorMessageTranslationKey) {
@@ -164,11 +171,15 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
         const emailParts = userEmail.split('@');
         const domain = emailParts.at(1) ?? '';
 
-        if (session?.email && userEmail.toLowerCase() === session.email.toLowerCase() && !isOffline) {
-            addErrorMessage(errors, INPUT_IDS.ONBOARDING_WORK_EMAIL, translate('onboarding.workEmailValidationError.sameAsSignupEmail'));
-        } else if ((!Str.isValidEmail(userEmail) || PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) && !isOffline) {
+        // AddWorkEmail can make the submitted work email the account's login, so session.email is only the signup email while it is still on a public domain
+        if ((!Str.isValidEmail(userEmail) || PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) && !isOffline) {
             Log.hmmm('User is trying to add an invalid work email', {userEmail, domain});
-            addErrorMessage(errors, INPUT_IDS.ONBOARDING_WORK_EMAIL, translate('onboarding.workEmailValidationError.publicEmail'));
+            const isSignupEmail = !!session?.email && userEmail.toLowerCase() === session.email.toLowerCase();
+            addErrorMessage(
+                errors,
+                INPUT_IDS.ONBOARDING_WORK_EMAIL,
+                translate(isSignupEmail ? 'onboarding.workEmailValidationError.sameAsSignupEmail' : 'onboarding.workEmailValidationError.publicEmail'),
+            );
         }
 
         if (isOffline ?? false) {
diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
index 90c918e2bb4e..41b6c57b82d5 100644
--- a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx
@@ -4,6 +4,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import ValidateCodeForm from '@components/ValidateCodeActionModal/ValidateCodeForm';
 
+import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -21,7 +22,6 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
-import {useIsFocused} from '@react-navigation/native';
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
 
@@ -42,7 +42,6 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
     const isSmb = onboardingValues?.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;
     const [onboardingErrorMessage] = useOnyx(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY);
     const isValidateCodeFormSubmitting = AccountUtils.isValidateCodeFormSubmitting(account);
-    const isFocused = useIsFocused();
 
     useEffect(() => {
         if (onboardingValues?.isMergeAccountStepCompleted === undefined) {
@@ -66,7 +65,21 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
         }
 
         Navigation.navigate(ROUTES.ONBOARDING_PURPOSE.getRoute(), {forceReplace: true});
-    }, [onboardingValues?.isMergeAccountStepCompleted, onboardingValues?.shouldRedirectToClassicAfterMerge, onboardingValues?.isMergeAccountStepSkipped, isVsb, isSmb, isFocused]);
+    }, [onboardingValues?.isMergeAccountStepCompleted, onboardingValues?.shouldRedirectToClassicAfterMerge, onboardingValues?.isMergeAccountStepSkipped, isVsb, isSmb]);
+
+    const handleBackPress = () => {
+        // The merge request cannot be cancelled. Leaving mid-flight lets the work email screen consume the success
+        // and route through PRIVATE_DOMAIN instead of Join a workspace.
+        if (isValidateCodeFormSubmitting) {
+            return true;
+        }
+        updateOnboardingValuesAndNavigation(onboardingValues);
+        return true;
+    };
+
+    // The work email screen force-replaces itself with this one, so Android's system Back would otherwise pop the whole
+    // onboarding modal while `shouldValidate` is still set. Run the same handler as the header Back button.
+    useAndroidBackButtonHandler(handleBackPress);
 
     const sendValidateCode = () => {
         if (!credentials?.login) {
@@ -88,9 +101,7 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi
         >
             <OnboardingHeader
                 shouldShowBackButton={!onboardingValues?.isMergingAccountBlocked}
-                onBackButtonPress={() => {
-                    updateOnboardingValuesAndNavigation(onboardingValues);
-                }}
+                onBackButtonPress={handleBackPress}
             />
             {onboardingValues?.isMergingAccountBlocked ? (
                 <View style={[styles.flex1, onboardingIsMediumOrLargerScreenWidth && styles.mt5, onboardingIsMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}>
diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
index 70ae987d1234..b553c5bd631c 100644
--- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
+++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx
@@ -27,7 +27,7 @@ import {expensifyLoginsSelector, isCurrentUserValidated} from '@libs/UserUtils';
 import {askToJoinPolicy, joinAccessiblePolicy} from '@userActions/Policy/Member';
 import {getAccessiblePolicies} from '@userActions/Policy/Policy';
 import {completeOnboarding} from '@userActions/Report';
-import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@userActions/Welcome';
+import {setOnboardingAdminsChatReportID, setOnboardingErrorMessage, setOnboardingPolicyID} from '@userActions/Welcome';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -35,7 +35,7 @@ import ROUTES from '@src/ROUTES';
 import type {JoinablePolicy} from '@src/types/onyx/JoinablePolicies';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-import {useFocusEffect} from '@react-navigation/native';
+import {useFocusEffect, useNavigationState} from '@react-navigation/native';
 import {hasSeenTourSelector} from '@selectors/Onboarding';
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
@@ -82,7 +82,9 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
     const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED);
     const isEmployerWithSubmit = onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.EMPLOYER;
     const autoCreateSubmitWorkspace = useAutoCreateSubmitWorkspace();
-    const shouldHideBackButton = onboardingValues?.shouldValidate === false && route.params?.backTo === ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute();
+    // Nothing in this stack to go back to. The work email merge and the private domain screen force-replace into this
+    // screen, so it is the only route there. `canGoBack()` can't answer this: it bubbles to the root stack.
+    const shouldHideBackButton = useNavigationState((state) => state.routes.length === 1);
 
     const finishOnboarding = (policy: JoinablePolicy) => {
         const isJoiningSubmitPolicy = policy.policyType === CONST.POLICY.TYPE.SUBMIT;
@@ -138,6 +140,7 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
             policyID: policyInfo.policyID,
             keyForList: policyInfo.policyID,
             isDisabled: true,
+            itemStyle: onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8, styles.cursorDefault] : [],
             rightElement: (
                 <ButtonDisabledWhenOffline
                     variant={CONST.BUTTON_VARIANT.SUCCESS}
@@ -182,6 +185,8 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
     }, [isLoadingJoinablePolicies, joinablePoliciesLoading, joinablePoliciesLength, defaultPolicy?.id, defaultPolicy?.name, defaultPolicy?.owner, defaultPolicy?.type, finishOnboarding]);
 
     const skipJoiningWorkspaces = () => {
+        setOnboardingErrorMessage(null);
+
         if (isEmployerWithSubmit) {
             autoCreateSubmitWorkspace(onboardingPersonalDetails?.firstName ?? '', onboardingPersonalDetails?.lastName ?? '');
             return;
@@ -210,7 +215,6 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
                 data={policyIDItems}
                 onSelectRow={() => {}}
                 ListItem={BareUserListItem}
-                style={{listItemWrapperStyle: onboardingIsMediumOrLargerScreenWidth ? [styles.pl8, styles.pr8, styles.cursorDefault] : []}}
                 shouldShowLoadingPlaceholder={isLoadingJoinablePolicies || !!joinablePoliciesLoading || policyIDItems.length === 0}
                 shouldStopPropagation
                 showScrollIndicator
diff --git a/src/pages/OnboardingWorkspaces/index.native.tsx b/src/pages/OnboardingWorkspaces/index.native.tsx
index 3ed1db77de5c..8e0e1167d491 100644
--- a/src/pages/OnboardingWorkspaces/index.native.tsx
+++ b/src/pages/OnboardingWorkspaces/index.native.tsx
@@ -1,3 +1,5 @@
+import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
+
 import React from 'react';
 
 import type {OnboardingWorkspacesProps} from './types';
@@ -5,6 +7,12 @@ import type {OnboardingWorkspacesProps} from './types';
 import BaseOnboardingWorkspaces from './BaseOnboardingWorkspaces';
 
 function OnboardingWorkspaces({...rest}: OnboardingWorkspacesProps) {
+    const {index: routeIndex} = rest.navigation.getState();
+
+    // Swallow system Back only when this is the first onboarding route, so it cannot pop the onboarding modal.
+    // Returning false on a later visit lets Navigation pop as normal.
+    useAndroidBackButtonHandler(() => routeIndex === 0);
+
     return (
         <BaseOnboardingWorkspaces
             shouldUseNativeStyles
diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.tsx b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
index cb70f83629e6..d61ed673625c 100644
--- a/src/pages/PrivateNotes/PrivateNotesListPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
@@ -1,6 +1,7 @@
 import {AttachmentContext} from '@components/AttachmentContext';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
@@ -51,19 +52,17 @@ function PrivateNotesListPage({report, accountID: sessionAccountID}: PrivateNote
      */
     function getMenuItem(item: NoteListItem) {
         return (
-            <AttachmentContext.Provider value={getAttachmentValue(item)}>
-                <MenuItemWithTopDescription
-                    key={item.title}
-                    description={item.title}
-                    title={item.note}
-                    onPress={item.action}
-                    shouldShowRightIcon={!item.disabled}
-                    numberOfLinesTitle={0}
-                    shouldRenderAsHTML
-                    brickRoadIndicator={item.brickRoadIndicator}
-                    disabled={item.disabled}
-                    shouldGreyOutWhenDisabled={false}
-                />
+            <AttachmentContext.Provider
+                key={item.accountID}
+                value={getAttachmentValue(item)}
+            >
+                <MenuItemFieldHTML
+                    name={item.title}
+                    value={item.note}
+                    onPress={item.disabled ? undefined : item.action}
+                >
+                    {!!item.brickRoadIndicator && <MenuItem.BrickRoadIndicator status={item.brickRoadIndicator} />}
+                </MenuItemFieldHTML>
             </AttachmentContext.Provider>
         );
     }
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index 91a982bb787a..47d906da812a 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -22,6 +22,7 @@ import useIsSupportalSession from '@hooks/useIsSupportalSession';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useSwitchToDelegator from '@hooks/useSwitchToDelegator';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -50,7 +51,7 @@ import {openAgentsPage} from '@userActions/Agent';
 import {openExternalLink} from '@userActions/Link';
 import {openPublicProfilePage} from '@userActions/PersonalDetails';
 import {hasErrorInPrivateNotes} from '@userActions/Report';
-import {isAnonymousUser as isAnonymousUserSession} from '@userActions/Session';
+import {callFunctionIfActionIsAllowed, isAnonymousUser as isAnonymousUserSession} from '@userActions/Session';
 
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -88,7 +89,7 @@ const reportsSelector = (reports: OnyxCollection<Report>) => mapOnyxCollectionIt
 
 function ProfilePage({route}: ProfilePageProps) {
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: reportsSelector});
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_METADATA);
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
@@ -97,7 +98,7 @@ function ProfilePage({route}: ProfilePageProps) {
     const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
     const switchToDelegator = useSwitchToDelegator();
     const guideCalendarLink = account?.guideDetails?.calendarLink ?? '';
-    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Bug', 'MagnifyingGlass', 'Pencil', 'Phone', 'UserPlus']);
+    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Bug', 'History', 'Pencil', 'Phone', 'UserPlus']);
     const accountID = Number(route.params?.accountID ?? CONST.DEFAULT_NUMBER_ID);
     const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const isCurrentUser = currentUserAccountID === accountID;
@@ -330,8 +331,8 @@ function ProfilePage({route}: ProfilePageProps) {
                         {!!accountID && !isAnonymousUserSession() && (
                             <MenuItem
                                 shouldShowRightIcon
-                                title={translate(isCustomAgent || isAgentEmail(login) ? 'profilePage.viewAgentHistory' : 'profilePage.viewMemberHistory')}
-                                icon={expensifyIcons.MagnifyingGlass}
+                                title={translate(isCustomAgent || isAgentEmail(login) ? 'profilePage.viewAgentHistory' : 'profilePage.seeChatHistory')}
+                                icon={expensifyIcons.History}
                                 onPress={() => {
                                     const query = buildQueryStringFromFilterFormValues({
                                         type: CONST.SEARCH.DATA_TYPES.CHAT,
@@ -351,15 +352,20 @@ function ProfilePage({route}: ProfilePageProps) {
                             />
                         )}
                         {Permissions.canUsePrivateNotes() && !isEmptyObject(report) && !!report.reportID && !isCurrentUser && (
-                            <MenuItem
-                                title={`${translate('privateNotes.title')}`}
-                                titleStyle={styles.flex1}
-                                icon={expensifyIcons.Pencil}
-                                onPress={() => navigateToPrivateNotes(report, currentUserAccountID, true)}
-                                wrapperStyle={styles.breakAll}
-                                shouldShowRightIcon
-                                brickRoadIndicator={hasErrorInPrivateNotes(report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            />
+                            <MenuItem.Root onPress={callFunctionIfActionIsAllowed(() => navigateToPrivateNotes(report, currentUserAccountID, true))}>
+                                <MenuItem.Row>
+                                    <MenuItem.Leading>
+                                        <MenuItem.Icon src={expensifyIcons.Pencil} />
+                                    </MenuItem.Leading>
+                                    <MenuItem.Content>
+                                        <MenuItem.Title>{translate('privateNotes.title')}</MenuItem.Title>
+                                    </MenuItem.Content>
+                                    <MenuItem.Trailing>
+                                        {hasErrorInPrivateNotes(report) && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                                        <MenuItem.Chevron />
+                                    </MenuItem.Trailing>
+                                </MenuItem.Row>
+                            </MenuItem.Root>
                         )}
                         {isConcierge && !!guideCalendarLink && (
                             <MenuItemAction
diff --git a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
index 80f4ba2a11df..62e44574cc30 100644
--- a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
@@ -11,6 +11,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTwoFactorAuthRoute from '@hooks/useTwoFactorAuthRoute';
 
@@ -18,6 +19,7 @@ import Navigation from '@navigation/Navigation';
 
 import {navigateToConciergeChat} from '@userActions/Report';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
@@ -34,13 +36,15 @@ function Finish() {
 
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {getTwoFactorAuthRoute} = useTwoFactorAuthRoute();
 
     const handleBackButtonPress = () => {
         Navigation.dismissModal();
     };
-    const handleNavigateToConciergeChat = () => navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: true});
+    const handleNavigateToConciergeChat = () =>
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: true});
 
     return (
         <ScreenWrapper
diff --git a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx
index b8290a1c42a0..ba6b6c3728e5 100644
--- a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx
+++ b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/ConnectBankAccount.tsx
@@ -8,6 +8,7 @@ import TextLink from '@components/TextLink';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useRootNavigationState from '@hooks/useRootNavigationState';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -56,11 +57,12 @@ function ConnectBankAccount({onBackButtonPress, setShouldShowConnectedVerifiedBa
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
     const handleNavigateToConciergeChat = () => {
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: true});
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: true});
     };
     const bankAccountState = reimbursementAccount?.achData?.state ?? '';
     const pendingAction = reimbursementAccount?.pendingAction;
diff --git a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx
index 830eb502cbc8..e1f53dd44121 100644
--- a/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx
+++ b/src/pages/ReimbursementAccount/USD/ConnectBankAccount/components/FinishChatCard.tsx
@@ -7,6 +7,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useResetBankAccountModal from '@hooks/useResetBankAccountModal';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -53,6 +54,7 @@ function FinishChatCard({requiresTwoFactorAuth, reimbursementAccount, policy, se
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
@@ -68,6 +70,7 @@ function FinishChatCard({requiresTwoFactorAuth, reimbursementAccount, policy, se
             introSelected,
             currentUserAccountID,
             isSelfTourViewed,
+            conciergePersonalDetails,
             shouldDismissModal: true,
             reportActionID: reimbursementAccount?.achData?.ACHRequestReportActionID,
         });
diff --git a/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx b/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx
index 18b1b5d7e8ce..ffa2ace762f7 100644
--- a/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx
+++ b/src/pages/ReimbursementAccount/USD/KYBDocuments/index.tsx
@@ -9,6 +9,7 @@ import UploadFile from '@components/UploadFile';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useReimbursementAccountSubmitCallback from '@hooks/useReimbursementAccountSubmitCallback';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -56,6 +57,7 @@ function KYBDocuments({onBackButtonPress, onSubmit}: KYBDocumentsProps) {
     const [reimbursementAccountDraft] = useOnyx(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM_DRAFT);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const reimbursementAccountVerificationData = reimbursementAccount?.achData?.verifications?.externalApiResponses;
@@ -68,6 +70,7 @@ function KYBDocuments({onBackButtonPress, onSubmit}: KYBDocumentsProps) {
             introSelected,
             currentUserAccountID,
             isSelfTourViewed,
+            conciergePersonalDetails,
             shouldDismissModal: true,
             reportActionID: reimbursementAccount?.achData?.ACHRequestReportActionID,
         });
diff --git a/src/pages/ReportSubmitToContent.tsx b/src/pages/ReportSubmitToContent.tsx
index 10a862929646..5d76af4b6c5c 100644
--- a/src/pages/ReportSubmitToContent.tsx
+++ b/src/pages/ReportSubmitToContent.tsx
@@ -17,6 +17,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -24,10 +25,11 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {search} from '@libs/actions/Search';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
-import {getSearchValueForPhoneOrEmail, getUserToInviteOption, sortAlphabetically} from '@libs/OptionsListUtils';
-import {getKnownAccountIDByLogin, getPersonalDetailsByID} from '@libs/PersonalDetailsUtils';
+import {getSearchValueForPhoneOrEmail, getUserToInviteOption} from '@libs/OptionsListUtils';
+import {getKnownAccountIDByLogin, getLoginByAccountID, getPersonalDetailsByID} from '@libs/PersonalDetailsUtils';
 import {getAccountIDForSubmitManagerEmail, getMemberAccountIDsForWorkspace, getSubmitToEmail} from '@libs/PolicyUtils';
 import {hasViolations as hasViolationsReportUtils, isExpenseReport, isMoneyRequestReportPendingDeletion} from '@libs/ReportUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 import {expensifyLoginsSelector} from '@libs/UserUtils';
 
@@ -38,7 +40,6 @@ import {searchUserInServer} from '@userActions/Report';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type Policy from '@src/types/onyx/Policy';
 import type Report from '@src/types/onyx/Report';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -93,9 +94,9 @@ function ReportSubmitToContent({
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const [delegateEmail] = useOnyx(ONYXKEYS.ACCOUNT, {selector: delegateEmailSelector});
     const delegateAccountID = useDelegateAccountID();
-    const [submitterLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(report?.ownerAccountID)});
     const [loginList] = useOnyx(ONYXKEYS.LOGINS, {selector: expensifyLoginsSelector});
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
+    const submitterLogin = getLoginByAccountID(report?.ownerAccountID, personalDetails);
     const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
diff --git a/src/pages/RequireTwoFactorAuthenticationOverlay.tsx b/src/pages/RequireTwoFactorAuthenticationOverlay.tsx
index 60015feb132d..2b7f7061b380 100644
--- a/src/pages/RequireTwoFactorAuthenticationOverlay.tsx
+++ b/src/pages/RequireTwoFactorAuthenticationOverlay.tsx
@@ -1,5 +1,6 @@
 import Button from '@components/Button';
 import FocusTrapForModal from '@components/FocusTrap/FocusTrapForModal';
+import GpsDraftDetailsRefSync from '@components/GpsDraftDetailsRefSync';
 import Icon from '@components/Icon';
 import Text from '@components/Text';
 
@@ -8,6 +9,7 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useRootNavigationState from '@hooks/useRootNavigationState';
 import useShouldShowRequire2FAPage from '@hooks/useShouldShowRequire2FAPage';
+import useSignOut from '@hooks/useSignOut';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTwoFactorAuthRoute from '@hooks/useTwoFactorAuthRoute';
 
@@ -23,11 +25,12 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import {emailSelector} from '@src/selectors/Session';
 import type {Policy} from '@src/types/onyx';
+import type GpsDraftDetails from '@src/types/onyx/GpsDraftDetails';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
 import {useNavigation} from '@react-navigation/core';
-import React, {useCallback, useEffect} from 'react';
+import React, {useCallback, useEffect, useRef, useState} from 'react';
 import {StyleSheet, View} from 'react-native';
 
 /**
@@ -58,6 +61,9 @@ function RequireTwoFactorAuthenticationOverlay() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {getTwoFactorAuthRoute} = useTwoFactorAuthRoute();
+    const {signOut, leaveDelegateAccount, isActingAsDelegate, isTrackingGPS} = useSignOut();
+    const gpsDraftDetailsRef = useRef<GpsDraftDetails | undefined>(undefined);
+    const [isEscapeInFlight, setIsEscapeInFlight] = useState(false);
     const [onboardingInitialPath] = useOnyx(ONYXKEYS.ONBOARDING_LAST_VISITED_PATH);
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
     const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING);
@@ -90,7 +96,18 @@ function RequireTwoFactorAuthenticationOverlay() {
         snapshotOnboardingResumePathIfNeeded();
     }, [shouldShowRequire2FAPage, isIn2FASetupFlow, snapshotOnboardingResumePathIfNeeded]);
 
-    const handleOnPress = () => {
+    const onEscapePress = () => {
+        if (isEscapeInFlight) {
+            return;
+        }
+        setIsEscapeInFlight(true);
+        const escapeAction = isActingAsDelegate ? leaveDelegateAccount({gpsDraftDetailsRef}) : signOut();
+        escapeAction.finally(() => {
+            setIsEscapeInFlight(false);
+        });
+    };
+
+    const enableTwoFactorAuth = () => {
         snapshotOnboardingResumePathIfNeeded();
         Navigation.navigate(getTwoFactorAuthRoute(ROUTES.SETTINGS_SECURITY, {forceSetup: true}));
     };
@@ -100,40 +117,52 @@ function RequireTwoFactorAuthenticationOverlay() {
     }
 
     return (
-        <FocusTrapForModal active>
-            <View
-                style={[StyleSheet.absoluteFill, styles.twoFARequiredOverlay]}
-                testID="RequireTwoFactorAuthenticationOverlay"
-            >
-                <View style={[styles.flex1, styles.appBG]}>
-                    <View style={styles.twoFARequiredContainer}>
-                        <View style={[styles.twoFAIllustration, styles.alignItemsCenter]}>
-                            <Icon
-                                src={illustrations.Encryption}
-                                width={variables.twoFAIconHeight}
-                                height={variables.twoFAIconHeight}
-                            />
-                        </View>
-                        <View style={[styles.mt2, styles.mh5, styles.dFlex, styles.alignItemsCenter]}>
-                            <View style={styles.mb5}>
-                                <Text style={[styles.textHeadlineH1, styles.textAlignCenter, styles.mv2]}>{translate('twoFactorAuth.twoFactorAuthIsRequiredForAdminsHeader')}</Text>
-                                <Text style={[styles.textSupporting, styles.textAlignCenter]}>
-                                    {translate(is2FARequiredBecauseOfXero ? 'twoFactorAuth.twoFactorAuthIsRequiredXero' : 'twoFactorAuth.twoFactorAuthIsRequiredCompany')}
-                                </Text>
+        <>
+            {isActingAsDelegate && isTrackingGPS && <GpsDraftDetailsRefSync gpsDraftDetailsRef={gpsDraftDetailsRef} />}
+            <FocusTrapForModal active>
+                <View
+                    style={[StyleSheet.absoluteFill, styles.twoFARequiredOverlay]}
+                    testID="RequireTwoFactorAuthenticationOverlay"
+                >
+                    <View style={[styles.flex1, styles.appBG]}>
+                        <View style={styles.twoFARequiredContainer}>
+                            <View style={[styles.twoFAIllustration, styles.alignItemsCenter]}>
+                                <Icon
+                                    src={illustrations.Encryption}
+                                    width={variables.twoFAIconHeight}
+                                    height={variables.twoFAIconHeight}
+                                />
+                            </View>
+                            <View style={[styles.mt2, styles.mh5, styles.dFlex, styles.alignItemsCenter]}>
+                                <View style={styles.mb5}>
+                                    <Text style={[styles.textHeadlineH1, styles.textAlignCenter, styles.mv2]}>{translate('twoFactorAuth.twoFactorAuthIsRequiredForAdminsHeader')}</Text>
+                                    <Text style={[styles.textSupporting, styles.textAlignCenter]}>
+                                        {translate(is2FARequiredBecauseOfXero ? 'twoFactorAuth.twoFactorAuthIsRequiredXero' : 'twoFactorAuth.twoFactorAuthIsRequiredCompany')}
+                                    </Text>
+                                </View>
+                                <View style={[styles.flexRow, styles.gap2, styles.justifyContentCenter, styles.alignSelfCenter]}>
+                                    <Button
+                                        size={CONST.BUTTON_SIZE.LARGE}
+                                        isLoading={isEscapeInFlight}
+                                        onPress={onEscapePress}
+                                    >
+                                        <Button.Text>{translate(isActingAsDelegate ? 'delegate.leaveAccount' : 'initialSettingsPage.signOut')}</Button.Text>
+                                    </Button>
+                                    <Button
+                                        size={CONST.BUTTON_SIZE.LARGE}
+                                        variant={CONST.BUTTON_VARIANT.SUCCESS}
+                                        onPress={enableTwoFactorAuth}
+                                    >
+                                        <Button.KeyboardShortcut />
+                                        <Button.Text>{translate('twoFactorAuth.enable2FA')}</Button.Text>
+                                    </Button>
+                                </View>
                             </View>
-                            <Button
-                                size={CONST.BUTTON_SIZE.LARGE}
-                                variant={CONST.BUTTON_VARIANT.SUCCESS}
-                                onPress={handleOnPress}
-                            >
-                                <Button.KeyboardShortcut />
-                                <Button.Text>{translate('twoFactorAuth.enableTwoFactorAuth')}</Button.Text>
-                            </Button>
                         </View>
                     </View>
                 </View>
-            </View>
-        </FocusTrapForModal>
+            </FocusTrapForModal>
+        </>
     );
 }
 
diff --git a/src/pages/ScheduleCall/ScheduleCallConfirmationPage.tsx b/src/pages/ScheduleCall/ScheduleCallConfirmationPage.tsx
index f5d2163fc9cd..805daea38e34 100644
--- a/src/pages/ScheduleCall/ScheduleCallConfirmationPage.tsx
+++ b/src/pages/ScheduleCall/ScheduleCallConfirmationPage.tsx
@@ -5,7 +5,6 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItem from '@components/MenuItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import MenuItemWithLabel from '@components/MenuItem/presets/MenuItemWithLabel';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import ReportActionAvatars from '@components/ReportActionAvatars';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -126,12 +125,10 @@ function ScheduleCallConfirmationPage() {
                             </MenuItem.Content>
                         </MenuItem.Row>
                     </MenuItemWithLabel>
-                    <MenuItemWithTopDescription
-                        title={dateTimeString}
-                        description={translate('scheduledCall.confirmation.dateTime')}
-                        shouldTruncateTitle={false}
-                        numberOfLinesTitle={2}
-                        shouldShowRightIcon
+                    <MenuItemField
+                        name={translate('scheduledCall.confirmation.dateTime')}
+                        value={dateTimeString}
+                        numberOfLinesValue={2}
                         onPress={() => {
                             if (!route?.params?.reportID) {
                                 return;
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 585c44834169..3d350a55b391 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -1,13 +1,16 @@
 import ColumnsSettingsList from '@components/ColumnsSettingsList';
-import {useSearchQueryContext} from '@components/Search/SearchContext';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import useSearchColumnsToShow from '@components/Search/hooks/useSearchColumnsToShow';
+import {useSearchQueryContext, useSearchResultsContext} from '@components/Search/SearchContext';
 import type {SearchCustomColumnIds} from '@components/Search/types';
 
 import useIsVendorColumnAvailable from '@hooks/useIsVendorColumnAvailable';
+import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 
 import Navigation from '@libs/Navigation/Navigation';
 import {buildQueryStringFromFilterFormValues, getCurrentSearchQueryJSON, hasValuesIncludeViolationFilter} from '@libs/SearchQueryUtils';
-import {getCustomColumnDefault, getCustomColumns, insertColumnBeforeTotalAmount} from '@libs/SearchUIUtils';
+import {getCustomColumnDefault, getCustomColumns, getValidGroupBy, insertColumnBeforeTotalAmount, isSearchDataLoaded} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -18,7 +21,9 @@ import React from 'react';
 
 function SearchColumnsPage() {
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
-    const {currentSearchKey} = useSearchQueryContext();
+    const {currentSearchKey, currentSearchQueryJSON} = useSearchQueryContext();
+    const {currentSearchResults, shouldUseLiveData} = useSearchResultsContext();
+    const {isOffline} = useNetwork();
     const isVendorColumnAvailable = useIsVendorColumnAvailable();
 
     const groupBy = searchAdvancedFiltersForm?.groupBy;
@@ -35,7 +40,7 @@ function SearchColumnsPage() {
     const allGroupCustomColumns = getCustomColumns(groupBy);
     const defaultGroupCustomColumns = getCustomColumnDefault(groupBy);
     const defaultTypeCustomColumns = [...getCustomColumnDefault(queryType)];
-    const currentColumns = [...(searchAdvancedFiltersForm?.columns ?? [])].filter(isColumnAvailable);
+    const savedColumns = [...(searchAdvancedFiltersForm?.columns ?? [])].filter(isColumnAvailable);
 
     // We need at least one element with flex1 in the table to ensure the table looks good in the UI, so we don't allow removing the total columns
     // since it makes sense for them to show up in an expense management App and it fixes the layout issues.
@@ -58,11 +63,42 @@ function SearchColumnsPage() {
     if (shouldRequireViolationsColumn) {
         requiredColumns.add(CONST.SEARCH.TABLE_COLUMNS.VIOLATIONS);
         insertColumnBeforeTotalAmount(defaultTypeCustomColumns, CONST.SEARCH.TABLE_COLUMNS.VIOLATIONS);
-        if (currentColumns.length > 0) {
-            insertColumnBeforeTotalAmount(currentColumns, CONST.SEARCH.TABLE_COLUMNS.VIOLATIONS);
+        if (savedColumns.length > 0) {
+            insertColumnBeforeTotalAmount(savedColumns, CONST.SEARCH.TABLE_COLUMNS.VIOLATIONS);
         }
     }
 
+    // With no saved selection the table derives its columns from the data (e.g. Description shows up as soon
+    // as one expense has one), so seed the picker from that same set. Seeding from the static default list
+    // instead would show those columns as unchecked while the table renders them, and saving would pin the
+    // static list rather than what is on screen.
+    //
+    // The seed comes from the same hook the table uses, reading the query and the snapshot rather than the
+    // advanced-filters form. The form is only a mirror of the query and stops being written while category
+    // data loads, so it can still describe the previous search while the new snapshot is already rendered.
+    //
+    // Nothing to seed when the user already has a saved selection, and nothing to seed for a grouped search
+    // either: the table renders only GROUP_* columns there, none of which are selectable in this picker.
+    // Passing no snapshot keeps ColumnsSettingsList on its own group-defaults fallback instead of handing it
+    // an empty type-column selection.
+    const shouldSeedFromTable = savedColumns.length === 0 && !getValidGroupBy(currentSearchQueryJSON?.groupBy);
+    const tableColumns = useSearchColumnsToShow(currentSearchQueryJSON, shouldSeedFromTable ? currentSearchResults : undefined);
+    const selectableColumns = new Set<string>(allTypeCustomColumns);
+    const renderedColumns = tableColumns.filter((column): column is SearchCustomColumnIds => selectableColumns.has(column));
+
+    const currentColumns = savedColumns.length > 0 ? savedColumns : renderedColumns;
+
+    // A sort swaps in a new snapshot that has no data until the server responds, while the table keeps showing
+    // the previous rows. ColumnsSettingsList only reads its seed on mount, so wait for the snapshot instead of
+    // seeding from the static defaults and letting a Save pin them.
+    const isSeedPending =
+        shouldSeedFromTable &&
+        !isOffline &&
+        !shouldUseLiveData &&
+        !!currentSearchQueryJSON &&
+        !currentSearchResults?.data &&
+        !isSearchDataLoaded(currentSearchResults, currentSearchQueryJSON);
+
     const applyChanges = (selectedColumnIds: SearchCustomColumnIds[]) => {
         const updatedAdvancedFilters: Partial<SearchAdvancedFiltersForm> = {
             ...searchAdvancedFiltersForm,
@@ -80,6 +116,10 @@ function SearchColumnsPage() {
         Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString, searchKey: currentSearchKey}), {forceReplace: true});
     };
 
+    if (isSeedPending) {
+        return <FullScreenLoadingIndicator shouldUseGoBackButton />;
+    }
+
     return (
         <ColumnsSettingsList
             allColumns={allTypeCustomColumns}
diff --git a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
index 6b1e352396ad..96aeb07420a9 100644
--- a/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
+++ b/src/pages/Search/SearchEditMultiple/SearchEditMultiplePage.tsx
@@ -1,6 +1,7 @@
 import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -14,12 +15,14 @@ import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearBulkEditDraftTransaction, updateMultipleMoneyRequests} from '@libs/actions/IOU/BulkEdit';
 import Navigation from '@libs/Navigation/Navigation';
 import {hasEnabledOptions} from '@libs/OptionsListUtils';
+import Parser from '@libs/Parser';
 import {getCleanedTagName, getTagLists, hasDependentTags as hasDependentTagsPolicyUtils} from '@libs/PolicyUtils';
 import {canEditFieldOfMoneyRequest, isInvoiceReport, isIOUReport, isReportApproved, isSettled} from '@libs/ReportUtils';
 import {getSearchBulkEditPolicyID} from '@libs/SearchUIUtils';
@@ -38,8 +41,6 @@ import {
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Route} from '@src/ROUTES';
-import {personalDetailsListSelector} from '@src/selectors/PersonalDetails';
 import type {TransactionChanges} from '@src/types/onyx/Transaction';
 
 import type {ValueOf} from 'type-fest';
@@ -81,14 +82,12 @@ function SearchEditMultiplePage() {
     const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
     const [allPolicyCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES);
     const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
-    const [personalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsListSelector(
-            selectedTransactionIDs.map((transactionID) => {
-                const iouReportID = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID;
-                return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`]?.ownerAccountID;
-            }),
-        ),
-    });
+    const [personalDetailsList] = usePersonalDetailsByIDs(
+        selectedTransactionIDs.map((transactionID) => {
+            const iouReportID = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.reportID;
+            return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`]?.ownerAccountID;
+        }),
+    );
 
     const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
@@ -284,32 +283,6 @@ function SearchEditMultiplePage() {
     const tagsArray = getTagArrayFromName(draftTransaction?.tag ?? '');
     const hasDependentTags = hasDependentTagsPolicyUtils(policy, policyTags);
     const shouldShowTagList = hasDependentTags ? getDependentTagVisibility(policyTagLists, draftTransaction?.tag) : [];
-    const tagFields: Array<{description: string; title: string; route: Route; disabled?: boolean}> = areTagsEnabled
-        ? policyTagLists.flatMap((tagList, tagListIndex) => {
-              const tagName = tagsArray.at(tagListIndex) ?? '';
-              const tagTitle = tagName ? getCleanedTagName(tagName) : '';
-              const description = tagList.name || translate('common.tag');
-              let shouldShow = true;
-
-              if (hasDependentTags) {
-                  shouldShow = !!shouldShowTagList.at(tagListIndex);
-              }
-
-              if (!shouldShow) {
-                  return [];
-              }
-
-              return [
-                  {
-                      description: description || translate('common.tag'),
-                      title: tagTitle,
-                      route: ROUTES.SEARCH_EDIT_MULTIPLE_TAG_RHP.getRoute(tagListIndex),
-                      disabled: false,
-                  },
-              ];
-          })
-        : [];
-
     const getBooleanTitle = (value?: boolean) => {
         if (value === undefined) {
             return '';
@@ -317,82 +290,11 @@ function SearchEditMultiplePage() {
         return value ? translate('common.yes') : translate('common.no');
     };
 
-    const fields: Array<{description: string; title: string; route: Route; disabled?: boolean; shouldParseTitle?: boolean}> = [
-        {
-            description: translate('iou.amount'),
-            title: draftTransaction?.amount !== undefined ? convertToDisplayStringWithoutCurrency(draftTransaction.amount, currency) : '',
-            route: ROUTES.SEARCH_EDIT_MULTIPLE_AMOUNT_RHP,
-            disabled: hasCustomUnitTransaction || hasPartiallyEditableTransaction || hasSplitTransaction,
-        },
-        {
-            description: translate('common.description'),
-            title: draftTransaction?.comment?.comment ?? '',
-            route: ROUTES.SEARCH_EDIT_MULTIPLE_DESCRIPTION_RHP,
-            shouldParseTitle: true,
-        },
-        {
-            description: translate('common.merchant'),
-            title: draftTransaction?.merchant ?? '',
-            route: ROUTES.SEARCH_EDIT_MULTIPLE_MERCHANT_RHP,
-            disabled: hasPartiallyEditableMerchantTransaction,
-        },
-        {
-            description: translate('common.date'),
-            title: draftTransaction?.created ?? '',
-            route: ROUTES.SEARCH_EDIT_MULTIPLE_DATE_RHP,
-            disabled: hasPartiallyEditableDateTransaction,
-        },
-        ...(areCategoriesEnabled
-            ? [
-                  {
-                      description: translate('common.category'),
-                      title: draftTransaction?.category ?? '',
-                      route: ROUTES.SEARCH_EDIT_MULTIPLE_CATEGORY_RHP,
-                  },
-              ]
-            : []),
-        ...tagFields,
-        ...(isTaxTrackingEnabled
-            ? [
-                  {
-                      description: policy?.taxRates?.name ?? translate('common.tax'),
-                      title: draftTransaction?.taxCode ? (getTaxName(policy, draftTransaction) ?? '') : '',
-                      route: ROUTES.SEARCH_EDIT_MULTIPLE_TAX_RHP,
-                      disabled: hasPartiallyEditableTaxRateTransaction || hasSplitTransaction,
-                  },
-              ]
-            : []),
-        ...(areSelectedTransactionsBillable
-            ? [
-                  {
-                      description: translate('common.billable'),
-                      title: getBooleanTitle(draftTransaction?.billable),
-                      route: ROUTES.SEARCH_EDIT_MULTIPLE_BILLABLE_RHP,
-                      disabled: isFieldDisabledForAnyTransaction(CONST.EDIT_REQUEST_FIELD.BILLABLE),
-                  },
-              ]
-            : []),
-        ...(areSelectedTransactionsReimbursable
-            ? [
-                  {
-                      description: translate('common.reimbursable'),
-                      title: getBooleanTitle(draftTransaction?.reimbursable),
-                      route: ROUTES.SEARCH_EDIT_MULTIPLE_REIMBURSABLE_RHP,
-                      disabled: hasPartiallyEditableReimbursableTransaction,
-                  },
-              ]
-            : []),
-        ...(areAttendeesEnabled
-            ? [
-                  {
-                      description: translate('iou.attendees'),
-                      title: draftTransaction?.comment?.attendees?.length ? getAttendeesListDisplayString(draftTransaction.comment.attendees, localeCompare) : '',
-                      route: ROUTES.SEARCH_EDIT_MULTIPLE_ATTENDEES_RHP,
-                      disabled: isFieldDisabledForAnyTransaction(CONST.EDIT_REQUEST_FIELD.ATTENDEES),
-                  },
-              ]
-            : []),
-    ];
+    const isAmountDisabled = hasCustomUnitTransaction || hasPartiallyEditableTransaction || hasSplitTransaction;
+    const isTaxDisabled = hasPartiallyEditableTaxRateTransaction || hasSplitTransaction;
+    const isBillableDisabled = isFieldDisabledForAnyTransaction(CONST.EDIT_REQUEST_FIELD.BILLABLE);
+    const isAttendeesDisabled = isFieldDisabledForAnyTransaction(CONST.EDIT_REQUEST_FIELD.ATTENDEES);
+    const description = draftTransaction?.comment?.comment;
 
     return (
         <ScreenWrapper
@@ -406,18 +308,83 @@ function SearchEditMultiplePage() {
             <View style={[styles.flex1]}>
                 <ScrollView contentContainerStyle={styles.flexGrow1}>
                     <Text style={[styles.ph5, styles.mb5, styles.textSupporting]}>{translate('search.bulkActions.editMultipleDescription')}</Text>
-                    {fields.map((field) => (
-                        <MenuItemWithTopDescription
-                            key={field.route}
-                            title={field.title}
-                            description={field.description}
-                            onPress={() => Navigation.navigate(field.route)}
-                            shouldShowRightIcon={!field.disabled}
-                            disabled={field.disabled}
-                            interactive={!field.disabled}
-                            shouldParseTitle={field.shouldParseTitle}
+                    <MenuItemField
+                        name={translate('iou.amount')}
+                        value={draftTransaction?.amount !== undefined ? convertToDisplayStringWithoutCurrency(draftTransaction.amount, currency) : ''}
+                        onPress={isAmountDisabled ? undefined : () => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_AMOUNT_RHP)}
+                        isDisabled={isAmountDisabled}
+                    />
+                    <MenuItemFieldHTML
+                        name={translate('common.description')}
+                        value={description ? Parser.replace(description) : undefined}
+                        onPress={() => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_DESCRIPTION_RHP)}
+                    />
+                    <MenuItemField
+                        name={translate('common.merchant')}
+                        value={draftTransaction?.merchant}
+                        onPress={hasPartiallyEditableMerchantTransaction ? undefined : () => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_MERCHANT_RHP)}
+                        isDisabled={hasPartiallyEditableMerchantTransaction}
+                    />
+                    <MenuItemField
+                        name={translate('common.date')}
+                        value={draftTransaction?.created}
+                        onPress={hasPartiallyEditableDateTransaction ? undefined : () => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_DATE_RHP)}
+                        isDisabled={hasPartiallyEditableDateTransaction}
+                    />
+                    {areCategoriesEnabled && (
+                        <MenuItemField
+                            name={translate('common.category')}
+                            value={draftTransaction?.category}
+                            onPress={() => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_CATEGORY_RHP)}
+                        />
+                    )}
+                    {areTagsEnabled &&
+                        policyTagLists.map((tagList, tagListIndex) => {
+                            if (hasDependentTags && !shouldShowTagList.at(tagListIndex)) {
+                                return null;
+                            }
+                            const tagName = tagsArray.at(tagListIndex) ?? '';
+                            return (
+                                <MenuItemField
+                                    key={tagList.name}
+                                    name={tagList.name || translate('common.tag')}
+                                    value={tagName ? getCleanedTagName(tagName) : ''}
+                                    onPress={() => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_TAG_RHP.getRoute(tagListIndex))}
+                                />
+                            );
+                        })}
+                    {isTaxTrackingEnabled && (
+                        <MenuItemField
+                            name={policy?.taxRates?.name ?? translate('common.tax')}
+                            value={draftTransaction?.taxCode ? getTaxName(policy, draftTransaction) : ''}
+                            onPress={isTaxDisabled ? undefined : () => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_TAX_RHP)}
+                            isDisabled={isTaxDisabled}
+                        />
+                    )}
+                    {areSelectedTransactionsBillable && (
+                        <MenuItemField
+                            name={translate('common.billable')}
+                            value={getBooleanTitle(draftTransaction?.billable)}
+                            onPress={isBillableDisabled ? undefined : () => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_BILLABLE_RHP)}
+                            isDisabled={isBillableDisabled}
+                        />
+                    )}
+                    {areSelectedTransactionsReimbursable && (
+                        <MenuItemField
+                            name={translate('common.reimbursable')}
+                            value={getBooleanTitle(draftTransaction?.reimbursable)}
+                            onPress={hasPartiallyEditableReimbursableTransaction ? undefined : () => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_REIMBURSABLE_RHP)}
+                            isDisabled={hasPartiallyEditableReimbursableTransaction}
+                        />
+                    )}
+                    {areAttendeesEnabled && (
+                        <MenuItemField
+                            name={translate('iou.attendees')}
+                            value={draftTransaction?.comment?.attendees?.length ? getAttendeesListDisplayString(draftTransaction.comment.attendees, localeCompare) : ''}
+                            onPress={isAttendeesDisabled ? undefined : () => Navigation.navigate(ROUTES.SEARCH_EDIT_MULTIPLE_ATTENDEES_RHP)}
+                            isDisabled={isAttendeesDisabled}
                         />
-                    ))}
+                    )}
                 </ScrollView>
                 <Button
                     variant={CONST.BUTTON_VARIANT.SUCCESS}
diff --git a/src/pages/Search/SearchEditMultiple/SearchEditMultipleTagPage.tsx b/src/pages/Search/SearchEditMultiple/SearchEditMultipleTagPage.tsx
index 738c39c5012e..87ab82d502fe 100644
--- a/src/pages/Search/SearchEditMultiple/SearchEditMultipleTagPage.tsx
+++ b/src/pages/Search/SearchEditMultiple/SearchEditMultipleTagPage.tsx
@@ -39,21 +39,23 @@ function SearchEditMultipleTagPage() {
     const selectedTransactions = selectedTransactionIDs.map((transactionID) => allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]);
     const commonDependentTag = getCommonDependentTag(selectedTransactions);
     const draftTag = draftTransaction?.tag;
-    const transactionTag = draftTag === undefined ? (commonDependentTag ?? '') : draftTag;
-    const currentTag = getTagArrayFromName(draftTag ?? '').at(tagListIndex) ?? '';
     const hasDependentTags = hasDependentTagsPolicyUtils(policy, policyTags);
 
+    // Only prefill dependent tags. Their child tags need the selected parent.
+    // Leave independent tag lists empty until the user selects a tag.
+    const autoSelectedTag = hasDependentTags ? (commonDependentTag ?? '') : '';
+    const transactionTag = draftTag === undefined ? autoSelectedTag : draftTag;
+    const currentTag = getTagArrayFromName(draftTag ?? '').at(tagListIndex) ?? '';
+
     const tagListName = getTagList(policyTags, tagListIndex).name;
     const headerTitle = tagListName || translate('common.tag');
 
     const saveTag = (item: Partial<OptionData>) => {
         const selectedTagName = item.searchText ?? '';
-        // Tapping the value already committed in this draft means the user is clearing the level.
-        // getUpdatedTransactionTag resolves the same thing internally for the displayed tag, but the
-        // intent has to be resolved again here because apply time replays each recorded intent with an
-        // empty currentTag. A raw tag name would read as a fresh selection there and re-add the level
-        // the user just cleared, so record an empty value to carry the clear through.
+
+        // Tapping the value that's already set on this level clears it.
         const isDeselecting = selectedTagName === currentTag;
+        const recordedTagChanges = draftTransaction?.bulkEditTagChanges ?? {};
 
         const updatedTag = getUpdatedTransactionTag({
             transactionTag,
@@ -65,14 +67,15 @@ function SearchEditMultipleTagPage() {
             hasMultipleTagLists: policy?.hasMultipleTagLists ?? false,
         });
 
-        // Record the per-level edit intent. For dependent tags, editing this level invalidates every
-        // deeper (child) level, so drop any child intents previously recorded in the same draft. The
-        // draft is merged, so without this a stale child edit would be replayed after this parent change
-        // at apply time and re-add a child that no longer belongs under the newly selected parent, even
-        // though the displayed updatedTag above already cleared it. Independent tags keep every level.
-        const bulkEditTagChanges: Record<string, string | null> = {[tagListIndex]: isDeselecting ? '' : selectedTagName};
+        // If the user picks and then removes a tag before saving, do not save a change.
+        // Otherwise, remove the tag.
+        const isUndoingOwnPick = isDeselecting && recordedTagChanges[tagListIndex] === currentTag;
+        const deselectValue = isUndoingOwnPick ? null : '';
+        const bulkEditTagChanges: Record<string, string | null> = {[tagListIndex]: isDeselecting ? deselectValue : selectedTagName};
+
+        // For dependent tags, changing a level makes the deeper ones stale, so clear any child intents still in the draft before they get replayed.
         if (hasDependentTags) {
-            for (const recordedIndex of Object.keys(draftTransaction?.bulkEditTagChanges ?? {})) {
+            for (const recordedIndex of Object.keys(recordedTagChanges)) {
                 if (Number(recordedIndex) <= tagListIndex) {
                     continue;
                 }
@@ -81,8 +84,7 @@ function SearchEditMultipleTagPage() {
         }
 
         updateBulkEditDraftTransaction({
-            // Keep the flattened tag for the summary display, and record the per-level edit intent so
-            // apply time can merge it into each transaction's own tag instead of overwriting all levels.
+            // tag is only for display here, bulkEditTagChanges is what drives the save.
             tag: updatedTag,
             bulkEditTagChanges,
         });
diff --git a/src/pages/Search/SearchHoldReasonPage.tsx b/src/pages/Search/SearchHoldReasonPage.tsx
index 72567d38b727..30702e2c52a9 100644
--- a/src/pages/Search/SearchHoldReasonPage.tsx
+++ b/src/pages/Search/SearchHoldReasonPage.tsx
@@ -9,6 +9,7 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import useTransactionsByID from '@hooks/useTransactionsByID';
 
 import {clearErrorFields, clearErrors} from '@libs/actions/FormActions';
 import {putOnHold, putTransactionsOnHold} from '@libs/actions/IOU/Hold';
@@ -47,6 +48,7 @@ function SearchHoldReasonPage({route}: SearchHoldReasonPageProps) {
 
     const relevantTransactionIDs = useMemo(() => (isBulkHold ? selectedTransactionIDs : Object.keys(selectedTransactions)), [isBulkHold, selectedTransactionIDs, selectedTransactions]);
     const [selectedTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, {selector: transactionViolationsByIDsSelector(relevantTransactionIDs)});
+    const [relevantTransactions] = useTransactionsByID(relevantTransactionIDs);
     const {isOffline} = useNetwork();
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {
         selector: isTrackIntentUserSelector,
@@ -66,36 +68,42 @@ function SearchHoldReasonPage({route}: SearchHoldReasonPageProps) {
                 return;
             }
             if (isBulkHold) {
-                putTransactionsOnHold(
-                    selectedTransactionIDs,
+                putTransactionsOnHold({
+                    transactionsID: selectedTransactionIDs,
                     comment,
                     reportID,
                     isOffline,
-                    currentUserLogin ?? '',
+                    currentUserLogin: currentUserLogin ?? '',
                     currentUserAccountID,
-                    selectedTransactionViolations,
+                    allTransactionViolations: selectedTransactionViolations,
+                    transactions: relevantTransactions,
                     isTrackIntentUser,
                     delegateAccountID,
-                    {rules, ancestors},
-                );
+                    rules,
+                    ancestors,
+                });
                 clearSelectedTransactions(true);
             } else {
                 const transactionIDs = Object.keys(selectedTransactions);
                 for (const transactionID of transactionIDs) {
                     const transactionThreadReportID = selectedTransactions[transactionID].reportAction?.childReportID;
                     const transactionViolations = selectedTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
-                    putOnHold(
+                    const transaction = relevantTransactions.find((t) => t.transactionID === transactionID) ?? selectedTransactions[transactionID].transaction;
+
+                    putOnHold({
                         transactionID,
+                        transaction,
                         comment,
-                        transactionThreadReportID,
+                        initialReportID: transactionThreadReportID,
                         isOffline,
-                        currentUserLogin ?? '',
+                        currentUserLogin: currentUserLogin ?? '',
                         currentUserAccountID,
                         transactionViolations,
                         isTrackIntentUser,
                         delegateAccountID,
-                        {rules, ancestors},
-                    );
+                        rules,
+                        ancestors,
+                    });
                 }
                 clearSelectedTransactions();
             }
@@ -109,15 +117,16 @@ function SearchHoldReasonPage({route}: SearchHoldReasonPageProps) {
             selectedTransactionIDs,
             reportID,
             isOffline,
-            ancestors,
-            clearSelectedTransactions,
-            selectedTransactions,
             currentUserLogin,
             currentUserAccountID,
             selectedTransactionViolations,
+            relevantTransactions,
             isTrackIntentUser,
             delegateAccountID,
             rules,
+            ancestors,
+            clearSelectedTransactions,
+            selectedTransactions,
         ],
     );
 
diff --git a/src/pages/Search/SearchReportsMergeReports.tsx b/src/pages/Search/SearchReportsMergeReports.tsx
index 8dbe6c83e44b..05dc453833e4 100644
--- a/src/pages/Search/SearchReportsMergeReports.tsx
+++ b/src/pages/Search/SearchReportsMergeReports.tsx
@@ -48,6 +48,7 @@ function SearchMergeReports() {
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [selfDMReportID] = useOnyx(ONYXKEYS.SELF_DM_REPORT_ID);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`);
 
     const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
@@ -176,6 +177,7 @@ function SearchMergeReports() {
             allReportsTransactions,
             bankAccountList,
             rules,
+            cardList,
             hash: currentSearchHash,
             isTrackIntentUser,
             personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
@@ -219,7 +221,6 @@ function SearchMergeReports() {
                 data={reportItems}
                 onSelectRow={onSelection}
                 ListItem={SearchMergeReportsListItem}
-                isRowMultilineSupported
                 shouldSingleExecuteRowSelect
                 canSelectMultiple={false}
                 footerContent={
diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx
index 145ea72dda54..133b7af101c3 100644
--- a/src/pages/Search/SearchTransactionsChangeReport.tsx
+++ b/src/pages/Search/SearchTransactionsChangeReport.tsx
@@ -93,6 +93,7 @@ function SearchTransactionsChangeReport() {
     const reports = useChangeTransactionsReportReports(transactions, undefined);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
     const isVendorMatchingBetaEnabled = isBetaEnabledOrUnknown(CONST.BETAS.VENDOR_MATCHING);
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
@@ -200,6 +201,7 @@ function SearchTransactionsChangeReport() {
                 allTransactionViolation: transactionViolations,
                 reports: reportsForCall,
                 rules,
+                cardList,
                 isTrackIntentUser,
                 personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
                 selfDMReportActions,
@@ -303,6 +305,7 @@ function SearchTransactionsChangeReport() {
             allTransactionViolation: transactionViolations,
             reports: reportsForCall,
             rules,
+            cardList,
             isTrackIntentUser,
             personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
             selfDMReportActions,
@@ -343,6 +346,7 @@ function SearchTransactionsChangeReport() {
             allTransactionViolation: transactionViolations,
             reports,
             rules,
+            cardList,
             isTrackIntentUser,
             personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
             selfDMReportActions,
diff --git a/src/pages/Share/ShareTab.tsx b/src/pages/Share/ShareTab.tsx
index 9b41c0208569..20e568250960 100644
--- a/src/pages/Share/ShareTab.tsx
+++ b/src/pages/Share/ShareTab.tsx
@@ -1,3 +1,4 @@
+import {useActivePolicyContext} from '@components/ActivePolicyProvider';
 import {usePersonalDetails} from '@components/OnyxListItemProvider';
 import SelectionList from '@components/SelectionList';
 import InviteMemberListItem from '@components/SelectionList/ListItem/InviteMemberListItem';
@@ -42,7 +43,7 @@ const defaultListOptions = {
 function ShareTab() {
     const styles = useThemeStyles();
     const {translate, dateFnsLocale} = useLocalize();
-    const {convertToDisplayString} = useCurrencyListActions();
+    const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
     const {isOffline} = useNetwork();
     const [textInputValue, debouncedTextInputValue, setTextInputValue] = useDebouncedState('');
     const {isBetaEnabled} = usePermissions();
@@ -50,6 +51,7 @@ function ShareTab() {
     const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
     const [loginList] = useOnyx(ONYXKEYS.LOGINS, {selector: expensifyLoginsSelector});
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const {activePolicyID} = useActivePolicyContext();
     const [draftComments] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT);
     const [visibleReportActionsData] = useOnyx(ONYXKEYS.DERIVED.VISIBLE_REPORT_ACTIONS);
     const sortedReportActionsData = useSortedReportActionsData();
@@ -82,6 +84,7 @@ function ShareTab() {
         ? getSearchOptions({
               dateFnsLocale,
               convertToDisplayString,
+              convertToDisplayStringWithoutCurrency,
               options: listOptions ?? {reports: [], personalDetails: []},
               draftComments,
               isDefaultRoomsBetaEnabled: isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
@@ -110,7 +113,7 @@ function ShareTab() {
     if (textInputValue.trim() === '') {
         recentReportsOptions = optionsOrderBy(searchOptions.recentReports, recentReportComparator, 20).options;
     } else {
-        const orderedOptions = combineOrderingOfReportsAndPersonalDetails(searchOptions, textInputValue, {
+        const orderedOptions = combineOrderingOfReportsAndPersonalDetails(searchOptions, textInputValue, activePolicyID, {
             sortByReportTypeInSearch: true,
             preferChatRoomsOverThreads: true,
         });
diff --git a/src/pages/Share/SubmitDetailsPage.tsx b/src/pages/Share/SubmitDetailsPage.tsx
index 43a398f6bbdc..6b2f875dfbe0 100644
--- a/src/pages/Share/SubmitDetailsPage.tsx
+++ b/src/pages/Share/SubmitDetailsPage.tsx
@@ -32,6 +32,7 @@ import {
     updateLastLocationPermissionPrompt,
 } from '@libs/actions/IOU/MoneyRequest';
 import {setMoneyRequestReceipt} from '@libs/actions/IOU/Receipt';
+import signalExpenseAddedGrowl from '@libs/actions/IOU/signalExpenseAddedGrowl';
 import {requestMoney, trackExpense} from '@libs/actions/IOU/TrackExpense';
 import type {GPSPoint as GpsPoint} from '@libs/actions/IOU/types/TrackExpenseTransactionParams';
 import {WRITE_COMMANDS} from '@libs/API/types';
@@ -54,7 +55,7 @@ import {getReportOrDraftReport, isMoneyRequestReport, isSelfDM} from '@libs/Repo
 import {cancelSpan, endSpan} from '@libs/telemetry/activeSpans';
 import {logReceiptAdoptFailed, logReceiptCaptured, logReceiptSubmitted, mintAndStampReceiptTraceId} from '@libs/telemetry/ReceiptObservability';
 import {cancelTracking} from '@libs/telemetry/submitFollowUpAction';
-import {getDefaultTaxCode, getIsFromGlobalCreate, getTaxValue} from '@libs/TransactionUtils';
+import {getDefaultTaxCode, getIsFromGlobalCreate, getTaxValue, hasAllManuallyEnteredScanFields} from '@libs/TransactionUtils';
 
 import DraftWorkspaceOpener from '@pages/iou/request/step/confirmation/DraftWorkspaceOpener';
 import getSubmitExpensePreMountDestinationRoute from '@pages/iou/request/step/confirmation/getSubmitExpensePreMountDestinationRoute';
@@ -182,7 +183,18 @@ function SubmitDetailsPage({
         showErrorAlert(errorTitle, errorMessage);
     }, [errorTitle, errorMessage]);
 
+    // Feed the date / currency the user entered back into `initMoneyRequest`, which re-runs whenever late Onyx data
+    // lands and would otherwise re-seed them from the policy, discarding what they typed.
+    const enteredDate = transaction?.isCreatedSet ? transaction.created : undefined;
+    // Latch the currency rather than reading it live: clearing the amount resets `isAmountSet` while the picked
+    // currency stays on the draft, so a live read would let the next re-seed swap it for the policy's currency.
+    const enteredCurrencyRef = useRef<string | undefined>(undefined);
+
     useEffect(() => {
+        if (transaction?.isAmountSet && transaction.currency) {
+            enteredCurrencyRef.current = transaction.currency;
+        }
+
         initMoneyRequest({
             reportID: reportOrAccountID,
             policy,
@@ -191,14 +203,27 @@ function SubmitDetailsPage({
             newIouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
             report,
             parentReport,
-            currentDate,
+            currentDate: enteredDate ?? currentDate,
+            overrideCurrency: enteredCurrencyRef.current,
             hasOnlyPersonalPolicies,
             draftTransactionIDs,
         });
         // Populate transaction.participants so IOURequestStepReport can highlight the destination (mirrors other expense flows).
         setMoneyRequestParticipantsFromReport(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, report, currentUserPersonalDetails.accountID);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [reportOrAccountID, policy, personalPolicy, report, parentReport, currentDate, currentUserPersonalDetails.accountID, hasOnlyPersonalPolicies]);
+    }, [
+        reportOrAccountID,
+        policy,
+        personalPolicy,
+        report,
+        parentReport,
+        currentDate,
+        currentUserPersonalDetails.accountID,
+        hasOnlyPersonalPolicies,
+        enteredDate,
+        transaction?.isAmountSet,
+        transaction?.currency,
+    ]);
 
     // Use the branch-aware values computed above: for a share that needs conversion (e.g. HEIC), these resolve to the
     // converted JPEG from VALIDATED_FILE_OBJECT; otherwise they fall back to the raw attachment. Re-deriving from
@@ -479,6 +504,10 @@ function SubmitDetailsPage({
                     rules,
                 });
             }
+
+            // requestMoney/trackExpense only signal the growl for the global-create flow and the share
+            // extension isn't flagged as such, so signal it here instead.
+            signalExpenseAddedGrowl(optimisticTransactionID, CONST.SEARCH.DATA_TYPES.EXPENSE);
         };
 
         const cleanupParams = {
@@ -542,7 +571,7 @@ function SubmitDetailsPage({
 
     const onSuccess = (file: File, locationPermissionGranted?: boolean) => {
         const receipt: Receipt = file;
-        receipt.state = file && CONST.IOU.RECEIPT_STATE.SCAN_READY;
+        receipt.state = hasAllManuallyEnteredScanFields(transaction) ? CONST.IOU.RECEIPT_STATE.OPEN : CONST.IOU.RECEIPT_STATE.SCAN_READY;
         // The share flow builds the receipt here by hand and skips buildReceiptFiles, so this is the only place to stamp
         // the trace id and log the capture.
         const receiptTraceId = mintAndStampReceiptTraceId(receipt);
@@ -689,9 +718,13 @@ function SubmitDetailsPage({
                         isPolicyExpenseChat={isPolicyExpenseChat}
                         policyID={policy?.id}
                         isConfirming={isConfirming}
-                        onConfirm={() => onConfirm(true)}
+                        onConfirm={() => onConfirm(!hasAllManuallyEnteredScanFields(transaction))}
                         reportID={reportOrAccountID}
-                        shouldShowSmartScanFields={false}
+                        // The share flow always creates a Scan expense from the shared file: it is never a split, never
+                        // a moved tracked expense and never a test receipt, so the amount / merchant / date are always
+                        // offered behind "Show more" here, exactly as they are on the in-app Scan confirmation.
+                        shouldShowSmartScanFields
+                        canEnterScanFieldsManually
                         action={CONST.IOU.ACTION.CREATE}
                         receiptOptions={{
                             receiptPath: currentReceiptSource,
diff --git a/src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx b/src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx
index 261ca3982d5e..012f1f347f50 100644
--- a/src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx
+++ b/src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx
@@ -32,7 +32,7 @@ type DuplicateTransactionItemProps = {
     isSelected: boolean;
     shouldShowSelection?: boolean;
     onSelectTransaction: (transactionID: string) => void;
-    onPreviewPressed: (reportID: string) => void;
+    onPreviewPressed: (reportID: string, transactionID: string | undefined) => void;
 };
 
 function DuplicateTransactionItem({transaction, isLastItem, isSelected, shouldShowSelection = true, onSelectTransaction, onPreviewPressed}: DuplicateTransactionItemProps) {
@@ -67,7 +67,7 @@ function DuplicateTransactionItem({transaction, isLastItem, isSelected, shouldSh
         }
 
         if (action.childReportID) {
-            onPreviewPressed(action.childReportID);
+            onPreviewPressed(action.childReportID, transaction?.transactionID);
             return;
         }
 
@@ -87,7 +87,7 @@ function DuplicateTransactionItem({transaction, isLastItem, isSelected, shouldSh
             return;
         }
 
-        onPreviewPressed(transactionThreadReport.reportID);
+        onPreviewPressed(transactionThreadReport.reportID, transaction?.transactionID);
     };
 
     if (!action || !report || !transaction) {
diff --git a/src/pages/TransactionDuplicate/DuplicateTransactionsList.tsx b/src/pages/TransactionDuplicate/DuplicateTransactionsList.tsx
index 6cd5b1b37df2..21474a464da1 100644
--- a/src/pages/TransactionDuplicate/DuplicateTransactionsList.tsx
+++ b/src/pages/TransactionDuplicate/DuplicateTransactionsList.tsx
@@ -15,7 +15,7 @@ type DuplicateTransactionsListProps = {
     selectedTransactionID?: string;
     shouldShowSelection?: boolean;
     onSelectTransaction: (transactionID: string) => void;
-    onPreviewPressed: (reportID: string) => void;
+    onPreviewPressed: (reportID: string, transactionID: string | undefined) => void;
 };
 
 function DuplicateTransactionsList({transactions, selectedTransactionID, shouldShowSelection = true, onSelectTransaction, onPreviewPressed}: DuplicateTransactionsListProps) {
diff --git a/src/pages/TransactionDuplicate/DynamicReviewPage.tsx b/src/pages/TransactionDuplicate/DynamicReviewPage.tsx
index 44db85a6cfb5..b053d14073b4 100644
--- a/src/pages/TransactionDuplicate/DynamicReviewPage.tsx
+++ b/src/pages/TransactionDuplicate/DynamicReviewPage.tsx
@@ -21,7 +21,7 @@ import useTransactionViolations from '@hooks/useTransactionViolations';
 
 import {clearDeleteTransactionNavigateBackUrl, openReport} from '@libs/actions/Report';
 import {dismissDuplicateTransactionViolation, getDuplicateTransactionDetails} from '@libs/actions/Transaction';
-import {setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import {CAROUSEL_SOURCE, getActiveTransactionIDs, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
@@ -30,6 +30,7 @@ import {getLinkedTransactionID, getReportAction} from '@libs/ReportActionsUtils'
 import {isReportIDApproved, isSettled} from '@libs/ReportUtils';
 import {doesDeleteNavigateBackUrlIncludeSpecificDuplicatesReview, getParentReportActionDeletionStatus, hasLoadedReportActions, isThreadReportDeleted} from '@libs/TransactionNavigationUtils';
 import {getReviewNavigationRoute} from '@libs/TransactionPreviewUtils';
+import type {TransactionThreadNavigationDescriptor} from '@libs/TransactionThreadNavigationUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -66,13 +67,28 @@ function DynamicReviewPage() {
     const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
     const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [transactionIDsList = getEmptyArray<string>()] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS);
+    // Read alongside the IDs so the fallback below can hand a snapshot-backed carousel back intact. The module
+    // mirror is empty after a reload (it only ever lives for one JS session), and rebuilding from the IDs alone
+    // dropped the hash and the descriptors, which is exactly the data the siblings are resolved from.
+    const [activeSnapshotHash] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH);
+    const [activeSiblingDescriptors] = useOnyx(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
 
-    const originalTransactionIDsListRef = useRef<string[] | null>(null);
+    // The whole carousel this screen is about to displace, so the restore effect below can hand it back exactly as
+    // it was. The owner has to be the screen the carousel came from (Search, or a report's list): re-seeding the
+    // previous screen's list under duplicate review's own source would leave that screen unable to refresh or
+    // release its own carousel. The snapshot hash and descriptors have to come back too, or a snapshot-backed
+    // carousel loses the data its siblings are resolved from.
+    const displacedCarouselRef = useRef<{
+        ids: string[];
+        source: string | undefined;
+        snapshotHash: number | undefined;
+        descriptors: Record<string, TransactionThreadNavigationDescriptor> | undefined;
+    } | null>(null);
 
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
     const reportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
@@ -171,23 +187,32 @@ function DynamicReviewPage() {
 
     useFocusEffect(
         useCallback(() => {
-            if (!originalTransactionIDsListRef.current) {
+            const displaced = displacedCarouselRef.current;
+            if (!displaced) {
                 return;
             }
-            setActiveTransactionIDs(originalTransactionIDsListRef.current);
+            setActiveTransactionIDs(displaced.ids, {source: displaced.source, snapshotHash: displaced.snapshotHash, descriptors: displaced.descriptors});
         }, []),
     );
 
-    const onPreviewPressed = (reportID: string) => {
+    const onPreviewPressed = (reportID: string, pressedTransactionID: string | undefined) => {
+        // Capture the carousel we are about to displace before overwriting it, on the first press only, so the
+        // restore effect re-seeds what was active when this screen mounted. setActiveTransactionIDs updates the
+        // module mirror synchronously, so reading it afterwards would only ever return our own write back.
+        if (!displacedCarouselRef.current) {
+            const active = getActiveTransactionIDs();
+            displacedCarouselRef.current = {
+                ids: active.ids ?? transactionIDsList,
+                source: active.source ?? undefined,
+                snapshotHash: active.snapshotHash ?? activeSnapshotHash,
+                descriptors: active.descriptors ?? activeSiblingDescriptors,
+            };
+        }
+
         const siblingTransactionIDsList = transactions.map((transaction) => transaction.transactionID);
-        setActiveTransactionIDs(siblingTransactionIDsList).then(() => {
-            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, backTo: Navigation.getActiveRoute()}));
+        setActiveTransactionIDs(siblingTransactionIDsList, {source: CAROUSEL_SOURCE.duplicateReview(transactionID)}).then(() => {
+            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, backTo: Navigation.getActiveRoute(), anchorTransactionID: pressedTransactionID}));
         });
-        // Store the initial value of transactionIDsList and only save it when the item is clicked for the first time
-        // to ensure that transactionIDsList reflects its original value when this component is mounted
-        if (!originalTransactionIDsListRef.current) {
-            originalTransactionIDsListRef.current = transactionIDsList;
-        }
     };
 
     const currentTransactionViolations = transactionIDs.map((id) => ({
diff --git a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
index 148a5e11372a..77d345cb7f43 100644
--- a/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
+++ b/src/pages/TransactionMerge/DynamicConfirmationPage.tsx
@@ -17,6 +17,7 @@ import useMergeTransactions from '@hooks/useMergeTransactions';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useReportTransactionsCollection from '@hooks/useReportTransactionsCollection';
 import useSelfDMReport from '@hooks/useSelfDMReport';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -28,20 +29,20 @@ import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTop
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {MergeTransactionNavigatorParamList} from '@libs/Navigation/types';
-import {getFilteredReportActionsForReportView, getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
+import {getFilteredReportActionsForReportView, getIOUActionForTransactionID, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {findSelfDMReportID} from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type {Transaction} from '@src/types/onyx';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import React, {useState} from 'react';
 import {View} from 'react-native';
 
@@ -79,9 +80,7 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
     const {currentSearchResults} = useSearchResultsContext();
     const [targetTransactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${targetTransactionThreadReportID}`);
     const [targetTransactionThreadParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(targetTransactionThreadReport?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsLoginSelector(targetTransactionThreadParentReport?.ownerAccountID),
-    });
+    const [iouReportOwnerLogin] = usePersonalDetail(targetTransactionThreadParentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(targetTransactionThreadParentReport?.policyID)}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {
         selector: isTrackIntentUserSelector,
@@ -98,6 +97,9 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
     const sourceThreadReportID = sourceIOUAction?.childReportID ?? selfDMSourceIOUAction?.childReportID;
     const [sourceTransactionThreadReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(sourceThreadReportID)}`);
     const [sourceIOUActionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(sourceThreadReportID)}`);
+    const sourceIOUReportID = isMoneyRequestAction(sourceIOUAction) ? sourceIOUAction?.reportID : undefined;
+    const [sourceActionIOUReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(sourceIOUReportID)}`);
+    const [sourceActionChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(sourceActionIOUReport?.chatReportID)}`);
 
     // Build the merged transaction data for display
     const mergedTransactionData = buildMergedTransactionData(targetTransaction, mergeTransaction);
@@ -142,6 +144,8 @@ function DynamicConfirmationPage({route}: DynamicConfirmationPageProps) {
             sourceTransactionThreadReportActions,
             sourceIOUAction,
             sourceIOUActionThreadReport,
+            sourceActionIOUReport,
+            sourceActionChatReport,
             rules,
         });
 
diff --git a/src/pages/TransactionMerge/MergeTransactionItem.tsx b/src/pages/TransactionMerge/MergeTransactionItem.tsx
index c64fcffb5c03..2af37b6fb4d0 100644
--- a/src/pages/TransactionMerge/MergeTransactionItem.tsx
+++ b/src/pages/TransactionMerge/MergeTransactionItem.tsx
@@ -14,13 +14,26 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type Transaction from '@src/types/onyx/Transaction';
 
 import type {ComponentRef} from 'react';
 import type {View} from 'react-native';
 
 import React, {useRef} from 'react';
 
-function MergeTransactionItem<TItem extends ListItem>({item, isFocused, showTooltip, isDisabled, onFocus, shouldSyncFocus, onSelectRow, isLastItem}: ListItemProps<TItem>) {
+/** A transaction rendered as a selectable row in the merge-expenses list */
+type MergeTransactionListItemType = Transaction & ListItem;
+
+function MergeTransactionItem<TItem extends MergeTransactionListItemType>({
+    item,
+    isFocused,
+    showTooltip,
+    isDisabled,
+    onFocus,
+    shouldSyncFocus,
+    onSelectRow,
+    isLastItem,
+}: ListItemProps<TItem>) {
     const styles = useThemeStyles();
     const transactionItem = item as unknown as TransactionListItemType;
     const theme = useTheme();
@@ -81,3 +94,4 @@ function MergeTransactionItem<TItem extends ListItem>({item, isFocused, showTool
 }
 
 export default MergeTransactionItem;
+export type {MergeTransactionListItemType};
diff --git a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
index 4eabf7bf8010..6b541330b8b8 100644
--- a/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
+++ b/src/pages/TransactionMerge/MergeTransactionsListContent.tsx
@@ -2,7 +2,6 @@ import EmptyStateComponent from '@components/EmptyStateComponent';
 import RenderHTML from '@components/RenderHTML';
 import ScrollView from '@components/ScrollView';
 import SelectionList from '@components/SelectionList';
-import type {ListItem} from '@components/SelectionList/ListItem/types';
 import MergeExpensesSkeleton from '@components/Skeletons/MergeExpensesSkeleton';
 
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
@@ -26,13 +25,14 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {MergeTransaction} from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
-import type Transaction from '@src/types/onyx/Transaction';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
 
+import type {MergeTransactionListItemType} from './MergeTransactionItem';
+
 import MergeTransactionItem from './MergeTransactionItem';
 
 type MergeTransactionsListContentProps = {
@@ -40,8 +40,6 @@ type MergeTransactionsListContentProps = {
     mergeTransaction: OnyxEntry<MergeTransaction>;
 };
 
-type MergeTransactionListItemType = Transaction & ListItem;
-
 function MergeTransactionsListContent({transactionID, mergeTransaction}: MergeTransactionsListContentProps) {
     const illustrations = useMemoizedLazyIllustrations(['EmptyShelves']);
     const {translate, localeCompare} = useLocalize();
diff --git a/src/pages/Travel/DynamicTripDetailsPage.tsx b/src/pages/Travel/DynamicTripDetailsPage.tsx
index 09b2b1e6282d..fe298a561213 100644
--- a/src/pages/Travel/DynamicTripDetailsPage.tsx
+++ b/src/pages/Travel/DynamicTripDetailsPage.tsx
@@ -1,5 +1,5 @@
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
 import MenuItem from '@components/MenuItem';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -10,6 +10,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -85,9 +86,7 @@ function DynamicTripDetailsPage({route}: DynamicTripDetailsPageProps) {
 
     const {reservation, prevReservation, reservationType, reservationIcon, isCancelled} = getReservationDetailsFromSequence(icons, tripReservations, Number(sequenceIndex));
     const travelerEmail = reservation?.travelerPersonalInfo?.email;
-    const [travelerPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: (personalDetails: OnyxEntry<PersonalDetailsList>) => pickTravelerPersonalDetails(personalDetails, travelerEmail),
-    });
+    const [travelerPersonalDetails] = useAllPersonalDetails((personalDetails: OnyxEntry<PersonalDetailsList>) => pickTravelerPersonalDetails(personalDetails, travelerEmail));
 
     return (
         <ScreenWrapper
@@ -101,20 +100,26 @@ function DynamicTripDetailsPage({route}: DynamicTripDetailsPageProps) {
                 shouldForceFullScreen
                 shouldShow={!reservation || (!CONFIG.IS_HYBRID_APP && isBlockedFromSpotnanaTravel)}
             >
-                <HeaderWithBackButton
-                    title={formatCancelledDescription(
-                        translate('iou.canceled'),
-                        reservationType ? `${translate(`travel.${reservationType}`)} ${translate('common.details').toLowerCase()}` : translate('common.details'),
-                        isCancelled,
-                    )}
-                    shouldShowBackButton
-                    onBackButtonPress={() => Navigation.goBack(backPath)}
-                    icon={reservationIcon}
-                    iconHeight={20}
-                    iconWidth={20}
-                    iconStyles={[StyleUtils.getTripReservationIconContainer(false), styles.mr3]}
-                    iconFill={theme.icon}
-                />
+                <Header>
+                    <Header.BackButton
+                        onPress={() => Navigation.goBack(backPath)}
+                        iconFill={theme.icon}
+                    />
+                    <Header.Icon
+                        src={reservationIcon}
+                        width={20}
+                        height={20}
+                        style={[StyleUtils.getTripReservationIconContainer(false), styles.mr3]}
+                        iconFill={theme.icon}
+                    />
+                    <Header.Title
+                        title={formatCancelledDescription(
+                            translate('iou.canceled'),
+                            reservationType ? `${translate(`travel.${reservationType}`)} ${translate('common.details').toLowerCase()}` : translate('common.details'),
+                            isCancelled,
+                        )}
+                    />
+                </Header>
                 <ScrollView>
                     {!!reservation && reservationType === CONST.RESERVATION_TYPE.FLIGHT && (
                         <FlightTripDetails
diff --git a/src/pages/Travel/EnableTravel/subPages/DomainSelectorStep.tsx b/src/pages/Travel/EnableTravel/subPages/DomainSelectorStep.tsx
index 72cbf1b22f0e..c2636ab6c633 100644
--- a/src/pages/Travel/EnableTravel/subPages/DomainSelectorStep.tsx
+++ b/src/pages/Travel/EnableTravel/subPages/DomainSelectorStep.tsx
@@ -1,6 +1,7 @@
+import Badge from '@components/Badge';
 import Button from '@components/Button';
 import SelectionList from '@components/SelectionList';
-import TravelDomainListItem from '@components/SelectionList/ListItem/TravelDomainListItem';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
 
@@ -19,7 +20,6 @@ import {View} from 'react-native';
 
 type DomainItem = ListItem & {
     value: string;
-    isRecommended: boolean;
 };
 
 function DomainSelectorStep({policy, onNext}: EnableTravelSubPageProps) {
@@ -37,9 +37,9 @@ function DomainSelectorStep({policy, onNext}: EnableTravelSubPageProps) {
             isSelected: domain === selectedDomain,
             keyForList: domain,
             text: domain,
-            isRecommended: domain === recommendedDomain,
+            rightElement: domain === recommendedDomain ? <Badge text={translate('travel.domainSelector.recommended')} /> : undefined,
         }));
-    }, [domains, recommendedDomain, selectedDomain]);
+    }, [domains, recommendedDomain, selectedDomain, translate]);
 
     const handleContinue = () => {
         if (!selectedDomain) {
@@ -59,7 +59,8 @@ function DomainSelectorStep({policy, onNext}: EnableTravelSubPageProps) {
             <SelectionList
                 onSelectRow={(option) => setSelectedDomain(option.value)}
                 data={data}
-                ListItem={TravelDomainListItem}
+                ListItem={SingleSelectListItem}
+                selectionButtonPosition={CONST.SELECTION_BUTTON_POSITION.LEFT}
                 shouldShowTooltips
                 footerContent={
                     <Button
diff --git a/src/pages/domain/AddDomainVerifyAccountPage.tsx b/src/pages/domain/AddDomainVerifyAccountPage.tsx
deleted file mode 100644
index cdae599012b5..000000000000
--- a/src/pages/domain/AddDomainVerifyAccountPage.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import VerifyAccountPageBase from '@pages/settings/VerifyAccountPageBase';
-
-import ROUTES from '@src/ROUTES';
-
-import React from 'react';
-
-function AddDomainVerifyAccountPage() {
-    return <VerifyAccountPageBase navigateBackTo={ROUTES.WORKSPACES_ADD_DOMAIN} />;
-}
-
-export default AddDomainVerifyAccountPage;
diff --git a/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx b/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx
index 55a23741fc27..aea84483150f 100644
--- a/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx
+++ b/src/pages/domain/Admins/DomainAddPrimaryContactPage.tsx
@@ -7,10 +7,12 @@ import type {ListItem} from '@components/SelectionList/types';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
+import {getSearchValueForPhoneOrEmail} from '@libs/OptionsListUtils';
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import Navigation from '@navigation/Navigation';
@@ -61,9 +63,7 @@ function DomainAddPrimaryContactPage({route}: DomainAddPrimaryContactPageProps)
         },
         [adminAccountIDs],
     );
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: adminsPersonalDetailsSelector,
-    });
+    const [personalDetails] = useAllPersonalDetails(adminsPersonalDetailsSelector);
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
     const [technicalContactSettings] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainAccountID}`, {
diff --git a/src/pages/domain/Admins/DomainAdminDetailsPage.tsx b/src/pages/domain/Admins/DomainAdminDetailsPage.tsx
index 146fe6a05e98..f3e7bc940914 100644
--- a/src/pages/domain/Admins/DomainAdminDetailsPage.tsx
+++ b/src/pages/domain/Admins/DomainAdminDetailsPage.tsx
@@ -6,6 +6,7 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 
@@ -22,12 +23,9 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {PersonalDetailsList} from '@src/types/onyx';
-
-import type {OnyxEntry} from 'react-native-onyx';
 
 import {adminAccountIDsSelector, domainSettingsPrimaryContactSelector} from '@selectors/Domain';
-import React, {useCallback} from 'react';
+import React from 'react';
 
 type DomainAdminDetailsPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.ADMIN_DETAILS>;
 
@@ -45,10 +43,7 @@ function DomainAdminDetailsPage({route}: DomainAdminDetailsPageProps) {
         selector: adminAccountIDsSelector,
     });
 
-    const adminPersonalDetailsSelector = useCallback((personalDetailsList: OnyxEntry<PersonalDetailsList>) => personalDetailsList?.[accountID], [accountID]);
-    const [adminPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: adminPersonalDetailsSelector,
-    });
+    const [adminPersonalDetails] = usePersonalDetail(accountID);
 
     const domainHasOnlyOneAdmin = adminAccountIDs?.length === 1;
     const displayName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: adminPersonalDetails, translate, formatPhoneNumber});
diff --git a/src/pages/domain/Admins/DomainAdminsPage.tsx b/src/pages/domain/Admins/DomainAdminsPage.tsx
index 4b702d4b022a..d7c4da4ff862 100644
--- a/src/pages/domain/Admins/DomainAdminsPage.tsx
+++ b/src/pages/domain/Admins/DomainAdminsPage.tsx
@@ -10,6 +10,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
 import useTheme from '@hooks/useTheme';
@@ -91,7 +92,7 @@ function DomainAdminsPage({route}: DomainAdminsPageProps) {
         selector: adminshipRequesterPendingActionSelector,
     });
 
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [technicalContactSettings] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainAccountID}`, {
         selector: technicalContactSettingsSelector,
     });
diff --git a/src/pages/domain/BaseDomainMemberDetailsComponent.tsx b/src/pages/domain/BaseDomainMemberDetailsComponent.tsx
index 0575b2fec977..0c7b8726d9ff 100644
--- a/src/pages/domain/BaseDomainMemberDetailsComponent.tsx
+++ b/src/pages/domain/BaseDomainMemberDetailsComponent.tsx
@@ -10,7 +10,7 @@ import Text from '@components/Text';
 
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
@@ -19,14 +19,10 @@ import {temporaryGetDisplayNameOrDefault, getPhoneNumber} from '@libs/PersonalDe
 import Navigation from '@navigation/Navigation';
 
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import type {PersonalDetailsList} from '@src/types/onyx';
-
-import type {OnyxEntry} from 'react-native-onyx';
 
 import {Str} from 'expensify-common';
-import React, {useCallback} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 
 import DomainNotFoundPageWrapper from './DomainNotFoundPageWrapper';
@@ -47,10 +43,7 @@ function BaseDomainMemberDetailsComponent({domainAccountID, accountID, children,
     const {translate, formatPhoneNumber} = useLocalize();
     const icons = useMemoizedLazyExpensifyIcons(['Info']);
 
-    const personalDetailsSelector = useCallback((personalDetailsList: OnyxEntry<PersonalDetailsList>) => personalDetailsList?.[accountID], [accountID]);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsSelector,
-    });
+    const [personalDetails] = usePersonalDetail(accountID);
 
     const displayName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: personalDetails, translate, formatPhoneNumber});
     const phoneNumber = getPhoneNumber(personalDetails);
diff --git a/src/pages/domain/Members/DomainAddMemberPage.tsx b/src/pages/domain/Members/DomainAddMemberPage.tsx
index 117fbbbb2c69..292f8bc2528e 100644
--- a/src/pages/domain/Members/DomainAddMemberPage.tsx
+++ b/src/pages/domain/Members/DomainAddMemberPage.tsx
@@ -9,6 +9,7 @@ import type {BaseTextInputProps} from '@components/TextInput/BaseTextInput/types
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {addErrorMessage} from '@libs/ErrorUtils';
@@ -59,7 +60,7 @@ function DomainAddMemberPage({route}: DomainAddMemberProps) {
     const [memberIDs = getEmptyArray<number>()] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {
         selector: memberAccountIDsSelector,
     });
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: multiPersonalDetailsSelector(memberIDs)});
+    const [personalDetails] = useAllPersonalDetails(multiPersonalDetailsSelector(memberIDs));
     const [domainName] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainNameSelector});
     const [defaultSecurityGroupID] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: defaultSecurityGroupIDSelector});
 
diff --git a/src/pages/domain/Members/DomainMemberDetailsPage.tsx b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
index e2b202899662..345e09535742 100644
--- a/src/pages/domain/Members/DomainMemberDetailsPage.tsx
+++ b/src/pages/domain/Members/DomainMemberDetailsPage.tsx
@@ -11,6 +11,7 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -38,13 +39,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Domain, PersonalDetailsList} from '@src/types/onyx';
+import type {Domain} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {requiresTwoFactorAuthSelector} from '@selectors/Account';
 import {accountLockSelector, domainMemberSettingsSelector, domainNameSelector, selectSecurityGroupForAccount, vacationDelegateSelector} from '@selectors/Domain';
-import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
 
@@ -67,10 +67,7 @@ function DomainMemberDetailsPage({route}: DomainMemberDetailsPageProps) {
         selector: securityGroupSelector,
     });
 
-    const memberPersonalDetailsSelector = useCallback((personalDetailsList: OnyxEntry<PersonalDetailsList>) => personalDetailsSelector(accountID)(personalDetailsList), [accountID]);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: memberPersonalDetailsSelector,
-    });
+    const [personalDetails] = usePersonalDetail(accountID);
 
     const [domainName] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainNameSelector});
 
diff --git a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
index 704f53ecac29..f86ddcef8c47 100644
--- a/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
+++ b/src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx
@@ -4,6 +4,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import Navigation from '@libs/Navigation/Navigation';
 
@@ -20,7 +21,6 @@ import type SCREENS from '@src/SCREENS';
 import type {Participant} from '@src/types/onyx/IOU';
 
 import {vacationDelegateSelector} from '@selectors/Domain';
-import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 type DomainMemberVacationDelegatePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.VACATION_DELEGATE>;
@@ -35,9 +35,7 @@ function DomainMemberVacationDelegatePage({route}: DomainMemberVacationDelegateP
         selector: vacationDelegateSelector(accountID),
     });
 
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsSelector(accountID),
-    });
+    const [personalDetails] = usePersonalDetail(accountID);
     const memberLogin = personalDetails?.login;
 
     const onSelectRow = (option: Participant) => {
diff --git a/src/pages/domain/Members/DomainMembersPage.tsx b/src/pages/domain/Members/DomainMembersPage.tsx
index 526aa39ae14e..86246ff9cb9c 100644
--- a/src/pages/domain/Members/DomainMembersPage.tsx
+++ b/src/pages/domain/Members/DomainMembersPage.tsx
@@ -21,6 +21,7 @@ import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSearchBackPress from '@hooks/useSearchBackPress';
 import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
@@ -75,7 +76,7 @@ function DomainMembersPage({route}: DomainMembersPageProps) {
     const [isModalVisible, setIsModalVisible] = useState(false);
     const [shouldForceCloseAccount, setShouldForceCloseAccount] = useState<boolean>();
     const {showConfirmModal} = useConfirmModal();
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [domain] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`);
     const [domainName] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainNameSelector});
     useDomainDocumentTitle(domainName, 'domain.domainMembers');
diff --git a/src/pages/domain/Members/DomainReportSuspiciousActivityPage.tsx b/src/pages/domain/Members/DomainReportSuspiciousActivityPage.tsx
index 6c3804f105d3..e751fc6c62b9 100644
--- a/src/pages/domain/Members/DomainReportSuspiciousActivityPage.tsx
+++ b/src/pages/domain/Members/DomainReportSuspiciousActivityPage.tsx
@@ -2,6 +2,7 @@ import RenderHTML from '@components/RenderHTML';
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
@@ -16,8 +17,8 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import {domainNameSelector} from '@src/selectors/Domain';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 
+import {loginSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 import {View} from 'react-native';
 
@@ -28,7 +29,7 @@ function DomainReportSuspiciousActivityPage({route}: DomainReportSuspiciousActiv
 
     const {domainAccountID, accountID} = route.params;
 
-    const [memberLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(accountID)});
+    const [memberLogin] = usePersonalDetail(accountID, loginSelector);
     const [domainName] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: domainNameSelector});
 
     const {translate} = useLocalize();
diff --git a/src/pages/domain/Members/MoveUserBetweenGroupsPage.tsx b/src/pages/domain/Members/MoveUserBetweenGroupsPage.tsx
index ff3bc7a6c598..81b33867efdb 100644
--- a/src/pages/domain/Members/MoveUserBetweenGroupsPage.tsx
+++ b/src/pages/domain/Members/MoveUserBetweenGroupsPage.tsx
@@ -9,6 +9,7 @@ import Text from '@components/Text';
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {changeDomainSecurityGroup} from '@libs/actions/Domain';
@@ -23,9 +24,9 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 
 import {domainNameSelector, groupsSelector, selectSecurityGroupForAccount} from '@selectors/Domain';
+import {loginSelector} from '@selectors/PersonalDetails';
 import React, {useState} from 'react';
 
 import useDomainGroupMoveValidation from './useDomainGroupMoveValidation';
@@ -46,7 +47,7 @@ function MoveUserBetweenGroupsPage({route}: MoveUserBetweenGroupsPageProps) {
     const [securityGroups] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: groupsSelector});
 
     const [userSecurityGroup] = useOnyx(`${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, {selector: selectSecurityGroupForAccount(accountID)});
-    const [memberLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(accountID)});
+    const [memberLogin] = usePersonalDetail(accountID, loginSelector);
 
     const currentGroupId = userSecurityGroup?.key.replace(CONST.DOMAIN.DOMAIN_SECURITY_GROUP_PREFIX, '');
 
diff --git a/src/pages/domain/Members/TwoFactorAuth/DomainMemberForceTwoFactorAuthPage.tsx b/src/pages/domain/Members/TwoFactorAuth/DomainMemberForceTwoFactorAuthPage.tsx
index 32a9fa2768ec..b3b021ad64f1 100644
--- a/src/pages/domain/Members/TwoFactorAuth/DomainMemberForceTwoFactorAuthPage.tsx
+++ b/src/pages/domain/Members/TwoFactorAuth/DomainMemberForceTwoFactorAuthPage.tsx
@@ -1,4 +1,5 @@
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
@@ -13,7 +14,6 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 import {domainMemberSettingsSelector} from '@selectors/Domain';
-import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React, {useEffect} from 'react';
 
 type DomainMemberForceTwoFactorAuthPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.MEMBER_FORCE_TWO_FACTOR_AUTH>;
@@ -21,9 +21,7 @@ type DomainMemberForceTwoFactorAuthPageProps = PlatformStackScreenProps<Settings
 function DomainMemberForceTwoFactorAuthPage({route}: DomainMemberForceTwoFactorAuthPageProps) {
     const {domainAccountID, accountID} = route.params;
 
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsSelector(accountID),
-    });
+    const [personalDetails] = usePersonalDetail(accountID);
     const memberLogin = personalDetails?.login ?? '';
     const [domainSettings] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${domainAccountID}`, {
         selector: domainMemberSettingsSelector,
diff --git a/src/pages/domain/Members/TwoFactorAuth/DomainMemberResetTwoFactorAuthPage.tsx b/src/pages/domain/Members/TwoFactorAuth/DomainMemberResetTwoFactorAuthPage.tsx
index 675c54ce1e1d..0e190b1de3bb 100644
--- a/src/pages/domain/Members/TwoFactorAuth/DomainMemberResetTwoFactorAuthPage.tsx
+++ b/src/pages/domain/Members/TwoFactorAuth/DomainMemberResetTwoFactorAuthPage.tsx
@@ -1,4 +1,4 @@
-import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import Navigation from '@navigation/Navigation';
 import type {PlatformStackScreenProps} from '@navigation/PlatformStackNavigation/types';
@@ -8,11 +8,9 @@ import BaseDomainRequireTwoFactorAuthPage from '@pages/domain/BaseDomainRequireT
 
 import {resetDomainMemberTwoFactorAuth} from '@userActions/Domain';
 
-import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
-import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 type DomainMemberTwoFactorAuthPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.DOMAIN.MEMBER_RESET_TWO_FACTOR_AUTH>;
@@ -20,9 +18,7 @@ type DomainMemberTwoFactorAuthPageProps = PlatformStackScreenProps<SettingsNavig
 function DomainMemberResetTwoFactorAuthPage({route}: DomainMemberTwoFactorAuthPageProps) {
     const {domainAccountID, accountID} = route.params;
 
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsSelector(accountID),
-    });
+    const [personalDetails] = usePersonalDetail(accountID);
 
     return (
         <BaseDomainRequireTwoFactorAuthPage
diff --git a/src/pages/home/EarlyRenewalOfferSection/index.tsx b/src/pages/home/EarlyRenewalOfferSection/index.tsx
new file mode 100644
index 000000000000..cef1adca7308
--- /dev/null
+++ b/src/pages/home/EarlyRenewalOfferSection/index.tsx
@@ -0,0 +1,77 @@
+import Button from '@components/Button';
+import Icon from '@components/Icon';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+import WidgetContainer from '@components/WidgetContainer';
+
+import useEarlyRenewalConfirmation from '@hooks/useEarlyRenewalConfirmation';
+import useEarlyRenewalPeriod from '@hooks/useEarlyRenewalPeriod';
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useOnyx from '@hooks/useOnyx';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearEarlyRenewalOfferErrors} from '@libs/actions/EarlyRenewalOffer';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import React from 'react';
+import {View} from 'react-native';
+
+const ICON_SIZE = variables.componentSizeNormal;
+
+function EarlyRenewalOfferSection() {
+    const [eligibility, eligibilityMetadata] = useOnyx(ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY);
+    const {isNonIncentivizedPeriod} = useEarlyRenewalPeriod();
+    const showEarlyRenewalConfirmation = useEarlyRenewalConfirmation();
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const styles = useThemeStyles();
+    const illustrations = useMemoizedLazyIllustrations(['SubscriptionAnnual']);
+
+    if (eligibilityMetadata.status !== 'loaded' || !eligibility?.canClaim || !isNonIncentivizedPeriod) {
+        return null;
+    }
+
+    return (
+        <WidgetContainer
+            title={translate('earlyRenewal.title')}
+            containerStyles={styles.trialBannerBackgroundColor}
+        >
+            <OfflineWithFeedback
+                errors={eligibility.errors}
+                onClose={clearEarlyRenewalOfferErrors}
+                errorRowStyles={[styles.pb4, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}
+            >
+                <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3, styles.pt3, styles.pb8, shouldUseNarrowLayout ? styles.ph5 : styles.ph8]}>
+                    <Icon
+                        src={illustrations.SubscriptionAnnual}
+                        width={ICON_SIZE}
+                        height={ICON_SIZE}
+                    />
+                    <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter]}>
+                        <Text style={styles.widgetItemTitle}>{translate('earlyRenewal.subtitle')}</Text>
+                    </View>
+                    <Button
+                        isDisabled={isOffline}
+                        isLoading={!!eligibility.pendingAction}
+                        onPress={showEarlyRenewalConfirmation}
+                        size={CONST.BUTTON_SIZE.SMALL}
+                        style={styles.widgetItemButton}
+                        variant={CONST.BUTTON_VARIANT.SUCCESS}
+                    >
+                        <Button.Text>{translate('earlyRenewal.renew')}</Button.Text>
+                    </Button>
+                </View>
+            </OfflineWithFeedback>
+        </WidgetContainer>
+    );
+}
+
+export default EarlyRenewalOfferSection;
diff --git a/src/pages/home/ForYouSection/useReviewFlaggedExpenses.ts b/src/pages/home/ForYouSection/useReviewFlaggedExpenses.ts
index 826181772b36..83d806751b07 100644
--- a/src/pages/home/ForYouSection/useReviewFlaggedExpenses.ts
+++ b/src/pages/home/ForYouSection/useReviewFlaggedExpenses.ts
@@ -2,6 +2,7 @@ import useNavigateToTransactionThread from '@hooks/useNavigateToTransactionThrea
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
+import {CAROUSEL_SOURCE, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import Navigation from '@libs/Navigation/Navigation';
 import {isOneTransactionReport} from '@libs/ReportUtils';
@@ -170,16 +171,23 @@ function useReviewFlaggedExpenses(): ReviewFlaggedExpenses {
               const firstFlaggedReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${firstFlaggedExpense.reportID}`];
               const firstFlaggedTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${firstFlaggedExpense.transactionID}`];
 
-              // With a single flagged expense the review carousel has nothing to navigate between, and for a
-              // one-transaction report the transaction thread is a redundant duplicate of the report itself.
-              // Gate on the report's transaction count (not its type) so a lone flagged expense inside a
-              // multi-transaction report still opens that expense's thread rather than the whole report.
-              if (flaggedExpenses.length === 1 && isOneTransactionReport(firstFlaggedReport)) {
-                  Navigation.navigate(
-                      shouldUseNarrowLayout
-                          ? ROUTES.REPORT_WITH_ID.getRoute(firstFlaggedExpense.reportID, undefined, undefined, ROUTES.HOME)
-                          : ROUTES.EXPENSE_REPORT_RHP.getRoute({reportID: firstFlaggedExpense.reportID, backTo: ROUTES.HOME}),
-                  );
+              const siblingTransactionIDs = flaggedExpenses.map((flaggedExpense) => flaggedExpense.transactionID);
+
+              if (isOneTransactionReport(firstFlaggedReport) && (flaggedExpenses.length === 1 || !shouldUseNarrowLayout)) {
+                  // A lone flagged expense has nothing to page between, so it skips seeding the carousel entirely.
+                  const shouldSeedCarousel = flaggedExpenses.length > 1;
+                  const openReport = () =>
+                      Navigation.navigate(
+                          shouldUseNarrowLayout
+                              ? ROUTES.REPORT_WITH_ID.getRoute(firstFlaggedExpense.reportID, undefined, undefined, ROUTES.HOME)
+                              : ROUTES.EXPENSE_REPORT_RHP.getRoute({reportID: firstFlaggedExpense.reportID, backTo: ROUTES.HOME}),
+                      );
+
+                  if (!shouldSeedCarousel) {
+                      openReport();
+                      return;
+                  }
+                  setActiveTransactionIDs(siblingTransactionIDs, {source: CAROUSEL_SOURCE.homeReviewFlagged}).then(openReport);
                   return;
               }
 
@@ -188,7 +196,8 @@ function useReviewFlaggedExpenses(): ReviewFlaggedExpenses {
                   reportActions: Object.values(firstFlaggedReportActions ?? {}),
                   report: firstFlaggedReport,
                   transaction: firstFlaggedTransaction,
-                  siblingTransactionIDs: flaggedExpenses.map((flaggedExpense) => flaggedExpense.transactionID),
+                  siblingTransactionIDs,
+                  carouselSource: CAROUSEL_SOURCE.homeReviewFlagged,
                   backTo: ROUTES.HOME,
               });
           }
diff --git a/src/pages/home/GettingStartedSection/hooks/useGettingStartedItems.ts b/src/pages/home/GettingStartedSection/hooks/useGettingStartedItems.ts
index aab813466ec1..145463f91914 100644
--- a/src/pages/home/GettingStartedSection/hooks/useGettingStartedItems.ts
+++ b/src/pages/home/GettingStartedSection/hooks/useGettingStartedItems.ts
@@ -4,6 +4,7 @@ import useLocalize from '@hooks/useLocalize';
 import useOnboardingIntent from '@hooks/useOnboardingIntent';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useRulesPrefetch from '@hooks/useRulesPrefetch';
 import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 
 import {startMoneyRequest} from '@libs/actions/IOU/MoneyRequest';
@@ -35,6 +36,7 @@ import type {Route} from '@src/ROUTES';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 
 import {hasIssuedExpensifyCardSelector} from '@selectors/Card';
+import {createHasExpenseDefaultRulesSelector} from '@selectors/Rule';
 import {accountIDSelector} from '@selectors/Session';
 import {validTransactionDraftIDsSelector} from '@selectors/TransactionDraft';
 
@@ -72,11 +74,15 @@ function useGettingStartedItems(): UseGettingStartedItemsResult {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const intent = useOnboardingIntent();
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
+    const [hasMerchantRules] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: createHasExpenseDefaultRulesSelector(activePolicyID)});
     const [currentUserAccountID] = useOnyx(ONYXKEYS.SESSION, {selector: accountIDSelector});
     const [firstDayFreeTrial] = useOnyx(ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL);
     const [reportedIntegration] = useOnyx(ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION);
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${activePolicyID}`);
+
+    // The checklist reads the rules collection, and nothing on Home opens a workspace to populate it.
+    useRulesPrefetch(arePolicyRulesEnabled(policy, policyCategories));
     const [allCardFeeds] = useCardFeeds(activePolicyID);
     const workspaceAccountID = useWorkspaceAccountID(activePolicyID);
 
@@ -348,7 +354,7 @@ function useGettingStartedItems(): UseGettingStartedItemsResult {
             key: 'setupRules',
             label: translate('homePage.gettingStartedSection.setupRules'),
             subText: translate('homePage.gettingStartedSection.setupRulesSubText'),
-            isComplete: hasConfiguredRules(policy, policyCategories),
+            isComplete: hasConfiguredRules(policy, policyCategories, hasMerchantRules ?? false),
             route: ROUTES.WORKSPACE_RULES.getRoute(activePolicyID),
         });
     }
diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx
index 0890196ac886..8b384ebbc67e 100644
--- a/src/pages/home/HomePage.tsx
+++ b/src/pages/home/HomePage.tsx
@@ -14,6 +14,8 @@ import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import openHomePage from '@libs/actions/HomePage';
+
 import variables from '@styles/variables';
 
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -21,9 +23,11 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {ComponentRef} from 'react';
 
 import {PortalHost} from '@gorhom/portal';
+import {useFocusEffect} from '@react-navigation/native';
 import {useRef, useState} from 'react';
 import {View} from 'react-native';
 
+import EarlyRenewalOfferSection from './EarlyRenewalOfferSection';
 import ForYouSection from './ForYouSection';
 import FreeTrialSection from './FreeTrialSection';
 import GettingStartedSection from './GettingStartedSection';
@@ -41,7 +45,7 @@ function HomePage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     useDocumentTitle(translate('common.home'));
-    const {isOffline} = useNetwork();
+    const {isOffline} = useNetwork({onReconnect: openHomePage});
     const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
     const [isLoadingReportData = false] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
     // Offline the underlying commands never send, so the loading flags can stay true forever. Match useLoadingBarVisibility and hide the bar when offline.
@@ -49,6 +53,10 @@ function HomePage() {
     const shouldShowHomeSkeleton = useAppLoadSkeletonVisibility();
     const receiptDropTargetRef = useRef<ComponentRef<typeof View>>(null);
 
+    useFocusEffect(() => {
+        openHomePage();
+    });
+
     // Owned here (above the narrow/wide layout branch) so the Concierge "+" menu survives the ForYouSection remount that
     // happens on breakpoint change, converting between anchored popover and bottom-docked modal instead of vanishing.
     const [isConciergeMenuVisible, setIsConciergeMenuVisible] = useState(false);
@@ -68,7 +76,8 @@ function HomePage() {
     // than replacing the whole layout, which would unmount the Concierge card and interrupt anyone typing in it.
     const homeLayout = shouldUseNarrowLayout ? (
         <>
-            {/* Occupies a slot whether or not it renders, so the card below keeps its index across the swap. */}
+            {/* These occupy slots whether or not they render, so the card below keeps its index across the swap. */}
+            {shouldShowHomeSkeleton ? null : <EarlyRenewalOfferSection />}
             {shouldShowHomeSkeleton ? null : <FreeTrialSection />}
             {forYouSection}
             {shouldShowHomeSkeleton ? (
@@ -110,6 +119,7 @@ function HomePage() {
                     <HomePageSkeletonRowCards />
                 ) : (
                     <>
+                        <EarlyRenewalOfferSection />
                         <FreeTrialSection />
                         <YourSpendSection />
                         <RecentlyAddedSection />
diff --git a/src/pages/home/InsightsSection/InsightsSectionContent.tsx b/src/pages/home/InsightsSection/InsightsSectionContent.tsx
index c67d68fdbc45..94ef755a07f3 100644
--- a/src/pages/home/InsightsSection/InsightsSectionContent.tsx
+++ b/src/pages/home/InsightsSection/InsightsSectionContent.tsx
@@ -1,7 +1,6 @@
-import BlockingView from '@components/BlockingViews/BlockingView';
-import {CHART_CONTENT_MIN_HEIGHT} from '@components/Charts/VictoryTheme';
 import ChartEmptyState from '@components/Search/ChartEmptyState';
 import ChartErrorState from '@components/Search/ChartErrorState';
+import ChartOfflineState from '@components/Search/ChartOfflineState';
 import SearchChartView from '@components/Search/SearchChartView';
 import WidgetContainer from '@components/WidgetContainer';
 import WidgetHeaderMenu from '@components/WidgetHeaderMenu';
@@ -11,15 +10,13 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
-import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {setNameValuePair} from '@libs/actions/User';
 import Navigation from '@libs/Navigation/Navigation';
+import {INSIGHTS_CHART_STATE} from '@libs/resolveInsightsChartData';
 import type {SearchKey} from '@libs/SearchKeyUtils';
 
-import variables from '@styles/variables';
-
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -29,13 +26,12 @@ import {View} from 'react-native';
 
 import InsightTitleDropdown from './InsightTitleDropdown';
 import useHomeInsightConfigs from './useHomeInsightConfigs';
-import useInsightData, {INSIGHT_STATE} from './useInsightData';
+import useInsightData from './useInsightData';
 
 function InsightsSectionContent() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const theme = useTheme();
-    const icons = useMemoizedLazyExpensifyIcons(['Expand', 'OfflineCloud']);
+    const icons = useMemoizedLazyExpensifyIcons(['Expand']);
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBetaEnabled} = usePermissions();
     const isInsightsPageEnabled = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
@@ -45,7 +41,7 @@ function InsightsSectionContent() {
 
     // The persisted key can name an insight the user is no longer eligible for, so fall back to the first option.
     const config = insightConfigs.find((insightConfig) => insightConfig.key === selectedKey) ?? insightConfigs.at(0);
-    const {queryJSON, groupBy, view, sortedData, state, retry} = useInsightData(config, isConfigResolved && selectedKeyMetadata.status === 'loaded');
+    const {queryJSON, groupBy, view, data, state, retry} = useInsightData(config, isConfigResolved && selectedKeyMetadata.status === 'loaded');
 
     const onSelectInsight = (key: SearchKey) => {
         if (key === config?.key) {
@@ -68,7 +64,7 @@ function InsightsSectionContent() {
                 />
             }
             titleRightContent={
-                state === INSIGHT_STATE.READY || state === INSIGHT_STATE.EMPTY || state === INSIGHT_STATE.ERROR ? (
+                state === INSIGHTS_CHART_STATE.READY || state === INSIGHTS_CHART_STATE.EMPTY || state === INSIGHTS_CHART_STATE.ERROR ? (
                     <WidgetHeaderMenu
                         testID="insightsOverflowMenu"
                         sentryLabel="InsightsOverflowMenu"
@@ -89,28 +85,17 @@ function InsightsSectionContent() {
                 ) : null
             }
         >
-            {state === INSIGHT_STATE.OFFLINE && (
-                <BlockingView
-                    icon={icons.OfflineCloud}
-                    iconColor={theme.offline}
-                    iconWidth={variables.iconSizeUltraLarge}
-                    title={translate('common.youAppearToBeOffline')}
-                    titleStyles={[styles.mt0, styles.mb2]}
-                    subtitle={translate('common.thisFeatureRequiresInternet')}
-                    subtitleStyle={styles.textSupporting}
-                    containerStyle={[{minHeight: CHART_CONTENT_MIN_HEIGHT}, styles.gap5]}
-                />
-            )}
-            {state === INSIGHT_STATE.EMPTY && <ChartEmptyState testID="insightsSectionEmptyState" />}
-            {state === INSIGHT_STATE.ERROR && <ChartErrorState onRetry={retry} />}
-            {(state === INSIGHT_STATE.LOADING || state === INSIGHT_STATE.READY) && (
-                <View style={[shouldUseNarrowLayout ? styles.ph5 : [styles.ph8, styles.pt3], view === CONST.SEARCH.VIEW.PIE && styles.pb6]}>
+            {state === INSIGHTS_CHART_STATE.OFFLINE && <ChartOfflineState />}
+            {state === INSIGHTS_CHART_STATE.EMPTY && <ChartEmptyState testID="insightsSectionEmptyState" />}
+            {state === INSIGHTS_CHART_STATE.ERROR && <ChartErrorState onRetry={retry} />}
+            {(state === INSIGHTS_CHART_STATE.LOADING || state === INSIGHTS_CHART_STATE.READY) && (
+                <View style={shouldUseNarrowLayout ? [styles.ph5, styles.pb5] : [styles.ph8, styles.pt3, styles.pb8]}>
                     <SearchChartView
                         queryJSON={queryJSON}
                         view={view}
                         groupBy={groupBy}
-                        data={sortedData ?? []}
-                        isLoading={state === INSIGHT_STATE.LOADING}
+                        data={data}
+                        isLoading={state === INSIGHTS_CHART_STATE.LOADING}
                         color={config.color}
                     />
                 </View>
diff --git a/src/pages/home/InsightsSection/useInsightData.ts b/src/pages/home/InsightsSection/useInsightData.ts
index 6c17ee302635..bf66e77f60c4 100644
--- a/src/pages/home/InsightsSection/useInsightData.ts
+++ b/src/pages/home/InsightsSection/useInsightData.ts
@@ -1,56 +1,32 @@
 import useGroupedItems from '@components/Search/hooks/useGroupedItems';
-import type {ChartView, GroupedItem, SearchQueryJSON, SearchView} from '@components/Search/types';
+import type {ChartView, SearchView} from '@components/Search/types';
 
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import useTabFocusedRefresh from '@hooks/useTabFocusedRefresh';
 
 import {search} from '@libs/actions/Search';
+import {INSIGHTS_CHART_STATE, resolveInsightsChartData} from '@libs/resolveInsightsChartData';
 import type {SearchTypeMenuItem} from '@libs/SearchUIUtils';
-import {isSearchDataLoaded} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type SearchResults from '@src/types/onyx/SearchResults';
+import SCREENS from '@src/SCREENS';
+import type {Policy} from '@src/types/onyx';
 
-import type {OnyxEntry} from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
-
-import {useIsFocused} from '@react-navigation/native';
-import {useEffect, useEffectEvent} from 'react';
-
-const INSIGHT_STATE = {
-    OFFLINE: 'offline',
-    ERROR: 'error',
-    LOADING: 'loading',
-    EMPTY: 'empty',
-    READY: 'ready',
-} as const;
+import type {OnyxCollection} from 'react-native-onyx';
 
 function isChartView(view: SearchView): view is ChartView {
     return view === CONST.SEARCH.VIEW.BAR || view === CONST.SEARCH.VIEW.LINE || view === CONST.SEARCH.VIEW.PIE;
 }
 
-function getInsightState(
-    isOffline: boolean,
-    searchResults: OnyxEntry<SearchResults>,
-    queryJSON: SearchQueryJSON | undefined,
-    sortedData: GroupedItem[] | undefined,
-): ValueOf<typeof INSIGHT_STATE> {
-    const isDataLoaded = isSearchDataLoaded(searchResults, queryJSON);
-
-    if (isOffline && !isDataLoaded) {
-        return INSIGHT_STATE.OFFLINE;
-    }
-    if (!isOffline && Object.keys(searchResults?.errors ?? {}).length > 0) {
-        return INSIGHT_STATE.ERROR;
-    }
-    if (!isDataLoaded) {
-        return INSIGHT_STATE.LOADING;
-    }
-    if (!sortedData?.length) {
-        return INSIGHT_STATE.EMPTY;
-    }
-    return INSIGHT_STATE.READY;
+/** Joining a workspace adds its members' spend to the chart without touching any local expense. */
+function policyIDsSelector(policies: OnyxCollection<Policy>): string {
+    return Object.values(policies ?? {})
+        .map((policy) => policy?.id)
+        .filter((policyID): policyID is string => !!policyID)
+        .sort()
+        .join(',');
 }
 
 function useInsightData(config: SearchTypeMenuItem | undefined, isConfigResolved = true) {
@@ -62,7 +38,9 @@ function useInsightData(config: SearchTypeMenuItem | undefined, isConfigResolved
     const [searchResults] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON?.hash}`);
 
     const {isOffline} = useNetwork();
-    const isFocused = useIsFocused();
+    // The chart is built from a snapshot that no update patches, so an expense change has to move the key.
+    const [spendDataSignature] = useOnyx(ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE);
+    const [policyIDs] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policyIDsSelector});
 
     const retry = () => {
         // `search.isLoading` is persisted and may be stale after a reload. Call `search()` again and let it ignore a request that is still running.
@@ -81,30 +59,20 @@ function useInsightData(config: SearchTypeMenuItem | undefined, isConfigResolved
         });
     };
 
-    const onConfigChanged = useEffectEvent(() => {
-        retry();
-    });
-
-    useEffect(() => {
-        if (!isFocused) {
-            return;
-        }
-        onConfigChanged();
-    }, [queryJSON?.hash, isOffline, isFocused, isConfigResolved]);
+    useTabFocusedRefresh(SCREENS.HOME, [queryJSON?.hash, isOffline, isConfigResolved, spendDataSignature?.expenses ?? 0, policyIDs ?? ''].join('|'), retry);
 
     const sortedData = useGroupedItems(searchResults, queryJSON);
 
-    const state = isConfigResolved ? getInsightState(isOffline, searchResults, queryJSON, sortedData) : INSIGHT_STATE.LOADING;
+    const {data, state} = isConfigResolved ? resolveInsightsChartData({snapshot: searchResults, queryJSON, sortedData, isOffline}) : {data: [], state: INSIGHTS_CHART_STATE.LOADING};
 
     return {
         queryJSON,
         groupBy,
         view,
-        sortedData,
+        data,
         state,
         retry,
     };
 }
 
-export {INSIGHT_STATE, getInsightState};
 export default useInsightData;
diff --git a/src/pages/home/RecentlyAddedSection/index.tsx b/src/pages/home/RecentlyAddedSection/index.tsx
index 14231d5b6183..931acf6c286d 100644
--- a/src/pages/home/RecentlyAddedSection/index.tsx
+++ b/src/pages/home/RecentlyAddedSection/index.tsx
@@ -11,7 +11,7 @@ import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import {CAROUSEL_SOURCE, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import Navigation from '@libs/Navigation/Navigation';
 import {buildQueryStringFromFilterFormValues} from '@libs/SearchQueryUtils';
 import type {TransactionThreadNavigationDescriptor} from '@libs/TransactionThreadNavigationUtils';
@@ -83,9 +83,12 @@ function RecentlyAddedSection() {
         // Each row opens a single-expense view that always lands in (Wide) RHP on both layouts so the carousel
         // arrows are available. Marking the report as an expense lets the RHP open wide immediately, before its
         // data loads, instead of flickering from narrow to wide.
-        setActiveTransactionIDs(siblingTransactionIDs, siblingDescriptorsByTransactionID).then(() => {
+        setActiveTransactionIDs(siblingTransactionIDs, {source: CAROUSEL_SOURCE.homeRecentlyAdded, descriptors: siblingDescriptorsByTransactionID}).then(() => {
             markReportRHPWidth(reportID, 'wide');
-            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, backTo: ROUTES.HOME}));
+            // The anchor is what lets the header show the carousel on a cold open: getReportIDToOpenForExpense
+            // resolves the snapshot's childReportID without materializing the thread, so the header has no
+            // transaction of its own until OpenReport round-trips, and the counter would pop in only after that.
+            Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute({reportID, backTo: ROUTES.HOME, anchorTransactionID: expense.transactionID}));
         });
     };
 
diff --git a/src/pages/home/RecentlyAddedSection/useRecentlyAddedData.ts b/src/pages/home/RecentlyAddedSection/useRecentlyAddedData.ts
index 4b8f82966c7e..00b9a301afa0 100644
--- a/src/pages/home/RecentlyAddedSection/useRecentlyAddedData.ts
+++ b/src/pages/home/RecentlyAddedSection/useRecentlyAddedData.ts
@@ -2,21 +2,22 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import useTabFocusedRefresh from '@hooks/useTabFocusedRefresh';
 
 import {search} from '@libs/actions/Search';
-import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
+import {getExpenseCreationIOUActionForTransactionID} from '@libs/ReportActionsUtils';
 import {buildQueryStringFromFilterFormValues, buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 import {getAmount, getCreated, getCurrency, getMerchantName, getTransactionPendingAction} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
 import type {Report, ReportAction, Transaction} from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
-import {useIsFocused} from '@react-navigation/native';
-import {useEffect, useEffectEvent, useMemo, useState} from 'react';
+import {useMemo, useState} from 'react';
 
 /** A single expense row surfaced by the Recently added slot. */
 type RecentlyAddedExpense = {
@@ -98,7 +99,6 @@ function useRecentlyAddedData(): RecentlyAddedData {
     const {accountID} = useCurrentUserPersonalDetails();
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
-    const isFocused = useIsFocused();
 
     const query = useMemo(
         () =>
@@ -112,6 +112,8 @@ function useRecentlyAddedData(): RecentlyAddedData {
     const hash = queryJSON?.hash;
 
     const [searchResults] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`);
+    const [spendDataSignature] = useOnyx(ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE);
+
     // Read by key only, never iterated: the collection holds tens of thousands of entries.
     const [localTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
     const [pendingTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {selector: pendingTransactionIDsSelector});
@@ -125,7 +127,7 @@ function useRecentlyAddedData(): RecentlyAddedData {
     // keeps it suppressed until the snapshot catches up.
     const [deletedTransactionIDs, setDeletedTransactionIDs] = useState(() => new Set<string>());
 
-    const fireSearch = useEffectEvent(() => {
+    const fireSearch = () => {
         if (isOffline || !queryJSON) {
             return;
         }
@@ -139,14 +141,10 @@ function useRecentlyAddedData(): RecentlyAddedData {
             // The query only filters on the current accountID, which is available before OpenApp responds. Don't sit behind it.
             skipWaitForWrites: true,
         });
-    });
+    };
 
-    useEffect(() => {
-        if (!isFocused) {
-            return;
-        }
-        fireSearch();
-    }, [isFocused, isOffline, hash]);
+    // The list below only patches in expenses made on this device. One made elsewhere arrives here.
+    useTabFocusedRefresh(SCREENS.HOME, [hash, isOffline, spendDataSignature?.expenses ?? 0].join('|'), fireSearch);
 
     const snapshotData = searchResults?.data;
 
@@ -271,7 +269,7 @@ function useRecentlyAddedData(): RecentlyAddedData {
                     // displayed amount must be negated for them (mirrors the Search transaction list).
                     amount: getAmount(sourceTransaction, isFromExpenseReport, isFromTrackedExpense),
                     currency: getCurrency(sourceTransaction),
-                    reportAction: getIOUActionForTransactionID(snapshotReportActions, transaction.transactionID),
+                    reportAction: getExpenseCreationIOUActionForTransactionID(snapshotReportActions, transaction.transactionID),
                     report: reportByReportID.get(transaction.reportID),
                     // Derive from the local copy so an offline edit (which sets `pendingFields`, not `pendingAction`)
                     // still surfaces the pending state, alongside offline creates (ADD) and deletes (DELETE).
diff --git a/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx b/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx
index 4e3f1809a749..0060836f5874 100644
--- a/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx
+++ b/src/pages/home/TimeSensitiveSection/items/UnlockBankAccount.tsx
@@ -6,6 +6,7 @@ import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 
 import {pressLockedBankAccount} from '@libs/actions/BankAccounts';
 import {navigateToConciergeChat} from '@libs/actions/Report';
@@ -30,6 +31,7 @@ function UnlockBankAccount({bankAccountID, policyName}: UnlockBankAccountProps)
     const icons = useMemoizedLazyExpensifyIcons(['BankLock']);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     const delegateAccountID = useDelegateAccountID();
@@ -49,7 +51,7 @@ function UnlockBankAccount({bankAccountID, policyName}: UnlockBankAccountProps)
             return;
         }
         pressLockedBankAccount(bankAccountID, translate, conciergeReportID, delegateAccountID, initiatingBankAccountUnlock);
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed});
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails});
     };
 
     return (
diff --git a/src/pages/home/YourSpendSection/useYourSpendData.ts b/src/pages/home/YourSpendSection/useYourSpendData.ts
index 1c717a13cd89..8aa681848b6c 100644
--- a/src/pages/home/YourSpendSection/useYourSpendData.ts
+++ b/src/pages/home/YourSpendSection/useYourSpendData.ts
@@ -2,6 +2,7 @@ import useCardFeedErrors from '@hooks/useCardFeedErrors';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import useTabFocusedRefresh from '@hooks/useTabFocusedRefresh';
 
 import {search} from '@libs/actions/Search';
 import {WRITE_COMMANDS} from '@libs/API/types';
@@ -12,6 +13,7 @@ import {isGroupEntry} from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
 import type {Card, Policy, Report} from '@src/types/onyx';
 import type {CardFeedWithNumber} from '@src/types/onyx/CardFeeds';
 import type {AnyRequest} from '@src/types/onyx/Request';
@@ -20,8 +22,7 @@ import type SearchResults from '@src/types/onyx/SearchResults';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 
-import {useIsFocused} from '@react-navigation/native';
-import {useEffect, useEffectEvent, useMemo, useState} from 'react';
+import {useMemo, useState} from 'react';
 
 import {YOUR_SPEND_CARD_KIND, YOUR_SPEND_ROW_STATE} from './const';
 import {buildAwaitingApprovalQuery, buildCardGroupQuery, buildRecentCardTransactionsQuery, buildRepaidLast30DaysQuery} from './queries';
@@ -376,10 +377,10 @@ function getYourSpendRowState({isApplicable, isOffline, searchResults}: GetYourS
 function useYourSpendData(): UseYourSpendDataReturn {
     const {accountID} = useCurrentUserPersonalDetails();
     const {isOffline} = useNetwork();
-    const isFocused = useIsFocused();
 
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
+    const [spendDataSignature] = useOnyx(ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE);
 
     const {isApprovalApplicable, isPaymentApplicable, paidGroupPolicyIDs} = getYourSpendApplicability(policies);
 
@@ -407,6 +408,7 @@ function useYourSpendData(): UseYourSpendDataReturn {
         selector: (reports) => getYourSpendReportsSignature(reports, paidGroupPolicyIDs, accountID),
     });
     const outstandingReportsSignature = reportsSignature?.outstandingReportIDs ?? '';
+    const reimbursedReportsSignature = reportsSignature?.reimbursedReportIDs ?? '';
     const [queuedSpendRequests] = useOnyx(ONYXKEYS.PERSISTED_REQUESTS, {selector: projectQueuedSpendRequests});
     const [ongoingSpendRequests] = useOnyx(ONYXKEYS.PERSISTED_ONGOING_REQUESTS, {selector: projectOngoingSpendRequest});
     const pendingSpendBuckets = useMemo(
@@ -539,52 +541,57 @@ function useYourSpendData(): UseYourSpendDataReturn {
     const {state: approvalRowState, totals: approvalTotals} = useOfflineFrozenSpendRow(isOffline, isApprovalApplicable, approvalRowStateLive, approvalTotalsLive, approvalHash);
     const {state: paymentRowState, totals: paymentTotals} = useOfflineFrozenSpendRow(isOffline, isPaymentApplicable, paymentRowStateLive, paymentTotalsLive, paymentQueryJSON?.hash);
 
-    // Re-fires the search effect when applicability flips, the user joins/leaves a workspace
-    // (which changes the policyID filter), or the set of OUTSTANDING reports changes.
-    const applicabilityKey = [isApprovalApplicable ? 1 : 0, isPaymentApplicable ? 1 : 0, paidGroupPolicyIDs.join(','), outstandingReportsSignature].join('|');
-
-    const fireSearches = useEffectEvent(() => {
-        if (isOffline) {
+    // One key per search, so a card charge does not also refetch the approval and payment totals.
+    const fireCardSearch = () => {
+        if (isOffline || !cardGroupQueryJSON) {
             return;
         }
-        if (cardGroupQueryJSON) {
-            search({
-                queryJSON: cardGroupQueryJSON,
-                searchKey: undefined,
-                offset: 0,
-                isLoading: false,
-                shouldCalculateTotals: true,
-                shouldUpdateLastSearchParams: false,
-            });
-        }
-        if (isApprovalApplicable && approvalQueryJSON) {
-            search({
-                queryJSON: approvalQueryJSON,
-                searchKey: undefined,
-                offset: 0,
-                isLoading: false,
-                shouldCalculateTotals: true,
-                shouldUpdateLastSearchParams: false,
-            });
-        }
-        if (isPaymentApplicable && paymentQueryJSON) {
-            search({
-                queryJSON: paymentQueryJSON,
-                searchKey: undefined,
-                offset: 0,
-                isLoading: false,
-                shouldCalculateTotals: true,
-                shouldUpdateLastSearchParams: false,
-            });
+        search({
+            queryJSON: cardGroupQueryJSON,
+            searchKey: undefined,
+            offset: 0,
+            isLoading: false,
+            shouldCalculateTotals: true,
+            shouldUpdateLastSearchParams: false,
+        });
+    };
+
+    const fireApprovalSearch = () => {
+        if (isOffline || !isApprovalApplicable || !approvalQueryJSON) {
+            return;
         }
-    });
+        search({
+            queryJSON: approvalQueryJSON,
+            searchKey: undefined,
+            offset: 0,
+            isLoading: false,
+            shouldCalculateTotals: true,
+            shouldUpdateLastSearchParams: false,
+        });
+    };
 
-    useEffect(() => {
-        if (!isFocused) {
+    const firePaymentSearch = () => {
+        if (isOffline || !isPaymentApplicable || !paymentQueryJSON) {
             return;
         }
-        fireSearches();
-    }, [isFocused, isOffline, cardGroupQueryJSON?.hash, applicabilityKey, accountID]);
+        search({
+            queryJSON: paymentQueryJSON,
+            searchKey: undefined,
+            offset: 0,
+            isLoading: false,
+            shouldCalculateTotals: true,
+            shouldUpdateLastSearchParams: false,
+        });
+    };
+
+    useTabFocusedRefresh(SCREENS.HOME, [isOffline, accountID, cardGroupQueryJSON?.hash, spendDataSignature?.cardExpenses ?? 0].join('|'), fireCardSearch);
+    useTabFocusedRefresh(
+        SCREENS.HOME,
+        // The expense counter catches edits on a report that is already outstanding, which leave the report list unchanged.
+        [isOffline, accountID, approvalQueryJSON?.hash, isApprovalApplicable ? 1 : 0, paidGroupPolicyIDs.join(','), outstandingReportsSignature, spendDataSignature?.expenses ?? 0].join('|'),
+        fireApprovalSearch,
+    );
+    useTabFocusedRefresh(SCREENS.HOME, [isOffline, accountID, paymentQueryJSON?.hash, isPaymentApplicable ? 1 : 0, reimbursedReportsSignature].join('|'), firePaymentSearch);
 
     return {
         approvalRowState,
diff --git a/src/pages/inbox/AccountManagerBanner.tsx b/src/pages/inbox/AccountManagerBanner.tsx
deleted file mode 100644
index 46c90ab4860f..000000000000
--- a/src/pages/inbox/AccountManagerBanner.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import Banner from '@components/Banner';
-
-import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
-import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import Navigation from '@libs/Navigation/Navigation';
-import {temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
-import {isConciergeChatReport} from '@libs/ReportUtils';
-
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-
-import {personalDetailsSelector} from '@selectors/PersonalDetails';
-import React, {useState} from 'react';
-
-type AccountManagerBannerProps = {
-    reportID: string | undefined;
-};
-
-function AccountManagerBanner({reportID}: AccountManagerBannerProps) {
-    const styles = useThemeStyles();
-    const {translate, formatPhoneNumber} = useLocalize();
-    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Lightbulb']);
-    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`);
-    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
-    const [accountManagerData] = useOnyx(ONYXKEYS.ACCOUNT, {
-        selector: (account) => ({
-            accountManagerReportID: account?.accountManagerReportID,
-            accountManagerAccountID: account?.accountManagerAccountID,
-        }),
-    });
-    const accountManagerReportID = accountManagerData?.accountManagerReportID;
-    const accountManagerAccountID = accountManagerData?.accountManagerAccountID ?? CONST.DEFAULT_MISSING_ID;
-    const [participantPersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsSelector(accountManagerAccountID),
-    });
-    const [isBannerVisible, setIsBannerVisible] = useState(true);
-
-    if (!accountManagerReportID || !isConciergeChatReport(report, conciergeReportID) || !isBannerVisible) {
-        return null;
-    }
-    const displayName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: participantPersonalDetail, translate, formatPhoneNumber});
-    const login = participantPersonalDetail?.login;
-    const chatWithAccountManagerText = displayName && login ? translate('common.chatWithAccountManager', `${displayName} (${login})`) : '';
-
-    const dismissBanner = () => setIsBannerVisible(false);
-    const chatWithAccountManager = () => {
-        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(accountManagerReportID));
-    };
-
-    return (
-        <Banner
-            containerStyles={[styles.mh4, styles.mt4, styles.p4, styles.br2, styles.breakWord]}
-            text={chatWithAccountManagerText}
-            onClose={dismissBanner}
-            onButtonPress={chatWithAccountManager}
-            shouldShowCloseButton
-            icon={expensifyIcons.Lightbulb}
-            shouldShowIcon
-            shouldShowButton
-        />
-    );
-}
-
-AccountManagerBanner.displayName = 'AccountManagerBanner';
-
-export default AccountManagerBanner;
diff --git a/src/pages/inbox/AgentZeroStatusContext.tsx b/src/pages/inbox/AgentZeroStatusContext.tsx
index 6a913fb0c9be..62c775a5081c 100644
--- a/src/pages/inbox/AgentZeroStatusContext.tsx
+++ b/src/pages/inbox/AgentZeroStatusContext.tsx
@@ -1,4 +1,5 @@
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 
 import {clearConciergeThinkingKickoff, subscribeToReportReasoningEvents, unsubscribeFromReportReasoningChannel} from '@libs/actions/Report';
 import AgentZeroOptimisticStore from '@libs/AgentZeroOptimisticStore';
@@ -82,7 +83,7 @@ const AgentZeroStatusActionsContext = createContext<AgentZeroStatusActions>(defa
 function AgentZeroStatusProvider({reportID, children}: React.PropsWithChildren<{reportID: string | undefined}>) {
     const [reportMeta] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: reportMetaSelector});
     const {chatType, isDM: isDMReport = false, parentReportID, participantAccountIDs} = reportMeta ?? {};
-    const [agentParticipantAccountID] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: getCustomAgentParticipantAccountID(participantAccountIDs)});
+    const [agentParticipantAccountID] = usePersonalDetailsByIDs(participantAccountIDs, getCustomAgentParticipantAccountID(participantAccountIDs));
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [currentUserAccountID] = useOnyx(ONYXKEYS.SESSION, {selector: accountIDSelector});
 
diff --git a/src/pages/inbox/ConciergeDraftContext.tsx b/src/pages/inbox/ConciergeDraftContext.tsx
index 07297f60c2ac..d646ab8a4ddb 100644
--- a/src/pages/inbox/ConciergeDraftContext.tsx
+++ b/src/pages/inbox/ConciergeDraftContext.tsx
@@ -1,4 +1,5 @@
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 
 import {isGroupPolicyByType} from '@libs/PolicyUtils';
 import type {ConciergeDraftEvent} from '@libs/Pusher/types';
@@ -50,7 +51,7 @@ const ConciergeDraftActionsContext = createContext<ConciergeDraftActions>(defaul
 function ConciergeDraftProvider({reportID, children}: React.PropsWithChildren<{reportID: string | undefined}>) {
     const [chatType] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: getReportChatType});
     const [participantAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: getReportParticipantAccountIDs});
-    const [agentParticipantAccountID] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: getCustomAgentParticipantAccountID(participantAccountIDs)});
+    const [agentParticipantAccountID] = usePersonalDetailsByIDs(participantAccountIDs, getCustomAgentParticipantAccountID(participantAccountIDs));
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [parentReportID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {selector: getReportParentReportID});
 
diff --git a/src/pages/inbox/HeaderView.tsx b/src/pages/inbox/HeaderView.tsx
index 94be13a4eb84..c6cd282640fa 100644
--- a/src/pages/inbox/HeaderView.tsx
+++ b/src/pages/inbox/HeaderView.tsx
@@ -27,6 +27,7 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useParentReportAction from '@hooks/useParentReportAction';
 import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import {useDerivedReportNamesByReportIDs} from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
@@ -93,7 +94,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {useRoute} from '@react-navigation/native';
 import {accountGuideDetailsSelector} from '@selectors/Account';
-import {accountIDSelector, isOptimisticPersonalDetailSelector} from '@selectors/PersonalDetails';
+import {accountIDSelector, isPersonalDetailOptimistic} from '@selectors/PersonalDetails';
 import {pendingChatMembersSelector} from '@selectors/ReportMetaData';
 import {isPast} from 'date-fns';
 import React, {useMemo} from 'react';
@@ -120,7 +121,7 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
     const [grandParentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(parentReport?.parentReportID)}`);
     const grandParentReportAction = useParentReportAction(parentReport);
     const policy = usePolicy(report?.policyID);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [userBillingFundID] = useOnyx(ONYXKEYS.NVP_BILLING_FUND_ID);
     const [firstDayFreeTrial] = useOnyx(ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL);
     const [lastDayFreeTrial] = useOnyx(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL);
@@ -155,7 +156,6 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
     const participants = allParticipants.slice(0, CONST.DISPLAY_PARTICIPANTS_LIMIT);
     const isMultipleParticipant = participants.length > 1;
     const firstParticipantAccountID = participants.at(0) ?? CONST.DEFAULT_NUMBER_ID;
-    const [isParticipantOptimistic = true] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: isOptimisticPersonalDetailSelector(firstParticipantAccountID)});
 
     const participantPersonalDetails = getPersonalDetailsForAccountIDs(participants, personalDetails);
     const displayNamesWithTooltips = getDisplayNamesWithTooltips(participantPersonalDetails, isMultipleParticipant, localeCompare, formatPhoneNumber, translate, undefined, isSelfDM);
@@ -313,6 +313,7 @@ function HeaderView({onNavigationMenuButtonClicked, reportID}: HeaderViewProps)
 
     const shouldShowSubscript = shouldReportShowSubscript(report, isReportArchived);
     const brickRoadIndicator = hasReportNameError(report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
+    const isParticipantOptimistic = isPersonalDetailOptimistic(personalDetails?.[firstParticipantAccountID]);
     const shouldDisableDetailPage = shouldDisableDetailPageReportUtils(report, isParticipantOptimistic);
     const shouldUseGroupTitle = isGroupChat && (!!report?.reportName || !isMultipleParticipant);
     const isLoading = !report?.reportID || !title;
diff --git a/src/pages/inbox/ReportFetchHandler.tsx b/src/pages/inbox/ReportFetchHandler.tsx
index 5ed69c8e97ef..dd456bcb912a 100644
--- a/src/pages/inbox/ReportFetchHandler.tsx
+++ b/src/pages/inbox/ReportFetchHandler.tsx
@@ -484,6 +484,27 @@ function ReportFetchHandler() {
         updateLoadingInitialReportAction(reportIDFromRoute, true);
     }, [reportIDFromRoute, reportLoadingState.hasOnceLoadedReportActions]);
 
+    // "Clear cache and restart" drops the memory-only `hasOnceLoadedReportActions` under a mounted report screen, and
+    // nothing re-fetches, so the effect above re-arms `isLoadingInitialReportActions` for a load that never comes and
+    // the report preview spins forever. Re-fetch only when a stamp this screen saw for the same reportID is lost, so a
+    // normal open or a switch to another report does not double up on the fetch effect below. See issue #100524.
+    const stampedReportIDRef = useRef<string | undefined>(undefined);
+    useEffect(() => {
+        if (reportLoadingState.hasOnceLoadedReportActions) {
+            stampedReportIDRef.current = reportIDFromRoute;
+            return;
+        }
+
+        // Held while the Inbox tab is merely preloaded, like every other fetch here: OpenReport would mark a report
+        // the user has never opened as read. The ref survives the bail, so opening the tab re-runs this effect and
+        // the fetch is deferred rather than lost.
+        if (stampedReportIDRef.current !== reportIDFromRoute || !isFocused || isOffline || isInPreloadedTab) {
+            return;
+        }
+        stampedReportIDRef.current = undefined;
+        fetchReport();
+    }, [reportIDFromRoute, reportLoadingState.hasOnceLoadedReportActions, isFocused, isOffline, isInPreloadedTab]);
+
     // isLoadingInitialReportActions only clears via OpenReport's success/failure Onyx update (no client timeout), so
     // a reconciliation stall that pauses the queue before that response arrives leaves the skeleton stuck with
     // nothing else to log it. See Expensify#667674.
diff --git a/src/pages/inbox/ReportNavigateAwayHandler.tsx b/src/pages/inbox/ReportNavigateAwayHandler.tsx
index 8eef1491ccad..531a5ba69f16 100644
--- a/src/pages/inbox/ReportNavigateAwayHandler.tsx
+++ b/src/pages/inbox/ReportNavigateAwayHandler.tsx
@@ -3,6 +3,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useIsOwnWorkspaceChatRef from '@hooks/useIsOwnWorkspaceChatRef';
 import useOnyx from '@hooks/useOnyx';
 import useParentReportAction from '@hooks/useParentReportAction';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import usePrevious from '@hooks/usePrevious';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
@@ -73,6 +74,7 @@ function ReportNavigateAwayHandler() {
     const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportIDFromRoute}`);
     const [userLeavingStatus = false] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportIDFromRoute}`);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [onboarding] = useOnyx(ONYXKEYS.NVP_ONBOARDING);
     const isSelfTourViewed = onboarding?.selfTourViewed;
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
@@ -142,7 +144,7 @@ function ReportNavigateAwayHandler() {
         }
 
         Navigation.isNavigationReady().then(() => {
-            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
         });
     });
 
@@ -233,9 +235,20 @@ function ReportNavigateAwayHandler() {
             }
 
             // Fallback to Concierge
-            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed});
+            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails});
         });
-    }, [reportWasDeleted, previousReportWasDeleted, isFocused, deletedReportParentID, conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, reportIDFromRoute]);
+    }, [
+        reportWasDeleted,
+        previousReportWasDeleted,
+        isFocused,
+        deletedReportParentID,
+        conciergeReportID,
+        introSelected,
+        currentUserAccountID,
+        isSelfTourViewed,
+        conciergePersonalDetails,
+        reportIDFromRoute,
+    ]);
 
     return null;
 }
diff --git a/src/pages/inbox/ReportScreen.tsx b/src/pages/inbox/ReportScreen.tsx
index e7f927b21ead..13553611777b 100644
--- a/src/pages/inbox/ReportScreen.tsx
+++ b/src/pages/inbox/ReportScreen.tsx
@@ -27,7 +27,6 @@ import {View} from 'react-native';
 
 import type ReportScreenNavigationProps from './types';
 
-import AccountManagerBanner from './AccountManagerBanner';
 import {ActionListContextProvider} from './ActionListContext';
 import {AgentZeroStatusProvider} from './AgentZeroStatusContext';
 import {ConciergeDraftProvider} from './ConciergeDraftContext';
@@ -132,7 +131,6 @@ function ReportScreen({route, navigation, shouldDeferReportActions = false}: Rep
                                         {!shouldDeferNonEssentials && <ReportLifecycleHandler reportID={reportIDFromRoute} />}
                                         <CollapsibleHeaderOnKeyboard>
                                             <ReportHeader />
-                                            {!shouldDeferNonEssentials && <AccountManagerBanner reportID={reportIDFromRoute} />}
                                         </CollapsibleHeaderOnKeyboard>
                                         <OfflineWithFeedback
                                             pendingAction={reportPendingAction}
diff --git a/src/pages/inbox/conciergeDraftState.ts b/src/pages/inbox/conciergeDraftState.ts
index f697c2872238..aca78ccba544 100644
--- a/src/pages/inbox/conciergeDraftState.ts
+++ b/src/pages/inbox/conciergeDraftState.ts
@@ -592,7 +592,11 @@ function buildConciergeDraftReportAction({
     reportID,
     isGroupPolicyReport,
 }: BuildConciergeDraftReportActionParams): ReportAction | null {
-    const html = finalRenderedHTML ?? (bodyMarkdown ? getParsedComment(stripIncompleteMarkdown(bodyMarkdown), {reportID}, undefined, undefined, isGroupPolicyReport) : '');
+    // ExpensiMark escapes entities that the server renders as literal text. Keep the
+    // canonical Markdown for pacing, but wait for final HTML from the first ampersand.
+    const ampersandIndex = bodyMarkdown?.indexOf('&') ?? -1;
+    const visibleBodyMarkdown = ampersandIndex === -1 ? bodyMarkdown : bodyMarkdown?.slice(0, ampersandIndex);
+    const html = finalRenderedHTML ?? (visibleBodyMarkdown ? getParsedComment(stripIncompleteMarkdown(visibleBodyMarkdown), {reportID}, undefined, undefined, isGroupPolicyReport) : '');
 
     if (!html) {
         return null;
diff --git a/src/pages/inbox/report/AncestorReportActionItem.tsx b/src/pages/inbox/report/AncestorReportActionItem.tsx
index c190bd450ac1..caf4dbb51e8d 100644
--- a/src/pages/inbox/report/AncestorReportActionItem.tsx
+++ b/src/pages/inbox/report/AncestorReportActionItem.tsx
@@ -9,7 +9,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
-import {isTripPreview} from '@libs/ReportActionsUtils';
+import {getLatestConciergeFeedbackActionIDFromReportActions, isTripPreview} from '@libs/ReportActionsUtils';
 import {
     canCurrentUserOpenReport,
     canUserPerformWriteAction as canUserPerformWriteActionReportUtils,
@@ -59,6 +59,9 @@ type AncestorReportActionItemProps = {
 
     linkedTransactionRouteError: Errors | undefined;
     parentReportAction: OnyxEntry<ReportAction>;
+
+    /** Whether the report being viewed allows the Concierge feedback prompt on the message it hangs off */
+    shouldAllowConciergeFeedback: boolean;
     shouldUseThreadDividerLine: boolean;
     transactionThreadReport: OnyxEntry<Report>;
 };
@@ -77,6 +80,7 @@ function AncestorReportActionItem({
     isSelfTourViewed,
     linkedTransactionRouteError,
     parentReportAction,
+    shouldAllowConciergeFeedback,
     shouldUseThreadDividerLine,
     transactionThreadReport,
 }: AncestorReportActionItemProps) {
@@ -89,6 +93,11 @@ function AncestorReportActionItem({
 
     const {isBetaEnabled} = usePermissions();
 
+    // The message shown above a thread belongs to the parent report, so its own actions decide whether it is the newest Concierge answer
+    const [latestConciergeFeedbackActionID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(report?.reportID)}`, {
+        selector: getLatestConciergeFeedbackActionIDFromReportActions,
+    });
+
     const shouldDisplayThreadDivider = !isTripPreview(reportAction);
     const isAncestorReportArchived = isArchivedReport(reportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`]);
     const canOpenAncestorReport = canCurrentUserOpenReport(report, isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS), hasGuidesEmails, isAncestorReportArchived);
@@ -156,6 +165,7 @@ function AncestorReportActionItem({
                 isFirstVisibleReportAction={isFirstVisibleReportAction}
                 shouldUseThreadDividerLine={shouldUseThreadDividerLine}
                 isThreadReportParentAction
+                isLatestConciergeFeedbackAction={shouldAllowConciergeFeedback && !!latestConciergeFeedbackActionID && latestConciergeFeedbackActionID === reportAction.reportActionID}
                 linkedTransactionRouteError={linkedTransactionRouteError}
             />
         </OfflineWithFeedback>
diff --git a/src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx b/src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx
index ce5df390086d..f56bd19c3819 100755
--- a/src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx
+++ b/src/pages/inbox/report/ContextMenu/BaseReportActionContextMenu.tsx
@@ -18,6 +18,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
 import useReportAttributes, {useDerivedIsEmptyReport, useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
+import useReportIDToNameMap from '@hooks/useReportIDToNameMap';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useReportOrReportDraft from '@hooks/useReportOrReportDraft';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -243,6 +244,7 @@ function BaseReportActionContextMenu({
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const personalDetails = usePersonalDetails();
     const reportAttributes = useReportAttributes();
@@ -304,6 +306,7 @@ function BaseReportActionContextMenu({
                 isHarvestReport,
                 currentUserAccountID: currentUserPersonalDetails?.accountID,
                 rules,
+                cardList,
             }),
     );
 
@@ -377,6 +380,8 @@ function BaseReportActionContextMenu({
 
     const bottomSafeAreaPaddingStyle = useBottomSafeSafeAreaPaddingStyle({addBottomSafeAreaPadding: enableEdgeToEdgeBottomSafeAreaPadding, style: wrapperStyle});
 
+    const reportIDToName = useReportIDToNameMap();
+
     return (
         (isVisible || shouldKeepOpen || !isMini) && (
             <FocusTrapForModal active={!isMini && !isSmallScreenWidth && (isVisible || shouldKeepOpen)}>
@@ -392,6 +397,7 @@ function BaseReportActionContextMenu({
                                 reportActions,
                                 childReportActions,
                                 originalReportActions,
+                                reportIDToName,
                                 // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
                                 reportAction: (reportAction ?? null) as ReportAction,
                                 reportID,
diff --git a/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx b/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx
index 88573e1b5fdf..7e2138559971 100644
--- a/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx
@@ -27,6 +27,7 @@ import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManag
 import stripFollowupListFromHtml from '@libs/ReportActionFollowupUtils/stripFollowupListFromHtml';
 import {
     getActionableCard3DSTransactionApprovalMessage,
+    getAgentPromptUpdatedMessage,
     getActionableCardFraudAlertMessage,
     getActionableMentionWhisperMessage,
     getAddedApprovalRuleMessage,
@@ -35,6 +36,7 @@ import {
     getAddedConnectionMessage,
     getApprovalLimitUpdateMessage,
     getAssignedCompanyCardMessage,
+    getAutoCategorizeNewExpensesMessage,
     getAutoPayApprovedReportsEnabledMessage,
     getAutoReimbursementMessage,
     getCardConnectionBrokenMessage,
@@ -114,6 +116,7 @@ import {
     getUpdatedDefaultTitleMessage,
     getUpdatedIndividualBudgetNotificationMessage,
     getUpdatedManualApprovalThresholdMessage,
+    getUpdatedMemberWorkArrangementMessage,
     getUpdatedOwnershipMessage,
     getUpdatedProhibitedExpensesMessage,
     getUpdatedReimbursementChoiceMessage,
@@ -228,6 +231,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {
     BankAccountList,
+    CardList,
     Card,
     Download as DownloadOnyx,
     IntroSelected,
@@ -267,12 +271,12 @@ function getActionHtml(reportAction: OnyxInputOrEntry<ReportAction>): string {
 }
 
 /** Sets the HTML string to Clipboard */
-function setClipboardMessage(content: string | undefined) {
+function setClipboardMessage(content: string | undefined, reportIDToName?: Record<string, string>) {
     const strippedContent = stripFollowupListFromHtml(content);
     if (!strippedContent) {
         return;
     }
-    const clipboardText = getClipboardText(strippedContent);
+    const clipboardText = getClipboardText(strippedContent, reportIDToName);
     if (!Clipboard.canSetHtml()) {
         Clipboard.setString(clipboardText);
     } else {
@@ -281,12 +285,13 @@ function setClipboardMessage(content: string | undefined) {
 }
 
 /** Sets the HTML string to Clipboard after stripping the SMS domain from any user mentions */
-function setClipboardMessageWithCleanedMentions(value: string) {
+function setClipboardMessageWithCleanedMentions(value: string, reportIDToName?: Record<string, string>) {
     setClipboardMessage(
         value.replaceAll(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag: string, innerContent: string, closeTag: string): string => {
             const modifiedContent = Str.removeSMSDomain(innerContent) || '';
             return openTag + modifiedContent + closeTag || '';
         }),
+        reportIDToName,
     );
 }
 
@@ -316,6 +321,7 @@ type ShouldShow = (args: {
     isHarvestReport?: boolean;
     currentUserAccountID: number;
     rules: OnyxCollection<Rule>;
+    cardList: OnyxEntry<CardList>;
 }) => boolean;
 
 type ContextMenuActionPayload = {
@@ -377,6 +383,7 @@ type ContextMenuActionPayload = {
     reportAttributes: ReportAttributesDerivedValue['reports'] | undefined;
     memberChangeLogRoomReportName: string | undefined;
     rules: OnyxCollection<Rule>;
+    reportIDToName: Record<string, string>;
 };
 
 type OnPress = (closePopover: boolean, payload: ContextMenuActionPayload, selection?: string, reportID?: string) => void;
@@ -651,6 +658,7 @@ const ContextMenuActions: ContextMenuAction[] = [
                 conciergeChat,
                 isOffline,
                 personalDetails,
+                reportIDToName,
             },
         ) => {
             if (isMoneyRequestAction(reportAction) || isMoneyRequestAction(moneyRequestAction)) {
@@ -667,7 +675,13 @@ const ContextMenuActions: ContextMenuAction[] = [
                 return;
             }
             const editAction = () => {
-                saveReportActionDraft(originalReportID ?? reportID, reportAction, originalReportActions ?? reportActions, Parser.htmlToMarkdown(getActionHtml(reportAction)), isOffline);
+                saveReportActionDraft(
+                    originalReportID ?? reportID,
+                    reportAction,
+                    originalReportActions ?? reportActions,
+                    Parser.htmlToMarkdown(getActionHtml(reportAction), {reportIDToName}),
+                    isOffline,
+                );
             };
 
             if (closePopover) {
@@ -1031,6 +1045,7 @@ const ContextMenuActions: ContextMenuAction[] = [
                 memberChangeLogRoomReportName,
                 currentUserAccountID,
                 rules,
+                reportIDToName,
             },
         ) => {
             const isReportPreviewAction = isReportPreviewActionReportActionsUtils(reportAction);
@@ -1043,7 +1058,7 @@ const ContextMenuActions: ContextMenuAction[] = [
                 if (selection) {
                     // When the user has highlighted part of a message, always copy exactly what's selected,
                     // regardless of the report action type (including system messages like "marked as paid").
-                    setClipboardMessageWithCleanedMentions(selection);
+                    setClipboardMessageWithCleanedMentions(selection, reportIDToName);
                 } else if (isReportPreviewAction) {
                     const iouReportID = getIOUReportIDFromReportActionPreview(reportAction);
                     const displayMessage = getReportPreviewMessageForCopy({
@@ -1173,6 +1188,8 @@ const ContextMenuActions: ContextMenuAction[] = [
                     Clipboard.setString(getAutoPayApprovedReportsEnabledMessage(translate, reportAction));
                 } else if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRE_COMPANY_CARDS_ENABLED) {
                     Clipboard.setString(getRequireCompanyCardsEnabledMessage(translate, reportAction));
+                } else if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES) {
+                    Clipboard.setString(getAutoCategorizeNewExpensesMessage(translate, reportAction));
                 } else if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY) {
                     Clipboard.setString(getRequiresCategoryMessage(translate, reportAction));
                 } else if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_TAG) {
@@ -1224,6 +1241,8 @@ const ContextMenuActions: ContextMenuAction[] = [
                     );
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED)) {
                     Clipboard.setString(getMarkedReimbursedMessage(translate, reportAction));
+                } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED)) {
+                    Clipboard.setString(getAgentPromptUpdatedMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSED)) {
                     Clipboard.setString(
                         getReimbursedMessage(
@@ -1303,6 +1322,8 @@ const ContextMenuActions: ContextMenuAction[] = [
                     Clipboard.setString(translate('iou.heldExpense'));
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
                     Clipboard.setString(translate('iou.unheldExpense'));
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION) {
+                    Clipboard.setString(translate('iou.undeletedExpense'));
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REJECTEDTRANSACTION_THREAD) {
                     Clipboard.setString(translate('iou.reject.reportActions.rejectedExpense'));
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REJECTED_TRANSACTION_MARKASRESOLVED) {
@@ -1425,6 +1446,8 @@ const ContextMenuActions: ContextMenuAction[] = [
                     setClipboardMessage(getUpdatedDefaultTitleMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_HARVESTING)) {
                     setClipboardMessage(getUpdatedAutoHarvestingMessage(translate, reportAction));
+                } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT)) {
+                    setClipboardMessage(getUpdatedMemberWorkArrangementMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INDIVIDUAL_BUDGET_NOTIFICATION)) {
                     setClipboardMessage(getUpdatedIndividualBudgetNotificationMessage(translate, reportAction));
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SHARED_BUDGET_NOTIFICATION)) {
@@ -1499,7 +1522,7 @@ const ContextMenuActions: ContextMenuAction[] = [
                     const missingFields = getOriginalMessage(reportAction)?.missingFields;
                     setClipboardMessage(translate('violations.smartscanFailed', {canEdit: wasActionTakenByCurrentUser(iouAction, currentUserAccountID), missingFields}));
                 } else if (content) {
-                    setClipboardMessageWithCleanedMentions(content);
+                    setClipboardMessageWithCleanedMentions(content, reportIDToName);
                 } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED)) {
                     setClipboardMessage(getSettlementAccountLockedMessage(translate, reportAction));
                 } else if (messageText) {
@@ -1689,6 +1712,7 @@ const ContextMenuActions: ContextMenuAction[] = [
             childReportActions,
             currentUserAccountID,
             rules,
+            cardList,
         }) => {
             // A single-expense report preview also exposes its embedded money request action.
             // Preserve the expense-delete flow for its author. Otherwise, use the preview action so an admin
@@ -1717,7 +1741,7 @@ const ContextMenuActions: ContextMenuAction[] = [
             return (
                 !!reportIDParam &&
                 type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION &&
-                canDeleteReportAction(actionToDelete, reportID, iouTransaction, transactions, childReportActions, currentUserAccountID, rules) &&
+                canDeleteReportAction(actionToDelete, reportID, iouTransaction, transactions, childReportActions, currentUserAccountID, rules, cardList) &&
                 !isArchivedRoom &&
                 !isChronosReport &&
                 !isMessageDeleted(reportAction)
diff --git a/src/pages/inbox/report/DelegateOnBehalfOfText.tsx b/src/pages/inbox/report/DelegateOnBehalfOfText.tsx
index abb8a8ba7418..8809288edc0f 100644
--- a/src/pages/inbox/report/DelegateOnBehalfOfText.tsx
+++ b/src/pages/inbox/report/DelegateOnBehalfOfText.tsx
@@ -1,14 +1,10 @@
 import Text from '@components/Text';
 
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
 import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-
-import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 type DelegateOnBehalfOfTextFallbackProps = {
@@ -34,7 +30,7 @@ type DelegateOnBehalfOfTextProps = {
 function DelegateOnBehalfOfText({mainAccountID, fallbackLogin}: DelegateOnBehalfOfTextProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const [resolvedDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsSelector(mainAccountID ?? CONST.DEFAULT_NUMBER_ID)});
+    const [resolvedDetail] = usePersonalDetail(mainAccountID);
 
     if (!resolvedDetail?.login) {
         return <DelegateOnBehalfOfTextFallback fallbackLogin={fallbackLogin} />;
diff --git a/src/pages/inbox/report/HumanAgentAssistedByText.tsx b/src/pages/inbox/report/HumanAgentAssistedByText.tsx
index 53591fb0545f..c016361a51a9 100644
--- a/src/pages/inbox/report/HumanAgentAssistedByText.tsx
+++ b/src/pages/inbox/report/HumanAgentAssistedByText.tsx
@@ -1,16 +1,16 @@
 import Text from '@components/Text';
 
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getHumanAgentFirstName} from '@libs/ReportActionsUtils';
+import {getHumanAgentAccountIDFromReportAction} from '@libs/ReportActionsUtils';
 
-import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
+import {firstNameSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 type HumanAgentAssistedByTextProps = {
@@ -21,9 +21,7 @@ type HumanAgentAssistedByTextProps = {
 function HumanAgentAssistedByText({action}: HumanAgentAssistedByTextProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const [humanAgentName] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: (list: OnyxEntry<OnyxTypes.PersonalDetailsList>) => getHumanAgentFirstName(action, list),
-    });
+    const [humanAgentName] = usePersonalDetail(getHumanAgentAccountIDFromReportAction(action), firstNameSelector);
     return <Text style={[styles.chatDelegateMessage]}>{translate('reportAction.assistedBy', humanAgentName ?? translate('reportAction.humanSupportAgent'))}</Text>;
 }
 
diff --git a/src/pages/inbox/report/ReactionList/PopoverReactionList.tsx b/src/pages/inbox/report/ReactionList/PopoverReactionList.tsx
index 2e96664b0ef1..f179325d2b09 100644
--- a/src/pages/inbox/report/ReactionList/PopoverReactionList.tsx
+++ b/src/pages/inbox/report/ReactionList/PopoverReactionList.tsx
@@ -2,6 +2,7 @@ import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 
 import {getEmojiReactionDetails, mergeReactionsByEmoji} from '@libs/EmojiUtils';
 
@@ -39,9 +40,7 @@ function PopoverReactionList({isVisible, emojiName, reportActionID, anchorPositi
     const isReady = !!selectedReaction;
     const {emojiCodes = [], reactionCount = 0, hasUserReacted = false, userAccountIDs = []} = selectedReaction ? getEmojiReactionDetails(emojiName, selectedReaction, accountID) : {};
 
-    const [users = getEmptyArray<PersonalDetails>()] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: multiPersonalDetailsSelector(isReady ? userAccountIDs : []),
-    });
+    const [users = getEmptyArray<PersonalDetails>()] = useAllPersonalDetails(multiPersonalDetailsSelector(isReady ? userAccountIDs : []));
 
     // Hide the list when all reactions are removed
     useEffect(() => {
diff --git a/src/pages/inbox/report/ReportActionCompose/ComposerLocalTime.tsx b/src/pages/inbox/report/ReportActionCompose/ComposerLocalTime.tsx
index e7c081c53871..552470830d6c 100644
--- a/src/pages/inbox/report/ReportActionCompose/ComposerLocalTime.tsx
+++ b/src/pages/inbox/report/ReportActionCompose/ComposerLocalTime.tsx
@@ -2,6 +2,7 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useReportRecipientLocalTime from '@hooks/useReportRecipientLocalTime';
 
 import {getReportOfflinePendingActionAndErrors, getReportRecipientAccountIDs} from '@libs/ReportUtils';
@@ -11,7 +12,6 @@ import ParticipantLocalTime from '@pages/inbox/report/ParticipantLocalTime';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-import {personalDetailsSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 import {useComposerState} from './ComposerContext';
@@ -24,7 +24,7 @@ function ComposerLocalTime() {
     const canShowRecipientLocalTime = useReportRecipientLocalTime({report});
     const shouldShow = canShowRecipientLocalTime && !isComposerFullSize;
     const reportRecipientAccountID = getReportRecipientAccountIDs(report, currentUserAccountID).at(0);
-    const [reportRecipient] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsSelector(shouldShow ? reportRecipientAccountID : undefined)});
+    const [reportRecipient] = usePersonalDetail(shouldShow ? reportRecipientAccountID : undefined);
 
     if (!shouldShow || isEmptyObject(reportRecipient) || reportRecipient?.isCustomAgent) {
         return null;
diff --git a/src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx b/src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx
index 2b9e386320e5..9f73d1198880 100644
--- a/src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx
+++ b/src/pages/inbox/report/ReportActionCompose/ComposerWithSuggestions.tsx
@@ -11,6 +11,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePrevious from '@hooks/usePrevious';
+import useReportIDToNameMap from '@hooks/useReportIDToNameMap';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSidePanelState from '@hooks/useSidePanelState';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -285,6 +286,8 @@ function ComposerWithSuggestions({
 
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
+    const reportIDToName = useReportIDToNameMap();
+
     const commentRef = useRef(initialText);
 
     const {superWideRHPRouteKeys, wideRHPRouteKeys} = useWideRHPState();
@@ -611,7 +614,7 @@ function ComposerWithSuggestions({
                 webEvent.preventDefault();
                 if (lastReportAction) {
                     const message = Array.isArray(lastReportAction?.message) ? (lastReportAction?.message?.at(-1) ?? null) : (lastReportAction?.message ?? null);
-                    saveReportActionDraft(reportID, lastReportAction, reportActions, Parser.htmlToMarkdown(message?.html ?? ''), isOffline);
+                    saveReportActionDraft(reportID, lastReportAction, reportActions, Parser.htmlToMarkdown(message?.html ?? '', {reportIDToName}), isOffline);
                 }
             }
             // Flag emojis like "Wales" have several code points. Default backspace key action does not remove such flag emojis completely.
@@ -661,6 +664,7 @@ function ComposerWithSuggestions({
             lastReportAction,
             reportID,
             reportActions,
+            reportIDToName,
             updateComment,
             setCurrentEditMessageSelection,
             isOffline,
diff --git a/src/pages/inbox/report/ReportActionCompose/useEditMessage.ts b/src/pages/inbox/report/ReportActionCompose/useEditMessage.ts
index 2d0f7fbcb3a2..d80fc2d53d64 100644
--- a/src/pages/inbox/report/ReportActionCompose/useEditMessage.ts
+++ b/src/pages/inbox/report/ReportActionCompose/useEditMessage.ts
@@ -3,6 +3,7 @@ import type {ComposerRef} from '@components/Composer/types';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
 import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
+import useReportIDToNameMap from '@hooks/useReportIDToNameMap';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useReportScrollManager from '@hooks/useReportScrollManager';
 
@@ -48,6 +49,7 @@ function useEditMessage({
     const [personalDetails] = useAllPersonalDetails();
     const [originalReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${actionOwnerReportID}`);
     const isOriginalReportArchived = useReportIsArchived(actionOwnerReportID);
+    const reportIDToName = useReportIDToNameMap();
 
     const {stopEditing, submitEdit} = useReportActionActiveEditActions();
 
@@ -98,7 +100,16 @@ function useEditMessage({
 
         submitEdit();
 
-        editReportComment(originalReport, reportAction, trimmedNewDraft, isOriginalReportArchived, email ?? '', personalDetails, Object.fromEntries(draftMessageVideoAttributeCache));
+        editReportComment(
+            originalReport,
+            reportAction,
+            trimmedNewDraft,
+            isOriginalReportArchived,
+            email ?? '',
+            personalDetails,
+            Object.fromEntries(draftMessageVideoAttributeCache),
+            reportIDToName,
+        );
         deleteDraft();
     }
 
diff --git a/src/pages/inbox/report/ReportActionCompose/useShouldAddOrReplaceReceipt.ts b/src/pages/inbox/report/ReportActionCompose/useShouldAddOrReplaceReceipt.ts
index 4d0fcd20a75a..e07cc0e9bd53 100644
--- a/src/pages/inbox/report/ReportActionCompose/useShouldAddOrReplaceReceipt.ts
+++ b/src/pages/inbox/report/ReportActionCompose/useShouldAddOrReplaceReceipt.ts
@@ -37,7 +37,7 @@ function useShouldAddOrReplaceReceipt(reportID: string) {
     const canUserPerformWriteAction = !!canUserPerformWriteActionReportUtils(report, isReportArchived);
     const canEditReceipt =
         canUserPerformWriteAction &&
-        canEditFieldOfMoneyRequest({reportAction: effectiveParentReportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT, transaction, rules}) &&
+        canEditFieldOfMoneyRequest({reportAction: effectiveParentReportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT, transaction, rules, reportNameValuePairs: undefined}) &&
         !transaction?.receipt?.isTestDriveReceipt;
     const shouldAddOrReplaceReceipt = (isTransactionThreadView || isSingleTransactionView) && canEditReceipt;
 
diff --git a/src/pages/inbox/report/ReportActionItem.tsx b/src/pages/inbox/report/ReportActionItem.tsx
index 1b8a72000923..8f81eeaf67f6 100644
--- a/src/pages/inbox/report/ReportActionItem.tsx
+++ b/src/pages/inbox/report/ReportActionItem.tsx
@@ -18,6 +18,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useOriginalReportID from '@hooks/useOriginalReportID';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useReportTransactionsCollection from '@hooks/useReportTransactionsCollection';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -39,14 +40,15 @@ import type {ReportsSplitNavigatorParamList} from '@libs/Navigation/types';
 import Permissions from '@libs/Permissions';
 import {
     extractLinksFromMessageHtml,
+    getAgentPromptUpdatedMessage,
     getIOUReportIDFromReportActionPreview,
     getOriginalMessage,
     getPaymentMessageWithExpectedDate,
     getReportActionMessage,
     getReportActionText,
     getWhisperedTo,
-    isCreatedTaskReportAction,
     isActionOfType,
+    isCreatedTaskReportAction,
     isDeletedParentAction as isDeletedParentActionUtils,
     isMessageDeleted,
     isMoneyRequestAction,
@@ -77,6 +79,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import {getStableReportSelector} from '@src/selectors/Report';
 import {getReimbursedExpectedDateSelector} from '@src/selectors/ReportAction';
+import {isSplitContainerTransactionSelector, originalTransactionIDSelector} from '@src/selectors/Transaction';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject, isEmptyValueObject} from '@src/types/utils/EmptyObject';
@@ -86,7 +89,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 
 import {useNavigation} from '@react-navigation/native';
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
-import {personalDetailsDisplayNameSelector} from '@selectors/PersonalDetails';
+import {displayNameOrDefaultSelector} from '@selectors/PersonalDetails';
 import {deepEqual} from 'fast-equals';
 import mapValues from 'lodash/mapValues';
 import React, {useContext, useEffect, useRef, useState} from 'react';
@@ -207,6 +210,9 @@ function ReportActionItem({
 
     const [linkedTransactionRouteError] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {selector: getLinkedTransactionRouteError});
 
+    const [originalTransactionID] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {selector: originalTransactionIDSelector});
+    const [isOriginalTransactionSplitContainer] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`, {selector: isSplitContainerTransactionSelector});
+
     const {editingMessage, editingReportAction} = useReportActionActiveEdit();
 
     const isConciergeGreeting = action.reportActionID === CONST.CONCIERGE_GREETING_ACTION_ID;
@@ -214,9 +220,7 @@ function ReportActionItem({
     const {transitionActionSheetState} = ActionSheetAwareScrollView.useActionSheetAwareScrollViewActions();
     const {translate, datetimeToCalendarTime, formatPhoneNumber, dateFnsLocale} = useLocalize();
     const {getCurrencyDecimals} = useCurrencyListActions();
-    const [actorDisplayName] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsDisplayNameSelector(action.actorAccountID ?? CONST.DEFAULT_NUMBER_ID, translate, formatPhoneNumber),
-    });
+    const [actorDisplayName] = usePersonalDetail(action.actorAccountID, displayNameOrDefaultSelector(translate, formatPhoneNumber));
     const {showConfirmModal} = useConfirmModal();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const theme = useTheme();
@@ -285,7 +289,7 @@ function ReportActionItem({
             navigation.setParams({reportActionID: ''});
         }
         if (transactionIDToDismiss) {
-            clearErrorWithOriginalTransactionError(transactionIDToDismiss);
+            clearErrorWithOriginalTransactionError(transactionIDToDismiss, originalTransactionID, isOriginalTransactionSplitContainer);
         }
         clearAllRelatedReportActionErrors(reportID, action, originalReportID, isOffline);
     };
@@ -520,7 +524,9 @@ function ReportActionItem({
     const shouldDisplayThreadReplies = shouldDisplayThreadRepliesUtils(action, isThreadReportParentAction) && !isOnSearch;
 
     const formattedTimestamp = datetimeToCalendarTime(action.created, false);
-    const plainMessage = getPaymentMessageWithExpectedDate(translate, dateFnsLocale, getReportActionText(action), paymentExpectedDate);
+    const plainMessage = isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED)
+        ? getAgentPromptUpdatedMessage(translate, action)
+        : getPaymentMessageWithExpectedDate(translate, dateFnsLocale, getReportActionText(action), paymentExpectedDate);
     const accessibilityLabel = `${actorDisplayName ?? ''}, ${formattedTimestamp}, ${plainMessage}`;
 
     return (
diff --git a/src/pages/inbox/report/ReportActionItemBasicMessage.tsx b/src/pages/inbox/report/ReportActionItemBasicMessage.tsx
index 3dbf2f83305a..6c5eec366f25 100644
--- a/src/pages/inbox/report/ReportActionItemBasicMessage.tsx
+++ b/src/pages/inbox/report/ReportActionItemBasicMessage.tsx
@@ -25,7 +25,7 @@ function ReportActionItemBasicMessage({message, children}: ReportActionItemBasic
     const selectableStyle = !canUseTouchScreen() || !shouldUseNarrowLayout ? styles.userSelectText : styles.userSelectNone;
 
     return (
-        <View>
+        <View style={styles.renderHTML}>
             {!!message &&
                 (messageContainsCustomEmojiWithText ? (
                     <TextWithEmojiFragment
diff --git a/src/pages/inbox/report/ReportActionItemCreated.tsx b/src/pages/inbox/report/ReportActionItemCreated.tsx
index 088f93deea76..a3fdf8201913 100644
--- a/src/pages/inbox/report/ReportActionItemCreated.tsx
+++ b/src/pages/inbox/report/ReportActionItemCreated.tsx
@@ -8,6 +8,7 @@ import useIsInSidePanel from '@hooks/useIsInSidePanel';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useOptimisticPersonalDetails from '@hooks/useOptimisticPersonalDetails';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -20,7 +21,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
-import {conciergePersonalDetailSelector, isOptimisticPersonalDetailSelector, personalDetailsSelector} from '@selectors/PersonalDetails';
+import {isPersonalDetailOptimistic} from '@selectors/PersonalDetails';
 import React, {memo} from 'react';
 import {View} from 'react-native';
 
@@ -46,15 +47,15 @@ function ReportActionItemCreated({reportID, policyID}: ReportActionItemCreatedPr
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const currentUserPersonalDetail = useCurrentUserPersonalDetails();
     const {accountID: currentUserAccountID} = currentUserPersonalDetail;
-    const [conciergePersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: conciergePersonalDetailSelector});
-    const [reportOwnerPersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsSelector(report?.ownerAccountID)});
+    const [conciergePersonalDetail] = usePersonalDetail(CONST.ACCOUNT_ID.CONCIERGE);
+    const [reportOwnerPersonalDetail] = usePersonalDetail(report?.ownerAccountID);
     const optimisticPersonalDetails = useOptimisticPersonalDetails();
 
     const otherParticipantAccountID =
         Object.keys(report?.participants ?? {})
             .map(Number)
             .find((id) => id !== currentUserAccountID) ?? CONST.DEFAULT_NUMBER_ID;
-    const [isParticipantOptimistic = true] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: isOptimisticPersonalDetailSelector(otherParticipantAccountID)});
+    const [isParticipantOptimistic = true] = usePersonalDetail(otherParticipantAccountID, isPersonalDetailOptimistic);
 
     if (!isChatReport(report)) {
         return null;
diff --git a/src/pages/inbox/report/ReportActionItemParentAction.tsx b/src/pages/inbox/report/ReportActionItemParentAction.tsx
index ce41817d3fc1..4c5504a2fb68 100644
--- a/src/pages/inbox/report/ReportActionItemParentAction.tsx
+++ b/src/pages/inbox/report/ReportActionItemParentAction.tsx
@@ -3,22 +3,25 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import useAncestors from '@hooks/useAncestors';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {shouldExcludeAncestorReportAction} from '@libs/ReportUtils';
 
 import {navigateToConciergeChatAndDeleteReport} from '@userActions/Report';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report, ReportAction, ReportNameValuePairs, Transaction} from '@src/types/onyx';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
-import {conciergePersonalDetailSelector, personalDetailsSelector} from '@selectors/PersonalDetails';
+import {getConciergeFeedbackForReportActionID} from '@selectors/ReportNameValuePairs';
 import React from 'react';
 import {View} from 'react-native';
 
@@ -58,8 +61,8 @@ function ReportActionItemParentAction({
 
     const currentUserPersonalDetail = useCurrentUserPersonalDetails();
     const {accountID: currentUserAccountID} = currentUserPersonalDetail;
-    const [conciergePersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: conciergePersonalDetailSelector});
-    const [reportOwnerPersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsSelector(report?.ownerAccountID)});
+    const [conciergePersonalDetail] = usePersonalDetail(CONST.ACCOUNT_ID.CONCIERGE);
+    const [reportOwnerPersonalDetail] = usePersonalDetail(report?.ownerAccountID);
 
     const [linkedTransactionRouteError] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
         selector: (transaction: OnyxEntry<Transaction>) => {
@@ -81,6 +84,11 @@ function ReportActionItemParentAction({
         },
     });
 
+    // The backend marks the thread it opens after a thumbs down, and the answer it collects feedback on is not up for rating again
+    const [conciergeFeedbackForReportActionID] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${getNonEmptyStringOnyxID(report?.reportID)}`, {
+        selector: getConciergeFeedbackForReportActionID,
+    });
+
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
@@ -127,6 +135,7 @@ function ReportActionItemParentAction({
                         parentReportAction={parentReportAction}
                         transactionThreadReport={transactionThreadReport}
                         isFirstVisibleReportAction={isFirstVisibleReportAction}
+                        shouldAllowConciergeFeedback={!conciergeFeedbackForReportActionID}
                         shouldUseThreadDividerLine={shouldUseThreadDividerLine}
                         linkedTransactionRouteError={linkedTransactionRouteError}
                     />
diff --git a/src/pages/inbox/report/ReportActionItemSingle.tsx b/src/pages/inbox/report/ReportActionItemSingle.tsx
index 00eeb9b4b9b1..04044bd5f5bd 100644
--- a/src/pages/inbox/report/ReportActionItemSingle.tsx
+++ b/src/pages/inbox/report/ReportActionItemSingle.tsx
@@ -8,7 +8,7 @@ import Tooltip from '@components/Tooltip';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -19,7 +19,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import {getDelegateAccountIDFromReportAction, getHumanAgentAccountIDFromReportAction, getManagerOnVacation, getModerationFlagState, getVacationer} from '@libs/ReportActionsUtils';
 
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type {Report, ReportAction} from '@src/types/onyx';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
@@ -27,7 +26,7 @@ import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import type {StyleProp, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 
-import {isOptimisticPersonalDetailSelector} from '@selectors/PersonalDetails';
+import {isPersonalDetailOptimistic} from '@selectors/PersonalDetails';
 import React from 'react';
 import {View} from 'react-native';
 
@@ -122,7 +121,7 @@ function ReportActionItemSingle({
     };
 
     const optimisticCheckAccountID = delegateAccountID ? Number(delegateAccountID) : (details.accountID ?? CONST.DEFAULT_NUMBER_ID);
-    const [isOptimistic] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: isOptimisticPersonalDetailSelector(optimisticCheckAccountID)});
+    const [isOptimistic] = usePersonalDetail(optimisticCheckAccountID, isPersonalDetailOptimistic);
     const shouldDisableDetailPage = CONST.RESTRICTED_ACCOUNT_IDS.includes(details.accountID ?? CONST.DEFAULT_NUMBER_ID) || (!details.isWorkspaceActor && !!isOptimistic);
 
     const getBackgroundColor = () => {
diff --git a/src/pages/inbox/report/ReportActionsList.tsx b/src/pages/inbox/report/ReportActionsList.tsx
index 95693d1fd357..e240e744651e 100644
--- a/src/pages/inbox/report/ReportActionsList.tsx
+++ b/src/pages/inbox/report/ReportActionsList.tsx
@@ -26,7 +26,6 @@ import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import {
     getFirstVisibleReportActionID,
     getLatestConciergeFeedbackActionID,
-    getReportActionHtml,
     getReportActionMessage,
     isConsecutiveActionMadeByPreviousActor,
     isDeletedParentAction,
@@ -209,7 +208,11 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
         hasNewerActions,
     });
 
-    const persistedDraftReportAction = draftReportAction ? sortedVisibleReportActions.find((action) => action.reportActionID === draftReportAction.reportActionID) : undefined;
+    const persistedDraftReportAction = draftReportAction
+        ? (sortedAllReportActions ?? sortedVisibleReportActions).find(
+              (action) => action.reportActionID === draftReportAction.reportActionID && action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+          )
+        : undefined;
 
     const renderedVisibleReportActions = (() => {
         if (!draftReportAction) {
@@ -220,13 +223,14 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
             return sortedVisibleReportActions;
         }
 
+        // A completed reveal belongs to the saved action, even when pagination keeps that action off screen.
+        if (persistedDraftReportAction && !isDraftPendingCompletion) {
+            return sortedVisibleReportActions;
+        }
+
         // Insert the synthetic draft into the already-descending render list without treating it as a persisted report action.
         for (const [index, action] of sortedVisibleReportActions.entries()) {
             if (action.reportActionID === draftReportAction.reportActionID) {
-                if (!isDraftPendingCompletion) {
-                    return sortedVisibleReportActions;
-                }
-
                 const visibleReportActionsWithDraft = [...sortedVisibleReportActions];
                 visibleReportActionsWithDraft[index] = draftReportAction;
                 return visibleReportActionsWithDraft;
@@ -257,10 +261,12 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
     }, [clearDraft, draftReportAction, isSyntheticDraftVisible]);
 
     useEffect(() => {
-        if (!isDraftPendingCompletion || !draftReportAction || !persistedDraftReportAction || getReportActionHtml(draftReportAction) === getReportActionHtml(persistedDraftReportAction)) {
+        if (!isDraftPendingCompletion || !draftReportAction || !persistedDraftReportAction) {
             return;
         }
 
+        // The persisted action is the durable completion signal when a terminal Pusher event is missed.
+        // Reconcile by action ID even when its HTML is byte-identical to the last streamed draft.
         revealDraftFromReportAction(persistedDraftReportAction);
     }, [draftReportAction, isDraftPendingCompletion, persistedDraftReportAction, revealDraftFromReportAction]);
 
@@ -340,7 +346,6 @@ function ReportActionsListContent({reportID, conciergeChat, onLayout}: ReportAct
             : getLatestConciergeFeedbackActionID(renderedVisibleReportActions, allReportActionIDs);
 
     useFollowActionBadgeTarget({
-        isProduction,
         reportID,
         actionTargetReportActionID: reportAttributes?.actionTargetReportActionID,
         actionBadgeTargetIndex,
diff --git a/src/pages/inbox/report/actionContents/JoinRequestContent.tsx b/src/pages/inbox/report/actionContents/JoinRequestContent.tsx
index df38c77f9ecf..1ccf057d2cd7 100644
--- a/src/pages/inbox/report/actionContents/JoinRequestContent.tsx
+++ b/src/pages/inbox/report/actionContents/JoinRequestContent.tsx
@@ -3,6 +3,7 @@ import ActionableItemButtons from '@components/ReportActionItem/ActionableItemBu
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import {getJoinRequestMessage, getOriginalMessage} from '@libs/ReportActionsUtils';
 
@@ -12,7 +13,6 @@ import {acceptJoinRequest, declineJoinRequest} from '@userActions/Policy/Member'
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {personalDetailsSelector} from '@src/selectors/PersonalDetails';
 import {policyNameSelector} from '@src/selectors/Policy';
 import type {ReportAction} from '@src/types/onyx';
 import type {JoinWorkspaceResolution} from '@src/types/onyx/OriginalMessage';
@@ -31,7 +31,7 @@ function JoinRequestContent({action, actionOwnerReportID, policyID}: JoinRequest
     const [policyName = ''] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {selector: policyNameSelector});
 
     const originalMessage = getOriginalMessage(action);
-    const [requesterDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsSelector(originalMessage?.accountID)});
+    const [requesterDetails] = usePersonalDetail(originalMessage?.accountID);
 
     const isJoinRequestUnresolved = originalMessage?.choice === ('' as JoinWorkspaceResolution);
 
diff --git a/src/pages/inbox/report/actionContents/MemberChangeContent.tsx b/src/pages/inbox/report/actionContents/MemberChangeContent.tsx
index 2d18b01037b5..c3b367fda7c9 100644
--- a/src/pages/inbox/report/actionContents/MemberChangeContent.tsx
+++ b/src/pages/inbox/report/actionContents/MemberChangeContent.tsx
@@ -1,5 +1,6 @@
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail, usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -10,7 +11,6 @@ import TextCommentFragment from '@pages/inbox/report/comment/TextCommentFragment
 
 import type CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {personalDetailsListSelector, personalDetailsSelector} from '@src/selectors/PersonalDetails';
 import type {ReportAction} from '@src/types/onyx';
 
 import type {ValueOf} from 'type-fest';
@@ -26,8 +26,8 @@ function MemberChangeContent({action}: MemberChangeContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const memberChangeLogReportActionMessage = isMemberChangeAction(action) ? getOriginalMessage(action) : undefined;
-    const [actorDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsSelector(action.actorAccountID)});
-    const [targetAccountDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsListSelector(memberChangeLogReportActionMessage?.targetAccountIDs)});
+    const [actorDetails] = usePersonalDetail(action.actorAccountID);
+    const [targetAccountDetailsList] = usePersonalDetailsByIDs(memberChangeLogReportActionMessage?.targetAccountIDs);
     const [memberChangeLogRoomReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${memberChangeLogReportActionMessage?.reportID}`);
     const derivedMemberChangeLogRoomReportName = useDerivedReportNameByReportID(memberChangeLogRoomReport?.reportID);
     const memberChangeLogRoomReportName = getReportName(memberChangeLogRoomReport, derivedMemberChangeLogRoomReportName) || memberChangeLogReportActionMessage?.roomName;
diff --git a/src/pages/inbox/report/actionContents/MentionWhisperContent.tsx b/src/pages/inbox/report/actionContents/MentionWhisperContent.tsx
index 028363a7aae2..47325790df4d 100644
--- a/src/pages/inbox/report/actionContents/MentionWhisperContent.tsx
+++ b/src/pages/inbox/report/actionContents/MentionWhisperContent.tsx
@@ -5,6 +5,7 @@ import ActionableItemButtons from '@components/ReportActionItem/ActionableItemBu
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 
 import {isPolicyAdmin, isPolicyMember, isPolicyOwner} from '@libs/PolicyUtils';
@@ -16,7 +17,6 @@ import {resolveActionableMentionWhisper} from '@userActions/Report';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {personalDetailsListSelector} from '@src/selectors/PersonalDetails';
 import type {Report, ReportAction} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
@@ -48,7 +48,7 @@ function MentionWhisperContent({action, actionOwnerReportStable, parentReport, o
 
     // Subscribe to the full report here — the resolve action needs heartbeat fields for its failure-revert payload.
     const [actionOwnerReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${actionOwnerReportStable?.reportID}`);
-    const [targetAccountDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsListSelector(getOriginalMessage(action)?.inviteeAccountIDs)});
+    const [targetAccountDetails] = usePersonalDetailsByIDs(getOriginalMessage(action)?.inviteeAccountIDs);
 
     const isReportInPolicy = !!policyID && policyID !== CONST.POLICY.ID_FAKE && personalPolicyID !== policyID;
     const hasMentionedPolicyMembers = getOriginalMessage(action)?.inviteeEmails?.every((login) => isPolicyMember(policy, login));
diff --git a/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx b/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx
index b35e5ce32425..22286cfd3812 100644
--- a/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx
+++ b/src/pages/inbox/report/actionContents/PolicyChangeLogContent.tsx
@@ -15,6 +15,7 @@ import {
     getAddedConnectionMessage,
     getApprovalLimitUpdateMessage,
     getAssignedCompanyCardMessage,
+    getAutoCategorizeNewExpensesMessage,
     getAutoPayApprovedReportsEnabledMessage,
     getAutoReimbursementMessage,
     getCategoryTaxRateMessage,
@@ -62,6 +63,7 @@ import {
     getUpdatedCardFeedLiabilityMessage,
     getUpdatedCardFeedStatementPeriodMessage,
     getUpdatedCommuterExclusionsMessage,
+    getUpdatedMemberWorkArrangementMessage,
     getUpdatedDefaultTitleMessage,
     getUpdatedIndividualBudgetNotificationMessage,
     getUpdatedManualApprovalThresholdMessage,
@@ -170,6 +172,7 @@ const POLICY_CHANGE_LOG_RESOLVERS: Record<string, ResolverFn> = {
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FEATURE_ENABLED]: (translate, action) => getWorkspaceFeatureEnabledMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_IS_ATTENDEE_TRACKING_ENABLED]: (translate, action) => getWorkspaceAttendeeTrackingUpdateMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRE_COMPANY_CARDS_ENABLED]: (translate, action) => getRequireCompanyCardsEnabledMessage(translate, action),
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_CATEGORIZE_NEW_EXPENSES]: (translate, action) => getAutoCategorizeNewExpensesMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY]: (translate, action) => getRequiresCategoryMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_TAG]: (translate, action) => getRequiresTagMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_GLOBAL_REIMBURSEMENTS_FX_PREFERENCE]: (translate, action) => getCurrencyConversionFeeMessage(translate, action),
@@ -230,6 +233,7 @@ const POLICY_CHANGE_LOG_RESOLVERS: Record<string, ResolverFn> = {
         getUpdatedTimeRateMessage(translate, action, convertToDisplayString),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_PROHIBITED_EXPENSES]: (translate, action) => getUpdatedProhibitedExpensesMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_COMMUTER_EXCLUSIONS]: (translate, action) => getUpdatedCommuterExclusionsMessage(translate, action),
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT]: (translate, action) => getUpdatedMemberWorkArrangementMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSEMENT_CHOICE]: (translate, action) => getUpdatedReimbursementChoiceMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SET_AUTO_JOIN]: (translate, action) => getSetAutoJoinMessage(translate, action),
     [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_TITLE]: (translate, action) => getUpdatedDefaultTitleMessage(translate, action),
diff --git a/src/pages/inbox/report/actionContents/ReimbursedContent.tsx b/src/pages/inbox/report/actionContents/ReimbursedContent.tsx
index 8bd1bacbfb7b..2b11daee84b6 100644
--- a/src/pages/inbox/report/actionContents/ReimbursedContent.tsx
+++ b/src/pages/inbox/report/actionContents/ReimbursedContent.tsx
@@ -1,16 +1,15 @@
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import {getReimbursedMessage} from '@libs/ReportActionsUtils';
 
 import ReportActionItemBasicMessage from '@pages/inbox/report/ReportActionItemBasicMessage';
 
-import ONYXKEYS from '@src/ONYXKEYS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type {ReportAction} from '@src/types/onyx';
 
+import {loginSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 type ReimbursedContentProps = {
@@ -22,8 +21,8 @@ function ReimbursedContent({action, reportOwnerAccountID}: ReimbursedContentProp
     const {translate, dateFnsLocale} = useLocalize();
     const {convertToDisplayString} = useCurrencyListActions();
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
-    const [submitterLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(reportOwnerAccountID)});
-    const [actorLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(action.actorAccountID)});
+    const [submitterLogin] = usePersonalDetail(reportOwnerAccountID, loginSelector);
+    const [actorLogin] = usePersonalDetail(action.actorAccountID, loginSelector);
     const message = getReimbursedMessage(translate, dateFnsLocale, action, reportOwnerAccountID, submitterLogin, actorLogin, convertToDisplayString, currentUserAccountID);
 
     return <ReportActionItemBasicMessage message={message} />;
diff --git a/src/pages/inbox/report/actionContents/ReimbursementQueuedContent.tsx b/src/pages/inbox/report/actionContents/ReimbursementQueuedContent.tsx
index 2e4846bd8b75..988f28f61670 100644
--- a/src/pages/inbox/report/actionContents/ReimbursementQueuedContent.tsx
+++ b/src/pages/inbox/report/actionContents/ReimbursementQueuedContent.tsx
@@ -5,6 +5,7 @@ import ActionableItemButtons from '@components/ReportActionItem/ActionableItemBu
 
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import Navigation from '@libs/Navigation/Navigation';
@@ -23,7 +24,7 @@ import type {Report, ReportAction} from '@src/types/onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {isUserValidatedSelector} from '@selectors/Account';
-import {personalDetailsDisplayNameSelector} from '@selectors/PersonalDetails';
+import {displayNameOrDefaultSelector} from '@selectors/PersonalDetails';
 import {tierNameSelector} from '@selectors/UserWallet';
 import React, {useContext} from 'react';
 
@@ -47,10 +48,7 @@ function ReimbursementQueuedContent({action, report, iouReport}: ReimbursementQu
     const [isUserValidated] = useOnyx(ONYXKEYS.ACCOUNT, {selector: isUserValidatedSelector});
 
     const targetReport = isChatThread(report) ? parentReport : report;
-    const [ownerDisplayName] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsDisplayNameSelector(targetReport?.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID, translate, formatPhoneNumber),
-    });
-    const submitterDisplayName = ownerDisplayName ?? '';
+    const [submitterDisplayName = ''] = usePersonalDetail(targetReport?.ownerAccountID, displayNameOrDefaultSelector(translate, formatPhoneNumber));
     const paymentType = getOriginalMessage(action)?.paymentType ?? '';
     const missingPaymentMethod = getIndicatedMissingPaymentMethod(userWalletTierName, targetReport?.reportID, action, bankAccountList);
 
diff --git a/src/pages/inbox/report/actionContents/RemovedFromApprovalChainContent.tsx b/src/pages/inbox/report/actionContents/RemovedFromApprovalChainContent.tsx
index 5f9b14d4fee5..9d222fc0343c 100644
--- a/src/pages/inbox/report/actionContents/RemovedFromApprovalChainContent.tsx
+++ b/src/pages/inbox/report/actionContents/RemovedFromApprovalChainContent.tsx
@@ -1,12 +1,11 @@
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 
 import {getOriginalMessage, getRemovedFromApprovalChainMessage} from '@libs/ReportActionsUtils';
 
 import ReportActionItemBasicMessage from '@pages/inbox/report/ReportActionItemBasicMessage';
 
 import type CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import {multiPersonalDetailsSelector} from '@src/selectors/PersonalDetails';
 import type {PersonalDetailsList, ReportAction} from '@src/types/onyx';
 
@@ -26,7 +25,7 @@ function submitterNamesSelector(submittersAccountIDs: number[] | undefined) {
 
 function RemovedFromApprovalChainContent({action}: RemovedFromApprovalChainContentProps) {
     const {translate} = useLocalize();
-    const [submitterNames] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: submitterNamesSelector(getOriginalMessage(action)?.submittersAccountIDs)});
+    const [submitterNames] = useAllPersonalDetails(submitterNamesSelector(getOriginalMessage(action)?.submittersAccountIDs));
 
     return <ReportActionItemBasicMessage message={getRemovedFromApprovalChainMessage(translate, submitterNames ?? [])} />;
 }
diff --git a/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx b/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx
index c929fca11b36..fbd937960d5d 100644
--- a/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx
+++ b/src/pages/inbox/report/actionContents/SimpleMessageContent.tsx
@@ -1,8 +1,11 @@
+import RenderHTML from '@components/RenderHTML';
+
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useLocalize from '@hooks/useLocalize';
 
 import {
     getActionableCard3DSTransactionApprovalMessage,
+    getAgentPromptUpdatedMessageHTML,
     getDemotedFromWorkspaceMessage,
     getDismissedViolationMessageText,
     getMarkedReimbursedMessage,
@@ -27,6 +30,7 @@ type SimpleMessageContentProps = {
 };
 
 const SIMPLE_MESSAGE_ACTION_TYPES = new Set<string>([
+    CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED,
     CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
     CONST.REPORT.ACTIONS.TYPE.HOLD,
     CONST.REPORT.ACTIONS.TYPE.HOLD_COMMENT,
@@ -37,6 +41,7 @@ const SIMPLE_MESSAGE_ACTION_TYPES = new Set<string>([
     CONST.REPORT.ACTIONS.TYPE.REOPENED,
     CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY,
     CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION,
+    CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION,
     CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION,
     CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION,
     CONST.REPORT.ACTIONS.TYPE.RESOLVED_DUPLICATES,
@@ -53,6 +58,13 @@ function SimpleMessageContent({action}: SimpleMessageContentProps) {
     const {translate} = useLocalize();
     const {convertToDisplayString, convertToDisplayStringWithoutCurrency} = useCurrencyListActions();
 
+    if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED)) {
+        return (
+            <ReportActionItemBasicMessage>
+                <RenderHTML html={`<comment><muted-text>${getAgentPromptUpdatedMessageHTML(translate, action)}</muted-text></comment>`} />
+            </ReportActionItemBasicMessage>
+        );
+    }
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED)) {
         return <ReportActionItemBasicMessage message={getMarkedReimbursedMessage(translate, action)} />;
     }
@@ -83,6 +95,9 @@ function SimpleMessageContent({action}: SimpleMessageContentProps) {
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION)) {
         return <ReportActionItemBasicMessage message={getDeletedTransactionMessage(translate, action, convertToDisplayString)} />;
     }
+    if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION)) {
+        return <ReportActionItemBasicMessage message={translate('iou.undeletedExpense')} />;
+    }
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION)) {
         return <ReportActionItemBasicMessage message={translate('systemMessage.mergedWithCashTransaction')} />;
     }
diff --git a/src/pages/inbox/report/getReportActionsToDisplay.ts b/src/pages/inbox/report/getReportActionsToDisplay.ts
index 00d65b8b04fc..3e6badd1232c 100644
--- a/src/pages/inbox/report/getReportActionsToDisplay.ts
+++ b/src/pages/inbox/report/getReportActionsToDisplay.ts
@@ -19,6 +19,7 @@ function getReportActionsToDisplay(
     transactionThreadReport: OnyxTypes.Report | undefined,
     shouldAddCreatedAction: boolean,
     getCurrencyDecimals: CurrencyListActionsContextType['getCurrencyDecimals'],
+    delegateAccountID: number | undefined,
 ) {
     const actions = [...(allReportActions ?? [])];
 
@@ -57,8 +58,7 @@ function getReportActionsToDisplay(
             transactionID: rand64(),
             iouReportID: report?.reportID,
             created: DateUtils.subtractMillisecondsFromDateTime(actions.at(-1)?.created ?? '', 1),
-            // delegateAccountIDParam: will be threaded in PR 15; buildOptimisticIOUReportAction falls back to module-level Onyx.connect value (https://github.com/Expensify/App/issues/66425)
-            delegateAccountIDParam: undefined,
+            delegateAccountIDParam: delegateAccountID,
             getCurrencyDecimals,
         }) as OnyxTypes.ReportAction;
         moneyRequestActions.push(optimisticIOUAction);
diff --git a/src/pages/inbox/report/shouldFollowActionBadgeTarget.ts b/src/pages/inbox/report/shouldFollowActionBadgeTarget.ts
index 5d8940ff5020..6686da21fd50 100644
--- a/src/pages/inbox/report/shouldFollowActionBadgeTarget.ts
+++ b/src/pages/inbox/report/shouldFollowActionBadgeTarget.ts
@@ -1,7 +1,4 @@
 type ShouldFollowActionBadgeTargetParams = {
-    /** Whether the app is running in production, where this auto-scroll behavior is gated off */
-    isProduction: boolean;
-
     /** The report action the badge currently targets (the oldest preview still requiring action) */
     actionTargetReportActionID: string | undefined;
 
@@ -24,13 +21,12 @@ type ShouldFollowActionBadgeTargetParams = {
  * upward/backward (e.g. when older actions are loaded in via pagination).
  */
 function shouldFollowActionBadgeTarget({
-    isProduction,
     actionTargetReportActionID,
     prevActionTargetReportActionID,
     actionBadgeTargetIndex,
     prevActionBadgeTargetIndex,
 }: ShouldFollowActionBadgeTargetParams): boolean {
-    if (isProduction || !actionTargetReportActionID || !prevActionTargetReportActionID || actionTargetReportActionID === prevActionTargetReportActionID || actionBadgeTargetIndex < 0) {
+    if (!actionTargetReportActionID || !prevActionTargetReportActionID || actionTargetReportActionID === prevActionTargetReportActionID || actionBadgeTargetIndex < 0) {
         return false;
     }
     return prevActionBadgeTargetIndex >= 0 && actionBadgeTargetIndex < prevActionBadgeTargetIndex;
diff --git a/src/pages/inbox/report/useDraftMessageVideoAttributeCache.ts b/src/pages/inbox/report/useDraftMessageVideoAttributeCache.ts
index 516bbddf77d0..a0f46d880404 100644
--- a/src/pages/inbox/report/useDraftMessageVideoAttributeCache.ts
+++ b/src/pages/inbox/report/useDraftMessageVideoAttributeCache.ts
@@ -1,4 +1,5 @@
 import usePrevious from '@hooks/usePrevious';
+import useReportIDToNameMap from '@hooks/useReportIDToNameMap';
 
 import Parser from '@libs/Parser';
 import {getReportActionHtml, isDeletedAction} from '@libs/ReportActionsUtils';
@@ -28,6 +29,7 @@ function useDraftMessageVideoAttributeCache({
     isEditInProgressRef,
 }: UseDraftMessageVideoAttributeCacheProps): DraftMessageVideoAttributeCache {
     const prevDraftMessage = usePrevious(draftMessage);
+    const reportIDToName = useReportIDToNameMap();
 
     useEffect(() => {
         if (!isEditing) {
@@ -37,6 +39,7 @@ function useDraftMessageVideoAttributeCache({
         draftMessageVideoAttributeCache.clear();
 
         const originalMessage = Parser.htmlToMarkdown(getReportActionHtml(editingReportAction), {
+            reportIDToName,
             cacheVideoAttributes: (videoSource, attrs) => draftMessageVideoAttributeCache.set(videoSource, attrs),
         });
         if (
@@ -47,7 +50,7 @@ function useDraftMessageVideoAttributeCache({
             return;
         }
         updateDraftMessageProp(draftMessage);
-    }, [draftMessage, editingReportAction, isEditInProgressRef, isEditing, prevDraftMessage, updateDraftMessageProp]);
+    }, [draftMessage, editingReportAction, isEditInProgressRef, isEditing, prevDraftMessage, reportIDToName, updateDraftMessageProp]);
 
     return draftMessageVideoAttributeCache;
 }
diff --git a/src/pages/inbox/report/useFollowActionBadgeTarget.ts b/src/pages/inbox/report/useFollowActionBadgeTarget.ts
index b15df8c3a2ff..bbf859b72291 100644
--- a/src/pages/inbox/report/useFollowActionBadgeTarget.ts
+++ b/src/pages/inbox/report/useFollowActionBadgeTarget.ts
@@ -9,9 +9,6 @@ import {useEffect, useRef} from 'react';
 import shouldFollowActionBadgeTarget from './shouldFollowActionBadgeTarget';
 
 type UseFollowActionBadgeTargetParams = {
-    /** Whether the app is running in production, where this auto-scroll behavior is gated off */
-    isProduction: boolean;
-
     /** The ID of the report whose list is being displayed */
     reportID: string;
 
@@ -33,7 +30,6 @@ type UseFollowActionBadgeTargetParams = {
  * preview requiring action. This hook scrolls down to follow it immediately on action.
  */
 function useFollowActionBadgeTarget({
-    isProduction,
     reportID,
     actionTargetReportActionID,
     actionBadgeTargetIndex,
@@ -49,7 +45,7 @@ function useFollowActionBadgeTarget({
     });
     useEffect(() => {
         const prevActionBadgeTargetIndex = renderedVisibleReportActions.findIndex((action) => action.reportActionID === prevActionTargetReportActionID);
-        if (!shouldFollowActionBadgeTarget({isProduction, actionTargetReportActionID, prevActionTargetReportActionID, actionBadgeTargetIndex, prevActionBadgeTargetIndex})) {
+        if (!shouldFollowActionBadgeTarget({actionTargetReportActionID, prevActionTargetReportActionID, actionBadgeTargetIndex, prevActionBadgeTargetIndex})) {
             return;
         }
         // Only follow the badge when the resolving action happened on this report's preview while this report is the one on
diff --git a/src/pages/iou/DynamicHoldReasonPage.tsx b/src/pages/iou/DynamicHoldReasonPage.tsx
index 021c0d1d1c86..b1190bd52ad6 100644
--- a/src/pages/iou/DynamicHoldReasonPage.tsx
+++ b/src/pages/iou/DynamicHoldReasonPage.tsx
@@ -82,7 +82,17 @@ function DynamicHoldReasonPage({route}: DynamicHoldReasonPageProps) {
             return;
         }
 
-        putOnHold(transactionID, values.comment, holdReportID, isOffline, currentUserLogin ?? '', currentUserAccountID, transactionViolations, isTrackIntentUser, delegateAccountID, {
+        putOnHold({
+            transactionID,
+            transaction,
+            comment: values.comment,
+            initialReportID: holdReportID,
+            isOffline,
+            currentUserLogin: currentUserLogin ?? '',
+            currentUserAccountID,
+            transactionViolations,
+            isTrackIntentUser,
+            delegateAccountID,
             rules,
             ancestors,
         });
diff --git a/src/pages/iou/DynamicSplitExpenseEditPage.tsx b/src/pages/iou/DynamicSplitExpenseEditPage.tsx
index 473ec3b35f69..9b6b6c9aed94 100644
--- a/src/pages/iou/DynamicSplitExpenseEditPage.tsx
+++ b/src/pages/iou/DynamicSplitExpenseEditPage.tsx
@@ -64,6 +64,8 @@ import {
     isTimeRequest,
 } from '@libs/TransactionUtils';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
@@ -298,6 +300,9 @@ function DynamicSplitExpenseEditPage({route}: DynamicSplitExpenseEditPageProps)
         return '';
     };
 
+    const isRateInteractive = !isSelfDMSplit || isRateBroken || hasAvailableEnabledRates || !hasAnyPaidWorkspace || shouldSelectPolicy;
+    const rateErrorText = getErrorForField('customUnitRateID');
+
     const distanceRequestFields = isDistance ? (
         <>
             <MenuItemField
@@ -338,51 +343,66 @@ function DynamicSplitExpenseEditPage({route}: DynamicSplitExpenseEditPageProps)
                     );
                 }}
             />
-            <MenuItemWithTopDescription
-                description={translate('common.rate')}
-                title={rateToDisplay}
-                interactive={!isSelfDMSplit || isRateBroken || hasAvailableEnabledRates || !hasAnyPaidWorkspace || shouldSelectPolicy}
-                shouldShowRightIcon={!isSelfDMSplit || isRateBroken || hasAvailableEnabledRates || !hasAnyPaidWorkspace || shouldSelectPolicy}
-                titleStyle={styles.flex1}
-                brickRoadIndicator={getErrorForField('customUnitRateID') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                errorText={getErrorForField('customUnitRateID')}
-                style={[styles.moneyRequestMenuItem]}
-                onPress={() => {
-                    const rateRoute = createDynamicRoute(
-                        DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(CONST.IOU.ACTION.EDIT, CONST.IOU.TYPE.SPLIT_EXPENSE, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, reportID),
-                    );
-
-                    // SelfDM split whose source workspace is gone and user has no other paid workspace:
-                    // mirror the selfDM track-expense Rate flow (MoneyRequestView) and route through the
-                    // IOU-level upgrade screen so the user can create a workspace, then a distance rate.
-                    // Use OPTIMISTIC_TRANSACTION_ID so the post-upgrade hop back into the rate step picks
-                    // up the same SPLIT_TRANSACTION_DRAFT this screen reads from (see line 57 above).
-                    if (isSelfDMSplit && !effectivePolicy && !hasAnyPaidWorkspace && reportID) {
-                        Navigation.navigate(
-                            createDynamicRoute(
-                                DYNAMIC_ROUTES.MONEY_REQUEST_UPGRADE.getRoute({
-                                    action: CONST.IOU.ACTION.EDIT,
-                                    iouType: CONST.IOU.TYPE.SPLIT_EXPENSE,
-                                    transactionID: CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
-                                    reportID,
-                                    upgradePath: CONST.UPGRADE_PATHS.DISTANCE_RATES,
-                                }),
-                            ),
-                        );
-                        return;
-                    }
-
-                    // SelfDM split with paid workspaces but none is default/active paid (e.g. personal
-                    // is the active policy): open the workspace selector first — same UX as the parent
-                    // self-DM expense's Rate field in MoneyRequestView and the Category branch below.
-                    if (!effectivePolicy && shouldSelectPolicy) {
-                        Navigation.navigate(ROUTES.SET_DEFAULT_WORKSPACE.getRoute(rateRoute));
-                        return;
-                    }
-
-                    Navigation.navigate(rateRoute);
-                }}
-            />
+            <MenuItem.Root
+                onPress={
+                    isRateInteractive
+                        ? callFunctionIfActionIsAllowed(() => {
+                              const rateRoute = createDynamicRoute(
+                                  DYNAMIC_ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(
+                                      CONST.IOU.ACTION.EDIT,
+                                      CONST.IOU.TYPE.SPLIT_EXPENSE,
+                                      CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
+                                      reportID,
+                                  ),
+                              );
+
+                              // SelfDM split whose source workspace is gone and user has no other paid workspace:
+                              // mirror the selfDM track-expense Rate flow (MoneyRequestView) and route through the
+                              // IOU-level upgrade screen so the user can create a workspace, then a distance rate.
+                              // Use OPTIMISTIC_TRANSACTION_ID so the post-upgrade hop back into the rate step picks
+                              // up the same SPLIT_TRANSACTION_DRAFT this screen reads from (see line 57 above).
+                              if (isSelfDMSplit && !effectivePolicy && !hasAnyPaidWorkspace && reportID) {
+                                  Navigation.navigate(
+                                      createDynamicRoute(
+                                          DYNAMIC_ROUTES.MONEY_REQUEST_UPGRADE.getRoute({
+                                              action: CONST.IOU.ACTION.EDIT,
+                                              iouType: CONST.IOU.TYPE.SPLIT_EXPENSE,
+                                              transactionID: CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
+                                              reportID,
+                                              upgradePath: CONST.UPGRADE_PATHS.DISTANCE_RATES,
+                                          }),
+                                      ),
+                                  );
+                                  return;
+                              }
+
+                              // SelfDM split with paid workspaces but none is default/active paid (e.g. personal
+                              // is the active policy): open the workspace selector first — same UX as the parent
+                              // self-DM expense's Rate field in MoneyRequestView and the Category branch below.
+                              if (!effectivePolicy && shouldSelectPolicy) {
+                                  Navigation.navigate(ROUTES.SET_DEFAULT_WORKSPACE.getRoute(rateRoute));
+                                  return;
+                              }
+
+                              Navigation.navigate(rateRoute);
+                          })
+                        : undefined
+                }
+            >
+                <MenuItemField.Row
+                    name={translate('common.rate')}
+                    value={rateToDisplay}
+                >
+                    {!!rateErrorText && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                    {isRateInteractive && <MenuItem.Chevron />}
+                </MenuItemField.Row>
+                {!!rateErrorText && (
+                    <MenuItem.HelpText
+                        isError
+                        message={rateErrorText}
+                    />
+                )}
+            </MenuItem.Root>
         </>
     ) : null;
 
diff --git a/src/pages/iou/DynamicSplitExpensePage.tsx b/src/pages/iou/DynamicSplitExpensePage.tsx
index 55ac81803984..36dcdb3acee3 100644
--- a/src/pages/iou/DynamicSplitExpensePage.tsx
+++ b/src/pages/iou/DynamicSplitExpensePage.tsx
@@ -5,7 +5,7 @@ import FormHelpMessage from '@components/FormHelpMessage';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItem from '@components/MenuItem';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {useSearchQueryContext, useSearchResultsContext, useSearchSelectionActions} from '@components/Search/SearchContext';
 import type {SplitListItemType} from '@components/SelectionList/ListItem/types';
@@ -583,16 +583,11 @@ function DynamicSplitExpensePage({route}: DynamicSplitExpensePageProps) {
 
     const headerDateContent = (
         <View style={styles.pb3}>
-            <MenuItemWithTopDescription
-                shouldShowRightIcon
-                shouldRenderAsHTML
-                key={translate('iou.splitDates')}
-                description={translate('iou.splitDates')}
-                title={splitDatesTitle}
+            <MenuItemField
+                name={translate('iou.splitDates')}
+                value={splitDatesTitle}
+                numberOfLinesValue={2}
                 onPress={handleDatePress}
-                style={[styles.moneyRequestMenuItem]}
-                titleWrapperStyle={styles.flex1}
-                numberOfLinesTitle={2}
             />
         </View>
     );
diff --git a/src/pages/iou/SplitList/index.tsx b/src/pages/iou/SplitList/index.tsx
index bdcefc554ce1..73e7c0d19a82 100644
--- a/src/pages/iou/SplitList/index.tsx
+++ b/src/pages/iou/SplitList/index.tsx
@@ -1,6 +1,6 @@
 import SelectionList from '@components/SelectionList';
 import SplitListItem from '@components/SelectionList/ListItem/SplitListItem';
-import type {ListItem, SplitListItemType} from '@components/SelectionList/ListItem/types';
+import type {SplitListItemType} from '@components/SelectionList/ListItem/types';
 import type {SelectionListHandle} from '@components/SelectionList/types';
 
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -9,7 +9,7 @@ import type CONST from '@src/CONST';
 
 import type {ValueOf} from 'type-fest';
 
-import React, {useMemo, useRef} from 'react';
+import React, {useRef} from 'react';
 
 import useHandleInputFocus from './useHandleInputFocus';
 
@@ -30,8 +30,6 @@ type SplitListProps = {
     mode: ValueOf<typeof CONST.TAB.SPLIT>;
 };
 
-type SplitListItemProps = React.ComponentProps<typeof SplitListItem>;
-
 /**
  * Unified component for split expense tabs (Amount, Percentage, Date).
  * Renders split items with the appropriate input type based on mode,
@@ -43,19 +41,7 @@ function SplitList({data, initiallyFocusedOptionKey, onSelectRow, listFooterCont
 
     const handleInputFocus = useHandleInputFocus({listRef});
 
-    // Create a wrapper component that adds the onInputFocus handler
-    const SplitListItemWithInputFocus = useMemo(
-        () =>
-            ((props: SplitListItemProps) => (
-                <SplitListItem
-                    onInputFocus={(item: ListItem) => handleInputFocus(item as SplitListItemType)}
-                    {...props}
-                />
-            )) as typeof SplitListItem,
-        [handleInputFocus],
-    );
-
-    const splitOptions = data.map((option) => ({...option, mode}));
+    const splitOptions = data.map((option) => ({...option, mode, onInputFocus: handleInputFocus}));
 
     return (
         <SelectionList
@@ -63,7 +49,7 @@ function SplitList({data, initiallyFocusedOptionKey, onSelectRow, listFooterCont
             onSelectRow={onSelectRow}
             ref={listRef}
             initiallyFocusedItemKey={initiallyFocusedOptionKey}
-            ListItem={SplitListItemWithInputFocus}
+            ListItem={SplitListItem}
             style={{containerStyle: styles.flexBasisAuto}}
             customListHeaderContent={listHeaderContent}
             listFooterContent={listFooterContent}
diff --git a/src/pages/iou/request/ParticipantSearchResults.tsx b/src/pages/iou/request/ParticipantSearchResults.tsx
index d56bd3848543..ed8a2f02d019 100644
--- a/src/pages/iou/request/ParticipantSearchResults.tsx
+++ b/src/pages/iou/request/ParticipantSearchResults.tsx
@@ -290,7 +290,7 @@ function ParticipantSearchResults({
         !!availableOptions?.userToInvite,
         debouncedSearchTerm.trim(),
         countryCode,
-        participants.some((participant) => doesPersonalDetailMatchSearchTerm(participant, currentUserAccountID, cleanSearchTerm)),
+        participants.some((participant) => doesPersonalDetailMatchSearchTerm(participant, currentUserAccountID, cleanSearchTerm, translate)),
     );
 
     const showImportContacts =
diff --git a/src/pages/iou/request/step/AmountSubmitDataSync.tsx b/src/pages/iou/request/step/AmountSubmitDataSync.tsx
index fe1b3be66791..2a1a4b396838 100644
--- a/src/pages/iou/request/step/AmountSubmitDataSync.tsx
+++ b/src/pages/iou/request/step/AmountSubmitDataSync.tsx
@@ -3,6 +3,7 @@ import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import useSelfDMReport from '@hooks/useSelfDMReport';
 
@@ -80,7 +81,7 @@ function AmountSubmitDataSync({report, transaction, transactionID, policyID, isE
     const selfDMReport = useSelfDMReport();
     const defaultExpensePolicy = useDefaultExpensePolicy();
     const personalPolicy = usePersonalPolicy();
-    const [allPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [allPersonalDetails] = useAllPersonalDetails();
     const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [allReportDrafts] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT);
     const [allReportNVPs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
diff --git a/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx b/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx
index a18380a8e95d..4cdc6d5e84c3 100644
--- a/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestEditReport.tsx
@@ -105,6 +105,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps)
     const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const {getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
     const selectReport = (item: TransactionGroupListItem, report?: OnyxEntry<Report>) => {
         if (transactionIDs.length === 0 || item.value === reportID) {
@@ -131,6 +132,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps)
                 allTransactionViolation: transactionViolations,
                 reports: reportsForCall,
                 rules,
+                cardList,
                 isTrackIntentUser,
                 personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
                 selfDMReportActions,
@@ -162,6 +164,7 @@ function DynamicIOURequestEditReport({route}: DynamicIOURequestEditReportProps)
             allTransactionViolation: transactionViolations,
             reports,
             rules,
+            cardList,
             isTrackIntentUser,
             personalPolicyOutputCurrency: personalPolicy?.outputCurrency,
             selfDMReportActions,
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx b/src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx
index 9309efade426..0d3fcae34691 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepAttendees.tsx
@@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePrevious from '@hooks/usePrevious';
 import useReportOwnerAsAttendee from '@hooks/useReportOwnerAsAttendee';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
@@ -23,10 +24,10 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type {Attendee} from '@src/types/onyx/IOU';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import {deepEqual} from 'fast-equals';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 
@@ -55,7 +56,7 @@ function DynamicIOURequestStepAttendees({
     const reportOwnerAsAttendee = useReportOwnerAsAttendee(transaction);
     const [attendees, setAttendees] = useState<Attendee[]>(() => getOriginalAttendees(transaction, reportOwnerAsAttendee));
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
index f83e2954f947..d5b747707863 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepCategory.tsx
@@ -3,14 +3,10 @@ import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOffli
 import Button from '@components/Button';
 import CategoryPicker from '@components/CategoryPicker';
 import FixedFooter from '@components/FixedFooter';
-import {useSearchQueryContext} from '@components/Search/SearchContext';
 import type {ListItem} from '@components/SelectionList/types';
 import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
 
-import useAllTransactionViolations from '@hooks/useAllTransactionViolations';
-import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
-import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -24,13 +20,11 @@ import useReportOrReportDraft from '@hooks/useReportOrReportDraft';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
 import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useUpdateTransactionCategory from '@hooks/useUpdateTransactionCategory';
 
-import {getIOURequestPolicyID, setMoneyRequestCategory} from '@libs/actions/IOU/MoneyRequest';
-import {setDraftSplitTransaction} from '@libs/actions/IOU/Split';
-import {updateMoneyRequestCategory} from '@libs/actions/IOU/UpdateMoneyRequest';
+import {getIOURequestPolicyID} from '@libs/actions/IOU/MoneyRequest';
 import {enablePolicyCategories, getPolicyCategories} from '@libs/actions/Policy/Category';
 import {isCategoryMissing} from '@libs/CategoryUtils';
-import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {getSelectedWorkspacePolicyID, pickReportForPolicy} from '@libs/IOUUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -43,9 +37,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 
-import {isTrackIntentUserSelector} from '@selectors/Onboarding';
 import lodashIsEmpty from 'lodash/isEmpty';
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
@@ -68,7 +60,6 @@ function DynamicIOURequestStepCategory({
     },
     transaction,
 }: DynamicIOURequestStepCategoryProps) {
-    const {getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const illustrations = useMemoizedLazyIllustrations(['EmptyStateExpenses']);
@@ -95,32 +86,17 @@ function DynamicIOURequestStepCategory({
     const policyID = policy?.id;
 
     const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);
-    const allTransactionViolations = useAllTransactionViolations(transaction?.transactionID);
     const [policyCategoriesReal] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
     const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyIdDraft}`);
-    const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
-    const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`);
-    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
-    const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
-    const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {
-        selector: isTrackIntentUserSelector,
-    });
-    const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
 
     const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
     const policyData = usePolicyData(policy?.id);
-    const {currentSearchHash} = useSearchQueryContext();
     const currentTransaction = isEditingSplit && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction : transaction;
     const transactionCategory = getTransactionDetails(currentTransaction)?.category ?? '';
     useRestartOnReceiptFailure(transaction, routeReportID, iouType, action);
-    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const currentUserAccountIDParam = currentUserPersonalDetails.accountID;
-    const currentUserEmailParam = currentUserPersonalDetails.login ?? '';
-    const delegateAccountID = useDelegateAccountID();
-    const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
+    const currentUserEmailParam = useCurrentUserPersonalDetails().login ?? '';
+    const {isBetaEnabledOrUnknown} = usePermissions();
     const isVendorMatchingBetaEnabled = isBetaEnabledOrUnknown(CONST.BETAS.VENDOR_MATCHING);
-    const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
 
     const categoryForDisplay = isCategoryMissing(transactionCategory) ? '' : transactionCategory;
 
@@ -167,6 +143,16 @@ function DynamicIOURequestStepCategory({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [policyID]);
 
+    const {updateCategory: updateTransactionCategory, isDraftUpdate} = useUpdateTransactionCategory({
+        transactionID,
+        transaction,
+        report,
+        policy,
+        policyCategories,
+        isEditing,
+        isEditingSplit,
+    });
+
     const navigateBack = () => {
         Navigation.goBack(backPath);
     };
@@ -180,54 +166,11 @@ function DynamicIOURequestStepCategory({
         const isSelectedCategory = categorySearchText === categoryForDisplay;
         const updatedCategory = isSelectedCategory ? '' : categorySearchText;
 
-        if (transaction) {
-            // In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
-            if (isEditingSplit) {
-                setDraftSplitTransaction(transaction.transactionID, splitDraftTransaction, {category: updatedCategory}, getCurrencyDecimals, getCurrencySymbol, policy);
-                saveAndNavigateBack();
-                return;
-            }
-
-            if (isEditing && report) {
-                updateMoneyRequestCategory({
-                    isVendorMatchingBetaEnabled,
-                    transactionID: transaction.transactionID,
-                    transaction,
-                    transactionThreadReport: report,
-                    parentReport,
-                    iouReportOwnerLogin,
-                    category: updatedCategory,
-                    policy,
-                    policyTagList: policyTags,
-                    policyCategories,
-                    policyRecentlyUsedCategories,
-                    currentUserAccountIDParam,
-                    currentUserEmailParam,
-                    isASAPSubmitBetaEnabled,
-                    hash: currentSearchHash,
-                    delegateAccountID,
-                    reportPolicyTags,
-                    isTrackIntentUser,
-                    violations: allTransactionViolations,
-                    getCurrencyDecimals,
-                    getCurrencySymbol,
-                    rules,
-                });
-                saveAndNavigateBack();
-                return;
-            }
-        }
-
-        setMoneyRequestCategory(transactionID, updatedCategory, policy, getCurrencyDecimals);
-
-        // `action === CATEGORIZE` only ever occurs when categorizing a fresh tracked expense directly from a
-        // report (never from an existing Confirmation screen), so continue forward into Confirmation here.
-        if (action === CONST.IOU.ACTION.CATEGORIZE) {
-            if (backPath.includes('/confirmation/')) {
-                saveAndNavigateBack();
-                return;
-            }
+        updateTransactionCategory(updatedCategory);
 
+        // `action === CATEGORIZE` only occurs when categorizing a fresh tracked expense from a report, never from
+        // an existing Confirmation screen, so continue forward into Confirmation here.
+        if (isDraftUpdate && action === CONST.IOU.ACTION.CATEGORIZE && !backPath.includes('/confirmation/')) {
             if (report?.reportID) {
                 Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report.reportID));
             }
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepCategoryCreate.tsx b/src/pages/iou/request/step/DynamicIOURequestStepCategoryCreate.tsx
index 2709c0324391..ecd7cd0c9c76 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepCategoryCreate.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepCategoryCreate.tsx
@@ -10,6 +10,7 @@ import useLocalize from '@hooks/useLocalize';
 import useOnboardingTaskInformation from '@hooks/useOnboardingTaskInformation';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
@@ -25,6 +26,7 @@ import getPathWithoutDynamicSuffix from '@libs/Navigation/helpers/dynamicRoutesU
 import Navigation from '@libs/Navigation/Navigation';
 import {hasTags} from '@libs/PolicyUtils';
 import {isSelfDM} from '@libs/ReportUtils';
+import StringUtils from '@libs/StringUtils';
 
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import CategoryForm from '@pages/workspace/categories/CategoryForm';
@@ -33,9 +35,9 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
@@ -98,7 +100,7 @@ function DynamicIOURequestStepCategoryCreate({
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
     const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportReal?.parentReportID ?? reportDraft?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
@@ -124,7 +126,7 @@ function DynamicIOURequestStepCategoryCreate({
     } = useOnboardingTaskInformation(CONST.ONBOARDING_TASK_TYPE.SETUP_CATEGORIES_AND_TAGS);
 
     const createCategory = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
-        const categoryName = values.categoryName.trim();
+        const categoryName = StringUtils.sanitizeName(values.categoryName);
 
         if (!policyID) {
             return;
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepDate.tsx b/src/pages/iou/request/step/DynamicIOURequestStepDate.tsx
index 78a0395c2593..883822bbd2c6 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepDate.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepDate.tsx
@@ -13,6 +13,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import usePolicy from '@hooks/usePolicy';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
@@ -35,13 +36,13 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import INPUT_IDS from '@src/types/form/MoneyRequestDateForm';
 import type {Report, Transaction} from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import lodashIsEmpty from 'lodash/isEmpty';
 import React, {useCallback} from 'react';
 
@@ -83,7 +84,7 @@ function DynamicIOURequestStepDate({
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
 
     const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepDescription.tsx b/src/pages/iou/request/step/DynamicIOURequestStepDescription.tsx
index 95541661cb02..43bbdbc23225 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepDescription.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepDescription.tsx
@@ -14,6 +14,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNavigateBackOnSave from '@hooks/useNavigateBackOnSave';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
 import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
@@ -37,13 +38,13 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import INPUT_IDS from '@src/types/form/MoneyRequestDescriptionForm';
 import type * as OnyxTypes from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import lodashIsEmpty from 'lodash/isEmpty';
 import React, {useCallback, useMemo, useState} from 'react';
 import {View} from 'react-native';
@@ -73,7 +74,7 @@ function DynamicIOURequestStepDescription({
     const allTransactionViolations = useAllTransactionViolations(transaction?.transactionID);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
 
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`);
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepDistanceRate.tsx b/src/pages/iou/request/step/DynamicIOURequestStepDistanceRate.tsx
index faaa85d8d49b..33e77e963418 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepDistanceRate.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepDistanceRate.tsx
@@ -12,6 +12,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
@@ -40,12 +41,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type * as OnyxTypes from '@src/types/onyx';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import {policyTypeSelector} from '@selectors/Policy';
 import lodashIsEmpty from 'lodash/isEmpty';
 import React, {useState} from 'react';
@@ -77,7 +78,7 @@ function DynamicIOURequestStepDistanceRate({
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
 
     const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepMerchant.tsx b/src/pages/iou/request/step/DynamicIOURequestStepMerchant.tsx
index a20efa9e1410..4e626a5fe607 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepMerchant.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepMerchant.tsx
@@ -15,6 +15,7 @@ import useNavigateBackOnSave from '@hooks/useNavigateBackOnSave';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
 import useShowNotFoundPageInIOUStep from '@hooks/useShowNotFoundPageInIOUStep';
@@ -35,11 +36,11 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import INPUT_IDS from '@src/types/form/MoneyRequestMerchantForm';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
 
@@ -67,7 +68,7 @@ function DynamicIOURequestStepMerchant({
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
     const styles = useThemeStyles();
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepTag.tsx b/src/pages/iou/request/step/DynamicIOURequestStepTag.tsx
index 06d47afc7561..a2ad9156bdc1 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepTag.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepTag.tsx
@@ -10,10 +10,12 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLoadPolicyTags from '@hooks/useLoadPolicyTags';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
@@ -36,10 +38,10 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
 
@@ -84,7 +86,7 @@ function DynamicIOURequestStepTag({
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
     const [policyRecentlyUsedTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${policyID}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
 
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
@@ -141,7 +143,15 @@ function DynamicIOURequestStepTag({
         return parentTagAtIndex ? [parentTagAtIndex] : undefined;
     }, [parentTransactionTag, tagListIndex]);
 
-    const shouldShowTag = transactionTag || hasEnabledTags(policyTagLists) || !!additionalTagsToInclude?.length;
+    // Backfill the policy's tags here too, not just inside TagPicker: on a lazy-loaded account an absent collection
+    // makes `hasEnabledTags` false, so without this the empty state renders, TagPicker never mounts, and the read it
+    // owns never fires — leaving the user unable to assign a tag to an untagged expense.
+    const {isLoadingPolicyTags} = useLoadPolicyTags(policyID);
+
+    // An absent tags collection means "not read yet", not "this policy has no tags", so keep the picker mounted while
+    // the read is in flight and let it show its own loading state. Once the tags land, a genuinely tag-less policy
+    // falls back to the empty state as before.
+    const shouldShowTag = transactionTag || hasEnabledTags(policyTagLists) || !!additionalTagsToInclude?.length || isLoadingPolicyTags;
 
     const shouldShowNotFoundPage = useShowNotFoundPageInIOUStep(action, iouType, reportActionID, report, transaction);
 
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepTaxAmountPage.tsx b/src/pages/iou/request/step/DynamicIOURequestStepTaxAmountPage.tsx
index 81c8f6c764c4..525482ef62ff 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepTaxAmountPage.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepTaxAmountPage.tsx
@@ -7,6 +7,7 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
 
@@ -26,7 +27,6 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type {Policy, Transaction} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
@@ -34,6 +34,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 
 import {useFocusEffect} from '@react-navigation/native';
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import React, {useCallback, useRef} from 'react';
 
 import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
@@ -76,7 +77,7 @@ function DynamicIOURequestStepTaxAmountPage({
     const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
 
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx b/src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx
index 150044b77c53..31e4abda1473 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepTaxRatePage.tsx
@@ -8,6 +8,7 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import usePolicyForTransaction from '@hooks/usePolicyForTransaction';
 import useRestartOnReceiptFailure from '@hooks/useRestartOnReceiptFailure';
@@ -28,13 +29,13 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import {personalDetailsLoginSelector} from '@src/selectors/PersonalDetails';
 import type {Policy, Transaction} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
 import {isTrackIntentUserSelector} from '@selectors/Onboarding';
+import {loginSelector} from '@selectors/PersonalDetails';
 import React from 'react';
 
 import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
@@ -81,7 +82,7 @@ function DynamicIOURequestStepTaxRatePage({
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(report?.parentReportID)}`);
     const [reportPolicyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(parentReport?.policyID)}`);
-    const [iouReportOwnerLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: personalDetailsLoginSelector(parentReport?.ownerAccountID)});
+    const [iouReportOwnerLogin] = usePersonalDetail(parentReport?.ownerAccountID, loginSelector);
 
     useRestartOnReceiptFailure(transaction, reportIDFromRoute, iouType, action);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
diff --git a/src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx b/src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx
index 9c35a067b3a1..cebe3dca5442 100644
--- a/src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx
+++ b/src/pages/iou/request/step/DynamicIOURequestStepUpgrade.tsx
@@ -111,6 +111,7 @@ function DynamicIOURequestStepUpgrade({
     const [selfDMReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getNonEmptyStringOnyxID(selfDMReportID)}`);
     const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const {getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
 
     // Search-selected transactions are not in COLLECTION.TRANSACTION — extract from `selectedTransactions` directly.
@@ -174,6 +175,7 @@ function DynamicIOURequestStepUpgrade({
                 allTransactionViolation: transactionViolations,
                 reports: reportsForCall,
                 rules,
+                cardList,
                 selfDMReportActions,
                 isTrackIntentUser,
                 // Expenses move to the upgraded workspace (newPolicy), whose currency drives any distance calculation, so the personal-policy currency is never read here.
@@ -294,6 +296,7 @@ function DynamicIOURequestStepUpgrade({
         getCurrencyDecimals,
         getCurrencySymbol,
         rules,
+        cardList,
         areAllMatchingItemsSelected,
         currentSearchQueryJSON,
         excludedTransactions,
diff --git a/src/pages/iou/request/step/IOURequestEditReportCommon.tsx b/src/pages/iou/request/step/IOURequestEditReportCommon.tsx
index ee6b962db838..d3aa0ed49d3f 100644
--- a/src/pages/iou/request/step/IOURequestEditReportCommon.tsx
+++ b/src/pages/iou/request/step/IOURequestEditReportCommon.tsx
@@ -439,7 +439,7 @@ function IOURequestEditReportCommon({
             <SelectionList
                 data={reportOptions}
                 onSelectRow={handleSelectReport}
-                isRowMultilineSupported
+                titleNumberOfLines={2}
                 shouldShowTextInput={!hasMultipleSubmitters && outstandingReports.length >= CONST.STANDARD_LIST_ITEM_LIMIT}
                 textInputOptions={{
                     value: searchValue,
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index 5bc8ab15358b..e1d36dec11d9 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -66,7 +66,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {MoneyRequestNavigatorParamList} from '@libs/Navigation/types';
 import {getParticipantsOption, getReportOption} from '@libs/OptionsListUtils';
 import {getDistanceRateCustomUnit} from '@libs/PolicyUtils';
-import {findSelfDMReportID, generateReportID, getChatByParticipants, getReportOrDraftReport, isMoneyRequestReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils';
+import {findSelfDMReportID, generateReportID, getParticipantsChatKey, getReportOrDraftReport, isMoneyRequestReport, isPolicyExpenseChat as isPolicyExpenseChatUtils} from '@libs/ReportUtils';
 import {cancelTracking, getPendingSubmitFollowUpAction, isTracking} from '@libs/telemetry/submitFollowUpAction';
 import {
     getRequestType,
@@ -94,7 +94,7 @@ import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
-import type {Policy} from '@src/types/onyx';
+import type {OneOnOneChatReportIDsDerivedValue, Policy} from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type {Receipt} from '@src/types/onyx/Transaction';
@@ -723,11 +723,11 @@ function IOURequestStepConfirmationContent({
 
     // Read reports reactively: if the chat lands mid-flow the optimistic ID must drop out, or we'd reveal an uncreated report.
     const existingP2PChatSelector = useCallback(
-        (reports: Parameters<typeof getChatByParticipants>[1]) =>
-            isP2PDestination ? getChatByParticipants([p2pRecipientAccountID, currentUserPersonalDetails.accountID], reports)?.reportID : undefined,
+        (chatReportIDs: OnyxEntry<OneOnOneChatReportIDsDerivedValue>) =>
+            isP2PDestination ? chatReportIDs?.reportIDs?.[getParticipantsChatKey([p2pRecipientAccountID, currentUserPersonalDetails.accountID])] : undefined,
         [isP2PDestination, p2pRecipientAccountID, currentUserPersonalDetails.accountID],
     );
-    const [existingP2PDestinationReportID] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: existingP2PChatSelector});
+    const [existingP2PDestinationReportID] = useOnyx(ONYXKEYS.DERIVED.ONE_ON_ONE_CHAT_REPORT_IDS, {selector: existingP2PChatSelector});
     const optimisticP2PDestinationReportID = !existingP2PDestinationReportID && reusableP2PReportID ? reusableP2PReportID : undefined;
     // Trust `report` when it already belongs to this participant (their chat, or an IOU report under it), so a
     // flow started from an IOU report keeps that report as destination instead of falling back to the chat.
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx
index 19d7f9bed52b..ea591ee07807 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceGPS/GPSButtons/index.tsx
@@ -1,8 +1,9 @@
 import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
 import {loadIllustration} from '@components/Icon/IllustrationLoader';
+import {ModalActions} from '@components/Modal/Global/ModalContext';
 import {useSession} from '@components/OnyxListItemProvider';
 
+import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyAsset} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -22,7 +23,7 @@ import type {GPSPoint} from '@src/types/onyx/GpsDraftDetails';
 import type {Unit} from '@src/types/onyx/Policy';
 
 import {hasServicesEnabledAsync, startLocationUpdatesAsync} from 'expo-location';
-import React, {useState} from 'react';
+import React, {useRef} from 'react';
 import {Linking, View} from 'react-native';
 
 import GPSTooltip from './GPSTooltip';
@@ -49,11 +50,9 @@ type ButtonsProps = {
 };
 
 function GPSButtons({navigateToNextStep, setShouldShowStartError, setShouldShowPermissionsError, reportID, unit, gpsPoints}: ButtonsProps) {
-    const [showLocationRequiredModal, setShowLocationRequiredModal] = useState(false);
-    const [showZeroDistanceModal, setShowZeroDistanceModal] = useState(false);
-    const [showDisabledServicesModal, setShowDisabledServicesModal] = useState(false);
     const {isOffline} = useNetwork();
     const session = useSession();
+    const {showConfirmModal} = useConfirmModal();
 
     const {asset: ReceiptLocationMarker} = useMemoizedLazyAsset(() => loadIllustration('ReceiptLocationMarker'));
     const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
@@ -62,6 +61,69 @@ function GPSButtons({navigateToNextStep, setShouldShowStartError, setShouldShowP
 
     const isTripStopped = isTripStoppedUtil(gpsDraftDetails);
 
+    // The prompts live on the global modal stack, which adds a new entry on every call. Two quick presses can both get
+    // past the awaited services check before either prompt is up, so this keeps a second prompt from stacking on the first.
+    const isPromptOpenRef = useRef(false);
+
+    const showPrompt = (options: Parameters<typeof showConfirmModal>[0], onConfirm?: () => void) => {
+        if (isPromptOpenRef.current) {
+            return;
+        }
+        isPromptOpenRef.current = true;
+
+        showConfirmModal(options).then((result) => {
+            isPromptOpenRef.current = false;
+
+            if (result.action !== ModalActions.CONFIRM) {
+                return;
+            }
+
+            onConfirm?.();
+        });
+    };
+
+    const showDisabledServicesModal = () => {
+        showPrompt(
+            {
+                title: translate('gps.locationServicesRequiredModal.title'),
+                prompt: translate('gps.locationServicesRequiredModal.prompt'),
+                confirmText: translate('gps.locationServicesRequiredModal.confirm'),
+                cancelText: translate('common.dismiss'),
+                shouldReverseStackedButtons: true,
+            },
+            openSettings,
+        );
+    };
+
+    const showLocationRequiredModal = () => {
+        showPrompt(
+            {
+                title: translate('gps.locationRequiredModal.title'),
+                prompt: translate('gps.locationRequiredModal.prompt'),
+                confirmText: translate('common.settings'),
+                cancelText: translate('common.dismiss'),
+                iconSource: ReceiptLocationMarker,
+                iconFill: false,
+                iconWidth: 140,
+                iconHeight: 120,
+                shouldCenterIcon: true,
+                shouldReverseStackedButtons: true,
+            },
+            () => {
+                Linking.openSettings();
+            },
+        );
+    };
+
+    const showZeroDistanceModal = () => {
+        showPrompt({
+            title: translate('gps.zeroDistanceTripModal.title'),
+            prompt: translate('gps.zeroDistanceTripModal.prompt'),
+            confirmText: translate('common.buttonConfirm'),
+            shouldShowCancelButton: false,
+        });
+    };
+
     // Returns true if location tracking was successfully initialized, false otherwise
     const initLocationTracking = async (): Promise<boolean> => {
         try {
@@ -99,7 +161,7 @@ function GPSButtons({navigateToNextStep, setShouldShowStartError, setShouldShowP
     const startPermissionsFlow = useBackgroundLocationPermissionsFlow({
         // eslint-disable-next-line @typescript-eslint/no-misused-promises -- the flow starts the trip without awaiting it
         onGrant: isTripStopped ? resumeGpsTrip : startGpsTrip,
-        onDeny: () => setShowLocationRequiredModal(true),
+        onDeny: showLocationRequiredModal,
         onError: () => setShouldShowPermissionsError(true),
     });
 
@@ -109,7 +171,7 @@ function GPSButtons({navigateToNextStep, setShouldShowStartError, setShouldShowP
         const hasLocationServicesEnabled = await hasServicesEnabledAsync();
 
         if (!hasLocationServicesEnabled) {
-            setShowDisabledServicesModal(true);
+            showDisabledServicesModal();
             return;
         }
 
@@ -122,96 +184,50 @@ function GPSButtons({navigateToNextStep, setShouldShowStartError, setShouldShowP
 
     const saveGpsTrip = () => {
         if (gpsDraftDetails?.distanceInMeters === 0) {
-            setShowZeroDistanceModal(true);
+            showZeroDistanceModal();
             return;
         }
 
         navigateToNextStep();
     };
 
-    const openSettingsForLocationServices = () => {
-        setShowDisabledServicesModal(false);
-        openSettings();
-    };
-
-    return (
-        <>
-            {isTripStopped ? (
-                <View style={[styles.gap2, styles.flexRow]}>
-                    <Button
-                        onPress={checkSettingsAndPermissions}
-                        size={CONST.BUTTON_SIZE.LARGE}
-                        style={[styles.flex1]}
-                        sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.GPS_DISCARD_BUTTON}
-                    >
-                        <Button.KeyboardShortcut allowBubble />
-                        <Button.Text>{translate('gps.resume')}</Button.Text>
-                    </Button>
-                    <Button
-                        onPress={saveGpsTrip}
-                        variant={CONST.BUTTON_VARIANT.SUCCESS}
-                        size={CONST.BUTTON_SIZE.LARGE}
-                        style={[styles.flex1]}
-                        sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.GPS_NEXT_BUTTON}
-                    >
-                        <Button.KeyboardShortcut allowBubble />
-                        <Button.Text>{translate('gps.save')}</Button.Text>
-                    </Button>
-                </View>
-            ) : (
-                <GPSTooltip>
-                    <View>
-                        <Button
-                            onPress={gpsDraftDetails?.isTracking ? stopGpsTrip : checkSettingsAndPermissions}
-                            variant={gpsDraftDetails?.isTracking ? undefined : CONST.BUTTON_VARIANT.SUCCESS}
-                            size={CONST.BUTTON_SIZE.LARGE}
-                            style={[styles.w100, styles.flexShrink0]}
-                            sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.GPS_START_STOP_BUTTON}
-                        >
-                            <Button.KeyboardShortcut allowBubble />
-                            <Button.Text>{gpsDraftDetails?.isTracking ? translate('gps.stop') : translate('gps.start')}</Button.Text>
-                        </Button>
-                    </View>
-                </GPSTooltip>
-            )}
-
-            <ConfirmModal
-                shouldShowCancelButton={false}
-                title={translate('gps.zeroDistanceTripModal.title')}
-                isVisible={showZeroDistanceModal}
-                onConfirm={() => setShowZeroDistanceModal(false)}
-                confirmText={translate('common.buttonConfirm')}
-                prompt={translate('gps.zeroDistanceTripModal.prompt')}
-            />
-            <ConfirmModal
-                isVisible={showLocationRequiredModal}
-                title={translate('gps.locationRequiredModal.title')}
-                onConfirm={() => {
-                    setShowLocationRequiredModal(false);
-                    Linking.openSettings();
-                }}
-                onCancel={() => setShowLocationRequiredModal(false)}
-                confirmText={translate('common.settings')}
-                cancelText={translate('common.dismiss')}
-                prompt={translate('gps.locationRequiredModal.prompt')}
-                iconSource={ReceiptLocationMarker}
-                iconFill={false}
-                iconWidth={140}
-                iconHeight={120}
-                shouldCenterIcon
-                shouldReverseStackedButtons
-            />
-            <ConfirmModal
-                title={translate('gps.locationServicesRequiredModal.title')}
-                isVisible={showDisabledServicesModal}
-                onConfirm={openSettingsForLocationServices}
-                onCancel={() => setShowDisabledServicesModal(false)}
-                confirmText={translate('gps.locationServicesRequiredModal.confirm')}
-                cancelText={translate('common.dismiss')}
-                prompt={translate('gps.locationServicesRequiredModal.prompt')}
-                shouldReverseStackedButtons
-            />
-        </>
+    return isTripStopped ? (
+        <View style={[styles.gap2, styles.flexRow]}>
+            <Button
+                onPress={checkSettingsAndPermissions}
+                size={CONST.BUTTON_SIZE.LARGE}
+                style={[styles.flex1]}
+                sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.GPS_DISCARD_BUTTON}
+            >
+                <Button.KeyboardShortcut allowBubble />
+                <Button.Text>{translate('gps.resume')}</Button.Text>
+            </Button>
+            <Button
+                onPress={saveGpsTrip}
+                variant={CONST.BUTTON_VARIANT.SUCCESS}
+                size={CONST.BUTTON_SIZE.LARGE}
+                style={[styles.flex1]}
+                sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.GPS_NEXT_BUTTON}
+            >
+                <Button.KeyboardShortcut allowBubble />
+                <Button.Text>{translate('gps.save')}</Button.Text>
+            </Button>
+        </View>
+    ) : (
+        <GPSTooltip>
+            <View>
+                <Button
+                    onPress={gpsDraftDetails?.isTracking ? stopGpsTrip : checkSettingsAndPermissions}
+                    variant={gpsDraftDetails?.isTracking ? undefined : CONST.BUTTON_VARIANT.SUCCESS}
+                    size={CONST.BUTTON_SIZE.LARGE}
+                    style={[styles.w100, styles.flexShrink0]}
+                    sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.GPS_START_STOP_BUTTON}
+                >
+                    <Button.KeyboardShortcut allowBubble />
+                    <Button.Text>{gpsDraftDetails?.isTracking ? translate('gps.stop') : translate('gps.start')}</Button.Text>
+                </Button>
+            </View>
+        </GPSTooltip>
     );
 }
 
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
index 1457edbc41a3..96f1f205f212 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx
@@ -12,6 +12,7 @@ import useMoneyRequestPolicyTagsForReport from '@hooks/useMoneyRequestPolicyTags
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import usePolicy from '@hooks/usePolicy';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
@@ -73,7 +74,7 @@ function IOURequestStepDistanceGPS({
     const isArchived = useReportIsArchived(report?.reportID);
     const [gpsDraftDetails] = useOnyx(ONYXKEYS.GPS_DRAFT_DETAILS);
     const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const reportAttributesDerived = useReportAttributes();
     const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
     const [policyRecentlyUsedCurrencies] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES);
diff --git a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
index 16eaf551212f..cd18b4c2b28e 100644
--- a/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
+++ b/src/pages/iou/request/step/IOURequestStepReport/hooks/useReportSelectionActions.ts
@@ -120,6 +120,7 @@ function useReportSelectionActions({
     const reports = useChangeTransactionsReportReports(transaction ? [transaction] : [], undefined);
     const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector});
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
     const delegateAccountID = useDelegateAccountID();
     const {getCurrencyDecimals, getCurrencySymbol} = useCurrencyListActions();
 
@@ -218,6 +219,7 @@ function useReportSelectionActions({
                         allTransactionViolation: transactionViolations,
                         reports: reportsForCall,
                         rules,
+                        cardList,
                         isTrackIntentUser,
                         personalPolicyOutputCurrency: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`]?.outputCurrency,
                         selfDMReportActions,
@@ -250,6 +252,7 @@ function useReportSelectionActions({
                     allTransactionViolation: transactionViolations,
                     reports,
                     rules,
+                    cardList,
                     isTrackIntentUser,
                     personalPolicyOutputCurrency: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${personalPolicyID}`]?.outputCurrency,
                     selfDMReportActions,
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index 21d5094fa50b..1d015e201149 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -12,6 +12,7 @@ import useOnyx from '@hooks/useOnyx';
 import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
 import useParticipantsPolicyTags from '@hooks/useParticipantsPolicyTags';
 import usePermissions from '@hooks/usePermissions';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
 import usePreMountDestination from '@hooks/usePreMountDestination';
@@ -90,7 +91,7 @@ function ScanSkipConfirmation({report, action, iouType, reportID, transactionID,
     const delegateAccountID = useDelegateAccountID();
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
 
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
     const [policyRecentlyUsedCurrencies] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
diff --git a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
index 02971cbd38a2..0d2ddc3705f0 100644
--- a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
+++ b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
@@ -175,8 +175,15 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
     const [sourceUri, setSourceUri] = useState<ReceiptSource>('');
 
     const parentReportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
-    const canEditReceipt = canEditFieldOfMoneyRequest({reportAction: parentReportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT, transaction, rules});
-    const canDeleteReceipt = canEditFieldOfMoneyRequest({reportAction: parentReportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT, isDeleteAction: true, transaction, rules});
+    const canEditReceipt = canEditFieldOfMoneyRequest({reportAction: parentReportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT, transaction, rules, reportNameValuePairs: undefined});
+    const canDeleteReceipt = canEditFieldOfMoneyRequest({
+        reportAction: parentReportAction,
+        fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
+        isDeleteAction: true,
+        transaction,
+        rules,
+        reportNameValuePairs: undefined,
+    });
 
     const receiptFilename = transaction?.receipt?.filename;
     const isStitchedOdometerReceipt = isOdometerDistanceRequest(transaction) && !imageType;
diff --git a/src/pages/settings/AboutPage/AboutPage.tsx b/src/pages/settings/AboutPage/AboutPage.tsx
index 835ac71d9da3..3b1c6f495f5a 100644
--- a/src/pages/settings/AboutPage/AboutPage.tsx
+++ b/src/pages/settings/AboutPage/AboutPage.tsx
@@ -11,6 +11,7 @@ import useDocumentTitle from '@hooks/useDocumentTitle';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
@@ -75,6 +76,7 @@ function AboutPage() {
     const aboutIllustration = useAboutSectionIllustration();
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
@@ -119,7 +121,7 @@ function AboutPage() {
                 icon: icons.Bug,
                 sentryLabel: CONST.SENTRY_LABEL.SETTINGS_ABOUT.REPORT_A_BUG,
                 action: waitForNavigate(() => {
-                    navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+                    navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
                 }),
             },
         ];
@@ -146,7 +148,7 @@ function AboutPage() {
             wrapperStyle: [styles.sectionMenuItemTopDescription],
             sentryLabel,
         }));
-    }, [icons, styles, translate, waitForNavigate, conciergeReportID, introSelected, isSelfTourViewed, currentUserAccountID]);
+    }, [icons, styles, translate, waitForNavigate, conciergeReportID, introSelected, isSelfTourViewed, currentUserAccountID, conciergePersonalDetails]);
 
     const overlayContent = useCallback(
         () => (
diff --git a/src/pages/settings/Agents/AddAgentPage.tsx b/src/pages/settings/Agents/AddAgentPage.tsx
index 00cf4179d60e..d9bc458715ac 100644
--- a/src/pages/settings/Agents/AddAgentPage.tsx
+++ b/src/pages/settings/Agents/AddAgentPage.tsx
@@ -43,9 +43,9 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import type {TextInputKeyPressEvent} from 'react-native';
 
 import React, {useCallback, useEffect, useRef} from 'react';
-import {View} from 'react-native';
+import {Platform, View} from 'react-native';
 
-import {PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE} from './const';
+import {PROMPT_MAX_AUTO_GROW_HEIGHT, PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE} from './const';
 import scrollToMultilineInput from './scrollToMultilineInput';
 
 type AddAgentPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.AGENTS.ADD>;
@@ -66,6 +66,10 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
     const {windowWidth, windowHeight} = useWindowDimensions();
     const {isKeyboardActive} = useKeyboardState();
     const isInLandscapeMode = isInLandscapeModeUtil(windowWidth, windowHeight);
+    // On native portrait the prompt grows with its content up to a max height instead of filling the screen, so the open
+    // keyboard can't squeeze it or hide the line being edited, and the form scrolls to fit it above the keyboard.
+    const shouldAutoGrowPromptInput = Platform.OS !== 'web' && !isInLandscapeMode;
+    const shouldUseScrollableLayout = shouldAutoGrowPromptInput || isInLandscapeMode;
     const shouldShrinkPromptInput = isInLandscapeMode && isKeyboardActive;
     const {accountID: ownerAccountID, login: ownerLogin, displayName} = useCurrentUserPersonalDetails();
     const defaultAgentName = template?.name ?? (displayName ? translate('addAgentPage.defaultAgentName', displayName) : undefined);
@@ -182,7 +186,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
     };
 
     const promptTopOffsetRef = useRef(0);
-    const handleInputFocus = () => scrollToMultilineInput(formRef, isInLandscapeMode, promptTopOffsetRef.current);
+    const handleInputFocus = () => scrollToMultilineInput(formRef, shouldUseScrollableLayout, promptTopOffsetRef.current);
 
     const agentAvatar = avatarSource ? (
         <UserAvatar
@@ -197,6 +201,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
             testID={AddAgentPage.displayName}
             includeSafeAreaPaddingBottom
             offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight={shouldAutoGrowPromptInput}
         >
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
@@ -211,7 +216,7 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
                 validate={validate}
                 submitButtonText={translate('addAgentPage.createAgent')}
                 style={[styles.flex1, styles.ph5]}
-                shouldUseScrollView={isInLandscapeMode}
+                shouldUseScrollView={shouldUseScrollableLayout}
                 submitFlexEnabled={false}
                 shouldHideFixErrorsAlert
                 enabledWhenOffline
@@ -240,7 +245,11 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
                         defaultValue={defaultAgentName}
                     />
                     <View
-                        style={shouldShrinkPromptInput ? StyleUtils.getHeight(PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE) : [isInLandscapeMode ? styles.h42 : styles.flex1]}
+                        style={
+                            shouldShrinkPromptInput
+                                ? StyleUtils.getHeight(PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE)
+                                : [isInLandscapeMode && styles.h42, !isInLandscapeMode && !shouldAutoGrowPromptInput && styles.flex1]
+                        }
                         onLayout={(event) => {
                             promptTopOffsetRef.current = event.nativeEvent.layout.y;
                         }}
@@ -256,9 +265,11 @@ function AddAgentPageContent({route, template}: AddAgentPageContentProps) {
                             onKeyPress={submitFormOnModEnter}
                             defaultValue={defaultPrompt}
                             multiline
-                            containerStyles={[styles.h100]}
-                            touchableInputWrapperStyle={[styles.flex1]}
-                            inputStyle={[styles.flex1, styles.textAlignVerticalTop]}
+                            autoGrowHeight={shouldAutoGrowPromptInput}
+                            maxAutoGrowHeight={shouldAutoGrowPromptInput ? PROMPT_MAX_AUTO_GROW_HEIGHT : undefined}
+                            containerStyles={shouldAutoGrowPromptInput ? undefined : [styles.h100]}
+                            touchableInputWrapperStyle={shouldAutoGrowPromptInput ? undefined : [styles.flex1]}
+                            inputStyle={[!shouldAutoGrowPromptInput && styles.flex1, styles.textAlignVerticalTop]}
                             onFocus={handleInputFocus}
                         />
                     </View>
diff --git a/src/pages/settings/Agents/EditAgentPage.tsx b/src/pages/settings/Agents/EditAgentPage.tsx
index 0adc52eed325..1a950b1497a2 100644
--- a/src/pages/settings/Agents/EditAgentPage.tsx
+++ b/src/pages/settings/Agents/EditAgentPage.tsx
@@ -3,7 +3,7 @@ import AvatarButtonWithIcon from '@components/AvatarButtonWithIcon';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItemAction from '@components/MenuItem/presets/MenuItemAction';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -14,6 +14,7 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useRuleBotGuardModal from '@hooks/useRuleBotGuardModal';
 import useSwitchToDelegator from '@hooks/useSwitchToDelegator';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -23,6 +24,7 @@ import {getRuleBotEnforcedPolicy} from '@libs/AgentRulesUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import Parser from '@libs/Parser';
 import {buildQueryStringFromFilterFormValues} from '@libs/SearchQueryUtils';
 
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
@@ -44,14 +46,15 @@ function EditAgentPage({route}: EditAgentPageProps) {
     const icons = useMemoizedLazyExpensifyIcons(['Trashcan', 'ChatBubble', 'MagnifyingGlass', 'Users']);
     const accountID = route.params.accountID;
     const [agent, agentMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
-    const [personalDetails, personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
+    const [personalDetails, personalDetailsMetadata] = usePersonalDetail(accountID);
     const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const {showConfirmModal} = useConfirmModal();
     const showRuleBotGuardModal = useRuleBotGuardModal();
     const chatWithAgent = useChatWithAgent();
     const switchToDelegator = useSwitchToDelegator();
     const isOnyxLoaded = agentMetadata.status === 'loaded' && personalDetailsMetadata.status === 'loaded';
-    const shouldShowNotFoundPage = isOnyxLoaded && !agent && !personalDetails;
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
+    const shouldShowNotFoundPage = isLoadingApp === false && isOnyxLoaded && !agent && !personalDetails;
 
     const agentLogin = personalDetails?.login ?? '';
     const handleBackPress = () => Navigation.goBack();
@@ -79,6 +82,7 @@ function EditAgentPage({route}: EditAgentPageProps) {
     };
     const isPendingAddOrDelete = agent?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || agent?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const areActionsDisabled = isPendingAddOrDelete || accountID <= 0 || !agentLogin;
+    const agentPrompt = Str.htmlDecode(agent?.prompt?.trim() ?? '');
     const handleChatPress = () => {
         chatWithAgent(accountID);
     };
@@ -148,14 +152,10 @@ function EditAgentPage({route}: EditAgentPageProps) {
                     errorRowStyles={[styles.mh5, styles.mb2]}
                     onClose={() => clearAgentPromptUpdateError(accountID)}
                 >
-                    <MenuItemWithTopDescription
-                        description={translate('editAgentPage.instructions')}
-                        title={Str.htmlDecode(agent?.prompt?.trim() ?? '')}
-                        shouldParseTitle
-                        excludedMarkdownRules={['reportMentions']}
-                        shouldTruncateTitle
+                    <MenuItemFieldHTML
+                        name={translate('editAgentPage.instructions')}
+                        value={agentPrompt ? Parser.replace(agentPrompt, {disabledRules: ['reportMentions']}) : undefined}
                         characterLimit={CONST.AGENT_PROMPT_LIMIT}
-                        shouldShowRightIcon
                         onPress={handleEditPromptPress}
                     />
                 </OfflineWithFeedback>
diff --git a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
index c126468589b0..14443666d669 100644
--- a/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
+++ b/src/pages/settings/Agents/Fields/EditAgentAvatarPage.tsx
@@ -13,7 +13,7 @@ import useAvatarCrop from '@hooks/useAvatarCrop';
 import useDiscardChangesConfirmation from '@hooks/useDiscardChangesConfirmation';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -30,7 +30,6 @@ import {updateAgentAvatar} from '@userActions/Agent';
 
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
-import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -66,7 +65,7 @@ function EditAgentAvatarContent({accountID, fallbackRoute, onSave, initialPreset
     const icons = useMemoizedLazyExpensifyIcons(['Upload']);
     const presetAvatarSize = StyleUtils.getAvatarSize(CONST.AVATAR_SIZE.X_LARGE);
 
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
+    const [personalDetails] = usePersonalDetail(accountID);
 
     const initialBotAvatar = useMemo<AgentAvatarID | null>(() => {
         if (!initialPresetID || !AGENT_AVATARS.isAvatarID(initialPresetID)) {
diff --git a/src/pages/settings/Agents/Fields/EditNamePage.tsx b/src/pages/settings/Agents/Fields/EditNamePage.tsx
index 6012562e1784..092d13abb51f 100644
--- a/src/pages/settings/Agents/Fields/EditNamePage.tsx
+++ b/src/pages/settings/Agents/Fields/EditNamePage.tsx
@@ -7,7 +7,7 @@ import TextInput from '@components/TextInput';
 
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
-import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateAgentName} from '@libs/actions/Agent';
@@ -29,7 +29,7 @@ function EditNamePage({route}: EditNamePageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const accountID = route.params.accountID;
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (list) => list?.[accountID]});
+    const [personalDetails] = usePersonalDetail(accountID);
 
     const {inputCallbackRef} = useAutoFocusInput();
 
diff --git a/src/pages/settings/Agents/Fields/EditPromptPage.tsx b/src/pages/settings/Agents/Fields/EditPromptPage.tsx
index 1e3d0644a5a9..82349412396f 100644
--- a/src/pages/settings/Agents/Fields/EditPromptPage.tsx
+++ b/src/pages/settings/Agents/Fields/EditPromptPage.tsx
@@ -20,7 +20,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
-import {PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE} from '@pages/settings/Agents/const';
+import {PROMPT_MAX_AUTO_GROW_HEIGHT, PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE} from '@pages/settings/Agents/const';
 import scrollToMultilineInput from '@pages/settings/Agents/scrollToMultilineInput';
 
 import CONST from '@src/CONST';
@@ -40,12 +40,16 @@ function EditPromptPage({route}: EditPromptPageProps) {
     const styles = useThemeStyles();
     const {isKeyboardActive} = useKeyboardState();
     const isInLandscapeMode = useIsInLandscapeMode();
+    // On native portrait the prompt grows with its content up to a max height instead of filling the screen, so the open
+    // keyboard can't squeeze it or hide the line being edited, and the form scrolls to fit it above the keyboard.
+    const shouldAutoGrowPromptInput = Platform.OS !== 'web' && !isInLandscapeMode;
+    const shouldUseScrollableLayout = shouldAutoGrowPromptInput || isInLandscapeMode;
     const shouldShrinkPromptInput = isInLandscapeMode && isKeyboardActive;
     const accountID = route.params.accountID;
     const [agentPrompt] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_AGENT_PROMPT}${accountID}`);
     const formRef = useRef<FormRef>(null);
     const promptTopOffsetRef = useRef(0);
-    const scrollToInput = () => scrollToMultilineInput(formRef, isInLandscapeMode, promptTopOffsetRef.current);
+    const scrollToInput = () => scrollToMultilineInput(formRef, shouldUseScrollableLayout, promptTopOffsetRef.current);
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM> => {
         const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_AGENT_PROMPT_FORM> = {};
@@ -84,6 +88,7 @@ function EditPromptPage({route}: EditPromptPageProps) {
             testID={EditPromptPage.displayName}
             includeSafeAreaPaddingBottom
             offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight={shouldAutoGrowPromptInput}
         >
             <CollapsibleHeaderOnKeyboard>
                 <HeaderWithBackButton
@@ -98,7 +103,7 @@ function EditPromptPage({route}: EditPromptPageProps) {
                 onSubmit={handleSubmit}
                 submitButtonText={translate('common.save')}
                 style={[styles.flex1, styles.ph5]}
-                shouldUseScrollView={isInLandscapeMode}
+                shouldUseScrollView={shouldUseScrollableLayout}
                 submitFlexEnabled={false}
                 enabledWhenOffline
                 shouldHideFixErrorsAlert
@@ -108,7 +113,11 @@ function EditPromptPage({route}: EditPromptPageProps) {
             >
                 <View style={[styles.flex1, styles.flexColumn, styles.gap5]}>
                     <View
-                        style={shouldShrinkPromptInput ? StyleUtils.getHeight(PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE) : [isInLandscapeMode ? styles.h42 : styles.flex1]}
+                        style={
+                            shouldShrinkPromptInput
+                                ? StyleUtils.getHeight(PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE)
+                                : [isInLandscapeMode && styles.h42, !isInLandscapeMode && !shouldAutoGrowPromptInput && styles.flex1]
+                        }
                         onLayout={(event) => {
                             promptTopOffsetRef.current = event.nativeEvent.layout.y;
                         }}
@@ -123,9 +132,11 @@ function EditPromptPage({route}: EditPromptPageProps) {
                             excludedMarkdownStyles={['mentionReport']}
                             defaultValue={Str.htmlDecode(agentPrompt?.prompt ?? '')}
                             multiline
-                            containerStyles={[styles.h100]}
-                            touchableInputWrapperStyle={[styles.flex1]}
-                            inputStyle={[styles.flex1, styles.textAlignVerticalTop]}
+                            autoGrowHeight={shouldAutoGrowPromptInput}
+                            maxAutoGrowHeight={shouldAutoGrowPromptInput ? PROMPT_MAX_AUTO_GROW_HEIGHT : undefined}
+                            containerStyles={shouldAutoGrowPromptInput ? undefined : [styles.h100]}
+                            touchableInputWrapperStyle={shouldAutoGrowPromptInput ? undefined : [styles.flex1]}
+                            inputStyle={[!shouldAutoGrowPromptInput && styles.flex1, styles.textAlignVerticalTop]}
                             onFocus={scrollToInput}
                         />
                     </View>
diff --git a/src/pages/settings/Agents/const/index.ios.ts b/src/pages/settings/Agents/const/index.ios.ts
index 6e7180062c4a..1ccf6e72e016 100644
--- a/src/pages/settings/Agents/const/index.ios.ts
+++ b/src/pages/settings/Agents/const/index.ios.ts
@@ -1,8 +1,8 @@
 import getPromptMaxHeightOnKeyboardOpenLandscapeMode from './getPromptMaxHeightOnKeyboardOpenLandscapeMode';
+import PROMPT_MAX_AUTO_GROW_HEIGHT from './promptMaxAutoGrowHeight';
 
 // The iOS keyboard is smaller than the Android keyboard, so we want to show one more line compared to the Android version.
 const MAX_PROMPT_LINES_WITH_KEYBOARD = 3;
 const PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE = getPromptMaxHeightOnKeyboardOpenLandscapeMode(MAX_PROMPT_LINES_WITH_KEYBOARD);
 
-// eslint-disable-next-line import/prefer-default-export
-export {PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE};
+export {PROMPT_MAX_AUTO_GROW_HEIGHT, PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE};
diff --git a/src/pages/settings/Agents/const/index.ts b/src/pages/settings/Agents/const/index.ts
index ff8f80e29b72..e779c98922a0 100644
--- a/src/pages/settings/Agents/const/index.ts
+++ b/src/pages/settings/Agents/const/index.ts
@@ -1,7 +1,7 @@
 import getPromptMaxHeightOnKeyboardOpenLandscapeMode from './getPromptMaxHeightOnKeyboardOpenLandscapeMode';
+import PROMPT_MAX_AUTO_GROW_HEIGHT from './promptMaxAutoGrowHeight';
 
 const MAX_PROMPT_LINES_WITH_KEYBOARD = 2;
 const PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE = getPromptMaxHeightOnKeyboardOpenLandscapeMode(MAX_PROMPT_LINES_WITH_KEYBOARD);
 
-// eslint-disable-next-line import/prefer-default-export
-export {PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE};
+export {PROMPT_MAX_AUTO_GROW_HEIGHT, PROMPT_MAX_HEIGHT_ON_KEYBOARD_OPEN_LANDSCAPE_MODE};
diff --git a/src/pages/settings/Agents/const/promptMaxAutoGrowHeight.ts b/src/pages/settings/Agents/const/promptMaxAutoGrowHeight.ts
new file mode 100644
index 000000000000..a63680116eb1
--- /dev/null
+++ b/src/pages/settings/Agents/const/promptMaxAutoGrowHeight.ts
@@ -0,0 +1,7 @@
+import getPromptMaxHeightOnKeyboardOpenLandscapeMode from './getPromptMaxHeightOnKeyboardOpenLandscapeMode';
+
+// Tall enough to comfortably read and edit the prompt, while still fitting above the keyboard on smaller phones.
+const MAX_PROMPT_LINES_WITH_AUTO_GROW = 10;
+const PROMPT_MAX_AUTO_GROW_HEIGHT = getPromptMaxHeightOnKeyboardOpenLandscapeMode(MAX_PROMPT_LINES_WITH_AUTO_GROW);
+
+export default PROMPT_MAX_AUTO_GROW_HEIGHT;
diff --git a/src/pages/settings/Copilot/CopilotPage.tsx b/src/pages/settings/Copilot/CopilotPage.tsx
index efff967e8c38..2907b2fbcbf5 100644
--- a/src/pages/settings/Copilot/CopilotPage.tsx
+++ b/src/pages/settings/Copilot/CopilotPage.tsx
@@ -33,7 +33,7 @@ import {clearDelegateErrorsByField, openSecuritySettingsPage, removeDelegate, re
 import {getLatestError} from '@libs/ErrorUtils';
 import getClickedTargetLocation from '@libs/getClickedTargetLocation';
 import Navigation from '@libs/Navigation/Navigation';
-import {sortAlphabetically} from '@libs/OptionsListUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
 
diff --git a/src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsConfirmValidateCodePage.tsx b/src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsConfirmValidateCodePage.tsx
index b148c224c90a..526ac5c0abe1 100644
--- a/src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsConfirmValidateCodePage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/PrivatePersonalDetailsConfirmValidateCodePage.tsx
@@ -18,6 +18,7 @@ import ROUTES from '@src/ROUTES';
 import type {PersonalDetailsForm} from '@src/types/form';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
+import {CONST as COMMON_CONST} from 'expensify-common';
 import React, {useEffect, useRef} from 'react';
 
 function PrivatePersonalDetailsConfirmValidateCodePage() {
@@ -73,7 +74,8 @@ function PrivatePersonalDetailsConfirmValidateCodePage() {
         <ValidateCodeActionContent
             title={translate('delegate.makeSureItIsYou')}
             descriptionPrimary={translate('contacts.enterSecurityCode', primaryLogin ?? '')}
-            sendValidateCode={() => requestValidateCodeAction()}
+            sendValidateCode={() => requestValidateCodeAction({reasonCode: COMMON_CONST.VALIDATE_CODE_REASONS.UPDATE_PERSONAL_DETAILS})}
+            validateCodeReasonCode={COMMON_CONST.VALIDATE_CODE_REASONS.UPDATE_PERSONAL_DETAILS}
             validateCodeActionErrorField="personalDetails"
             handleSubmitForm={handleSubmitForm}
             validateError={submitError}
diff --git a/src/pages/settings/Report/DynamicNotificationPreferencePage.tsx b/src/pages/settings/Report/DynamicNotificationPreferencePage.tsx
index 1ad16a6bc8c4..b4e7b957ebd1 100644
--- a/src/pages/settings/Report/DynamicNotificationPreferencePage.tsx
+++ b/src/pages/settings/Report/DynamicNotificationPreferencePage.tsx
@@ -10,7 +10,7 @@ import useLocalize from '@hooks/useLocalize';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 
 import Navigation from '@libs/Navigation/Navigation';
-import {getReportNotificationPreference, isArchivedNonExpenseReport, isHiddenForCurrentUser, isMoneyRequestReport, isSelfDM} from '@libs/ReportUtils';
+import {getReportNotificationPreferenceForSettings, isArchivedNonExpenseReport, isHiddenForCurrentUser, isSelfDM} from '@libs/ReportUtils';
 
 import withReportOrNotFound from '@pages/inbox/report/withReportOrNotFound';
 import type {WithReportOrNotFoundProps} from '@pages/inbox/report/withReportOrNotFound';
@@ -30,13 +30,13 @@ function DynamicNotificationPreferencePage({report}: DynamicNotificationPreferen
     const {translate} = useLocalize();
     const isReportArchived = useReportIsArchived(report?.reportID);
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
-    const isMoneyRequest = isMoneyRequestReport(report);
-    const currentNotificationPreference = getReportNotificationPreference(report);
+    const currentUserParticipant = currentUserAccountID ? report?.participants?.[currentUserAccountID] : undefined;
+    const currentUserNotificationPreference = currentUserParticipant?.notificationPreference;
+    const currentNotificationPreference = getReportNotificationPreferenceForSettings(report, currentUserAccountID);
 
     const [draftNotificationPreference, setDraftNotificationPreference] = useState<ValueOf<typeof CONST.REPORT.NOTIFICATION_PREFERENCE> | undefined>(undefined);
     const selectedNotificationPreference = draftNotificationPreference ?? currentNotificationPreference;
-    const shouldDisableNotificationPreferences =
-        isArchivedNonExpenseReport(report, isReportArchived) || isSelfDM(report) || (!isMoneyRequest && isHiddenForCurrentUser(currentNotificationPreference));
+    const shouldDisableNotificationPreferences = isArchivedNonExpenseReport(report, isReportArchived) || isSelfDM(report) || !currentUserParticipant;
     const notificationPreferenceOptions = Object.values(CONST.REPORT.NOTIFICATION_PREFERENCE)
         .filter((pref) => !isHiddenForCurrentUser(pref))
         .map((preference) => ({
@@ -52,7 +52,7 @@ function DynamicNotificationPreferencePage({report}: DynamicNotificationPreferen
     }, [backPath]);
 
     const saveNotificationPreference = () => {
-        updateNotificationPreference(report.reportID, currentNotificationPreference, selectedNotificationPreference, currentUserAccountID, undefined, undefined);
+        updateNotificationPreference(report.reportID, currentUserNotificationPreference, selectedNotificationPreference, currentUserAccountID, undefined, undefined);
         goBack();
     };
 
@@ -60,7 +60,7 @@ function DynamicNotificationPreferencePage({report}: DynamicNotificationPreferen
         showButton: true,
         text: translate('common.save'),
         onConfirm: saveNotificationPreference,
-        isDisabled: selectedNotificationPreference === currentNotificationPreference,
+        isDisabled: selectedNotificationPreference === currentUserNotificationPreference,
     };
 
     return (
diff --git a/src/pages/settings/Report/DynamicReportSettingsPage.tsx b/src/pages/settings/Report/DynamicReportSettingsPage.tsx
index e250f12273c9..927a7bbfe980 100644
--- a/src/pages/settings/Report/DynamicReportSettingsPage.tsx
+++ b/src/pages/settings/Report/DynamicReportSettingsPage.tsx
@@ -5,6 +5,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useReportIsArchived from '@hooks/useReportIsArchived';
@@ -16,10 +17,9 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig
 import {
     canEditRoomVisibility,
     canEditWriteCapability,
-    getReportNotificationPreference,
+    getReportNotificationPreferenceForSettings,
     isAdminRoom,
     isArchivedNonExpenseReport as isArchivedNonExpenseReportUtils,
-    isHiddenForCurrentUser,
     isMoneyRequestReport as isMoneyRequestReportUtils,
     isSelfDM,
 } from '@libs/ReportUtils';
@@ -45,22 +45,21 @@ function DynamicReportSettingsPage({report, policy}: DynamicReportSettingsPagePr
     const {translate} = useLocalize();
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_SETTINGS.path);
     const isReportArchived = useReportIsArchived(reportID);
+    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
+    const currentUserParticipant = currentUserAccountID ? report?.participants?.[currentUserAccountID] : undefined;
     const isArchivedNonExpenseReport = isArchivedNonExpenseReportUtils(report, isReportArchived);
     // The workspace the report is on, null if the user isn't a member of the workspace
     const linkedWorkspace = useMemo(() => (report?.policyID && policy?.id === report?.policyID ? policy : undefined), [policy, report?.policyID]);
     const isMoneyRequestReport = isMoneyRequestReportUtils(report);
     const shouldDisableSettings = isArchivedNonExpenseReport || isEmptyObject(report) || isSelfDM(report);
-    const notificationPreferenceValue = getReportNotificationPreference(report);
-    const notificationPreference =
-        notificationPreferenceValue && !isHiddenForCurrentUser(notificationPreferenceValue)
-            ? translate(`notificationPreferencesPage.notificationPreferences.${notificationPreferenceValue}`)
-            : '';
+    const notificationPreferenceValue = getReportNotificationPreferenceForSettings(report, currentUserAccountID);
+    const notificationPreference = notificationPreferenceValue ? translate(`notificationPreferencesPage.notificationPreferences.${notificationPreferenceValue}`) : '';
     const writeCapability = isAdminRoom(report) ? CONST.REPORT.WRITE_CAPABILITIES.ADMINS : (report?.writeCapability ?? CONST.REPORT.WRITE_CAPABILITIES.ALL);
     const writeCapabilityText = translate(`writeCapabilityPage.writeCapability.${writeCapability}`);
     const shouldAllowWriteCapabilityEditing = useMemo(() => canEditWriteCapability(report, linkedWorkspace, isReportArchived), [report, linkedWorkspace, isReportArchived]);
     const shouldAllowChangeVisibility = useMemo(() => canEditRoomVisibility(linkedWorkspace, isArchivedNonExpenseReport), [linkedWorkspace, isArchivedNonExpenseReport]);
 
-    const shouldShowNotificationPref = !isMoneyRequestReport && !isHiddenForCurrentUser(notificationPreferenceValue);
+    const shouldShowNotificationPref = !isMoneyRequestReport && !!currentUserParticipant;
 
     const shouldShowWriteCapability = !isMoneyRequestReport;
 
diff --git a/src/pages/settings/Rules/RulePageBase.tsx b/src/pages/settings/Rules/RulePageBase.tsx
index 4583e8c64115..6c06945b0a10 100644
--- a/src/pages/settings/Rules/RulePageBase.tsx
+++ b/src/pages/settings/Rules/RulePageBase.tsx
@@ -1,7 +1,9 @@
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 import RuleNotFoundPageWrapper from '@components/Rule/RuleNotFoundPageWrapper';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -24,6 +26,8 @@ import {getTagArrayFromName} from '@libs/TransactionUtils';
 
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -44,20 +48,6 @@ type RulePageBaseProps = {
     hash?: string;
 };
 
-type SectionItemType = {
-    key: string;
-    description: string;
-    required?: boolean;
-    title?: string;
-    onPress: () => void;
-    shouldRenderAsHTML?: boolean;
-};
-
-type SectionType = {
-    titleTranslationKey: TranslationPaths;
-    items: Array<SectionItemType | undefined>;
-};
-
 const navigateTo = (field: ExpenseRuleFormFieldID, hash?: string, index?: number) => {
     if (hash) {
         Navigation.navigate(ROUTES.SETTINGS_RULES_EDIT.getRoute(hash, field, index));
@@ -156,83 +146,8 @@ function RulePageBase({titleKey, testID, hash}: RulePageBaseProps) {
         });
     };
 
-    const sections: SectionType[] = [
-        {
-            titleTranslationKey: 'expenseRulesPage.addRule.expenseContains',
-            items: [
-                {
-                    key: 'merchantToMatch',
-                    description: translate('common.merchant'),
-                    required: true,
-                    title: form?.merchantToMatch,
-                    onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.MERCHANT, hash),
-                },
-            ],
-        },
-        {
-            titleTranslationKey: 'expenseRulesPage.addRule.applyUpdates',
-            items: [
-                {
-                    key: 'merchant',
-                    description: translate('common.merchant'),
-                    title: form?.merchant,
-                    onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.RENAME_MERCHANT, hash),
-                },
-                form?.category || hasPolicyCategories
-                    ? {
-                          key: 'category',
-                          description: translate('common.category'),
-                          title: form?.category ? getDecodedCategoryName(form.category) : undefined,
-                          onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.CATEGORY, hash),
-                      }
-                    : undefined,
-                ...policyTags
-                    .filter(({orderWeight, tags}) => !!formTags.at(orderWeight) || getEnabledTags(tags, form?.tag ?? '', orderWeight).length > 0)
-                    .map(({name, orderWeight}) => {
-                        const formTag = formTags.at(orderWeight);
-                        return {
-                            key: `tag-${name}-${orderWeight}`,
-                            description: name,
-                            title: formTag ? getCleanedTagName(formTag) : undefined,
-                            onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.TAG, hash, orderWeight),
-                        };
-                    }),
-                hasTaxRates
-                    ? {
-                          key: 'tax',
-                          description: translate('common.tax'),
-                          title: selectedTaxRate ? `${selectedTaxRate.name} (${selectedTaxRate.value})` : undefined,
-                          onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.TAX, hash),
-                      }
-                    : undefined,
-                {
-                    key: 'description',
-                    description: translate('common.description'),
-                    title: form?.comment ? Parser.replace(form.comment) : undefined,
-                    onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.DESCRIPTION, hash),
-                    shouldRenderAsHTML: true,
-                },
-                {
-                    key: 'reimbursable',
-                    description: translate('common.reimbursable'),
-                    title: form?.reimbursable ? translate(form.reimbursable === 'true' ? 'common.yes' : 'common.no') : translate('common.dontChange'),
-                    onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.REIMBURSABLE, hash),
-                },
-                {
-                    key: 'billable',
-                    description: translate('common.billable'),
-                    title: form?.billable ? translate(form.billable === 'true' ? 'common.yes' : 'common.no') : translate('common.dontChange'),
-                    onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.BILLABLE, hash),
-                },
-                {
-                    key: 'addToReport',
-                    description: translate('expenseRulesPage.addRule.addToReport'),
-                    title: form?.report,
-                    onPress: () => navigateTo(EXPENSE_RULE_INPUT_IDS.REPORT, hash),
-                },
-            ],
-        },
-    ];
+    const hasMerchantToMatchError = shouldShowError && !form?.merchantToMatch;
+    const tagsToShow = policyTags.filter(({orderWeight, tags}) => !!formTags.at(orderWeight) || getEnabledTags(tags, form?.tag ?? '', orderWeight).length > 0);
 
     return (
         <RuleNotFoundPageWrapper
@@ -246,29 +161,73 @@ function RulePageBase({titleKey, testID, hash}: RulePageBaseProps) {
             >
                 <HeaderWithBackButton title={translate(titleKey)} />
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
-                    {sections.map((section) => (
-                        <View key={section.titleTranslationKey}>
-                            <Text style={[styles.textHeadlineH2, styles.reportHorizontalRule, styles.mt4, styles.mb2]}>{translate(section.titleTranslationKey)}</Text>
-                            {section.items.map((item) => {
-                                if (!item) {
-                                    return null;
-                                }
-                                return (
-                                    <MenuItemWithTopDescription
-                                        key={item.key}
-                                        description={item.description}
-                                        errorText={shouldShowError && item.required && !item.title ? translate('common.error.fieldRequired') : ''}
-                                        onPress={item.onPress}
-                                        rightLabel={item.required ? translate('common.required') : undefined}
-                                        shouldShowRightIcon
-                                        title={item.title}
-                                        titleStyle={styles.flex1}
-                                        shouldRenderAsHTML={item.shouldRenderAsHTML}
-                                    />
-                                );
-                            })}
-                        </View>
-                    ))}
+                    <Text style={[styles.textHeadlineH2, styles.reportHorizontalRule, styles.mt4, styles.mb2]}>{translate('expenseRulesPage.addRule.expenseContains')}</Text>
+                    <MenuItem.Root onPress={callFunctionIfActionIsAllowed(() => navigateTo(EXPENSE_RULE_INPUT_IDS.MERCHANT, hash))}>
+                        <MenuItemField.Row
+                            name={translate('common.merchant')}
+                            value={form?.merchantToMatch}
+                        >
+                            {!form?.merchantToMatch && !hasMerchantToMatchError && <MenuItem.RightLabel>{translate('common.required')}</MenuItem.RightLabel>}
+                            <MenuItem.Chevron />
+                        </MenuItemField.Row>
+                        {hasMerchantToMatchError && (
+                            <MenuItem.HelpText
+                                isError
+                                message={translate('common.error.fieldRequired')}
+                            />
+                        )}
+                    </MenuItem.Root>
+                    <Text style={[styles.textHeadlineH2, styles.reportHorizontalRule, styles.mt4, styles.mb2]}>{translate('expenseRulesPage.addRule.applyUpdates')}</Text>
+                    <MenuItemField
+                        name={translate('common.merchant')}
+                        value={form?.merchant}
+                        onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.RENAME_MERCHANT, hash)}
+                    />
+                    {(!!form?.category || !!hasPolicyCategories) && (
+                        <MenuItemField
+                            name={translate('common.category')}
+                            value={form?.category ? getDecodedCategoryName(form.category) : undefined}
+                            onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.CATEGORY, hash)}
+                        />
+                    )}
+                    {tagsToShow.map(({name, orderWeight}) => {
+                        const formTag = formTags.at(orderWeight);
+                        return (
+                            <MenuItemField
+                                key={`tag-${name}-${orderWeight}`}
+                                name={name}
+                                value={formTag ? getCleanedTagName(formTag) : undefined}
+                                onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.TAG, hash, orderWeight)}
+                            />
+                        );
+                    })}
+                    {hasTaxRates && (
+                        <MenuItemField
+                            name={translate('common.tax')}
+                            value={selectedTaxRate ? `${selectedTaxRate.name} (${selectedTaxRate.value})` : undefined}
+                            onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.TAX, hash)}
+                        />
+                    )}
+                    <MenuItemFieldHTML
+                        name={translate('common.description')}
+                        value={form?.comment ? Parser.replace(form.comment) : undefined}
+                        onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.DESCRIPTION, hash)}
+                    />
+                    <MenuItemField
+                        name={translate('common.reimbursable')}
+                        value={form?.reimbursable ? translate(form.reimbursable === 'true' ? 'common.yes' : 'common.no') : translate('common.dontChange')}
+                        onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.REIMBURSABLE, hash)}
+                    />
+                    <MenuItemField
+                        name={translate('common.billable')}
+                        value={form?.billable ? translate(form.billable === 'true' ? 'common.yes' : 'common.no') : translate('common.dontChange')}
+                        onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.BILLABLE, hash)}
+                    />
+                    <MenuItemField
+                        name={translate('expenseRulesPage.addRule.addToReport')}
+                        value={form?.report}
+                        onPress={() => navigateTo(EXPENSE_RULE_INPUT_IDS.REPORT, hash)}
+                    />
                     <View style={[styles.flexRow, styles.alignItemsCenter, styles.ml5, styles.mr8, styles.optionRow]}>
                         <ToggleSettingOptionRow
                             isActive={form?.createReport ?? false}
diff --git a/src/pages/settings/Security/MergeAccounts/AccountValidatePage.tsx b/src/pages/settings/Security/MergeAccounts/AccountValidatePage.tsx
index 1caaddde6a29..beddbebdc1a8 100644
--- a/src/pages/settings/Security/MergeAccounts/AccountValidatePage.tsx
+++ b/src/pages/settings/Security/MergeAccounts/AccountValidatePage.tsx
@@ -74,7 +74,7 @@ const getAuthenticationErrorKey = (err: string): TranslationPaths | null => {
         return null;
     }
 
-    if (err.includes('Invalid validateCode')) {
+    if (err.includes(CONST.MERGE_ACCOUNT_INVALID_CODE_ERROR)) {
         return 'mergeAccountsPage.accountValidate.errors.incorrectSecurityCode';
     }
 
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyRenewalBillingBanner/index.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyRenewalBillingBanner/index.tsx
new file mode 100644
index 000000000000..9b7ae3077b1b
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/EarlyRenewalBillingBanner/index.tsx
@@ -0,0 +1,56 @@
+/** The billing owner's early renewal offer, shown above their payment details when CardSection finds them eligible. */
+import Button from '@components/Button';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+
+import useEarlyRenewalConfirmation from '@hooks/useEarlyRenewalConfirmation';
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearEarlyRenewalOfferErrors} from '@libs/actions/EarlyRenewalOffer';
+
+import BillingBanner from '@pages/settings/Subscription/CardSection/BillingBanner/BillingBanner';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import React from 'react';
+
+function EarlyRenewalBillingBanner() {
+    const [eligibility] = useOnyx(ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY);
+    const showEarlyRenewalConfirmation = useEarlyRenewalConfirmation();
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useMemoizedLazyIllustrations(['SubscriptionAnnual']);
+
+    return (
+        <OfflineWithFeedback
+            errors={eligibility?.errors}
+            onClose={clearEarlyRenewalOfferErrors}
+            style={styles.w100}
+            errorRowStyles={[styles.ph5, styles.pb4]}
+        >
+            <BillingBanner
+                title={translate('earlyRenewal.title')}
+                subtitle={translate('earlyRenewal.subtitle')}
+                icon={illustrations.SubscriptionAnnual}
+                rightComponent={
+                    <Button
+                        isDisabled={isOffline}
+                        isLoading={!!eligibility?.pendingAction}
+                        onPress={showEarlyRenewalConfirmation}
+                        size={CONST.BUTTON_SIZE.SMALL}
+                        variant={CONST.BUTTON_VARIANT.SUCCESS}
+                    >
+                        <Button.Text>{translate('earlyRenewal.renew')}</Button.Text>
+                    </Button>
+                }
+            />
+        </OfflineWithFeedback>
+    );
+}
+
+export default EarlyRenewalBillingBanner;
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
index 936db7f50829..33f42d9ef17d 100644
--- a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
@@ -4,12 +4,14 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {navigateToConciergeChat} from '@libs/actions/Report';
 import Navigation from '@libs/Navigation/Navigation';
 import {getChatUsedForOnboarding} from '@libs/ReportUtils';
 
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 
@@ -25,6 +27,7 @@ function PreTrialBillingBanner() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [onboarding] = useOnyx(ONYXKEYS.NVP_ONBOARDING);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const isSelfTourViewed = onboarding?.selfTourViewed;
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
@@ -32,7 +35,7 @@ function PreTrialBillingBanner() {
         const reportUsedForOnboarding = getChatUsedForOnboarding(onboarding, conciergeReportID);
 
         if (!reportUsedForOnboarding) {
-            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
             return;
         }
 
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
index a5617c757e49..7994bba412ac 100644
--- a/src/pages/settings/Subscription/CardSection/CardSection.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -6,6 +6,7 @@ import RenderHTML from '@components/RenderHTML';
 import Section from '@components/Section';
 
 import useConfirmModal from '@hooks/useConfirmModal';
+import useEarlyRenewalPeriod from '@hooks/useEarlyRenewalPeriod';
 import useHasTeam2025Pricing from '@hooks/useHasTeam2025Pricing';
 import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
@@ -43,6 +44,7 @@ import {View} from 'react-native';
 import type {BillingStatusResult} from './utils';
 
 import EarlyDiscountBanner from './BillingBanner/EarlyDiscountBanner';
+import EarlyRenewalBillingBanner from './BillingBanner/EarlyRenewalBillingBanner';
 import PreTrialBillingBanner from './BillingBanner/PreTrialBillingBanner';
 import SubscriptionBillingBanner from './BillingBanner/SubscriptionBillingBanner';
 import SubscriptionExpiringSoonBanner from './BillingBanner/SubscriptionExpiringSoonBanner';
@@ -62,6 +64,8 @@ function CardSection() {
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['History', 'Bill', 'Close']);
     const illustrations = useMemoizedLazyIllustrations(['CreditCardEyes']);
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [earlyRenewalEligibility, earlyRenewalEligibilityMetadata] = useOnyx(ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY);
+    const {isNonIncentivizedPeriod} = useEarlyRenewalPeriod();
     const privateSubscription = usePrivateSubscription();
     const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
     const [authenticationLink] = useOnyx(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION);
@@ -226,9 +230,12 @@ function CardSection() {
     };
 
     let BillingBanner: React.ReactNode | undefined;
-    // Checked before the trial banners because the pre-trial check also passes when the free trial NVPs are absent,
-    // which an annual subscriber can have
-    if (shouldShowSubscriptionExpiringSoonUI(privateSubscription)) {
+    // Renewing early also resolves an expiring subscription, so the offer wins over every other non-error banner
+    if (earlyRenewalEligibilityMetadata.status === 'loaded' && earlyRenewalEligibility?.canClaim && isNonIncentivizedPeriod) {
+        BillingBanner = <EarlyRenewalBillingBanner />;
+    } else if (shouldShowSubscriptionExpiringSoonUI(privateSubscription)) {
+        // Checked before the trial banners because the pre-trial check also passes when the free trial NVPs are absent,
+        // which an annual subscriber can have
         BillingBanner = <SubscriptionExpiringSoonBanner endDate={privateSubscription?.endDate} />;
     } else if (shouldShowDiscountBanner(session?.accountID, hasTeam2025Pricing, subscriptionPlan, firstDayFreeTrial, lastDayFreeTrial, userBillingFundID, allPolicies)) {
         BillingBanner = <EarlyDiscountBanner isSubscriptionPage />;
diff --git a/src/pages/settings/Subscription/PaymentHistoryPage/PaymentHistoryTable.tsx b/src/pages/settings/Subscription/PaymentHistoryPage/PaymentHistoryTable.tsx
new file mode 100644
index 000000000000..8ea268e76245
--- /dev/null
+++ b/src/pages/settings/Subscription/PaymentHistoryPage/PaymentHistoryTable.tsx
@@ -0,0 +1,156 @@
+import Badge from '@components/Badge';
+import MenuItem from '@components/MenuItem';
+import Section from '@components/Section';
+import SkeletonTextLine from '@components/Skeletons/SkeletonTextLine';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {convertAmountToDisplayString} from '@libs/CurrencyUtils';
+import DateUtils from '@libs/DateUtils';
+import type {PaymentHistoryRow} from '@libs/PaymentHistoryUtils';
+import {getBadgeAppearance, getPaymentHistoryRows, getStateTranslationKey} from '@libs/PaymentHistoryUtils';
+
+import {lineHeightScale} from '@styles/typography';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import React from 'react';
+import {View} from 'react-native';
+
+const SKELETON_ROWS = [0, 1, 2, 3];
+const SKELETON_TITLE_WIDTH = 180;
+const SKELETON_SUBTITLE_WIDTH = 120;
+
+// The payment details page is a later change, so pressing a row does nothing yet.
+function ignorePaymentRowPress() {}
+
+function PaymentHistoryTable() {
+    const {translate, dateFnsLocale} = useLocalize();
+    const styles = useThemeStyles();
+    const [purchaseList] = useOnyx(ONYXKEYS.PURCHASE_LIST);
+    const isLoading = purchaseList === undefined;
+    const rows = getPaymentHistoryRows(purchaseList);
+
+    return (
+        <Section
+            isCentralPane
+            containerStyles={styles.borderRadiusComponentNormal}
+            centralPaneContainerStyle={styles.p0}
+            renderTitle={() => (
+                <View style={[styles.p4, styles.borderBottom]}>
+                    <Text
+                        variant="micro"
+                        style={[styles.textSupporting, styles.userSelectText]}
+                        accessibilityRole={CONST.ROLE.HEADER}
+                    >
+                        {translate('subscription.paymentHistory.payments')}
+                    </Text>
+                </View>
+            )}
+        >
+            {isLoading && <PaymentHistorySkeleton />}
+            {!isLoading && rows.length === 0 && (
+                <Text style={[styles.textNormal, styles.textSupporting, styles.userSelectText, styles.p4]}>{translate('subscription.paymentHistory.empty')}</Text>
+            )}
+            {!isLoading &&
+                rows.map((row, index) => (
+                    <PaymentHistoryTableRow
+                        key={row.purchaseID}
+                        row={row}
+                        dateLabel={DateUtils.formatWithUTCTimeZone(row.created, CONST.DATE.MONTH_DAY_YEAR_FORMAT, dateFnsLocale) || row.created}
+                        shouldShowDivider={index < rows.length - 1}
+                    />
+                ))}
+        </Section>
+    );
+}
+
+type PaymentHistoryTableRowProps = {
+    row: PaymentHistoryRow;
+    dateLabel: string;
+    shouldShowDivider: boolean;
+};
+
+function PaymentHistoryTableRow({row, dateLabel, shouldShowDivider}: PaymentHistoryTableRowProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const stateLabel = translate(getStateTranslationKey(row.state));
+    const amountLabel = convertAmountToDisplayString(row.amount, row.currency);
+    const activeUserLabel = row.activeUserCount ? translate('subscription.paymentHistory.activeUsers', {count: row.activeUserCount}) : undefined;
+    const taxLabel = row.showsTax ? translate('subscription.paymentHistory.inclTax') : undefined;
+    const {success, error} = getBadgeAppearance(row.state);
+
+    return (
+        <MenuItem.Root
+            onPress={ignorePaymentRowPress}
+            sentryLabel={CONST.SENTRY_LABEL.SETTINGS_SUBSCRIPTION.PAYMENT_HISTORY_ROW}
+            accessibilityLabel={[dateLabel, stateLabel, activeUserLabel, amountLabel, taxLabel].filter(Boolean).join(', ')}
+            style={[styles.ph4, styles.pv4, shouldShowDivider && styles.borderBottom]}
+        >
+            <MenuItem.Row>
+                <MenuItem.Content>
+                    <Text
+                        variant="text"
+                        style={[styles.popoverMenuText, styles.userSelectText]}
+                        numberOfLines={1}
+                    >
+                        {dateLabel}
+                    </Text>
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
+                        <Badge
+                            text={stateLabel}
+                            success={success}
+                            error={error}
+                            isCondensed
+                            badgeStyles={styles.ml0}
+                            textStyles={styles.userSelectText}
+                        />
+                        {!!activeUserLabel && <Text style={[styles.textLabelSupporting, styles.userSelectText]}>{activeUserLabel}</Text>}
+                    </View>
+                </MenuItem.Content>
+                <View style={[styles.menuItemTrailing, styles.gap3]}>
+                    <View style={styles.alignItemsEnd}>
+                        <Text
+                            variant="text"
+                            style={[styles.popoverMenuText, styles.userSelectText]}
+                        >
+                            {amountLabel}
+                        </Text>
+                        {!!taxLabel && <Text style={[styles.textLabelSupporting, styles.userSelectText]}>{taxLabel}</Text>}
+                    </View>
+                    <MenuItem.Chevron />
+                </View>
+            </MenuItem.Row>
+        </MenuItem.Root>
+    );
+}
+
+function PaymentHistorySkeleton() {
+    const styles = useThemeStyles();
+
+    return (
+        <View style={[styles.gap4, styles.p4]}>
+            {SKELETON_ROWS.map((row) => (
+                <View
+                    key={row}
+                    style={styles.gap1}
+                >
+                    <SkeletonTextLine
+                        lineHeight={lineHeightScale.text}
+                        barWidth={SKELETON_TITLE_WIDTH}
+                    />
+                    <SkeletonTextLine
+                        lineHeight={lineHeightScale.label}
+                        barWidth={SKELETON_SUBTITLE_WIDTH}
+                    />
+                </View>
+            ))}
+        </View>
+    );
+}
+
+export default PaymentHistoryTable;
diff --git a/src/pages/settings/Subscription/PaymentHistoryPage/index.tsx b/src/pages/settings/Subscription/PaymentHistoryPage/index.tsx
index e9a8512c5f15..9f9a4fcbd4c1 100644
--- a/src/pages/settings/Subscription/PaymentHistoryPage/index.tsx
+++ b/src/pages/settings/Subscription/PaymentHistoryPage/index.tsx
@@ -1,5 +1,5 @@
 import DelegateNoAccessWrapper from '@components/DelegateNoAccessWrapper';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
@@ -8,8 +8,6 @@ import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import Navigation from '@libs/Navigation/Navigation';
-
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 
 import {openPaymentHistoryPage} from '@userActions/Subscription';
@@ -19,6 +17,8 @@ import CONST from '@src/CONST';
 import {useFocusEffect} from '@react-navigation/native';
 import React, {useCallback} from 'react';
 
+import PaymentHistoryTable from './PaymentHistoryTable';
+
 function PaymentHistoryPage() {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -45,12 +45,10 @@ function PaymentHistoryPage() {
             shouldEnableMaxHeight
         >
             <DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]}>
-                <HeaderWithBackButton
-                    title={translate('subscription.paymentHistory.title')}
-                    onBackButtonPress={Navigation.goBack}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('subscription.paymentHistory.title')} />
                 <ScrollView>
-                    <Text style={[styles.textNormal, styles.textSupporting, styles.mh5, styles.mb5]}>{translate('subscription.paymentHistory.subtitle')}</Text>
+                    <Text style={[styles.textNormal, styles.textSupporting, styles.mh5, styles.mb5, styles.userSelectText]}>{translate('subscription.paymentHistory.subtitle')}</Text>
+                    <PaymentHistoryTable />
                 </ScrollView>
             </DelegateNoAccessWrapper>
         </ScreenWrapper>
diff --git a/src/pages/settings/Subscription/SubscriptionSettings/index.tsx b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
index 29391cf49ff0..208fb2a9d373 100644
--- a/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
+++ b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
@@ -21,6 +21,7 @@ import useHasTeam2025Pricing from '@hooks/useHasTeam2025Pricing';
 import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import usePreferredCurrency from '@hooks/usePreferredCurrency';
 import usePrivateSubscription from '@hooks/usePrivateSubscription';
@@ -88,6 +89,7 @@ function SubscriptionSettings() {
     const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
 
     const {isSecretPromoCode, promoDiscountValue} = getPrivatePromoDiscountInfo(privatePromoDiscount, isAnnual);
@@ -355,7 +357,14 @@ function SubscriptionSettings() {
                     <MenuItemSectionRoot
                         onPress={() => {
                             requestTaxExempt();
-                            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+                            navigateToConciergeChat({
+                                conciergeReportID,
+                                introSelected,
+                                currentUserAccountID,
+                                isSelfTourViewed,
+                                conciergePersonalDetails,
+                                shouldDismissModal: false,
+                            });
                         }}
                     >
                         <MenuItem.Row>
diff --git a/src/pages/settings/Troubleshoot/ServerPage.tsx b/src/pages/settings/Troubleshoot/ServerPage.tsx
new file mode 100644
index 000000000000..5a18ea8f710d
--- /dev/null
+++ b/src/pages/settings/Troubleshoot/ServerPage.tsx
@@ -0,0 +1,18 @@
+import ScreenWrapper from '@components/ScreenWrapper';
+
+import React from 'react';
+
+import ServerSelector from './ServerSelector';
+
+function ServerPage() {
+    return (
+        <ScreenWrapper
+            enableEdgeToEdgeBottomSafeAreaPadding
+            testID="ServerPage"
+        >
+            <ServerSelector shouldAddBottomSafeAreaPadding />
+        </ScreenWrapper>
+    );
+}
+
+export default ServerPage;
diff --git a/src/pages/settings/Troubleshoot/ServerSelector.tsx b/src/pages/settings/Troubleshoot/ServerSelector.tsx
new file mode 100644
index 000000000000..fd7d59e92fa7
--- /dev/null
+++ b/src/pages/settings/Troubleshoot/ServerSelector.tsx
@@ -0,0 +1,91 @@
+/**
+ * Lets a tester point the app at a different API server, and disables the choice on builds where the environment pins one.
+ */
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import SelectionList from '@components/SelectionList';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/ListItem/types';
+import Text from '@components/Text';
+
+import useActiveServer from '@hooks/useActiveServer';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import type {Server} from '@libs/ApiUtils';
+import {isQAAuthConfigured} from '@libs/CloudflareAccess/Config';
+import Navigation from '@libs/Navigation/Navigation';
+
+import {setActiveServer} from '@userActions/User';
+
+import CONST from '@src/CONST';
+import type {Route} from '@src/ROUTES';
+
+import React, {useState} from 'react';
+
+type ServerListItem = ListItem & {keyForList: Server};
+
+type ServerSelectorProps = {
+    shouldAddBottomSafeAreaPadding?: boolean;
+    backToRoute?: Route;
+};
+
+function ServerSelector({shouldAddBottomSafeAreaPadding = false, backToRoute}: ServerSelectorProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {activeServer, isPinnedByEnvironment, isStagingIgnored, isQASelectable} = useActiveServer();
+
+    // The resolved server arrives a tick after mount, so it cannot seed this state
+    const [pickedServer, setPickedServer] = useState<Server>();
+    const selectedServer = pickedServer ?? activeServer;
+
+    const canPickQA = isQASelectable && isQAAuthConfigured();
+    const offeredServers = [CONST.SERVER.PRODUCTION, ...(isStagingIgnored ? [] : [CONST.SERVER.STAGING]), ...(canPickQA ? [CONST.SERVER.QA] : [])];
+
+    // A pinned build can be on a server the list would not otherwise offer
+    const listedServers = offeredServers.includes(activeServer) ? offeredServers : [...offeredServers, activeServer];
+
+    const servers: ServerListItem[] = listedServers.map((server) => ({
+        text: translate(`initialSettingsPage.troubleshoot.servers.${server}.label`),
+        alternateText: translate(`initialSettingsPage.troubleshoot.servers.${server}.description`),
+        keyForList: server,
+        isSelected: selectedServer === server,
+    }));
+
+    const goBack = () => Navigation.goBack(backToRoute, {compareParams: false});
+
+    const saveAndGoBack = () => {
+        setActiveServer(selectedServer);
+        goBack();
+    };
+
+    const confirmButtonOptions = {
+        showButton: !isPinnedByEnvironment,
+        text: translate('common.save'),
+        onConfirm: saveAndGoBack,
+        isDisabled: selectedServer === activeServer,
+    };
+
+    return (
+        <>
+            <HeaderWithBackButton
+                title={translate('initialSettingsPage.troubleshoot.server')}
+                onBackButtonPress={goBack}
+            />
+            <SelectionList
+                data={servers}
+                ListItem={SingleSelectListItem}
+                onSelectRow={(server: ServerListItem) => setPickedServer(server.keyForList)}
+                shouldSingleExecuteRowSelect
+                confirmButtonOptions={confirmButtonOptions}
+                isDisabled={isPinnedByEnvironment}
+                customListHeaderContent={
+                    isPinnedByEnvironment ? <Text style={[styles.mh5, styles.mv3]}>{translate('initialSettingsPage.troubleshoot.serverPinnedDescription')}</Text> : undefined
+                }
+                initiallyFocusedItemKey={activeServer}
+                addBottomSafeAreaPadding={shouldAddBottomSafeAreaPadding}
+            />
+        </>
+    );
+}
+
+export default ServerSelector;
diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index f2c64e8fa22e..7d613e0d7d04 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -42,7 +42,7 @@ import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import {DYNAMIC_ROUTES} from '@src/ROUTES';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
 import type IconAsset from '@src/types/utils/IconAsset';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
@@ -245,7 +245,7 @@ function TroubleshootPage() {
                                     shouldUseSingleExecution
                                 />
                                 <View style={[styles.mt6]}>
-                                    <TestToolMenu />
+                                    <TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />
                                 </View>
                                 {isDevelopment && (
                                     <View style={[styles.mt6]}>
diff --git a/src/pages/settings/Wallet/ExpensifyCardPage/index.tsx b/src/pages/settings/Wallet/ExpensifyCardPage/index.tsx
index 673e53da450a..eea07fcf680f 100644
--- a/src/pages/settings/Wallet/ExpensifyCardPage/index.tsx
+++ b/src/pages/settings/Wallet/ExpensifyCardPage/index.tsx
@@ -476,34 +476,28 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
                         </MenuItem.Root>
                         {shouldShowReportLostCardButton && (
                             <>
-                                <MenuItemWithTopDescription
-                                    description={translate('cardPage.physicalCardNumber')}
-                                    title={maskCard(currentPhysicalCard?.lastFourPAN)}
-                                    interactive={false}
-                                    titleStyle={styles.walletCardNumber}
+                                <MenuItemField
+                                    name={translate('cardPage.physicalCardNumber')}
+                                    value={maskCard(currentPhysicalCard?.lastFourPAN)}
                                 />
                                 {shouldShowPIN && (
-                                    <MenuItemWithTopDescription
-                                        description={translate('cardPage.physicalCardPin')}
-                                        title={maskPin(revealedPIN)}
-                                        interactive={false}
-                                        titleStyle={styles.walletCardNumber}
-                                        shouldShowRightComponent={canRevealPIN}
-                                        rightComponent={
-                                            canRevealPIN ? (
-                                                <ButtonDisabledWhenOffline
-                                                    onPress={() => {
-                                                        executeScenario(CONST.MULTIFACTOR_AUTHENTICATION.SCENARIO.REVEAL_PIN, {
-                                                            cardID: String(currentPhysicalCard?.cardID),
-                                                        });
-                                                    }}
-                                                >
-                                                    <Button.Icon src={expensifyIcons.Eye} />
-                                                    <Button.Text>{translate('cardPage.revealPin')}</Button.Text>
-                                                </ButtonDisabledWhenOffline>
-                                            ) : undefined
-                                        }
-                                    />
+                                    <MenuItemField
+                                        name={translate('cardPage.physicalCardPin')}
+                                        value={maskPin(revealedPIN)}
+                                    >
+                                        {canRevealPIN && (
+                                            <ButtonDisabledWhenOffline
+                                                onPress={() => {
+                                                    executeScenario(CONST.MULTIFACTOR_AUTHENTICATION.SCENARIO.REVEAL_PIN, {
+                                                        cardID: String(currentPhysicalCard?.cardID),
+                                                    });
+                                                }}
+                                            >
+                                                <Button.Icon src={expensifyIcons.Eye} />
+                                                <Button.Text>{translate('cardPage.revealPin')}</Button.Text>
+                                            </ButtonDisabledWhenOffline>
+                                        )}
+                                    </MenuItemField>
                                 )}
                             </>
                         )}
@@ -644,12 +638,10 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
                                     <>
                                         {shouldShowReportVirtualCardFraudRows &&
                                             virtualCards.map((card) => (
-                                                <MenuItemWithTopDescription
+                                                <MenuItemNavigation
                                                     key={`virtual-fraud-${card.cardID}`}
                                                     title={translate('cardPage.reportFraud')}
-                                                    titleStyle={styles.walletCardMenuItem}
                                                     icon={expensifyIcons.Flag}
-                                                    shouldShowRightIcon
                                                     onPress={() => {
                                                         if (isAccountLocked) {
                                                             showLockedAccountModal();
@@ -665,12 +657,10 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
                                             ))}
                                         {shouldShowReportTravelCardFraudRows &&
                                             travelCards.map((card) => (
-                                                <MenuItemWithTopDescription
+                                                <MenuItemNavigation
                                                     key={`travel-fraud-${card.cardID}`}
                                                     title={translate('cardPage.reportTravelFraud')}
-                                                    titleStyle={styles.walletCardMenuItem}
                                                     icon={expensifyIcons.Flag}
-                                                    shouldShowRightIcon
                                                     onPress={() => Navigation.navigate(ROUTES.SETTINGS_REPORT_FRAUD.getRoute(String(card.cardID)))}
                                                 />
                                             ))}
diff --git a/src/pages/settings/Wallet/ImportTransactionsPage.tsx b/src/pages/settings/Wallet/ImportTransactionsPage.tsx
index 71475aadc7fa..d6b6eb201265 100644
--- a/src/pages/settings/Wallet/ImportTransactionsPage.tsx
+++ b/src/pages/settings/Wallet/ImportTransactionsPage.tsx
@@ -1,7 +1,7 @@
 import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItem from '@components/MenuItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
@@ -15,6 +15,8 @@ import Navigation from '@libs/Navigation/Navigation';
 
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -52,6 +54,8 @@ function ImportTransactionsPage() {
         Navigation.navigate(ROUTES.SETTINGS_WALLET_IMPORT_TRANSACTIONS_SPREADSHEET.getRoute());
     }, [cardDisplayName, currency, isReimbursable, flipAmountSign]);
 
+    const shouldShowCardDisplayNameError = shouldShowError && !cardDisplayName;
+
     return (
         <ScreenWrapper testID="ImportTransactionsPage">
             <HeaderWithBackButton
@@ -61,17 +65,22 @@ function ImportTransactionsPage() {
             <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
                 <View>
                     <Text style={[styles.textNormal, styles.mh5, styles.mb5]}>{translate('workspace.companyCards.importTransactions.description')}</Text>
-                    <MenuItemWithTopDescription
-                        shouldShowRightIcon
-                        title={cardDisplayName || undefined}
-                        description={translate('workspace.companyCards.importTransactions.cardDisplayName')}
-                        style={styles.moneyRequestMenuItem}
-                        titleStyle={styles.flex1}
-                        onPress={navigateToCardNameSelection}
-                        rightLabel={translate('common.required')}
-                        brickRoadIndicator={shouldShowError && !cardDisplayName ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                        errorText={shouldShowError && !cardDisplayName ? translate('common.error.fieldRequired') : ''}
-                    />
+                    <MenuItem.Root onPress={callFunctionIfActionIsAllowed(navigateToCardNameSelection)}>
+                        <MenuItemField.Row
+                            name={translate('workspace.companyCards.importTransactions.cardDisplayName')}
+                            value={cardDisplayName || undefined}
+                        >
+                            {shouldShowCardDisplayNameError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                            {!cardDisplayName && !shouldShowCardDisplayNameError && <MenuItem.RightLabel>{translate('common.required')}</MenuItem.RightLabel>}
+                            <MenuItem.Chevron />
+                        </MenuItemField.Row>
+                        {shouldShowCardDisplayNameError && (
+                            <MenuItem.HelpText
+                                isError
+                                message={translate('common.error.fieldRequired')}
+                            />
+                        )}
+                    </MenuItem.Root>
                     <MenuItemField
                         value={currency}
                         name={translate('workspace.companyCards.importTransactions.currency')}
diff --git a/src/pages/settings/Wallet/PersonalCardEditNamePage.tsx b/src/pages/settings/Wallet/PersonalCardEditNamePage.tsx
index 3acee65d17f6..1be476bc189f 100644
--- a/src/pages/settings/Wallet/PersonalCardEditNamePage.tsx
+++ b/src/pages/settings/Wallet/PersonalCardEditNamePage.tsx
@@ -12,10 +12,9 @@ import useOnyx from '@hooks/useOnyx';
 import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getDefaultCardName} from '@libs/CardUtils';
-import {addErrorMessage} from '@libs/ErrorUtils';
+import {getCardNameError, getCardNameErrorMessage, getDefaultCardName} from '@libs/CardUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {getFieldRequiredErrors, isValidInputLength} from '@libs/ValidationUtils';
+import StringUtils from '@libs/StringUtils';
 
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -52,18 +51,18 @@ function PersonalCardEditNamePage({route}: PersonalCardEditNamePageProps) {
     const styles = useThemeStyles();
 
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_PERSONAL_CARD_NAME_FORM>) => {
-        updateAssignedCardName(cardID, values[INPUT_IDS.NAME], defaultValue);
+        updateAssignedCardName(cardID, StringUtils.sanitizeName(values[INPUT_IDS.NAME]), defaultValue);
         Navigation.goBack(ROUTES.SETTINGS_WALLET_PERSONAL_CARD_DETAILS.getRoute(cardID));
     };
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_PERSONAL_CARD_NAME_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_PERSONAL_CARD_NAME_FORM> => {
-        const errors = getFieldRequiredErrors(values, [INPUT_IDS.NAME], translate);
-        if (values.name) {
-            const {isValid, byteLength} = isValidInputLength(values.name, CONST.STANDARD_LENGTH_LIMIT);
-            if (!isValid) {
-                addErrorMessage(errors, INPUT_IDS.NAME, translate('common.error.characterLimitExceedCounter', byteLength, CONST.STANDARD_LENGTH_LIMIT));
-            }
+        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_PERSONAL_CARD_NAME_FORM> = {};
+        const error = getCardNameError(values.name);
+
+        if (error) {
+            errors[INPUT_IDS.NAME] = getCardNameErrorMessage(translate, error, values.name);
         }
+
         return errors;
     };
 
diff --git a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
index 8ab164545183..1cf62b6c5bf8 100644
--- a/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/AddNewCardPage.tsx
@@ -5,6 +5,7 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {navigateToConciergeChat} from '@libs/actions/Report';
@@ -31,6 +32,7 @@ function AddPersonalNewCardPage() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const {currentStep} = addNewPersonalCardFeed ?? {};
     const [isModalVisible, setIsModalVisible] = useState(false);
     const {showConfirmModal} = useConfirmModal();
@@ -75,7 +77,7 @@ function AddPersonalNewCardPage() {
                                 if (result.action !== ModalActions.CONFIRM) {
                                     return;
                                 }
-                                navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed});
+                                navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails});
                             })
                             .finally(() => {
                                 setIsModalVisible(false);
diff --git a/src/pages/settings/Wallet/PersonalCards/PersonalCardsErrorConfirmation.tsx b/src/pages/settings/Wallet/PersonalCards/PersonalCardsErrorConfirmation.tsx
index b70ab0bcb391..531a6321918f 100644
--- a/src/pages/settings/Wallet/PersonalCards/PersonalCardsErrorConfirmation.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/PersonalCardsErrorConfirmation.tsx
@@ -14,7 +14,12 @@ import CONST from '@src/CONST';
 
 import React from 'react';
 
-function PersonalCardsErrorConfirmation() {
+type PersonalCardsErrorConfirmationProps = {
+    /** Backend-supplied bank connection error message to display */
+    errorMessage?: string;
+};
+
+function PersonalCardsErrorConfirmation({errorMessage}: PersonalCardsErrorConfirmationProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const illustrations = useMemoizedLazyIllustrations(['QuestionMark']);
@@ -25,6 +30,7 @@ function PersonalCardsErrorConfirmation() {
     };
 
     const openPlaidLink = () => {
+        clearAddNewPersonalCardErrors();
         setAddNewPersonalCardStepAndData({
             step: CONST.PERSONAL_CARDS.STEP.PLAID_CONNECTION,
             data: {
@@ -41,6 +47,7 @@ function PersonalCardsErrorConfirmation() {
             heading={translate('personalCard.bankConnectionError')}
             description={
                 <Text style={[styles.textSupporting, styles.textAlignCenter]}>
+                    {!!errorMessage && `${errorMessage} `}
                     {translate('personalCard.bankConnectionDescription')}{' '}
                     <TextLink
                         style={[styles.link]}
diff --git a/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.native.tsx b/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.native.tsx
index 90a203e4eb85..3712e18461d5 100644
--- a/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.native.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.native.tsx
@@ -9,6 +9,7 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getLatestErrorMessage} from '@libs/ErrorUtils';
 import getUAForWebView from '@libs/getUAForWebView';
 
 import PersonalCardsErrorConfirmation from '@pages/settings/Wallet/PersonalCards/PersonalCardsErrorConfirmation';
@@ -44,6 +45,7 @@ function BankConnection() {
     const onImportPlaidAccounts = useImportPersonalPlaidAccounts();
     const newCard = useGetNewPersonalCard();
     const isNewCardError = !isEmptyObject(addNewCard?.errors);
+    const errorMessage = getLatestErrorMessage(addNewCard) || undefined;
 
     const renderLoading = () => <LoadingIndicator />;
 
@@ -111,7 +113,7 @@ function BankConnection() {
                         style={styles.flex1}
                     />
                 )}
-                {isNewCardError && <PersonalCardsErrorConfirmation />}
+                {isNewCardError && <PersonalCardsErrorConfirmation errorMessage={errorMessage} />}
             </FullPageOfflineBlockingView>
         </ScreenWrapper>
     );
diff --git a/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.tsx b/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.tsx
index 737919bc4b23..fc2c4eb3b0f3 100644
--- a/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/steps/BankConnection/index.tsx
@@ -13,6 +13,8 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getLatestErrorMessage} from '@libs/ErrorUtils';
+
 import PersonalCardsErrorConfirmation from '@pages/settings/Wallet/PersonalCards/PersonalCardsErrorConfirmation';
 import useGetNewPersonalCard from '@pages/settings/Wallet/PersonalCards/useGetNewPersonalCard';
 
@@ -31,18 +33,19 @@ let customWindow: Window | null = null;
 
 type BankConnectionContentProps = {
     hasImportError: boolean;
+    errorMessage?: string;
     isPlaid?: boolean;
     onOpenBankConnectionFlow: () => void;
     bankName?: string | null;
     plaidConnectedFeedName?: string;
 };
 
-function BankConnectionContent({hasImportError, isPlaid, onOpenBankConnectionFlow, bankName, plaidConnectedFeedName}: BankConnectionContentProps) {
+function BankConnectionContent({hasImportError, errorMessage, isPlaid, onOpenBankConnectionFlow, bankName, plaidConnectedFeedName}: BankConnectionContentProps) {
     const illustrations = useMemoizedLazyIllustrations(['PendingBank']);
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     if (hasImportError) {
-        return <PersonalCardsErrorConfirmation />;
+        return <PersonalCardsErrorConfirmation errorMessage={errorMessage} />;
     }
     if (!isPlaid) {
         return (
@@ -82,6 +85,7 @@ function BankConnection() {
     const onImportPlaidAccounts = useImportPersonalPlaidAccounts();
     const newCard = useGetNewPersonalCard();
     const hasImportError = !isEmptyObject(addNewCard?.errors);
+    const errorMessage = getLatestErrorMessage(addNewCard) || undefined;
 
     const onOpenBankConnectionFlow = () => {
         if (!url) {
@@ -131,6 +135,7 @@ function BankConnection() {
             <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                 <BankConnectionContent
                     bankName={bankName}
+                    errorMessage={errorMessage}
                     hasImportError={hasImportError}
                     onOpenBankConnectionFlow={onOpenBankConnectionFlow}
                     plaidConnectedFeedName={addNewCard?.data?.plaidConnectedFeedName}
diff --git a/src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx b/src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx
index a5362395dcce..f91d0b146645 100644
--- a/src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx
+++ b/src/pages/settings/Wallet/PersonalCards/upgrade/PersonalCardUpgradePage.tsx
@@ -15,13 +15,12 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@navigation/Navigation';
 
-import {createWorkspaceWithPolicyDraft} from '@userActions/App';
-import {generateDefaultWorkspaceName, generatePolicyID} from '@userActions/Policy/Policy';
+import {createWorkspaceWithPolicyDraft} from '@userActions/Policy/CreateWorkspaceFlow';
+import {generateDefaultWorkspaceName, generatePolicyID} from '@userActions/Policy/PolicyDraft';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {LastPaymentMethodType} from '@src/types/onyx';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
 import React, {useState} from 'react';
@@ -37,7 +36,6 @@ function PersonalCardUpgradePage() {
     const {isOffline} = useNetwork();
     const [isUpgraded, setIsUpgraded] = useState(false);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
-    const [lastPaymentMethod] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
@@ -58,7 +56,6 @@ function PersonalCardUpgradePage() {
             transitionFromOldDot: false,
             makeMeAdmin: false,
             policyID,
-            lastUsedPaymentMethod: lastPaymentMethod?.[policyID] as LastPaymentMethodType,
             activePolicy,
             conciergeChat,
             currentUserAccountIDParam: accountID,
diff --git a/src/pages/settings/Wallet/WalletPage/index.tsx b/src/pages/settings/Wallet/WalletPage/index.tsx
index 2205580a6dfe..739ed0c9c531 100644
--- a/src/pages/settings/Wallet/WalletPage/index.tsx
+++ b/src/pages/settings/Wallet/WalletPage/index.tsx
@@ -29,6 +29,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePaymentMethodState from '@hooks/usePaymentMethodState';
 import type {FormattedSelectedPaymentMethod} from '@hooks/usePaymentMethodState/types';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useRefreshPendingDigitalWalletApproval from '@hooks/useRefreshPendingDigitalWalletApproval';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -100,6 +101,7 @@ function WalletPage() {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [nvpLockedVbaUnlockRequested] = useOnyx(ONYXKEYS.COLLECTION.NVP_LOCKED_VBA_UNLOCK_REQUESTED);
     const [initiatingBankAccountUnlock] = useOnyx(ONYXKEYS.INITIATING_BANK_ACCOUNT_UNLOCK);
     const delegateAccountID = useDelegateAccountID();
@@ -166,7 +168,7 @@ function WalletPage() {
                 return;
             }
             pressLockedBankAccount(accountData.bankAccountID, translate, conciergeReportID ?? undefined, delegateAccountID, initiatingBankAccountUnlock);
-            navigateToConciergeChat({conciergeReportID: conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed});
+            navigateToConciergeChat({conciergeReportID: conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails});
             return;
         }
 
diff --git a/src/pages/settings/useInitialSettingsPageMenuData.ts b/src/pages/settings/useInitialSettingsPageMenuData.ts
index 51f5aa1a44b2..65aae879d93f 100644
--- a/src/pages/settings/useInitialSettingsPageMenuData.ts
+++ b/src/pages/settings/useInitialSettingsPageMenuData.ts
@@ -1,38 +1,30 @@
 /**
  * Builds the Account and General menu section data shown on the Initial Settings page.
  */
-import {ModalActions} from '@components/Modal/Global/ModalContext';
-
 import useCardFeedErrors from '@hooks/useCardFeedErrors';
-import useConfirmModal from '@hooks/useConfirmModal';
 import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
 import useNonPersonalCardList from '@hooks/useNonPersonalCardList';
 import useOnyx from '@hooks/useOnyx';
 import usePrivateSubscription from '@hooks/usePrivateSubscription';
+import useSignOut from '@hooks/useSignOut';
 
 import {resetExitSurveyForm} from '@libs/actions/ExitSurvey';
 import {closeReactNativeApp} from '@libs/actions/HybridApp';
 import {hasPartiallySetupBankAccount, hasPersonalBankAccountMissingInfo} from '@libs/BankAccountUtils';
 import {hasCardPendingDigitalWalletApproval, hasPendingExpensifyCardAction, hasVirtualExpensifyCardMissingPersonalDetails} from '@libs/CardUtils';
-import {showPermissionErrorAlert} from '@libs/fileDownload/FileUtils';
-import Log from '@libs/Log';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
-import {getSaveablePendingReceiptRequests, saveReceiptsToGallery} from '@libs/savePendingReceiptsToGallery';
 import {getFreeTrialText, hasSubscriptionRedDotError, shouldShowSubscriptionExpiringSoonUI} from '@libs/SubscriptionUtils';
 import {shouldHideOldAppRedirect} from '@libs/TryNewDotUtils';
 import {expensifyLoginsSelector, getProfilePageBrickRoadIndicator, hasDeviceManagementError} from '@libs/UserUtils';
 
 import useTimeSensitiveHomeAddress from '@pages/home/TimeSensitiveSection/hooks/useTimeSensitiveHomeAddress';
-import {BACKGROUND_LOCATION_TRACKING_TASK_NAME} from '@pages/iou/request/step/IOURequestStepDistanceGPS/const';
-import {stopGpsTripNotification} from '@pages/iou/request/step/IOURequestStepDistanceGPS/GPSNotifications';
 
 import {openExternalLink, openOldDotLink} from '@userActions/Link';
 import {hasPaymentMethodError} from '@userActions/PaymentMethods';
-import {hasStashedSession, isSupportAuthToken, signOutAndRedirectToSignIn} from '@userActions/Session';
+import {hasStashedSession, isSupportAuthToken} from '@userActions/Session';
 
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
@@ -48,7 +40,6 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import type {ValueOf} from 'type-fest';
 
 import {differenceInDays} from 'date-fns';
-import {stopLocationUpdatesAsync} from 'expo-location';
 
 import type {MenuData, MenuSection} from './useSettingsNavigationMenuData';
 
@@ -82,8 +73,8 @@ function useInitialSettingsPageMenuData(currentUserPersonalDetails: CurrentUserP
     const [amountOwed = 0] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const [ownerTravelBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_TRAVEL_BILLING_GRACE_PERIOD_END);
-    const network = useNetwork();
     const {translate} = useLocalize();
+    const {signOut: signOutInteractively, signOutImmediately} = useSignOut();
     const hasActivatedWallet = ([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM] as string[]).includes(userWallet?.tierName ?? '');
     const hasLockedBankAccount = bankAccountList ? Object.values(bankAccountList).some((bankAccount) => bankAccount.accountData?.state === CONST.BANK_ACCOUNT.STATE.LOCKED) : false;
     const {shouldShowAddHomeAddress} = useTimeSensitiveHomeAddress();
@@ -132,106 +123,12 @@ function useInitialSettingsPageMenuData(currentUserPersonalDetails: CurrentUserP
         walletBrickRoadIndicator = CONST.BRICK_ROAD_INDICATOR_STATUS.INFO;
     }
 
-    const {showConfirmModal} = useConfirmModal();
-    const confirmModalTitle = isTrackingGPS ? translate('gps.signOutWarningTripInProgress.title') : translate('common.areYouSure');
-    const confirmModalPrompt = isTrackingGPS ? translate('gps.signOutWarningTripInProgress.prompt') : translate('initialSettingsPage.signOutConfirmationText');
-    const confirmModalConfirmText = isTrackingGPS ? translate('gps.signOutWarningTripInProgress.confirm') : translate('initialSettingsPage.signOut');
-
-    const showSignOutModal = () => {
-        return showConfirmModal({
-            title: confirmModalTitle,
-            prompt: confirmModalPrompt,
-            confirmText: confirmModalConfirmText,
-            cancelText: translate('common.cancel'),
-            shouldShowCancelButton: true,
-            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
-        });
-    };
-
-    const showSaveReceiptsModal = (pendingReceiptCount: number) => {
-        return showConfirmModal({
-            title: translate('initialSettingsPage.saveReceiptsConfirmation.title'),
-            prompt: translate('initialSettingsPage.saveReceiptsConfirmation.prompt', {
-                count: pendingReceiptCount,
-            }),
-            confirmText: translate('initialSettingsPage.saveReceiptsConfirmation.confirm'),
-            cancelText: translate('common.cancel'),
-            shouldShowCancelButton: true,
-        });
-    };
-
-    // Combined modal for the offline case: warns about losing offline changes and offers to save the pending receipts, so the user is not shown two back-to-back prompts.
-    const showSaveReceiptsAndSignOutModal = (pendingReceiptCount: number) => {
-        return showConfirmModal({
-            title: translate('initialSettingsPage.saveReceiptsAndSignOutConfirmation.title'),
-            prompt: translate('initialSettingsPage.saveReceiptsAndSignOutConfirmation.prompt', {
-                count: pendingReceiptCount,
-            }),
-            confirmText: translate('initialSettingsPage.saveReceiptsAndSignOutConfirmation.confirm'),
-            cancelText: translate('common.cancel'),
-            shouldShowCancelButton: true,
-            buttonVariant: CONST.BUTTON_VARIANT.DANGER,
-        });
-    };
-
-    // Save must complete before the forced-signout branch dispatches `Onyx.clear`, which wipes the persisted queue that holds these local file paths.
-    const saveReceipts = async (saveableReceipts: ReturnType<typeof getSaveablePendingReceiptRequests>) => {
-        try {
-            const {savedCount, failedCount, permissionDenied} = await saveReceiptsToGallery(saveableReceipts);
-            Log.info('[Receipt] Saved pending receipts to gallery before sign-out', false, {savedCount, failedCount, permissionDenied});
-            // When the OS denied gallery access the receipts could not be saved. Point the user to Settings with the same alert the manual download flow uses, then let sign-out proceed.
-            if (permissionDenied) {
-                showPermissionErrorAlert(translate);
-            }
-        } catch (error) {
-            Log.alert('[Receipt] Unexpected rejection from saveReceiptsToGallery; sign-out continued', {error});
-        }
-    };
-
     const signOut = async (shouldForceSignout = false) => {
-        // Forced sign-out (expired session, SAML re-auth) must be non-interactive: it must not touch the gallery flow, which can trigger OS permission prompts and delay the redirect.
         if (shouldForceSignout) {
-            return signOutAndRedirectToSignIn();
-        }
-
-        // `getSaveablePendingReceiptRequests` is platform-split (web returns `[]`) and image-filtered so we do not promise a save the native gallery API can not deliver.
-        const saveableReceipts = getSaveablePendingReceiptRequests();
-        const shouldWarnBeforeSignOut = network.isOffline || isTrackingGPS;
-        // Offline + receipts is the common case; merge the offline warning and the save-receipts prompt into a single modal. GPS keeps its own warning, so it falls through to the two-step path below.
-        const isOfflineReceiptsCase = network.isOffline && !isTrackingGPS && saveableReceipts.length > 0;
-
-        if (!shouldWarnBeforeSignOut && saveableReceipts.length === 0) {
-            return signOutAndRedirectToSignIn();
+            return signOutImmediately();
         }
 
-        if (isOfflineReceiptsCase) {
-            const result = await showSaveReceiptsAndSignOutModal(saveableReceipts.length);
-            if (result.action !== ModalActions.CONFIRM) {
-                return;
-            }
-            await saveReceipts(saveableReceipts);
-        } else {
-            if (shouldWarnBeforeSignOut) {
-                const result = await showSignOutModal();
-                if (result.action !== ModalActions.CONFIRM) {
-                    return;
-                }
-            }
-
-            if (saveableReceipts.length > 0) {
-                const result = await showSaveReceiptsModal(saveableReceipts.length);
-                if (result.action !== ModalActions.CONFIRM) {
-                    return;
-                }
-                await saveReceipts(saveableReceipts);
-            }
-        }
-
-        if (isTrackingGPS) {
-            stopGpsTripNotification();
-            stopLocationUpdatesAsync(BACKGROUND_LOCATION_TRACKING_TASK_NAME).catch((error) => console.error('[GPS distance request] Failed to stop location tracking', error));
-        }
-        signOut(true);
+        return signOutInteractively();
     };
 
     const surveyThresholdInDays = 30;
diff --git a/src/pages/signin/SAMLSignInPage/index.native.tsx b/src/pages/signin/SAMLSignInPage/index.native.tsx
index a12d06e536b8..ca50ec0f5513 100644
--- a/src/pages/signin/SAMLSignInPage/index.native.tsx
+++ b/src/pages/signin/SAMLSignInPage/index.native.tsx
@@ -106,7 +106,7 @@ function SAMLSignInPage() {
             // A forced re-auth leaves account.isLoading true until sign-in, so the token alone decides here.
             if (credentials?.login && shortLivedAuthToken) {
                 Log.info('SAMLSignInPage - Successfully received shortLivedAuthToken. Signing in...');
-                signInWithShortLivedAuthToken(shortLivedAuthToken, true, lastVisitedPath);
+                signInWithShortLivedAuthToken(shortLivedAuthToken, true, lastVisitedPath, credentials?.login);
                 return;
             }
 
diff --git a/src/pages/tasks/DynamicNewTaskDetailsPage.tsx b/src/pages/tasks/DynamicNewTaskDetailsPage.tsx
index 61fb0431626e..e236b1e227a2 100644
--- a/src/pages/tasks/DynamicNewTaskDetailsPage.tsx
+++ b/src/pages/tasks/DynamicNewTaskDetailsPage.tsx
@@ -13,6 +13,7 @@ import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {addErrorMessage} from '@libs/ErrorUtils';
@@ -28,7 +29,6 @@ import {createTaskAndNavigate, dismissModalAndClearOutTaskInfo, setDetailsValue,
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import {personalDetailsListSelector} from '@src/selectors/PersonalDetails';
 import INPUT_IDS from '@src/types/form/NewTaskForm';
 
 import React, {useState} from 'react';
@@ -41,9 +41,7 @@ function DynamicNewTaskDetailsPage() {
     const ancestors = useAncestors(parentReport);
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const delegateAccountID = useDelegateAccountID();
-    const [taskCreatorAndAssigneeDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsListSelector([currentUserPersonalDetails.accountID, task?.assigneeAccountID]),
-    });
+    const [taskCreatorAndAssigneeDetails] = usePersonalDetailsByIDs([currentUserPersonalDetails.accountID, task?.assigneeAccountID]);
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const accountIDToName = useAccountIDToNameMap();
diff --git a/src/pages/tasks/DynamicNewTaskPage.tsx b/src/pages/tasks/DynamicNewTaskPage.tsx
index 74d792a1a7b4..61a79f77aa27 100644
--- a/src/pages/tasks/DynamicNewTaskPage.tsx
+++ b/src/pages/tasks/DynamicNewTaskPage.tsx
@@ -6,8 +6,8 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItem from '@components/MenuItem';
 import {useMenuItemConfig, useMenuItemInteraction} from '@components/MenuItem/MenuItemContext';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 import MenuItemWithLabel from '@components/MenuItem/presets/MenuItemWithLabel';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ReportActionAvatars from '@components/ReportActionAvatars';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -19,6 +19,7 @@ import useDelegateAccountID from '@hooks/useDelegateAccountID';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import usePressLoading from '@hooks/usePressLoading';
 import {useDerivedReportNameByReportID} from '@hooks/useReportAttributes';
@@ -29,6 +30,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {createTaskAndNavigate, dismissModalAndClearOutTaskInfo, getAssignee, getShareDestination, setShareDestinationValue} from '@libs/actions/Task';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
+import Parser from '@libs/Parser';
+import {getPersonalDetailsListByIDs} from '@libs/PersonalDetailsUtils';
 import {isAllowedToComment} from '@libs/ReportUtils';
 
 import {callFunctionIfActionIsAllowed} from '@userActions/Session';
@@ -36,7 +39,6 @@ import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import {personalDetailsListSelector} from '@src/selectors/PersonalDetails';
 import {pendingDeleteMemberAccountIDsSelector} from '@src/selectors/ReportMetaData';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
@@ -72,16 +74,14 @@ function DynamicNewTaskPage() {
     const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${task?.shareDestination}`);
     const [pendingDeleteMemberAccountIDs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${task?.shareDestination}`, {selector: pendingDeleteMemberAccountIDsSelector});
     const policy = usePolicy(parentReport?.policyID);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
     const derivedSharedDestinationReportName = useDerivedReportNameByReportID(parentReport?.reportID);
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const delegateAccountID = useDelegateAccountID();
-    const [taskCreatorAndAssigneeDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: personalDetailsListSelector([currentUserPersonalDetails.accountID, task?.assigneeAccountID]),
-    });
+    const taskCreatorAndAssigneeDetails = getPersonalDetailsListByIDs([currentUserPersonalDetails.accountID, task?.assigneeAccountID], personalDetails);
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber, localeCompare} = useLocalize();
     const assignee = getAssignee(task?.assigneeAccountID ?? CONST.DEFAULT_NUMBER_ID, personalDetails, translate, formatPhoneNumber);
@@ -211,23 +211,17 @@ function DynamicNewTaskPage() {
                 >
                     <View style={styles.flex1}>
                         <View style={styles.mb5}>
-                            <MenuItemWithTopDescription
-                                description={translate('task.title')}
-                                title={task?.title}
+                            <MenuItemFieldHTML
+                                name={translate('task.title')}
+                                value={task?.title ? Parser.replace(task.title, {disabledRules: [...CONST.TASK_TITLE_DISABLED_RULES]}) : undefined}
                                 onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.NEW_TASK_TITLE.path))}
-                                shouldShowRightIcon
-                                rightLabel={translate('common.required')}
-                                shouldParseTitle
-                                excludedMarkdownRules={[...CONST.TASK_TITLE_DISABLED_RULES]}
-                            />
-                            <MenuItemWithTopDescription
-                                description={translate('task.description')}
-                                title={task?.description}
+                            >
+                                {!task?.title && <MenuItem.RightLabel>{translate('common.required')}</MenuItem.RightLabel>}
+                            </MenuItemFieldHTML>
+                            <MenuItemFieldHTML
+                                name={translate('task.description')}
+                                value={task?.description ? Parser.replace(task.description) : undefined}
                                 onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.NEW_TASK_DESCRIPTION.path))}
-                                shouldShowRightIcon
-                                shouldParseTitle
-                                numberOfLinesTitle={2}
-                                titleStyle={styles.flex1}
                             />
                             {assignee?.displayName ? (
                                 <MenuItem.Root
diff --git a/src/pages/tasks/DynamicTaskShareDestinationSelectorModal.tsx b/src/pages/tasks/DynamicTaskShareDestinationSelectorModal.tsx
index f75a55c031bf..c969dee60cad 100644
--- a/src/pages/tasks/DynamicTaskShareDestinationSelectorModal.tsx
+++ b/src/pages/tasks/DynamicTaskShareDestinationSelectorModal.tsx
@@ -92,7 +92,6 @@ function DynamicTaskShareDestinationSelectorModal() {
                       keyForList: option.keyForList ?? '',
                       isDisabled: option.isDisabled ?? undefined,
                       login: option.login ?? undefined,
-                      shouldShowSubscript: option.shouldShowSubscript ?? undefined,
                   }))
                 : [],
         [filteredOptions.recentReports],
diff --git a/src/pages/wallet/WalletStatementPage.tsx b/src/pages/wallet/WalletStatementPage.tsx
index 73925d5bd7be..ccfefa6cc128 100644
--- a/src/pages/wallet/WalletStatementPage.tsx
+++ b/src/pages/wallet/WalletStatementPage.tsx
@@ -1,5 +1,6 @@
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import {useSession} from '@components/OnyxListItemProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
 import WalletStatementModal from '@components/WalletStatementModal';
@@ -97,12 +98,14 @@ function WalletStatementPage({route}: WalletStatementPageProps) {
             enableEdgeToEdgeBottomSafeAreaPadding
             testID="WalletStatementPage"
         >
-            <HeaderWithBackButton
-                title={Str.recapitalize(translate('statementPage.title', year, monthName))}
-                shouldShowDownloadButton={!isOffline || isDownloading}
-                isDownloading={isDownloading}
-                onDownloadButtonPress={processDownload}
-            />
+            <HeaderWithBackButtonAndTitle title={Str.recapitalize(translate('statementPage.title', year, monthName))}>
+                {(!isOffline || isDownloading) && (
+                    <Header.DownloadButton
+                        onPress={processDownload}
+                        isLoading={isDownloading}
+                    />
+                )}
+            </HeaderWithBackButtonAndTitle>
             <FullPageOfflineBlockingView addBottomSafeAreaPadding>
                 <WalletStatementModal statementPageURL={url} />
             </FullPageOfflineBlockingView>
diff --git a/src/pages/workspace/ConnectExistingBusinessBankAccountPage.tsx b/src/pages/workspace/ConnectExistingBusinessBankAccountPage.tsx
index 799b3b6e4c1a..953dedede905 100644
--- a/src/pages/workspace/ConnectExistingBusinessBankAccountPage.tsx
+++ b/src/pages/workspace/ConnectExistingBusinessBankAccountPage.tsx
@@ -142,6 +142,8 @@ function ConnectExistingBusinessBankAccountPage({route}: ConnectExistingBusiness
                         excludeStates={[CONST.BANK_ACCOUNT.STATE.LOCKED]}
                         excludeBankAccountID={isChangingBankAccount ? connectedAccountBankAccountID : undefined}
                         shouldHideDefaultBadge
+                        // The workspace bank account flow asks for the magic code itself and keeps the policyID after validation
+                        shouldSkipDefaultAccountValidation
                     />
                 </ScrollView>
             )}
diff --git a/src/pages/workspace/DynamicWorkspaceConfirmationPage.tsx b/src/pages/workspace/DynamicWorkspaceConfirmationPage.tsx
index 1fb432052252..0be218ca901a 100644
--- a/src/pages/workspace/DynamicWorkspaceConfirmationPage.tsx
+++ b/src/pages/workspace/DynamicWorkspaceConfirmationPage.tsx
@@ -12,15 +12,15 @@ import useOnyx from '@hooks/useOnyx';
 import usePrivateSubscription from '@hooks/usePrivateSubscription';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
-import {createWorkspaceWithPolicyDraftAndNavigateToIt} from '@libs/actions/App';
 import getCurrentUrl from '@libs/Navigation/currentUrl';
 import Navigation from '@libs/Navigation/Navigation';
 import {isSubscriptionTypeOfInvoicing} from '@libs/SubscriptionUtils';
 
+import {createWorkspaceWithPolicyDraftAndNavigateToIt} from '@userActions/Policy/CreateWorkspaceFlow';
+
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
-import type {LastPaymentMethodType} from '@src/types/onyx';
 
 import {hasSeenTourSelector} from '@selectors/Onboarding';
 import React, {useState} from 'react';
@@ -31,7 +31,6 @@ function DynamicWorkspaceConfirmationPage() {
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.WORKSPACE_CONFIRMATION.path);
-    const [lastPaymentMethod] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
@@ -72,7 +71,6 @@ function DynamicWorkspaceConfirmationPage() {
             currency: params.currency,
             file: params.avatarFile as File,
             routeToNavigateAfterCreate: routeToNavigate,
-            lastUsedPaymentMethod: lastPaymentMethod?.[policyID] as LastPaymentMethodType,
             activePolicy,
             conciergeChat,
             currentUserAccountIDParam: currentUserPersonalDetails.accountID,
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 5beb127fe3d2..d3f3335608bd 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -26,6 +26,7 @@ import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 
 import {isConnectionInProgress} from '@libs/actions/connections';
 import {clearErrors, openPolicyInitialPage, removeWorkspace} from '@libs/actions/Policy/Policy';
+import {getRules} from '@libs/actions/Policy/Rules';
 import goBackFromWorkspaceSettingPages from '@libs/Navigation/helpers/goBackFromWorkspaceSettingPages';
 import WorkspaceCreationReveal from '@libs/Navigation/helpers/WorkspaceCreationReveal';
 import Navigation from '@libs/Navigation/Navigation';
@@ -44,6 +45,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {LayoutChangeEvent} from 'react-native';
 
 import {findFocusedRoute, useFocusEffect, useIsFocused, useNavigationState} from '@react-navigation/native';
+import {createHasExpenseDefaultRuleErrorsSelector} from '@selectors/Rule';
 import {emailSelector} from '@selectors/Session';
 import React, {useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
@@ -87,6 +89,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
 
     const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${routePolicyID}`);
+    const [hasMerchantRuleErrors] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: createHasExpenseDefaultRuleErrorsSelector(policyID)});
     const workspaceAccountID = useWorkspaceAccountID(policyID);
     const {shouldShowEnterCredentialsError} = useGetReceiptPartnersIntegrationData(policyID);
     const {shouldShowRbrForWorkspaceAccountID} = useCardFeedErrors();
@@ -148,6 +151,9 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
             return;
         }
         openPolicyInitialPage(routePolicyID);
+        // Deliberately not `useRulesPrefetch`, which fetches once per session for screens that only need a count.
+        // Opening a workspace is the point at which its rules have to be current, including after a reconnect.
+        getRules();
     };
     useNetwork({onReconnect: fetchPolicyData});
     useFocusEffect(
@@ -180,6 +186,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
         icons: expensifyIcons,
         isConnectionInProgress: isConnectionInProgress(connectionSyncProgress, policy),
         policyCategories,
+        hasMerchantRuleErrors,
         previousPendingFields: prevPendingFields,
         shouldShowEnterCredentialsError,
         shouldShowRBR,
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index f1f05138fc85..c63e5edf8e9e 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -32,6 +32,7 @@ import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {isConnectionInProgress, syncConnection} from '@libs/actions/connections';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import {updateMemberRoleInline} from '@libs/actions/Policy/InlineEdit';
 import {
     clearAddMemberError,
     clearDeleteMemberError,
@@ -54,11 +55,13 @@ import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavig
 import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
 import {isPersonalDetailsReady} from '@libs/OptionsListUtils';
 import {getPersonalDetailsByID, temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
+import {isPolicyReimburser} from '@libs/PolicyMemberRoleUtils';
 import {
     canEditWorkspaceSettings as canEditWorkspaceSettingsUtil,
     canMemberAssignRole,
     canMemberManageMemberWithRole,
     canMemberWrite,
+    canRolePay,
     getConnectionExporters,
     getMemberAccountIDsForWorkspace,
     getReimburserEmail,
@@ -69,6 +72,7 @@ import {
     isPaidGroupPolicy,
     isPolicyApprover,
     isSubmitPolicy,
+    PAYER_ROLES,
     shouldFilterExpensifyTeam,
 } from '@libs/PolicyUtils';
 import {getDisplayNameForParticipant, isApproverOfOutstandingPolicyReports} from '@libs/ReportUtils';
@@ -85,7 +89,7 @@ import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetails, PolicyEmployee} from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import {isEmptyObject, isEmptyValueObject} from '@src/types/utils/EmptyObject';
 
 import type {ValueOf} from 'type-fest';
 
@@ -329,6 +333,24 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         [route.params.policyID],
     );
 
+    const changeMemberRole = (login: string, accountID: number, currentRole: string | undefined, newRole: ValueOf<typeof CONST.POLICY.ROLE>) => {
+        if (newRole === currentRole || !canMemberAssignRole(policy, currentUserLogin ?? '', newRole)) {
+            return;
+        }
+
+        // A reimburser must stay a valid payer, so reject any role that cannot pay.
+        if (getReimburserEmail(policy) === login && !canRolePay(newRole)) {
+            return;
+        }
+
+        if (newRole !== CONST.POLICY.ROLE.ADMIN && isRuleBotEnforcingRules(accountID, policy)) {
+            showRuleBotGuardModal('changeRole', policyID);
+            return;
+        }
+
+        updateMemberRoleInline(policy, login, accountID, currentRole, newRole);
+    };
+
     const policyOwner = policy?.owner;
     const canAssignElevatedRoles = canMemberWrite(policy, currentUserLogin ?? '', CONST.POLICY.POLICY_FEATURE.ASSIGN_ELEVATED_ROLES);
     const invitedPrimaryToSecondaryLogins = useMemo(() => invertObject(policy?.primaryLoginsInvited ?? {}), [policy?.primaryLoginsInvited]);
@@ -339,7 +361,10 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         const result: Array<{email: string; policyEmployee: PolicyEmployee; accountID: number; details: PersonalDetails}> = [];
 
         for (const [email, policyEmployee] of Object.entries(policy?.employeeList ?? {})) {
-            if (isDeletedPolicyEmployee(policyEmployee, isOffline)) {
+            // Inviting a secondary login leaves an empty employeeList entry: the backend nulls that key, then
+            // successData merges {pendingAction: null} back onto it. Skip it so it doesn't render as a second
+            // member. A real member whose personal details haven't loaded still has a role and stays visible.
+            if (isEmptyValueObject(policyEmployee) || isDeletedPolicyEmployee(policyEmployee, isOffline)) {
                 continue;
             }
 
@@ -379,15 +404,36 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
     // Submit workspaces have a flat role model where every member, including the owner, is an Editor.
     const isSubmitWorkspace = isSubmitPolicy(policy);
 
+    const isSelectionModeActive = selectedEmployees.length > 0 || isMobileSelectionModeEnabled;
+    // Role assignment is a Collect/Control capability. Submit locks every member to Editor.
+    const canAssignMemberRole = isGroupPolicy(policy) && !isSubmitWorkspace;
+
     const data: WorkspaceMemberRowData[] = useMemo(() => {
         const ownerDisplayRole = isSubmitWorkspace ? CONST.POLICY.ROLE.EDITOR : CONST.POLICY.ROLE.OWNER;
+        const assignablePayerRoles = PAYER_ROLES.filter((payerRole) => canMemberAssignRole(policy, currentUserLogin ?? '', payerRole));
+        const policyRoles = Object.values(CONST.POLICY.ROLE);
+
         return filteredMembers.map(({policyEmployee, accountID, details}) => {
             const isPendingDeleteOrError = canEditWorkspaceSettings && (policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors));
-            const role = policy?.owner === details.login ? ownerDisplayRole : policyEmployee.role;
+            const employeeRole = policyRoles.find((policyRole) => policyRole === policyEmployee.role);
+            const role = policy?.owner === details.login ? ownerDisplayRole : employeeRole;
 
             const login = details.login ?? '';
             const memberEmail = formatPhoneNumber(login);
             const memberName = temporaryGetDisplayNameOrDefault({passedPersonalDetails: details, translate, formatPhoneNumber});
+            const isOwner = policy?.owner === login;
+            const isCurrentUser = accountID === session?.accountID;
+            const isReimburser = isPolicyReimburser(policy, login);
+            const canReimburserChangeRole = assignablePayerRoles.some((payerRole) => payerRole !== policyEmployee.role);
+            const canEditRole =
+                canAssignMemberRole &&
+                !isSelectionModeActive &&
+                !isPendingDeleteOrError &&
+                !isOwner &&
+                !isCurrentUser &&
+                !details.isOptimisticPersonalDetail &&
+                canMemberAssignRole(policy, currentUserLogin ?? '', policyEmployee.role) &&
+                (!isReimburser || canReimburserChangeRole);
 
             return {
                 keyForList: login,
@@ -409,6 +455,8 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
                 errors: getLatestErrorMessageField(policyEmployee),
                 pendingAction: policyEmployee.pendingAction,
                 disabled: isPendingDeleteOrError,
+                canEditRole,
+                onChangeRole: (newRole) => changeMemberRole(login, accountID, policyEmployee.role, newRole),
                 // Note which secondary login was used to invite this primary login
                 invitedSecondaryLogin: details?.login ? (invitedPrimaryToSecondaryLogins[details.login] ?? '') : '',
                 action: () => openMemberDetails(accountID, login),
@@ -419,9 +467,11 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         filteredMembers,
         canEditWorkspaceSettings,
         canWriteMembers,
+        canAssignMemberRole,
         currentUserLogin,
         policy,
         isSubmitWorkspace,
+        isSelectionModeActive,
         formatPhoneNumber,
         translate,
         session?.accountID,
@@ -430,6 +480,7 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         invitedPrimaryToSecondaryLogins,
         openMemberDetails,
         dismissError,
+        changeMemberRole,
     ]);
 
     useEffect(() => {
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
index 43d1d892c8cf..8ac71ac5deb8 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx
@@ -14,6 +14,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import usePolicyConnectionsPrefetch from '@hooks/usePolicyConnectionsPrefetch';
 import usePolicyData from '@hooks/usePolicyData';
 import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
@@ -138,6 +139,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
 
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID.toString()}_${CONST.EXPENSIFY_CARD.BANK}`, {
@@ -173,7 +175,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
     //
     // Use the active vendor source so a stale GA connection cannot bypass the beta for another
     // integration. When no source is active, keep the connected integration's discovery row.
-    // QBO (R1), Sage Intacct (R2), Rillet, and DualEntry are GA. Xero and Business Central require the vendorMatching beta.
+    // QBO (R1), Sage Intacct (R2), Xero (R3), Rillet, and DualEntry are GA. Business Central requires the vendorMatching beta.
     // Certinia is deliberately not in the discovery list. It reaches the row only through
     // getActiveVendorMatchingIntegration's strict FFA gate, so PSA connections never see it.
     const vendorMatchingConnection =
@@ -189,6 +191,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
     const isGenerallyAvailableVendorConnection =
         vendorMatchingConnection === CONST.POLICY.CONNECTIONS.NAME.QBO ||
         vendorMatchingConnection === CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT ||
+        vendorMatchingConnection === CONST.POLICY.CONNECTIONS.NAME.XERO ||
         vendorMatchingConnection === CONST.POLICY.CONNECTIONS.NAME.RILLET ||
         vendorMatchingConnection === CONST.POLICY.CONNECTIONS.NAME.DUALENTRY;
     const shouldShowVendorsFeature = isGenerallyAvailableVendorConnection || (!!isVendorMatchingBetaEnabled && !!vendorMatchingConnection);
@@ -288,7 +291,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         if (action !== ModalActions.CONFIRM) {
             return;
         }
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
     };
 
     const promptDisableTravelViaInvoicing = async () => {
@@ -314,7 +317,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         if (action !== ModalActions.CONFIRM) {
             return;
         }
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
     };
 
     const promptDisableSmartLimitForWorkflows = async () => {
diff --git a/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx b/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx
index 27b60a1a6efe..006a13bb7c3a 100644
--- a/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx
+++ b/src/pages/workspace/WorkspaceOverviewCurrencyPage.tsx
@@ -8,6 +8,7 @@ import useOnyx from '@hooks/useOnyx';
 import useReviewWorkspaceSettingsTaskCompletion from '@hooks/useReviewWorkspaceSettingsTaskCompletion';
 import useShouldBlockCurrencyChange from '@hooks/useShouldBlockCurrencyChange';
 
+import {getExpensifyCardEnrollmentRoute, isCurrencySupportedForECards} from '@libs/CardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -42,7 +43,10 @@ function WorkspaceOverviewCurrencyPage({policy}: WorkspaceOverviewCurrencyPagePr
     const route = useRoute<PlatformStackRouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.CURRENCY>>();
     const {translate} = useLocalize();
     const isForcedToChangeCurrency = !!route.params?.isForcedToChangeCurrency;
+    const shouldStartExpensifyCardEnrollment = !!route.params?.shouldStartExpensifyCardEnrollment;
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [supportedCountriesByCurrency] = useOnyx(ONYXKEYS.CARD_SUPPORTED_COUNTRIES);
+    const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT);
     const shouldBlockCurrencyChange = useShouldBlockCurrencyChange(policy?.id);
     const getReviewWorkspaceSettingsTaskCompletion = useReviewWorkspaceSettingsTaskCompletion();
 
@@ -54,6 +58,23 @@ function WorkspaceOverviewCurrencyPage({policy}: WorkspaceOverviewCurrencyPagePr
         updateGeneralSettings(policy, policy?.name ?? '', item.currencyCode, getReviewWorkspaceSettingsTaskCompletion());
         clearCorpayBankAccountFields();
 
+        const isUkEuCurrencySupported = isCurrencySupportedForECards(item.currencyCode);
+        const canEnrollNewCardProgram = item.currencyCode === CONST.CURRENCY.USD || isUkEuCurrencySupported;
+        if (shouldStartExpensifyCardEnrollment && canEnrollNewCardProgram) {
+            Navigation.navigate(
+                getExpensifyCardEnrollmentRoute({
+                    policyID: policy.id,
+                    currencyCode: item.currencyCode,
+                    isUkEuCurrencySupported,
+                    bankAccountsList: bankAccountList,
+                    supportedCountriesByCurrency,
+                    achData: reimbursementAccount?.achData,
+                }),
+                {forceReplace: true},
+            );
+            return;
+        }
+
         if (isForcedToChangeCurrency) {
             if (isCurrencySupportedForGlobalReimbursement(item.currencyCode as CurrencyType)) {
                 const hasValidExistingAccounts = getEligibleExistingBusinessBankAccounts(bankAccountList, item.currencyCode, true).length > 0;
@@ -103,4 +124,6 @@ function WorkspaceOverviewCurrencyPage({policy}: WorkspaceOverviewCurrencyPagePr
     );
 }
 
+export {WorkspaceOverviewCurrencyPage};
+export type {WorkspaceOverviewCurrencyPageProps};
 export default withPolicyAndFullscreenLoading(WorkspaceOverviewCurrencyPage);
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 6ec96548d145..10233579782c 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -13,6 +13,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePreferredPolicy from '@hooks/usePreferredPolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -85,7 +86,7 @@ function WorkspacesListPage() {
                 .filter((id): id is number => id !== undefined),
         ),
     ];
-    const [ownerDisplayDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: createDisplayDetailsByAccountIDsSelector(ownerAccountIDs)});
+    const [ownerDisplayDetails] = useAllPersonalDetails(createDisplayDetailsByAccountIDsSelector(ownerAccountIDs));
 
     const navigateToWorkspace = (policyID: string, event?: ModifiedMouseEvent) => {
         const workspaceRoute = shouldUseNarrowLayout ? ROUTES.WORKSPACE_INITIAL.getRoute(policyID) : ROUTES.WORKSPACE_OVERVIEW.getRoute(policyID);
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 57dcfe3870d4..9cfa34148979 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -36,9 +36,11 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
+import {getQBORefreshTokenExpiryDate, getQBORefreshTokenExpiryStatus} from '@libs/AccountingUtils';
 import {isAuthenticationError, isConnectionInProgress, isConnectionUnverified, removePolicyConnection, syncConnection} from '@libs/actions/connections';
 import {shouldShowQBOReimbursableExportDestinationAccountError} from '@libs/actions/connections/QuickbooksOnline';
 import {isExpensifyCardFullySetUp} from '@libs/CardUtils';
+import DateUtils from '@libs/DateUtils';
 import {getOldDotURLFromEnvironment} from '@libs/Environment/Environment';
 import getPlatform from '@libs/getPlatform';
 import {
@@ -99,7 +101,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {translate, datetimeToRelative: getDatetimeToRelative, getLocalDateFromDatetime} = useLocalize();
+    const {translate, datetimeToRelative: getDatetimeToRelative, getLocalDateFromDatetime, dateFnsLocale} = useLocalize();
     const {environment} = useEnvironment();
     const oldDotEnvironmentURL = getOldDotURLFromEnvironment(environment);
     const {isOffline} = useNetwork();
@@ -174,7 +176,12 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
 
     const isSageIntacct = connectedIntegration === CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT;
     const hasAuthError = !!connectedIntegration && !!synchronizationError && isAuthenticationError(policy, connectedIntegration);
-    const shouldShowEnterCredentials = !!connectedIntegration && (hasAuthError || isSageIntacct);
+    // A QBO refresh token that is about to expire (or already has, without a sync failing yet) is warned about while the connection still looks healthy
+    const qboTokenExpiryStatus =
+        connectedIntegration === CONST.POLICY.CONNECTIONS.NAME.QBO && !synchronizationError && !isSyncInProgress ? getQBORefreshTokenExpiryStatus(policy) : undefined;
+    const isQBOTokenExpiringSoon = !!qboTokenExpiryStatus;
+    const qboTokenExpiryDate = isQBOTokenExpiringSoon ? getQBORefreshTokenExpiryDate(policy) : undefined;
+    const shouldShowEnterCredentials = !!connectedIntegration && (hasAuthError || isSageIntacct || isQBOTokenExpiringSoon);
 
     // Get the last successful date of the integration. Then, if `connectionSyncProgress` is the same integration displayed and the state is 'jobDone', get the more recent update time of the two.
     const successfulDate = getIntegrationLastSuccessfulDate(
@@ -193,7 +200,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
     const shouldShowCardReconciliationOption = Object.values(allCardSettings ?? {})?.some((cardSetting) => isExpensifyCardFullySetUp(policy, cardSetting));
     const shouldShowReconnect = hasAuthError && connectedIntegration === CONST.POLICY.CONNECTIONS.NAME.CERTINIA;
     let credentialsMenuTextKey: Parameters<typeof translate>[0] = 'workspace.accounting.enterCredentials';
-    if (shouldShowReconnect) {
+    if (shouldShowReconnect || isQBOTokenExpiringSoon) {
         credentialsMenuTextKey = 'workspace.accounting.reconnect';
     } else if (isSageIntacct && !hasAuthError) {
         credentialsMenuTextKey = 'workspace.accounting.updateCredentials';
@@ -223,7 +230,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                                   Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.getRoute(policyID));
                                   return;
                               }
-                              startIntegrationFlow({name: connectedIntegration});
+                              startIntegrationFlow({name: connectedIntegration, isIntuitEnterpriseSuite: isConnectedToIntuitEnterpriseSuite});
                           },
                           shouldCallAfterModalHide: true,
                           disabled: isOffline,
@@ -274,6 +281,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
             policy,
             connectedIntegration,
             connectedIntegrationDisplayName,
+            isConnectedToIntuitEnterpriseSuite,
             startIntegrationFlow,
             isSageIntacct,
             hasAuthError,
@@ -735,6 +743,24 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
             );
         }
 
+        let qboTokenExpiryHint;
+        if (qboTokenExpiryDate && canWriteAccounting) {
+            const formattedExpiryDate = DateUtils.formatWithUTCTimeZone(qboTokenExpiryDate.toISOString(), CONST.DATE.MONTH_DAY_YEAR_FORMAT, dateFnsLocale);
+            qboTokenExpiryHint = (
+                <>
+                    {translate(
+                        qboTokenExpiryStatus === CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_STATUS.EXPIRED
+                            ? 'workspace.accounting.qboConnectionExpired'
+                            : 'workspace.accounting.qboConnectionExpiring',
+                        {date: formattedExpiryDate},
+                    )}{' '}
+                    <TextLink onPress={() => startIntegrationFlow({name: CONST.POLICY.CONNECTIONS.NAME.QBO, isIntuitEnterpriseSuite: isConnectedToIntuitEnterpriseSuite})}>
+                        {translate('workspace.accounting.reconnect')}
+                    </TextLink>
+                </>
+            );
+        }
+
         return [
             {
                 ...iconProps,
@@ -746,6 +772,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                 errorTextStyle: [styles.mt5],
                 shouldShowRedDotIndicator: true,
                 description: connectionMessage,
+                hintText: qboTokenExpiryHint,
                 rightComponent,
             },
             ...(isEmptyObject(integrationSpecificMenuItems) || shouldShowSynchronizationError || !hasAccountingConnection ? [] : [integrationSpecificMenuItems]),
@@ -787,6 +814,9 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
         startIntegrationFlow,
         popoverAnchorRefs,
         datetimeToRelative,
+        qboTokenExpiryDate,
+        qboTokenExpiryStatus,
+        dateFnsLocale,
         hasReusablePoliciesConnectedToSageIntacct,
         hasReusablePoliciesConnectedToCertinia,
         hasReusablePoliciesConnectedToRillet,
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralCompanyCardAccountSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralCompanyCardAccountSelectPage.tsx
new file mode 100644
index 000000000000..eeb2a6271ee8
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralCompanyCardAccountSelectPage.tsx
@@ -0,0 +1,97 @@
+import BlockingView from '@components/BlockingViews/BlockingView';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useSelectionListSearch from '@hooks/useSelectionListSearch';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralNonReimbursableAccount} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type AccountListItem = ListItem & {
+    value: string;
+};
+
+function BusinessCentralCompanyCardAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useMemoizedLazyIllustrations(['Telescope']);
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const nonReimbursableAccount = businessCentralConfig?.export?.nonReimbursableAccount;
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    const data: AccountListItem[] =
+        policy?.connections?.businessCentral?.data?.bankAccounts?.map((bankAccount) => ({
+            value: bankAccount.id,
+            text: `${bankAccount.number} ${bankAccount.name}`,
+            keyForList: bankAccount.id,
+            isSelected: nonReimbursableAccount === bankAccount.id,
+        })) ?? [];
+    const {filteredData, textInputOptions} = useSelectionListSearch(data);
+
+    const headerContent = (
+        <View>
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.businessCentral.companyCardAccount.description')}</Text>
+        </View>
+    );
+
+    const listEmptyContent = (
+        <BlockingView
+            icon={illustrations.Telescope}
+            iconWidth={variables.emptyListIconWidth}
+            iconHeight={variables.emptyListIconHeight}
+            title={translate('workspace.businessCentral.noBankAccountsFound')}
+            subtitle={translate('workspace.businessCentral.noBankAccountsFoundDescription')}
+            containerStyle={styles.pb10}
+        />
+    );
+
+    const selectAccount = (item: AccountListItem) => {
+        if (item.value !== nonReimbursableAccount && policyID) {
+            updateBusinessCentralNonReimbursableAccount(policyID, item.value, nonReimbursableAccount);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralCompanyCardAccountSelectPage"
+            title="workspace.businessCentral.companyCardAccount.label"
+            data={filteredData}
+            textInputOptions={textInputOptions}
+            headerContent={headerContent}
+            listEmptyContent={listEmptyContent}
+            onSelectRow={selectAccount}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={nonReimbursableAccount}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE_ACCOUNT], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralCompanyCardAccountSelectPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralDefaultVendorSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralDefaultVendorSelectPage.tsx
new file mode 100644
index 000000000000..338fc50ba5e6
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralDefaultVendorSelectPage.tsx
@@ -0,0 +1,98 @@
+import BlockingView from '@components/BlockingViews/BlockingView';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useSelectionListSearch from '@hooks/useSelectionListSearch';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralDefaultVendor} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction, sortVendors} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type VendorListItem = ListItem & {
+    value: string;
+};
+
+function BusinessCentralDefaultVendorSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate, localeCompare} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useMemoizedLazyIllustrations(['Telescope']);
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const defaultVendorID = businessCentralConfig?.export?.defaultVendorID;
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    // Business Central rejects documents with a vendor blocked for all transactions, so it can't be the fallback vendor
+    const vendors = (policy?.connections?.businessCentral?.data?.vendors ?? []).filter((vendor) => vendor.blocked !== CONST.BUSINESS_CENTRAL_VENDOR_BLOCKED.ALL);
+    const data: VendorListItem[] = sortVendors(vendors, localeCompare).map((vendor) => ({
+        value: vendor.id,
+        text: vendor.name,
+        keyForList: vendor.id,
+        isSelected: defaultVendorID === vendor.id,
+    }));
+    const {filteredData, textInputOptions} = useSelectionListSearch(data);
+
+    const headerContent = (
+        <View>
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.businessCentral.defaultCompanyCardVendor.description')}</Text>
+        </View>
+    );
+
+    const listEmptyContent = (
+        <BlockingView
+            icon={illustrations.Telescope}
+            iconWidth={variables.emptyListIconWidth}
+            iconHeight={variables.emptyListIconHeight}
+            title={translate('workspace.businessCentral.noVendorsFound')}
+            subtitle={translate('workspace.businessCentral.noVendorsFoundDescription')}
+            containerStyle={styles.pb10}
+        />
+    );
+
+    const selectVendor = (item: VendorListItem) => {
+        if (item.value !== defaultVendorID && policyID) {
+            updateBusinessCentralDefaultVendor(policyID, item.value, defaultVendorID);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralDefaultVendorSelectPage"
+            title="workspace.businessCentral.defaultCompanyCardVendor.label"
+            data={filteredData}
+            textInputOptions={{...textInputOptions, label: textInputOptions.label ? translate('workspace.vendors.findVendor') : undefined}}
+            headerContent={headerContent}
+            listEmptyContent={listEmptyContent}
+            onSelectRow={selectVendor}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={defaultVendorID}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralDefaultVendorSelectPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralExportDateSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralExportDateSelectPage.tsx
new file mode 100644
index 000000000000..8518873f24b4
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralExportDateSelectPage.tsx
@@ -0,0 +1,78 @@
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralExportDate} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type ExportDateListItem = ListItem & {
+    value: BusinessCentralExport['exportDate'];
+};
+
+function BusinessCentralExportDateSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const exportDate = businessCentralConfig?.export?.exportDate ?? CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE;
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    const data: ExportDateListItem[] = Object.values(CONST.BUSINESS_CENTRAL_EXPORT_DATE).map((exportDateItem) => ({
+        value: exportDateItem,
+        text: translate(`workspace.businessCentral.exportDate.values.${exportDateItem}.label`),
+        alternateText: translate(`workspace.businessCentral.exportDate.values.${exportDateItem}.description`),
+        keyForList: exportDateItem,
+        isSelected: exportDate === exportDateItem,
+    }));
+
+    const headerContent = (
+        <View>
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.businessCentral.exportDate.description')}</Text>
+        </View>
+    );
+
+    const selectExportDate = (item: ExportDateListItem) => {
+        if (item.value !== exportDate && policyID) {
+            updateBusinessCentralExportDate(policyID, item.value, businessCentralConfig?.export?.exportDate);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralExportDateSelectPage"
+            title="workspace.businessCentral.exportDate.label"
+            data={data}
+            headerContent={headerContent}
+            onSelectRow={selectExportDate}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={exportDate}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.EXPORT_DATE], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.EXPORT_DATE)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.EXPORT_DATE)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralExportDateSelectPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralExportPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralExportPage.tsx
new file mode 100644
index 000000000000..9265ce487c2c
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralExportPage.tsx
@@ -0,0 +1,157 @@
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import Navigation from '@libs/Navigation/Navigation';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
+
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+
+import CONST from '@src/CONST';
+import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type ExportRow = {
+    settingName: keyof BusinessCentralExport;
+    label: string;
+    value: string | undefined;
+    route: Route;
+    shouldHide?: boolean;
+};
+
+function BusinessCentralExportPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const businessCentralData = policy?.connections?.businessCentral?.data;
+    const exportConfig = businessCentralConfig?.export;
+
+    // We use the logical OR (||) here instead of ?? because `exporter` could be an empty string on a fresh connection
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const exporter = exportConfig?.exporter || policy?.owner;
+    const exportDate = exportConfig?.exportDate ?? CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE;
+    const reimbursable = exportConfig?.reimbursable ?? CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY;
+    const nonReimbursable = exportConfig?.nonReimbursable ?? CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE;
+    const reimbursableAccount = businessCentralData?.bankAccounts?.find((bankAccount) => bankAccount.id === exportConfig?.reimbursableAccount);
+    const nonReimbursableAccount = businessCentralData?.bankAccounts?.find((bankAccount) => bankAccount.id === exportConfig?.nonReimbursableAccount);
+    const defaultVendor = businessCentralData?.vendors?.find((vendor) => vendor.id === exportConfig?.defaultVendorID);
+    const paymentMethod = businessCentralData?.paymentMethods?.find((method) => method.code === exportConfig?.paymentMethodCode);
+    const isReimbursableJournalEntry = reimbursable === CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY;
+    const isNonReimbursableJournalEntry = nonReimbursable === CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY;
+
+    if (!policyID) {
+        return null;
+    }
+
+    const sections: ExportRow[][] = [
+        [
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.EXPORTER,
+                label: translate('workspace.accounting.preferredExporter'),
+                value: exporter,
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_PREFERRED_EXPORTER.getRoute(policyID),
+            },
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.EXPORT_DATE,
+                label: translate('workspace.businessCentral.exportDate.label'),
+                value: translate(`workspace.businessCentral.exportDate.values.${exportDate}.label`),
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_DATE.getRoute(policyID),
+            },
+        ],
+        [
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE,
+                label: translate('workspace.businessCentral.exportReimbursable'),
+                value: translate(`workspace.businessCentral.exportDestination.${reimbursable}`),
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION.getRoute(policyID),
+            },
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT,
+                label: translate('workspace.businessCentral.reimbursableAccount.label'),
+                value: reimbursableAccount ? `${reimbursableAccount.number} ${reimbursableAccount.name}` : undefined,
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_REIMBURSABLE_ACCOUNT.getRoute(policyID),
+                shouldHide: !isReimbursableJournalEntry,
+            },
+        ],
+        [
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE,
+                label: translate('workspace.businessCentral.exportNonReimbursable'),
+                value: translate(`workspace.businessCentral.exportDestination.${nonReimbursable}`),
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION.getRoute(policyID),
+            },
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID,
+                label: translate('workspace.businessCentral.defaultCompanyCardVendor.label'),
+                value: defaultVendor?.name,
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_DEFAULT_VENDOR.getRoute(policyID),
+            },
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE_ACCOUNT,
+                label: translate('workspace.businessCentral.companyCardAccount.label'),
+                value: nonReimbursableAccount ? `${nonReimbursableAccount.number} ${nonReimbursableAccount.name}` : undefined,
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_COMPANY_CARD_ACCOUNT.getRoute(policyID),
+                shouldHide: !isNonReimbursableJournalEntry,
+            },
+            {
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.PAYMENT_METHOD_CODE,
+                label: translate('workspace.businessCentral.paymentMethod.label'),
+                value: paymentMethod?.displayName,
+                route: ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT_PAYMENT_METHOD.getRoute(policyID),
+                shouldHide: isReimbursableJournalEntry && isNonReimbursableJournalEntry,
+            },
+        ],
+    ];
+
+    return (
+        <ConnectionLayout
+            displayName="BusinessCentralExportPage"
+            headerTitle="workspace.accounting.export"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            shouldBeBlocked
+        >
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.businessCentral.exportDescription')}</Text>
+            {sections.map((rows, sectionIndex) => (
+                <View key={rows.at(0)?.settingName}>
+                    {sectionIndex > 0 && <View style={[styles.mv3, styles.mh5, styles.borderTop]} />}
+                    {rows
+                        .filter((row) => !row.shouldHide)
+                        .map((row) => (
+                            <OfflineWithFeedback
+                                key={row.settingName}
+                                pendingAction={settingsPendingAction([row.settingName], businessCentralConfig?.pendingFields)}
+                            >
+                                <MenuItemField
+                                    name={row.label}
+                                    value={row.value}
+                                    onPress={() => Navigation.navigate(row.route)}
+                                >
+                                    {areSettingsInErrorFields([row.settingName], businessCentralConfig?.errorFields) && (
+                                        <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                                    )}
+                                </MenuItemField>
+                            </OfflineWithFeedback>
+                        ))}
+                </View>
+            ))}
+        </ConnectionLayout>
+    );
+}
+
+export default withPolicyConnections(BusinessCentralExportPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralNonReimbursableExpensesExportDestinationSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralNonReimbursableExpensesExportDestinationSelectPage.tsx
new file mode 100644
index 000000000000..28c8c4b7cff0
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralNonReimbursableExpensesExportDestinationSelectPage.tsx
@@ -0,0 +1,68 @@
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralNonReimbursableExpensesExportDestination} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+import React from 'react';
+
+type DestinationListItem = ListItem & {
+    value: BusinessCentralExport['nonReimbursable'];
+};
+
+function BusinessCentralNonReimbursableExpensesExportDestinationSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const nonReimbursable = businessCentralConfig?.export?.nonReimbursable ?? CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE;
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    const data: DestinationListItem[] = Object.values(CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION).map((destination) => ({
+        value: destination,
+        text: translate(`workspace.businessCentral.exportDestination.${destination}`),
+        keyForList: destination,
+        isSelected: nonReimbursable === destination,
+    }));
+
+    const selectDestination = (item: DestinationListItem) => {
+        if (item.value !== nonReimbursable && policyID) {
+            updateBusinessCentralNonReimbursableExpensesExportDestination(policyID, item.value, businessCentralConfig?.export?.nonReimbursable);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralNonReimbursableExpensesExportDestinationSelectPage"
+            title="workspace.businessCentral.exportNonReimbursable"
+            data={data}
+            onSelectRow={selectDestination}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={nonReimbursable}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralNonReimbursableExpensesExportDestinationSelectPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralPaymentMethodSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralPaymentMethodSelectPage.tsx
new file mode 100644
index 000000000000..2c5264566764
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralPaymentMethodSelectPage.tsx
@@ -0,0 +1,106 @@
+import BlockingView from '@components/BlockingViews/BlockingView';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useSelectionListSearch from '@hooks/useSelectionListSearch';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralPaymentMethod} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type PaymentMethodListItem = ListItem & {
+    value: string;
+};
+
+function BusinessCentralPaymentMethodSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useMemoizedLazyIllustrations(['Telescope']);
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const paymentMethodCode = businessCentralConfig?.export?.paymentMethodCode;
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    const paymentMethodOptions: PaymentMethodListItem[] =
+        policy?.connections?.businessCentral?.data?.paymentMethods?.map((paymentMethod) => ({
+            value: paymentMethod.code,
+            text: paymentMethod.displayName,
+            keyForList: paymentMethod.code,
+            isSelected: paymentMethodCode === paymentMethod.code,
+        })) ?? [];
+    const {filteredData, textInputOptions} = useSelectionListSearch(paymentMethodOptions);
+
+    // The payment method is optional, and an empty code clears it
+    const noneOption: PaymentMethodListItem = {
+        value: '',
+        text: translate('common.none'),
+        keyForList: '',
+        isSelected: !paymentMethodCode,
+    };
+    const data = paymentMethodOptions.length > 0 ? [noneOption, ...filteredData] : [];
+
+    const headerContent = (
+        <View>
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.businessCentral.paymentMethod.description')}</Text>
+        </View>
+    );
+
+    const listEmptyContent = (
+        <BlockingView
+            icon={illustrations.Telescope}
+            iconWidth={variables.emptyListIconWidth}
+            iconHeight={variables.emptyListIconHeight}
+            title={translate('workspace.businessCentral.noPaymentMethodsFound')}
+            subtitle={translate('workspace.businessCentral.noPaymentMethodsFoundDescription')}
+            containerStyle={styles.pb10}
+        />
+    );
+
+    const selectPaymentMethod = (item: PaymentMethodListItem) => {
+        if (item.value !== (paymentMethodCode ?? '') && policyID) {
+            updateBusinessCentralPaymentMethod(policyID, item.value, paymentMethodCode);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralPaymentMethodSelectPage"
+            title="workspace.businessCentral.paymentMethod.label"
+            data={data}
+            textInputOptions={textInputOptions}
+            headerContent={headerContent}
+            listEmptyContent={listEmptyContent}
+            onSelectRow={selectPaymentMethod}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={paymentMethodCode ?? ''}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.PAYMENT_METHOD_CODE], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.PAYMENT_METHOD_CODE)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.PAYMENT_METHOD_CODE)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralPaymentMethodSelectPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralPreferredExporterSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralPreferredExporterSelectPage.tsx
new file mode 100644
index 000000000000..21e5b4e56c89
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralPreferredExporterSelectPage.tsx
@@ -0,0 +1,108 @@
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralExporter} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getAdminEmployees, isExpensifyTeam, settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import isEmpty from 'lodash/isEmpty';
+import React from 'react';
+import {View} from 'react-native';
+
+type ExporterListItem = ListItem & {
+    value: string;
+};
+
+function BusinessCentralPreferredExporterSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+    const policyID = policy?.id;
+    const policyOwner = policy?.owner;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const savedExporter = businessCentralConfig?.export?.exporter;
+
+    // We use the logical OR (||) here instead of ?? because `exporter` could be an empty string on a fresh connection
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const exporter = savedExporter || policyOwner;
+    const exporters = getAdminEmployees(policy);
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    const data: ExporterListItem[] =
+        policyOwner && isEmpty(exporters)
+            ? [
+                  {
+                      value: policyOwner,
+                      text: policyOwner,
+                      keyForList: policyOwner,
+                      isSelected: exporter === policyOwner,
+                  },
+              ]
+            : (exporters?.reduce<ExporterListItem[]>((options, exporterItem) => {
+                  if (!exporterItem.email) {
+                      return options;
+                  }
+
+                  // Don't show guides if the current user is not a guide themselves or an Expensify employee
+                  if (isExpensifyTeam(exporterItem.email) && !isExpensifyTeam(policyOwner) && !isExpensifyTeam(currentUserLogin)) {
+                      return options;
+                  }
+
+                  options.push({
+                      value: exporterItem.email,
+                      text: exporterItem.email,
+                      keyForList: exporterItem.email,
+                      isSelected: exporter === exporterItem.email,
+                  });
+                  return options;
+              }, []) ?? []);
+
+    const headerContent = (
+        <View style={[styles.pb2, styles.ph5]}>
+            <Text style={[styles.pb2, styles.textNormal]}>{translate('workspace.accounting.exportPreferredExporterNote')}</Text>
+            <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.accounting.exportPreferredExporterSubNote')}</Text>
+        </View>
+    );
+
+    const selectExporter = (item: ExporterListItem) => {
+        if (item.value !== exporter && policyID) {
+            updateBusinessCentralExporter(policyID, item.value, savedExporter);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralPreferredExporterSelectPage"
+            title="workspace.accounting.preferredExporter"
+            data={data}
+            headerContent={headerContent}
+            onSelectRow={selectExporter}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={exporter}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.EXPORTER], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.EXPORTER)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.EXPORTER)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralPreferredExporterSelectPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableAccountSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableAccountSelectPage.tsx
new file mode 100644
index 000000000000..b5def4f6d641
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableAccountSelectPage.tsx
@@ -0,0 +1,97 @@
+import BlockingView from '@components/BlockingViews/BlockingView';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useSelectionListSearch from '@hooks/useSelectionListSearch';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralReimbursableAccount} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type AccountListItem = ListItem & {
+    value: string;
+};
+
+function BusinessCentralReimbursableAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useMemoizedLazyIllustrations(['Telescope']);
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const reimbursableAccount = businessCentralConfig?.export?.reimbursableAccount;
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    const data: AccountListItem[] =
+        policy?.connections?.businessCentral?.data?.bankAccounts?.map((bankAccount) => ({
+            value: bankAccount.id,
+            text: `${bankAccount.number} ${bankAccount.name}`,
+            keyForList: bankAccount.id,
+            isSelected: reimbursableAccount === bankAccount.id,
+        })) ?? [];
+    const {filteredData, textInputOptions} = useSelectionListSearch(data);
+
+    const headerContent = (
+        <View>
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.businessCentral.reimbursableAccount.description')}</Text>
+        </View>
+    );
+
+    const listEmptyContent = (
+        <BlockingView
+            icon={illustrations.Telescope}
+            iconWidth={variables.emptyListIconWidth}
+            iconHeight={variables.emptyListIconHeight}
+            title={translate('workspace.businessCentral.noBankAccountsFound')}
+            subtitle={translate('workspace.businessCentral.noBankAccountsFoundDescription')}
+            containerStyle={styles.pb10}
+        />
+    );
+
+    const selectAccount = (item: AccountListItem) => {
+        if (item.value !== reimbursableAccount && policyID) {
+            updateBusinessCentralReimbursableAccount(policyID, item.value, reimbursableAccount);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralReimbursableAccountSelectPage"
+            title="workspace.businessCentral.reimbursableAccount.label"
+            data={filteredData}
+            textInputOptions={textInputOptions}
+            headerContent={headerContent}
+            listEmptyContent={listEmptyContent}
+            onSelectRow={selectAccount}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={reimbursableAccount}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralReimbursableAccountSelectPage);
diff --git a/src/pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableExpensesExportDestinationSelectPage.tsx b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableExpensesExportDestinationSelectPage.tsx
new file mode 100644
index 000000000000..bc8dce748272
--- /dev/null
+++ b/src/pages/workspace/accounting/businessCentral/export/BusinessCentralReimbursableExpensesExportDestinationSelectPage.tsx
@@ -0,0 +1,68 @@
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearBusinessCentralErrorField, updateBusinessCentralReimbursableExpensesExportDestination} from '@libs/actions/connections/BusinessCentral';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {BusinessCentralExport} from '@src/types/onyx/Policy';
+
+import React from 'react';
+
+type DestinationListItem = ListItem & {
+    value: BusinessCentralExport['reimbursable'];
+};
+
+function BusinessCentralReimbursableExpensesExportDestinationSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id;
+    const businessCentralConfig = policy?.connections?.businessCentral?.config;
+    const reimbursable = businessCentralConfig?.export?.reimbursable ?? CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY;
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID) : undefined;
+
+    const data: DestinationListItem[] = Object.values(CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION).map((destination) => ({
+        value: destination,
+        text: translate(`workspace.businessCentral.exportDestination.${destination}`),
+        keyForList: destination,
+        isSelected: reimbursable === destination,
+    }));
+
+    const selectDestination = (item: DestinationListItem) => {
+        if (item.value !== reimbursable && policyID) {
+            updateBusinessCentralReimbursableExpensesExportDestination(policyID, item.value, businessCentralConfig?.export?.reimbursable);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="BusinessCentralReimbursableExpensesExportDestinationSelectPage"
+            title="workspace.businessCentral.exportReimbursable"
+            data={data}
+            onSelectRow={selectDestination}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={reimbursable}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL}
+            pendingAction={settingsPendingAction([CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE], businessCentralConfig?.pendingFields)}
+            errors={getLatestErrorField(businessCentralConfig, CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearBusinessCentralErrorField(policyID, CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE)}
+        />
+    );
+}
+
+export default withPolicyConnections(BusinessCentralReimbursableExpensesExportDestinationSelectPage);
diff --git a/src/pages/workspace/accounting/campfire/export/CampfireCardAccountCardListPage.tsx b/src/pages/workspace/accounting/campfire/export/CampfireCardAccountCardListPage.tsx
new file mode 100644
index 000000000000..30e57bcb7c74
--- /dev/null
+++ b/src/pages/workspace/accounting/campfire/export/CampfireCardAccountCardListPage.tsx
@@ -0,0 +1,115 @@
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+
+import useCardFeeds from '@hooks/useCardFeeds';
+import useCardsList from '@hooks/useCardsList';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {areCardsCustomExportInErrorFields, findMatchingCards, getCardsCustomExportPendingAction} from '@libs/CardFeedUtils';
+import {getCardDescription, getCustomOrFormattedFeedName, isCard} from '@libs/CardUtils';
+import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+
+import CONST from '@src/CONST';
+import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type CampfireCardAccountCardListPageProps = WithPolicyConnectionsProps &
+    PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT_CARD_LIST>;
+
+function CampfireCardAccountCardListPage({
+    policy,
+    route: {
+        params: {feed: feedWithDomainID},
+    },
+}: CampfireCardAccountCardListPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id;
+    const [cardList] = useCardsList(feedWithDomainID);
+    const [cardFeeds] = useCardFeeds(policyID);
+    const cardFeed = cardFeeds?.[feedWithDomainID];
+    const feedKey = cardFeed?.feed;
+    const campfireConfig = policy?.connections?.campfire?.config;
+    const campfireData = policy?.connections?.campfire?.data;
+    const creditCardAccountID = campfireConfig?.export?.creditCardAccountID;
+    const cardProgramsUsingCustomAccounts = campfireConfig?.export?.cardProgramAccounts;
+    const cardProgramAccountID = (feedKey ? cardProgramsUsingCustomAccounts?.[feedKey] : undefined) ?? creditCardAccountID;
+    const cardProgramAccount = campfireData?.accounts?.find((account) => account.id === cardProgramAccountID);
+    const hasActiveCards = feedKey && findMatchingCards(cardFeeds ?? {}, {[feedWithDomainID]: cardList}, feedKey).length > 0;
+    const title = getCustomOrFormattedFeedName(translate, feedKey, cardFeed?.customFeedName, false);
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_ACCOUNT.getRoute(policyID) : undefined;
+
+    return (
+        <ConnectionLayout
+            displayName="CampfireCardAccountCardListPage"
+            headerTitleAlreadyTranslated={title}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.CAMPFIRE}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            shouldBeBlocked
+            shouldBeForceBlocked={!hasActiveCards}
+        >
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.campfire.cardAccount.descriptionLevel2')}</Text>
+            </View>
+            {Object.values(cardList ?? {})
+                .filter(isCard)
+                .map((card) => {
+                    const cardID = card.cardID;
+                    const isUsingCustomAccount = typeof card.nameValuePairs === 'object' && CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT in card.nameValuePairs;
+                    const cardAccountID =
+                        (typeof card.nameValuePairs === 'object' ? card.nameValuePairs[CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT] : undefined) ??
+                        cardProgramAccount?.id;
+                    const cardAccount = campfireData?.accounts?.find((account) => account.id === cardAccountID);
+                    const cardAccountDisplayName = cardAccount
+                        ? `${cardAccount.id} ${cardAccount.name}${isUsingCustomAccount ? '' : ` (${translate('common.default').toLocaleLowerCase()})`}`
+                        : '';
+                    return (
+                        <OfflineWithFeedback
+                            key={cardID}
+                            pendingAction={getCardsCustomExportPendingAction(
+                                cardFeeds ?? {},
+                                {[feedWithDomainID]: cardList},
+                                CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT,
+                                feedKey,
+                                cardID,
+                            )}
+                        >
+                            <MenuItemField
+                                name={getCardDescription(card, translate)}
+                                onPress={() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_COMPANY_CARD_EXPORT.getRoute(feedWithDomainID, String(cardID))))}
+                                value={cardAccountDisplayName}
+                            >
+                                {areCardsCustomExportInErrorFields(
+                                    cardFeeds ?? {},
+                                    {[feedWithDomainID]: cardList},
+                                    CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT,
+                                    feedKey,
+                                    cardID,
+                                ) && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                            </MenuItemField>
+                        </OfflineWithFeedback>
+                    );
+                })}
+        </ConnectionLayout>
+    );
+}
+
+export default withPolicyConnections(CampfireCardAccountCardListPage);
diff --git a/src/pages/workspace/accounting/campfire/export/CampfireCardAccountPage.tsx b/src/pages/workspace/accounting/campfire/export/CampfireCardAccountPage.tsx
new file mode 100644
index 000000000000..6ec1ca037cc0
--- /dev/null
+++ b/src/pages/workspace/accounting/campfire/export/CampfireCardAccountPage.tsx
@@ -0,0 +1,99 @@
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+
+import useCardFeeds from '@hooks/useCardFeeds';
+import useCardsLists from '@hooks/useCardsLists';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {areCardsCustomExportInErrorFields, findMatchingCards, getCardsCustomExportPendingAction, getCardsUsingCustomExportCount} from '@libs/CardFeedUtils';
+import {getCardFeedWithDomainID, getCustomOrFormattedFeedName} from '@libs/CardUtils';
+import Navigation from '@libs/Navigation/Navigation';
+
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import React from 'react';
+import {View} from 'react-native';
+
+function CampfireCardAccountPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id;
+    const [cardFeeds] = useCardFeeds(policyID);
+    const [cardLists] = useCardsLists();
+    const campfireConfig = policy?.connections?.campfire?.config;
+    const campfireData = policy?.connections?.campfire?.data;
+    const creditCardAccountID = campfireConfig?.export?.creditCardAccountID;
+    const cardProgramsUsingCustomAccounts = campfireConfig?.export?.cardProgramAccounts;
+    const cardsUsingCustomAccountsCount = getCardsUsingCustomExportCount(cardFeeds ?? {}, cardLists, CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT);
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_CAMPFIRE_EXPORT.getRoute(policyID) : undefined;
+
+    return (
+        <ConnectionLayout
+            displayName="CampfireCardAccountPage"
+            headerTitle="workspace.campfire.cardAccount.label"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.CAMPFIRE}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            shouldBeBlocked
+        >
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.campfire.cardAccount.description')}</Text>
+            </View>
+            {Object.values(cardFeeds ?? {})
+                .filter((cardFeed) => findMatchingCards(cardFeeds ?? {}, cardLists, cardFeed.feed).length > 0)
+                .map((cardFeed) => {
+                    const feedKey = cardFeed.feed;
+                    const feedName = getCustomOrFormattedFeedName(translate, feedKey, cardFeed.customFeedName, false);
+                    const feedDomainID = cardFeed.domainID ?? CONST.DEFAULT_MISSING_ID;
+                    const feedWithDomainID = getCardFeedWithDomainID(feedKey, feedDomainID);
+                    const cardProgramAccountID = cardProgramsUsingCustomAccounts?.[feedKey] ?? creditCardAccountID;
+                    const isUsingDefaultAccount = cardProgramAccountID === creditCardAccountID;
+                    const cardProgramAccount = campfireData?.accounts?.find((account) => account.id === cardProgramAccountID);
+                    const cardProgramAccountDisplayName = cardProgramAccount
+                        ? `${cardProgramAccount.id} ${cardProgramAccount.name}${isUsingDefaultAccount ? ` (${translate('common.default').toLocaleLowerCase()})` : ''}`
+                        : '';
+                    return (
+                        <OfflineWithFeedback
+                            key={feedKey}
+                            pendingAction={getCardsCustomExportPendingAction(cardFeeds ?? {}, cardLists ?? {}, CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT, feedKey)}
+                        >
+                            <MenuItem.Root
+                                onPress={callFunctionIfActionIsAllowed(() =>
+                                    policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_ACCOUNT_CARD_LIST.getRoute(policyID, feedWithDomainID)) : undefined,
+                                )}
+                            >
+                                <MenuItemField.Row
+                                    name={feedName ?? ''}
+                                    value={cardProgramAccountDisplayName}
+                                >
+                                    {areCardsCustomExportInErrorFields(cardFeeds ?? {}, cardLists ?? {}, CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT, feedKey) && (
+                                        <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                                    )}
+                                    <MenuItem.Chevron />
+                                </MenuItemField.Row>
+                                {!!cardsUsingCustomAccountsCount.perFeedCount[feedKey] && (
+                                    <MenuItem.HelpText message={translate('workspace.campfire.cardAccount.countInfo', cardsUsingCustomAccountsCount.perFeedCount[feedKey])} />
+                                )}
+                            </MenuItem.Root>
+                        </OfflineWithFeedback>
+                    );
+                })}
+        </ConnectionLayout>
+    );
+}
+
+export default withPolicyConnections(CampfireCardAccountPage);
diff --git a/src/pages/workspace/accounting/campfire/export/CampfireCardProgramAccountPage.tsx b/src/pages/workspace/accounting/campfire/export/CampfireCardProgramAccountPage.tsx
new file mode 100644
index 000000000000..42ab275935fb
--- /dev/null
+++ b/src/pages/workspace/accounting/campfire/export/CampfireCardProgramAccountPage.tsx
@@ -0,0 +1,100 @@
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+
+import useCardFeeds from '@hooks/useCardFeeds';
+import useCardsLists from '@hooks/useCardsLists';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {findMatchingCards, getCardsUsingCustomExportCount} from '@libs/CardFeedUtils';
+import {getCardFeedWithDomainID, getCustomOrFormattedFeedName} from '@libs/CardUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
+
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import React from 'react';
+import {View} from 'react-native';
+
+function CampfireCardProgramAccountPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id;
+    const [cardFeeds] = useCardFeeds(policyID);
+    const [cardLists] = useCardsLists();
+    const campfireConfig = policy?.connections?.campfire?.config;
+    const campfireData = policy?.connections?.campfire?.data;
+    const creditCardAccountID = campfireConfig?.export?.creditCardAccountID;
+    const cardProgramsUsingCustomAccounts = campfireConfig?.export?.cardProgramAccounts;
+    const cardsUsingCustomAccountsCount = getCardsUsingCustomExportCount(cardFeeds ?? {}, cardLists, CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT);
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_CAMPFIRE_EXPORT.getRoute(policyID) : undefined;
+
+    return (
+        <ConnectionLayout
+            displayName="CampfireCardProgramAccountPage"
+            headerTitle="workspace.campfire.cardProgramAccount.label"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.CAMPFIRE}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            shouldBeBlocked
+        >
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.campfire.cardProgramAccount.description')}</Text>
+            </View>
+            {Object.values(cardFeeds ?? {})
+                .filter((cardFeed) => findMatchingCards(cardFeeds ?? {}, cardLists, cardFeed.feed).length > 0)
+                .map((cardFeed) => {
+                    const feedKey = cardFeed.feed;
+                    const feedName = getCustomOrFormattedFeedName(translate, feedKey, cardFeed.customFeedName, false);
+                    const feedDomainID = cardFeed.domainID ?? CONST.DEFAULT_MISSING_ID;
+                    const feedWithDomainID = getCardFeedWithDomainID(feedKey, feedDomainID);
+                    const isUsingCustomAccount = !!cardProgramsUsingCustomAccounts?.[feedKey];
+                    const cardProgramAccountID = cardProgramsUsingCustomAccounts?.[feedKey] ?? creditCardAccountID;
+                    const cardProgramAccount = campfireData?.accounts?.find((account) => account.id === cardProgramAccountID);
+                    const cardProgramAccountDisplayName = cardProgramAccount
+                        ? `${cardProgramAccount.id} ${cardProgramAccount.name}${isUsingCustomAccount ? '' : ` (${translate('common.default').toLocaleLowerCase()})`}`
+                        : '';
+                    return (
+                        <OfflineWithFeedback
+                            key={feedKey}
+                            pendingAction={settingsPendingAction([`${CONST.CAMPFIRE_CONFIG.CARD_PROGRAM_ACCOUNT_PREFIX}${feedKey}`], campfireConfig?.pendingFields)}
+                        >
+                            <MenuItem.Root
+                                onPress={callFunctionIfActionIsAllowed(() =>
+                                    policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR.getRoute(policyID, feedWithDomainID)) : undefined,
+                                )}
+                            >
+                                <MenuItemField.Row
+                                    name={feedName ?? ''}
+                                    value={cardProgramAccountDisplayName}
+                                >
+                                    {areSettingsInErrorFields([`${CONST.CAMPFIRE_CONFIG.CARD_PROGRAM_ACCOUNT_PREFIX}${feedKey}`], campfireConfig?.errorFields) && (
+                                        <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                                    )}
+                                    <MenuItem.Chevron />
+                                </MenuItemField.Row>
+                                {!!cardsUsingCustomAccountsCount.perFeedCount[feedKey] && (
+                                    <MenuItem.HelpText message={translate('workspace.campfire.cardAccount.countInfo', cardsUsingCustomAccountsCount.perFeedCount[feedKey])} />
+                                )}
+                            </MenuItem.Root>
+                        </OfflineWithFeedback>
+                    );
+                })}
+        </ConnectionLayout>
+    );
+}
+
+export default withPolicyConnections(CampfireCardProgramAccountPage);
diff --git a/src/pages/workspace/accounting/campfire/export/CampfireCardProgramAccountSelectorPage.tsx b/src/pages/workspace/accounting/campfire/export/CampfireCardProgramAccountSelectorPage.tsx
new file mode 100644
index 000000000000..ded0d93e8075
--- /dev/null
+++ b/src/pages/workspace/accounting/campfire/export/CampfireCardProgramAccountSelectorPage.tsx
@@ -0,0 +1,133 @@
+import BlockingView from '@components/BlockingViews/BlockingView';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+
+import useCardFeeds from '@hooks/useCardFeeds';
+import useCardsLists from '@hooks/useCardsLists';
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
+import useLocalize from '@hooks/useLocalize';
+import useSelectionListSearch from '@hooks/useSelectionListSearch';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {clearCampfireErrorField, updateCampfireCardProgramAccount} from '@libs/actions/connections/Campfire';
+import {findMatchingCards} from '@libs/CardFeedUtils';
+import {getCustomOrFormattedFeedName} from '@libs/CardUtils';
+import {getLatestErrorField} from '@libs/ErrorUtils';
+import {sortDefaultToTop} from '@libs/ListUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+
+import variables from '@styles/variables';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {CampfireAccount} from '@src/types/onyx/Policy';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type AccountListItem = ListItem & {
+    value: CampfireAccount['id'];
+};
+
+type CampfireCardProgramAccountSelectorPageProps = WithPolicyConnectionsProps &
+    PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR>;
+
+function CampfireCardProgramAccountSelectorPage({
+    policy,
+    route: {
+        params: {feed: feedWithDomainID},
+    },
+}: CampfireCardProgramAccountSelectorPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useMemoizedLazyIllustrations(['Telescope']);
+    const policyID = policy?.id;
+    const [cardFeeds] = useCardFeeds(policyID);
+    const cardFeed = cardFeeds?.[feedWithDomainID];
+    const [cardLists] = useCardsLists();
+    const feedKey = cardFeed?.feed;
+    const campfireConfig = policy?.connections?.campfire?.config;
+    const campfireData = policy?.connections?.campfire?.data;
+    const creditCardAccountID = campfireConfig?.export?.creditCardAccountID;
+    const cardProgramsUsingCustomAccounts = campfireConfig?.export?.cardProgramAccounts;
+    const cardProgramAccountID = (feedKey ? cardProgramsUsingCustomAccounts?.[feedKey] : undefined) ?? creditCardAccountID;
+    const hasActiveCards = feedKey && findMatchingCards(cardFeeds ?? {}, cardLists, feedKey).length > 0;
+    const title = getCustomOrFormattedFeedName(translate, feedKey, cardFeed?.customFeedName, false);
+    const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_PROGRAM_ACCOUNT.getRoute(policyID) : undefined;
+
+    const data: AccountListItem[] =
+        campfireData?.accounts
+            ?.filter(
+                (accountItem) =>
+                    accountItem.isActive && (accountItem.accountSubtype === CONST.CAMPFIRE_ACCOUNT_SUBTYPE.CREDIT_CARD || accountItem.accountSubtype === CONST.CAMPFIRE_ACCOUNT_SUBTYPE.BANK),
+            )
+            .map((accountItem) => ({
+                value: accountItem.id,
+                text: `${creditCardAccountID === accountItem.id ? `${translate('common.default')} - ` : ''}${accountItem.id} ${accountItem.name}`,
+                keyForList: accountItem.id,
+                isSelected: cardProgramAccountID === accountItem.id,
+            })) ?? [];
+    const {filteredData: filteredUnprocessedData, textInputOptions} = useSelectionListSearch(data);
+    const filteredData = sortDefaultToTop(filteredUnprocessedData, (accountItem) => creditCardAccountID === accountItem.keyForList, styles);
+
+    const headerContent = (
+        <View>
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.campfire.cardProgramAccount.descriptionLevel2')}</Text>
+        </View>
+    );
+
+    const listEmptyContent = (
+        <BlockingView
+            icon={illustrations.Telescope}
+            iconWidth={variables.emptyListIconWidth}
+            iconHeight={variables.emptyListIconHeight}
+            title={translate('workspace.campfire.noAccountsFound')}
+            subtitle={translate('workspace.campfire.noAccountsFoundDescription')}
+            containerStyle={styles.pb10}
+        />
+    );
+
+    const selectCreditCardAccount = (item: AccountListItem) => {
+        if (item.value !== cardProgramAccountID && policyID && feedKey) {
+            // Choosing the default account clears the custom account
+            const value = item.value === creditCardAccountID ? '' : item.value;
+            const oldValue = cardProgramAccountID === creditCardAccountID ? undefined : cardProgramAccountID;
+            updateCampfireCardProgramAccount(policyID, feedKey, value, oldValue);
+        }
+        Navigation.goBack(backPath);
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName="CampfireCardProgramAccountSelectorPage"
+            headerTitleAlreadyTranslated={title}
+            data={filteredData}
+            textInputOptions={textInputOptions}
+            shouldBeBlocked={!hasActiveCards}
+            headerContent={headerContent}
+            listEmptyContent={listEmptyContent}
+            onSelectRow={selectCreditCardAccount}
+            shouldSingleExecuteRowSelect
+            initiallyFocusedOptionKey={cardProgramAccountID}
+            onBackButtonPress={() => Navigation.goBack(backPath)}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.CAMPFIRE}
+            pendingAction={settingsPendingAction([`${CONST.CAMPFIRE_CONFIG.CARD_PROGRAM_ACCOUNT_PREFIX}${feedKey}`], campfireConfig?.pendingFields)}
+            errors={getLatestErrorField(campfireConfig, `${CONST.CAMPFIRE_CONFIG.CARD_PROGRAM_ACCOUNT_PREFIX}${feedKey}`)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => policyID && clearCampfireErrorField(policyID, `${CONST.CAMPFIRE_CONFIG.CARD_PROGRAM_ACCOUNT_PREFIX}${feedKey}`)}
+        />
+    );
+}
+
+export default withPolicyConnections(CampfireCardProgramAccountSelectorPage);
diff --git a/src/pages/workspace/accounting/campfire/export/CampfireExportPage.tsx b/src/pages/workspace/accounting/campfire/export/CampfireExportPage.tsx
index c1ec2f43a958..08423428d65d 100644
--- a/src/pages/workspace/accounting/campfire/export/CampfireExportPage.tsx
+++ b/src/pages/workspace/accounting/campfire/export/CampfireExportPage.tsx
@@ -1,19 +1,30 @@
+import Accordion from '@components/Accordion';
 import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import Text from '@components/Text';
 
+import useAccordionAnimation from '@hooks/useAccordionAnimation';
+import useCardFeeds from '@hooks/useCardFeeds';
+import useCardsLists from '@hooks/useCardsLists';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {updateCampfireExportToMultipleAccounts, clearCampfireErrorField} from '@libs/actions/connections/Campfire';
+import {findMatchingCards, getCardsUsingCustomExportCount, getCardsCustomExportPendingAction, areCardsCustomExportInErrorFields} from '@libs/CardFeedUtils';
+import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
 
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
+import type {CardFeedWithNumber} from '@src/types/onyx/CardFeeds';
 
 import {View} from 'react-native';
 
@@ -21,6 +32,8 @@ function CampfireExportPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const policyID = policy?.id;
+    const [cardFeeds] = useCardFeeds(policyID);
+    const [cardLists] = useCardsLists();
     const policyOwner = policy?.owner;
     const campfireConfig = policy?.connections?.campfire?.config;
     const campfireData = policy?.connections?.campfire?.data;
@@ -31,6 +44,16 @@ function CampfireExportPage({policy}: WithPolicyConnectionsProps) {
     const defaultCompanyCardVendor = campfireData?.vendors?.find((vendor) => vendor.id === campfireConfig?.export?.defaultVendorID);
     const companyCardAccountID = campfireConfig?.export?.creditCardAccountID;
     const companyCardAccount = campfireData?.accounts?.find((account) => account.id === companyCardAccountID);
+    const exportToMultipleAccounts = campfireConfig?.export?.exportToMultipleAccounts ?? false;
+    const cardProgramsUsingCustomAccountsCount = Object.keys(campfireConfig?.export?.cardProgramAccounts ?? {}).filter(
+        (cardFeed) => findMatchingCards(cardFeeds ?? {}, cardLists, cardFeed as CardFeedWithNumber).length > 0,
+    ).length;
+    const cardProgramsOfflineFeedbackKeys = Object.values(cardFeeds ?? {}).map((program) => `${CONST.CAMPFIRE_CONFIG.CARD_PROGRAM_ACCOUNT_PREFIX}${program.feed}`);
+    const cardsUsingCustomAccountsCount = getCardsUsingCustomExportCount(cardFeeds ?? {}, cardLists, CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT);
+    const hasActiveCards = findMatchingCards(cardFeeds ?? {}, cardLists).length > 0;
+
+    const {isAccordionExpanded: isExportToMultipleAccountsAccordionExpanded, shouldAnimateAccordionSection: shouldAnimateExportToMultipleAccountsAccordionSection} =
+        useAccordionAnimation(exportToMultipleAccounts);
 
     return (
         <ConnectionLayout
@@ -104,6 +127,48 @@ function CampfireExportPage({policy}: WithPolicyConnectionsProps) {
                     }
                 />
             </OfflineWithFeedback>
+            {hasActiveCards && (
+                <>
+                    <ToggleSettingOptionRow
+                        title={translate('workspace.campfire.exportToMultipleAccounts')}
+                        switchAccessibilityLabel={translate('workspace.campfire.exportToMultipleAccounts')}
+                        shouldPlaceSubtitleBelowSwitch
+                        wrapperStyle={[styles.mv3, styles.mh5]}
+                        isActive={exportToMultipleAccounts}
+                        onToggle={() => policyID && updateCampfireExportToMultipleAccounts(policyID, !exportToMultipleAccounts, exportToMultipleAccounts)}
+                        pendingAction={settingsPendingAction([CONST.CAMPFIRE_CONFIG.EXPORT_TO_MULTIPLE_ACCOUNTS], campfireConfig?.pendingFields)}
+                        errors={getLatestErrorField(campfireConfig ?? {}, CONST.CAMPFIRE_CONFIG.EXPORT_TO_MULTIPLE_ACCOUNTS)}
+                        onCloseError={() => policyID && clearCampfireErrorField(policyID, CONST.CAMPFIRE_CONFIG.EXPORT_TO_MULTIPLE_ACCOUNTS)}
+                    />
+                    <Accordion
+                        isExpanded={isExportToMultipleAccountsAccordionExpanded}
+                        isToggleTriggered={shouldAnimateExportToMultipleAccountsAccordionSection}
+                    >
+                        <OfflineWithFeedback pendingAction={settingsPendingAction(cardProgramsOfflineFeedbackKeys, campfireConfig?.pendingFields)}>
+                            <MenuItemField
+                                name={translate('workspace.campfire.cardProgramAccount.label')}
+                                onPress={() => (policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_PROGRAM_ACCOUNT.getRoute(policyID)) : undefined)}
+                                value={translate('workspace.campfire.cardProgramAccount.countInfo', cardProgramsUsingCustomAccountsCount)}
+                            >
+                                {areSettingsInErrorFields(cardProgramsOfflineFeedbackKeys, campfireConfig?.errorFields) && (
+                                    <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                                )}
+                            </MenuItemField>
+                        </OfflineWithFeedback>
+                        <OfflineWithFeedback pendingAction={getCardsCustomExportPendingAction(cardFeeds ?? {}, cardLists, CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT)}>
+                            <MenuItemField
+                                name={translate('workspace.campfire.cardAccount.label')}
+                                onPress={() => (policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_CAMPFIRE_CARD_ACCOUNT.getRoute(policyID)) : undefined)}
+                                value={translate('workspace.campfire.cardAccount.countInfo', cardsUsingCustomAccountsCount.totalCount)}
+                            >
+                                {areCardsCustomExportInErrorFields(cardFeeds ?? {}, cardLists, CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT) && (
+                                    <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                                )}
+                            </MenuItemField>
+                        </OfflineWithFeedback>
+                    </Accordion>
+                </>
+            )}
         </ConnectionLayout>
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
index e1ed41196b6d..8076c730aff8 100644
--- a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
@@ -3,7 +3,6 @@ import InteractiveStepSubPageHeader from '@components/InteractiveStepSubPageHead
 
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import useSubPage from '@hooks/useSubPage';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -50,20 +49,20 @@ function NetSuiteTokenInputPage({policy}: WithPolicyConnectionsProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isProduction} = useEnvironment();
-    const {isBetaEnabled} = usePermissions();
     const {params} = useRoute<NetSuiteTokenInputRoute>();
     const {authType} = params;
 
-    const canUseNetSuiteOAuth = isBetaEnabled(CONST.BETAS.NETSUITE_OAUTH);
-    // Only dev and staging can move a beta member back to token-based authentication. Production ignores the route param.
-    const canSwitchToTokenAuthentication = canUseNetSuiteOAuth && !isProduction;
+    const hasAuthError = isAuthenticationError(policy, CONST.POLICY.CONNECTIONS.NAME.NETSUITE);
+    // Only dev and staging can switch back to the token-based (TBA/SOAP) flow via route param for testing.
+    const canSwitchToTokenAuthentication = !isProduction;
     const isTokenAuthenticationSelected = canSwitchToTokenAuthentication && authType === CONST.NETSUITE_CONFIG.TOKEN_INPUT.AUTH_TYPE.TBA;
-    const isOAuthFlow = canUseNetSuiteOAuth && !isTokenAuthenticationSelected;
+    // TBA connections store a tokenID while OAuth connections do not, so this is used to pick the correct credentials
+    // form upon reconnection. Fresh connections will always use the OAuth wizard.
+    const netSuiteConnection = policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE];
+    const isOAuthFlow = !(hasAuthError && !!netSuiteConnection?.tokenID) && !isTokenAuthenticationSelected;
     const pages = isOAuthFlow ? oauthPages : tokenPages;
     const stepNames = isOAuthFlow ? CONST.NETSUITE_CONFIG.TOKEN_INPUT.OAUTH_STEP_INDEX_LIST : CONST.NETSUITE_CONFIG.TOKEN_INPUT.STEP_INDEX_LIST;
 
-    const hasAuthError = isAuthenticationError(policy, CONST.POLICY.CONNECTIONS.NAME.NETSUITE);
-
     const submit = () => {
         Navigation.dismissModal();
     };
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
index a26c558c960e..9c91f4f919f8 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
@@ -19,13 +19,8 @@ import {clearNetSuiteErrorField} from '@libs/actions/Policy/Policy';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
-import {
-    areSettingsInErrorFields,
-    getFilteredApprovalAccountOptions,
-    getFilteredCollectionAccountOptions,
-    getFilteredReimbursableAccountOptions,
-    settingsPendingAction,
-} from '@libs/PolicyUtils';
+import {getFilteredApprovalAccountOptions, getFilteredCollectionAccountOptions, getFilteredReimbursableAccountOptions} from '@libs/NetSuiteUtils';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {ExtendedMenuItemWithSubscribedSettings, MenuItemToRender} from '@pages/workspace/accounting/netsuite/types';
 import {
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage.tsx
index 17df6a9bbff7..74c6745480bb 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage.tsx
@@ -10,7 +10,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {updateNetSuiteApprovalAccount} from '@libs/actions/connections/NetSuiteCommands';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getNetSuiteApprovalAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuiteApprovalAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
@@ -82,7 +83,7 @@ function NetSuiteApprovalAccountSelectPage({policy}: WithPolicyConnectionsProps)
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             displayName="NetSuiteApprovalAccountSelectPage"
             headerContent={headerContent}
-            isRowMultilineSupported
+            titleNumberOfLines={2}
             data={netsuiteApprovalAccountOptions}
             onSelectRow={updateCollectionAccount}
             initiallyFocusedOptionKey={initiallyFocusedOptionKey}
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
index e9d9d7f547ee..29a77826d070 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
@@ -10,7 +10,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {updateNetSuiteCollectionAccount} from '@libs/actions/connections/NetSuiteCommands';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getNetSuiteCollectionAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuiteCollectionAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteFxExpenseAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteFxExpenseAccountSelectPage.tsx
index 058a8265781f..1d2dc915f116 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteFxExpenseAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteFxExpenseAccountSelectPage.tsx
@@ -12,7 +12,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {updateNetSuiteFxExpenseAccount} from '@libs/actions/connections/NetSuiteCommands';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getNetSuiteExpenseAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuiteExpenseAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import {shouldHideReimbursedReportsSection} from '@pages/workspace/accounting/netsuite/utils';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
index 16d0a73214b1..0c4a951cf9b1 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
@@ -10,7 +10,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {updateNetSuiteReimbursementAccountID} from '@libs/actions/connections/NetSuiteCommands';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getNetSuiteReimbursableAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuiteReimbursableAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPage.tsx b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPage.tsx
index 81fbfe4c08d4..8134b8ffdc06 100644
--- a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPage.tsx
@@ -1,19 +1,19 @@
 import ConnectionLayout from '@components/ConnectionLayout';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {clearNetSuiteErrorField} from '@libs/actions/Policy/Policy';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import Parser from '@libs/Parser';
 import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
 
-import type {MenuItem} from '@pages/workspace/accounting/netsuite/types';
 import {
     exportExpensesDestinationSettingName,
     shouldHideJournalPostingPreference,
@@ -31,10 +31,6 @@ import type SCREENS from '@src/SCREENS';
 import {useRoute} from '@react-navigation/native';
 import React, {useMemo} from 'react';
 
-type MenuItemWithSubscribedSettings = Pick<MenuItem, 'description' | 'title' | 'onPress' | 'shouldHide' | 'onCloseError' | 'helperText' | 'shouldParseHelperText'> & {
-    subscribedSettings?: string[];
-};
-
 function DynamicNetSuiteExportExpensesPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -58,76 +54,12 @@ function DynamicNetSuiteExportExpensesPage({policy}: WithPolicyConnectionsProps)
 
     const selectedReimbursablePayableAccount = useMemo(() => payableList?.find(({id}) => id === config?.reimbursablePayableAccount), [payableList, config?.reimbursablePayableAccount]);
 
-    const menuItems: MenuItemWithSubscribedSettings[] = [
-        {
-            description: translate('workspace.accounting.exportAs'),
-            onPress: () => {
-                if (!policyID) {
-                    return;
-                }
-                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT.path));
-            },
-            title: exportDestination ? translate(`workspace.netsuite.exportDestination.values.${exportDestination}.label`) : undefined,
-            subscribedSettings: [exportDestinationSettingName],
-            onCloseError: () => clearNetSuiteErrorField(policyID, exportDestinationSettingName),
-            helperText: exportDestination ? translate(`workspace.netsuite.exportDestination.values.${exportDestination}.${helperTextType}`) : undefined,
-            shouldParseHelperText: true,
-        },
-        {
-            description: translate('workspace.accounting.defaultVendor'),
-            onPress: () => {
-                if (!policyID) {
-                    return;
-                }
-                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT.path));
-            },
-            title: defaultVendor ? defaultVendor.name : undefined,
-            subscribedSettings: [CONST.NETSUITE_CONFIG.DEFAULT_VENDOR],
-            onCloseError: () => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR),
-            shouldHide: shouldHideReimbursableDefaultVendor(isReimbursable, config),
-        },
-        {
-            description: translate('workspace.netsuite.nonReimbursableJournalPostingAccount'),
-            onPress: () => {
-                if (!policyID) {
-                    return;
-                }
-                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT.path));
-            },
-            title: selectedPayableAccount ? selectedPayableAccount.name : undefined,
-            subscribedSettings: [CONST.NETSUITE_CONFIG.PAYABLE_ACCT],
-            onCloseError: () => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.PAYABLE_ACCT),
-            shouldHide: shouldHideNonReimbursableJournalPostingAccount(isReimbursable, config),
-        },
-        {
-            description: translate('workspace.netsuite.reimbursableJournalPostingAccount'),
-            onPress: () => {
-                if (!policyID) {
-                    return;
-                }
-                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT.path));
-            },
-            title: selectedReimbursablePayableAccount ? selectedReimbursablePayableAccount.name : undefined,
-            subscribedSettings: [CONST.NETSUITE_CONFIG.REIMBURSABLE_PAYABLE_ACCOUNT],
-            onCloseError: () => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.REIMBURSABLE_PAYABLE_ACCOUNT),
-            shouldHide: shouldHideReimbursableJournalPostingAccount(isReimbursable, config),
-        },
-        {
-            description: translate('workspace.netsuite.journalPostingPreference.label'),
-            onPress: () => {
-                if (!policyID) {
-                    return;
-                }
-                Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT.path));
-            },
-            title: config?.journalPostingPreference
-                ? translate(`workspace.netsuite.journalPostingPreference.values.${config.journalPostingPreference}`)
-                : translate(`workspace.netsuite.journalPostingPreference.values.${CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_INDIVIDUAL_LINE}`),
-            subscribedSettings: [CONST.NETSUITE_CONFIG.JOURNAL_POSTING_PREFERENCE],
-            onCloseError: () => clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.JOURNAL_POSTING_PREFERENCE),
-            shouldHide: shouldHideJournalPostingPreference(isReimbursable, config),
-        },
-    ];
+    const navigateToStep = (path: Parameters<typeof createDynamicRoute>[0]) => {
+        if (!policyID) {
+            return;
+        }
+        Navigation.navigate(createDynamicRoute(path));
+    };
 
     return (
         <ConnectionLayout
@@ -141,24 +73,72 @@ function DynamicNetSuiteExportExpensesPage({policy}: WithPolicyConnectionsProps)
             titleStyle={styles.ph5}
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
         >
-            {menuItems
-                .filter((item) => !item.shouldHide)
-                .map((item) => (
-                    <OfflineWithFeedback
-                        key={item.description}
-                        pendingAction={settingsPendingAction(item.subscribedSettings, config?.pendingFields)}
+            <OfflineWithFeedback pendingAction={settingsPendingAction([exportDestinationSettingName], config?.pendingFields)}>
+                <MenuItemField
+                    name={translate('workspace.accounting.exportAs')}
+                    value={exportDestination ? translate(`workspace.netsuite.exportDestination.values.${exportDestination}.label`) : undefined}
+                    onPress={() => navigateToStep(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT.path)}
+                >
+                    {areSettingsInErrorFields([exportDestinationSettingName], config?.errorFields) && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                </MenuItemField>
+                {!!exportDestination && (
+                    <MenuItem.HelpTextHTML>{Parser.replace(translate(`workspace.netsuite.exportDestination.values.${exportDestination}.${helperTextType}`))}</MenuItem.HelpTextHTML>
+                )}
+            </OfflineWithFeedback>
+            {!shouldHideReimbursableDefaultVendor(isReimbursable, config) && (
+                <OfflineWithFeedback pendingAction={settingsPendingAction([CONST.NETSUITE_CONFIG.DEFAULT_VENDOR], config?.pendingFields)}>
+                    <MenuItemField
+                        name={translate('workspace.accounting.defaultVendor')}
+                        value={defaultVendor?.name}
+                        onPress={() => navigateToStep(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT.path)}
+                    >
+                        {areSettingsInErrorFields([CONST.NETSUITE_CONFIG.DEFAULT_VENDOR], config?.errorFields) && (
+                            <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                        )}
+                    </MenuItemField>
+                </OfflineWithFeedback>
+            )}
+            {!shouldHideNonReimbursableJournalPostingAccount(isReimbursable, config) && (
+                <OfflineWithFeedback pendingAction={settingsPendingAction([CONST.NETSUITE_CONFIG.PAYABLE_ACCT], config?.pendingFields)}>
+                    <MenuItemField
+                        name={translate('workspace.netsuite.nonReimbursableJournalPostingAccount')}
+                        value={selectedPayableAccount?.name}
+                        onPress={() => navigateToStep(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT.path)}
+                    >
+                        {areSettingsInErrorFields([CONST.NETSUITE_CONFIG.PAYABLE_ACCT], config?.errorFields) && (
+                            <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                        )}
+                    </MenuItemField>
+                </OfflineWithFeedback>
+            )}
+            {!shouldHideReimbursableJournalPostingAccount(isReimbursable, config) && (
+                <OfflineWithFeedback pendingAction={settingsPendingAction([CONST.NETSUITE_CONFIG.REIMBURSABLE_PAYABLE_ACCOUNT], config?.pendingFields)}>
+                    <MenuItemField
+                        name={translate('workspace.netsuite.reimbursableJournalPostingAccount')}
+                        value={selectedReimbursablePayableAccount?.name}
+                        onPress={() => navigateToStep(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT.path)}
+                    >
+                        {areSettingsInErrorFields([CONST.NETSUITE_CONFIG.REIMBURSABLE_PAYABLE_ACCOUNT], config?.errorFields) && (
+                            <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                        )}
+                    </MenuItemField>
+                </OfflineWithFeedback>
+            )}
+            {!shouldHideJournalPostingPreference(isReimbursable, config) && (
+                <OfflineWithFeedback pendingAction={settingsPendingAction([CONST.NETSUITE_CONFIG.JOURNAL_POSTING_PREFERENCE], config?.pendingFields)}>
+                    <MenuItemField
+                        name={translate('workspace.netsuite.journalPostingPreference.label')}
+                        value={translate(
+                            `workspace.netsuite.journalPostingPreference.values.${config?.journalPostingPreference ?? CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_INDIVIDUAL_LINE}`,
+                        )}
+                        onPress={() => navigateToStep(DYNAMIC_ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT.path)}
                     >
-                        <MenuItemWithTopDescription
-                            title={item.title}
-                            description={item.description}
-                            shouldShowRightIcon
-                            onPress={item?.onPress}
-                            brickRoadIndicator={areSettingsInErrorFields(item.subscribedSettings, config?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            helperText={item?.helperText}
-                            shouldParseHelperText={item.shouldParseHelperText ?? false}
-                        />
-                    </OfflineWithFeedback>
-                ))}
+                        {areSettingsInErrorFields([CONST.NETSUITE_CONFIG.JOURNAL_POSTING_PREFERENCE], config?.errorFields) && (
+                            <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />
+                        )}
+                    </MenuItemField>
+                </OfflineWithFeedback>
+            )}
         </ConnectionLayout>
     );
 }
diff --git a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPayableAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPayableAccountSelectPage.tsx
index 05e02c16b595..60f7d3c03634 100644
--- a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPayableAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesPayableAccountSelectPage.tsx
@@ -12,7 +12,8 @@ import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getNetSuitePayableAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuitePayableAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesVendorSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesVendorSelectPage.tsx
index 75298c35f884..d807fcb8f66d 100644
--- a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesVendorSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteExportExpensesVendorSelectPage.tsx
@@ -12,7 +12,8 @@ import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getNetSuiteVendorOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuiteVendorOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteInvoiceItemSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteInvoiceItemSelectPage.tsx
index f6a049db3840..c1b1a8545041 100644
--- a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteInvoiceItemSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteInvoiceItemSelectPage.tsx
@@ -10,7 +10,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {updateNetSuiteInvoiceItem} from '@libs/actions/connections/NetSuiteCommands';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getNetSuiteInvoiceItemOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuiteInvoiceItemOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteReceivableAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteReceivableAccountSelectPage.tsx
index c9ae9c808a50..825b5d30afb5 100644
--- a/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteReceivableAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/DynamicNetSuiteReceivableAccountSelectPage.tsx
@@ -11,7 +11,8 @@ import {updateNetSuiteReceivableAccount} from '@libs/actions/connections/NetSuit
 import {clearNetSuiteErrorField} from '@libs/actions/Policy/Policy';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getNetSuiteReceivableAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNetSuiteReceivableAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx
index 7d4c31533afa..9b157228e59e 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx
@@ -10,7 +10,8 @@ import {updateNetSuiteProvincialTaxPostingAccount} from '@libs/actions/connectio
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
-import {canUseProvincialTaxNetSuite, getNetSuiteTaxAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {canUseProvincialTaxNetSuite, getNetSuiteTaxAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx
index c29268769f98..ed76e9c47c4c 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx
@@ -11,7 +11,8 @@ import {updateNetSuiteTaxPostingAccount} from '@libs/actions/connections/NetSuit
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
-import {canUseTaxNetSuite, getNetSuiteTaxAccountOptions, settingsPendingAction} from '@libs/PolicyUtils';
+import {canUseTaxNetSuite, getNetSuiteTaxAccountOptions} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteTravelBillingConfigurationPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteTravelBillingConfigurationPage.tsx
index 81d60874adca..9fb6dbc2f079 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteTravelBillingConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteTravelBillingConfigurationPage.tsx
@@ -1,13 +1,13 @@
 import ConnectionLayout from '@components/ConnectionLayout';
 import MenuItem from '@components/MenuItem';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
+import Parser from '@libs/Parser';
 import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
 
 import Navigation from '@navigation/Navigation';
@@ -90,13 +90,13 @@ function NetSuiteTravelBillingConfigurationPage({policy}: WithPolicyConnectionsP
             connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
             onBackButtonPress={() => Navigation.goBack(netSuiteExportBackPath)}
         >
-            <MenuItemWithTopDescription
-                title={translate(`workspace.netsuite.exportDestination.values.${CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY}.label`)}
-                description={translate('workspace.accounting.exportAs')}
-                helperText={translate(`workspace.netsuite.exportDestination.values.${CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY}.travelDescription`)}
-                shouldParseHelperText
-                shouldShowRightIcon={false}
+            <MenuItemField
+                name={translate('workspace.accounting.exportAs')}
+                value={translate(`workspace.netsuite.exportDestination.values.${CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY}.label`)}
             />
+            <MenuItem.HelpTextHTML>
+                {Parser.replace(translate(`workspace.netsuite.exportDestination.values.${CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY}.travelDescription`))}
+            </MenuItem.HelpTextHTML>
             {sections.map((section) => (
                 <OfflineWithFeedback
                     pendingAction={section.pendingAction}
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
index cdfcae2160b9..43d506424ab9 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
@@ -11,7 +11,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {updateNetSuiteCustomLists, updateNetSuiteCustomSegments} from '@libs/actions/connections/NetSuiteCommands';
 import {addErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {isNetSuiteCustomFieldPropertyEditable, isNetSuiteCustomSegmentRecord, settingsPendingAction} from '@libs/PolicyUtils';
+import {isNetSuiteCustomFieldPropertyEditable, isNetSuiteCustomSegmentRecord} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
index c8f770d65e88..32cdfc1ce987 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
@@ -13,7 +13,8 @@ import {updateNetSuiteCustomLists, updateNetSuiteCustomSegments} from '@libs/act
 import {clearNetSuiteErrorField, clearNetSuitePendingField, removeNetSuiteCustomFieldByIndex} from '@libs/actions/Policy/Policy';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {getNameFromNetSuiteCustomField, isNetSuiteCustomFieldPropertyEditable, isNetSuiteCustomSegmentRecord, settingsPendingAction} from '@libs/PolicyUtils';
+import {getNameFromNetSuiteCustomField, isNetSuiteCustomFieldPropertyEditable, isNetSuiteCustomSegmentRecord} from '@libs/NetSuiteUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
 
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
index b3e5a1de8239..e2b4880f73f9 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
@@ -11,7 +11,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {updateNetSuiteSyncTaxConfiguration} from '@libs/actions/connections/NetSuiteCommands';
 import {getLatestErrorField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import {areSettingsInErrorFields, canUseTaxNetSuite, getCustomersOrJobsLabelNetSuite, getNetSuiteImportCustomFieldLabel, settingsPendingAction} from '@libs/PolicyUtils';
+import {canUseTaxNetSuite, getCustomersOrJobsLabelNetSuite, getNetSuiteImportCustomFieldLabel} from '@libs/NetSuiteUtils';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
 
 import {getImportCustomFieldsSettings} from '@pages/workspace/accounting/netsuite/utils';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
diff --git a/src/pages/workspace/accounting/netsuite/utils.ts b/src/pages/workspace/accounting/netsuite/utils.ts
index 0d887a779f9f..00be7f39c86c 100644
--- a/src/pages/workspace/accounting/netsuite/utils.ts
+++ b/src/pages/workspace/accounting/netsuite/utils.ts
@@ -1,5 +1,5 @@
 import {isAuthenticationError} from '@libs/actions/connections';
-import {canUseProvincialTaxNetSuite, canUseTaxNetSuite} from '@libs/PolicyUtils';
+import {canUseProvincialTaxNetSuite, canUseTaxNetSuite} from '@libs/NetSuiteUtils';
 
 import CONST from '@src/CONST';
 import type {NetSuiteConnectionConfig, NetSuiteSubsidiary} from '@src/types/onyx/Policy';
diff --git a/src/pages/workspace/accounting/utils.tsx b/src/pages/workspace/accounting/utils.tsx
index 6a9d7caaedb1..1a6c485fb1b1 100644
--- a/src/pages/workspace/accounting/utils.tsx
+++ b/src/pages/workspace/accounting/utils.tsx
@@ -16,7 +16,8 @@ import {getAccountingIntegrationDisplayName, getQuickbooksOnlineIntegrationName,
 import {isAuthenticationError} from '@libs/actions/connections';
 import {getCardsCustomExportPendingAction, areCardsCustomExportInErrorFields} from '@libs/CardFeedUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
-import {canUseTaxNetSuite, getCurrentConnectionName} from '@libs/PolicyUtils';
+import {canUseTaxNetSuite} from '@libs/NetSuiteUtils';
+import {getCurrentConnectionName} from '@libs/PolicyUtils';
 
 import Navigation from '@navigation/Navigation';
 
@@ -674,8 +675,17 @@ function getAccountingIntegrationData(
                     CONST.BUSINESS_CENTRAL_CONFIG.SYNC_TAX_RATES,
                     ...(policy?.connections?.businessCentral?.data?.dimensions?.map((dimension) => `${CONST.BUSINESS_CENTRAL_CONFIG.FIELD_MAPPING_PREFIX}${dimension.id}`) ?? []),
                 ],
-                onExportPagePress: () => null,
-                subscribedExportSettings: [],
+                onExportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_BUSINESS_CENTRAL_EXPORT.getRoute(policyID)),
+                subscribedExportSettings: [
+                    CONST.BUSINESS_CENTRAL_CONFIG.EXPORTER,
+                    CONST.BUSINESS_CENTRAL_CONFIG.EXPORT_DATE,
+                    CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE,
+                    CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT,
+                    CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE,
+                    CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID,
+                    CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE_ACCOUNT,
+                    CONST.BUSINESS_CENTRAL_CONFIG.PAYMENT_METHOD_CODE,
+                ],
                 onAdvancedPagePress: () => null,
                 subscribedAdvancedSettings: [],
                 workspaceUpgradeNavigationDetails: {
diff --git a/src/pages/workspace/accounting/xero/export/DynamicXeroExportConfigurationPage.tsx b/src/pages/workspace/accounting/xero/export/DynamicXeroExportConfigurationPage.tsx
index f71a5dfe9e03..92940342da7c 100644
--- a/src/pages/workspace/accounting/xero/export/DynamicXeroExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/export/DynamicXeroExportConfigurationPage.tsx
@@ -5,7 +5,6 @@ import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 
@@ -26,7 +25,6 @@ import React, {useMemo} from 'react';
 function DynamicXeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {isBetaEnabled} = usePermissions();
     const policyID = policy?.id;
     const policyOwner = policy?.owner ?? '';
     const dynamicBackPath = useDynamicBackPath(DYNAMIC_ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.path);
@@ -41,7 +39,7 @@ function DynamicXeroExportConfigurationPage({policy}: WithPolicyConnectionsProps
     // row even when Xero is mid tenant-switch (config.isConfigured=false) and data.contacts is
     // stale from the prior tenant — allowing the admin to persist a defaultVendor that flips
     // invalid the moment the new sync completes.
-    const isVendorFeatureAvailable = isBetaEnabled(CONST.BETAS.VENDOR_MATCHING) && isXeroVendorMatchingActive(policy);
+    const isVendorFeatureAvailable = isXeroVendorMatchingActive(policy);
     const defaultVendorName = getXeroSupplierByID(policy, defaultVendor)?.name ?? '';
     const exportPath = policyID ? `${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.path}` : undefined;
     const workspaceAccountID = useWorkspaceAccountID(policyID);
diff --git a/src/pages/workspace/accounting/xero/export/DynamicXeroNonReimbursableDefaultContactSelectPage.tsx b/src/pages/workspace/accounting/xero/export/DynamicXeroNonReimbursableDefaultContactSelectPage.tsx
index 2213aa2eb5c8..bf9a55ee0bc4 100644
--- a/src/pages/workspace/accounting/xero/export/DynamicXeroNonReimbursableDefaultContactSelectPage.tsx
+++ b/src/pages/workspace/accounting/xero/export/DynamicXeroNonReimbursableDefaultContactSelectPage.tsx
@@ -5,7 +5,6 @@ import Text from '@components/Text';
 
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateManyPolicyConnectionConfigs} from '@libs/actions/connections';
@@ -35,20 +34,19 @@ const CLEAR_DEFAULT_VENDOR_VALUE = '';
 function DynamicXeroNonReimbursableDefaultContactSelectPage({policy}: WithPolicyConnectionsProps) {
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
-    const {isBetaEnabled} = usePermissions();
     const illustrations = useMemoizedLazyIllustrations(['Telescope']);
 
     const policyID = policy?.id;
     const xeroConfig = policy?.connections?.xero?.config;
     const currentContactID = xeroConfig?.defaultVendor;
 
-    // Match the parent page's gate so direct deep-links (or stale-open tabs after the beta is
-    // revoked) cannot reach the supplier updater. The parent page hides the row when the feature
-    // is off, but the route remains addressable on its own. Gated on Xero specifically being
-    // configured — not the global hasVendorFeature predicate — so dual-connected workspaces mid
-    // Xero tenant switch (config.isConfigured=false with stale data.contacts) cannot persist a
-    // defaultVendor from the prior tenant.
-    const isFeatureAvailable = isBetaEnabled(CONST.BETAS.VENDOR_MATCHING) && isXeroVendorMatchingActive(policy);
+    // Match the parent page's gate so a direct deep link cannot reach the supplier updater. The
+    // parent page hides the row when the feature is off, but the route remains addressable on its
+    // own. The gate checks that Xero itself is configured instead of using the global
+    // hasVendorFeature predicate, so a workspace in the middle of a Xero tenant switch, where
+    // config.isConfigured is false and data.contacts still holds the previous tenant's contacts,
+    // cannot persist a defaultVendor from that tenant.
+    const isFeatureAvailable = isXeroVendorMatchingActive(policy);
 
     const suppliers = useMemo(() => getXeroSuppliers(policy), [policy]);
     const sortedSuppliers = sortVendors(suppliers, localeCompare);
diff --git a/src/pages/workspace/categories/CategoryForm.tsx b/src/pages/workspace/categories/CategoryForm.tsx
index 5e3753ef2a15..3742095facff 100644
--- a/src/pages/workspace/categories/CategoryForm.tsx
+++ b/src/pages/workspace/categories/CategoryForm.tsx
@@ -7,9 +7,8 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getDecodedCategoryName} from '@libs/CategoryUtils';
+import {getCategoryNameError, getCategoryNameErrorMessage, getDecodedCategoryName} from '@libs/CategoryUtils';
 import {addErrorMessage} from '@libs/ErrorUtils';
-import {isRequiredFulfilled} from '@libs/ValidationUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -41,17 +40,10 @@ function CategoryForm({onSubmit, policyCategories, categoryName, validateEdit, a
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM> = {};
-            const newCategoryName = values.categoryName.trim();
+            const nameError = getCategoryNameError(policyCategories, values.categoryName);
 
-            if (!isRequiredFulfilled(newCategoryName)) {
-                errors.categoryName = translate('workspace.categories.categoryRequiredError');
-            } else if (policyCategories?.[newCategoryName]) {
-                errors.categoryName = translate('workspace.categories.existingCategoryError');
-            } else if (newCategoryName === CONST.INVALID_CATEGORY_NAME || newCategoryName === CONST.SEARCH.CATEGORY_DEFAULT_VALUE) {
-                errors.categoryName = translate('workspace.categories.invalidCategoryName');
-            } else if ([...newCategoryName].length > CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH) {
-                // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
-                addErrorMessage(errors, 'categoryName', translate('common.error.characterLimitExceedCounter', [...newCategoryName].length, CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH));
+            if (nameError) {
+                addErrorMessage(errors, 'categoryName', getCategoryNameErrorMessage(translate, nameError, values.categoryName));
             }
 
             return errors;
diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
index 6874738715d6..1c871d4be279 100644
--- a/src/pages/workspace/categories/CategorySettingsPage.tsx
+++ b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -2,7 +2,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItem from '@components/MenuItem';
 import MenuItemAction from '@components/MenuItem/presets/MenuItemAction';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItemFieldHTML from '@components/MenuItem/presets/MenuItemFieldHTML';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -33,6 +33,7 @@ import {getLatestErrorMessageField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import {isDisablingOrDeletingLastEnabledCategory} from '@libs/OptionsListUtils';
+import Parser from '@libs/Parser';
 import {arePolicyRulesEnabled, getWorkflowApprovalsUnavailable, hasTags, isControlPolicy, tryNavigateToControlPolicyUpgrade} from '@libs/PolicyUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -81,6 +82,7 @@ function CategorySettingsPage({route: {params, name}, navigation}: CategorySetti
         ? []
         : getCategoryContextualRules({
               policy,
+              policyCategories,
               category: policyCategory,
               categoryName: policyCategory.name,
               translate,
@@ -310,33 +312,35 @@ function CategorySettingsPage({route: {params, name}, navigation}: CategorySetti
                     {categoryRulesEnabled && (
                         <>
                             <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.commentHint}>
-                                <MenuItemWithTopDescription
-                                    title={policyCategory?.commentHint}
-                                    description={translate('workspace.rules.categoryRules.descriptionHint')}
-                                    onPress={() => {
-                                        navigateToCategoryRule(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_DESCRIPTION_HINT.path);
-                                    }}
-                                    interactive={canWriteCategories}
-                                    shouldShowRightIcon={canWriteCategories}
-                                    shouldRenderAsHTML
+                                <MenuItemFieldHTML
+                                    name={translate('workspace.rules.categoryRules.descriptionHint')}
+                                    value={policyCategory?.commentHint}
+                                    onPress={
+                                        canWriteCategories
+                                            ? () => {
+                                                  navigateToCategoryRule(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_DESCRIPTION_HINT.path);
+                                              }
+                                            : undefined
+                                    }
                                 />
                             </OfflineWithFeedback>
-                            <MenuItemWithTopDescription
-                                title={approverText}
-                                description={translate('workspace.rules.categoryRules.approver')}
-                                onPress={() => {
-                                    navigateToCategoryRule(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_APPROVER.path);
-                                }}
-                                interactive={canWriteCategories}
-                                shouldShowRightIcon={canWriteCategories}
-                                disabled={approverDisabled}
-                                helperText={
-                                    approverDisabled
-                                        ? translate('workspace.rules.categoryRules.enableWorkflows', `${environmentURL}/${ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)}`)
+                            <MenuItemField
+                                name={translate('workspace.rules.categoryRules.approver')}
+                                value={approverText}
+                                onPress={
+                                    canWriteCategories
+                                        ? () => {
+                                              navigateToCategoryRule(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_APPROVER.path);
+                                          }
                                         : undefined
                                 }
-                                shouldParseHelperText
+                                isDisabled={approverDisabled}
                             />
+                            {approverDisabled && (
+                                <MenuItem.HelpTextHTML>
+                                    {Parser.replace(translate('workspace.rules.categoryRules.enableWorkflows', `${environmentURL}/${ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)}`))}
+                                </MenuItem.HelpTextHTML>
+                            )}
                         </>
                     )}
                     {canWriteCategories && !isThereAnyAccountingConnection && (
diff --git a/src/pages/workspace/categories/DynamicCreateCategoryPage.tsx b/src/pages/workspace/categories/DynamicCreateCategoryPage.tsx
index 95ed3e78de12..c2a7151e38c0 100644
--- a/src/pages/workspace/categories/DynamicCreateCategoryPage.tsx
+++ b/src/pages/workspace/categories/DynamicCreateCategoryPage.tsx
@@ -13,6 +13,7 @@ import {createPolicyCategory} from '@libs/actions/Policy/Category';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import {hasTags} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
 
@@ -61,7 +62,7 @@ function DynamicCreateCategoryPage({route}: DynamicCreateCategoryPageProps) {
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
             createPolicyCategory({
                 policyID: route.params.policyID,
-                categoryName: values.categoryName.trim(),
+                categoryName: StringUtils.sanitizeName(values.categoryName),
                 isSetupCategoriesTaskParentReportArchived: isSetupCategoryTaskParentReportArchived,
                 setupCategoryTaskReport,
                 setupCategoryTaskParentReport,
diff --git a/src/pages/workspace/categories/DynamicEditCategoryPage.tsx b/src/pages/workspace/categories/DynamicEditCategoryPage.tsx
index 945537f20671..0953be8443cf 100644
--- a/src/pages/workspace/categories/DynamicEditCategoryPage.tsx
+++ b/src/pages/workspace/categories/DynamicEditCategoryPage.tsx
@@ -8,8 +8,10 @@ import usePermissions from '@hooks/usePermissions';
 import usePolicyData from '@hooks/usePolicyData';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getCategoryNameError, getCategoryNameErrorMessage, getDecodedCategoryName} from '@libs/CategoryUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import StringUtils from '@libs/StringUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
 
@@ -41,32 +43,26 @@ function DynamicEditCategoryPage({route}: DynamicEditCategoryPageProps) {
     const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORY_EDIT;
     const settingsBackPath = useDynamicBackPath(DYNAMIC_ROUTES.SETTINGS_CATEGORY_EDIT.path);
     const workspaceBackPath = useDynamicBackPath(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_EDIT.path);
-
-    const sanitizeCategoryName = useCallback((name: string) => name.replaceAll(CONST.REGEX.NON_BREAKING_SPACE, ' ').trim(), []);
+    const decodedCategoryName = getDecodedCategoryName(currentCategoryName);
 
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM> = {};
-            const newCategoryName = sanitizeCategoryName(values.categoryName);
-
-            if (!newCategoryName) {
-                errors.categoryName = translate('workspace.categories.categoryRequiredError');
-            } else if (policyCategories?.[newCategoryName] && currentCategoryName !== newCategoryName) {
-                errors.categoryName = translate('workspace.categories.existingCategoryError');
-            } else if ([...newCategoryName].length > CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH) {
-                // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
-                errors.categoryName = translate('common.error.characterLimitExceedCounter', [...newCategoryName].length, CONST.API_TRANSACTION_CATEGORY_MAX_LENGTH);
+            const nameError = getCategoryNameError(policyCategories, values.categoryName, decodedCategoryName);
+
+            if (nameError) {
+                errors.categoryName = getCategoryNameErrorMessage(translate, nameError, values.categoryName);
             }
             return errors;
         },
-        [policyCategories, currentCategoryName, translate, sanitizeCategoryName],
+        [policyCategories, decodedCategoryName, translate],
     );
 
     const editCategory = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
-            const newCategoryName = sanitizeCategoryName(values.categoryName);
+            const newCategoryName = StringUtils.sanitizeName(values.categoryName);
             // Do not call the API if the edited category name is the same as the current category name
-            if (currentCategoryName !== newCategoryName) {
+            if (decodedCategoryName !== newCategoryName) {
                 renamePolicyCategory(policyData, {oldName: currentCategoryName, newName: newCategoryName}, isVendorMatchingBetaEnabled);
             }
 
@@ -75,7 +71,7 @@ function DynamicEditCategoryPage({route}: DynamicEditCategoryPageProps) {
                 Navigation.goBack(isQuickSettingsFlow ? settingsBackPath : workspaceBackPath, {compareParams: false});
             });
         },
-        [currentCategoryName, policyData, isQuickSettingsFlow, settingsBackPath, workspaceBackPath, sanitizeCategoryName, isVendorMatchingBetaEnabled],
+        [decodedCategoryName, currentCategoryName, policyData, isQuickSettingsFlow, settingsBackPath, workspaceBackPath, isVendorMatchingBetaEnabled],
     );
 
     return (
diff --git a/src/pages/workspace/categories/DynamicWorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/DynamicWorkspaceCategoriesSettingsPage.tsx
index 07a42d753fe9..0772828a0ca5 100644
--- a/src/pages/workspace/categories/DynamicWorkspaceCategoriesSettingsPage.tsx
+++ b/src/pages/workspace/categories/DynamicWorkspaceCategoriesSettingsPage.tsx
@@ -4,18 +4,20 @@ import ScrollView from '@components/ScrollView';
 
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useLocalize from '@hooks/useLocalize';
+import usePolicyData from '@hooks/usePolicyData';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {hasEnabledOptions} from '@libs/OptionsListUtils';
 
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 
-import {setPolicyShowCategoryGLCodes} from '@userActions/Policy/Category';
+import {setPolicyAutoCategorizeNewExpenses, setPolicyShowCategoryGLCodes} from '@userActions/Policy/Category';
 import {clearPolicyErrorField} from '@userActions/Policy/Policy';
 
 import CONST from '@src/CONST';
@@ -34,22 +36,25 @@ function DynamicWorkspaceCategoriesSettingsPage({policy, route}: DynamicWorkspac
     const {policyID} = route.params;
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const policyData = usePolicyData(policyID);
     const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_CATEGORIES.DYNAMIC_SETTINGS_CATEGORIES_SETTINGS;
     const backPath = useDynamicBackPath(DYNAMIC_ROUTES.SETTINGS_CATEGORIES_SETTINGS.path);
 
+    const updateAutoCategorizeNewExpenses = (value: boolean) => {
+        setPolicyAutoCategorizeNewExpenses(policyID, value);
+    };
+
     const updateShowCategoryGLCodes = (value: boolean) => {
         setPolicyShowCategoryGLCodes(policyID, value);
     };
 
-    // Only the GL codes toggle is left here, so the page has nothing to show without it.
-    const shouldBlockEmptySettings = !policy?.glCodes;
+    const hasEnabledCategories = hasEnabledOptions(policyData.categories);
 
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
-            shouldBeBlocked={shouldBlockEmptySettings}
         >
             <ScreenWrapper
                 enableEdgeToEdgeBottomSafeAreaPadding
@@ -61,6 +66,17 @@ function DynamicWorkspaceCategoriesSettingsPage({policy, route}: DynamicWorkspac
                     onBackButtonPress={() => Navigation.goBack(isQuickSettingsFlow ? backPath : undefined)}
                 />
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
+                    <ToggleSettingOptionRow
+                        title={translate('workspace.categories.autoCategorizeNewExpenses')}
+                        switchAccessibilityLabel={translate('workspace.categories.autoCategorizeNewExpenses')}
+                        isActive={policy?.autoCategorizeNewExpenses ?? true}
+                        onToggle={updateAutoCategorizeNewExpenses}
+                        pendingAction={policy?.pendingFields?.autoCategorizeNewExpenses}
+                        disabled={!policy?.areCategoriesEnabled || !hasEnabledCategories}
+                        wrapperStyle={[styles.pv2, styles.mh5]}
+                        errors={policy?.errorFields?.autoCategorizeNewExpenses ?? undefined}
+                        onCloseError={() => clearPolicyErrorField(policy?.id, 'autoCategorizeNewExpenses')}
+                    />
                     {!!policy?.glCodes && (
                         <ToggleSettingOptionRow
                             title={translate('workspace.categories.showCategoryGLCodes')}
diff --git a/src/pages/workspace/categories/ImportedCategoriesPage.tsx b/src/pages/workspace/categories/ImportedCategoriesPage.tsx
index a4056a650c5b..b1201064d06d 100644
--- a/src/pages/workspace/categories/ImportedCategoriesPage.tsx
+++ b/src/pages/workspace/categories/ImportedCategoriesPage.tsx
@@ -10,11 +10,12 @@ import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 
 import {importPolicyCategories} from '@libs/actions/Policy/Category';
+import {buildCategoriesFromSpreadsheet} from '@libs/ImportCategoriesUtils';
 import {findDuplicate, generateColumnNames} from '@libs/importSpreadsheetUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {hasAccountingConnections as hasAccountingConnectionsPolicyUtils, isControlPolicy} from '@libs/PolicyUtils';
+import {arePolicyRulesEnabled, hasAccountingConnections as hasAccountingConnectionsPolicyUtils, isControlPolicy} from '@libs/PolicyUtils';
 
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 
@@ -29,33 +30,6 @@ import type {RouteProp} from '@react-navigation/native';
 
 import React, {useCallback, useState} from 'react';
 
-/**
- * Parses a CSV cell value for receipt requirement columns.
- * Mirrors the OD import logic: "required"/"always_required" → 0,
- * "not_required" → DISABLED_MAX_EXPENSE_VALUE, numeric string → number.
- * Returns undefined for unmapped columns, empty/default values, or invalid input.
- */
-function parseCsvReceiptValue(raw: string | undefined): number | undefined {
-    if (raw === undefined) {
-        return undefined;
-    }
-    const trimmed = raw.trim().toLowerCase();
-    if (!trimmed || trimmed === 'default') {
-        return undefined;
-    }
-    if (trimmed === 'required' || trimmed === 'always_required') {
-        return 0;
-    }
-    if (trimmed === 'not_required') {
-        return CONST.DISABLED_MAX_EXPENSE_VALUE;
-    }
-    const num = Number(trimmed);
-    if (Number.isFinite(num) && num >= 0) {
-        return num;
-    }
-    return undefined;
-}
-
 type ImportedCategoriesPageProps = {
     route: RouteProp<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DYNAMIC_CATEGORIES_IMPORTED | typeof SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_IMPORTED>;
 };
@@ -88,11 +62,21 @@ function ImportedCategoriesPage({route}: ImportedCategoriesPageProps) {
         if (isControlPolicy(policy)) {
             roles.push(
                 {text: translate('workspace.categories.glCode'), value: CONST.CSV_IMPORT_COLUMNS.GL_CODE},
+                {text: translate('workspace.categories.payrollCode'), value: CONST.CSV_IMPORT_COLUMNS.PAYROLL_CODE},
                 {text: translate('workspace.rules.categoryRules.requireReceiptsOver'), value: CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_RECEIPT},
                 {text: translate('workspace.rules.categoryRules.requireItemizedReceiptsOver'), value: CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_ITEMIZED_RECEIPT},
             );
         }
 
+        if (arePolicyRulesEnabled(policy, policyCategories)) {
+            roles.push(
+                {text: translate('workspace.rules.categoryRules.requireDescription'), value: CONST.CSV_IMPORT_COLUMNS.ARE_COMMENTS_REQUIRED},
+                {text: translate('workspace.rules.categoryRules.descriptionHint'), value: CONST.CSV_IMPORT_COLUMNS.COMMENT_HINT},
+                {text: translate('workspace.rules.categoryRules.flagAmountsOver'), value: CONST.CSV_IMPORT_COLUMNS.MAX_EXPENSE_AMOUNT},
+                {text: translate('workspace.rules.categoryRules.expenseLimitType'), value: CONST.CSV_IMPORT_COLUMNS.EXPENSE_LIMIT_TYPE},
+            );
+        }
+
         return roles;
     };
 
@@ -139,35 +123,7 @@ function ImportedCategoriesPage({route}: ImportedCategoriesPageProps) {
             return;
         }
 
-        const columns = Object.values(spreadsheet?.columns ?? {});
-        const categoriesNamesColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.NAME);
-        const categoriesGLCodeColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.GL_CODE);
-        const categoriesEnabledColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.ENABLED);
-        const categoriesMaxAmountNoReceiptColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_RECEIPT);
-        const categoriesMaxAmountNoItemizedReceiptColumn = columns.findIndex((column) => column === CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_ITEMIZED_RECEIPT);
-        const categoriesNames = spreadsheet?.data[categoriesNamesColumn].map((name) => name);
-        const categoriesEnabled = categoriesEnabledColumn !== -1 ? spreadsheet?.data[categoriesEnabledColumn].map((enabled) => enabled) : [];
-        const categoriesGLCode = categoriesGLCodeColumn !== -1 ? spreadsheet?.data[categoriesGLCodeColumn].map((glCode) => glCode) : [];
-        const categoriesMaxAmountNoReceipt = categoriesMaxAmountNoReceiptColumn !== -1 ? spreadsheet?.data[categoriesMaxAmountNoReceiptColumn] : [];
-        const categoriesMaxAmountNoItemizedReceipt = categoriesMaxAmountNoItemizedReceiptColumn !== -1 ? spreadsheet?.data[categoriesMaxAmountNoItemizedReceiptColumn] : [];
-        const categories = categoriesNames?.slice(containsHeader ? 1 : 0).map((name, index) => {
-            const categoryAlreadyExists = policyCategories?.[name];
-            const existingGLCodeOrDefault = categoryAlreadyExists?.['GL Code'] ?? '';
-            const dataIndex = containsHeader ? index + 1 : index;
-
-            const parsedMaxAmountNoReceipt = categoriesMaxAmountNoReceiptColumn !== -1 ? parseCsvReceiptValue(categoriesMaxAmountNoReceipt?.[dataIndex]?.toString()) : undefined;
-            const parsedMaxAmountNoItemizedReceipt =
-                categoriesMaxAmountNoItemizedReceiptColumn !== -1 ? parseCsvReceiptValue(categoriesMaxAmountNoItemizedReceipt?.[dataIndex]?.toString()) : undefined;
-
-            return {
-                name,
-                enabled: categoriesEnabledColumn !== -1 ? ['true', 'yes'].includes(categoriesEnabled?.[dataIndex]?.toString().trim().toLowerCase() ?? '') : true,
-                // eslint-disable-next-line @typescript-eslint/naming-convention
-                'GL Code': categoriesGLCodeColumn !== -1 ? (categoriesGLCode?.[dataIndex] ?? '') : existingGLCodeOrDefault,
-                ...(parsedMaxAmountNoReceipt !== undefined && {maxAmountNoReceipt: parsedMaxAmountNoReceipt}),
-                ...(parsedMaxAmountNoItemizedReceipt !== undefined && {maxAmountNoItemizedReceipt: parsedMaxAmountNoItemizedReceipt}),
-            };
-        });
+        const categories = buildCategoriesFromSpreadsheet(spreadsheet, policyCategories);
 
         if (categories) {
             setIsImportingCategories(true);
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 40304f598e58..f70617af6aef 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -36,6 +36,7 @@ import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {isConnectionInProgress, isConnectionUnverified} from '@libs/actions/connections';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import {renameCategoryInline} from '@libs/actions/Policy/InlineEdit';
 import {getCategoryApproverRule, getDecodedCategoryName} from '@libs/CategoryUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -267,6 +268,8 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
     const shouldShowGLCodeColumn = Object.values(policyCategories ?? {}).some((category) => !!category['GL Code']) && isControlPolicyWithWideLayout;
     const shouldShowApproverColumn = isControlPolicyWithWideLayout && arePolicyRulesEnabled(policy, policyCategories) && Object.keys(categoryApproverEmails).length > 0;
 
+    const isSelectionModeActive = selectedCategoryKeys.length > 0 || isMobileSelectionModeEnabled;
+
     const categoryRows = useMemo<WorkspaceCategoryTableRowData[]>(() => {
         return categories.reduce<WorkspaceCategoryTableRowData[]>((acc, value) => {
             const isDisabled = value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
@@ -292,8 +295,10 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                 errors: value.errors ?? undefined,
                 pendingAction: value.pendingAction,
                 isLocked: isDisablingOrDeletingLastEnabledCategory(policy, policyCategories, [value]) || !canWriteCategories || isDisabled,
+                canEditName: canWriteCategories && !isDisabled && !isSelectionModeActive,
                 action: () => navigateToCategory(value),
                 onToggleEnabled: (enabled: boolean) => handleCategoryToggle(enabled, value),
+                onRenameName: (newName: string) => renameCategoryInline(policyData, value.name, newName, isVendorMatchingBetaEnabled),
                 dismissError: () => clearCategoryErrors(policyId, value.name, policyCategories),
             });
 
@@ -305,6 +310,8 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
         shouldShowApproverColumn,
         categoryApproverEmails,
         canWriteCategories,
+        isSelectionModeActive,
+        policyData,
         policy,
         policyCategories,
         navigateToCategory,
@@ -312,6 +319,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
         policyId,
         employeePersonalDetails,
         formatPhoneNumber,
+        isVendorMatchingBetaEnabled,
     ]);
 
     const navigateToCategoriesSettings = useCallback(() => {
@@ -370,7 +378,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
     const secondaryActions = useMemo(() => {
         const menuItems = [];
         // The other settings moved to Rules, so this is only worth showing for the GL codes toggle.
-        if (canWriteCategories && !!policy?.glCodes) {
+        if (canWriteCategories) {
             menuItems.push({
                 icon: icons.Gear,
                 text: translate('common.settings'),
@@ -418,7 +426,6 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
         translate,
         canWriteCategories,
         navigateToCategoriesSettings,
-        policy?.glCodes,
         policyHasAccountingConnections,
         hasVisibleCategories,
         navigateToImportSpreadsheet,
diff --git a/src/pages/workspace/companyCards/BankConnection/index.native.tsx b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
index c6c1a7505044..f0e0ea84804e 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.native.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.native.tsx
@@ -5,6 +5,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 
 import useCardFeeds from '@hooks/useCardFeeds';
+import useCompanyCardConnectionError from '@hooks/useCompanyCardConnectionError';
 import useDuplicateFeedDetection from '@hooks/useDuplicateFeedDetection';
 import useImportPlaidAccounts from '@hooks/useImportPlaidAccounts';
 import useIsBlockedToAddFeed from '@hooks/useIsBlockedToAddFeed';
@@ -22,7 +23,7 @@ import Navigation from '@libs/Navigation/Navigation';
 
 import WorkspaceCompanyCardsErrorConfirmation from '@pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation';
 
-import {setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
+import {clearAddNewCompanyCardErrors, setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
 import {getCompanyCardBankConnection} from '@userActions/getCompanyCardBankConnection';
 
 import CONST from '@src/CONST';
@@ -72,7 +73,7 @@ function BankConnection({policyID, feed, title}: BankConnectionProps) {
     const headerTitle = feed ? translate('workspace.companyCards.assignCard') : headerTitleAddCards;
     const onImportPlaidAccounts = useImportPlaidAccounts(policyID);
     const {updateBrokenConnection, isFeedConnectionBroken} = useUpdateFeedBrokenConnection({policyID, feed});
-    const isNewFeedHasError = !!(newFeed && cardFeeds?.[newFeed]?.errors);
+    const {errorMessage, hasError: isNewFeedHasError} = useCompanyCardConnectionError({cardFeeds, addNewCard, newFeed, isAddingNewCard: !feed});
     // importPlaidAccounts only writes these errors while repairing an existing feed, so the add-card flow ignores them
     const hasImportError = !!feed && !isEmptyObject(assignCard?.errors);
     const illustrations = useMemoizedLazyIllustrations(['BrokenCompanyCardBankConnection']);
@@ -101,6 +102,7 @@ function BankConnection({policyID, feed, title}: BankConnectionProps) {
             return;
         }
 
+        clearAddNewCompanyCardErrors();
         setAddNewCompanyCardStepAndData({step: CONST.COMPANY_CARDS.STEP.SELECT_BANK});
     };
 
@@ -230,6 +232,7 @@ function BankConnection({policyID, feed, title}: BankConnectionProps) {
                     <WorkspaceCompanyCardsErrorConfirmation
                         policyID={policyID}
                         newFeed={newFeed}
+                        errorMessage={errorMessage}
                     />
                 )}
             </FullPageOfflineBlockingView>
diff --git a/src/pages/workspace/companyCards/BankConnection/index.tsx b/src/pages/workspace/companyCards/BankConnection/index.tsx
index a62f955dba43..a01e820cdaa1 100644
--- a/src/pages/workspace/companyCards/BankConnection/index.tsx
+++ b/src/pages/workspace/companyCards/BankConnection/index.tsx
@@ -8,6 +8,7 @@ import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 
 import useCardFeeds from '@hooks/useCardFeeds';
+import useCompanyCardConnectionError from '@hooks/useCompanyCardConnectionError';
 import useDuplicateFeedDetection from '@hooks/useDuplicateFeedDetection';
 import useImportPlaidAccounts from '@hooks/useImportPlaidAccounts';
 import useIsBlockedToAddFeed from '@hooks/useIsBlockedToAddFeed';
@@ -25,7 +26,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import WorkspaceCompanyCardsErrorConfirmation from '@pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation';
 
 import {updateSelectedFeed} from '@userActions/Card';
-import {setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
+import {clearAddNewCompanyCardErrors, setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
 import {getCompanyCardBankConnection} from '@userActions/getCompanyCardBankConnection';
 
 import CONST from '@src/CONST';
@@ -74,7 +75,7 @@ function BankConnection({policyID, feed, title}: BankConnectionProps) {
     const isFeedExpired = feed ? isSelectedFeedExpired(cardFeeds?.[feed]) : false;
     const headerTitleAddCards = translate('workspace.companyCards.addCards');
     const headerTitle = feed ? translate('workspace.companyCards.assignCard') : headerTitleAddCards;
-    const isNewFeedHasError = !!(newFeed && cardFeeds?.[newFeed]?.errors);
+    const {errorMessage, hasError: isNewFeedHasError} = useCompanyCardConnectionError({cardFeeds, addNewCard, newFeed, isAddingNewCard: !feed});
     // importPlaidAccounts only writes these errors while repairing an existing feed, so the add-card flow ignores them
     const hasImportError = !!feed && !isEmptyObject(assignCard?.errors);
     const onImportPlaidAccounts = useImportPlaidAccounts(policyID);
@@ -106,6 +107,7 @@ function BankConnection({policyID, feed, title}: BankConnectionProps) {
             return;
         }
 
+        clearAddNewCompanyCardErrors();
         setAddNewCompanyCardStepAndData({step: CONST.COMPANY_CARDS.STEP.SELECT_BANK});
     };
 
@@ -220,6 +222,7 @@ function BankConnection({policyID, feed, title}: BankConnectionProps) {
                 <WorkspaceCompanyCardsErrorConfirmation
                     policyID={policyID}
                     newFeed={newFeed}
+                    errorMessage={errorMessage}
                 />
             );
         }
diff --git a/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardAccountSelectCardPage.tsx b/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardAccountSelectCardPage.tsx
index 6511c1d2f55a..7997aa4871f0 100644
--- a/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardAccountSelectCardPage.tsx
+++ b/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardAccountSelectCardPage.tsx
@@ -7,6 +7,7 @@ import useCardFeeds from '@hooks/useCardFeeds';
 import useCardsList from '@hooks/useCardsList';
 import useDynamicBackPath from '@hooks/useDynamicBackPath';
 import useEnvironment from '@hooks/useEnvironment';
+import useInitialSelection from '@hooks/useInitialSelection';
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import usePolicy from '@hooks/usePolicy';
@@ -17,6 +18,7 @@ import {setCompanyCardExportAccount} from '@libs/actions/CompanyCards';
 import {getCompanyCardFeed, getDomainOrWorkspaceAccountID, isExpensifyCard as isExpensifyCardUtil} from '@libs/CardUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
+import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import Navigation from '@navigation/Navigation';
@@ -71,7 +73,12 @@ function DynamicWorkspaceCompanyCardAccountSelectCardPage({route}: DynamicWorksp
     const featureName = isExpensifyCard ? CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED : CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED;
     const policyFeature = isExpensifyCard ? CONST.POLICY.POLICY_FEATURE.EXPENSIFY_CARD : CONST.POLICY.POLICY_FEATURE.COMPANY_CARDS;
 
-    const searchedListOptions = tokenizedSearch(exportMenuItem?.data ?? [], searchText, (option) => [option.text ?? option.value]);
+    // Freeze the export account selected when the page opened so it stays pinned to the top of the list.
+    const selectedExportValue = exportMenuItem?.data?.find((option) => option.isSelected)?.value;
+    const initialExportValue = useInitialSelection(selectedExportValue, {resetOnFocus: true});
+    // Pin the frozen initial account to the top of the full list before filtering, so it stays pinned while searching.
+    const orderedListOptions = moveInitialSelectionToTop(exportMenuItem?.data ?? [], initialExportValue !== undefined ? [String(initialExportValue)] : []);
+    const searchedListOptions = tokenizedSearch(orderedListOptions, searchText, (option) => [option.text ?? option.value]);
 
     const listEmptyContent = (
         <BlockingView
@@ -129,12 +136,13 @@ function DynamicWorkspaceCompanyCardAccountSelectCardPage({route}: DynamicWorksp
                 }}
                 onSelectRow={updateExportAccount}
                 initiallyFocusedOptionKey={exportMenuItem?.data?.find((mode) => mode.isSelected)?.keyForList}
+                shouldUpdateFocusedIndex
                 onBackButtonPress={() => Navigation.goBack(backPath)}
                 headerTitleAlreadyTranslated={exportMenuItem?.description}
                 listEmptyContent={listEmptyContent}
                 connectionName={connectedIntegration}
                 shouldShowTextInput={shouldShowTextInput}
-                isRowMultilineSupported
+                titleNumberOfLines={2}
             />
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx b/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx
index 98d48fb561f6..5ccb97cfc706 100644
--- a/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx
+++ b/src/pages/workspace/companyCards/DynamicWorkspaceCompanyCardDetailsPage.tsx
@@ -255,12 +255,10 @@ function DynamicWorkspaceCompanyCardDetailsPage({route}: DynamicWorkspaceCompany
                             {!!card?.nameValuePairs?.errorFields?.cardTitle && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
                         </MenuItemField>
                     </OfflineWithFeedback>
-                    <MenuItemWithTopDescription
-                        numberOfLinesTitle={3}
-                        description={translate('workspace.moreFeatures.companyCards.cardNumber')}
-                        title={maskCardNumber(card?.cardName ?? '', bank, true)}
-                        interactive={false}
-                        titleStyle={styles.walletCardNumber}
+                    <MenuItemField
+                        name={translate('workspace.moreFeatures.companyCards.cardNumber')}
+                        value={maskCardNumber(card?.cardName ?? '', bank, true)}
+                        numberOfLinesValue={3}
                     />
                     <OfflineWithFeedback
                         pendingAction={card?.pendingFields?.scrapeMinDate}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx
index 9746af98df80..848f4a2f3160 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardEditCardNamePage.tsx
@@ -13,10 +13,9 @@ import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID';
 
-import {getCompanyCardCustomName, getCompanyCardFeed, getCompanyFeeds, getDomainOrWorkspaceAccountID} from '@libs/CardUtils';
-import {addErrorMessage} from '@libs/ErrorUtils';
+import {getCardNameError, getCardNameErrorMessage, getCompanyCardCustomName, getCompanyCardFeed, getCompanyFeeds, getDomainOrWorkspaceAccountID} from '@libs/CardUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {getFieldRequiredErrors, isValidInputLength} from '@libs/ValidationUtils';
+import StringUtils from '@libs/StringUtils';
 
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -58,18 +57,18 @@ function WorkspaceCompanyCardEditCardNamePage({route, navigation}: WorkspaceComp
     const defaultValue = getCompanyCardCustomName(cardID, sharedCardCustomNames, customCardNames);
 
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM>) => {
-        updateCompanyCardName(domainOrWorkspaceAccountID, cardID, values[INPUT_IDS.NAME], getCompanyCardFeed(feed), defaultValue);
+        updateCompanyCardName(domainOrWorkspaceAccountID, cardID, StringUtils.sanitizeName(values[INPUT_IDS.NAME]), getCompanyCardFeed(feed), defaultValue);
         goBackToCardDetails();
     };
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM> => {
-        const errors = getFieldRequiredErrors(values, [INPUT_IDS.NAME], translate);
-        if (values.name) {
-            const {isValid, byteLength} = isValidInputLength(values.name, CONST.STANDARD_LENGTH_LIMIT);
-            if (!isValid) {
-                addErrorMessage(errors, INPUT_IDS.NAME, translate('common.error.characterLimitExceedCounter', byteLength, CONST.STANDARD_LENGTH_LIMIT));
-            }
+        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM> = {};
+        const error = getCardNameError(values.name);
+
+        if (error) {
+            errors[INPUT_IDS.NAME] = getCardNameErrorMessage(translate, error, values.name);
         }
+
         return errors;
     };
 
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
index 798bd4c3376b..3dcc16911b5c 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
@@ -201,11 +201,9 @@ function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedS
                                 showTooltip={false}
                                 item={itemWithError}
                                 onSelectRow={selectOtherFeed}
-                                isMultilineSupported
-                                isAlternateTextMultilineSupported
                                 alternateTextNumberOfLines={2}
                                 titleNumberOfLines={2}
-                                // BaseSelectListItem defaults to flex1 on the row; inside a column footer that makes rows split height and overlap. Size rows to content instead.
+                                // SingleSelectListItem defaults to flex1 on the row; inside a column footer that makes rows split height and overlap. Size rows to content instead.
                                 wrapperStyle={[styles.flexReset, styles.w100]}
                             />
                         );
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx
index 1e93e34f88fc..7cbf7e0a8633 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsErrorConfirmation.tsx
@@ -13,7 +13,7 @@ import {getCompanyCardFeed, getCompanyFeeds, getDomainOrWorkspaceAccountID} from
 
 import Navigation from '@navigation/Navigation';
 
-import {deleteWorkspaceCompanyCardFeed, setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
+import {clearAddNewCompanyCardErrors, deleteWorkspaceCompanyCardFeed, setAddNewCompanyCardStepAndData} from '@userActions/CompanyCards';
 import {enableExpensifyCard} from '@userActions/Policy/Policy';
 
 import CONST from '@src/CONST';
@@ -25,9 +25,10 @@ import React from 'react';
 type WorkspaceCompanyCardsErrorConfirmationProps = {
     policyID?: string;
     newFeed?: CompanyCardFeedWithDomainID;
+    errorMessage?: string;
 };
 
-function WorkspaceCompanyCardsErrorConfirmation({policyID, newFeed}: WorkspaceCompanyCardsErrorConfirmationProps) {
+function WorkspaceCompanyCardsErrorConfirmation({policyID, newFeed, errorMessage}: WorkspaceCompanyCardsErrorConfirmationProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const illustrations = useMemoizedLazyIllustrations(['BrokenCompanyCardBankConnection']);
@@ -61,6 +62,7 @@ function WorkspaceCompanyCardsErrorConfirmation({policyID, newFeed}: WorkspaceCo
         if (!policyID) {
             return;
         }
+        clearAddNewCompanyCardErrors();
         setAddNewCompanyCardStepAndData({
             step: CONST.COMPANY_CARDS.STEP.PLAID_CONNECTION,
             data: {
@@ -89,6 +91,7 @@ function WorkspaceCompanyCardsErrorConfirmation({policyID, newFeed}: WorkspaceCo
             heading={translate('workspace.moreFeatures.companyCards.bankConnectionError')}
             description={
                 <Text style={[styles.textSupporting, styles.textAlignCenter]}>
+                    {!!errorMessage && `${errorMessage} `}
                     {translate('workspace.moreFeatures.companyCards.bankConnectionDescription')}{' '}
                     <TextLink
                         style={[styles.link]}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx
index c6055c2696ed..159a9a5121e6 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsFeedPendingPage.tsx
@@ -7,6 +7,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {navigateToConciergeChat} from '@libs/actions/Report';
@@ -23,6 +24,7 @@ function WorkspaceCompanyCardsFeedPendingPage() {
     const {LaptopReviewCard} = useMemoizedLazyIllustrations(['LaptopReviewCard']);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
@@ -39,7 +41,14 @@ function WorkspaceCompanyCardsFeedPendingPage() {
                     {translate('workspace.moreFeatures.companyCards.pendingFeedDescription')}
                     <TextLink
                         onPress={() => {
-                            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+                            navigateToConciergeChat({
+                                conciergeReportID,
+                                introSelected,
+                                currentUserAccountID,
+                                isSelfTourViewed,
+                                conciergePersonalDetails,
+                                shouldDismissModal: false,
+                            });
                         }}
                     >
                         {' '}
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
index 50975ec2eeca..61dd90efe489 100644
--- a/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsSettingsPage.tsx
@@ -2,7 +2,6 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItem from '@components/MenuItem';
 import MenuItemAction from '@components/MenuItem/presets/MenuItemAction';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -154,15 +153,13 @@ function WorkspaceCompanyCardsSettingsPage({
                             onPress={navigateToChangeFeedName}
                         />
                         <OfflineWithFeedback pendingAction={selectedFeedData?.pendingFields?.statementPeriodEndDay}>
-                            <MenuItemWithTopDescription
-                                shouldShowRightIcon
-                                title={statementCloseDate?.toString()}
-                                description={translate('workspace.moreFeatures.companyCards.statementCloseDateTitle')}
-                                style={[styles.moneyRequestMenuItem]}
-                                titleStyle={styles.flex1}
+                            <MenuItemField
+                                value={statementCloseDate?.toString()}
+                                name={translate('workspace.moreFeatures.companyCards.statementCloseDateTitle')}
                                 onPress={navigateToChangeStatementCloseDate}
-                                brickRoadIndicator={selectedFeedData?.errorFields?.statementPeriodEndDay ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            />
+                            >
+                                {!!selectedFeedData?.errorFields?.statementPeriodEndDay && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                            </MenuItemField>
                         </OfflineWithFeedback>
                         <View style={[styles.mv3, styles.mh5]}>
                             <ToggleSettingOptionRow
diff --git a/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx b/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx
index 32e3aa771928..0ba5c55bd597 100644
--- a/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx
+++ b/src/pages/workspace/companyCards/addNew/DynamicAddNewCardPage.tsx
@@ -9,6 +9,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useIsBlockedToAddFeed from '@hooks/useIsBlockedToAddFeed';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {navigateToConciergeChat} from '@libs/actions/Report';
@@ -52,6 +53,7 @@ function DynamicAddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
     const {translate} = useLocalize();
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
     const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
 
@@ -108,7 +110,7 @@ function DynamicAddNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
             if (result.action !== ModalActions.CONFIRM) {
                 return;
             }
-            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
         });
     };
 
diff --git a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
index e8cf5eacb03f..2af98387ef93 100644
--- a/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/AssigneeStep.tsx
@@ -22,10 +22,11 @@ import {getCardAssignmentDateOption, getCardAssignmentStartDate, getDefaultCardN
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
+import {getSearchValueForPhoneOrEmail} from '@libs/OptionsListUtils';
 import {getHeaderMessage} from '@libs/PersonalDetailOptionsListUtils';
 import {canMemberWrite, filterGuideAndAccountManager, getGuideAndAccountManagerInfo, getIneligibleInvitees, isDeletedPolicyEmployee} from '@libs/PolicyUtils';
 import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import Navigation from '@navigation/Navigation';
diff --git a/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx b/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
index 067c14746f36..999bb4580051 100644
--- a/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
+++ b/src/pages/workspace/companyCards/assignCard/CardNameStep.tsx
@@ -11,10 +11,10 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {addErrorMessage} from '@libs/ErrorUtils';
+import {getCardNameError, getCardNameErrorMessage} from '@libs/CardUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getFieldRequiredErrors, isValidInputLength} from '@libs/ValidationUtils';
+import StringUtils from '@libs/StringUtils';
 
 import Navigation from '@navigation/Navigation';
 
@@ -44,7 +44,7 @@ function CardNameStep({route}: CardNameStepProps) {
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM>) => {
         setAssignCardStepAndData({
             cardToAssign: {
-                customCardName: values.name,
+                customCardName: StringUtils.sanitizeName(values.name),
                 isCustomCardNameEdited: true,
             },
             isEditing: false,
@@ -53,13 +53,13 @@ function CardNameStep({route}: CardNameStepProps) {
     };
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM> => {
-        const errors = getFieldRequiredErrors(values, [INPUT_IDS.NAME], translate);
-        if (values.name) {
-            const {isValid, byteLength} = isValidInputLength(values.name, CONST.STANDARD_LENGTH_LIMIT);
-            if (!isValid) {
-                addErrorMessage(errors, INPUT_IDS.NAME, translate('common.error.characterLimitExceedCounter', byteLength, CONST.STANDARD_LENGTH_LIMIT));
-            }
+        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_WORKSPACE_COMPANY_CARD_NAME_FORM> = {};
+        const error = getCardNameError(values.name);
+
+        if (error) {
+            errors[INPUT_IDS.NAME] = getCardNameErrorMessage(translate, error, values.name);
         }
+
         return errors;
     };
 
diff --git a/src/pages/workspace/companyCards/utils.tsx b/src/pages/workspace/companyCards/utils.tsx
index 74fcc198b211..8addbeed7074 100644
--- a/src/pages/workspace/companyCards/utils.tsx
+++ b/src/pages/workspace/companyCards/utils.tsx
@@ -84,7 +84,10 @@ type ProgramAccountExport = {
     type: typeof CONST.COMPANY_CARDS.EXPORT_RESOLVER.PROGRAM_ACCOUNT;
 
     /** The card NVP holding this integration's export account */
-    nvpKey: typeof CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_RILLET_EXPORT_ACCOUNT | typeof CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_DUALENTRY_EXPORT_ACCOUNT;
+    nvpKey:
+        | typeof CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_RILLET_EXPORT_ACCOUNT
+        | typeof CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_DUALENTRY_EXPORT_ACCOUNT
+        | typeof CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT;
 
     /** Every account, in connection order, because an account that is no longer offered can still be the resolved one */
     accounts: ProgramAccountOption[];
@@ -502,6 +505,42 @@ function getPolicyCardExportSettings(
                 },
             };
         }
+        case CONST.POLICY.CONNECTIONS.NAME.CAMPFIRE: {
+            const campfireConfig = policy?.connections?.campfire?.config;
+            const campfireData = policy?.connections?.campfire?.data;
+            const exportReimbursable = campfireConfig?.export?.reimbursable ?? CONST.CAMPFIRE_EXPORT_REIMBURSABLE.VENDOR_BILL;
+            const exportNonReimbursable = campfireConfig?.export?.nonReimbursable ?? CONST.CAMPFIRE_EXPORT_NON_REIMBURSABLE.JOURNAL_ENTRY;
+
+            return {
+                description: currentConnectionName
+                    ? translate('workspace.moreFeatures.companyCards.integrationExport', currentConnectionName, translate('workspace.campfire.cardAccount.label'))
+                    : undefined,
+                exportType: CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT,
+                shouldHideMenuItemDescription: true,
+                shouldShowMenuItemIcon: true,
+                shouldShowMenuItem:
+                    campfireConfig?.export?.exportToMultipleAccounts &&
+                    exportReimbursable === CONST.CAMPFIRE_EXPORT_REIMBURSABLE.VENDOR_BILL &&
+                    exportNonReimbursable === CONST.CAMPFIRE_EXPORT_NON_REIMBURSABLE.JOURNAL_ENTRY,
+                accountSelection: {
+                    type: CONST.COMPANY_CARDS.EXPORT_RESOLVER.PROGRAM_ACCOUNT,
+                    nvpKey: CONST.COMPANY_CARDS.EXPORT_CARD_TYPES.NVP_CAMPFIRE_EXPORT_ACCOUNT,
+                    accounts: (campfireData?.accounts ?? []).map((account) => ({
+                        id: account.id,
+                        label: `${account.id} ${account.name}`,
+                        keyForList: account.id,
+                        configKey: account.id,
+                        isSelectable:
+                            account.isActive && (account.accountSubtype === CONST.CAMPFIRE_ACCOUNT_SUBTYPE.CREDIT_CARD || account.accountSubtype === CONST.CAMPFIRE_ACCOUNT_SUBTYPE.BANK),
+                    })),
+                    workspaceProgramAccountKey: campfireConfig?.export?.creditCardAccountID,
+                    programAccountKeysByFeed: campfireConfig?.export?.cardProgramAccounts,
+                    exportsToLabel: translate('common.exportsTo'),
+                    defaultTitleSuffix: translate('common.default').toLocaleLowerCase(),
+                    defaultOptionPrefix: translate('common.default'),
+                },
+            };
+        }
         default:
             return undefined;
     }
diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx
index 7bf9dce5016a..d80b77989913 100644
--- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx
+++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsConfirmPage.tsx
@@ -42,6 +42,7 @@ function CopyPolicySettingsConfirmPage() {
     const [copyPolicySettingsState, copyPolicySettingsMetadata] = useOnyx(ONYXKEYS.COPY_POLICY_SETTINGS);
     const [allPolicyCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES);
     const [allPolicyTags] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
+    const [allRules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
 
     const sourcePolicy = sourcePolicyID ? policies?.[`${ONYXKEYS.COLLECTION.POLICY}${sourcePolicyID}`] : undefined;
     const targetPolicyIDs = copyPolicySettingsState?.targetPolicyIDs ?? [];
@@ -91,7 +92,7 @@ function CopyPolicySettingsConfirmPage() {
             Navigation.navigate(ROUTES.POLICY_COPY_SETTINGS_UPGRADE.getRoute(sourcePolicyID));
             return;
         }
-        copyPolicySettings(sourcePolicy, targetPolicies, parts, allPolicyCategories, allPolicyTags);
+        copyPolicySettings(sourcePolicy, targetPolicies, parts, allPolicyCategories, allPolicyTags, allRules);
         Navigation.dismissModal();
     };
 
diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx
index 74e0a79bd4ba..627f636a9eb0 100644
--- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx
+++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsProgressModal.tsx
@@ -4,6 +4,7 @@ import RenderHTML from '@components/RenderHTML';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearCopyPolicySettings, requestCopyPolicySettingsNotification, setCopyPolicySettingsData} from '@libs/actions/Policy/CopyPolicySettings';
@@ -26,6 +27,7 @@ function useCopyPolicySettingsProgressModal() {
     const [bulkPolicyCopySettings] = useOnyx(ONYXKEYS.NVP_BULK_POLICY_COPY_SETTINGS);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
 
     const copyInProgressStep = copyPolicySettings?.currentStep === CONST.POLICY.COPY_SETTINGS_MODAL_STEP.LOADING;
@@ -122,7 +124,7 @@ function useCopyPolicySettingsProgressModal() {
             shouldShowCancelButton: true,
             onConfirm: () => {
                 clearCopyPolicySettings();
-                navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+                navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
             },
             onCancel: () => {
                 clearCopyPolicySettings();
diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx
index 43923a0123a9..957a98d2fad6 100644
--- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx
+++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsSelectFeaturesPage.tsx
@@ -13,6 +13,8 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import {usePersonalDetailsByLogins} from '@hooks/usePersonalDetailByLogin';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
+import useRulesPrefetch from '@hooks/useRulesPrefetch';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {setCopyPolicySettingsData} from '@libs/actions/Policy/CopyPolicySettings';
@@ -54,6 +56,7 @@ import type SCREENS from '@src/SCREENS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import {useRoute} from '@react-navigation/native';
+import {createExpenseDefaultRuleCountSelector} from '@selectors/Rule';
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 
@@ -81,6 +84,8 @@ function CopyPolicySettingsSelectFeaturesPage() {
     const [copyPolicySettings] = useOnyx(ONYXKEYS.COPY_POLICY_SETTINGS);
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${sourcePolicyID}`);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${sourcePolicyID}`);
+    const [codingRulesCount = 0] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: createExpenseDefaultRuleCountSelector(sourcePolicyID)});
+    useRulesPrefetch();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
 
     const sourcePolicy = sourcePolicyID ? policies?.[`${ONYXKEYS.COLLECTION.POLICY}${sourcePolicyID}`] : undefined;
@@ -98,9 +103,9 @@ function CopyPolicySettingsSelectFeaturesPage() {
     const hasTargetWithoutAddress = targetPolicies.some((policy) => isEmptyObject(policy?.address));
 
     const sourceEmployeePersonalDetails = usePersonalDetailsByLogins(Object.keys(sourcePolicy?.employeeList ?? {}));
-    const [memberCount = 0] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: createFilteredMemberCountSelector(sourcePolicy?.employeeList, sourcePolicy?.owner, currentUserPersonalDetails.login, sourceEmployeePersonalDetails),
-    });
+    const [memberCount = 0] = useAllPersonalDetails(
+        createFilteredMemberCountSelector(sourcePolicy?.employeeList, sourcePolicy?.owner, currentUserPersonalDetails.login, sourceEmployeePersonalDetails),
+    );
     const invoiceCompany = [sourcePolicy?.invoice?.companyName, sourcePolicy?.invoice?.companyWebsite].filter(Boolean).join(', ');
     const [invoiceConfigurationText = ''] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {
         selector: createInvoiceConfigurationTextSelector(translate, invoiceCompany),
@@ -116,7 +121,6 @@ function CopyPolicySettingsSelectFeaturesPage() {
     const policyFields = Object.values(getReportFieldsByPolicyID(sourcePolicy) ?? {}).filter((field) => field.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
     const reportFieldsCount = policyFields.filter((field) => field.target !== CONST.REPORT_FIELD_TARGETS.INVOICE).length;
     const invoiceFieldsCount = policyFields.filter((field) => field.target === CONST.REPORT_FIELD_TARGETS.INVOICE).length;
-    const codingRulesCount = Object.values(sourcePolicy?.rules?.codingRules ?? {}).filter((rule) => rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length;
     const connectedIntegration = getAllValidConnectedIntegration(sourcePolicy, CONST.POLICY.CONNECTIONS.ACCOUNTING_CONNECTION_NAMES);
     const distanceRatesCount = Object.values(getDistanceRateCustomUnit(sourcePolicy)?.rates ?? {}).filter((rate) => rate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length;
     const perDiemRates = getPerDiemCustomUnit(sourcePolicy)?.rates ?? {};
diff --git a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsUpgradePage.tsx b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsUpgradePage.tsx
index edd02bc0de1d..fb4677c9f163 100644
--- a/src/pages/workspace/copyPolicySettings/CopyPolicySettingsUpgradePage.tsx
+++ b/src/pages/workspace/copyPolicySettings/CopyPolicySettingsUpgradePage.tsx
@@ -86,7 +86,8 @@ function CopyPolicySettingsUpgradePage() {
         if (!sourcePolicyID || !isDataLoaded || hasRequestedUpgrade || policiesToUpgrade.length > 0) {
             return;
         }
-        Navigation.navigate(ROUTES.POLICY_COPY_SETTINGS_CONFIRM.getRoute(sourcePolicyID));
+        // This step is no longer valid, so replace it instead of leaving it beneath Confirm in the navigation stack.
+        Navigation.navigate(ROUTES.POLICY_COPY_SETTINGS_CONFIRM.getRoute(sourcePolicyID), {forceReplace: true});
     }, [isDataLoaded, hasRequestedUpgrade, policiesToUpgrade.length, sourcePolicyID]);
 
     const onUpgrade = () => {
@@ -103,7 +104,8 @@ function CopyPolicySettingsUpgradePage() {
         if (!sourcePolicyID) {
             return;
         }
-        Navigation.navigate(ROUTES.POLICY_COPY_SETTINGS_CONFIRM.getRoute(sourcePolicyID));
+        // Upgrade is a one-way step, so replace it to keep a refreshed stack from returning to the stale success view.
+        Navigation.navigate(ROUTES.POLICY_COPY_SETTINGS_CONFIRM.getRoute(sourcePolicyID), {forceReplace: true});
     };
 
     return (
diff --git a/src/pages/workspace/deleteWorkspace/DeleteWorkspaceFlow.tsx b/src/pages/workspace/deleteWorkspace/DeleteWorkspaceFlow.tsx
index f737d34247a8..03717d85e013 100644
--- a/src/pages/workspace/deleteWorkspace/DeleteWorkspaceFlow.tsx
+++ b/src/pages/workspace/deleteWorkspace/DeleteWorkspaceFlow.tsx
@@ -8,6 +8,7 @@ import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useOutstandingBalanceGuard from '@hooks/useOutstandingBalanceGuard';
 import usePayAndDowngrade from '@hooks/usePayAndDowngrade';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePrevious from '@hooks/usePrevious';
 import useScreenBoundDynamicRoute from '@hooks/useScreenBoundDynamicRoute';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -91,7 +92,7 @@ function DeleteWorkspaceFlow({policyID, onDismiss, onDeleteComplete}: DeleteWork
     });
     const [travelCardSettings, travelCardSettingsResult] = useOnyx(getTravelBillingCardSettingsKey(workspaceAccountID));
     const {reportsToArchive, transactionViolations, reportsResult, transactionsResult, transactionViolationsResult} = useTransactionViolationOfWorkspace(policyID);
-    const [accountIDToLogin] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: accountIDToLoginSelector(reportsToArchive)});
+    const [accountIDToLogin] = useAllPersonalDetails(accountIDToLoginSelector(reportsToArchive));
 
     const isLoadingData = isLoadingOnyxValue(
         policiesResult,
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateNameEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateNameEditPage.tsx
index 5e18d55051d8..b30b7ff4d0d4 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateNameEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateNameEditPage.tsx
@@ -12,7 +12,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import {getDistanceRateNameError, getDistanceRateNameErrorMessage} from '@libs/PolicyDistanceRatesUtils';
 import {getDistanceRateCustomUnit} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
 
@@ -46,15 +48,11 @@ function PolicyDistanceRateNameEditPage({route}: PolicyDistanceRateNameEditPageP
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_NAME_EDIT_FORM>) => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_NAME_EDIT_FORM> = {};
-            const newRateName = values.rateName.trim();
-
-            if (!newRateName) {
-                errors.rateName = translate('workspace.distanceRates.errors.rateNameRequired');
-            } else if (Object.values(customUnit?.rates ?? {}).some((r) => r.name === newRateName) && currentRateName !== newRateName) {
-                errors.rateName = translate('workspace.distanceRates.errors.existingRateName');
-            } else if ([...newRateName].length > CONST.TAX_RATES.NAME_MAX_LENGTH) {
-                // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
-                errors.rateName = translate('common.error.characterLimitExceedCounter', [...newRateName].length, CONST.TAX_RATES.NAME_MAX_LENGTH);
+            const existingRateNames = Object.values(customUnit?.rates ?? {}).map((existingRate) => existingRate.name ?? '');
+            const nameError = getDistanceRateNameError(existingRateNames, values.rateName, currentRateName);
+
+            if (nameError) {
+                errors.rateName = getDistanceRateNameErrorMessage(translate, nameError, values.rateName);
             }
 
             return errors;
@@ -67,11 +65,12 @@ function PolicyDistanceRateNameEditPage({route}: PolicyDistanceRateNameEditPageP
             if (!customUnit || !rate) {
                 return;
             }
-            if (currentRateName === values.rateName) {
+            const sanitized = StringUtils.sanitizeName(values.rateName);
+            if (currentRateName === sanitized) {
                 Navigation.goBack();
                 return;
             }
-            updatePolicyDistanceRateName(policyID, customUnit, [{...rate, name: values.rateName}]);
+            updatePolicyDistanceRateName(policyID, customUnit, [{...rate, name: sanitized}]);
             Keyboard.dismiss();
             Navigation.goBack();
         },
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index de8c2c657abd..b9995ac400b4 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -33,6 +33,7 @@ import {
     openPolicyDistanceRatesPage,
     setPolicyDistanceRatesEnabled,
 } from '@libs/actions/Policy/DistanceRate';
+import {renameDistanceRateInline, updateDistanceRateValueInline} from '@libs/actions/Policy/InlineEdit';
 import {convertAmountToDisplayString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -65,7 +66,7 @@ function PolicyDistanceRatesPage({
     const icons = useMemoizedLazyExpensifyIcons(['Checkmark', 'Close', 'Gear', 'Plus', 'Trashcan']);
     const {shouldUseNarrowLayout, isInLandscapeMode} = useResponsiveLayout();
     const styles = useThemeStyles();
-    const {translate} = useLocalize();
+    const {translate, toLocaleDigit} = useLocalize();
     const {showConfirmModal} = useConfirmModal();
     const policy = usePolicy(policyID);
     useWorkspaceDocumentTitle(policy?.name, 'workspace.common.distanceRates');
@@ -153,6 +154,8 @@ function PolicyDistanceRatesPage({
 
     useCleanupSelectedOptions(clearTableSelection);
 
+    const isSelectionModeActive = selectedDistanceRates.length > 0 || isMobileSelectionModeEnabled;
+
     const canDisableOrDeleteSelectedRates = useMemo(
         () =>
             Object.keys(selectableRates)
@@ -315,18 +318,35 @@ function PolicyDistanceRatesPage({
                     formattedRate: `${convertAmountToDisplayString(rate.rate, rate.currency ?? CONST.CURRENCY.USD)} / ${unitTranslation}`,
                     pendingAction: resolvedPendingAction ?? undefined,
                     errors: rate.errors ?? undefined,
+                    canEditName: canWriteDistanceRates && !isDeleting && !isSelectionModeActive,
+                    canEditRate: canWriteDistanceRates && !isDeleting && !isSelectionModeActive,
                     action: () => openRateDetailsByID(rate.customUnitRateID),
                     dismissError: () => dismissErrorByID(rate.customUnitRateID),
                     onToggleEnabled: (value: boolean) => updateDistanceRateEnabled(value, rate.customUnitRateID),
+                    onRenameName: (newName: string) => {
+                        if (!customUnit) {
+                            return;
+                        }
+                        renameDistanceRateInline(policyID, customUnit, rate, newName);
+                    },
+                    onChangeRate: (newRate: string) => {
+                        if (!customUnit) {
+                            return;
+                        }
+                        updateDistanceRateValueInline(policyID, customUnit, rate, newRate, toLocaleDigit);
+                    },
                 };
             }),
         [
             customUnitRates,
             unitTranslation,
-            customUnit?.pendingFields?.attributes,
+            customUnit,
             policy?.pendingAction,
             canWriteDistanceRates,
             canDisableOrDeleteRate,
+            isSelectionModeActive,
+            policyID,
+            toLocaleDigit,
             openRateDetailsByID,
             dismissErrorByID,
             updateDistanceRateEnabled,
diff --git a/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx b/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx
index 99390334fe1f..4b49d7560645 100644
--- a/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx
+++ b/src/pages/workspace/duplicate/WorkspaceDuplicateSelectFeaturesForm.tsx
@@ -12,9 +12,12 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import {usePersonalDetailsByLogins} from '@hooks/usePersonalDetailByLogin';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
+import useRulesPrefetch from '@hooks/useRulesPrefetch';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {getExpenseDefaultRuleCount} from '@libs/ExpenseDefaultRuleUtils';
 import {readFileAsync} from '@libs/fileDownload/FileUtils';
 import {createFilteredMemberCountSelector, createInvoiceConfigurationTextSelector, getDistanceRateCustomUnit, getPerDiemCustomUnit, isCollectPolicy} from '@libs/PolicyUtils';
 import {formatAddressToString} from '@libs/ReportActionsUtils';
@@ -46,12 +49,14 @@ function WorkspaceDuplicateSelectFeaturesForm({policyID}: WorkspaceDuplicateForm
     const isCollect = isCollectPolicy(policy);
     const {showConfirmModal} = useConfirmModal();
     const [duplicateWorkspace] = useOnyx(ONYXKEYS.DUPLICATE_WORKSPACE);
+    const [allRules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    useRulesPrefetch();
     const [duplicatedWorkspaceAvatar, setDuplicatedWorkspaceAvatar] = useState<File | undefined>();
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
     const taxesLength = Object.values(policy?.taxRates?.taxes ?? {}).filter((tax) => tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length ?? 0;
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
     const categoriesCount = Object.values(policyCategories ?? {}).filter((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length;
-    const codingRulesCount = Object.values(policy?.rules?.codingRules ?? {}).filter((rule) => rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE).length;
+    const codingRulesCount = getExpenseDefaultRuleCount(allRules, policy?.id);
     const [selectedItems, setSelectedItems] = useState<string[]>([]);
     const policyFields = Object.values(getReportFieldsByPolicyID(policy) ?? {}).filter((field) => field.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
     const reportFields = policyFields.filter((field) => field.target !== CONST.REPORT_FIELD_TARGETS.INVOICE).length;
@@ -62,9 +67,7 @@ function WorkspaceDuplicateSelectFeaturesForm({policyID}: WorkspaceDuplicateForm
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const employeePersonalDetails = usePersonalDetailsByLogins(Object.keys(policy?.employeeList ?? {}));
     const totalMembersSelector = createFilteredMemberCountSelector(policy?.employeeList, policy?.owner, currentUserPersonalDetails.login, employeePersonalDetails);
-    const [totalMembers = 0] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-        selector: totalMembersSelector,
-    });
+    const [totalMembers = 0] = useAllPersonalDetails(totalMembersSelector);
     // The invoicing company details are provisioned per workspace, so they aren't copied over to the duplicate and shouldn't be advertised here.
     const invoiceConfigurationTextSelector = createInvoiceConfigurationTextSelector(translate, '');
     const [invoiceConfigurationText = ''] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST, {
@@ -246,6 +249,7 @@ function WorkspaceDuplicateSelectFeaturesForm({policyID}: WorkspaceDuplicateForm
             },
             file: duplicatedWorkspaceAvatar,
             localCurrency: currentUserPersonalDetails?.localCurrencyCode ?? CONST.CURRENCY.USD,
+            rules: allRules,
         });
         Navigation.closeRHPFlow();
     };
diff --git a/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage.tsx b/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage.tsx
index ae57d6181e41..9285c419db19 100644
--- a/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage.tsx
+++ b/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitPage.tsx
@@ -17,7 +17,13 @@ import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateExpensifyCardLimit} from '@libs/actions/Card';
-import {filterInactiveCardsForWorkspace} from '@libs/CardUtils';
+import {
+    filterInactiveCardsForWorkspace,
+    getExpensifyCardLimitChangeWarningKey,
+    getExpensifyCardLimitError,
+    getExpensifyCardLimitErrorMessage,
+    getExpensifyCardNewAvailableSpend,
+} from '@libs/CardUtils';
 import {convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import {getFieldRequiredErrors} from '@libs/ValidationUtils';
@@ -33,9 +39,7 @@ import {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/EditExpensifyCardLimitForm';
 
-import React, {useCallback, useEffect, useMemo, useRef} from 'react';
-
-type ConfirmationWarningTranslationPaths = 'workspace.expensifyCard.smartLimitWarning' | 'workspace.expensifyCard.monthlyLimitWarning' | 'workspace.expensifyCard.fixedLimitWarning';
+import React, {useCallback, useEffect, useRef} from 'react';
 
 type DynamicExpensifyCardLimitPageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.EXPENSIFY_CARD.DYNAMIC_EXPENSIFY_CARD_LIMIT>;
 
@@ -61,26 +65,9 @@ function DynamicExpensifyCardLimitPage({route}: DynamicExpensifyCardLimitPagePro
         cardRef.current = card;
     }, [card]);
 
-    const getPromptTextKey = useMemo((): ConfirmationWarningTranslationPaths => {
-        switch (card?.nameValuePairs?.limitType) {
-            case CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART:
-                return 'workspace.expensifyCard.smartLimitWarning';
-            case CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED:
-                return 'workspace.expensifyCard.fixedLimitWarning';
-            case CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY:
-                return 'workspace.expensifyCard.monthlyLimitWarning';
-            default:
-                return 'workspace.expensifyCard.fixedLimitWarning';
-        }
-    }, [card?.nameValuePairs?.limitType]);
-
-    const getNewAvailableSpend = (newLimit: number) => {
-        const latestCard = cardRef.current;
-        const currentLimit = latestCard?.nameValuePairs?.unapprovedExpenseLimit ?? 0;
-        const currentSpend = currentLimit - (latestCard?.availableSpend ?? 0);
+    const getPromptTextKey = () => getExpensifyCardLimitChangeWarningKey(cardRef.current?.nameValuePairs?.limitType);
 
-        return newLimit - currentSpend;
-    };
+    const getNewAvailableSpend = (newLimit: number) => getExpensifyCardNewAvailableSpend(cardRef.current, newLimit);
 
     const goBack = useCallback(() => {
         Navigation.goBack(backPath, {compareParams: false});
@@ -110,7 +97,7 @@ function DynamicExpensifyCardLimitPage({route}: DynamicExpensifyCardLimitPagePro
         if (newAvailableSpend <= 0) {
             showConfirmModal({
                 title: translate('workspace.expensifyCard.changeCardLimit'),
-                prompt: translate(getPromptTextKey, convertToDisplayString(newLimit, currency)),
+                prompt: translate(getPromptTextKey(), convertToDisplayString(newLimit, currency)),
                 confirmText: translate('workspace.expensifyCard.changeLimit'),
                 cancelText: translate('common.cancel'),
                 buttonVariant: CONST.BUTTON_VARIANT.DANGER,
@@ -130,15 +117,13 @@ function DynamicExpensifyCardLimitPage({route}: DynamicExpensifyCardLimitPagePro
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM> => {
             const errors = getFieldRequiredErrors(values, [INPUT_IDS.LIMIT], translate);
-
-            if (Number.isNaN(Number(values.limit))) {
-                errors.limit = translate('iou.error.invalidAmount');
-            } else if (!Number.isInteger(Number(values.limit))) {
-                errors.limit = translate('iou.error.invalidIntegerAmount');
+            if (errors.limit) {
+                return errors;
             }
 
-            if (Number(values.limit) > CONST.EXPENSIFY_CARD.LIMIT_VALUE) {
-                errors.limit = translate('workspace.card.issueNewCard.cardLimitError');
+            const limitError = getExpensifyCardLimitError(values.limit);
+            if (limitError) {
+                errors.limit = getExpensifyCardLimitErrorMessage(translate, limitError);
             }
             return errors;
         },
diff --git a/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage.tsx b/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage.tsx
index b2816360222c..417fe92dba66 100644
--- a/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage.tsx
+++ b/src/pages/workspace/expensifyCard/DynamicExpensifyCardLimitTypePage.tsx
@@ -27,7 +27,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateExpensifyCardLimitType} from '@libs/actions/Card';
 import {openPolicyEditCardLimitTypePage} from '@libs/actions/Policy/Policy';
-import {filterInactiveCardsForWorkspace, getDefaultExpensifyCardLimitType} from '@libs/CardUtils';
+import {
+    filterInactiveCardsForWorkspace,
+    getDefaultExpensifyCardLimitType,
+    getExpensifyCardLimitTypeChangeWarningKey,
+    getVisibleExpensifyCardLimitTypes,
+    shouldConfirmExpensifyCardLimitTypeChange,
+} from '@libs/CardUtils';
 import DateUtils from '@libs/DateUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import {canMemberRead, getApprovalWorkflow} from '@libs/PolicyUtils';
@@ -77,10 +83,6 @@ function DynamicExpensifyCardLimitTypePage({route}: WorkspaceEditCardLimitTypePa
     const areApprovalsConfigured = getApprovalWorkflow(policy) !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
     const defaultLimitType = getDefaultExpensifyCardLimitType(policy);
     const initialLimitType = card?.nameValuePairs?.limitType ?? defaultLimitType;
-    const promptTranslationKey =
-        initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY || initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED
-            ? 'workspace.expensifyCard.changeCardSmartLimitTypeWarning'
-            : 'workspace.expensifyCard.changeCardMonthlyLimitTypeWarning';
 
     const [typeSelected, setTypeSelected] = useState(initialLimitType);
     const [expirationToggle, setExpirationToggle] = useState(!!card?.nameValuePairs?.validFrom);
@@ -107,44 +109,24 @@ function DynamicExpensifyCardLimitTypePage({route}: WorkspaceEditCardLimitTypePa
     useFocusEffect(fetchCardLimitTypeData);
 
     const updateCardLimitType = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_TYPE_FORM>) => {
-        updateExpensifyCardLimitType(
-            defaultFundID,
-            Number(cardID),
-            typeSelected,
-            assigneeTimeZone,
-            latestCardRef.current?.nameValuePairs,
-            values[INPUT_IDS.VALID_FROM],
-            values[INPUT_IDS.VALID_THRU],
-            !expirationToggle,
-        );
+        updateExpensifyCardLimitType({
+            workspaceAccountID: defaultFundID,
+            cardID: Number(cardID),
+            newLimitType: typeSelected,
+            timeZone: assigneeTimeZone,
+            oldCardNameValuePairs: latestCardRef.current?.nameValuePairs,
+            validFrom: values[INPUT_IDS.VALID_FROM],
+            validThru: values[INPUT_IDS.VALID_THRU],
+            shouldClearValidityDates: !expirationToggle,
+        });
         goBack();
     };
 
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_TYPE_FORM>) => {
-        let shouldShowConfirmModal = false;
-        if (!!card?.unapprovedSpend && card?.nameValuePairs?.unapprovedExpenseLimit) {
-            // Spends are coming as negative numbers from the backend and we need to make it positive for the correct expression.
-            const unapprovedSpend = Math.abs(card.unapprovedSpend);
-            const isUnapprovedSpendOverLimit = unapprovedSpend >= card.nameValuePairs.unapprovedExpenseLimit;
-
-            const validCombinations = [
-                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],
-                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY],
-                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],
-                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY],
-            ];
-            // Check if the combination exists in validCombinations
-            const isValidCombination = validCombinations.some(([limitType, selectedType]) => initialLimitType === limitType && typeSelected === selectedType);
-
-            if (isValidCombination && isUnapprovedSpendOverLimit) {
-                shouldShowConfirmModal = true;
-            }
-        }
-
-        if (shouldShowConfirmModal) {
+        if (shouldConfirmExpensifyCardLimitTypeChange(card, typeSelected, defaultLimitType)) {
             showConfirmModal({
                 title: translate('workspace.expensifyCard.changeCardLimitType'),
-                prompt: translate(promptTranslationKey, convertToDisplayString(card?.nameValuePairs?.unapprovedExpenseLimit, currency)),
+                prompt: translate(getExpensifyCardLimitTypeChangeWarningKey(initialLimitType), convertToDisplayString(card?.nameValuePairs?.unapprovedExpenseLimit, currency)),
                 confirmText: translate('workspace.expensifyCard.changeLimitType'),
                 cancelText: translate('common.cancel'),
                 buttonVariant: CONST.BUTTON_VARIANT.DANGER,
@@ -155,22 +137,13 @@ function DynamicExpensifyCardLimitTypePage({route}: WorkspaceEditCardLimitTypePa
                 }
                 updateCardLimitType(values);
             });
-        } else {
-            updateCardLimitType(values);
+            return;
         }
-    };
 
-    let shouldShowFixedOption = true;
+        updateCardLimitType(values);
+    };
 
-    if (card?.totalSpend && card?.nameValuePairs?.unapprovedExpenseLimit) {
-        const totalSpend = Math.abs(card.totalSpend);
-        if (
-            (initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY || initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART) &&
-            totalSpend >= card.nameValuePairs?.unapprovedExpenseLimit
-        ) {
-            shouldShowFixedOption = false;
-        }
-    }
+    const visibleLimitTypes = getVisibleExpensifyCardLimitTypes(card, policy);
 
     // Only link to the Workflows page when the current user can actually read it. Card admins without Workflows
     // access would otherwise be dropped onto the Not Found page. When they lack access, render plain (non-linked) text.
@@ -205,7 +178,7 @@ function DynamicExpensifyCardLimitTypePage({route}: WorkspaceEditCardLimitTypePa
         isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
     });
 
-    if (shouldShowFixedOption) {
+    if (visibleLimitTypes.includes(CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED)) {
         data.push({
             value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
             label: translate('workspace.card.issueNewCard.fixedAmount'),
@@ -215,7 +188,7 @@ function DynamicExpensifyCardLimitTypePage({route}: WorkspaceEditCardLimitTypePa
         });
     }
 
-    if (card?.nameValuePairs?.isVirtual) {
+    if (visibleLimitTypes.includes(CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE)) {
         data.push({
             value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE,
             label: translate('workspace.card.issueNewCard.singleUse'),
diff --git a/src/pages/workspace/expensifyCard/DynamicExpensifyCardNamePage.tsx b/src/pages/workspace/expensifyCard/DynamicExpensifyCardNamePage.tsx
index 7b521bb13c7b..cc5ef34006bb 100644
--- a/src/pages/workspace/expensifyCard/DynamicExpensifyCardNamePage.tsx
+++ b/src/pages/workspace/expensifyCard/DynamicExpensifyCardNamePage.tsx
@@ -13,10 +13,9 @@ import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {updateExpensifyCardTitle} from '@libs/actions/Card';
-import {filterInactiveCardsForWorkspace} from '@libs/CardUtils';
-import {addErrorMessage} from '@libs/ErrorUtils';
+import {filterInactiveCardsForWorkspace, getCardNameError, getCardNameErrorMessage} from '@libs/CardUtils';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {getFieldRequiredErrors, isValidInputLength} from '@libs/ValidationUtils';
+import StringUtils from '@libs/StringUtils';
 
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -50,18 +49,18 @@ function DynamicExpensifyCardNamePage({route}: DynamicExpensifyCardNamePageProps
     }, [backPath]);
 
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM>) => {
-        updateExpensifyCardTitle(defaultFundID, Number(cardID), values[INPUT_IDS.NAME], card?.nameValuePairs?.cardTitle);
+        updateExpensifyCardTitle(defaultFundID, Number(cardID), StringUtils.sanitizeName(values[INPUT_IDS.NAME]), card?.nameValuePairs?.cardTitle);
         goBack();
     };
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM> => {
-        const errors = getFieldRequiredErrors(values, [INPUT_IDS.NAME], translate);
-        if (values.name) {
-            const {isValid, byteLength} = isValidInputLength(values.name, CONST.STANDARD_LENGTH_LIMIT);
-            if (!isValid) {
-                addErrorMessage(errors, INPUT_IDS.NAME, translate('common.error.characterLimitExceedCounter', byteLength, CONST.STANDARD_LENGTH_LIMIT));
-            }
+        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM> = {};
+        const error = getCardNameError(values.name);
+
+        if (error) {
+            errors[INPUT_IDS.NAME] = getCardNameErrorMessage(translate, error, values.name);
         }
+
         return errors;
     };
 
diff --git a/src/pages/workspace/expensifyCard/DynamicWorkspaceExpensifyCardDetailsPage.tsx b/src/pages/workspace/expensifyCard/DynamicWorkspaceExpensifyCardDetailsPage.tsx
index 96d279fedb68..dcdb0aadc346 100644
--- a/src/pages/workspace/expensifyCard/DynamicWorkspaceExpensifyCardDetailsPage.tsx
+++ b/src/pages/workspace/expensifyCard/DynamicWorkspaceExpensifyCardDetailsPage.tsx
@@ -27,6 +27,7 @@ import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hook
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetail} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -128,7 +129,6 @@ function DynamicWorkspaceExpensifyCardDetailsPage({route}: DynamicWorkspaceExpen
     const StyleUtils = useStyleUtils();
     const {showConfirmModal} = useConfirmModal();
 
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
@@ -151,7 +151,7 @@ function DynamicWorkspaceExpensifyCardDetailsPage({route}: DynamicWorkspaceExpen
         policyID,
         fundID: defaultFundID,
     });
-    const cardholder = personalDetails?.[card?.accountID ?? CONST.DEFAULT_NUMBER_ID];
+    const [cardholder] = usePersonalDetail(card?.accountID);
     const isVirtual = !!card?.nameValuePairs?.isVirtual;
     const formattedAvailableSpendAmount = convertToDisplayString(card?.availableSpend, currency);
     const formattedLimit = convertToDisplayString(card?.nameValuePairs?.unapprovedExpenseLimit, currency);
@@ -400,11 +400,9 @@ function DynamicWorkspaceExpensifyCardDetailsPage({route}: DynamicWorkspaceExpen
                             value={card?.nameValuePairs?.cardTitle}
                         />
                     </OfflineWithFeedback>
-                    <MenuItemWithTopDescription
-                        description={translate(isVirtual ? 'cardPage.virtualCardNumber' : 'cardPage.physicalCardNumber')}
-                        title={maskCard(card?.lastFourPAN)}
-                        interactive={false}
-                        titleStyle={styles.walletCardNumber}
+                    <MenuItemField
+                        name={translate(isVirtual ? 'cardPage.virtualCardNumber' : 'cardPage.physicalCardNumber')}
+                        value={maskCard(card?.lastFourPAN)}
                     />
                     {spendRulesSummary.length > 0 && (
                         <MenuItemWithTopDescription
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
index f7383078da64..7b9f19373ef0 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
@@ -15,6 +15,7 @@ import useDefaultFundID from '@hooks/useDefaultFundID';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -76,6 +77,7 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr
     const [conciergeChat] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${conciergeReportID}`);
     const [hasReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeReportID}`, {selector: Boolean});
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [guidedSetupAndTourStatus] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: guidedSetupAndTourStatusSelector});
     const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
     const isSelfTourViewed = guidedSetupAndTourStatus?.isSelfTourViewed;
@@ -133,7 +135,7 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr
         if (isGuidedSetupPending && !conciergeReportID) {
             // No Concierge chat exists yet: navigateToConciergeChat creates it and enqueues the onboarding OpenReport on
             // its create path. Wait for that promise so the limit-increase write lands after it in the queue.
-            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false}).then(() => {
+            navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false}).then(() => {
                 requestExpensifyCardLimitIncrease(settings?.paymentBankAccountID, defaultFundID);
             });
             return;
@@ -156,7 +158,7 @@ function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelPr
             });
         }
         requestExpensifyCardLimitIncrease(settings?.paymentBankAccountID, defaultFundID);
-        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, shouldDismissModal: false});
+        navigateToConciergeChat({conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails, shouldDismissModal: false});
     };
 
     const isCurrentBalanceType = type === CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.CURRENT_BALANCE;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
index f79462302b54..d324d5c481b1 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
@@ -28,7 +28,7 @@ import type {SettingsNavigatorParamList} from '@navigation/types';
 
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 
-import {configureExpensifyCardsForPolicy, setIssueNewCardStepAndData} from '@userActions/Card';
+import {clearIssueNewCardFormData, configureExpensifyCardsForPolicy, setIssueNewCardStepAndData} from '@userActions/Card';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -129,6 +129,7 @@ function WorkspaceExpensifyCardBankAccounts({route}: WorkspaceExpensifyCardBankA
         if (!policyID) {
             return;
         }
+        clearIssueNewCardFormData();
         setIssueNewCardStepAndData({policyID, isChangeAssigneeDisabled: false});
         Navigation.dismissModal();
         Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.path, ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID)));
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage.tsx
index 372466cfdadc..636b6131bcd4 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage.tsx
@@ -1,3 +1,4 @@
+import BlockingView from '@components/BlockingViews/BlockingView';
 import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/DelegateNoAccessModalProvider';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
@@ -63,7 +64,7 @@ function WorkspaceExpensifyCardFeedSelectorPage({route}: WorkspaceExpensifyCardF
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const styles = useThemeStyles();
-    const illustrations = useMemoizedLazyIllustrations(['ExpensifyCardImage']);
+    const illustrations = useMemoizedLazyIllustrations(['ExpensifyCardImage', 'Telescope']);
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['Plus']);
     const {isDelegateAccessRestricted} = useDelegateNoAccessState();
     const {showDelegateNoAccessModal} = useDelegateNoAccessActions();
@@ -207,8 +208,9 @@ function WorkspaceExpensifyCardFeedSelectorPage({route}: WorkspaceExpensifyCardF
     // Suppress the new-program branch on workspaces with unsupported currencies, and for members who cannot
     // reach the bank account setup page. These workspaces may only issue cards on existing feeds
     const shouldShowIssueCardButton = hasIssueCardFundID || (canEnrollNewCardProgram && canStartBankAccountSetup);
+    const shouldShowFooter = canWriteExpensifyCard && (shouldShowIssueCardButton || otherFeeds.length > 0);
 
-    const issueNewCardAndOtherFeedsFooter = canWriteExpensifyCard ? (
+    const issueNewCardAndOtherFeedsFooter = shouldShowFooter ? (
         <View style={[styles.w100, styles.flexColumn]}>
             {shouldShowIssueCardButton && (
                 <MenuItemAction
@@ -231,8 +233,6 @@ function WorkspaceExpensifyCardFeedSelectorPage({route}: WorkspaceExpensifyCardF
                                 showTooltip={false}
                                 item={item}
                                 onSelectRow={selectOtherFeed}
-                                isMultilineSupported
-                                isAlternateTextMultilineSupported
                                 alternateTextNumberOfLines={2}
                                 titleNumberOfLines={2}
                                 wrapperStyle={[styles.flexReset, styles.w100]}
@@ -244,6 +244,44 @@ function WorkspaceExpensifyCardFeedSelectorPage({route}: WorkspaceExpensifyCardF
         </View>
     ) : undefined;
 
+    const renderFeedListContent = () => {
+        if (primaryFeeds.length > 0) {
+            return (
+                <SelectionList
+                    ListItem={SingleSelectListItem}
+                    onSelectRow={selectFeed}
+                    data={primaryListData}
+                    alternateNumberOfSupportedLines={2}
+                    initiallyFocusedItemKey={lastSelectedExpensifyCardFeedID.toString()}
+                    addBottomSafeAreaPadding
+                    listFooterContent={issueNewCardAndOtherFeedsFooter}
+                    onDismissError={onDismissError}
+                />
+            );
+        }
+        if (issueNewCardAndOtherFeedsFooter) {
+            return (
+                <ScrollView
+                    addBottomSafeAreaPadding
+                    style={styles.flex1}
+                    keyboardShouldPersistTaps="handled"
+                >
+                    {issueNewCardAndOtherFeedsFooter}
+                </ScrollView>
+            );
+        }
+        return (
+            <BlockingView
+                addBottomSafeAreaPadding
+                icon={illustrations.Telescope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.expensifyCard.noCardFeedsAvailable')}
+                subtitle={translate('workspace.expensifyCard.noCardFeedsAvailableDescription')}
+            />
+        );
+    };
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -260,26 +298,7 @@ function WorkspaceExpensifyCardFeedSelectorPage({route}: WorkspaceExpensifyCardF
                     title={translate('workspace.companyCards.selectCards')}
                     onBackButtonPress={goBack}
                 />
-                {primaryFeeds.length > 0 ? (
-                    <SelectionList
-                        ListItem={SingleSelectListItem}
-                        onSelectRow={selectFeed}
-                        data={primaryListData}
-                        alternateNumberOfSupportedLines={2}
-                        initiallyFocusedItemKey={lastSelectedExpensifyCardFeedID.toString()}
-                        addBottomSafeAreaPadding
-                        listFooterContent={issueNewCardAndOtherFeedsFooter}
-                        onDismissError={onDismissError}
-                    />
-                ) : (
-                    <ScrollView
-                        addBottomSafeAreaPadding
-                        style={styles.flex1}
-                        keyboardShouldPersistTaps="handled"
-                    >
-                        {issueNewCardAndOtherFeedsFooter}
-                    </ScrollView>
-                )}
+                {renderFeedListContent()}
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
index 6677b96f52ee..de161969cb8c 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
@@ -6,6 +6,7 @@ import {useDelegateNoAccessActions, useDelegateNoAccessState} from '@components/
 import FeedSelector from '@components/FeedSelector';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import {useLockedAccountActions, useLockedAccountState} from '@components/LockedAccountModalProvider';
+import {ModalActions} from '@components/Modal/Global/ModalContext';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {WorkspaceExpensifyCardTableRowData} from '@components/Tables/WorkspaceExpensifyCardsTable';
 import WorkspaceExpensifyCardsTable from '@components/Tables/WorkspaceExpensifyCardsTable';
@@ -13,8 +14,9 @@ import Text from '@components/Text';
 
 import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
 import useCleanupSelectedOptions from '@hooks/useCleanupSelectedOptions';
+import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrencyForExpensifyCard from '@hooks/useCurrencyForExpensifyCard';
-import useDefaultFundID from '@hooks/useDefaultFundID';
+import {useCurrencyListActions} from '@hooks/useCurrencyList';
 import useEmptyViewHeaderHeight from '@hooks/useEmptyViewHeaderHeight';
 import useExpensifyCardFeedsForFeedSelector from '@hooks/useExpensifyCardFeedsForFeedSelector';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -33,7 +35,23 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import {clearIssueNewCardFormData, exportExpensifyCardListToCSV, setIssueNewCardStepAndData} from '@libs/actions/Card';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import {clearDeletePaymentMethodError} from '@libs/actions/PaymentMethods';
-import {getCardsByCardholderName, getCardSettings, isCurrencySupportedForECards} from '@libs/CardUtils';
+import {
+    canUpdateExpensifyCardLimitTypeInline,
+    getExpensifyCardLimitInlineUpdate,
+    renameExpensifyCardInline,
+    updateExpensifyCardLimitInline,
+    updateExpensifyCardLimitTypeInline,
+} from '@libs/actions/Policy/InlineEdit';
+import {
+    getCardsByCardholderName,
+    getCardSettings,
+    getDefaultExpensifyCardLimitType,
+    getExpensifyCardLimitChangeWarningKey,
+    getExpensifyCardLimitTypeChangeWarningKey,
+    getExpensifyCardNewAvailableSpend,
+    isCurrencySupportedForECards,
+    shouldConfirmExpensifyCardLimitTypeChange,
+} from '@libs/CardUtils';
 import {getExpensifyCardFeedDescription} from '@libs/ExpensifyCardFeedSelectorUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -51,11 +69,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {WorkspaceCardsList} from '@src/types/onyx';
+import type {Card, WorkspaceCardsList} from '@src/types/onyx';
+import type {CardLimitType} from '@src/types/onyx/Card';
 
 import type {OnyxEntry} from 'react-native-onyx';
 
-import React, {useCallback, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 
 import EmptyCardView from './EmptyCardView';
@@ -74,9 +93,10 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
     const {translate, formatPhoneNumber} = useLocalize();
     const styles = useThemeStyles();
     const isMobileSelectionModeEnabled = useMobileSelectionMode();
+    const {convertToDisplayString} = useCurrencyListActions();
+    const {showConfirmModal} = useConfirmModal();
     const policyID = route.params.policyID;
     const policy = usePolicy(policyID);
-    const defaultFundID = useDefaultFundID(policyID);
     const [personalDetails] = useAllPersonalDetails();
     const [cardOnWaitlist] = useOnyx(`${ONYXKEYS.COLLECTION.NVP_EXPENSIFY_ON_CARD_WAITLIST}${policyID}`);
     const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${fundID}`);
@@ -118,6 +138,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
     const shouldShowExportAccountColumn = !!cardExportSettings?.shouldShowMenuItem;
 
     const settlementCurrency = useCurrencyForExpensifyCard({policyID, fundID});
+    const defaultLimitType = getDefaultExpensifyCardLimitType(policy);
     const shouldShowEuUkDisclaimer = isCurrencySupportedForECards(settlementCurrency);
     const employeePersonalDetails = usePersonalDetailsByLogins(Object.keys(policy?.employeeList ?? {}));
     const allCards = useMemo(() => {
@@ -125,11 +146,20 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
         return getCardsByCardholderName(cardsList, policyMembersAccountIDs);
     }, [cardsList, policy?.employeeList, employeePersonalDetails]);
 
+    // Row click handlers close over the card from that render. Read the live list from a ref so
+    // no-op/confirm checks use the same card persist will use, and so confirm still persists
+    // current spend and rollback values if Onyx refreshes while the modal is open.
+    const cardsListRef = useRef(cardsList);
+    useEffect(() => {
+        cardsListRef.current = cardsList;
+    }, [cardsList]);
+
     const isCardListEmpty = allCards.length === 0;
     const [selectedCardKeys, setSelectedCardKeys] = useState<string[]>([]);
     const selectableCardKeySet = useMemo(() => new Set(allCards.map((card) => String(card.cardID))), [allCards]);
     const validatedSelectedCardKeys = useMemo(() => selectedCardKeys.filter((key) => selectableCardKeySet.has(key)), [selectedCardKeys, selectableCardKeySet]);
     const selectedCardIDs = useMemo(() => validatedSelectedCardKeys.map((key) => Number(key)), [validatedSelectedCardKeys]);
+    const isSelectionModeActive = selectedCardKeys.length > 0 || isMobileSelectionModeEnabled;
 
     const clearTableSelection = useCallback(() => {
         setSelectedCardKeys((prevSelectedCardKeys) => (prevSelectedCardKeys.length > 0 ? [] : prevSelectedCardKeys));
@@ -137,6 +167,72 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
 
     useCleanupSelectedOptions(clearTableSelection);
 
+    const changeCardLimitType = useCallback(
+        (card: Card, newLimitType: CardLimitType) => {
+            const latestCard = cardsListRef.current?.[String(card.cardID)] ?? card;
+            if (!canUpdateExpensifyCardLimitTypeInline(latestCard, newLimitType, defaultLimitType)) {
+                return;
+            }
+
+            const persistLimitType = () => updateExpensifyCardLimitTypeInline(fundID, cardsListRef.current?.[String(card.cardID)] ?? latestCard, newLimitType, defaultLimitType);
+
+            if (!shouldConfirmExpensifyCardLimitTypeChange(latestCard, newLimitType, defaultLimitType)) {
+                persistLimitType();
+                return;
+            }
+
+            showConfirmModal({
+                title: translate('workspace.expensifyCard.changeCardLimitType'),
+                prompt: translate(
+                    getExpensifyCardLimitTypeChangeWarningKey(latestCard.nameValuePairs?.limitType ?? defaultLimitType),
+                    convertToDisplayString(latestCard.nameValuePairs?.unapprovedExpenseLimit, settlementCurrency),
+                ),
+                confirmText: translate('workspace.expensifyCard.changeLimitType'),
+                cancelText: translate('common.cancel'),
+                buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+                shouldEnableNewFocusManagement: true,
+            }).then(({action}) => {
+                if (action !== ModalActions.CONFIRM) {
+                    return;
+                }
+                persistLimitType();
+            });
+        },
+        [convertToDisplayString, defaultLimitType, fundID, settlementCurrency, showConfirmModal, translate],
+    );
+
+    const changeCardLimit = useCallback(
+        (card: Card, newLimit: string) => {
+            const latestCard = cardsListRef.current?.[String(card.cardID)] ?? card;
+            const nextLimit = getExpensifyCardLimitInlineUpdate(latestCard, newLimit);
+            if (nextLimit === undefined) {
+                return;
+            }
+
+            const persistLimit = () => updateExpensifyCardLimitInline(fundID, cardsListRef.current?.[String(card.cardID)] ?? latestCard, newLimit);
+
+            if (getExpensifyCardNewAvailableSpend(latestCard, nextLimit) > 0) {
+                persistLimit();
+                return;
+            }
+
+            showConfirmModal({
+                title: translate('workspace.expensifyCard.changeCardLimit'),
+                prompt: translate(getExpensifyCardLimitChangeWarningKey(latestCard.nameValuePairs?.limitType ?? defaultLimitType), convertToDisplayString(nextLimit, settlementCurrency)),
+                confirmText: translate('workspace.expensifyCard.changeLimit'),
+                cancelText: translate('common.cancel'),
+                buttonVariant: CONST.BUTTON_VARIANT.DANGER,
+                shouldEnableNewFocusManagement: true,
+            }).then(({action}) => {
+                if (action !== ModalActions.CONFIRM) {
+                    return;
+                }
+                persistLimit();
+            });
+        },
+        [convertToDisplayString, defaultLimitType, fundID, settlementCurrency, showConfirmModal, translate],
+    );
+
     const cardRows = useMemo<WorkspaceExpensifyCardTableRowData[]>(
         () =>
             allCards.map((card) => {
@@ -149,6 +245,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
                           formatPhoneNumber,
                       }) || undefined
                     : undefined;
+                const canEditCard = canWriteExpensifyCard && card.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !isSelectionModeActive;
 
                 return {
                     keyForList: String(card.cardID),
@@ -168,11 +265,30 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
                     frozenDate: card.nameValuePairs?.frozen?.date,
                     errors: card.errors,
                     pendingAction: card.pendingAction,
+                    canEditName: canEditCard,
+                    canEditLimitType: canEditCard,
+                    canEditLimit: canEditCard,
                     action: () => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(card.cardID.toString()))),
-                    onClose: () => clearDeletePaymentMethodError(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, card.cardID),
+                    onRenameName: (newName: string) => renameExpensifyCardInline(fundID, card.cardID, newName, card.nameValuePairs?.cardTitle ?? ''),
+                    onChangeLimitType: (newLimitType: CardLimitType) => changeCardLimitType(card, newLimitType),
+                    onChangeLimit: (newLimit: string) => changeCardLimit(card, newLimit),
+                    onClose: () => clearDeletePaymentMethodError(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${fundID}_${CONST.EXPENSIFY_CARD.BANK}`, card.cardID),
                 };
             }),
-        [allCards, cardExportSettings, shouldShowExportAccountColumn, defaultFundID, personalDetails, settlementCurrency, translate, formatPhoneNumber],
+        [
+            allCards,
+            canWriteExpensifyCard,
+            cardExportSettings,
+            changeCardLimit,
+            changeCardLimitType,
+            formatPhoneNumber,
+            fundID,
+            isSelectionModeActive,
+            personalDetails,
+            settlementCurrency,
+            shouldShowExportAccountColumn,
+            translate,
+        ],
     );
 
     const bulkExportOptions: Array<DropdownOption<typeof CONST.EXPENSIFY_CARD.BULK_ACTIONS.EXPORT_CSV>> = [
@@ -187,6 +303,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
                     cards: selectedCards,
                     personalDetailsList: personalDetails,
                     settlementCurrency,
+                    defaultLimitType,
                     translate,
                     formatPhoneNumber,
                 });
@@ -366,6 +483,7 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
                 <View style={styles.flex1}>
                     <WorkspaceExpensifyCardsTable
                         policyID={policyID}
+                        policy={policy}
                         headerComponent={pageHeaderContent}
                         cards={cardRows}
                         selectionEnabled={cardRows.length > 0}
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
index 2162d77454ca..ad168b77419b 100644
--- a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
@@ -21,12 +21,12 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 
 import {clearIssueNewCardFormData} from '@libs/actions/Card';
-import {getEligibleBankAccountsForCard, getEligibleBankAccountsForUkEuCard} from '@libs/CardUtils';
+import {getExpensifyCardEnrollmentRoute} from '@libs/CardUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
 import {canEditWorkspaceSettings} from '@libs/PolicyUtils';
-import {hasInProgressUSDVBBA} from '@libs/ReimbursementAccountUtils';
+import {hasInProgressVBBA} from '@libs/ReimbursementAccountUtils';
 
 import Navigation from '@navigation/Navigation';
 
@@ -65,7 +65,7 @@ function WorkspaceExpensifyCardPageEmptyState({route, policy}: WorkspaceExpensif
     const {canWrite: canWriteExpensifyCard, showReadOnlyModal} = usePolicyFeatureWriteAccess(policy, CONST.POLICY.POLICY_FEATURE.EXPENSIFY_CARD);
     const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
 
-    const isSetupUnfinished = hasInProgressUSDVBBA(reimbursementAccount?.achData);
+    const isSetupUnfinished = !!policy?.id && hasInProgressVBBA(reimbursementAccount?.achData, policy.outputCurrency !== CONST.CURRENCY.USD, policy.id);
     const {canEnrollNewCardProgram, isUkEuCurrencySupported} = useCanEnrollNewExpensifyCardProgram(policy?.id);
     const shouldBlockCurrencyChange = useShouldBlockCurrencyChange(policy?.id);
 
@@ -84,34 +84,30 @@ function WorkspaceExpensifyCardPageEmptyState({route, policy}: WorkspaceExpensif
     const setupCtaTranslationKey = isSetupUnfinished ? 'workspace.expensifyCard.finishSetup' : 'workspace.expensifyCard.issueNewCard';
     const ctaTextTranslationKey = hasAccessibleFeeds ? 'workspace.moreFeatures.expensifyCard.feed.viewCards' : setupCtaTranslationKey;
 
-    const eligibleBankAccounts = isUkEuCurrencySupported
-        ? getEligibleBankAccountsForUkEuCard(bankAccountList, supportedCountriesByCurrency, policy?.outputCurrency)
-        : getEligibleBankAccountsForCard(bankAccountList);
-    const shouldStartBankAccountSetup = !eligibleBankAccounts.length || isSetupUnfinished;
     const canEditSettings = canEditWorkspaceSettings(policy, currentUserLogin);
     // Without an existing feed the only path forward is enrolling a new card program, and both the
     // bank account setup page and the currency page are admin only
     const shouldDisableCTA = !canWriteExpensifyCard || (!hasAccessibleFeeds && !canEditSettings);
 
     const startFlow = () => {
-        if (hasAccessibleFeeds && policy?.id) {
-            clearIssueNewCardFormData();
-            Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_SELECT_FEED.path, ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policy.id)));
+        if (!policy?.id) {
             return;
         }
-        if (shouldStartBankAccountSetup) {
-            Navigation.navigate(
-                ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute({
-                    policyID: policy?.id,
-                    backTo: ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policy?.id),
-                }),
-            );
-            return;
-        }
-        if (policy?.id) {
+        if (hasAccessibleFeeds) {
             clearIssueNewCardFormData();
             Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_EXPENSIFY_CARD_SELECT_FEED.path, ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policy.id)));
+            return;
         }
+        Navigation.navigate(
+            getExpensifyCardEnrollmentRoute({
+                policyID: policy.id,
+                currencyCode: policy.outputCurrency,
+                isUkEuCurrencySupported,
+                bankAccountsList: bankAccountList,
+                supportedCountriesByCurrency,
+                achData: reimbursementAccount?.achData,
+            }),
+        );
     };
 
     const expensifyCardFeatures: FeatureListItem[] = [
@@ -143,7 +139,7 @@ function WorkspaceExpensifyCardPageEmptyState({route, policy}: WorkspaceExpensif
         if (shouldBlockCurrencyChange || result.action !== ModalActions.CONFIRM || !policy) {
             return;
         }
-        Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_CURRENCY.getRoute(policy.id));
+        Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_CURRENCY.getRoute(policy.id, {shouldStartExpensifyCardEnrollment: true}));
     };
 
     return (
diff --git a/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
index 86de9913cd51..002024bd7cae 100644
--- a/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
@@ -19,10 +19,11 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {searchUserInServer} from '@libs/actions/Report';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
+import {getSearchValueForPhoneOrEmail} from '@libs/OptionsListUtils';
 import {getHeaderMessage} from '@libs/PersonalDetailOptionsListUtils';
 import {canMemberWrite, filterGuideAndAccountManager, getGuideAndAccountManagerInfo, getIneligibleInvitees, isDeletedPolicyEmployee} from '@libs/PolicyUtils';
 import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import Navigation from '@navigation/Navigation';
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
index 5328de575d8d..9a56227ab942 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -12,10 +12,9 @@ import useOnyx from '@hooks/useOnyx';
 import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getDefaultCardName} from '@libs/CardUtils';
-import {addErrorMessage} from '@libs/ErrorUtils';
+import {getCardNameError, getCardNameErrorMessage, getDefaultCardName} from '@libs/CardUtils';
 import {isPolicyFeatureEnabled} from '@libs/PolicyUtils';
-import {getFieldRequiredErrors, isValidInputLength} from '@libs/ValidationUtils';
+import StringUtils from '@libs/StringUtils';
 
 import {setIssueNewCardStepAndData} from '@userActions/Card';
 
@@ -54,13 +53,13 @@ function CardNameStep({policyID, stepNames, startStepIndex}: CardNameStepProps)
     const defaultCardTitle = !isVirtualCard ? getDefaultCardName(userName) : '';
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM> => {
-        const errors = getFieldRequiredErrors(values, [INPUT_IDS.CARD_TITLE], translate);
-        if (values.cardTitle) {
-            const {isValid, byteLength} = isValidInputLength(values.cardTitle, CONST.STANDARD_LENGTH_LIMIT);
-            if (!isValid) {
-                addErrorMessage(errors, INPUT_IDS.CARD_TITLE, translate('common.error.characterLimitExceedCounter', byteLength, CONST.STANDARD_LENGTH_LIMIT));
-            }
+        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM> = {};
+        const error = getCardNameError(values.cardTitle);
+
+        if (error) {
+            errors[INPUT_IDS.CARD_TITLE] = getCardNameErrorMessage(translate, error, values.cardTitle);
         }
+
         return errors;
     };
 
@@ -70,7 +69,7 @@ function CardNameStep({policyID, stepNames, startStepIndex}: CardNameStepProps)
                 setIssueNewCardStepAndData({
                     step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION,
                     data: {
-                        cardTitle: values.cardTitle,
+                        cardTitle: StringUtils.sanitizeName(values.cardTitle),
                     },
                     isEditing: false,
                     policyID,
diff --git a/src/pages/workspace/fields/FieldsInitialValuePage.tsx b/src/pages/workspace/fields/FieldsInitialValuePage.tsx
index 9564a512f4cb..b5ab10c08958 100644
--- a/src/pages/workspace/fields/FieldsInitialValuePage.tsx
+++ b/src/pages/workspace/fields/FieldsInitialValuePage.tsx
@@ -12,7 +12,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {hasCircularReferences} from '@libs/Formula';
 import Navigation from '@libs/Navigation/Navigation';
-import {getReportFieldKey} from '@libs/ReportUtils';
+import {getReportFieldKey, hasEnabledListValue} from '@libs/ReportUtils';
 import {isRequiredFulfilled} from '@libs/ValidationUtils';
 import {getReportFieldInitialValue, getReportFieldsForTarget, getUnsupportedReportFieldFormulaParts, isReportFieldTargetValid} from '@libs/WorkspaceReportFieldUtils';
 
@@ -49,7 +49,7 @@ function FieldsInitialValuePage({policy, policyID, reportFieldID, featureName, e
 
     const reportField = policy?.fieldList?.[getReportFieldKey(reportFieldID)] ?? null;
     const isInvoiceField = reportField?.target === CONST.REPORT_FIELD_TARGETS.INVOICE;
-    const availableListValuesLength = (reportField?.disabledOptions ?? []).filter((disabledListValue) => !disabledListValue).length;
+    const hasAvailableListValues = !!reportField && hasEnabledListValue(reportField);
     const currentInitialValue = getReportFieldInitialValue(reportField, translate);
     const [initialValue, setInitialValue] = useState(currentInitialValue);
 
@@ -91,7 +91,7 @@ function FieldsInitialValuePage({policy, policyID, reportFieldID, featureName, e
                 }
             }
 
-            if (reportField?.type === CONST.REPORT_FIELD_TYPES.LIST && availableListValuesLength > 0 && !isRequiredFulfilled(formInitialValue)) {
+            if (reportField?.type === CONST.REPORT_FIELD_TYPES.LIST && hasAvailableListValues && !isRequiredFulfilled(formInitialValue)) {
                 errors[INPUT_IDS.INITIAL_VALUE] = translate(
                     isInvoiceField ? 'workspace.invoiceFields.invoiceFieldInitialValueRequiredError' : 'workspace.reportFields.reportFieldInitialValueRequiredError',
                 );
@@ -99,7 +99,7 @@ function FieldsInitialValuePage({policy, policyID, reportFieldID, featureName, e
 
             return errors;
         },
-        [availableListValuesLength, expectedTarget, isInvoiceField, reportField?.name, reportField?.type, policy?.fieldList, translate],
+        [hasAvailableListValues, expectedTarget, isInvoiceField, reportField?.name, reportField?.type, policy?.fieldList, translate],
     );
 
     if (!reportField || !isReportFieldTargetValid(reportField, expectedTarget)) {
diff --git a/src/pages/workspace/fields/FieldsSettingsPage.tsx b/src/pages/workspace/fields/FieldsSettingsPage.tsx
index df78ada9a13a..d30eabdf8825 100644
--- a/src/pages/workspace/fields/FieldsSettingsPage.tsx
+++ b/src/pages/workspace/fields/FieldsSettingsPage.tsx
@@ -12,7 +12,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
 import type {PolicyFeature} from '@libs/PolicyUtils';
-import {getReportFieldKey} from '@libs/ReportUtils';
+import {getReportFieldKey, hasEnabledListValue} from '@libs/ReportUtils';
 import {getReportFieldInitialValue, getReportFieldTypeTranslationKey, isReportFieldImportedFromIntegration, isReportFieldTargetValid} from '@libs/WorkspaceReportFieldUtils';
 
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
@@ -75,7 +75,7 @@ function FieldsSettingsPage({
 
     const isDateFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.DATE;
     const isListFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.LIST;
-    const isListFieldEmpty = isListFieldType && reportField.disabledOptions.filter((disabledListValue) => !disabledListValue).length <= 0;
+    const isListFieldEmpty = isListFieldType && !hasEnabledListValue(reportField);
     const listValues = Object.values(policy?.fieldList?.[reportFieldKey]?.values ?? {})?.sort(localeCompare);
 
     const deleteReportFieldAndHideModal = () => {
diff --git a/src/pages/workspace/getWorkspaceMenuItems.ts b/src/pages/workspace/getWorkspaceMenuItems.ts
index e2eb8a0b85af..1f80a8a00759 100644
--- a/src/pages/workspace/getWorkspaceMenuItems.ts
+++ b/src/pages/workspace/getWorkspaceMenuItems.ts
@@ -20,6 +20,7 @@ import {
     isMCPEnabled,
     isPerDiemEnabled,
     isPolicyAdmin,
+    isQBORefreshTokenExpiringSoonSelector,
     isTimeTrackingEnabled,
     shouldShowEmployeeListError,
     shouldShowSyncError,
@@ -100,6 +101,8 @@ type GetWorkspaceMenuItemsParams = {
     isConnectionInProgress?: boolean;
     /** Categories used to determine category-related errors. */
     policyCategories?: OnyxTypes.PolicyCategories;
+    /** Whether any of the policy's merchant rules failed to save, used to surface a red dot on the Rules row. */
+    hasMerchantRuleErrors?: boolean;
     /** Previous pending fields used to identify the most recently enabled feature. */
     previousPendingFields?: OnyxTypes.Policy['pendingFields'];
     /** Whether receipt partner credentials require attention. */
@@ -121,6 +124,7 @@ function getWorkspaceMenuItems({
     icons,
     isConnectionInProgress = false,
     policyCategories,
+    hasMerchantRuleErrors,
     previousPendingFields,
     shouldShowEnterCredentialsError = false,
     shouldShowRBR = false,
@@ -227,11 +231,17 @@ function getWorkspaceMenuItems({
         }
 
         if (policyFeatureStates[CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED] && canReadPolicyFeature(CONST.POLICY.POLICY_FEATURE.ACCOUNTING)) {
+            let accountingBrickRoadIndicator;
+            if (hasSyncError || shouldShowQBOReimbursableExportDestinationAccountError(policy)) {
+                accountingBrickRoadIndicator = CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
+            } else if (isQBORefreshTokenExpiringSoonSelector(policy)) {
+                accountingBrickRoadIndicator = CONST.BRICK_ROAD_INDICATOR_STATUS.INFO;
+            }
             items.push({
                 translationKey: 'workspace.common.accounting',
                 icon: icons.Sync,
                 getRoute: () => ROUTES.POLICY_ACCOUNTING.getRoute(policyID),
-                brickRoadIndicator: hasSyncError || shouldShowQBOReimbursableExportDestinationAccountError(policy) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                brickRoadIndicator: accountingBrickRoadIndicator,
                 screenName: SCREENS.WORKSPACE.ACCOUNTING.ROOT,
                 sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.ACCOUNTING,
                 highlighted: highlightedPolicyFeature === CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED,
@@ -346,7 +356,7 @@ function getWorkspaceMenuItems({
                 translationKey: 'workspace.common.rules',
                 icon: icons.Bolt,
                 getRoute: () => ROUTES.WORKSPACE_RULES.getRoute(policyID),
-                brickRoadIndicator: hasPolicyRulesError(policy) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                brickRoadIndicator: hasPolicyRulesError(policy, hasMerchantRuleErrors ?? false) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
                 screenName: SCREENS.WORKSPACE.RULES,
                 sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.RULES,
                 highlighted: highlightedPolicyFeature === CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED,
diff --git a/src/pages/workspace/hr/merge/MergeHRGroupsPage.tsx b/src/pages/workspace/hr/merge/MergeHRGroupsPage.tsx
index 805158fc8d66..61928054b960 100644
--- a/src/pages/workspace/hr/merge/MergeHRGroupsPage.tsx
+++ b/src/pages/workspace/hr/merge/MergeHRGroupsPage.tsx
@@ -56,6 +56,7 @@ function MergeHRGroupsPage({
         keyForList: group.id,
         value: group.id,
         isSelected: selectedIds.has(group.id),
+        itemStyle: styles.pv4,
     }));
 
     const toggleItem = (item: GroupListItem) => {
@@ -117,7 +118,7 @@ function MergeHRGroupsPage({
                             onChangeText: setSearchText,
                             style: {containerStyle: styles.pb5},
                         }}
-                        style={{listHeaderSelectAllTextStyle: styles.textLabelSupporting, listItemWrapperStyle: styles.pv4}}
+                        style={{listHeaderSelectAllTextStyle: styles.textLabelSupporting}}
                     />
                     <FixedFooter
                         style={styles.mtAuto}
diff --git a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
index fb63dae1a08a..c52dc6d9352a 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx
@@ -84,7 +84,7 @@ function WorkspaceInvoiceVBASection({policyID, canWriteMoreFeatures, showReadOnl
             return;
         }
 
-        Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_CURRENCY.getRoute(policy.id, true));
+        Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_CURRENCY.getRoute(policy.id, {isForcedToChangeCurrency: true}));
     }, [policy]);
 
     /**
diff --git a/src/pages/workspace/members/WorkArrangementPage.tsx b/src/pages/workspace/members/WorkArrangementPage.tsx
new file mode 100644
index 000000000000..4d9ff8fdd9f8
--- /dev/null
+++ b/src/pages/workspace/members/WorkArrangementPage.tsx
@@ -0,0 +1,130 @@
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import Text from '@components/Text';
+
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+import {setEmployeeWorkArrangement} from '@libs/actions/Policy/DistanceRate';
+import Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {canMemberWrite, isMemberInHomeAndOfficeWorkspace} from '@libs/PolicyUtils';
+import {getEffectiveWorkArrangement, getWorkArrangementLabel} from '@libs/WorkArrangementUtils';
+
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {PersonalDetailsList} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import React from 'react';
+import {View} from 'react-native';
+
+type WorkArrangementOption = ListItem & {
+    /** Whether selecting this option sets the member to office-based. */
+    value: boolean;
+    /** The localized label shown for this work arrangement. */
+    text: string;
+    /** The localized description shown beneath the label. */
+    alternateText: string;
+    /** Whether this option matches the member's current work arrangement. */
+    isSelected: boolean;
+};
+
+type WorkArrangementPageProps = Omit<WithPolicyAndFullscreenLoadingProps, 'route'> &
+    PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT> & {
+        personalDetails: OnyxEntry<PersonalDetailsList>;
+    };
+
+function WorkArrangementPage({policy, personalDetails, route}: WorkArrangementPageProps) {
+    const accountID = Number(route.params.accountID);
+    const policyID = route.params.policyID;
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
+    const {isBetaEnabled} = usePermissions();
+    const isWorkArrangementBetaEnabled = isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS);
+
+    const memberLogin = personalDetails?.[accountID]?.login ?? '';
+    const member = policy?.employeeList?.[memberLogin];
+    const canWriteMembers = canMemberWrite(policy, currentUserLogin, CONST.POLICY.POLICY_FEATURE.MEMBERS);
+    const canAccessWorkArrangementPage = canWriteMembers && isWorkArrangementBetaEnabled && isMemberInHomeAndOfficeWorkspace(policy, memberLogin);
+
+    // The member-level setting wins; otherwise fall back to the workspace default, then to no regular workspace.
+    const currentIsOffice = getEffectiveWorkArrangement(member?.hasOfficeWorkArrangement, policy?.commuterExclusions?.isOfficeWorkArrangement);
+
+    const navigateBackToDetails = () => {
+        Navigation.goBack(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
+    };
+
+    const changeWorkArrangement = ({value}: WorkArrangementOption) => {
+        if (value === currentIsOffice || !canAccessWorkArrangementPage) {
+            return;
+        }
+        setEmployeeWorkArrangement(policy, [accountID], value, personalDetails, translate);
+        navigateBackToDetails();
+    };
+
+    const options: WorkArrangementOption[] = [
+        {
+            value: true,
+            text: getWorkArrangementLabel(translate, true),
+            alternateText: translate('workspace.people.workArrangementPage.optionOfficeBasedHelp'),
+            isSelected: currentIsOffice,
+            keyForList: 'office-based',
+        },
+        {
+            value: false,
+            text: getWorkArrangementLabel(translate, false),
+            alternateText: translate('workspace.people.workArrangementPage.optionNoRegularWorkspaceHelp'),
+            isSelected: !currentIsOffice,
+            keyForList: 'no-regular-workplace',
+        },
+    ];
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            policyFeature={CONST.POLICY.POLICY_FEATURE.MEMBERS}
+            policyFeatureAccess={CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE}
+            shouldBeBlocked={!canAccessWorkArrangementPage}
+        >
+            <ScreenWrapper
+                testID="WorkArrangementPage"
+                enableEdgeToEdgeBottomSafeAreaPadding
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.people.workArrangementPage.title')}
+                    onBackButtonPress={navigateBackToDetails}
+                />
+                <View style={[styles.flex1]}>
+                    <SelectionList
+                        ListItem={SingleSelectListItem}
+                        data={options}
+                        onSelectRow={changeWorkArrangement}
+                        shouldSingleExecuteRowSelect
+                        shouldUpdateFocusedIndex
+                        alternateNumberOfSupportedLines={2}
+                        disableKeyboardShortcuts
+                    />
+                    <View style={[styles.ph5, styles.pb5]}>
+                        <Text style={[styles.textLabelSupporting]}>{translate('workspace.people.workArrangementPage.futureOnlyNote')}</Text>
+                    </View>
+                </View>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+export default withPolicyAndFullscreenLoading(WorkArrangementPage);
diff --git a/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx b/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx
index 77411a4e7801..bcaa493c38f2 100644
--- a/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx
+++ b/src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx
@@ -14,6 +14,7 @@ import TextInput from '@components/TextInput';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import usePermissions from '@hooks/usePermissions';
 import usePersonalDetailByLogin, {usePersonalDetailsByLogins} from '@hooks/usePersonalDetailByLogin';
 import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -22,6 +23,7 @@ import {clearDraftValues} from '@libs/actions/FormActions';
 import {openExternalLink} from '@libs/actions/Link';
 import {addMembersToWorkspace, clearWorkspaceInviteApproverDraft, clearWorkspaceInviteRoleDraft} from '@libs/actions/Policy/Member';
 import {setWorkspaceInviteMessageDraft} from '@libs/actions/Policy/Policy';
+import {saveFastEditApprovalWorkflow} from '@libs/actions/Workflow';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import {getNewAccountIDsAndLogins, getPersonalDetailsForAccountIDs, getPersonalDetailsOnyxDataForOptimisticUsers, temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
@@ -38,6 +40,7 @@ import {
 import {getAllPolicyExpenseChatReportActions} from '@libs/ReportUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import {getSearchParamFromPath} from '@libs/Url';
+import {filterRulesForPolicy} from '@libs/WorkflowUtils';
 
 import variables from '@styles/variables';
 
@@ -49,10 +52,11 @@ import type {Route as Routes} from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/WorkspaceInviteMessageForm';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type Policy from '@src/types/onyx/Policy';
+import type Rule from '@src/types/onyx/Rule';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {GestureResponderEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 
 import {Str} from 'expensify-common';
@@ -95,6 +99,11 @@ function WorkspaceInviteMessageComponent({
     const [allPersonalDetails] = useAllPersonalDetails();
     const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [allReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
+    // Only used when this page finishes a "+N more" workflow edit, which has no edit page behind it to save the workflow.
+    const [approvalWorkflow] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
+    const policyRulesSelector = useCallback((rules: OnyxCollection<Rule>) => filterRulesForPolicy(rules, policyID), [policyID]);
+    const [rulesCollection] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: policyRulesSelector});
+    const {isBetaEnabled} = usePermissions();
 
     const [welcomeNote, setWelcomeNote] = useState<string>();
 
@@ -216,6 +225,11 @@ function WorkspaceInviteMessageComponent({
             const nestedBackTo = getSearchParamFromPath(backTo?.toString() ?? '', 'backTo');
             if (nestedBackTo) {
                 Navigation.goBack(nestedBackTo as Routes);
+            } else if (approvalWorkflow?.isFastEdit) {
+                Navigation.goBack(ROUTES.WORKSPACE_WORKFLOWS.getRoute(policyID), {
+                    afterTransition: () =>
+                        saveFastEditApprovalWorkflow({approvalWorkflow, policy, rules: rulesCollection, isMultipleApproversBetaEnabled: isBetaEnabled(CONST.BETAS.MULTIPLE_APPROVERS)}),
+                });
             } else {
                 // forceReplace so the invite page is removed from the stack. Otherwise it stays
                 // underneath the Approver page and an iOS swipe-back reopens the invite confirm page.
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index ca0baf2fba65..d4a44bb95fbb 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -22,6 +22,7 @@ import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import usePermissions from '@hooks/usePermissions';
 import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
 import usePrevious from '@hooks/usePrevious';
 import usePrivateIsArchivedMap from '@hooks/usePrivateIsArchivedMap';
@@ -38,20 +39,13 @@ import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/crea
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import {getPhoneNumber, temporaryGetDisplayNameOrDefault} from '@libs/PersonalDetailsUtils';
 import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
-import {
-    canMemberAssignRole,
-    canMemberManageMemberWithRole,
-    canMemberWrite,
-    getReimburserEmail,
-    isControlPolicy,
-    isPolicyApprover,
-    PAYER_ROLES,
-    tryNavigateToSubmitWorkspaceUpgrade,
-} from '@libs/PolicyUtils';
+import {isPolicyReimburser} from '@libs/PolicyMemberRoleUtils';
+import {canMemberAssignRole, canMemberManageMemberWithRole, canMemberWrite, isControlPolicy, isPolicyApprover, PAYER_ROLES, tryNavigateToSubmitWorkspaceUpgrade} from '@libs/PolicyUtils';
 import {isApproverOfOutstandingPolicyReports} from '@libs/ReportUtils';
 import shouldRenderTransferOwnerButton from '@libs/shouldRenderTransferOwnerButton';
 import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
 import {generateAccountID} from '@libs/UserUtils';
+import {getEffectiveWorkArrangement, getWorkArrangementLabel} from '@libs/WorkArrangementUtils';
 import {convertPolicyEmployeesToApprovalWorkflows, updateWorkflowDataOnApproverRemoval} from '@libs/WorkflowUtils';
 
 import Navigation from '@navigation/Navigation';
@@ -116,6 +110,8 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const {convertToDisplayString} = useCurrencyListActions();
     const icons = useMemoizedLazyExpensifyIcons(['RemoveMembers', 'Info', 'Transfer']);
     const styles = useThemeStyles();
+    const {isBetaEnabled} = usePermissions();
+    const isWorkArrangementBetaEnabled = isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS);
     const {formatPhoneNumber, translate, localeCompare} = useLocalize();
     const StyleUtils = useStyleUtils();
     const illustrations = useThemeIllustrations();
@@ -136,6 +132,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const memberPersonalDetails = usePersonalDetailByLogin(memberLogin);
     const accountID = memberPersonalDetails?.accountID ?? routeAccountID;
     const member = policy?.employeeList?.[memberLogin];
+    const memberWorkArrangement = getEffectiveWorkArrangement(member?.hasOfficeWorkArrangement, policy?.commuterExclusions?.isOfficeWorkArrangement);
     const prevMember = usePrevious(member);
     const details = memberPersonalDetails ?? ({} as PersonalDetails);
     const fallbackIcon = details.fallbackIcon ?? '';
@@ -154,8 +151,7 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const isSMSLogin = Str.isSMSLogin(memberLogin);
     const phoneNumber = getPhoneNumber(details);
     const memberLoginToCopy = isSMSLogin ? formatPhoneNumber(phoneNumber ?? '') : memberLogin;
-    const reimburserEmail = getReimburserEmail(policy);
-    const isReimburser = !!reimburserEmail && reimburserEmail === memberLogin;
+    const isReimburser = isPolicyReimburser(policy, memberLogin);
     // Only let the Authorized Payer change roles when there is another payer role they can actually move to.
     const assignablePayerRoles = PAYER_ROLES.filter((payerRole) => canMemberAssignRole(policy, currentUserLogin, payerRole));
     const canReimburserChangeRole = assignablePayerRoles.some((payerRole) => payerRole !== member?.role);
@@ -412,6 +408,19 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
                                     Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS_ROLE.getRoute(policyID, accountID));
                                 }}
                             />
+                            {policy?.commuterExclusions?.method === CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE && isWorkArrangementBetaEnabled && (
+                                <MenuItemWithTopDescription
+                                    disabled={!canWriteMembers}
+                                    title={getWorkArrangementLabel(translate, memberWorkArrangement)}
+                                    interactive={canWriteMembers}
+                                    description={translate('workspace.people.workArrangement')}
+                                    shouldShowRightIcon={canWriteMembers}
+                                    shouldGreyOutWhenDisabled={false}
+                                    shouldUseDefaultCursorWhenDisabled
+                                    pressableTestID="member-work-arrangement-menu-item"
+                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_MEMBER_WORK_ARRANGEMENT.getRoute(policyID, accountID))}
+                                />
+                            )}
                             {isControlPolicy(policy) && (
                                 <>
                                     <OfflineWithFeedback pendingAction={member?.pendingFields?.employeeUserID}>
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsRolePage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsRolePage.tsx
index 05ff7f67751b..6cf74e079b4c 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsRolePage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsRolePage.tsx
@@ -11,7 +11,8 @@ import {isRuleBotEnforcingRules} from '@libs/AgentRulesUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {canMemberAssignRole, canRolePay, getReimburserEmail, PAYER_ROLES} from '@libs/PolicyUtils';
+import {getAllowedRolesForMember, isPolicyReimburser} from '@libs/PolicyMemberRoleUtils';
+import {canMemberAssignRole, canRolePay} from '@libs/PolicyUtils';
 
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -40,9 +41,8 @@ function WorkspaceMemberDetailsRolePage({policy, personalDetails, route}: Worksp
     const member = policy?.employeeList?.[memberLogin];
     const canManageSelectedMemberRole = canMemberAssignRole(policy, currentUserLogin, member?.role);
     // The Authorized Payer (reimburser) must stay a valid payer, so restrict them to the roles that can pay (for example Admin or Payments Admin).
-    const reimburserEmail = getReimburserEmail(policy);
-    const isReimburser = !!reimburserEmail && reimburserEmail === memberLogin;
-    const allowedRoles = isReimburser ? [...PAYER_ROLES] : undefined;
+    const isReimburser = isPolicyReimburser(policy, memberLogin);
+    const allowedRoles = getAllowedRolesForMember(policy, memberLogin);
     useRedirectSubmitWorkspaceFeatureUpgrade({
         policy,
         backTo: ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID),
diff --git a/src/pages/workspace/merge/MergeFinalApproverPageBase.tsx b/src/pages/workspace/merge/MergeFinalApproverPageBase.tsx
index c623b2770f21..aa9768f0e070 100644
--- a/src/pages/workspace/merge/MergeFinalApproverPageBase.tsx
+++ b/src/pages/workspace/merge/MergeFinalApproverPageBase.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import WorkspaceMembersSelectionList from '@components/WorkspaceMembersSelectionList';
 
@@ -57,7 +57,7 @@ function MergeFinalApproverPageBase({policyID, config}: MergeFinalApproverPageBa
                 testID={config.testID}
                 shouldEnableMaxHeight
             >
-                <HeaderWithBackButton
+                <HeaderWithBackButtonAndTitle
                     title={config.getHeaderTitle(providerName)}
                     onBackButtonPress={() => Navigation.goBack(config.backRoute)}
                 />
diff --git a/src/pages/workspace/merge/MergeSyncResultsPageBase.tsx b/src/pages/workspace/merge/MergeSyncResultsPageBase.tsx
index 633634a897f8..412770dc85e4 100644
--- a/src/pages/workspace/merge/MergeSyncResultsPageBase.tsx
+++ b/src/pages/workspace/merge/MergeSyncResultsPageBase.tsx
@@ -7,7 +7,7 @@
  */
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import Icon from '@components/Icon';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -115,7 +115,7 @@ function MergeSyncResultsPageBase({policyID, category}: MergeSyncResultsPageBase
                 testID={testID}
                 enableEdgeToEdgeBottomSafeAreaPadding
             >
-                <HeaderWithBackButton
+                <HeaderWithBackButtonAndTitle
                     title={translate('workspace.merge.syncResults.title', providerDisplayName)}
                     onBackButtonPress={goBack}
                 />
diff --git a/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx b/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx
index 93acaa39d97b..0ab7ccc5e064 100644
--- a/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx
+++ b/src/pages/workspace/perDiem/EditPerDiemAmountPage.tsx
@@ -13,6 +13,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {convertToBackendAmount, convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import {getPerDiemAmountError, getPerDiemAmountErrorMessage} from '@libs/PolicyPerDiemUtils';
 import {getPerDiemCustomUnit} from '@libs/PolicyUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -52,11 +53,10 @@ function EditPerDiemAmountPage({route}: EditPerDiemAmountPageProps) {
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM> => {
         const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM> = {};
+        const amountError = getPerDiemAmountError(values.amount);
 
-        const newAmount = values.amount.trim();
-        const backendAmount = newAmount ? convertToBackendAmount(Number(newAmount)) : 0;
-        if (backendAmount === 0 || newAmount === '-') {
-            errors.amount = translate('common.error.fieldRequired');
+        if (amountError) {
+            errors.amount = getPerDiemAmountErrorMessage(translate, amountError);
         }
 
         return errors;
diff --git a/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx b/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx
index fb2099ec15ef..5a4b97007506 100644
--- a/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx
+++ b/src/pages/workspace/perDiem/EditPerDiemDestinationPage.tsx
@@ -13,7 +13,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import {getPerDiemNameError, getPerDiemNameErrorMessage} from '@libs/PolicyPerDiemUtils';
 import {getPerDiemCustomUnit} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
 
@@ -50,13 +52,10 @@ function EditPerDiemDestinationPage({route}: EditPerDiemDestinationPageProps) {
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM> => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM> = {};
+            const nameError = getPerDiemNameError(values.destination);
 
-            const destinationTrimmed = values.destination.trim();
-
-            if (!destinationTrimmed) {
-                errors.destination = translate('common.error.fieldRequired');
-            } else if (destinationTrimmed.length > CONST.MAX_LENGTH_256) {
-                errors.destination = translate('common.error.characterLimitExceedCounter', destinationTrimmed.length, CONST.MAX_LENGTH_256);
+            if (nameError) {
+                errors.destination = getPerDiemNameErrorMessage(translate, nameError, values.destination);
             }
 
             return errors;
@@ -66,7 +65,7 @@ function EditPerDiemDestinationPage({route}: EditPerDiemDestinationPageProps) {
 
     const editDestination = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM>) => {
-            const newDestination = values.destination.trim();
+            const newDestination = StringUtils.sanitizeName(values.destination);
             if (newDestination !== selectedRate?.name) {
                 editPerDiemRateDestination(policyID, rateID, customUnit, newDestination);
             }
diff --git a/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx b/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx
index 70749c50c2d7..907f51738f1c 100644
--- a/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx
+++ b/src/pages/workspace/perDiem/EditPerDiemSubratePage.tsx
@@ -12,7 +12,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import {getPerDiemNameError, getPerDiemNameErrorMessage} from '@libs/PolicyPerDiemUtils';
 import {getPerDiemCustomUnit} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
 
@@ -48,20 +50,17 @@ function EditPerDiemSubratePage({route}: EditPerDiemSubratePageProps) {
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM> => {
         const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM> = {};
+        const nameError = getPerDiemNameError(values.subrate);
 
-        const subrateTrimmed = values.subrate.trim();
-
-        if (!subrateTrimmed) {
-            errors.subrate = translate('common.error.fieldRequired');
-        } else if (subrateTrimmed.length > CONST.MAX_LENGTH_256) {
-            errors.subrate = translate('common.error.characterLimitExceedCounter', subrateTrimmed.length, CONST.MAX_LENGTH_256);
+        if (nameError) {
+            errors.subrate = getPerDiemNameErrorMessage(translate, nameError, values.subrate);
         }
 
         return errors;
     };
 
     const editSubrate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM>) => {
-        const newSubrate = values.subrate.trim();
+        const newSubrate = StringUtils.sanitizeName(values.subrate);
         if (newSubrate !== selectedSubrate?.name) {
             editPerDiemRateSubrate(policyID, rateID, subRateID, customUnit, newSubrate);
         }
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
index 03f0b52fbf95..508a4a56209c 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
@@ -26,6 +26,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import {renamePerDiemDestinationInline, renamePerDiemSubrateInline, updatePerDiemAmountInline} from '@libs/actions/Policy/InlineEdit';
 import {convertAmountToDisplayString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -176,12 +177,15 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
 
     const hasVisibleSubRates = allSubRates.some((subRate) => subRate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline);
 
+    const isSelectionModeActive = selectedSubRateKeys.length > 0 || isMobileSelectionModeEnabled;
+
     const perDiemRows: PerDiemTableRowData[] = useMemo(
         () =>
             allSubRates
                 .filter((subRate) => isOffline || subRate.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
                 .map((subRate) => {
                     const isDeleting = subRate.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                    const canEdit = canWritePerDiem && !isDeleting && !isSelectionModeActive;
 
                     return {
                         keyForList: getPerDiemRowKey(subRate.rateID, subRate.subRateID),
@@ -190,13 +194,20 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
                         destination: subRate.destination,
                         subRateName: subRate.subRateName,
                         rate: subRate.rate,
+                        currency: subRate.currency,
                         formattedAmount: convertAmountToDisplayString(subRate.rate, subRate.currency),
                         disabled: isDeleting,
                         pendingAction: subRate.pendingAction,
+                        canEditDestination: canEdit,
+                        canEditSubrate: canEdit,
+                        canEditAmount: canEdit,
                         action: () => openSubRateDetails(subRate.rateID, subRate.subRateID),
+                        onRenameDestination: (newName: string) => renamePerDiemDestinationInline(policyID, subRate.rateID, customUnit, subRate.destination, newName),
+                        onRenameSubrate: (newName: string) => renamePerDiemSubrateInline(policyID, subRate.rateID, subRate.subRateID, customUnit, subRate.subRateName, newName),
+                        onChangeAmount: (newAmount: string) => updatePerDiemAmountInline(policyID, subRate.rateID, subRate.subRateID, customUnit, subRate.rate, newAmount),
                     };
                 }),
-        [allSubRates, isOffline, openSubRateDetails],
+        [allSubRates, isOffline, openSubRateDetails, canWritePerDiem, isSelectionModeActive, policyID, customUnit],
     );
 
     const secondaryActions = useMemo(() => {
diff --git a/src/pages/workspace/receiptPartners/ChangeReceiptBillingAccountPage.tsx b/src/pages/workspace/receiptPartners/ChangeReceiptBillingAccountPage.tsx
index bedf1793295d..5f4f0eaea638 100644
--- a/src/pages/workspace/receiptPartners/ChangeReceiptBillingAccountPage.tsx
+++ b/src/pages/workspace/receiptPartners/ChangeReceiptBillingAccountPage.tsx
@@ -18,10 +18,11 @@ import {changePolicyUberBillingAccount} from '@libs/actions/Policy/Policy';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {formatMemberForList, getHeaderMessage, getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
+import {formatMemberForList, getHeaderMessage, getSearchValueForPhoneOrEmail} from '@libs/OptionsListUtils';
 import type {MemberForList} from '@libs/OptionsListUtils';
 import {isDeletedPolicyEmployee} from '@libs/PolicyUtils';
 import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
diff --git a/src/pages/workspace/receiptPartners/DynamicEditInviteReceiptPartnerPolicyPage.tsx b/src/pages/workspace/receiptPartners/DynamicEditInviteReceiptPartnerPolicyPage.tsx
index 5871caf7014e..8b1cfeeb7dee 100644
--- a/src/pages/workspace/receiptPartners/DynamicEditInviteReceiptPartnerPolicyPage.tsx
+++ b/src/pages/workspace/receiptPartners/DynamicEditInviteReceiptPartnerPolicyPage.tsx
@@ -23,9 +23,10 @@ import {clearUberEmployeeError, inviteWorkspaceEmployeesToUber} from '@libs/acti
 import Navigation from '@libs/Navigation/Navigation';
 import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {formatMemberForList, getHeaderMessage, sortAlphabetically} from '@libs/OptionsListUtils';
+import {formatMemberForList, getHeaderMessage} from '@libs/OptionsListUtils';
 import type {MemberForList} from '@libs/OptionsListUtils';
 import {isDeletedPolicyEmployee} from '@libs/PolicyUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
@@ -206,6 +207,7 @@ function DynamicEditInviteReceiptPartnerPolicyPage({route}: DynamicEditInviteRec
                 ...option,
                 rightElement,
                 errors: uberEmployeesByEmail[email]?.errors,
+                itemStyle: styles.cursorDefault,
             };
 
             list.push(optionWithErrorsAndRightElement as MemberForList & ListItem);
@@ -335,7 +337,7 @@ function DynamicEditInviteReceiptPartnerPolicyPage({route}: DynamicEditInviteRec
                                             ListItem={BareUserListItem}
                                             onSelectRow={() => {}}
                                             onDismissError={dismissError}
-                                            style={{listItemWrapperStyle: styles.cursorDefault, listStyle: styles.mt3}}
+                                            style={{listStyle: styles.mt3}}
                                             addBottomSafeAreaPadding
                                             shouldShowTextInput={shouldShowTextInput}
                                             textInputOptions={{
diff --git a/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx b/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx
index f9b86146be35..907e06819f86 100644
--- a/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx
+++ b/src/pages/workspace/receiptPartners/DynamicInviteReceiptPartnerPolicyPage.tsx
@@ -18,9 +18,10 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {clearErrors, inviteWorkspaceEmployeesToUber} from '@libs/actions/Policy/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {formatMemberForList, getHeaderMessage, getSearchValueForPhoneOrEmail, sortAlphabetically} from '@libs/OptionsListUtils';
+import {formatMemberForList, getHeaderMessage, getSearchValueForPhoneOrEmail} from '@libs/OptionsListUtils';
 import type {MemberForList} from '@libs/OptionsListUtils';
 import {isDeletedPolicyEmployee} from '@libs/PolicyUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import tokenizedSearch from '@libs/tokenizedSearch';
 
 import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
diff --git a/src/pages/workspace/recruiting/approver/MergeATSApprovalModePage.tsx b/src/pages/workspace/recruiting/approver/MergeATSApprovalModePage.tsx
index 096cfc1133d1..3283f3e5e880 100644
--- a/src/pages/workspace/recruiting/approver/MergeATSApprovalModePage.tsx
+++ b/src/pages/workspace/recruiting/approver/MergeATSApprovalModePage.tsx
@@ -1,6 +1,6 @@
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import RenderHTML from '@components/RenderHTML';
@@ -141,7 +141,7 @@ function MergeATSApprovalModePage({
                 enableEdgeToEdgeBottomSafeAreaPadding
                 testID="MergeATSApprovalModePage"
             >
-                <HeaderWithBackButton title={translate('workspace.recruiting.defaultApprover')} />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.recruiting.defaultApprover')} />
                 <View style={styles.flex1}>
                     <Text style={[styles.textSupporting, styles.ph5, styles.mb3]}>{translate('workspace.recruiting.approvalModeDescription', providerName)}</Text>
                     <ScrollView showsVerticalScrollIndicator={false}>
@@ -151,7 +151,6 @@ function MergeATSApprovalModePage({
                                     item={option}
                                     showTooltip={false}
                                     onSelectRow={() => setDraftApprovalMode(option.value)}
-                                    isAlternateTextMultilineSupported
                                     alternateTextNumberOfLines={3}
                                 />
                                 {option.value === selectedApprovalMode && selectedApprovalMode === CONST.MERGE.APPROVAL_MODE.BASIC && (
diff --git a/src/pages/workspace/recruiting/approver/MergeATSApproverFieldPage.tsx b/src/pages/workspace/recruiting/approver/MergeATSApproverFieldPage.tsx
index c4d3adcc810b..dc4ce3fc0893 100644
--- a/src/pages/workspace/recruiting/approver/MergeATSApproverFieldPage.tsx
+++ b/src/pages/workspace/recruiting/approver/MergeATSApproverFieldPage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
@@ -76,7 +76,7 @@ function MergeATSApproverFieldPage({
                 enableEdgeToEdgeBottomSafeAreaPadding
                 testID="MergeATSApproverFieldPage"
             >
-                <HeaderWithBackButton title={translate('workspace.recruiting.approverField')} />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.recruiting.approverField')} />
                 <View style={styles.flex1}>
                     <Text style={[styles.textSupporting, styles.ph5, styles.mb3]}>{translate('workspace.recruiting.approverFieldDescription', providerName)}</Text>
                     <SelectionList
diff --git a/src/pages/workspace/recruiting/approver/MergeATSFinalApproverMenuItem.tsx b/src/pages/workspace/recruiting/approver/MergeATSFinalApproverMenuItem.tsx
index 4e79dce7a662..40ef35987556 100644
--- a/src/pages/workspace/recruiting/approver/MergeATSFinalApproverMenuItem.tsx
+++ b/src/pages/workspace/recruiting/approver/MergeATSFinalApproverMenuItem.tsx
@@ -1,11 +1,12 @@
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
 import UserPills from '@components/UserPills';
 
 import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
-import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import ROUTES from '@src/ROUTES';
 
 import React from 'react';
@@ -21,32 +22,37 @@ type MergeATSFinalApproverMenuItemProps = {
 };
 
 function MergeATSFinalApproverMenuItem({policyID, description}: MergeATSFinalApproverMenuItemProps) {
-    const styles = useThemeStyles();
     const {finalApprover} = useMergeATSApprovalDraftState(policyID);
     const finalApproverDetails = usePersonalDetailByLogin(finalApprover);
+    const finalApproverDisplayName = finalApproverDetails?.displayName ?? finalApprover ?? '';
 
     return (
-        <MenuItemWithTopDescription
-            shouldShowRightIcon
-            description={description}
-            descriptionTextStyle={finalApprover ? styles.textLabelSupportingNormal : undefined}
-            titleComponent={
-                finalApprover ? (
-                    <UserPills
-                        users={[
-                            {
-                                avatar: finalApproverDetails?.avatar,
-                                displayName: finalApproverDetails?.displayName ?? finalApprover,
-                                accountID: finalApproverDetails?.accountID,
-                                email: finalApprover,
-                            },
-                        ]}
-                    />
-                ) : undefined
-            }
-            titleStyle={styles.flex1}
-            onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RECRUITING_MERGE_FINAL_APPROVER.getRoute(policyID))}
-        />
+        <MenuItem.Root onPress={callFunctionIfActionIsAllowed(() => Navigation.navigate(ROUTES.WORKSPACE_RECRUITING_MERGE_FINAL_APPROVER.getRoute(policyID)))}>
+            <MenuItem.Row>
+                <MenuItem.Content>
+                    {finalApprover ? (
+                        <>
+                            <MenuItem.FieldName>{description}</MenuItem.FieldName>
+                            <UserPills
+                                users={[
+                                    {
+                                        avatar: finalApproverDetails?.avatar,
+                                        displayName: finalApproverDisplayName,
+                                        accountID: finalApproverDetails?.accountID,
+                                        email: finalApprover,
+                                    },
+                                ]}
+                            />
+                        </>
+                    ) : (
+                        <MenuItem.FieldNamePlaceholder>{description}</MenuItem.FieldNamePlaceholder>
+                    )}
+                </MenuItem.Content>
+                <MenuItem.Trailing>
+                    <MenuItem.Chevron />
+                </MenuItem.Trailing>
+            </MenuItem.Row>
+        </MenuItem.Root>
     );
 }
 
diff --git a/src/pages/workspace/recruiting/merge/filters/MergeATSFilterSelectionPage.tsx b/src/pages/workspace/recruiting/merge/filters/MergeATSFilterSelectionPage.tsx
index 145383307570..c1ce1d47a8ac 100644
--- a/src/pages/workspace/recruiting/merge/filters/MergeATSFilterSelectionPage.tsx
+++ b/src/pages/workspace/recruiting/merge/filters/MergeATSFilterSelectionPage.tsx
@@ -1,6 +1,6 @@
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import MultiSelectListItem from '@components/SelectionList/ListItem/MultiSelectListItem';
@@ -113,7 +113,7 @@ function MergeATSFilterSelectionPage({
                 shouldEnableMaxHeight
                 testID="MergeATSFilterSelectionPage"
             >
-                <HeaderWithBackButton title={titleKey ? translate(titleKey) : ''} />
+                <HeaderWithBackButtonAndTitle title={titleKey ? translate(titleKey) : ''} />
                 <View style={styles.flex1}>
                     <Text style={[styles.ph5, styles.mb5, styles.textSupporting]}>{descriptionKey ? translate(descriptionKey) : ''}</Text>
                     <SelectionList
diff --git a/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx b/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
index 995b04c5665b..903bdb9c6726 100644
--- a/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
+++ b/src/pages/workspace/recruiting/merge/filters/MergeATSFiltersPage.tsx
@@ -1,7 +1,7 @@
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
 import FormHelpMessage from '@components/FormHelpMessage';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -101,7 +101,7 @@ function MergeATSFiltersPage({
                 enableEdgeToEdgeBottomSafeAreaPadding
                 testID="MergeATSFiltersPage"
             >
-                <HeaderWithBackButton title={translate('workspace.recruiting.importSettings')} />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.recruiting.importSettings')} />
                 <ScrollView contentContainerStyle={styles.flexGrow1}>
                     <Text style={[styles.ph5, styles.mb5, styles.textSupporting]}>{translate('workspace.recruiting.filters.description', providerName)}</Text>
                     <OfflineWithFeedback
diff --git a/src/pages/workspace/rules/AgentRules/AddAgentRulePage.tsx b/src/pages/workspace/rules/AgentRules/AddAgentRulePage.tsx
index c348dc737f52..7e8109e39e21 100644
--- a/src/pages/workspace/rules/AgentRules/AddAgentRulePage.tsx
+++ b/src/pages/workspace/rules/AgentRules/AddAgentRulePage.tsx
@@ -1,9 +1,10 @@
 import CollapsibleHeaderOnKeyboard from '@components/CollapsibleHeaderOnKeyboard';
 import type {FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import {BotAvatarBlue} from '@components/Icon/DefaultBotAvatars';
 import RenderHTML from '@components/RenderHTML';
 import ScreenWrapper from '@components/ScreenWrapper';
+import SidePanelButton from '@components/SidePanel/SidePanelButton';
 import TabSelectorBase from '@components/TabSelector/TabSelectorBase';
 import TabSelectorContextProvider from '@components/TabSelector/TabSelectorContext';
 import type {TabSelectorBaseItem} from '@components/TabSelector/types';
@@ -207,11 +208,12 @@ function AddAgentRulePage({
                 shouldEnableMaxHeight
             >
                 <CollapsibleHeaderOnKeyboard alwaysCollapseHeaderOnKeyboard>
-                    <HeaderWithBackButton
+                    <HeaderWithBackButtonAndTitle
                         title={translate('workspace.rules.agentRules.newRuleTitle')}
-                        shouldDisplayHelpButton
                         onBackButtonPress={handleBackButtonPress}
-                    />
+                    >
+                        <SidePanelButton />
+                    </HeaderWithBackButtonAndTitle>
                     <View style={[styles.flexShrink0, styles.w100]}>
                         <TabSelectorContextProvider activeTabKey={activeTab}>
                             <TabSelectorBase
diff --git a/src/pages/workspace/rules/AgentRules/AddAgentRuleSuggestionsTab.tsx b/src/pages/workspace/rules/AgentRules/AddAgentRuleSuggestionsTab.tsx
index b8441ecdb40f..c9f70f306d49 100644
--- a/src/pages/workspace/rules/AgentRules/AddAgentRuleSuggestionsTab.tsx
+++ b/src/pages/workspace/rules/AgentRules/AddAgentRuleSuggestionsTab.tsx
@@ -21,7 +21,7 @@ import useSuggestedAgentRules from '@hooks/useSuggestedAgentRules';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {getSuggestedAgentRuleIcon, SUGGESTED_AGENT_RULE_ICON_NAMES} from '@libs/PolicyRulesUtils';
+import {groupSuggestedAgentRulesByCategory} from '@libs/AgentRulesUtils';
 
 import variables from '@styles/variables';
 
@@ -37,7 +37,7 @@ type AddAgentRuleSuggestionsTabProps = {
 };
 
 function AddAgentRuleSuggestionsTab({onSelectSuggestion}: AddAgentRuleSuggestionsTabProps) {
-    const {translate} = useLocalize();
+    const {translate, localeCompare} = useLocalize();
     const styles = useThemeStyles();
     const theme = useTheme();
     const {isOffline} = useNetwork();
@@ -47,14 +47,33 @@ function AddAgentRuleSuggestionsTab({onSelectSuggestion}: AddAgentRuleSuggestion
 
     const {data, isLoading} = useSuggestedAgentRules();
     const illustrations = useMemoizedLazyIllustrations(['Lightbulb']);
-    const icons = useMemoizedLazyExpensifyIcons([...SUGGESTED_AGENT_RULE_ICON_NAMES]);
+    const icons = useMemoizedLazyExpensifyIcons(['DownArrow', 'UpArrow']);
     const [searchValue, setSearchValue] = useState('');
     const [selectedSuggestionID, setSelectedSuggestionID] = useState<string | undefined>();
+    const [collapsedCategories, setCollapsedCategories] = useState<string[]>([]);
+
+    const updateSearchValue = (value: string) => {
+        setSearchValue(value);
+
+        // Expand all sections when the search changes. A collapsed section would otherwise hide the rules that match.
+        setCollapsedCategories([]);
+    };
+
+    const toggleCategory = (category: string) => {
+        setCollapsedCategories((currentCategories) =>
+            currentCategories.includes(category) ? currentCategories.filter((collapsedCategory) => collapsedCategory !== category) : [...currentCategories, category],
+        );
+    };
 
     const trimmedSearch = searchValue.trim().toLowerCase();
     const filteredSuggestions = !trimmedSearch
         ? data
-        : data.filter((suggestion) => suggestion.title?.toLowerCase().includes(trimmedSearch) || suggestion.prompt?.toLowerCase().includes(trimmedSearch));
+        : data.filter(
+              (suggestion) =>
+                  suggestion.title?.toLowerCase().includes(trimmedSearch) ||
+                  suggestion.prompt?.toLowerCase().includes(trimmedSearch) ||
+                  !!suggestion.category?.toLowerCase().includes(trimmedSearch),
+          );
 
     const selectedSuggestion = filteredSuggestions.find((suggestion) => suggestion.id === selectedSuggestionID);
     const hasNoSuggestions = data.length === 0;
@@ -91,6 +110,7 @@ function AddAgentRuleSuggestionsTab({onSelectSuggestion}: AddAgentRuleSuggestion
     }
 
     const hasNoFilteredSuggestions = filteredSuggestions.length === 0;
+    const suggestionSections = groupSuggestedAgentRulesByCategory(filteredSuggestions, localeCompare);
 
     const button = (
         <Button
@@ -110,7 +130,7 @@ function AddAgentRuleSuggestionsTab({onSelectSuggestion}: AddAgentRuleSuggestion
                     label={translate('workspace.rules.agentRules.findSuggestion')}
                     accessibilityLabel={translate('workspace.rules.agentRules.findSuggestion')}
                     value={searchValue}
-                    onChangeText={setSearchValue}
+                    onChangeText={updateSearchValue}
                     shouldHideClearButton={false}
                     autoGrowHeight={false}
                     role={CONST.ROLE.SEARCHBOX}
@@ -118,7 +138,7 @@ function AddAgentRuleSuggestionsTab({onSelectSuggestion}: AddAgentRuleSuggestion
             </View>
             <ScrollView
                 style={styles.flex1}
-                contentContainerStyle={[styles.pb5, styles.gap2]}
+                contentContainerStyle={[styles.pb5, styles.gap3]}
                 keyboardShouldPersistTaps="handled"
             >
                 {hasNoFilteredSuggestions ? (
@@ -126,39 +146,59 @@ function AddAgentRuleSuggestionsTab({onSelectSuggestion}: AddAgentRuleSuggestion
                         <Text style={[styles.textLabel, styles.colorMuted, styles.minHeight5]}>{translate('common.noResultsFound')}</Text>
                     </View>
                 ) : (
-                    filteredSuggestions.map((suggestion) => {
-                        const iconName = getSuggestedAgentRuleIcon(suggestion);
-                        const isSelected = suggestion.id === selectedSuggestionID;
-                        const suggestionLabel = suggestion.prompt ?? suggestion.title ?? '';
+                    suggestionSections.map((section) => {
+                        const isCollapsed = collapsedCategories.includes(section.category);
                         return (
-                            <PressableWithFeedback
-                                key={suggestion.id}
-                                accessibilityLabel={suggestionLabel}
-                                accessibilityRole={CONST.ROLE.BUTTON}
-                                accessibilityState={{selected: isSelected}}
-                                onPress={() => setSelectedSuggestionID(suggestion.id)}
-                                wrapperStyle={[styles.mh5]}
-                                style={[
-                                    styles.flexRow,
-                                    styles.alignItemsCenter,
-                                    styles.ph5,
-                                    styles.pv5,
-                                    styles.highlightBG,
-                                    styles.borderRadiusComponentNormal,
-                                    isSelected && styles.activeComponentBG,
-                                ]}
-                                hoverStyle={!isSelected ? styles.hoveredComponentBG : undefined}
-                                sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.RULES.SUGGESTED_AGENT_RULE}
+                            <View
+                                key={section.category}
+                                style={styles.gap2}
                             >
-                                <Icon
-                                    src={icons[iconName]}
-                                    width={variables.iconSizeLarge}
-                                    height={variables.iconSizeLarge}
-                                    fill={theme.icon}
-                                    additionalStyles={[styles.mr4]}
-                                />
-                                <Text style={[styles.flex1, styles.textNormal, styles.lh20]}>{suggestionLabel}</Text>
-                            </PressableWithFeedback>
+                                {!!section.category && (
+                                    <PressableWithFeedback
+                                        onPress={() => toggleCategory(section.category)}
+                                        style={[styles.flexRow, styles.alignItemsCenter, styles.ph5, styles.pv2]}
+                                        role={CONST.ROLE.BUTTON}
+                                        accessibilityLabel={section.category}
+                                        accessibilityState={{expanded: !isCollapsed}}
+                                        sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.RULES.SUGGESTED_AGENT_RULE_CATEGORY}
+                                        hoverDimmingValue={1}
+                                        pressDimmingValue={0.2}
+                                    >
+                                        <Text
+                                            role={CONST.ROLE.HEADING}
+                                            style={[styles.flex1, styles.textLabelSupporting]}
+                                        >
+                                            {section.category}
+                                        </Text>
+                                        <Icon
+                                            src={isCollapsed ? icons.DownArrow : icons.UpArrow}
+                                            fill={theme.icon}
+                                            width={variables.iconSizeSmall}
+                                            height={variables.iconSizeSmall}
+                                        />
+                                    </PressableWithFeedback>
+                                )}
+                                {!isCollapsed &&
+                                    section.suggestions.map((suggestion) => {
+                                        const isSelected = suggestion.id === selectedSuggestionID;
+                                        return (
+                                            <PressableWithFeedback
+                                                key={suggestion.id}
+                                                accessibilityLabel={`${suggestion.title}, ${suggestion.prompt}`}
+                                                accessibilityRole={CONST.ROLE.BUTTON}
+                                                accessibilityState={{selected: isSelected}}
+                                                onPress={() => setSelectedSuggestionID(suggestion.id)}
+                                                wrapperStyle={[styles.mh5]}
+                                                style={[styles.gap1, styles.ph5, styles.pv5, styles.highlightBG, styles.borderRadiusComponentNormal, isSelected && styles.activeComponentBG]}
+                                                hoverStyle={!isSelected ? styles.hoveredComponentBG : undefined}
+                                                sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.RULES.SUGGESTED_AGENT_RULE}
+                                            >
+                                                <Text style={[styles.textStrong, styles.lh20]}>{suggestion.title}</Text>
+                                                <Text style={[styles.textSupporting, styles.lh20]}>{suggestion.prompt}</Text>
+                                            </PressableWithFeedback>
+                                        );
+                                    })}
+                            </View>
                         );
                     })
                 )}
diff --git a/src/pages/workspace/rules/AgentRules/EditAgentRulePage.tsx b/src/pages/workspace/rules/AgentRules/EditAgentRulePage.tsx
index a39a6c32cdda..55480fd16710 100644
--- a/src/pages/workspace/rules/AgentRules/EditAgentRulePage.tsx
+++ b/src/pages/workspace/rules/AgentRules/EditAgentRulePage.tsx
@@ -2,7 +2,8 @@ import CollapsibleHeaderOnKeyboard from '@components/CollapsibleHeaderOnKeyboard
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues, FormRef} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
@@ -80,7 +81,7 @@ function EditAgentRulePage({
 
     const inputWrapperStyles = useAgentPromptInputStyles();
 
-    const {deleteHeaderProps} = useRuleDeleteHeaderProps({
+    const {deleteIconButtonProps} = useRuleDeleteHeaderProps({
         canDelete: !!policy && !!agentRule && agentRule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
         onDelete: () => {
             if (!policy) {
@@ -111,10 +112,9 @@ function EditAgentRulePage({
                 shouldEnableMaxHeight={shouldUseExpandedRevampFormLayout}
             >
                 <CollapsibleHeaderOnKeyboard>
-                    <HeaderWithBackButton
-                        title={translate('workspace.rules.agentRules.editRuleTitle')}
-                        {...deleteHeaderProps}
-                    />
+                    <HeaderWithBackButtonAndTitle title={translate('workspace.rules.agentRules.editRuleTitle')}>
+                        {!!deleteIconButtonProps && <Header.IconButton {...deleteIconButtonProps} />}
+                    </HeaderWithBackButtonAndTitle>
                 </CollapsibleHeaderOnKeyboard>
                 <FormProvider
                     ref={formRef}
diff --git a/src/pages/workspace/rules/ExpenseReportRulesSection.tsx b/src/pages/workspace/rules/ExpenseReportRulesSection.tsx
index 1fb9961fe5a1..a902fb03a97d 100644
--- a/src/pages/workspace/rules/ExpenseReportRulesSection.tsx
+++ b/src/pages/workspace/rules/ExpenseReportRulesSection.tsx
@@ -9,7 +9,7 @@ import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
-import {getReimbursementChoice, getWorkflowApprovalsUnavailable, isControlPolicy} from '@libs/PolicyUtils';
+import {getWorkflowApprovalsUnavailable, isAutoPayApprovedReportsAvailable, isControlPolicy} from '@libs/PolicyUtils';
 
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 
@@ -35,8 +35,15 @@ function ExpenseReportRulesSection({policyID, canWriteApprovals, canWritePayment
     const policy = usePolicy(policyID);
     const {environmentURL} = useEnvironment();
     const workflowApprovalsUnavailable = getWorkflowApprovalsUnavailable(policy);
-    const autoPayApprovedReportsUnavailable =
-        !policy?.areWorkflowsEnabled || getReimbursementChoice(policy) !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES || !policy?.achAccount?.bankAccountID;
+    const autoPayApprovedReportsUnavailable = !isAutoPayApprovedReportsAvailable(policy);
+    // Auto-pay that is already on (e.g. kept after a downgrade) stays usable so admins can still turn it off.
+    // Users who can't write payments (e.g. on an archived workspace) can't upgrade either, so they don't get the upgrade link.
+    const autoPayApprovedReportsRequiresUpgrade = canWritePayments && !isControlPolicy(policy) && !policy?.shouldShowAutoReimbursementLimitOption;
+    const autoPayApprovedReportsUpgradeRoute = ROUTES.WORKSPACE_UPGRADE.getRoute(
+        policyID,
+        CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoPayApprovedReports.alias,
+        ROUTES.WORKSPACE_WORKFLOWS.getRoute(policyID),
+    );
 
     const renderFallbackSubtitle = ({featureName, variant = 'unlock'}: {featureName: string; variant?: 'unlock' | 'enable'}) => {
         const moreFeaturesLink = `${environmentURL}/${ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)}`;
@@ -46,6 +53,16 @@ function ExpenseReportRulesSection({policyID, canWriteApprovals, canWritePayment
         return translate('workspace.rules.expenseReportRules.enableFeatureSubtitle', featureName, moreFeaturesLink);
     };
 
+    const getAutoPayApprovedReportsSubtitle = () => {
+        if (autoPayApprovedReportsRequiresUpgrade) {
+            return translate('workspace.rules.expenseReportRules.autoPayApprovedReportsControlPlanSubtitle', `${environmentURL}/${autoPayApprovedReportsUpgradeRoute}`);
+        }
+        if (autoPayApprovedReportsUnavailable) {
+            return renderFallbackSubtitle({featureName: translate('common.payments').toLowerCase()});
+        }
+        return translate('workspace.rules.expenseReportRules.autoPayApprovedReportsSubtitle');
+    };
+
     const optionItems = [
         {
             title: translate('workspace.rules.expenseReportRules.preventSelfApprovalsTitle'),
@@ -126,24 +143,21 @@ function ExpenseReportRulesSection({policyID, canWriteApprovals, canWritePayment
         },
         {
             title: translate('workspace.rules.expenseReportRules.autoPayApprovedReportsTitle'),
-            subtitle: autoPayApprovedReportsUnavailable
-                ? renderFallbackSubtitle({featureName: translate('common.payments').toLowerCase()})
-                : translate('workspace.rules.expenseReportRules.autoPayApprovedReportsSubtitle'),
-            shouldParseSubtitle: autoPayApprovedReportsUnavailable,
+            subtitle: getAutoPayApprovedReportsSubtitle(),
+            shouldParseSubtitle: autoPayApprovedReportsRequiresUpgrade || autoPayApprovedReportsUnavailable,
             switchAccessibilityLabel: translate('workspace.rules.expenseReportRules.autoPayApprovedReportsTitle'),
             onToggle: (isEnabled: boolean) => {
-                if (isEnabled && !isControlPolicy(policy)) {
-                    Navigation.navigate(
-                        ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoPayApprovedReports.alias, ROUTES.WORKSPACE_WORKFLOWS.getRoute(policyID)),
-                    );
+                if (isEnabled && autoPayApprovedReportsRequiresUpgrade) {
+                    Navigation.navigate(autoPayApprovedReportsUpgradeRoute);
                     return;
                 }
 
                 enablePolicyAutoReimbursementLimit(policyID, isEnabled, policy?.shouldShowAutoReimbursementLimitOption, policy?.autoReimbursement?.limit);
             },
-            disabled: autoPayApprovedReportsUnavailable || !canWritePayments,
+            // Leave the switch pressable on non-Control workspaces so it can route to the upgrade page.
+            disabled: (!autoPayApprovedReportsRequiresUpgrade && autoPayApprovedReportsUnavailable) || !canWritePayments,
             disabledAction: withPaymentsReadOnlyFallback(),
-            showLockIcon: autoPayApprovedReportsUnavailable || !canWritePayments,
+            showLockIcon: autoPayApprovedReportsRequiresUpgrade || autoPayApprovedReportsUnavailable || !canWritePayments,
             isActive: policy?.shouldShowAutoReimbursementLimitOption && !autoPayApprovedReportsUnavailable,
             pendingAction: policy?.pendingFields?.shouldShowAutoReimbursementLimitOption ?? policy?.pendingAction,
             subMenuItems: [
@@ -190,6 +204,7 @@ function ExpenseReportRulesSection({policyID, canWriteApprovals, canWritePayment
                         shouldPlaceSubtitleBelowSwitch
                         titleStyle={styles.pv2}
                         subtitleStyle={styles.pt1}
+                        parsedSubtitleContainerStyle={styles.pt1}
                         isActive={!!isActive}
                         showLockIcon={showLockIcon}
                         disabled={disabled}
diff --git a/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRuleAmountPageBase.tsx b/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRuleAmountPageBase.tsx
index 8659bc10fb8c..472568d0c9cb 100644
--- a/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRuleAmountPageBase.tsx
+++ b/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRuleAmountPageBase.tsx
@@ -2,7 +2,7 @@ import AmountForm from '@components/AmountForm';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
@@ -116,7 +116,7 @@ function FlagForReviewRuleAmountPageBase({policyID, categoryName, isCategoryLock
                 enableEdgeToEdgeBottomSafeAreaPadding
                 testID="FlagForReviewRuleAmountPage"
             >
-                <HeaderWithBackButton
+                <HeaderWithBackButtonAndTitle
                     title={translate('iou.amount')}
                     onBackButtonPress={goBack}
                 />
diff --git a/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx b/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx
index fe0e112a326b..ac6ced5ec3fb 100644
--- a/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx
+++ b/src/pages/workspace/rules/FlagForReviewRules/FlagForReviewRulePageBase.tsx
@@ -1,5 +1,6 @@
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -182,7 +183,7 @@ function FlagForReviewRulePageBase({
     // The rule IS the category's flag amount, so there is only something to delete once one is set, and the category's
     // own pending state is the rule's: while a delete is in flight, deleting again would fire the same write twice.
     const isRuleBeingDeleted = category?.pendingFields?.maxExpenseAmount === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const {deleteHeaderProps} = useRuleDeleteHeaderProps({
+    const {deleteIconButtonProps} = useRuleDeleteHeaderProps({
         canDelete: canWriteRules && isEditing && hasExplicitFlagAmount(category?.maxExpenseAmount) && !isRuleBeingDeleted,
         onDelete: () => {
             deleteFlagForReviewRule(policyID, categoryName ?? '', policyData.categories);
@@ -227,10 +228,9 @@ function FlagForReviewRulePageBase({
                 offlineIndicatorStyle={styles.mtAuto}
                 includeSafeAreaPaddingBottom
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.flagForReviewRule.title')}
-                    {...deleteHeaderProps}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.flagForReviewRule.title')}>
+                    {!!deleteIconButtonProps && <Header.IconButton {...deleteIconButtonProps} />}
+                </HeaderWithBackButtonAndTitle>
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                     <View style={[styles.ph5, styles.pv3, styles.gap6]}>
                         <Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.rules.flagForReviewRule.subtitle')}</Text>
diff --git a/src/pages/workspace/rules/MerchantRules/AddCategoryTaxRulePage.tsx b/src/pages/workspace/rules/MerchantRules/AddCategoryTaxRulePage.tsx
new file mode 100644
index 000000000000..fc5ce474ced9
--- /dev/null
+++ b/src/pages/workspace/rules/MerchantRules/AddCategoryTaxRulePage.tsx
@@ -0,0 +1,38 @@
+import useCategoryRuleCreateBackPath from '@hooks/useCategoryRuleCreateBackPath';
+import usePolicy from '@hooks/usePolicy';
+
+import {categoryHasTaxRule} from '@libs/CategoryTaxRulesUtils';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+
+import {DYNAMIC_ROUTES, getWorkspaceCategorySettingsRoute} from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+import React from 'react';
+
+import MerchantRulePageBase from './MerchantRulePageBase';
+
+type AddCategoryTaxRulePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_NEW>;
+
+function AddCategoryTaxRulePage({route}: AddCategoryTaxRulePageProps) {
+    const {policyID, categoryName} = route.params;
+    const policy = usePolicy(policyID);
+    const categorySettingsBackPath = useCategoryRuleCreateBackPath(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_TAX_NEW.path) ?? getWorkspaceCategorySettingsRoute(policyID, categoryName);
+
+    // A category holds one tax default, so creating one for a category that already has it is really an edit. Opening
+    // it as one shows the rate already applied and lets the admin delete it.
+    const hasExistingRule = categoryHasTaxRule(policy?.rules?.expenseRules, categoryName);
+
+    return (
+        <MerchantRulePageBase
+            policyID={policyID}
+            editCategoryTaxRuleFor={hasExistingRule ? categoryName : undefined}
+            newCategoryTaxRuleFor={hasExistingRule ? undefined : categoryName}
+            isCategoryLocked
+            categorySettingsBackPath={categorySettingsBackPath}
+            testID="AddCategoryTaxRulePage"
+        />
+    );
+}
+
+export default AddCategoryTaxRulePage;
diff --git a/src/pages/workspace/rules/MerchantRules/AddCategoryToMatchPage.tsx b/src/pages/workspace/rules/MerchantRules/AddCategoryToMatchPage.tsx
index 051625913b58..01df6a002373 100644
--- a/src/pages/workspace/rules/MerchantRules/AddCategoryToMatchPage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/AddCategoryToMatchPage.tsx
@@ -1,7 +1,7 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import RuleCategoriesDisabledEmptyState from '@components/Rule/RuleCategoriesDisabledEmptyState';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -133,7 +133,7 @@ function AddCategoryToMatchPage({route}: AddCategoryToMatchPageProps) {
                 testID="AddCategoryToMatchPage"
                 shouldEnableMaxHeight
             >
-                <HeaderWithBackButton
+                <HeaderWithBackButtonAndTitle
                     title={translate('common.category')}
                     onBackButtonPress={goBackToRule}
                 />
@@ -149,7 +149,7 @@ function AddCategoryToMatchPage({route}: AddCategoryToMatchPageProps) {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton
+            <HeaderWithBackButtonAndTitle
                 title={translate('common.category')}
                 onBackButtonPress={goBackToRule}
             />
diff --git a/src/pages/workspace/rules/MerchantRules/AddMatchTypePage.tsx b/src/pages/workspace/rules/MerchantRules/AddMatchTypePage.tsx
index aef9c80dd2eb..fb984f874f5f 100644
--- a/src/pages/workspace/rules/MerchantRules/AddMatchTypePage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/AddMatchTypePage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
@@ -82,7 +82,7 @@ function AddMatchTypePage({route}: AddMatchTypePageProps) {
             includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton
+            <HeaderWithBackButtonAndTitle
                 title={translate('workspace.rules.merchantRules.matchType')}
                 onBackButtonPress={goBack}
             />
diff --git a/src/pages/workspace/rules/MerchantRules/AddMerchantToMatchPage.tsx b/src/pages/workspace/rules/MerchantRules/AddMerchantToMatchPage.tsx
index 585a9a69f613..0988460aad54 100644
--- a/src/pages/workspace/rules/MerchantRules/AddMerchantToMatchPage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/AddMerchantToMatchPage.tsx
@@ -1,7 +1,7 @@
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import ScreenWrapper from '@components/ScreenWrapper';
 import TextInput from '@components/TextInput';
@@ -92,7 +92,7 @@ function AddMerchantToMatchPage({route}: AddMerchantToMatchPageProps) {
             includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton
+            <HeaderWithBackButtonAndTitle
                 title={translate('common.merchant')}
                 onBackButtonPress={goBack}
             />
diff --git a/src/pages/workspace/rules/MerchantRules/EditCategoryTaxRulePage.tsx b/src/pages/workspace/rules/MerchantRules/EditCategoryTaxRulePage.tsx
index b246a380a4a0..44a321b4dff0 100644
--- a/src/pages/workspace/rules/MerchantRules/EditCategoryTaxRulePage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/EditCategoryTaxRulePage.tsx
@@ -1,19 +1,22 @@
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 
-import type SCREENS from '@src/SCREENS';
+import SCREENS from '@src/SCREENS';
 
 import React from 'react';
 
 import MerchantRulePageBase from './MerchantRulePageBase';
 
-type EditCategoryTaxRulePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_CATEGORY_TAX_EDIT>;
+type EditCategoryTaxRulePageProps =
+    | PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_CATEGORY_TAX_EDIT>
+    | PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_EDIT>;
 
 function EditCategoryTaxRulePage({route}: EditCategoryTaxRulePageProps) {
     return (
         <MerchantRulePageBase
             policyID={route.params.policyID}
             editCategoryTaxRuleFor={route.params.categoryName}
+            isCategoryLocked={route.name === SCREENS.WORKSPACE.DYNAMIC_CATEGORY_TAX_RULE_EDIT}
             testID="EditCategoryTaxRulePage"
         />
     );
diff --git a/src/pages/workspace/rules/MerchantRules/ExpenseDefaultTypePage.tsx b/src/pages/workspace/rules/MerchantRules/ExpenseDefaultTypePage.tsx
index 8b9ffd54dfbf..34468f65c7ef 100644
--- a/src/pages/workspace/rules/MerchantRules/ExpenseDefaultTypePage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/ExpenseDefaultTypePage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItem from '@components/MenuItem';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -100,7 +100,7 @@ function ExpenseDefaultTypePage({route}: ExpenseDefaultTypePageProps) {
                 testID="ExpenseDefaultTypePage"
                 enableEdgeToEdgeBottomSafeAreaPadding
             >
-                <HeaderWithBackButton title={translate('workspace.rules.expenseDefaultType.title')} />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.expenseDefaultType.title')} />
                 <ScrollView
                     style={[styles.flexGrow1]}
                     addBottomSafeAreaPadding
diff --git a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
index a8cdb9059fe8..767e128a047a 100644
--- a/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import type {ColumnRole} from '@components/ImportColumn';
 import ImportSpreadsheetColumns from '@components/ImportSpreadsheetColumns';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -17,6 +17,8 @@ import type {ImportedMerchantRule} from '@libs/actions/Policy/Rules';
 import {importMerchantRulesSpreadsheet} from '@libs/actions/Policy/Rules';
 import Tab from '@libs/actions/Tab';
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
+import {getMerchantRuleFormValues, getPolicyExpenseDefaultRules} from '@libs/ExpenseDefaultRuleUtils';
+import type {MerchantRuleFormValues} from '@libs/ExpenseDefaultRuleUtils';
 import {findDuplicate, generateColumnNames} from '@libs/importSpreadsheetUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -34,13 +36,12 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {ImportedSpreadsheet, Policy, PolicyCategories} from '@src/types/onyx';
+import type {ImportedSpreadsheet, Policy, PolicyCategories, Rule} from '@src/types/onyx';
 import type {ImportFinalModal} from '@src/types/onyx/ImportedSpreadsheet';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
-import type {CodingRule} from '@src/types/onyx/Policy';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {useFocusEffect} from '@react-navigation/native';
 import React, {useCallback, useMemo, useState} from 'react';
@@ -61,17 +62,17 @@ const ACTION_COLUMNS: string[] = [
  * spreadsheet rows that would recreate a rule the policy already has (e.g. the same spreadsheet
  * imported twice) as well as duplicate rows within the same spreadsheet.
  */
-function getRuleContentKey(rule: Pick<CodingRule, 'filters' | 'merchant' | 'category' | 'tag' | 'comment' | 'reimbursable' | 'billable' | 'vendorID'>): string {
+function getRuleContentKey(formValues: Partial<MerchantRuleFormValues>): string {
     return JSON.stringify([
-        rule.filters.operator,
-        rule.filters.right.toLowerCase(),
-        rule.merchant ?? '',
-        rule.category ?? '',
-        rule.tag ?? '',
-        rule.comment ?? '',
-        rule.reimbursable ?? null,
-        rule.billable ?? null,
-        rule.vendorID ?? null,
+        formValues.matchType ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+        formValues.merchantToMatch?.toLowerCase() ?? '',
+        formValues.merchant ?? '',
+        formValues.category ?? '',
+        formValues.tag ?? '',
+        formValues.comment ?? '',
+        formValues.reimbursable ?? null,
+        formValues.billable ?? null,
+        formValues.vendorID ?? null,
     ]);
 }
 
@@ -170,6 +171,7 @@ function parseSpreadsheetRules(
     containsHeader: boolean,
     policy: OnyxEntry<Policy>,
     policyCategories: OnyxEntry<PolicyCategories>,
+    existingRules: OnyxCollection<Rule>,
     isVendorListReady: boolean,
 ): ParsedSpreadsheetRules {
     const columns = Object.values(spreadsheet?.columns ?? {});
@@ -193,9 +195,13 @@ function parseSpreadsheetRules(
     };
 
     // Seed the duplicate check with the policy's current rules so re-importing a spreadsheet doesn't recreate them
+    // Rules the editor can't represent are skipped here: their content key can't be computed, so they can't be
+    // matched against a spreadsheet row anyway.
     const seenRuleKeys = new Set(
-        Object.values(policy?.rules?.codingRules ?? {})
-            .filter((rule) => rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && rule.filters?.right)
+        getPolicyExpenseDefaultRules(existingRules, policy?.id)
+            .filter(({rule}) => rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+            .map(({rule}) => getMerchantRuleFormValues(rule))
+            .filter((formValues) => !!formValues)
             .map(getRuleContentKey),
     );
     let skippedDuplicateCount = 0;
@@ -238,10 +244,22 @@ function parseSpreadsheetRules(
             continue;
         }
 
+        const formValues: Partial<MerchantRuleFormValues> = {
+            merchantToMatch,
+            matchType: merchantIsValue ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+            ...(updatedMerchant && {merchant: updatedMerchant}),
+            ...(category && {category}),
+            ...(tag && {tag}),
+            ...(comment && {comment}),
+            ...(reimbursable !== undefined && {reimbursable}),
+            ...(billable !== undefined && {billable}),
+            ...(vendorID && {vendorID}),
+        };
+
         const rule: ImportedMerchantRule = {
             filters: {
-                left: 'merchant',
-                operator: merchantIsValue ? CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO : CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
+                left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT,
+                operator: formValues.matchType ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS,
                 right: merchantToMatch,
             },
             ...(updatedMerchant && {merchant: updatedMerchant}),
@@ -254,7 +272,7 @@ function parseSpreadsheetRules(
             created: new Date().toISOString(),
         };
 
-        const ruleKey = getRuleContentKey(rule);
+        const ruleKey = getRuleContentKey(formValues);
         if (seenRuleKeys.has(ruleKey)) {
             skippedDuplicateCount++;
             continue;
@@ -287,6 +305,7 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
     const policyID = route.params.policyID;
     const policy = usePolicy(policyID);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
+    const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
     const {isBetaEnabled} = usePermissions();
     const isVendorFeatureAvailable = hasVendorFeature(policy, isBetaEnabled(CONST.BETAS.VENDOR_MATCHING));
 
@@ -370,8 +389,8 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
     // Parse once and reuse the result for both the offline button-enablement check and the import itself, so the
     // button can never be enabled offline for an import that actually needs the (non-retryable) API call
     const parsedRules = useMemo(
-        () => parseSpreadsheetRules(spreadsheet, containsHeader, policy, policyCategories, isVendorListReady),
-        [spreadsheet, containsHeader, policy, policyCategories, isVendorListReady],
+        () => parseSpreadsheetRules(spreadsheet, containsHeader, policy, policyCategories, rules, isVendorListReady),
+        [spreadsheet, containsHeader, policy, policyCategories, rules, isVendorListReady],
     );
 
     // When categories are enabled but not yet cached (e.g. after a cache clear, before the on-focus fetch), the
@@ -391,7 +410,7 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
             return;
         }
 
-        const {rules, skippedDuplicateCount, invalidCategoryNames, invalidVendorNames} = parsedRules;
+        const {rules: parsedMerchantRules, skippedDuplicateCount, invalidCategoryNames, invalidVendorNames} = parsedRules;
 
         setIsImportingRules(true);
         // When every row was skipped (duplicate rules and/or unknown categories/vendors), skip the API call and confirm that nothing was added
@@ -409,7 +428,7 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
                       secondaryPendingMessageKeyParams: {count: invalidVendorNames.size},
                   }),
               }
-            : await importMerchantRulesSpreadsheet(policyID, rules, invalidCategoryNames.size, invalidVendorNames.size);
+            : await importMerchantRulesSpreadsheet(policyID, parsedMerchantRules, invalidCategoryNames.size, invalidVendorNames.size);
         const didShowImportFinalModal = await showImportSpreadsheetConfirmModal(importFinalModal, {shouldHandleNavigationBack: false});
         if (!didShowImportFinalModal) {
             setIsImportingRules(false);
@@ -441,7 +460,7 @@ function ImportedMerchantRulesPage({route}: ImportedMerchantRulesPageProps) {
                 enableEdgeToEdgeBottomSafeAreaPadding
                 shouldShowOfflineIndicatorInWideScreen
             >
-                <HeaderWithBackButton
+                <HeaderWithBackButtonAndTitle
                     title={translate('workspace.rules.merchantRules.importRulesTitle')}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.RULES_MERCHANT_IMPORT.getRoute(policyID))}
                 />
diff --git a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
index c334ae9f942a..344f5c687b6f 100644
--- a/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
+++ b/src/pages/workspace/rules/MerchantRules/MerchantRulePageBase.tsx
@@ -1,6 +1,8 @@
 import Button from '@components/Button';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import type {LocalizedTranslate} from '@components/LocaleContextProvider';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
@@ -21,15 +23,17 @@ import usePolicy from '@hooks/usePolicy';
 import usePolicyConnectionsPrefetch from '@hooks/usePolicyConnectionsPrefetch';
 import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
 import usePressLoading from '@hooks/usePressLoading';
+import useRulesPrefetch from '@hooks/useRulesPrefetch';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {deletePolicyCategoryTax, movePolicyCategoryTax, openPolicyCategoriesPage, setPolicyCategoryTaxes} from '@libs/actions/Policy/Category';
-import {deletePolicyCodingRule, setPolicyCodingRule} from '@libs/actions/Policy/Rules';
+import {deleteMerchantRule, setMerchantRule} from '@libs/actions/Policy/Rules';
 import {openPolicyTagsPage} from '@libs/actions/Policy/Tag';
 import Tab from '@libs/actions/Tab';
 import {clearDraftMerchantRule, setDraftMerchantRule} from '@libs/actions/User';
 import {getCategoryTaxRuleTaxID, getTaxRateDisplayName, hasUsableTaxRates, isCategoryRuleDraft} from '@libs/CategoryTaxRulesUtils';
 import {getDecodedCategoryName} from '@libs/CategoryUtils';
+import {canEditMerchantRule, getMerchantRuleFormValues, getPolicyExpenseDefaultRules} from '@libs/ExpenseDefaultRuleUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {hasEnabledOptions} from '@libs/OptionsListUtils';
 import Parser from '@libs/Parser';
@@ -46,13 +50,14 @@ import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
 import type {MerchantRuleForm} from '@src/types/form';
 import MERCHANT_RULE_INPUT_IDS from '@src/types/form/MerchantRuleForm';
 import type {ExpenseDefaultRuleType} from '@src/types/form/MerchantRuleForm';
 import type {PolicyTagLists} from '@src/types/onyx';
-import type {CodingRule} from '@src/types/onyx/Policy';
 import getEmptyArray from '@src/types/utils/getEmptyArray';
 import type IconAsset from '@src/types/utils/IconAsset';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 
 import type {ValueOf} from 'type-fest';
 
@@ -73,6 +78,12 @@ type MerchantRulePageBaseProps = {
      * of through `ruleID`.
      */
     editCategoryTaxRuleFor?: string;
+    /** Starts a new category tax default for this category, used by the category details RHP. */
+    newCategoryTaxRuleFor?: string;
+    /** When true, the category field is non-interactive (category-scoped create/edit). */
+    isCategoryLocked?: boolean;
+    /** Where saving or deleting returns to when the rule was opened from category settings through the New rule hub. */
+    categorySettingsBackPath?: Route;
     testID: string;
 };
 
@@ -82,6 +93,7 @@ type SectionItemType = {
     required?: boolean;
     title?: string;
     onPress: () => void;
+    isLocked?: boolean;
     shouldRenderAsHTML?: boolean;
     icon?: IconAsset;
 };
@@ -142,7 +154,16 @@ const getErrorMessage = (translate: LocalizedTranslate, form?: MerchantRuleForm)
     return translate('workspace.rules.merchantRules.confirmErrorConditionAndDefault');
 };
 
-function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCategoryTaxRuleFor, testID}: MerchantRulePageBaseProps) {
+function MerchantRulePageBase({
+    policyID,
+    ruleID,
+    initialCategoryName,
+    editCategoryTaxRuleFor,
+    newCategoryTaxRuleFor,
+    isCategoryLocked = false,
+    categorySettingsBackPath,
+    testID,
+}: MerchantRulePageBaseProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const policy = usePolicy(policyID);
@@ -179,8 +200,14 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
     // the workspace has no accounting connection, and when the data has already been fetched.
     usePolicyConnectionsPrefetch(policy, true);
 
-    // Get the existing rule from the policy (for edit mode)
-    const existingRule = ruleID ? policy?.rules?.codingRules?.[ruleID] : undefined;
+    // This route is deep linkable, so it can be the first screen mounted. Nothing else on the way in fetches the
+    // rules collection, which would leave the not-found guard below reading an empty collection for a valid rule.
+    const {areRulesLoading: isRulesFetchPending} = useRulesPrefetch();
+
+    const [rules, rulesResult] = useOnyx(ONYXKEYS.COLLECTION.RULE);
+    const areRulesLoading = isLoadingOnyxValue(rulesResult) || isRulesFetchPending;
+    // Get the existing rule from the rules collection (for edit mode)
+    const existingRule = ruleID ? rules?.[`${ONYXKEYS.COLLECTION.RULE}${ruleID}`] : undefined;
     const existingCategoryTaxID = editCategoryTaxRuleFor ? getCategoryTaxRuleTaxID(policy?.rules?.expenseRules, editCategoryTaxRuleFor) : undefined;
 
     // Initialize the form with existing rule data (for edit mode)
@@ -195,6 +222,15 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
             return;
         }
 
+        if (newCategoryTaxRuleFor) {
+            if (didSeedInitialCategoryRef.current) {
+                return;
+            }
+            didSeedInitialCategoryRef.current = true;
+            setDraftMerchantRule({ruleType: CONST.POLICY.EXPENSE_DEFAULT_RULE_TYPE.CATEGORY, categoriesToMatch: [newCategoryTaxRuleFor]});
+            return;
+        }
+
         if (!isEditing) {
             // Seed once, or this overwrites whatever category the admin has since picked.
             if (!initialCategoryName || didSeedInitialCategoryRef.current) {
@@ -205,28 +241,14 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
             return;
         }
 
-        if (!existingRule) {
+        // An undefined result means the rule uses parts of the format this form can't show. Saving it back would
+        // drop them, so the editor stays empty and the rules list keeps such rules read-only.
+        const formValues = getMerchantRuleFormValues(existingRule);
+        if (!formValues) {
             return;
         }
-
-        // Convert the operator to matchType for the form
-        // 'eq' = exact match, 'contains' = contains match
-        const matchType = existingRule.filters?.operator;
-        // Convert HTML comment back to markdown for editing
-        const commentMarkdown = existingRule.comment ? Parser.htmlToMarkdown(existingRule.comment) : undefined;
-        setDraftMerchantRule({
-            merchantToMatch: existingRule.filters?.right,
-            matchType,
-            merchant: existingRule.merchant,
-            category: existingRule.category,
-            tag: existingRule.tag,
-            tax: existingRule.tax?.field_id_TAX?.externalID,
-            vendorID: existingRule.vendorID,
-            comment: commentMarkdown,
-            reimbursable: existingRule.reimbursable,
-            billable: existingRule.billable,
-        });
-    }, [isEditing, existingRule, isEditingCategoryTaxRule, editCategoryTaxRuleFor, existingCategoryTaxID, initialCategoryName]);
+        setDraftMerchantRule(formValues);
+    }, [isEditing, existingRule, isEditingCategoryTaxRule, editCategoryTaxRuleFor, existingCategoryTaxID, initialCategoryName, newCategoryTaxRuleFor]);
 
     // Clear the form on unmount
     useEffect(() => () => clearDraftMerchantRule(), []);
@@ -332,29 +354,27 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
      * A duplicate is a rule that has the same merchant to match AND the same match type (contains/exact).
      * When editing, we exclude the current rule from the comparison.
      */
-    const checkForDuplicateRule = (codingRules: Record<string, CodingRule> | undefined, merchantToMatch: string | undefined, matchType: string | undefined): boolean => {
-        if (!codingRules || !merchantToMatch) {
+    const checkForDuplicateRule = (merchantToMatch: string | undefined, matchType: string | undefined): boolean => {
+        if (!merchantToMatch) {
             return false;
         }
 
         const normalizedMerchant = merchantToMatch.toLowerCase();
         const currentMatchType = matchType ?? CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
-        const defaultMatchType = CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS;
 
-        return Object.entries(codingRules).some(([existingRuleID, rule]) => {
+        return getPolicyExpenseDefaultRules(rules, policyID).some(({ruleID: existingRuleID, rule}) => {
             // Skip the rule being edited
             if (isEditing && existingRuleID === ruleID) {
                 return false;
             }
 
-            if (!rule?.filters?.right) {
+            // A rule this form can't represent can't be a duplicate of what this form is about to save.
+            const existingFormValues = getMerchantRuleFormValues(rule);
+            if (!existingFormValues) {
                 return false;
             }
 
-            const existingMerchant = rule.filters.right.toLowerCase();
-            const existingMatchType = rule.filters.operator ?? defaultMatchType;
-
-            if (existingMerchant !== normalizedMerchant || existingMatchType !== currentMatchType) {
+            if (existingFormValues.merchantToMatch.toLowerCase() !== normalizedMerchant || existingFormValues.matchType !== currentMatchType) {
                 return false;
             }
 
@@ -392,7 +412,7 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
             // Nothing to write for an unchanged save; a move is blocked earlier by the error message instead.
             if (isSavedTaxTheWorkspaceDefault) {
                 setIsClosing(true);
-                Navigation.goBack();
+                Navigation.goBack(categorySettingsBackPath);
                 return;
             }
             setIsClosing(true);
@@ -403,15 +423,15 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
                 // The command is per-category, so a bulk selection saves one rule for each category picked.
                 setPolicyCategoryTaxes(policy, categoriesToMatch, categoryTaxID);
             }
-            if (isEditingCategoryTaxRule) {
-                Navigation.goBack();
+            if (isEditingCategoryTaxRule || categorySettingsBackPath) {
+                Navigation.goBack(categorySettingsBackPath);
             } else {
                 goBackToExpenseDefaults();
             }
             return;
         }
 
-        setPolicyCodingRule(policyID, form, policy, ruleID, shouldUpdateMatchingTransactions);
+        setMerchantRule(policyID, form, policy, ruleID, existingRule, shouldUpdateMatchingTransactions);
         if (isCreatedFromExpense) {
             // Opened from the callout, so this page is a suffix on the expense's path. Dropping it returns to the
             // expense instead of the workspace Rules page.
@@ -443,7 +463,7 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
         }
 
         // Check for duplicate rules
-        const hasDuplicate = checkForDuplicateRule(policy?.rules?.codingRules, form.merchantToMatch, form.matchType);
+        const hasDuplicate = checkForDuplicateRule(form.merchantToMatch, form.matchType);
         if (hasDuplicate) {
             showConfirmModal({
                 title: translate('workspace.rules.merchantRules.duplicateRuleTitle'),
@@ -470,7 +490,7 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
         if (editCategoryTaxRuleFor) {
             deletePolicyCategoryTax(policy, editCategoryTaxRuleFor);
         } else if (ruleID) {
-            deletePolicyCodingRule(policy, ruleID);
+            deleteMerchantRule(policy.id, ruleID, existingRule);
         }
         return true;
     };
@@ -480,10 +500,11 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
     const isRuleBeingDeleted = existingRule?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const canDeleteRule = canWriteRules && !!policy && !isRuleBeingDeleted && (isEditing || canDeleteCategoryTaxRule);
 
-    const {deleteHeaderProps} = useRuleDeleteHeaderProps({
+    const {deleteIconButtonProps} = useRuleDeleteHeaderProps({
         canDelete: canDeleteRule,
         onDelete: deleteRule,
         sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.RULES.MERCHANT_RULE_DELETE,
+        backTo: categorySettingsBackPath,
     });
 
     const sections: SectionType[] = [
@@ -511,6 +532,7 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
                           required: true,
                           title: categoriesToMatchDisplayName,
                           onPress: () => Navigation.navigate(ROUTES.RULES_CATEGORY_TO_MATCH.getRoute(policyID, ruleID, editCategoryTaxRuleFor)),
+                          isLocked: isCategoryLocked,
                           icon: icons.Folder,
                       }
                     : undefined,
@@ -622,10 +644,24 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
         Navigation.navigate(getRuleRoute(DYNAMIC_ROUTES.RULES_MERCHANT_PREVIEW_MATCHES_FROM_EXPENSE.path, ROUTES.RULES_MERCHANT_PREVIEW_MATCHES.getRoute(policyID, ruleID)));
     };
 
+    // `areRulesLoading` keeps a deep link from rendering not-found before the collection has both hydrated and
+    // been fetched. Onyx hydrates it as empty well before `GetRules` answers, so hydration alone is not enough.
+    // The form has to wait too: filled in and saved during that window it would write only the fields typed into
+    // it over the rule the link points at.
+    if (ruleID && !existingRule && !isClosing && areRulesLoading) {
+        return <FullScreenLoadingIndicator testID={`${testID}Loading`} />;
+    }
+
     if (ruleID && !existingRule && !isClosing) {
         return <NotFoundPage />;
     }
 
+    // The rules collection is shared across workspaces and rule kinds, so a stale link can resolve a ruleID that
+    // this editor must not write to. Saving would replace it with a merchant rule and drop whatever it holds.
+    if (ruleID && !!existingRule && !isClosing && !canEditMerchantRule(existingRule, policyID)) {
+        return <NotFoundPage />;
+    }
+
     if (isEditingCategoryTaxRule && !existingCategoryTaxID && !isClosing) {
         return <NotFoundPage />;
     }
@@ -684,29 +720,32 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
         />
     ) : null;
 
-    const renderSectionItem = (item: SectionItemType) => (
-        <MenuItemWithTopDescription
-            key={item.key}
-            description={item.description}
-            errorText={canWriteRules && shouldShowError && item.required && !item.title ? translate('common.error.fieldRequired') : ''}
-            onPress={canWriteRules ? item.onPress : undefined}
-            rightLabel={canWriteRules && item.required ? translate('common.required') : undefined}
-            shouldShowRightIcon={canWriteRules}
-            interactive={canWriteRules}
-            title={item.title}
-            numberOfLinesTitle={2}
-            titleStyle={styles.flex1}
-            shouldRenderAsHTML={item.shouldRenderAsHTML}
-            shouldApplyIconPaddingToHTMLTitle={!!item.icon && !!item.shouldRenderAsHTML}
-            icon={item.icon}
-            {...(item.icon && {
-                iconWidth: variables.iconSizeNormal,
-                iconHeight: variables.iconSizeNormal,
-                shouldIconUseAutoWidthStyle: true,
-            })}
-            sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.RULES.MERCHANT_RULE_SECTION_ITEM}
-        />
-    );
+    const renderSectionItem = (item: SectionItemType) => {
+        const canEditItem = canWriteRules && !item.isLocked;
+        return (
+            <MenuItemWithTopDescription
+                key={item.key}
+                description={item.description}
+                errorText={canEditItem && shouldShowError && item.required && !item.title ? translate('common.error.fieldRequired') : ''}
+                onPress={canEditItem ? item.onPress : undefined}
+                rightLabel={canEditItem && item.required ? translate('common.required') : undefined}
+                shouldShowRightIcon={canEditItem}
+                interactive={canEditItem}
+                title={item.title}
+                numberOfLinesTitle={2}
+                titleStyle={styles.flex1}
+                shouldRenderAsHTML={item.shouldRenderAsHTML}
+                shouldApplyIconPaddingToHTMLTitle={!!item.icon && !!item.shouldRenderAsHTML}
+                icon={item.icon}
+                {...(item.icon && {
+                    iconWidth: variables.iconSizeNormal,
+                    iconHeight: variables.iconSizeNormal,
+                    shouldIconUseAutoWidthStyle: true,
+                })}
+                sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.RULES.MERCHANT_RULE_SECTION_ITEM}
+            />
+        );
+    };
 
     const renderSections = () =>
         sections.map((section, sectionIndex) => (
@@ -735,14 +774,17 @@ function MerchantRulePageBase({policyID, ruleID, initialCategoryName, editCatego
                 offlineIndicatorStyle={styles.mtAuto}
                 includeSafeAreaPaddingBottom
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.merchantRules.expenseDefaultsTitle')}
-                    {...deleteHeaderProps}
-                >
-                    {/* Only while a condition is set, and only on an unsaved rule: resetting a saved one would let it
-                        switch condition type, which the two storage shapes can't express as one edit. */}
-                    {canWriteRules && !isEditingSavedRule && (hasMerchantCondition || hasCategoryCondition) && <TextLink onPress={resetRule}>{translate('common.reset')}</TextLink>}
-                </HeaderWithBackButton>
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.merchantRules.expenseDefaultsTitle')}>
+                    <Header.Actions>
+                        {/* Only while a condition is set, and only on an unsaved rule: resetting a saved one would let it
+                        switch condition type, which the two storage shapes can't express as one edit. A locked category
+                        isn't the admin's to clear. */}
+                        {canWriteRules && !isEditingSavedRule && !isCategoryLocked && (hasMerchantCondition || hasCategoryCondition) && (
+                            <TextLink onPress={resetRule}>{translate('common.reset')}</TextLink>
+                        )}
+                    </Header.Actions>
+                    {!!deleteIconButtonProps && <Header.IconButton {...deleteIconButtonProps} />}
+                </HeaderWithBackButtonAndTitle>
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                     <View style={[styles.ph5, styles.pv3, styles.gap6]}>
                         <Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.rules.merchantRules.expenseDefaultsSubtitle')}</Text>
diff --git a/src/pages/workspace/rules/MerchantRules/PreviewMatchesPage.tsx b/src/pages/workspace/rules/MerchantRules/PreviewMatchesPage.tsx
index da556c16ca26..cf944bc3f67a 100644
--- a/src/pages/workspace/rules/MerchantRules/PreviewMatchesPage.tsx
+++ b/src/pages/workspace/rules/MerchantRules/PreviewMatchesPage.tsx
@@ -1,7 +1,7 @@
 import ActivityIndicator from '@components/ActivityIndicator';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
@@ -98,7 +98,7 @@ function PreviewMatchesPage({route}: PreviewMatchesPageProps) {
             includeSafeAreaPaddingBottom
             shouldEnableMaxHeight
         >
-            <HeaderWithBackButton
+            <HeaderWithBackButtonAndTitle
                 title={translate('workspace.rules.merchantRules.previewMatches')}
                 onBackButtonPress={goBack}
             />
diff --git a/src/pages/workspace/rules/MerchantTypeRules/MerchantTypeRulePageBase.tsx b/src/pages/workspace/rules/MerchantTypeRules/MerchantTypeRulePageBase.tsx
index 7a2a276a4487..ef25481821e4 100644
--- a/src/pages/workspace/rules/MerchantTypeRules/MerchantTypeRulePageBase.tsx
+++ b/src/pages/workspace/rules/MerchantTypeRules/MerchantTypeRulePageBase.tsx
@@ -1,5 +1,5 @@
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -159,7 +159,7 @@ function MerchantTypeRulePageBase({policyID, groupID, testID}: MerchantTypeRuleP
                 offlineIndicatorStyle={styles.mtAuto}
                 includeSafeAreaPaddingBottom
             >
-                <HeaderWithBackButton title={translate('workspace.rules.merchantRules.expenseDefaultsTitle')} />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.merchantRules.expenseDefaultsTitle')} />
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                     <View style={[styles.ph5, styles.pv3, styles.gap6]}>
                         <Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.rules.merchantRules.expenseDefaultsSubtitle')}</Text>
diff --git a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
index de9dfe0f741b..0b4c27262f09 100644
--- a/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
+++ b/src/pages/workspace/rules/PolicyRulesPageRevamp.tsx
@@ -11,16 +11,18 @@ import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
+import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useRulesPrefetch from '@hooks/useRulesPrefetch';
 import useShouldDisplayButtonsInSeparateLine from '@hooks/useShouldDisplayButtonsInSeparateLine';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
-import {openPolicyRulesPage} from '@libs/actions/Policy/Rules';
+import {getRules, openPolicyRulesPage} from '@libs/actions/Policy/Rules';
 import Tab from '@libs/actions/Tab';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -95,10 +97,27 @@ function PolicyRulesPageRevamp({route}: PolicyRulesPageRevampProps) {
     const {showConfirmModal} = useConfirmModal();
 
     useEffect(() => {
-        // Fetch once on mount (and when policyID changes). setPolicyCodingRule already updates Onyx — refetching after saves can overwrite a newly added rule with stale data.
+        // Fetch once on mount and whenever policyID changes. setMerchantRule already updates Onyx, so refetching
+        // after a save can overwrite a newly added rule with stale data.
         openPolicyRulesPage(policyID);
+        // The mount fetch is this page's own, rather than the shared hook's once per session, because this page
+        // lists the rules themselves and a stale collection here is visible to the admin.
+        getRules();
     }, [policyID]);
 
+    // Clearing the cache empties the collection without remounting anything, so the mount fetch above never runs
+    // again and the list stays empty. The hook's flags are cleared along with the collection, so it refills it.
+    useRulesPrefetch();
+
+    // A read issued while offline is discarded rather than queued, so the mount fetch can leave this page with
+    // nothing to list. Pending writes flush before the read, so this cannot overwrite a rule saved offline.
+    useNetwork({
+        onReconnect: () => {
+            openPolicyRulesPage(policyID);
+            getRules();
+        },
+    });
+
     useEffect(() => {
         // Collect can only use the General tab; keep them there if a non-General tab is persisted.
         // Wait until policy is loaded so we do not reset Control users while Onyx is still hydrating.
diff --git a/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx b/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
index 9a84bd296447..acc27b19f322 100644
--- a/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
+++ b/src/pages/workspace/rules/RequireFieldsRules/RequireFieldsRulePageBase.tsx
@@ -1,5 +1,6 @@
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import FieldRequirementSettingRow from '@components/RequireFieldsRules/FieldRequirementSettingRow';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -403,7 +404,7 @@ function RequireFieldsRulePageBase({policyID, categoryName, initialCategoryName,
     // The rule is the set of field requirements on the category, so it only exists once one of them is on, and the
     // category's own pending state is the rule's: while a delete is in flight, deleting again would repeat the writes.
     const isRuleBeingDeleted = !!category && getRequireFieldsPendingActionForCategory(category) === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const {deleteHeaderProps} = useRuleDeleteHeaderProps({
+    const {deleteIconButtonProps} = useRuleDeleteHeaderProps({
         canDelete: canWriteRules && isEditing && !!category && categoryHasAnyRequireFieldsRule(category) && !isRuleBeingDeleted,
         onDelete: () => {
             deleteRequireFieldsRule(policyData, getRequireFieldsRuleKey(categoryName ?? ''), isVendorMatchingBetaEnabled);
@@ -448,10 +449,9 @@ function RequireFieldsRulePageBase({policyID, categoryName, initialCategoryName,
                 offlineIndicatorStyle={styles.mtAuto}
                 includeSafeAreaPaddingBottom
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.requireFieldsRule.title')}
-                    {...deleteHeaderProps}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.requireFieldsRule.title')}>
+                    {!!deleteIconButtonProps && <Header.IconButton {...deleteIconButtonProps} />}
+                </HeaderWithBackButtonAndTitle>
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>
                     <View style={[styles.ph5, styles.pv3, styles.gap6]}>
                         <Text style={[styles.textNormal, styles.textSupporting]}>{translate('workspace.rules.requireFieldsRule.subtitle')}</Text>
diff --git a/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx b/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
index 18b211beec55..7989af1d5a3e 100644
--- a/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
+++ b/src/pages/workspace/rules/RulesAutoApproveReportsUnderPage.tsx
@@ -1,7 +1,7 @@
 import AmountForm from '@components/AmountForm';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 
@@ -57,10 +57,7 @@ function RulesAutoApproveReportsUnderPage({route}: RulesAutoApproveReportsUnderP
                 shouldEnableMaxHeight
                 testID="RulesAutoApproveReportsUnderPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.expenseReportRules.autoApproveReportsUnderTitle')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.expenseReportRules.autoApproveReportsUnderTitle')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.mh5]}
                     formID={ONYXKEYS.FORMS.RULES_AUTO_APPROVE_REPORTS_UNDER_MODAL_FORM}
diff --git a/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx b/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
index cab41fedbe6b..81382500b884 100644
--- a/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
+++ b/src/pages/workspace/rules/RulesAutoPayReportsUnderPage.tsx
@@ -2,7 +2,7 @@ import AmountForm from '@components/AmountForm';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 
@@ -72,10 +72,7 @@ function RulesAutoPayReportsUnderPage({route}: RulesAutoPayReportsUnderPageProps
                 shouldEnableMaxHeight
                 testID="RulesAutoPayReportsUnderPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.expenseReportRules.autoPayReportsUnderTitle')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.expenseReportRules.autoPayReportsUnderTitle')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.mh5]}
                     formID={ONYXKEYS.FORMS.RULES_AUTO_PAY_REPORTS_UNDER_MODAL_FORM}
diff --git a/src/pages/workspace/rules/RulesBillableDefaultPage.tsx b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
index 6c78e78dbf1c..68082ca4ce3c 100644
--- a/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
+++ b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
@@ -105,10 +105,7 @@ function RulesBillableDefaultPage({
                 shouldEnableMaxHeight
                 testID="RulesBillableDefaultPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.generalTab.billableExpenses')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.generalTab.billableExpenses')} />
                 <Text style={[styles.flexRow, styles.alignItemsCenter, styles.mt3, styles.mh5, styles.mb3]}>
                     <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.rules.individualExpenseRules.billableDefaultDescription')}</Text>
                 </Text>
diff --git a/src/pages/workspace/rules/RulesCustomPage.tsx b/src/pages/workspace/rules/RulesCustomPage.tsx
index b3b78dad9a8d..f6003742843a 100644
--- a/src/pages/workspace/rules/RulesCustomPage.tsx
+++ b/src/pages/workspace/rules/RulesCustomPage.tsx
@@ -1,6 +1,6 @@
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import TextInput from '@components/TextInput';
 
@@ -55,10 +55,7 @@ function RulesCustomPage({
                 shouldEnableMaxHeight
                 testID="RulesCustomPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.customRules.title')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.customRules.title')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.RULES_CUSTOM_FORM}
diff --git a/src/pages/workspace/rules/RulesItemizedReceiptRequiredAmountPage.tsx b/src/pages/workspace/rules/RulesItemizedReceiptRequiredAmountPage.tsx
index ae28004375fb..894ee56c1f51 100644
--- a/src/pages/workspace/rules/RulesItemizedReceiptRequiredAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesItemizedReceiptRequiredAmountPage.tsx
@@ -2,7 +2,7 @@ import AmountForm from '@components/AmountForm';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 
@@ -80,10 +80,7 @@ function RulesItemizedReceiptRequiredAmountPage({
                 shouldEnableMaxHeight
                 testID={RulesItemizedReceiptRequiredAmountPage.displayName}
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.individualExpenseRules.itemizedReceiptRequiredAmount')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.individualExpenseRules.itemizedReceiptRequiredAmount')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.RULES_REQUIRED_ITEMIZED_RECEIPT_AMOUNT_FORM}
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
index 4cf6c5c2a15b..695fbb03a91f 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
@@ -1,6 +1,6 @@
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
@@ -63,10 +63,7 @@ function RulesMaxExpenseAgePage({
                 shouldEnableMaxHeight
                 testID="RulesMaxExpenseAgePage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.generalTab.expensesOlderThan')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.generalTab.expensesOlderThan')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AGE_FORM}
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
index 8c22c99d17d4..f24e3ce68954 100644
--- a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
@@ -1,7 +1,7 @@
 import AmountForm from '@components/AmountForm';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 
@@ -60,10 +60,7 @@ function RulesMaxExpenseAmountPage({
                 shouldEnableMaxHeight
                 testID="RulesMaxExpenseAmountPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.generalTab.expensesAboveAmount')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.generalTab.expensesAboveAmount')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AMOUNT_FORM}
diff --git a/src/pages/workspace/rules/RulesNewPage.tsx b/src/pages/workspace/rules/RulesNewPage.tsx
index 67d9e0a0f714..5cc21f7f416b 100644
--- a/src/pages/workspace/rules/RulesNewPage.tsx
+++ b/src/pages/workspace/rules/RulesNewPage.tsx
@@ -1,13 +1,16 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItem from '@components/MenuItem';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 
+import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 
+import {categoryHasTaxRule, hasSelectableCategoryTaxRate, hasUsableTaxRates} from '@libs/CategoryTaxRulesUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -45,7 +48,27 @@ function RulesNewPage({route}: RulesNewPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const illustrations = useMemoizedLazyIllustrations(['CardReaderAlt', 'Flag', 'CheckboxText', 'ReportReceipt', 'AiBot']);
-    const isCategoryScopedCreate = route.name === SCREENS.WORKSPACE.DYNAMIC_CATEGORY_RULES_NEW || !!categoryName;
+    const isCategorySettingsFlow = route.name === SCREENS.WORKSPACE.DYNAMIC_CATEGORY_RULES_NEW;
+    const isCategoryScopedCreate = isCategorySettingsFlow || !!categoryName;
+    const policy = usePolicy(policyID);
+    const {showConfirmModal} = useConfirmModal();
+
+    // From category settings the only expense default is the category's tax rate, so the type chooser is skipped. It
+    // can't be set without a rate to pick, so that case gets the chooser's explainer instead of an empty picker.
+    const openCategoryTaxRule = () => {
+        const hasCategoryTaxRule = !!categoryName && categoryHasTaxRule(policy?.rules?.expenseRules, categoryName);
+        if (!hasCategoryTaxRule && !hasSelectableCategoryTaxRate(policy)) {
+            const areTaxesEnabled = hasUsableTaxRates(policy);
+            showConfirmModal({
+                title: translate(areTaxesEnabled ? 'workspace.rules.merchantRules.addTaxRateFirstTitle' : 'workspace.rules.merchantRules.turnOnTaxesFirstTitle'),
+                prompt: translate(areTaxesEnabled ? 'workspace.rules.merchantRules.addTaxRateFirstPrompt' : 'workspace.rules.merchantRules.turnOnTaxesFirstPrompt'),
+                confirmText: translate('common.buttonConfirm'),
+                shouldShowCancelButton: false,
+            });
+            return;
+        }
+        Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_TAX_NEW.path));
+    };
 
     const newRuleOptions: NewRuleOption[] = [
         {
@@ -88,9 +111,10 @@ function RulesNewPage({route}: RulesNewPageProps) {
             icon: illustrations.ReportReceipt,
             title: translate('workspace.rules.newRule.applyExpenseDefaults'),
             description: translate('workspace.rules.newRule.applyExpenseDefaultsDescription'),
-            onPress: () => Navigation.navigate(ROUTES.RULES_EXPENSE_DEFAULT_TYPE.getRoute(policyID)),
+            onPress: () => (isCategorySettingsFlow ? openCategoryTaxRule() : Navigation.navigate(ROUTES.RULES_EXPENSE_DEFAULT_TYPE.getRoute(policyID))),
             sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.RULES.NEW_RULE_MENU_ITEM_APPLY_EXPENSE_DEFAULTS,
-            isWorkspaceOnly: true,
+            // Only category settings can scope the editor to its category, so a category passed any other way drops it.
+            isWorkspaceOnly: !isCategorySettingsFlow,
         },
         {
             key: 'createAgentRule',
@@ -117,7 +141,7 @@ function RulesNewPage({route}: RulesNewPageProps) {
                 testID="RulesNewPage"
                 enableEdgeToEdgeBottomSafeAreaPadding
             >
-                <HeaderWithBackButton title={translate('workspace.rules.newRule.title')} />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.newRule.title')} />
                 <ScrollView
                     style={[styles.flexGrow1]}
                     addBottomSafeAreaPadding
diff --git a/src/pages/workspace/rules/RulesProhibitedDefaultPage.tsx b/src/pages/workspace/rules/RulesProhibitedDefaultPage.tsx
index 63b48f9800f1..f63cc7c7725d 100644
--- a/src/pages/workspace/rules/RulesProhibitedDefaultPage.tsx
+++ b/src/pages/workspace/rules/RulesProhibitedDefaultPage.tsx
@@ -1,6 +1,6 @@
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -116,10 +116,7 @@ function RulesProhibitedDefaultPage({
                 shouldEnableMaxHeight
                 testID="RulesProhibitedDefaultPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.generalTab.flagReceiptLineItems')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.generalTab.flagReceiptLineItems')} />
                 <ScrollView
                     style={[styles.flexGrow1]}
                     contentContainerStyle={[styles.ph5, styles.pb5]}
diff --git a/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx b/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
index a6324b69a80a..4719628111ee 100644
--- a/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
+++ b/src/pages/workspace/rules/RulesRandomReportAuditPage.tsx
@@ -1,6 +1,6 @@
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import PercentageForm from '@components/PercentageForm';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
@@ -53,10 +53,7 @@ function RulesRandomReportAuditPage({route}: RulesRandomReportAuditPageProps) {
                 shouldEnableMaxHeight
                 testID="RulesRandomReportAuditPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.expenseReportRules.randomReportAuditTitle')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.expenseReportRules.randomReportAuditTitle')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.mh5]}
                     formID={ONYXKEYS.FORMS.RULES_RANDOM_REPORT_AUDIT_MODAL_FORM}
diff --git a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
index 725d1e3ac004..218cefa3362e 100644
--- a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
+++ b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
@@ -2,7 +2,7 @@ import AmountForm from '@components/AmountForm';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 
@@ -80,10 +80,7 @@ function RulesReceiptRequiredAmountPage({
                 shouldEnableMaxHeight
                 testID="RulesReceiptRequiredAmountPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.individualExpenseRules.receiptRequiredAmount')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.individualExpenseRules.receiptRequiredAmount')} />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.RULES_REQUIRED_RECEIPT_AMOUNT_FORM}
diff --git a/src/pages/workspace/rules/RulesReimbursableDefaultPage.tsx b/src/pages/workspace/rules/RulesReimbursableDefaultPage.tsx
index a18116bb3213..753ae3f4a76f 100644
--- a/src/pages/workspace/rules/RulesReimbursableDefaultPage.tsx
+++ b/src/pages/workspace/rules/RulesReimbursableDefaultPage.tsx
@@ -1,4 +1,4 @@
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
@@ -74,10 +74,7 @@ function RulesReimbursableDefaultPage({
                 shouldEnableMaxHeight
                 testID="RulesReimbursableDefaultPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.generalTab.cashExpenses')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.generalTab.cashExpenses')} />
                 <Text style={[styles.flexRow, styles.alignItemsCenter, styles.mt3, styles.mh5, styles.mb5]}>
                     <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.rules.individualExpenseRules.cashExpenseDefaultDescription')}</Text>
                 </Text>
diff --git a/src/pages/workspace/rules/RulesRequireFieldsPage.tsx b/src/pages/workspace/rules/RulesRequireFieldsPage.tsx
index b8b6c9d9de15..fb1ce9f1f436 100644
--- a/src/pages/workspace/rules/RulesRequireFieldsPage.tsx
+++ b/src/pages/workspace/rules/RulesRequireFieldsPage.tsx
@@ -1,6 +1,6 @@
 import Button from '@components/Button';
 import FixedFooter from '@components/FixedFooter';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
@@ -298,10 +298,7 @@ function RulesRequireFieldsPage({
                 shouldEnableMaxHeight
                 testID="RulesRequireFieldsPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.requireFields.title')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.requireFields.title')} />
                 <ScrollView
                     style={[styles.flexGrow1]}
                     contentContainerStyle={[styles.ph5, styles.pb5]}
diff --git a/src/pages/workspace/rules/RulesRequireReceiptsPage.tsx b/src/pages/workspace/rules/RulesRequireReceiptsPage.tsx
index e4a291cacf72..b6428895a3bb 100644
--- a/src/pages/workspace/rules/RulesRequireReceiptsPage.tsx
+++ b/src/pages/workspace/rules/RulesRequireReceiptsPage.tsx
@@ -3,7 +3,7 @@ import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues, FormRef} from '@components/Form/types';
 import FormHelpMessage from '@components/FormHelpMessage';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 
@@ -186,10 +186,7 @@ function RulesRequireReceiptsPage({
                 shouldEnableMaxHeight
                 testID="RulesRequireReceiptsPage"
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.requireReceipts.title')}
-                    onBackButtonPress={() => Navigation.goBack()}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.requireReceipts.title')} />
                 <FormProvider
                     ref={formRef}
                     style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx b/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx
index 74ff403664f9..216e67c31a4b 100644
--- a/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx
+++ b/src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx
@@ -1,7 +1,7 @@
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import SelectionList from '@components/SelectionList';
@@ -18,6 +18,7 @@ import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePressLoading from '@hooks/usePressLoading';
 import useSearchResults from '@hooks/useSearchResults';
 import useThemeIllustrations from '@hooks/useThemeIllustrations';
@@ -94,7 +95,7 @@ function SpendRuleCardPage({route}: SpendRuleCardPageProps) {
     const canWriteCardSpendRules = useCanWriteCardSpendRules(policyID);
     const defaultFundID = useDefaultFundID(policyID);
     const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${defaultFundID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards});
     const {cardList, ...allCards} = cardsList ?? {};
     const hasAnyCards = Object.keys(allCards).length > 0;
@@ -237,7 +238,7 @@ function SpendRuleCardPage({route}: SpendRuleCardPageProps) {
                     offlineIndicatorStyle={styles.mtAuto}
                     includeSafeAreaPaddingBottom
                 >
-                    <HeaderWithBackButton
+                    <HeaderWithBackButtonAndTitle
                         title={translate('workspace.rules.spendRules.cardPageTitle')}
                         onBackButtonPress={goBack}
                     />
diff --git a/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx b/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
index 17357323540c..92596602635d 100644
--- a/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
+++ b/src/pages/workspace/rules/SpendRules/SpendRulePageBase.tsx
@@ -1,5 +1,6 @@
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Header from '@components/Header';
+import HeaderWithBackButtonAndTitle from '@components/Header/composed/HeaderWithBackButtonAndTitle';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -14,6 +15,7 @@ import useDefaultFundID from '@hooks/useDefaultFundID';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
 import usePressLoading from '@hooks/usePressLoading';
@@ -84,7 +86,7 @@ function SpendRulePageBase({policyID, ruleID, testID, upgradeBackTo}: SpendRuleP
     const domainAccountID = useDefaultFundID(policyID);
     const [spendRuleForm] = useOnyx(ONYXKEYS.FORMS.SPEND_RULE_FORM);
     const [expensifyCardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${domainAccountID}`);
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${domainAccountID}_${CONST.EXPENSIFY_CARD.BANK}`, {selector: filterInactiveCards});
     const {isLoading, startWithLoading} = usePressLoading();
 
@@ -252,7 +254,7 @@ function SpendRulePageBase({policyID, ruleID, testID, upgradeBackTo}: SpendRuleP
     const isRuleBeingDeleted = existingRule?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
     const canDeleteRule = canWriteSpendRules && isEditingRule && !!existingRule && !isRuleBeingDeleted;
 
-    const {deleteHeaderProps} = useRuleDeleteHeaderProps({
+    const {deleteIconButtonProps} = useRuleDeleteHeaderProps({
         canDelete: canDeleteRule,
         onDelete: deleteRule,
         sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.RULES.SPEND_RULE_DELETE,
@@ -445,10 +447,9 @@ function SpendRulePageBase({policyID, ruleID, testID, upgradeBackTo}: SpendRuleP
                 includeSafeAreaPaddingBottom
                 shouldEnableKeyboardAvoidingView={false}
             >
-                <HeaderWithBackButton
-                    title={translate('workspace.rules.spendRules.restrictCardSpendTitle')}
-                    {...deleteHeaderProps}
-                />
+                <HeaderWithBackButtonAndTitle title={translate('workspace.rules.spendRules.restrictCardSpendTitle')}>
+                    {!!deleteIconButtonProps && <Header.IconButton {...deleteIconButtonProps} />}
+                </HeaderWithBackButtonAndTitle>
                 <ScrollView contentContainerStyle={[styles.flexGrow1]}>{revampFormContent}</ScrollView>
                 {canWriteSpendRules && (
                     <FormAlertWithSubmitButton
diff --git a/src/pages/workspace/rules/tabs/RulesExpenseDefaultsTab.tsx b/src/pages/workspace/rules/tabs/RulesExpenseDefaultsTab.tsx
index 979f0bfd8e50..09eed50e8c65 100644
--- a/src/pages/workspace/rules/tabs/RulesExpenseDefaultsTab.tsx
+++ b/src/pages/workspace/rules/tabs/RulesExpenseDefaultsTab.tsx
@@ -24,12 +24,14 @@ function RulesExpenseDefaultsTab({policyID, canWriteRules, selectedKeys, onSelec
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const policy = usePolicy(policyID);
+    const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
 
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
 
     const expenseDefaultsTableData = getExpenseDefaultsTableData({
         policy,
         policyID,
+        rules,
         policyCategories,
         translate,
         isOffline,
diff --git a/src/pages/workspace/rules/tabs/useRulesTableBulkActions.ts b/src/pages/workspace/rules/tabs/useRulesTableBulkActions.ts
index cb9017f9607c..275d6bdd9410 100644
--- a/src/pages/workspace/rules/tabs/useRulesTableBulkActions.ts
+++ b/src/pages/workspace/rules/tabs/useRulesTableBulkActions.ts
@@ -19,7 +19,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {deleteExpensifyCardRule} from '@libs/actions/Card';
 import {deletePolicyCategoryTaxes, openPolicyCategoriesPage} from '@libs/actions/Policy/Category';
 import {openPolicyExpensifyCardsPage} from '@libs/actions/Policy/Policy';
-import {deletePolicyCodingRule} from '@libs/actions/Policy/Rules';
+import {deleteMerchantRule} from '@libs/actions/Policy/Rules';
 import {getCategoryNameFromTaxRuleKey, isCategoryTaxRuleKey} from '@libs/CategoryTaxRulesUtils';
 import {deleteFlagForReviewRule, getFlagForReviewTableData} from '@libs/FlagForReviewRulesUtils';
 import {getExpenseDefaultsTableData, isMerchantTypeRuleKey} from '@libs/MerchantTypeRulesUtils';
@@ -71,6 +71,7 @@ function useRulesTableBulkActions({policyID, activeTab, selectedRuleKeysByTab, c
     const [expensifyCardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`);
     const {cardRules} = useExpensifyCardRules(policyID);
     const [policyCategoriesOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
+    const [rules] = useOnyx(ONYXKEYS.COLLECTION.RULE);
     const arePolicyCategoriesLoading = !!policy?.areCategoriesEnabled && policyCategoriesOnyx === undefined;
     const areCardsEnabled = !!policy?.areExpensifyCardsEnabled;
     const attemptedCardSettingsFetchRef = useRef<Set<number>>(new Set());
@@ -155,6 +156,7 @@ function useRulesTableBulkActions({policyID, activeTab, selectedRuleKeysByTab, c
     const expenseDefaultsTableData: ExpenseDefaultTableItem[] = getExpenseDefaultsTableData({
         policy,
         policyID,
+        rules,
         // Unlike the tables below, the raw value: a category pending deletion is exactly what marks its rule deleting.
         policyCategories: policyCategoriesOnyx,
         translate,
@@ -264,7 +266,7 @@ function useRulesTableBulkActions({policyID, activeTab, selectedRuleKeysByTab, c
                 continue;
             }
 
-            deletePolicyCodingRule(policy, ruleID);
+            deleteMerchantRule(policyID, ruleID, rules?.[`${ONYXKEYS.COLLECTION.RULE}${ruleID}`]);
         }
 
         if (selectedCategoryNames.length > 0) {
@@ -280,6 +282,7 @@ function useRulesTableBulkActions({policyID, activeTab, selectedRuleKeysByTab, c
         filteredSelectedExpenseDefaultKeys,
         filteredSelectedFlagForReviewRuleKeys,
         filteredSelectedRequireFieldsRuleKeys,
+        rules,
         filteredSelectedSpendRuleKeys,
         policy,
         policyData,
diff --git a/src/pages/workspace/rules/useRuleDeleteHeaderProps.ts b/src/pages/workspace/rules/useRuleDeleteHeaderProps.ts
index 1a0d6b1d35e1..cffb01b9b037 100644
--- a/src/pages/workspace/rules/useRuleDeleteHeaderProps.ts
+++ b/src/pages/workspace/rules/useRuleDeleteHeaderProps.ts
@@ -1,5 +1,4 @@
 import {ModalActions} from '@components/Modal/Global/ModalContext';
-import type {PopoverMenuItem} from '@components/PopoverMenu';
 
 import useConfirmModal from '@hooks/useConfirmModal';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
@@ -38,12 +37,11 @@ type RuleDeleteHeaderPropsParams = {
 };
 
 /**
- * The header props that put a rule's delete on a trashcan in the top right, and the confirmation behind it, which
- * every rule editor shares so the gesture is the same whichever kind of rule is open.
+ * The header icon-button props that put a rule's delete on a trashcan in the top right, and the confirmation
+ * behind it, which every rule editor shares so the gesture is the same whichever kind of rule is open.
  *
- * `HeaderWithBackButton` renders a single three-dots item as the icon itself, so one item is what makes this a
- * trashcan rather than a menu. `canDelete` decides whether it appears at all: an unsaved rule has nothing to delete,
- * a member without write access can't, and a rule already on its way out would otherwise be deleted twice.
+ * `canDelete` decides whether the button appears at all: an unsaved rule has nothing to delete, a member without
+ * write access can't, and a rule already on its way out would otherwise be deleted twice.
  *
  * The copy defaults to the pair the rules tables already use for their bulk delete, so deleting one rule and deleting
  * several read alike. It lives under `merchantRules` because that table had delete first, not because it is
@@ -74,22 +72,16 @@ function useRuleDeleteHeaderProps({canDelete, onDelete, sentryLabel, backTo, tit
         });
     };
 
-    const threeDotsMenuItems: PopoverMenuItem[] = [
-        {
-            icon: icons.Trashcan,
-            text: translate('common.delete'),
-            onSelected: confirmDelete,
-            sentryLabel,
-        },
-    ];
-
     return {
-        /** Spread onto `HeaderWithBackButton`. */
-        deleteHeaderProps: {
-            threeDotsMenuItems,
-            shouldShowThreeDotsButton: canDelete,
-            shouldMinimizeMenuButton: true,
-        },
+        /** Spread onto `Header.IconButton`; `undefined` (render nothing) when there's nothing to delete. */
+        deleteIconButtonProps: canDelete
+            ? {
+                  tooltipText: translate('common.delete'),
+                  onPress: confirmDelete,
+                  iconSrc: icons.Trashcan,
+                  sentryLabel,
+              }
+            : undefined,
 
         /** The same confirmation, for the pre-revamp footer button the two beta-gated pages still show. */
         confirmDelete,
diff --git a/src/pages/workspace/tags/DynamicEditTagPage.tsx b/src/pages/workspace/tags/DynamicEditTagPage.tsx
index 3a905b2d95ca..a7c492b905dd 100644
--- a/src/pages/workspace/tags/DynamicEditTagPage.tsx
+++ b/src/pages/workspace/tags/DynamicEditTagPage.tsx
@@ -14,8 +14,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {escapeTagName, getCleanedTagName, getTagListByOrderWeight} from '@libs/PolicyUtils';
-import {isRequiredFulfilled} from '@libs/ValidationUtils';
+import {getCleanedTagName, getTagListByOrderWeight} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
+import {getTagNameError, getTagNameErrorMessage} from '@libs/TagUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
 
@@ -53,18 +54,11 @@ function DynamicEditTagPage({route}: DynamicEditTagPageProps) {
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
-            const tagName = values.tagName.trim();
-            const escapedTagName = escapeTagName(values.tagName.trim());
             const {tags} = getTagListByOrderWeight(policyTags, orderWeight);
-            if (!isRequiredFulfilled(tagName)) {
-                errors.tagName = translate('workspace.tags.tagRequiredError');
-            } else if (escapedTagName === '0') {
-                errors.tagName = translate('workspace.tags.invalidTagNameError');
-            } else if (tags?.[escapedTagName] && currentTagName !== tagName) {
-                errors.tagName = translate('workspace.tags.existingTagError');
-            } else if ([...tagName].length > CONST.API_TRANSACTION_TAG_MAX_LENGTH) {
-                // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
-                errors.tagName = translate('common.error.characterLimitExceedCounter', [...tagName].length, CONST.API_TRANSACTION_TAG_MAX_LENGTH);
+            const error = getTagNameError(tags, values.tagName, currentTagName);
+
+            if (error) {
+                errors.tagName = getTagNameErrorMessage(translate, error, values.tagName);
             }
 
             return errors;
@@ -74,10 +68,10 @@ function DynamicEditTagPage({route}: DynamicEditTagPageProps) {
 
     const editTag = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
-            const tagName = values.tagName.trim();
+            const tagName = StringUtils.sanitizeName(values.tagName);
             // Do not call the API if the edited tag name is the same as the current tag name
             if (currentTagName !== tagName) {
-                renamePolicyTag(policyData, {oldName: route.params.tagName, newName: values.tagName.trim()}, orderWeight, isVendorMatchingBetaEnabled);
+                renamePolicyTag(policyData, {oldName: route.params.tagName, newName: tagName}, orderWeight, isVendorMatchingBetaEnabled);
             }
             Keyboard.dismiss();
             Navigation.goBack(backPath);
diff --git a/src/pages/workspace/tags/DynamicTagSettingsPage.tsx b/src/pages/workspace/tags/DynamicTagSettingsPage.tsx
index 92135bddadc5..9ceb61c564d9 100644
--- a/src/pages/workspace/tags/DynamicTagSettingsPage.tsx
+++ b/src/pages/workspace/tags/DynamicTagSettingsPage.tsx
@@ -1,4 +1,5 @@
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItem from '@components/MenuItem';
 import MenuItemAction from '@components/MenuItem/presets/MenuItemAction';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
@@ -25,6 +26,7 @@ import {getLatestErrorMessageField} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import {isDisablingOrDeletingLastEnabledTag} from '@libs/OptionsListUtils';
+import Parser from '@libs/Parser';
 import {
     arePolicyRulesEnabled,
     findPolicyTagEntryByParentFilter,
@@ -213,7 +215,7 @@ function DynamicTagSettingsPage({route, navigation}: DynamicTagSettingsPageProps
                             onPress={navigateToEditGlCode}
                             iconRight={hasAccountingConnections ? expensifyIcons.Lock : undefined}
                             interactive={canWriteTags && !hasAccountingConnections}
-                            shouldShowRightIcon={canWriteTags && !hasAccountingConnections}
+                            shouldShowRightIcon={canWriteTags}
                         />
                     </OfflineWithFeedback>
 
@@ -222,20 +224,17 @@ function DynamicTagSettingsPage({route, navigation}: DynamicTagSettingsPageProps
                             <View style={[styles.mh5, styles.mv3, styles.pt3, styles.borderTop]}>
                                 <Text style={[styles.textNormal, styles.textStrong, styles.mv3]}>{translate('workspace.tags.tagRules')}</Text>
                             </View>
-                            <MenuItemWithTopDescription
-                                title={approverText}
-                                description={translate(`workspace.tags.approverDescription`)}
-                                onPress={navigateToEditTagApprover}
-                                interactive={canWriteTags}
-                                shouldShowRightIcon={canWriteTags}
-                                disabled={approverDisabled}
-                                helperText={
-                                    approverDisabled
-                                        ? translate('workspace.rules.categoryRules.enableWorkflows', `${environmentURL}/${ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)}`)
-                                        : undefined
-                                }
-                                shouldParseHelperText
+                            <MenuItemField
+                                name={translate(`workspace.tags.approverDescription`)}
+                                value={approverText}
+                                onPress={canWriteTags ? navigateToEditTagApprover : undefined}
+                                isDisabled={approverDisabled}
                             />
+                            {approverDisabled && (
+                                <MenuItem.HelpTextHTML>
+                                    {Parser.replace(translate('workspace.rules.categoryRules.enableWorkflows', `${environmentURL}/${ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)}`))}
+                                </MenuItem.HelpTextHTML>
+                            )}
                         </>
                     )}
 
diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index 3077643b8bcc..87d3758ac4e7 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -14,11 +14,11 @@ import usePermissions from '@hooks/usePermissions';
 import usePolicyData from '@hooks/usePolicyData';
 import useThemeStyles from '@hooks/useThemeStyles';
 
-import {addErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
-import {escapeTagName, getTagList, hasCustomCategories} from '@libs/PolicyUtils';
-import {isRequiredFulfilled} from '@libs/ValidationUtils';
+import {getTagList, hasCustomCategories} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
+import {getTagNameError, getTagNameErrorMessage} from '@libs/TagUtils';
 
 import type {SettingsNavigatorParamList} from '@navigation/types';
 
@@ -55,18 +55,11 @@ function WorkspaceCreateTagPage({route}: WorkspaceCreateTagPageProps) {
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
         const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
-        const tagName = escapeTagName(values.tagName.trim());
         const {tags} = getTagList(policyTagLists, 0);
+        const error = getTagNameError(tags, values.tagName);
 
-        if (!isRequiredFulfilled(tagName)) {
-            errors.tagName = translate('workspace.tags.tagRequiredError');
-        } else if (tagName === '0') {
-            errors.tagName = translate('workspace.tags.invalidTagNameError');
-        } else if (tags?.[tagName]) {
-            errors.tagName = translate('workspace.tags.existingTagError');
-        } else if ([...tagName].length > CONST.API_TRANSACTION_TAG_MAX_LENGTH) {
-            // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
-            addErrorMessage(errors, 'tagName', translate('common.error.characterLimitExceedCounter', [...tagName].length, CONST.API_TRANSACTION_TAG_MAX_LENGTH));
+        if (error) {
+            errors.tagName = getTagNameErrorMessage(translate, error, values.tagName);
         }
 
         return errors;
@@ -94,7 +87,7 @@ function WorkspaceCreateTagPage({route}: WorkspaceCreateTagPageProps) {
         createPolicyTag({
             isVendorMatchingBetaEnabled,
             policyData,
-            tagName: values.tagName.trim(),
+            tagName: StringUtils.sanitizeName(values.tagName),
             setupTagsTaskReport,
             setupTagsTaskParentReport,
             isSetupTagsTaskParentReportArchived,
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index a22761356189..81e5a49fad67 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -34,6 +34,7 @@ import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle';
 
 import {isConnectionInProgress, isConnectionUnverified} from '@libs/actions/connections';
 import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import {renameTagInline} from '@libs/actions/Policy/InlineEdit';
 import {
     clearPolicyTagErrors,
     deletePolicyTags,
@@ -322,6 +323,8 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
         }
     }, [canWriteTags, hasDependentTags, isMultiLevelTags, policyTagLists, updateWorkspaceRequiresTag]);
 
+    const isSelectionModeActive = selectedTagKeys.length > 0 || isMobileSelectionModeEnabled;
+
     const tagRows = useMemo<WorkspaceTagTableRowData[]>(() => {
         if (isMultiLevelTags) {
             return policyTagLists.reduce<WorkspaceTagTableRowData[]>((acc, policyTagList) => {
@@ -350,6 +353,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                     pendingAction: getPendingAction(policyTagList),
                     isLocked: !canWriteTags || isMakingLastRequiredTagListOptional(policy, policyTags, [policyTagList]),
                     showEnabledSwitch: false,
+                    // Inline renaming targets single-level tags only; tag lists are renamed from their settings page.
                     action: () => navigateToTagSettings(policyTagList.name, policyTagList.orderWeight),
                     onClose: () => {},
                 });
@@ -391,8 +395,10 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                 pending: shouldShowPendingSwitch && tag.pendingFields?.enabled === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 isLocked: !canWriteTags || isLastEnabledTagAndEnabled,
                 showEnabledSwitch: true,
+                canEditName: canWriteTags && !isSelectionModeActive,
                 action: () => navigateToTagSettings(tag.name),
                 onToggleEnabled: (enabled: boolean) => handleTagEnabledToggle(enabled, tag),
+                onRenameName: (newName: string) => renameTagInline(policyData, tag.name, newName, isVendorMatchingBetaEnabled),
                 onClose: () => clearPolicyTagErrors({policyID, tagName: tag.name, tagListIndex: 0, policyTags}),
             });
 
@@ -400,6 +406,8 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
         }, []);
     }, [
         canWriteTags,
+        isSelectionModeActive,
+        policyData,
         handleTagEnabledToggle,
         isMultiLevelTags,
         isOffline,
@@ -412,6 +420,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
         tagApproverEmails,
         employeePersonalDetails,
         formatPhoneNumber,
+        isVendorMatchingBetaEnabled,
     ]);
 
     const tagRowsKeyedByName = useMemo(
diff --git a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
index 8ff41d26f49a..d6328404fa36 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
@@ -60,10 +60,11 @@ function WorkspaceTaxCodePage({route}: WorkspaceTaxCodePageProps) {
                 policy?.taxRates?.foreignTaxDefault,
                 policy?.taxRates?.defaultExternalID,
                 distanceRateCustomUnit,
+                policy?.rules?.expenseRules,
             );
             Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID, currentTaxCode));
         },
-        [currentTaxCode, policyID, policy?.taxRates, distanceRateCustomUnit, isTaxCodeCustomized],
+        [currentTaxCode, policyID, policy?.taxRates, policy?.rules?.expenseRules, distanceRateCustomUnit, isTaxCodeCustomized],
     );
 
     const validate = useCallback(
diff --git a/src/pages/workspace/travel/WorkspaceTravelBillingSection.tsx b/src/pages/workspace/travel/WorkspaceTravelBillingSection.tsx
index a414f7f73ebe..a5aa120eb579 100644
--- a/src/pages/workspace/travel/WorkspaceTravelBillingSection.tsx
+++ b/src/pages/workspace/travel/WorkspaceTravelBillingSection.tsx
@@ -1,6 +1,9 @@
 import Button from '@components/Button';
 import ButtonDisabledWhenOffline from '@components/Button/composed/ButtonDisabledWhenOffline';
 import FormHelpMessageRowWithRetryButton from '@components/Domain/FormHelpMessageRowWithRetryButton';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import MenuItemSectionRoot from '@components/MenuItem/presets/MenuItemSectionRoot';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -52,6 +55,7 @@ import {getSearchParamFromPath} from '@libs/Url';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 
 import {updateGeneralSettings as updatePolicyGeneralSettings} from '@userActions/Policy/Policy';
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -427,14 +431,12 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
                     )}
                 </View>
             </View>
-            <MenuItemWithTopDescription
-                description={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.currentTravelLimitLabel')}
-                title={formattedLimit}
-                wrapperStyle={[styles.sectionMenuItemTopDescription]}
-                titleStyle={styles.textNormalThemeText}
-                descriptionTextStyle={styles.textLabelSupportingNormal}
-                interactive={false}
-            />
+            <MenuItemSectionRoot>
+                <MenuItemField.Row
+                    name={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.currentTravelLimitLabel')}
+                    value={formattedLimit}
+                />
+            </MenuItemSectionRoot>
             <OfflineWithFeedback
                 errors={settlementAccountErrors}
                 pendingAction={settlementAccountPendingAction}
@@ -442,17 +444,22 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
                 errorRowStyles={styles.mh2half}
                 errorRowTextStyles={styles.mr3}
             >
-                <MenuItemWithTopDescription
-                    description={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.settlementAccountLabel')}
-                    title={settlementAccountNumber}
-                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_ACCOUNT.getRoute(policyID))}
-                    interactive={canWriteMoreFeatures}
-                    wrapperStyle={[styles.sectionMenuItemTopDescription]}
-                    titleStyle={settlementAccountNumber ? styles.textNormalThemeText : styles.colorMuted}
-                    descriptionTextStyle={styles.textLabelSupportingNormal}
-                    shouldShowRightIcon={canWriteMoreFeatures}
-                    brickRoadIndicator={hasSettlementAccountError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                />
+                <MenuItemSectionRoot
+                    onPress={canWriteMoreFeatures ? callFunctionIfActionIsAllowed(() => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_ACCOUNT.getRoute(policyID))) : undefined}
+                >
+                    <MenuItem.Row>
+                        <MenuItem.Content>
+                            <MenuItem.FieldName>{translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.settlementAccountLabel')}</MenuItem.FieldName>
+                            {!!settlementAccountNumber && <MenuItem.FieldValue>{settlementAccountNumber}</MenuItem.FieldValue>}
+                        </MenuItem.Content>
+                        {(hasSettlementAccountError || canWriteMoreFeatures) && (
+                            <MenuItem.Trailing>
+                                {hasSettlementAccountError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                                {canWriteMoreFeatures && <MenuItem.Chevron />}
+                            </MenuItem.Trailing>
+                        )}
+                    </MenuItem.Row>
+                </MenuItemSectionRoot>
             </OfflineWithFeedback>
             <OfflineWithFeedback
                 errors={settlementFrequencyErrors}
@@ -461,17 +468,17 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
                 errorRowStyles={styles.mh2half}
                 errorRowTextStyles={styles.mr3}
             >
-                <MenuItemWithTopDescription
-                    description={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.settlementFrequencyLabel')}
-                    title={localizedFrequency}
-                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_FREQUENCY.getRoute(policyID))}
-                    interactive={canWriteMoreFeatures}
-                    wrapperStyle={[styles.sectionMenuItemTopDescription]}
-                    titleStyle={styles.textNormalThemeText}
-                    descriptionTextStyle={styles.textLabelSupportingNormal}
-                    shouldShowRightIcon={canWriteMoreFeatures}
-                    brickRoadIndicator={hasSettlementFrequencyError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                />
+                <MenuItemSectionRoot
+                    onPress={canWriteMoreFeatures ? callFunctionIfActionIsAllowed(() => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_FREQUENCY.getRoute(policyID))) : undefined}
+                >
+                    <MenuItemField.Row
+                        name={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.settlementFrequencyLabel')}
+                        value={localizedFrequency}
+                    >
+                        {hasSettlementFrequencyError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                        {canWriteMoreFeatures && <MenuItem.Chevron />}
+                    </MenuItemField.Row>
+                </MenuItemSectionRoot>
             </OfflineWithFeedback>
             <OfflineWithFeedback
                 errors={monthlyLimitErrors}
@@ -480,17 +487,17 @@ function WorkspaceTravelBillingSection({policyID}: WorkspaceTravelBillingSection
                 errorRowStyles={styles.mh2half}
                 errorRowTextStyles={styles.mr3}
             >
-                <MenuItemWithTopDescription
-                    description={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.monthlySpendLimitLabel')}
-                    title={formattedMonthlyLimit}
-                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_MONTHLY_LIMIT.getRoute(policyID))}
-                    interactive={canWriteMoreFeatures}
-                    wrapperStyle={[styles.sectionMenuItemTopDescription]}
-                    titleStyle={styles.textNormalThemeText}
-                    descriptionTextStyle={styles.textLabelSupportingNormal}
-                    shouldShowRightIcon={canWriteMoreFeatures}
-                    brickRoadIndicator={hasMonthlyLimitError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                />
+                <MenuItemSectionRoot
+                    onPress={canWriteMoreFeatures ? callFunctionIfActionIsAllowed(() => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL_SETTINGS_MONTHLY_LIMIT.getRoute(policyID))) : undefined}
+                >
+                    <MenuItemField.Row
+                        name={translate('workspace.moreFeatures.travel.travelInvoicing.travelInvoicingSection.subsections.monthlySpendLimitLabel')}
+                        value={formattedMonthlyLimit}
+                    >
+                        {hasMonthlyLimitError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                        {canWriteMoreFeatures && <MenuItem.Chevron />}
+                    </MenuItemField.Row>
+                </MenuItemSectionRoot>
             </OfflineWithFeedback>
         </>
     );
diff --git a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
index 3224d5033765..3d34fb4c3994 100644
--- a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
+++ b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
@@ -25,6 +25,7 @@ import {
     getDistanceRateCustomUnit,
     getPerDiemCustomUnit,
     getUserFriendlyWorkspaceType,
+    isAutoPayApprovedReportsAvailable,
     isControlPolicy,
     isPaidGroupPolicy,
     isSubmitPolicy,
@@ -237,6 +238,10 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
                 enableAutoApprovalOptions(policyID, true, policy?.shouldShowAutoApprovalOptions, policy?.autoApproval?.limit, policy?.autoApproval?.auditRate);
                 break;
             case CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoPayApprovedReports.id:
+                // The upgrade is reachable before payments are set up; turning auto-pay on then would silently activate it once a bank account is connected.
+                if (!isAutoPayApprovedReportsAvailable(policy)) {
+                    break;
+                }
                 enablePolicyAutoReimbursementLimit(policyID, true, policy?.shouldShowAutoReimbursementLimitOption, policy?.autoReimbursement?.limit);
                 break;
             case CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.id:
diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx
index aa6d6e844bb3..b82d3e72f03e 100644
--- a/src/pages/workspace/withPolicy.tsx
+++ b/src/pages/workspace/withPolicy.tsx
@@ -44,6 +44,7 @@ type PolicyRouteName =
     | typeof SCREENS.WORKSPACE.WORKFLOWS_CURRENCY_CONVERSION_FEES
     | typeof SCREENS.WORKSPACE.MEMBER_DETAILS
     | typeof SCREENS.WORKSPACE.MEMBER_DETAILS_ROLE
+    | typeof SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT
     | typeof SCREENS.WORKSPACE.MEMBER_CUSTOM_FIELD
     | typeof SCREENS.WORKSPACE.INVOICES
     | typeof SCREENS.WORKSPACE.DYNAMIC_OWNER_CHANGE_CHECK
@@ -80,7 +81,9 @@ type PolicyRouteName =
     | typeof SCREENS.WORKSPACE.ACCOUNTING.RILLET_CARD_PROGRAM_ACCOUNT_SELECTOR
     | typeof SCREENS.WORKSPACE.ACCOUNTING.RILLET_CARD_ACCOUNT_CARD_LIST
     | typeof SCREENS.WORKSPACE.ACCOUNTING.DUALENTRY_CARD_PROGRAM_ACCOUNT_SELECTOR
-    | typeof SCREENS.WORKSPACE.ACCOUNTING.DUALENTRY_CARD_ACCOUNT_CARD_LIST;
+    | typeof SCREENS.WORKSPACE.ACCOUNTING.DUALENTRY_CARD_ACCOUNT_CARD_LIST
+    | typeof SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_PROGRAM_ACCOUNT_SELECTOR
+    | typeof SCREENS.WORKSPACE.ACCOUNTING.CAMPFIRE_CARD_ACCOUNT_CARD_LIST;
 
 type PolicyRoute = PlatformStackRouteProp<NavigatorsParamList, PolicyRouteName>;
 
diff --git a/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx b/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
index 5740417dcbe3..bcf631da20fc 100644
--- a/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
+++ b/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
@@ -66,6 +66,9 @@ type ToggleSettingOptionRowProps = {
     titleAccessibilityRole?: typeof CONST.ROLE.HEADER;
 
     subtitleStyle?: StyleProp<TextStyle>;
+
+    /** Style for the container of a parsed (HTML) subtitle. Use it to match the spacing `subtitleStyle` gives a plain-text subtitle. */
+    parsedSubtitleContainerStyle?: StyleProp<ViewStyle>;
     accordionStyle?: StyleProp<ViewStyle>;
     isActive: boolean;
 
@@ -107,6 +110,7 @@ function ToggleSettingOptionRow({
     customTitle,
     subtitle,
     subtitleStyle,
+    parsedSubtitleContainerStyle,
     accordionStyle,
     switchAccessibilityLabel,
     shouldPlaceSubtitleBelowSwitch,
@@ -170,7 +174,7 @@ function ToggleSettingOptionRow({
         if (typeof subtitle === 'string') {
             if (!!subtitle && shouldParseSubtitle) {
                 return (
-                    <View style={[styles.flexRow, styles.renderHTML, styles.textAlignLeft, subtitleSpacingStyle]}>
+                    <View style={[styles.flexRow, styles.renderHTML, styles.textAlignLeft, subtitleSpacingStyle, parsedSubtitleContainerStyle]}>
                         <RenderHTML html={processedSubtitle} />
                     </View>
                 );
@@ -200,6 +204,7 @@ function ToggleSettingOptionRow({
         styles.textAlignLeft,
         subtitleSpacingStyle,
         subtitleStyle,
+        parsedSubtitleContainerStyle,
         processedSubtitle,
         areSubtitleAndSwitchAccessibilityLabelEqual,
     ]);
@@ -217,7 +222,7 @@ function ToggleSettingOptionRow({
             {customTitle ?? (
                 <View style={[styles.flexColumn, styles.flex1, styles.mr6]}>
                     <Text
-                        style={[styles.textNormal, styles.lh20, titleStyle]}
+                        style={[styles.textNormal, styles.lh20, styles.textAlignVerticalCenter, titleStyle]}
                         accessibilityRole={titleAccessibilityRole}
                     >
                         {title}
diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
index e854ce63acf1..2c06fdfdddd0 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
@@ -4,6 +4,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem';
 
+import useInitialSelection from '@hooks/useInitialSelection';
 import useLocalize from '@hooks/useLocalize';
 import useReviewWorkspaceSettingsTaskCompletion from '@hooks/useReviewWorkspaceSettingsTaskCompletion';
 
@@ -11,6 +12,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
 import {canEditWorkspaceSettings, goBackFromInvalidPolicy, isGroupPolicy, isPendingDeletePolicy} from '@libs/PolicyUtils';
+import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
 
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
@@ -37,6 +39,7 @@ type AutoReportingOffsetKeys = ValueOf<typeof CONST.POLICY.AUTO_REPORTING_OFFSET
 type WorkspaceAutoReportingMonthlyOffsetPageItem = {
     text: string;
     keyForList: string;
+    value: string;
     isSelected: boolean;
     isNumber?: boolean;
 };
@@ -48,6 +51,8 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
     const offset = policy?.autoReportingOffset ?? 1;
     const [userSelectedOffset, setUserSelectedOffset] = useState<number | AutoReportingOffsetKeys | undefined>();
     const selectedOffset = userSelectedOffset ?? offset;
+    // Freeze the day selected when the page opened so it stays pinned to the top for the whole open/focus cycle, even as the live selection changes.
+    const initialOffset = useInitialSelection(selectedOffset, {resetOnFocus: true});
     const [searchText, setSearchText] = useState('');
     const trimmedText = searchText.trim().toLowerCase();
 
@@ -57,25 +62,30 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
         return {
             text: toLocaleOrdinal(day),
             keyForList: day.toString(), // we have to cast it as string for <ListItem> to work
+            value: day.toString(),
             isSelected: day === selectedOffset,
             isNumber: true,
         };
     }).concat([
         {
             keyForList: 'lastDayOfMonth',
+            value: 'lastDayOfMonth',
             text: translate('workflowsPage.frequencies.lastDayOfMonth'),
             isSelected: selectedOffset === CONST.POLICY.AUTO_REPORTING_OFFSET.LAST_DAY_OF_MONTH,
             isNumber: false,
         },
         {
             keyForList: 'lastBusinessDayOfMonth',
+            value: 'lastBusinessDayOfMonth',
             text: translate('workflowsPage.frequencies.lastBusinessDayOfMonth'),
             isSelected: selectedOffset === CONST.POLICY.AUTO_REPORTING_OFFSET.LAST_BUSINESS_DAY_OF_MONTH,
             isNumber: false,
         },
     ]);
 
-    const filteredDaysOfMonth = daysOfMonth.filter((dayItem) => dayItem.text.toLowerCase().includes(trimmedText));
+    // Pin the frozen initial day to the top of the full list before search filtering, so it stays pinned while searching.
+    const orderedDaysOfMonth = moveInitialSelectionToTop(daysOfMonth, [String(initialOffset)]);
+    const filteredDaysOfMonth = orderedDaysOfMonth.filter((dayItem) => dayItem.text.toLowerCase().includes(trimmedText));
 
     const onSelectDayOfMonth = (item: WorkspaceAutoReportingMonthlyOffsetPageItem) => {
         setUserSelectedOffset(item.isNumber ? parseInt(item.keyForList, 10) : (item.keyForList as AutoReportingOffsetKeys));
@@ -135,8 +145,11 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
                         onSelectRow={onSelectDayOfMonth}
                         textInputOptions={textInputOptions}
                         confirmButtonOptions={confirmButtonOptions}
-                        initiallyFocusedItemKey={offset.toString()}
+                        initiallyFocusedItemKey={String(initialOffset)}
                         shouldSingleExecuteRowSelect
+                        shouldScrollToFocusedIndexOnMount={false}
+                        shouldUpdateFocusedIndex
+                        disableMaintainingScrollPosition
                         addBottomSafeAreaPadding
                         showScrollIndicator
                     />
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index c79ce65e7021..3aa5bcb8cd2f 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -13,6 +13,7 @@ import type {ListItem} from '@components/SelectionList/types';
 
 import useConfirmModal from '@hooks/useConfirmModal';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useInitialSelection from '@hooks/useInitialSelection';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -90,7 +91,9 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
     const icons = useMemoizedLazyExpensifyIcons(['FallbackAvatar']);
     const [searchTerm, setSearchTerm] = useState('');
     const [sharedBankAccountData] = useOnyx(ONYXKEYS.SHARE_BANK_ACCOUNT);
-    const [selectedPayer, setSelectedPayer] = useState<string | undefined>(policy?.achAccount?.reimburser ?? policy?.owner);
+    const savedPayer = policy?.achAccount?.reimburser ?? policy?.owner;
+    const [selectedPayer, setSelectedPayer] = useState<string | undefined>(savedPayer);
+    const initialPayer = useInitialSelection(savedPayer, {resetOnFocus: true});
     const shouldShowSuccess = sharedBankAccountData?.shouldShowSuccess ?? false;
     const styles = useThemeStyles();
     const {showConfirmModal, closeModal} = useConfirmModal();
@@ -125,6 +128,8 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
             }
             const roleBadge = <Badge text={isOwner ? translate('common.owner') : translate('workspace.common.roleName', policyEmployee.role)} />;
             const isAuthorizedPayer = selectedPayer === details?.login;
+            // Section placement is frozen to the initially selected payer so switching payers only moves the checkmark instead of reordering the list.
+            const isInitialPayer = initialPayer === details?.login;
             const formattedMember = {
                 keyForList: String(adminAccountID),
                 accountID: adminAccountID,
@@ -144,7 +149,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                 errors: policyEmployee.errors,
                 pendingAction: (policyEmployee.pendingAction ?? isAuthorizedPayer) ? policy?.pendingFields?.reimburser : null,
             };
-            if (isAuthorizedPayer) {
+            if (isInitialPayer) {
                 authorizedPayerDetails.push(formattedMember);
             } else {
                 policyAdminDetails.push(formattedMember);
@@ -159,7 +164,8 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
         const sectionsArray: MembersSection[] = [];
         if (searchTerm !== '') {
             const searchValue = getSearchValueForPhoneOrEmail(searchTerm, countryCode);
-            const filteredOptions = tokenizedSearch([...formattedPolicyAdmins, ...formattedAuthorizedPayer], searchValue, (option) => [option.text ?? '', option.login ?? '']);
+            // Keep the frozen initial payer first so it stays pinned to the top of the search results (tokenizedSearch preserves input order).
+            const filteredOptions = tokenizedSearch([...formattedAuthorizedPayer, ...formattedPolicyAdmins], searchValue, (option) => [option.text ?? '', option.login ?? '']);
             return [
                 {
                     title: undefined,
@@ -386,6 +392,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                             }}
                             initiallyFocusedItemKey={formattedAuthorizedPayer.at(0)?.keyForList}
                             shouldSingleExecuteRowSelect
+                            shouldUpdateFocusedIndex
                             addBottomSafeAreaPadding
                             footerContent={
                                 <FormAlertWithSubmitButton
diff --git a/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx b/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
index f8fd0e98eee7..7c5b3e18b25b 100644
--- a/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
+++ b/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
@@ -16,8 +16,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
-import {sortAlphabetically} from '@libs/OptionsListUtils';
 import {isControlPolicy} from '@libs/PolicyUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
 import {getApprovalLimitDescription} from '@libs/WorkflowUtils';
 
diff --git a/src/pages/workspace/workflows/approvals/DynamicWorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/DynamicWorkspaceWorkflowsApprovalsExpensesFromPage.tsx
index efc9526bef80..10a88fbb18fb 100644
--- a/src/pages/workspace/workflows/approvals/DynamicWorkspaceWorkflowsApprovalsExpensesFromPage.tsx
+++ b/src/pages/workspace/workflows/approvals/DynamicWorkspaceWorkflowsApprovalsExpensesFromPage.tsx
@@ -19,7 +19,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 
 import {clearInviteDraft, setWorkspaceInviteMembersDraft} from '@libs/actions/Policy/Member';
 import {searchInServer} from '@libs/actions/Report';
-import {clearApprovalWorkflow, setApprovalWorkflowMembers} from '@libs/actions/Workflow';
+import {clearApprovalWorkflow, saveFastEditApprovalWorkflow, setApprovalWorkflowMembers} from '@libs/actions/Workflow';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -32,6 +32,7 @@ import {
     getApprovalWorkflowRulesForPolicy,
     getRulesSubmitterToFirstApprover,
     getRulesSubmitterToWorkflowKey,
+    includesEveryWorkspaceMember,
     isApprovalWorkflowLockedByIntegration,
 } from '@libs/WorkflowUtils';
 
@@ -90,6 +91,7 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
     const isHandingOffToInviteRef = useRef(false);
     // Tracks whether we're still on the very first step of the create flow
     const isInitialCreationFlowRef = useRef(false);
+    const isFastEditRef = useRef(false);
 
     const excludedUsers = useMemo(() => {
         return getExcludedUsers(policy?.employeeList);
@@ -445,13 +447,19 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
 
         if (isInitialCreationFlow) {
             Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(route.params.policyID, 0));
+        } else if (approvalWorkflow?.isFastEdit) {
+            const updatedApprovalWorkflow = {...approvalWorkflow, members: allMembers};
+            Navigation.goBack(backPath, {
+                compareParams: false,
+                afterTransition: () => saveFastEditApprovalWorkflow({approvalWorkflow: updatedApprovalWorkflow, policy, rules: rulesCollection, isMultipleApproversBetaEnabled}),
+            });
         } else {
             // Use goBack so we return to the existing parent (e.g. the workflow edit page) in the stack
             // instead of pushing a new instance. A fresh mount of the edit page would re-derive members
             // from policy.employeeList via its useEffect and overwrite the selection we just saved.
             Navigation.goBack(backPath, {compareParams: false});
         }
-    }, [route.params.policyID, selectedMembers, isInitialCreationFlow, backPath, policy?.employeeList]);
+    }, [route.params.policyID, selectedMembers, isInitialCreationFlow, backPath, policy, approvalWorkflow, rulesCollection, isMultipleApproversBetaEnabled]);
 
     const button = useMemo(() => {
         let buttonText = isInitialCreationFlow ? translate('common.next') : translate('common.save');
@@ -470,11 +478,15 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
         );
     }, [isInitialCreationFlow, translate, shouldShowListEmptyContent, selectedMembers.length, nextStep, styles]);
 
-    // Keep the ref in sync so the unmount cleanup below reads the latest value.
+    // Keep the refs in sync so the unmount cleanup below reads the latest values.
     useEffect(() => {
         isInitialCreationFlowRef.current = !!isInitialCreationFlow;
     }, [isInitialCreationFlow]);
 
+    useEffect(() => {
+        isFastEditRef.current = !!approvalWorkflow?.isFastEdit;
+    }, [approvalWorkflow?.isFastEdit]);
+
     // Clean up invite draft when leaving the expenses-from page to prevent
     // stale non-member data from persisting in the approval workflow. Skip
     // when handing off to the invite-message page, which still needs the draft.
@@ -484,9 +496,9 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
                 return;
             }
             clearInviteDraft(route.params.policyID);
-            // Abandoning the initial create step must discard the eagerly-seeded approvalWorkflow
-            // draft, otherwise a stale draft stays in Onyx and pollutes the next session.
-            if (isInitialCreationFlowRef.current) {
+            // Abandoning the initial create step or a "+N more" edit must discard the eagerly-seeded
+            // approvalWorkflow draft, otherwise a stale draft stays in Onyx and pollutes the next session.
+            if (isInitialCreationFlowRef.current || isFastEditRef.current) {
                 clearApprovalWorkflow();
             }
         };
@@ -523,6 +535,26 @@ function DynamicWorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingRe
                 setApprovalWorkflowMembers(workflowMembers);
             };
 
+            // Warn when selecting the last unselected workspace member: that moves everyone into this workflow,
+            // which deletes every other workflow.
+            const selectedLogins = selectedMembers.map((member) => member.login);
+            const nextSelectedLogins = members.map((member) => member.login);
+            const isSelectingLastMember = !includesEveryWorkspaceMember(selectedLogins, policy?.employeeList) && includesEveryWorkspaceMember(nextSelectedLogins, policy?.employeeList);
+            if (isSelectingLastMember) {
+                showConfirmModal({
+                    title: translate('workflowsExpensesFromPage.moveEveryoneToThisWorkflowTitle'),
+                    prompt: translate('workflowsExpensesFromPage.moveEveryoneToThisWorkflowPrompt'),
+                    confirmText: translate('common.confirm'),
+                    cancelText: translate('common.cancel'),
+                }).then((result) => {
+                    if (result.action !== ModalActions.CONFIRM) {
+                        return;
+                    }
+                    applySelection(members);
+                });
+                return;
+            }
+
             // Warn when adding a member who already belongs to another workflow. With the beta on this
             // applies to both create and edit (a submitter can only be in one workflow, so confirming
             // moves them); legacy keeps the create-only behavior.
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
index ccb9d3f4924f..af276a0d1780 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
@@ -16,7 +16,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
 import {canMemberWrite, goBackFromInvalidPolicy, isPendingDeletePolicy, shouldHideDynamicExternalWorkflowPeople} from '@libs/PolicyUtils';
-import {isApprovalWorkflowLockedByIntegration} from '@libs/WorkflowUtils';
+import {getWorkflowMemberEmails, includesEveryWorkspaceMember, isApprovalWorkflowLockedByIntegration} from '@libs/WorkflowUtils';
 
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -71,11 +71,14 @@ function WorkspaceWorkflowsApprovalsCreatePage({policy, isLoadingReportData = tr
             return;
         }
 
+        // A workflow with everyone in it leaves every other workflow empty, so it becomes the default one
+        const workflowToCreate = {...approvalWorkflow, isDefault: includesEveryWorkspaceMember(getWorkflowMemberEmails(approvalWorkflow.members), policy?.employeeList)};
+
         startWithLoading(() => {
             if (isBetaEnabled(CONST.BETAS.MULTIPLE_APPROVERS)) {
-                createApprovalWorkflowRules({approvalWorkflow, policy, addExpenseApprovalsTaskReport, rules: rulesCollection});
+                createApprovalWorkflowRules({approvalWorkflow: workflowToCreate, policy, addExpenseApprovalsTaskReport, rules: rulesCollection});
             } else {
-                createApprovalWorkflowAction({approvalWorkflow, policy, addExpenseApprovalsTaskReport});
+                createApprovalWorkflowAction({approvalWorkflow: workflowToCreate, policy, addExpenseApprovalsTaskReport});
             }
             Navigation.dismissModal();
         });
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
index 2859058ea7a0..15fe073b58a0 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
@@ -11,6 +11,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
+import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
 import usePressLoading from '@hooks/usePressLoading';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -23,6 +24,8 @@ import {
     convertPolicyEmployeesToApprovalWorkflows,
     filterRulesForPolicy,
     getApprovalWorkflowRulesForPolicy,
+    getWorkflowMemberEmails,
+    includesEveryWorkspaceMember,
     isApprovalWorkflowLockedByIntegration,
 } from '@libs/WorkflowUtils';
 
@@ -64,7 +67,7 @@ type WorkspaceWorkflowsApprovalsEditPageProps = WithPolicyAndFullscreenLoadingPr
 function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsEditPageProps) {
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [personalDetails] = useAllPersonalDetails();
     const [approvalWorkflow, approvalWorkflowMetadata] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
     const policyRulesSelector = useCallback((rules: OnyxCollection<Rule>) => filterRulesForPolicy(rules, route.params.policyID), [route.params.policyID]);
     const [rulesCollection] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: policyRulesSelector});
@@ -119,11 +122,15 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
             return;
         }
 
+        // A workflow with everyone in it leaves every other workflow empty, so it becomes the default one
+        const isDefault = approvalWorkflow.isDefault || includesEveryWorkspaceMember(getWorkflowMemberEmails(approvalWorkflow.members), policy?.employeeList);
+        const workflowToSave = {...approvalWorkflow, isDefault};
+
         startWithLoading(() => {
             if (isBetaEnabled(CONST.BETAS.MULTIPLE_APPROVERS)) {
                 Navigation.dismissModal({
                     afterTransition: () => {
-                        updateApprovalWorkflowRules({approvalWorkflow, initialApprovalWorkflow, policy, rules: rulesCollection});
+                        updateApprovalWorkflowRules({approvalWorkflow: workflowToSave, initialApprovalWorkflow, policy, rules: rulesCollection, defaultApprovalWorkflow});
                     },
                 });
                 return;
@@ -134,7 +141,7 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
             const approversToRemove = initialApprovalWorkflow.approvers.filter((initialApprover) => !approvalWorkflow.approvers.some((approver) => approver.email === initialApprover.email));
             Navigation.dismissModal({
                 afterTransition: () => {
-                    updateApprovalWorkflow(approvalWorkflow, membersToRemove, approversToRemove, policy);
+                    updateApprovalWorkflow(workflowToSave, membersToRemove, approversToRemove, policy);
                 },
             });
         });
diff --git a/src/pages/workspace/workflows/tabs/WorkflowsApprovalsTab.tsx b/src/pages/workspace/workflows/tabs/WorkflowsApprovalsTab.tsx
index c9062e89ad85..048c54077a91 100644
--- a/src/pages/workspace/workflows/tabs/WorkflowsApprovalsTab.tsx
+++ b/src/pages/workspace/workflows/tabs/WorkflowsApprovalsTab.tsx
@@ -33,7 +33,7 @@ import {isRecruitingAdvancedMode} from '@libs/merge/RecruitingUtils';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
-import {hasDynamicExternalWorkflow, isControlPolicy, isSubmitPolicy, shouldHideDynamicExternalWorkflowPeople} from '@libs/PolicyUtils';
+import {getApprovalWorkflow, hasDynamicExternalWorkflow, isControlPolicy, isGroupPolicy, isSubmitPolicy, shouldHideDynamicExternalWorkflowPeople} from '@libs/PolicyUtils';
 import tokenizedSearch from '@libs/tokenizedSearch';
 import {
     convertApprovalWorkflowRulesToWorkflows,
@@ -296,6 +296,10 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
     const hiddenWorkflowsCount = searchFilteredWorkflows.length - displayedWorkflows.length;
 
     const isDEWEnabled = hasDynamicExternalWorkflow(policy);
+    // A loaded non-Submit group workspace with no stored mode uses the app's ADVANCED default. Keep this separate from
+    // isActive because legacy modes can be configured even though this toggle intentionally displays them as off.
+    const hasConfiguredApprovalWorkflow = isGroupPolicy(policy) && !isSubmitPolicyWorkspace && getApprovalWorkflow(policy) !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    const isApprovalsLockedBySmartLimit = isSmartLimitEnabled && (hasConfiguredApprovalWorkflow || isDEWEnabled || isWorkflowFromIntegration);
     // A Dynamic External Workflow can be configured to keep the approval workflow out of the customer's hands entirely.
     // The info banner below still explains why the section is empty, but nothing else about the workflows is rendered.
     const shouldHideApprovalWorkflows = shouldHideDynamicExternalWorkflowPeople(policy);
@@ -317,7 +321,7 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
         );
     }, [isWorkflowFromIntegration, workflowSourceName, navigateToWorkflowSourceSettings, styles.lh20, styles.mr5, styles.mt1, styles.textLabelSupportingEmptyValue, translate]);
 
-    const approvalOptionSubtitle = isWorkflowFromIntegration || !isSmartLimitEnabled ? approvalSubtitle : translate('workspace.moreFeatures.workflows.disableApprovalPrompt');
+    const approvalOptionSubtitle = isWorkflowFromIntegration || !isApprovalsLockedBySmartLimit ? approvalSubtitle : translate('workspace.moreFeatures.workflows.disableApprovalPrompt');
     const hasApprovalError = !!policy?.errorFields?.approvalMode;
 
     const getAddApprovalsToggleDisabledAction = () => {
@@ -331,7 +335,9 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
         <WorkflowsSectionCard
             title={translate('workflowsPage.addApprovalsTitle')}
             subtitle={approvalOptionSubtitle}
-            switchAccessibilityLabel={isSmartLimitEnabled ? translate('workspace.moreFeatures.workflows.disableApprovalPrompt') : translate('workflowsPage.addApprovalsDescription')}
+            switchAccessibilityLabel={
+                isApprovalsLockedBySmartLimit ? translate('workspace.moreFeatures.workflows.disableApprovalPrompt') : translate('workflowsPage.addApprovalsDescription')
+            }
             onToggle={(isEnabled: boolean) => {
                 if (!canWriteApprovals) {
                     showReadOnlyModal();
@@ -439,6 +445,8 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
                                                               workflow,
                                                               defaultWorkflowMembers: availableMembers,
                                                               usedApproverEmails,
+                                                              defaultApprovalWorkflow: approvalWorkflows.find((approvalWorkflow) => approvalWorkflow.isDefault),
+                                                              isFastEdit: true,
                                                           });
                                                           Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EXPENSES_FROM.path));
                                                       }
@@ -480,7 +488,7 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
                     )}
                 </>
             }
-            disabled={!canWriteApprovals || isSmartLimitEnabled || isDEWEnabled || isWorkflowFromIntegration}
+            disabled={!canWriteApprovals || isApprovalsLockedBySmartLimit || isDEWEnabled || isWorkflowFromIntegration}
             disabledAction={withApprovalsReadOnlyFallback(getAddApprovalsToggleDisabledAction())}
             showLockIcon={!canWriteApprovals}
             // Submit2026 workspaces have approval mode set to Advanced, but we want to show it here as off because configuring the advanced approvals is a paid feature.
diff --git a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
index 42b1eecd947d..a74f63595c5e 100644
--- a/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
+++ b/src/pages/workspace/workflows/tabs/WorkflowsPaymentsTab.tsx
@@ -5,8 +5,8 @@ import getBankIcon from '@components/Icon/BankIcons';
 import type {BankName} from '@components/Icon/BankIconsUtils';
 import {useLockedAccountActions, useLockedAccountState} from '@components/LockedAccountModalProvider';
 import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import MenuItemSectionRoot from '@components/MenuItem/presets/MenuItemSectionRoot';
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import {ModalActions} from '@components/Modal/Global/ModalContext';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import RenderHTML from '@components/RenderHTML';
@@ -21,6 +21,7 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import usePersonalDetailByLogin from '@hooks/usePersonalDetailByLogin';
+import {usePersonalDetailsByIDs} from '@hooks/usePersonalDetails';
 import usePolicy from '@hooks/usePolicy';
 import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -38,6 +39,7 @@ import {getEligibleExistingBusinessBankAccounts} from '@libs/WorkflowUtils';
 import {pressLockedBankAccount} from '@userActions/BankAccounts';
 import {navigateToBankAccountRoute} from '@userActions/ReimbursementAccount';
 import {navigateToConciergeChat} from '@userActions/Report';
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -69,6 +71,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
     const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
     const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT);
     const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [conciergePersonalDetails] = usePersonalDetailsByIDs([CONST.ACCOUNT_ID.CONCIERGE]);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
@@ -116,7 +119,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
         if (!policy) {
             return;
         }
-        Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_CURRENCY.getRoute(policy.id, true));
+        Navigation.navigate(ROUTES.WORKSPACE_OVERVIEW_CURRENCY.getRoute(policy.id, {isForcedToChangeCurrency: true}));
     }, [policy]);
 
     const workflowsBackTo = ROUTES.WORKSPACE_WORKFLOWS.getRoute(policyID);
@@ -163,7 +166,10 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
     ) : undefined;
     const bankConnectionMessage = bankConnectionStatus?.messageKey ? translate(bankConnectionStatus.messageKey) : undefined;
     const bankConnectionActionText = bankConnectionStatus?.actionKey ? translate(bankConnectionStatus.actionKey) : undefined;
-    const canInteractWithBankAccountRow = canWritePayments && !isBankAccountPendingDelete;
+    // The reimburser's unlock request on a locked account is queued optimistically, so it works offline. Every other press
+    // opens the bank account flow, which needs a connection.
+    const isBankAccountRowBlockedOffline = isOffline && !(isBusinessBankAccountLocked && isUserReimburser);
+    const canInteractWithBankAccountRow = canWritePayments && !isBankAccountRowBlockedOffline && !isBankAccountPendingDelete;
     const isAddBankAccountInert = isOffline || !canWritePayments;
 
     // Only the reimburser can send the unlock request, so a locked account offers no action to anyone else rather than
@@ -222,7 +228,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
                 return;
             }
             pressLockedBankAccount(bankAccountID, translate, conciergeReportID ?? undefined, delegateAccountID, initiatingBankAccountUnlock);
-            navigateToConciergeChat({conciergeReportID: conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed});
+            navigateToConciergeChat({conciergeReportID: conciergeReportID ?? undefined, introSelected, currentUserAccountID, isSelfTourViewed, conciergePersonalDetails});
             return;
         }
 
@@ -254,7 +260,7 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
         shouldGreyOutWhenDisabled: !policy?.pendingFields?.reimbursementChoice,
         disabled: !canWritePayments || isBankAccountPendingDelete,
         shouldShowRightIcon: canWritePayments && !isBankAccountPendingDelete,
-        interactive: canWritePayments && !isBankAccountPendingDelete,
+        interactive: canInteractWithBankAccountRow,
         descriptionAddon: bankConnectionStatusAddon,
         shouldRemoveBackground: true,
         shouldRemoveHoverBackground: true,
@@ -359,18 +365,22 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
                             onClose={() => clearPolicyErrorField(policy?.id, CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
                             errorRowStyles={[styles.ml7]}
                         >
-                            <MenuItemWithTopDescription
-                                title={displayNameForAuthorizedPayer ?? ''}
-                                titleStyle={styles.textNormalThemeText}
-                                descriptionTextStyle={styles.textLabelSupportingNormal}
-                                description={translate('workflowsPayerPage.payer')}
-                                onPress={canChangePayer ? () => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_PAYER.getRoute(policyID)) : undefined}
-                                sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.WORKFLOWS.AUTHORIZED_PAYER}
-                                shouldShowRightIcon={canChangePayer}
-                                interactive={canChangePayer}
-                                wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3, styles.mbn3]}
-                                brickRoadIndicator={hasReimburserError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            />
+                            <View style={[styles.mt3, styles.mbn3]}>
+                                <MenuItemSectionRoot
+                                    onPress={canChangePayer ? callFunctionIfActionIsAllowed(() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_PAYER.getRoute(policyID))) : undefined}
+                                    sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.WORKFLOWS.AUTHORIZED_PAYER}
+                                >
+                                    <MenuItemField.Row
+                                        name={translate('workflowsPayerPage.payer')}
+                                        value={displayNameForAuthorizedPayer}
+                                    >
+                                        <>
+                                            {hasReimburserError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                                            {canChangePayer && <MenuItem.Chevron />}
+                                        </>
+                                    </MenuItemField.Row>
+                                </MenuItemSectionRoot>
+                            </View>
                         </OfflineWithFeedback>
                     )}
                     {canWritePayments && canConfigureCurrencyConversionFees && (
@@ -380,20 +390,23 @@ function WorkflowsPaymentsTab({policyID}: WorkflowsPaymentsTabProps) {
                             onClose={() => clearPolicyErrorField(policy?.id, CONST.POLICY.COLLECTION_KEYS.GLOBAL_REIMBURSEMENT_FX_PREFER_COMPANY)}
                             errorRowStyles={[styles.mt3]}
                         >
-                            <MenuItemWithTopDescription
-                                title={
-                                    policy?.globalReimbursementFXPreferCompany
-                                        ? translate('workflowsCurrencyConversionFeesPage.companyPays')
-                                        : translate('workflowsCurrencyConversionFeesPage.employeePays')
-                                }
-                                titleStyle={styles.textNormalThemeText}
-                                descriptionTextStyle={styles.textLabelSupportingNormal}
-                                description={translate('workflowsCurrencyConversionFeesPage.title')}
-                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_CURRENCY_CONVERSION_FEES.getRoute(policyID))}
-                                sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.WORKFLOWS.CURRENCY_CONVERSION_FEES}
-                                shouldShowRightIcon
-                                wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3, styles.mbn3]}
-                            />
+                            <View style={[styles.mt3, styles.mbn3]}>
+                                <MenuItemSectionRoot
+                                    onPress={callFunctionIfActionIsAllowed(() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_CURRENCY_CONVERSION_FEES.getRoute(policyID)))}
+                                    sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.WORKFLOWS.CURRENCY_CONVERSION_FEES}
+                                >
+                                    <MenuItemField.Row
+                                        name={translate('workflowsCurrencyConversionFeesPage.title')}
+                                        value={
+                                            policy?.globalReimbursementFXPreferCompany
+                                                ? translate('workflowsCurrencyConversionFeesPage.companyPays')
+                                                : translate('workflowsCurrencyConversionFeesPage.employeePays')
+                                        }
+                                    >
+                                        <MenuItem.Chevron />
+                                    </MenuItemField.Row>
+                                </MenuItemSectionRoot>
+                            </View>
                         </OfflineWithFeedback>
                     )}
                 </>
diff --git a/src/pages/workspace/workflows/tabs/WorkflowsSubmissionsTab.tsx b/src/pages/workspace/workflows/tabs/WorkflowsSubmissionsTab.tsx
index f2dda99c2ead..6f5711aeefbf 100644
--- a/src/pages/workspace/workflows/tabs/WorkflowsSubmissionsTab.tsx
+++ b/src/pages/workspace/workflows/tabs/WorkflowsSubmissionsTab.tsx
@@ -1,4 +1,6 @@
-import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import MenuItem from '@components/MenuItem';
+import MenuItemField from '@components/MenuItem/presets/MenuItemField';
+import MenuItemSectionRoot from '@components/MenuItem/presets/MenuItemSectionRoot';
 
 import useLocalize from '@hooks/useLocalize';
 import usePolicy from '@hooks/usePolicy';
@@ -12,10 +14,13 @@ import {getCorrectedAutoReportingFrequency} from '@libs/PolicyUtils';
 
 import {getAutoReportingFrequencyDisplayNames} from '@pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage';
 
+import {callFunctionIfActionIsAllowed} from '@userActions/Session';
+
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
 import React, {useCallback} from 'react';
+import {View} from 'react-native';
 
 import WorkflowsSectionCard from './WorkflowsSectionCard';
 
@@ -50,19 +55,22 @@ function WorkflowsSubmissionsTab({policyID}: WorkflowsSubmissionsTabProps) {
             switchAccessibilityLabel={translate('workflowsPage.submissionFrequencyDescription')}
             onToggle={onToggle}
             subMenuItems={
-                <MenuItemWithTopDescription
-                    title={getAutoReportingFrequencyDisplayNames(translate)[getCorrectedAutoReportingFrequency(policy) ?? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY]}
-                    titleStyle={styles.textNormalThemeText}
-                    descriptionTextStyle={styles.textLabelSupportingNormal}
-                    onPress={onPressAutoReportingFrequency}
-                    sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.WORKFLOWS.AUTO_REPORTING_FREQUENCY}
-                    // Instant submit is the equivalent of delayed submissions being turned off, so we show the feature as disabled if the frequency is instant
-                    description={translate('common.frequency')}
-                    shouldShowRightIcon={canWriteWorkflows}
-                    interactive={canWriteWorkflows}
-                    wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3, styles.mbn3]}
-                    brickRoadIndicator={hasDelayedSubmissionError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                />
+                <View style={[styles.mt3, styles.mbn3]}>
+                    <MenuItemSectionRoot
+                        onPress={canWriteWorkflows ? callFunctionIfActionIsAllowed(onPressAutoReportingFrequency) : undefined}
+                        sentryLabel={CONST.SENTRY_LABEL.WORKSPACE.WORKFLOWS.AUTO_REPORTING_FREQUENCY}
+                    >
+                        <MenuItemField.Row
+                            name={translate('common.frequency')}
+                            value={getAutoReportingFrequencyDisplayNames(translate)[getCorrectedAutoReportingFrequency(policy) ?? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY]}
+                        >
+                            <>
+                                {hasDelayedSubmissionError && <MenuItem.BrickRoadIndicator status={CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR} />}
+                                {canWriteWorkflows && <MenuItem.Chevron />}
+                            </>
+                        </MenuItemField.Row>
+                    </MenuItemSectionRoot>
+                </View>
             }
             isActive={(policy?.autoReporting && !hasDelayedSubmissionError) ?? false}
             pendingAction={policy?.pendingFields?.autoReporting ?? policy?.pendingFields?.autoReportingFrequency}
diff --git a/src/polyfills/SymbolDispose.ts b/src/polyfills/SymbolDispose.ts
new file mode 100644
index 000000000000..177f09099783
--- /dev/null
+++ b/src/polyfills/SymbolDispose.ts
@@ -0,0 +1 @@
+// Native Skia doesn't call `this[Symbol.dispose]()`, so no polyfill needed
diff --git a/src/polyfills/SymbolDispose.web.ts b/src/polyfills/SymbolDispose.web.ts
new file mode 100644
index 000000000000..6637b551d4b3
--- /dev/null
+++ b/src/polyfills/SymbolDispose.web.ts
@@ -0,0 +1,37 @@
+import type {TupleToUnion} from 'type-fest';
+
+/**
+ * Polyfill for Symbol.dispose and Symbol.asyncDispose, missing in Safari, Firefox < 141 and Chrome < 125.
+ *
+ * Skia's web host objects key a `[Symbol.dispose]()` method once at load, but `dispose()` reads `Symbol.dispose` on every call.
+ * If a script changes `Symbol.dispose` after Skia loads, the keys stop matching and every chart frame throws.
+ * Locking the symbols before Skia loads (like the native descriptor) keeps them in sync. An earlier configurable symbol is kept but locked.
+ *
+ * See https://github.com/Expensify/App/issues/102043.
+ */
+const DISPOSE_SYMBOL_NAMES = ['dispose', 'asyncDispose'] as const;
+
+type DisposeSymbolHost = Partial<Record<TupleToUnion<typeof DISPOSE_SYMBOL_NAMES>, symbol>>;
+
+function installDisposeSymbols(symbolConstructor: DisposeSymbolHost) {
+    for (const name of DISPOSE_SYMBOL_NAMES) {
+        const existing = Object.getOwnPropertyDescriptor(symbolConstructor, name);
+        if (existing && !existing.configurable) {
+            // Native, or already locked: nothing to do
+            continue;
+        }
+        const currentValue = symbolConstructor[name];
+        Object.defineProperty(symbolConstructor, name, {
+            // Keep an earlier script's symbol. Babel, SWC and core-js use the registered one
+            value: typeof currentValue === 'symbol' ? currentValue : Symbol.for(`Symbol.${name}`),
+            writable: false,
+            configurable: false,
+            enumerable: false,
+        });
+    }
+}
+
+installDisposeSymbols(Symbol);
+
+export default installDisposeSymbols;
+export type {DisposeSymbolHost};
diff --git a/src/selectors/PersonalDetails.ts b/src/selectors/PersonalDetails.ts
index 96a8bbbc7fb9..6213fb00410d 100644
--- a/src/selectors/PersonalDetails.ts
+++ b/src/selectors/PersonalDetails.ts
@@ -35,8 +35,6 @@ const personalDetailsDisplayNameSelector =
             formatPhoneNumber,
         });
 
-const conciergePersonalDetailSelector = personalDetailsSelector(CONST.ACCOUNT_ID.CONCIERGE);
-
 type DisplayDetails = Pick<PersonalDetails, 'accountID' | 'displayName' | 'login' | 'avatar'>;
 
 /**
@@ -82,15 +80,6 @@ function isPersonalDetailOptimistic(personalDetail: PersonalDetails | null | und
     return isEmptyObject(personalDetail) || !!personalDetail?.isOptimisticPersonalDetail;
 }
 
-const isOptimisticPersonalDetailSelector =
-    (accountID: number) =>
-    (personalDetailsList: OnyxEntry<PersonalDetailsList>): boolean => {
-        if (!personalDetailsList) {
-            return true;
-        }
-        return isPersonalDetailOptimistic(personalDetailsList[accountID]);
-    };
-
 /**
  * Returns only the personal details that were created optimistically. The optimistic set is tiny compared to the whole
  * personal details list, so subscribers using it don't re-render every time an unrelated (server-backed) detail changes.
@@ -119,6 +108,11 @@ const avatarStyleColorSelector = (personalDetails: PersonalDetails | undefined)
 
 const doesPersonalDetailExist = (personalDetails: PersonalDetails | undefined) => !!personalDetails;
 
+const firstNameSelector = (personalDetails: PersonalDetails | undefined) => (personalDetails?.firstName?.trim() ? personalDetails.firstName : undefined);
+
+const displayNameOrDefaultSelector = (translate: LocalizedTranslate, formatPhoneNumber: LocaleContextProps['formatPhoneNumber']) => (personalDetails: PersonalDetails | undefined) =>
+    temporaryGetDisplayNameOrDefault({passedPersonalDetails: personalDetails, translate, formatPhoneNumber});
+
 export {
     avatarStyleColorSelector,
     personalDetailsSelector,
@@ -127,16 +121,16 @@ export {
     personalDetailsDisplayNameSelector,
     personalDetailsLoginSelector,
     personalDetailsLoginsSelector,
-    conciergePersonalDetailSelector,
     doesPersonalDetailExistSelector,
     accountIDToLoginSelector,
-    isOptimisticPersonalDetailSelector,
+    isPersonalDetailOptimistic,
     optimisticPersonalDetailsSelector,
     createDisplayDetailsByAccountIDsSelector,
     newAccountIDsAndLoginsSelector,
     displayNameSelector,
     accountIDSelector,
     loginSelector,
+    firstNameSelector,
+    displayNameOrDefaultSelector,
     doesPersonalDetailExist,
-    isPersonalDetailOptimistic,
 };
diff --git a/src/selectors/Report.ts b/src/selectors/Report.ts
index 7ad840fcf476..16139e20e95f 100644
--- a/src/selectors/Report.ts
+++ b/src/selectors/Report.ts
@@ -87,7 +87,7 @@ function reportAvatarKindSelector(report: OnyxEntry<Report>): ValueOf<typeof CON
         case CONST.REPORT.CHAT_TYPE.INVOICE:
             return CONST.REPORT_AVATAR_KIND.ROOM;
         default:
-            // DM, self-DM, system, trip room and anything unclassified
+            // DM, self-DM, system, a trip room without its parent fields and anything unclassified
             return CONST.REPORT_AVATAR_KIND.DEFAULT;
     }
 }
@@ -102,15 +102,19 @@ function groupChatAvatarReportSelector(report: OnyxEntry<Report>): GroupChatAvat
     return {reportID: report.reportID, avatarUrl: report.avatarUrl, reportName: report.reportName, participants: report.participants};
 }
 
-/** The report fields `ExpenseReportAvatar` renders from: the owner and the parent action (for a copilot) for the primary avatar plus the workspace-icon fallbacks. */
-type ExpenseReportAvatarReport = Pick<Report, 'ownerAccountID' | 'policyID' | 'policyAvatar' | 'policyName' | 'oldPolicyName' | 'chatReportID' | 'parentReportID' | 'parentReportActionID'>;
+/** The report fields the report-type avatar wrappers render from: the owner, the parent-action link, the chat type and the workspace-icon fallbacks. */
+type ReportAvatarFields = Pick<
+    Report,
+    'ownerAccountID' | 'chatType' | 'policyID' | 'policyAvatar' | 'policyName' | 'oldPolicyName' | 'chatReportID' | 'parentReportID' | 'parentReportActionID'
+>;
 
-function expenseReportAvatarSelector(report: OnyxEntry<Report>): ExpenseReportAvatarReport | undefined {
+function reportAvatarFieldsSelector(report: OnyxEntry<Report>): ReportAvatarFields | undefined {
     if (!report) {
         return undefined;
     }
     return {
         ownerAccountID: report.ownerAccountID,
+        chatType: report.chatType,
         policyID: report.policyID,
         policyAvatar: report.policyAvatar,
         policyName: report.policyName,
@@ -361,7 +365,6 @@ function isDraftReportSelector(draft: OnyxEntry<Report>): boolean {
 }
 
 export {
-    expenseReportAvatarSelector,
     getArchiveReason,
     getReportChatType,
     groupChatAvatarReportSelector,
@@ -371,6 +374,7 @@ export {
     policyIDsWithEmptyReportsSelector,
     canShowReportRecipientLocalTimeSelector,
     policyChatRoomsSelector,
+    reportAvatarFieldsSelector,
     reportAvatarKindSelector,
     reportPolicyFieldsSelector,
     createMoveExpenseReportNVPSelector,
@@ -380,4 +384,4 @@ export {
     isDraftReportSelector,
 };
 
-export type {StableReport};
+export type {ReportAvatarFields, StableReport};
diff --git a/src/selectors/ReportNameValuePairs.ts b/src/selectors/ReportNameValuePairs.ts
index 9a761e0e26f6..01660b09e8ac 100644
--- a/src/selectors/ReportNameValuePairs.ts
+++ b/src/selectors/ReportNameValuePairs.ts
@@ -70,5 +70,9 @@ function agentZeroProcessingAgentIDsSelector(reportNameValuePairs: OnyxEntry<Rep
         .sort((a, b) => a - b);
 }
 
-export {getAgentZeroProcessingLabel, agentZeroProcessingAgentIDsSelector, reportNameValuePairsArchivedSelector};
+function getConciergeFeedbackForReportActionID(reportNameValuePairs: OnyxEntry<ReportNameValuePairs>): string | undefined {
+    return reportNameValuePairs?.conciergeFeedbackForReportActionID;
+}
+
+export {getAgentZeroProcessingLabel, agentZeroProcessingAgentIDsSelector, getConciergeFeedbackForReportActionID, reportNameValuePairsArchivedSelector};
 export type {ReportNameValuePairsArchivedState};
diff --git a/src/selectors/Rule.ts b/src/selectors/Rule.ts
new file mode 100644
index 000000000000..137663e4efc4
--- /dev/null
+++ b/src/selectors/Rule.ts
@@ -0,0 +1,23 @@
+/**
+ * Selectors for the `rules_` collection.
+ *
+ * `GetRules` SETs every rule the user can see across every workspace, so the collection reference changes
+ * on any rule write anywhere. A consumer that only needs a count or a flag reduces the collection to that
+ * value here, which keeps `useOnyx` from deep-comparing a filtered copy of it on each of those writes.
+ */
+import {getExpenseDefaultRuleCount, hasExpenseDefaultRuleErrors} from '@libs/ExpenseDefaultRuleUtils';
+
+import type {Rule} from '@src/types/onyx';
+
+import type {OnyxCollection} from 'react-native-onyx';
+
+/** How many expense default rules the policy has, ignoring ones being deleted. */
+const createExpenseDefaultRuleCountSelector = (policyID: string | undefined) => (rules: OnyxCollection<Rule>) => getExpenseDefaultRuleCount(rules, policyID);
+
+/** Whether the policy has at least one expense default rule. */
+const createHasExpenseDefaultRulesSelector = (policyID: string | undefined) => (rules: OnyxCollection<Rule>) => getExpenseDefaultRuleCount(rules, policyID) > 0;
+
+/** Whether any of the policy's expense default rules failed to save. */
+const createHasExpenseDefaultRuleErrorsSelector = (policyID: string | undefined) => (rules: OnyxCollection<Rule>) => hasExpenseDefaultRuleErrors(rules, policyID);
+
+export {createExpenseDefaultRuleCountSelector, createHasExpenseDefaultRuleErrorsSelector, createHasExpenseDefaultRulesSelector};
diff --git a/src/selectors/Transaction.ts b/src/selectors/Transaction.ts
index 6c849d4484c0..b24a44838544 100644
--- a/src/selectors/Transaction.ts
+++ b/src/selectors/Transaction.ts
@@ -1,3 +1,4 @@
+import CONST from '@src/CONST';
 import type TransactionType from '@src/types/onyx/Transaction';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
@@ -5,6 +6,8 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 /** Resolves the original (container) transaction ID that a split child points to. */
 const originalTransactionIDSelector = (transaction: OnyxEntry<TransactionType>): string | undefined => transaction?.comment?.originalTransactionID;
 
+const isSplitContainerTransactionSelector = (transaction: OnyxEntry<TransactionType>): boolean | undefined => transaction?.reportID === CONST.REPORT.SPLIT_REPORT_ID;
+
 const transactionsByReportIDSelector = (transactions: OnyxCollection<TransactionType>): Record<string, TransactionType[]> => {
     const result: Record<string, TransactionType[]> = {};
     if (!transactions) {
@@ -18,4 +21,4 @@ const transactionsByReportIDSelector = (transactions: OnyxCollection<Transaction
     }
     return result;
 };
-export {transactionsByReportIDSelector, originalTransactionIDSelector};
+export {transactionsByReportIDSelector, originalTransactionIDSelector, isSplitContainerTransactionSelector};
diff --git a/src/setup/index.ts b/src/setup/index.ts
index eeccebe3aabd..7f43c08e211c 100644
--- a/src/setup/index.ts
+++ b/src/setup/index.ts
@@ -7,6 +7,7 @@ import registerReportActionsPagination from '@libs/registerReportActionsPaginati
 
 import {setDeviceID} from '@userActions/Device';
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
+import {clearActiveTransactionIDs} from '@userActions/TransactionThreadNavigation';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -71,6 +72,7 @@ export default function () {
         skippableCollectionMemberIDs: CONST.SKIPPABLE_COLLECTION_MEMBER_IDS,
         snapshotMergeKeys: ['pendingAction', 'pendingFields'],
         ramOnlyKeys: [
+            ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS,
             ONYXKEYS.RAM_ONLY_ARE_TRANSLATIONS_LOADING,
             ONYXKEYS.RAM_ONLY_MOBILE_SELECTION_MODE,
             ONYXKEYS.RAM_ONLY_IS_SIDEBAR_LOADED,
@@ -80,17 +82,23 @@ export default function () {
             ONYXKEYS.RAM_ONLY_IS_CHECKING_PENDING_WALLET_APPROVAL,
             ONYXKEYS.RAM_ONLY_UPDATE_REQUIRED,
             ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS,
+            ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS,
             ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_USERS,
             ONYXKEYS.RAM_ONLY_IS_AUTHENTICATING_WITH_SHORT_LIVED_TOKEN,
             ONYXKEYS.RAM_ONLY_WALLET_ONFIDO,
             ONYXKEYS.RAM_ONLY_HAS_FRESH_WALLET_DATA,
+            ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED,
+            ONYXKEYS.RAM_ONLY_IS_LOADING_RULES,
             ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_CATEGORY_DATA,
+            ONYXKEYS.RAM_ONLY_IS_LOADING_SEARCH_FILTERS_VENDOR_DATA,
             ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_PAGINATION,
             ONYXKEYS.RAM_ONLY_SEARCH_TAG_FILTERS_RESULTS,
             ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE,
             ONYXKEYS.COLLECTION.RAM_ONLY_COMPANY_CARDS_LOADING_STATE,
             ONYXKEYS.RAM_ONLY_MERCHANT_RULE_SUGGESTION,
             ONYXKEYS.COLLECTION.RAM_ONLY_EXPENSIFY_CARD_LOADING_STATE,
+            ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_CATEGORIES_LOADING_STATE,
+            ONYXKEYS.COLLECTION.RAM_ONLY_POLICY_TAGS_LOADING_STATE,
             ONYXKEYS.RAM_ONLY_PLAID_LINK_TOKEN,
             ONYXKEYS.RAM_ONLY_MERGE_HR_LINK_TOKEN,
             ONYXKEYS.COLLECTION.RAM_ONLY_ISSUE_NEW_EXPENSIFY_CARD,
@@ -102,6 +110,12 @@ export default function () {
 
     cleanupPreMountedDraftReports();
 
+    // The carousel's sibling list belongs to the screen that seeded it, and that ownership lives in module state
+    // which dies with the JS runtime. A list that survives in storage is therefore orphaned the moment the app
+    // reloads: no mounted screen can refresh or release it, and an expense opened straight from a deeplink would
+    // pick it up and page through whatever the user last saw. Drop it before anything can read it.
+    clearActiveTransactionIDs();
+
     // Register the commands after Onyx is initialized so every JS runtime can process paginated
     // responses. Initial snapshots remain asynchronous and gate only pagination, not app startup.
     registerReportActionsPagination();
diff --git a/src/styles/index.ts b/src/styles/index.ts
index c85b7c7f0472..6736376b342d 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -83,6 +83,20 @@ type SelectionListPopover = {
     extraHeight?: number;
 };
 
+// Shared chrome of every RHP card in the stacked report flow, where the frame is invisible and each card draws its own inset bordered modal. Only the width differs.
+const getRHPExtendedCardFrame = (theme: ThemeColors): ViewStyle => ({
+    position: 'absolute',
+    top: variables.rhpFloatingCardMargin,
+    bottom: variables.rhpFloatingCardMargin,
+    right: 0,
+    height: 'auto',
+    borderRadius: variables.componentBorderRadiusLarge,
+    borderWidth: variables.rhpFloatingCardBorderWidth,
+    borderColor: theme.border,
+    overflow: 'hidden',
+    boxShadow: theme.shadow,
+});
+
 const getReceiptDropZoneViewStyle = (theme: ThemeColors, margin: number, paddingVertical: number): ViewStyle => ({
     borderRadius: variables.componentBorderRadiusLarge,
     borderColor: theme.borderFocus,
@@ -106,6 +120,8 @@ type CustomPickerStyle = PickerStyle & {icon?: ViewStyle};
 
 type OverlayStylesParams = Animated.AnimatedInterpolation<string | number> | Animated.Value;
 
+type OverlayPositionValue = number | Animated.Value | Animated.AnimatedAddition<number> | Animated.AnimatedSubtraction<string | number>;
+
 type TwoFactorAuthCodesBoxParams = {isExtraSmallScreenWidth: boolean; isSmallScreenWidth: boolean};
 type WorkspaceUpgradeIntroBoxParams = {isExtraSmallScreenWidth: boolean};
 
@@ -191,7 +207,7 @@ const headlineItalicFont = {
 const modalNavigatorContainer = (isSmallScreenWidth: boolean) =>
     ({
         position: 'absolute',
-        width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
+        width: isSmallScreenWidth ? '100%' : variables.rhpWidth,
         height: '100%',
     }) satisfies ViewStyle;
 
@@ -477,6 +493,10 @@ const staticStyles = (theme: ThemeColors) =>
             textAlignVertical: 'top',
         },
 
+        textAlignVerticalCenter: {
+            textAlignVertical: 'center',
+        },
+
         lineHeightUndefined: {
             lineHeight: undefined,
         },
@@ -518,6 +538,11 @@ const staticStyles = (theme: ThemeColors) =>
             lineHeight: lineHeightScale.label,
         },
 
+        /** Gives every digit the same advance so a counter doesn't shift sideways as its digits change. */
+        tabularNums: {
+            fontVariant: ['tabular-nums'],
+        },
+
         mutedNormalTextLabel: {
             color: theme.textSupporting,
             fontSize: fontScale.label,
@@ -700,10 +725,6 @@ const staticStyles = (theme: ThemeColors) =>
             opacity: 1,
         },
 
-        textDanger: {
-            color: theme.danger,
-        },
-
         borderRadiusNormal: {
             borderRadius: variables.buttonBorderRadius,
         },
@@ -1299,6 +1320,14 @@ const staticStyles = (theme: ThemeColors) =>
             paddingHorizontal: 4,
         },
 
+        /**
+         * Cancels editableCell's horizontal chrome so the value lines up with a
+         * sibling that has no edit padding, such as a card title under a cardholder name.
+         */
+        editableCellFlushWithSibling: {
+            marginHorizontal: -(variables.editableCellChromeWidth / 2),
+        },
+
         editableCell: {
             width: '100%',
             borderWidth: 1,
@@ -3311,6 +3340,23 @@ const staticStyles = (theme: ThemeColors) =>
             height: '100%',
         },
 
+        // Invisible frame for the stacked report flow. Clipping here would cut off the cards' shadows.
+        RHPCenteredFrame: {
+            right: variables.rhpFloatingCardMargin,
+            height: '100%',
+        },
+
+        // Anchors the floating RHP card on web wide layout in place of `r0` and `h100`. Width comes from the call site.
+        RHPFloatingCard: {
+            top: variables.rhpFloatingCardMargin,
+            right: variables.rhpFloatingCardMargin,
+            bottom: variables.rhpFloatingCardMargin,
+            borderRadius: variables.componentBorderRadiusLarge,
+            borderWidth: variables.rhpFloatingCardBorderWidth,
+            borderColor: theme.border,
+            boxShadow: theme.shadow,
+        },
+
         invisible: {
             position: 'absolute',
             opacity: 0,
@@ -3592,7 +3638,7 @@ const staticStyles = (theme: ThemeColors) =>
         },
 
         growlNotificationWrapper: {
-            zIndex: 2,
+            zIndex: variables.growlNotificationZIndex,
         },
 
         growlNotificationContainer: {
@@ -4621,7 +4667,7 @@ const staticStyles = (theme: ThemeColors) =>
         },
 
         textSuccess: {
-            color: theme.success,
+            color: theme.textSuccess,
         },
 
         footerRow: {
@@ -5761,50 +5807,44 @@ const staticStyles = (theme: ThemeColors) =>
             marginTop: 12,
         },
 
-        onboardingAccountingItem: {
+        onboardingTile: {
             backgroundColor: theme.cardBG,
             borderRadius: variables.componentBorderRadiusNormal,
             // Keeps "Intuit Enterprise Suite" on one line in narrow tiles.
             paddingHorizontal: 8,
             paddingVertical: 20,
             alignItems: 'center',
-            justifyContent: 'center',
             flexGrow: 1,
             flexShrink: 1,
         },
 
         // Three 32% tiles plus gaps overflow the 576px row, so wrap at 30% and cap the width instead.
+        // Uses width, not flexBasis, since native Yoga caches a flexBasis percentage across rotations.
         onboardingAccountingItemWide: {
-            flexBasis: '30%',
+            width: '30%',
             maxWidth: '32%',
         },
 
-        onboardingAccountingItemNarrow: {
-            flexBasis: '45%',
+        onboardingTileNarrow: {
+            width: '45%',
             maxWidth: '48.5%',
         },
 
-        onboardingAccountingItemSelected: {
+        onboardingTileSelected: {
             backgroundColor: theme.selectedOptionBG,
         },
 
         // Positioned via the wrapper, since `SelectionButton` applies `style` to the inner pressable.
-        onboardingAccountingItemSelectionButton: {
+        onboardingTileSelectionButton: {
             position: 'absolute',
             top: 12,
             left: 12,
         },
 
-        onboardingInterestedFeaturesItem: {
-            backgroundColor: theme.cardBG,
-            borderRadius: variables.componentBorderRadiusNormal,
-            padding: 16,
-            display: 'flex',
-            flexDirection: 'row',
-            alignItems: 'center',
-            justifyContent: 'space-between',
-            flexGrow: 1,
-            flexShrink: 1,
+        // Four 23.4% tiles plus gaps fill the 576px row exactly, so wrap at 22% to survive the scrollbar.
+        onboardingInterestedFeaturesItemWide: {
+            width: '22%',
+            maxWidth: '23.4%',
         },
 
         checkboxWithLabelCheckboxStyle: {
@@ -6519,17 +6559,13 @@ const staticStyles = (theme: ThemeColors) =>
         },
 
         wideRHPExtendedCardInterpolatorStyles: {
-            position: 'absolute',
-            height: '100%',
-            right: 0,
+            ...getRHPExtendedCardFrame(theme),
             width: animatedWideRHPWidth,
         },
 
         singleRHPExtendedCardInterpolatorStyles: {
-            position: 'absolute',
-            height: '100%',
-            right: 0,
-            width: variables.sideBarWidth,
+            ...getRHPExtendedCardFrame(theme),
+            width: variables.rhpWidth,
         },
 
         flexibleHeight: {
@@ -6819,6 +6855,8 @@ const staticStyles = (theme: ThemeColors) =>
             marginTop: variables.qrShareHorizontalPadding,
             flexDirection: 'row',
             flexWrap: 'wrap',
+            rowGap: 8,
+            columnGap: 16,
         },
         pieChartCenterLabel: {
             position: 'absolute',
@@ -6860,9 +6898,7 @@ const dynamicStyles = (theme: ThemeColors) =>
         // See https://github.com/Expensify/App/issues/99035
         getSuperWideRHPExtendedCardInterpolatorStyles: (width: Animated.AnimatedSubtraction<number>) =>
             ({
-                position: 'absolute',
-                height: '100%',
-                right: 0,
+                ...getRHPExtendedCardFrame(theme),
                 width,
             }) satisfies ViewStyle,
 
@@ -6917,7 +6953,7 @@ const dynamicStyles = (theme: ThemeColors) =>
 
         modalStackNavigatorContainerWidth: (isSmallScreenWidth: boolean) =>
             ({
-                width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
+                width: isSmallScreenWidth ? '100%' : variables.rhpWidth,
             }) satisfies ViewStyle,
 
         OnboardingNavigatorInnerView: (shouldUseNarrowLayout: boolean) =>
@@ -6947,18 +6983,26 @@ const dynamicStyles = (theme: ThemeColors) =>
             progress,
             positionLeftValue,
             positionRightValue,
+            positionTopValue,
+            positionBottomValue,
+            maxOpacity,
         }: {
             progress: OverlayStylesParams;
-            positionLeftValue: number | Animated.Value | Animated.AnimatedAddition<number>;
-            positionRightValue: number | Animated.Value | Animated.AnimatedAddition<number>;
+            positionLeftValue: OverlayPositionValue;
+            positionRightValue: OverlayPositionValue;
+            positionTopValue: number;
+            positionBottomValue: number;
+            maxOpacity: number;
         }) =>
             ({
                 // We need to stretch the overlay to cover the sidebar and the translate animation distance.
                 left: positionLeftValue,
                 right: positionRightValue,
+                top: positionTopValue,
+                bottom: positionBottomValue,
                 opacity: progress.interpolate({
                     inputRange: [0, 0.5],
-                    outputRange: [0, variables.overlayOpacity],
+                    outputRange: [0, maxOpacity],
                     extrapolate: 'clamp',
                 }),
             }) satisfies ViewStyle,
@@ -7152,6 +7196,11 @@ const dynamicStyles = (theme: ThemeColors) =>
             width,
         }),
 
+        getSplashScreenHiderPosition: (left: number, right: number): ViewStyle => ({
+            left: -left,
+            right: -right,
+        }),
+
         getSelectionListPopoverHeight: ({
             itemCount,
             itemHeight = variables.optionRowHeightCompact,
@@ -7164,11 +7213,11 @@ const dynamicStyles = (theme: ThemeColors) =>
             isNegatable,
             extraHeight = 0,
         }: SelectionListPopover) => {
-            const MODAL_VERTICAL_PADDING = 32;
+            const MODAL_VERTICAL_PADDING = variables.popoverVerticalPadding;
             const BUTTON_HEIGHT = hasButton ? 48 : 0;
             const HEADER_HEIGHT = hasHeader ? 48 : 0;
             const TITLE_HEIGHT = hasTitle ? 34 : 0;
-            const SEARCHBAR_HEIGHT = isSearchable ? 64 : 0;
+            const SEARCHBAR_HEIGHT = isSearchable ? variables.popoverSearchInputHeight : 0;
             const NEGATION_TOGGLE_BORDER_WIDTH = 1;
             const NEGATION_TOGGLE_HEIGHT = isNegatable ? variables.componentSizeSmall + NEGATION_TOGGLE_BORDER_WIDTH * 2 + spacing.gap3.gap : 0;
 
@@ -7237,6 +7286,7 @@ const dynamicStyles = (theme: ThemeColors) =>
             return {
                 width: shouldUseNarrowLayout ? '100%' : '91%',
                 height,
+                maxHeight: '100%',
                 borderRadius: variables.componentBorderRadiusLarge,
                 borderBottomRightRadius: borderBottomRadius,
                 borderBottomLeftRadius: borderBottomRadius,
@@ -7514,6 +7564,15 @@ const plainStyles = (theme: ThemeColors) =>
             gap: variables.insightsCardGap,
         } satisfies ViewStyle,
 
+        insightsDashboardScrollView: {
+            ...scrollbarGutterStable,
+        },
+
+        insightsPageControlsContainer: {
+            ...scrollbarGutterStable,
+            overflow: 'hidden',
+        },
+
         insightsChartGrid: {
             flexDirection: 'row',
             alignItems: 'flex-start',
@@ -7540,4 +7599,4 @@ const styles = (theme: ThemeColors) =>
 type ThemeStyles = ReturnType<typeof styles>;
 
 export default styles;
-export type {ThemeStyles, StatusBarStyle, ColorScheme, AnchorPosition, AnchorDimensions, OverlayStylesParams};
+export type {ThemeStyles, StatusBarStyle, ColorScheme, AnchorPosition, AnchorDimensions, OverlayStylesParams, OverlayPositionValue};
diff --git a/src/styles/theme/themes/dark-contrast.ts b/src/styles/theme/themes/dark-contrast.ts
index 79fdcf8ebb0f..7fe6a9dd7afc 100644
--- a/src/styles/theme/themes/dark-contrast.ts
+++ b/src/styles/theme/themes/dark-contrast.ts
@@ -8,6 +8,10 @@ const darkContrastTheme = {
     border: colors.productDark500,
     icon: colors.productDark700,
     textSupporting: colors.productDark800,
+    // The default theme trades some contrast for a softer look on RBR and GBR text. High contrast takes it back,
+    // so a reader who needs the extra separation from the background gets it.
+    textError: colors.tangerine200,
+    textSuccess: colors.green200,
     buttonSuccessText: colors.productLight900,
     buttonDangerText: colors.productDark100,
     bordersBold: colors.productDark700,
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 69babe41f250..6fb517723de7 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -64,7 +64,8 @@ const darkTheme = {
     textReversed: colors.productLight900,
     textBackground: colors.productDark200,
     textMutedReversed: colors.productDark700,
-    textError: colors.red,
+    textError: colors.tangerine300,
+    textSuccess: colors.green300,
     offline: colors.productDark700,
     modalBackground: colors.productDark100,
     cardBG: colors.productDark200,
diff --git a/src/styles/theme/themes/light-contrast.ts b/src/styles/theme/themes/light-contrast.ts
index a30289aee24a..e4d9bfdc89ea 100644
--- a/src/styles/theme/themes/light-contrast.ts
+++ b/src/styles/theme/themes/light-contrast.ts
@@ -8,6 +8,10 @@ const lightContrastTheme = {
     border: colors.productLight500,
     icon: colors.productLight800,
     textSupporting: '#53645C',
+    // The default theme trades some contrast for a softer look on RBR and GBR text. High contrast takes it back,
+    // so a reader who needs the extra separation from the background gets it.
+    textError: colors.tangerine700,
+    textSuccess: colors.green700,
     buttonSuccessText: colors.productLight900,
     buttonDangerText: colors.productDark100,
     bordersBold: colors.productLight800,
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 87db24d52e67..b83c5a565946 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -64,7 +64,8 @@ const lightTheme = {
     textReversed: colors.productDark900,
     textBackground: colors.productLight200,
     textMutedReversed: colors.productLight700,
-    textError: colors.red,
+    textError: colors.tangerine600,
+    textSuccess: colors.green600,
     offline: colors.productLight700,
     modalBackground: colors.productLight100,
     cardBG: colors.productLight200,
diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts
index 76a40d850ca5..da9f8e06987c 100644
--- a/src/styles/theme/types.ts
+++ b/src/styles/theme/types.ts
@@ -72,6 +72,7 @@ type ThemeColors = {
     textBackground: Color;
     textMutedReversed: Color;
     textError: Color;
+    textSuccess: Color;
     offline: Color;
     modalBackground: Color;
     cardBG: Color;
diff --git a/src/styles/utils/generators/ModalStyleUtils.ts b/src/styles/utils/generators/ModalStyleUtils.ts
index afd30f8545b2..99a6c3cef7c2 100644
--- a/src/styles/utils/generators/ModalStyleUtils.ts
+++ b/src/styles/utils/generators/ModalStyleUtils.ts
@@ -54,6 +54,7 @@ type GetModalStylesOptions = {
     };
     enableEdgeToEdgeBottomSafeAreaPadding?: boolean;
     shouldDisplayBelowModals?: boolean;
+    isStackedOnRHP?: boolean;
 };
 
 type GetModalStylesStyleUtil = {
@@ -71,6 +72,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
         safeAreaOptions = {modalOverlapsWithTopSafeArea: false, shouldDisableBottomSafeAreaPadding: false},
         enableEdgeToEdgeBottomSafeAreaPadding = false,
         shouldDisplayBelowModals = false,
+        isStackedOnRHP = false,
     }): GetModalStyles => {
         const {windowWidth, isSmallScreenWidth} = windowDimensions;
 
@@ -285,21 +287,38 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                 animationIn = 'fadeIn';
                 animationOut = 'fadeOut';
                 break;
-            case CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED:
+            case CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED: {
+                // Border-box card inset on every side. Both terms must match RightModalNavigator's frame or the two cards sit 2px apart and their borders read as one doubled line.
+                const rightDockedBoxWidth = variables.rhpWidth + 2 * variables.rhpFloatingCardBorderWidth + 2 * variables.rhpFloatingCardMargin;
                 modalStyle = {
                     ...modalStyle,
-                    marginLeft: isSmallScreenWidth ? 0 : windowWidth - variables.sideBarWidth,
-                    width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
+                    marginLeft: isSmallScreenWidth ? 0 : windowWidth - rightDockedBoxWidth,
+                    width: isSmallScreenWidth ? '100%' : rightDockedBoxWidth,
                     flexDirection: 'row',
                     justifyContent: 'flex-end',
                     height: '100%',
                     zIndex: variables.modalRightDockedZIndex,
                 };
-                modalContainerStyle = {
-                    width: isSmallScreenWidth ? '100%' : variables.sideBarWidth,
-                    height: '100%',
-                    overflow: 'hidden',
-                };
+                modalContainerStyle = isSmallScreenWidth
+                    ? {
+                          width: '100%',
+                          height: '100%',
+                          overflow: 'hidden',
+                      }
+                    : {
+                          flex: 1,
+                          // Per-edge insets on purpose. getModalPaddingStyles reads and rewrites marginTop/marginBottom, so a `margin` shorthand leaves both undefined and the card gets 0 top/bottom margin.
+                          marginTop: variables.rhpFloatingCardMargin,
+                          marginBottom: variables.rhpFloatingCardMargin,
+                          marginLeft: variables.rhpFloatingCardMargin,
+                          marginRight: variables.rhpFloatingCardMargin,
+                          borderRadius: variables.componentBorderRadiusLarge,
+                          borderWidth: variables.rhpFloatingCardBorderWidth,
+                          borderColor: theme.border,
+                          // The RHP frame under a stacked modal already casts the shadow.
+                          boxShadow: isStackedOnRHP ? undefined : theme.shadow,
+                          overflow: 'hidden',
+                      };
 
                 animationIn = 'slideInRight';
                 animationOut = 'slideOutRight';
@@ -308,6 +327,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                 shouldAddBottomSafeAreaPadding = !enableEdgeToEdgeBottomSafeAreaPadding;
                 shouldAddTopSafeAreaPadding = true;
                 break;
+            }
             default:
                 modalStyle = {height: '100%'};
                 modalContainerStyle = {};
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index d6a406ef8dbc..895135311b65 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1981,7 +1981,9 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
         borderColor: isSelected ? theme.buttonHoveredBG : theme.border,
     }),
 
-    getSearchTableHighlightBorderRadius: (isLargeScreenWidth: boolean): number => (isLargeScreenWidth ? 0 : variables.componentBorderRadius),
+    getSearchRowBackgroundStyle: (isSelected?: boolean): ViewStyle => ({
+        backgroundColor: isSelected ? theme.activeComponentBG : theme.highlightBG,
+    }),
 
     getReportTableColumnStyles: (columnName: string, options: GetReportTableColumnStylesParams = {}): ViewStyle => {
         const {
diff --git a/src/styles/utils/overflow.ts b/src/styles/utils/overflow.ts
index 219099b6c255..7025aac01bfc 100644
--- a/src/styles/utils/overflow.ts
+++ b/src/styles/utils/overflow.ts
@@ -1,6 +1,7 @@
 import type {ViewStyle} from 'react-native';
 
 import overflowAuto from './overflowAuto';
+import overflowXAuto from './overflowXAuto';
 import overflowXHidden from './overflowXHidden';
 import overscrollBehaviorContain from './overscrollBehaviorContain';
 
@@ -32,6 +33,8 @@ export default {
 
     overflowXHidden,
 
+    overflowXAuto,
+
     overscrollBehaviorContain,
 
     overflowAuto,
diff --git a/src/styles/utils/overflowXAuto/index.native.ts b/src/styles/utils/overflowXAuto/index.native.ts
new file mode 100644
index 000000000000..e7a94b7faa9b
--- /dev/null
+++ b/src/styles/utils/overflowXAuto/index.native.ts
@@ -0,0 +1,5 @@
+import type OverflowXAutoStyles from './types';
+
+const overflowXAuto: OverflowXAutoStyles = {};
+
+export default overflowXAuto;
diff --git a/src/styles/utils/overflowXAuto/index.ts b/src/styles/utils/overflowXAuto/index.ts
new file mode 100644
index 000000000000..59e2a100a051
--- /dev/null
+++ b/src/styles/utils/overflowXAuto/index.ts
@@ -0,0 +1,7 @@
+import type OverflowXAutoStyles from './types';
+
+const overflowXAuto: OverflowXAutoStyles = {
+    overflowX: 'auto',
+};
+
+export default overflowXAuto;
diff --git a/src/styles/utils/overflowXAuto/types.ts b/src/styles/utils/overflowXAuto/types.ts
new file mode 100644
index 000000000000..416cd99a19bb
--- /dev/null
+++ b/src/styles/utils/overflowXAuto/types.ts
@@ -0,0 +1,5 @@
+import type {ViewStyle} from 'react-native';
+
+type OverflowXAutoStyles = Pick<ViewStyle, 'overflowX'>;
+
+export default OverflowXAutoStyles;
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index e8c42618022f..20538418928c 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -111,6 +111,9 @@ export default {
     androidSafeAreaInsetsPercentage: 1,
     sideBarWidth: 375,
     sidePanelWidth: 375,
+    rhpFloatingCardMargin: 12,
+    // The frame width compensates for this border.
+    rhpFloatingCardBorderWidth: 1,
     // Screen inset shared by the top- and bottom-anchored growl containers so both stay in sync.
     growlNotificationInset: 20,
     receiptPaneRHPMaxWidth: 465,
@@ -127,7 +130,11 @@ export default {
     chooseFilesViewMargin: 8,
     sideBarWithLHBWidth: 260,
     inboxSideBarWidth: 360,
-    superWideRHPLeftMargin: 147,
+    superWideRHPLeftMargin: 360,
+    // RHP panel width. Kept separate from sideBarWidth (the LHN) so the two can differ.
+    rhpWidth: 440,
+    // The expense report's right pane can differ from the skinny RHP.
+    wideRHPRightPaneWidth: 460,
     searchSidebarExpandedWidth: 260,
     searchSidebarCollapsedWidth: 76,
     navigationTabBarSize: 72,
@@ -137,6 +144,8 @@ export default {
     gutterWidth: 12,
     optionRowHeight: 64,
     optionRowHeightCompact: 52,
+    popoverSearchInputHeight: 64,
+    popoverVerticalPadding: 32,
     tableHeaderContentHeight: 20,
     tableRowHeight: 56,
     tableRowHeightCompact: 60,
@@ -168,6 +177,8 @@ export default {
     sectionMenuItemHeightCompact: 44,
     optionsListSectionHeaderHeight: getValueUsingPixelRatio(32, 38),
     overlayOpacity: 0.72,
+    // Lighter scrim for the floating RHP card. Other modal backdrops keep overlayOpacity.
+    rhpOverlayOpacity: 0.5,
     // fontSizeExtraSmall is fixed at 9, so the line height must never scale below the font's natural line height (~1.18em = 10.62),
     // otherwise Android clamps the descent and clips descenders and underlines at small device font scales.
     lineHeightXSmall: Math.max(getValueUsingPixelRatio(11, 17), 11),
@@ -295,6 +306,7 @@ export default {
     reportActionImagesDoubleImageHeight: 138,
     reportActionImagesMultipleImageHeight: 110,
     reportActionItemImagesMoreCornerTriangleWidth: 40,
+    growlNotificationZIndex: 10001,
     popoverZIndex: 10000,
     modalBaseZIndex: 9999,
     autoCompleteSuggestionsZIndex: 9999,
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index f0b17df5675a..74008ae656b1 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -139,6 +139,9 @@ const FILTER_KEYS = {
     CATEGORY_NOT: 'categoryNot',
     CATEGORY: 'category',
 
+    VENDOR_NOT: 'vendorNot',
+    VENDOR: 'vendor',
+
     CARD_ID_NOT: 'cardIDNot',
     CARD_ID: 'cardID',
 
@@ -307,6 +310,8 @@ const ALLOWED_TYPE_FILTERS: Record<string, Set<string>> = {
         FILTER_KEYS.CATEGORY_NOT,
         FILTER_KEYS.TAG,
         FILTER_KEYS.TAG_NOT,
+        FILTER_KEYS.VENDOR,
+        FILTER_KEYS.VENDOR_NOT,
         FILTER_KEYS.PAYER,
         FILTER_KEYS.PAYER_NOT,
         FILTER_KEYS.PAID_BY,
@@ -793,6 +798,9 @@ type SearchAdvancedFiltersForm = Form<
         [FILTER_KEYS.CATEGORY]: string[];
         [FILTER_KEYS.CATEGORY_NOT]: string[];
 
+        [FILTER_KEYS.VENDOR]: string[];
+        [FILTER_KEYS.VENDOR_NOT]: string[];
+
         [FILTER_KEYS.POLICY_ID]: string[];
         [FILTER_KEYS.POLICY_ID_NOT]: string[];
 
diff --git a/src/types/modules/window.d.ts b/src/types/modules/window.d.ts
index 79562bceb768..958ca052960e 100644
--- a/src/types/modules/window.d.ts
+++ b/src/types/modules/window.d.ts
@@ -21,6 +21,12 @@ declare global {
     // Rsbuild defines, such as Storybook.
     // eslint-disable-next-line @typescript-eslint/naming-convention, no-underscore-dangle
     const __SENTRY_APPLICATION_KEY_STAMPED__: boolean | undefined;
+
+    // Injected by Rspack's DefinePlugin at build time: the URL of the `canvaskit.wasm` binary matching the
+    // CanvasKit glue bundled into this build (e.g. `/canvaskit-0.41.0.wasm`). Web only. See
+    // `CANVASKIT_WASM_FILENAME` in `config/rsbuild/rsbuild.common.ts`.
+    // eslint-disable-next-line @typescript-eslint/naming-convention, no-underscore-dangle
+    const __CANVASKIT_WASM_URL__: string;
 }
 
 export {};
diff --git a/src/types/onyx/ApprovalWorkflow.ts b/src/types/onyx/ApprovalWorkflow.ts
index f3d9f1ddb4fc..321dff5c3251 100644
--- a/src/types/onyx/ApprovalWorkflow.ts
+++ b/src/types/onyx/ApprovalWorkflow.ts
@@ -159,6 +159,16 @@ type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
      */
     originalApprovers: Approver[];
 
+    /**
+     * List of original members in the workflow, used to work out which members were removed by an edit
+     */
+    originalMembers?: Member[];
+
+    /**
+     * The policy's default workflow, where members taken out of this workflow go back to
+     */
+    defaultApprovalWorkflow?: ApprovalWorkflow;
+
     /**
      * Email of the member whose workflow this edit session belongs to.
      */
@@ -168,6 +178,12 @@ type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
      * Whether the user is in the initial creation flow
      */
     isInitialFlow?: boolean;
+
+    /**
+     * Whether this edit session was opened from the "+N more" shortcut on the workflows page. No edit page is
+     * behind it, so the members page has to save the workflow itself.
+     */
+    isFastEdit?: boolean;
 };
 
 export default ApprovalWorkflow;
diff --git a/src/types/onyx/ApprovalWorkflowRules.ts b/src/types/onyx/ApprovalWorkflowRules.ts
index 93970434dab0..d593c4e2dc34 100644
--- a/src/types/onyx/ApprovalWorkflowRules.ts
+++ b/src/types/onyx/ApprovalWorkflowRules.ts
@@ -1,11 +1,11 @@
 import type CONST from '@src/CONST';
 
-import type {ValueOf} from 'type-fest';
+import type {RuleFilterNode} from './RuleFilters';
 
 /**
  * A report lifecycle event that can fire an approval-workflow rule (`ReportSubmit` or `ReportApprove`).
  */
-type ApprovalWorkflowTrigger = ValueOf<typeof CONST.RULES.APPROVAL_WORKFLOW.TRIGGER>;
+type ApprovalWorkflowTrigger = typeof CONST.RULES.TRIGGERS.REPORT_SUBMIT | typeof CONST.RULES.TRIGGERS.REPORT_APPROVE;
 
 /**
  * The triggers of a rule, keyed by a string index starting at 1 (e.g. `{"1": "ReportSubmit"}`). A rule fires
@@ -16,7 +16,7 @@ type ApprovalWorkflowTriggers = Record<string, ApprovalWorkflowTrigger>;
 /**
  * The name of the action a rule performs when it matches (`ForwardTo` or `ApproveReport`).
  */
-type ApprovalWorkflowActionName = ValueOf<typeof CONST.RULES.APPROVAL_WORKFLOW.ACTION>;
+type ApprovalWorkflowActionName = typeof CONST.RULES.ACTIONS.FORWARD_TO | typeof CONST.RULES.ACTIONS.APPROVE_REPORT;
 
 /**
  * A single action a rule performs when it matches.
@@ -34,41 +34,6 @@ type ApprovalWorkflowAction = {
  */
 type ApprovalWorkflowActions = Record<string, ApprovalWorkflowAction>;
 
-/**
- * The value a comparison's field is compared against. For email-typed fields like `from`, this is a list
- * of emails to match against.
- */
-type ApprovalWorkflowFilterValue = string | number | string[];
-
-/**
- * A single comparison node: `<left> <operator> <right>`. Both `left` and `right` are always present.
- */
-type ApprovalWorkflowFilterComparison = {
-    /** The comparison operator. */
-    operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>;
-
-    /** The field identifier being compared — one of the search-syntax filter keys (`from`, `to`, `amount`). */
-    left: string;
-
-    /** The literal value being compared against. */
-    right: ApprovalWorkflowFilterValue;
-};
-
-/**
- * A boolean filter that combines two child nodes. `left` / `right` may each be either a leaf comparison
- * or a nested boolean filter. Both children are always present.
- */
-type ApprovalWorkflowFilter = {
-    /** Boolean combinator (`AND` in practice). */
-    operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>;
-
-    /** Left-hand child: leaf comparison or nested boolean filter. */
-    left: ApprovalWorkflowFilterComparison | ApprovalWorkflowFilter;
-
-    /** Right-hand child: leaf comparison or nested boolean filter. */
-    right: ApprovalWorkflowFilterComparison | ApprovalWorkflowFilter;
-};
-
 /**
  * The body of a single approval-workflow rule. When the report event matches one of the `triggers` and
  * the `filters` match the report, the rule's `actions` are performed
@@ -78,7 +43,7 @@ type ApprovalWorkflowRule = {
     triggers: ApprovalWorkflowTriggers;
 
     /** Conditions that must match the report for the rule to fire. */
-    filters: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison;
+    filters: RuleFilterNode;
 
     /** What happens when the rule matches. */
     actions: ApprovalWorkflowActions;
@@ -87,4 +52,4 @@ type ApprovalWorkflowRule = {
     isDefaultApprovalWorkflow?: boolean;
 };
 
-export type {ApprovalWorkflowAction, ApprovalWorkflowActions, ApprovalWorkflowFilter, ApprovalWorkflowFilterComparison, ApprovalWorkflowRule, ApprovalWorkflowTriggers};
+export type {ApprovalWorkflowAction, ApprovalWorkflowActions, ApprovalWorkflowRule, ApprovalWorkflowTriggers};
diff --git a/src/types/onyx/CardFeeds.ts b/src/types/onyx/CardFeeds.ts
index 41e2d499630f..78a925799653 100644
--- a/src/types/onyx/CardFeeds.ts
+++ b/src/types/onyx/CardFeeds.ts
@@ -297,6 +297,9 @@ type AddNewCompanyCardFeed = {
 
     /** Whether the user is editing step */
     isEditing: boolean;
+
+    /** Collection of errors coming from BE */
+    errors?: OnyxCommon.Errors;
 };
 
 /** Card fund ID */
diff --git a/src/types/onyx/DerivedValues.ts b/src/types/onyx/DerivedValues.ts
index 67731bdf65e7..676172d0a004 100644
--- a/src/types/onyx/DerivedValues.ts
+++ b/src/types/onyx/DerivedValues.ts
@@ -218,6 +218,25 @@ type LoginToAccountIDMapDerivedValue = Record<string, number>;
  */
 type GuideAccountIDsDerivedValue = number[];
 
+/**
+ * Counters that move when spend data changes, used by the Home cards to know a refetch is owed.
+ */
+type SpendDataSignatureDerivedValue = {
+    /** Moves on every change to any expense */
+    expenses: number;
+
+    /** Moves only on changes to expenses charged to one of the user's cards */
+    cardExpenses: number;
+};
+
+/**
+ * Maps a participant set to the reportID of its 1:1 (or system) chat, for the accountID it was built for.
+ */
+type OneOnOneChatReportIDsDerivedValue = {
+    reportIDs: Record<string, string>;
+    accountID?: number;
+};
+
 export type {
     ReportAttributes,
     ReportAttributesDerivedValue,
@@ -231,6 +250,8 @@ export type {
     CardFeedErrorsDerivedValue,
     LoginToAccountIDMapDerivedValue,
     GuideAccountIDsDerivedValue,
+    SpendDataSignatureDerivedValue,
+    OneOnOneChatReportIDsDerivedValue,
     CardFeedErrorsObject,
     CardFeedErrorState,
     CardFeedErrors,
diff --git a/src/types/onyx/EarlyRenewalOfferEligibility.ts b/src/types/onyx/EarlyRenewalOfferEligibility.ts
new file mode 100644
index 000000000000..858f59b6b67f
--- /dev/null
+++ b/src/types/onyx/EarlyRenewalOfferEligibility.ts
@@ -0,0 +1,25 @@
+import type {Errors, PendingAction} from './OnyxCommon';
+
+/** The current user's available Early Renewal 2027 action */
+type EarlyRenewalOfferEligibility = (
+    | {
+          /** Whether the current user can accept the offer as the billing owner */
+          canClaim: true;
+          nudgePolicyID?: never;
+      }
+    | {
+          /** Whether the current user can accept the offer as the billing owner */
+          canClaim: false;
+
+          /** The policy whose billing owner the current user can nudge */
+          nudgePolicyID: string;
+      }
+) & {
+    /** Set while an accepted offer is waiting on the server */
+    pendingAction?: PendingAction;
+
+    /** Why accepting the offer failed */
+    errors?: Errors | null;
+};
+
+export default EarlyRenewalOfferEligibility;
diff --git a/src/types/onyx/ExpenseDefaultRules.ts b/src/types/onyx/ExpenseDefaultRules.ts
new file mode 100644
index 000000000000..75bbf099e045
--- /dev/null
+++ b/src/types/onyx/ExpenseDefaultRules.ts
@@ -0,0 +1,86 @@
+import type CONST from '@src/CONST';
+
+import type {ValueOf} from 'type-fest';
+
+import type {RuleFilterNode} from './RuleFilters';
+
+/**
+ * A transaction lifecycle event that can fire an expense-default rule (currently only `CreateTransaction`).
+ */
+type ExpenseDefaultTrigger = typeof CONST.RULES.TRIGGERS.CREATE_TRANSACTION;
+
+/**
+ * The triggers of a rule, keyed by a string index starting at 1 (e.g. `{"1": "CreateTransaction"}`). A rule fires when
+ * any of its triggers matches the transaction event.
+ */
+type ExpenseDefaultTriggers = Record<string, ExpenseDefaultTrigger>;
+
+/**
+ * The name of the action a rule performs when it matches (currently only `Set`).
+ */
+type ExpenseDefaultActionName = typeof CONST.RULES.ACTIONS.SET;
+
+/**
+ * The expense field a `Set` action writes to.
+ */
+type ExpenseDefaultActionField = ValueOf<typeof CONST.RULES.EXPENSE_DEFAULT.FIELD>;
+
+/**
+ * The value of a `tax` action, wrapping the tax rate in the backend API format.
+ */
+type ExpenseDefaultTaxValue = {
+    /** Object wrapping the tax field - field_id_TAX matches the backend API format */
+    // field_id_TAX is the name the rules engine gives this key, so it can't follow our casing convention
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    field_id_TAX: {
+        /** The external ID of the tax rate */
+        externalID: string;
+
+        /** The tax rate value (e.g. "8.5%") */
+        value?: string;
+
+        /** The name of the tax rate */
+        name?: string;
+    };
+};
+
+/**
+ * The value a `Set` action writes. Which of these is valid depends on the action's `field`.
+ */
+type ExpenseDefaultActionValue = string | boolean | ExpenseDefaultTaxValue;
+
+/**
+ * A single change applied to expenses that match the rule's filters.
+ */
+type ExpenseDefaultAction = {
+    /** What the rule does when it matches. */
+    name: ExpenseDefaultActionName;
+
+    /** The expense field the action writes to. */
+    field: ExpenseDefaultActionField;
+
+    /** The value written to `field`. */
+    value: ExpenseDefaultActionValue;
+};
+
+/**
+ * The actions of a rule, keyed by a string index starting at 1 (e.g. `{"1": {"name": "Set", "field": "category", "value": "Travel"}}`).
+ */
+type ExpenseDefaultActions = Record<string, ExpenseDefaultAction>;
+
+/**
+ * The body of a single expense-default rule (what merchant rules are stored as). When a transaction event
+ * matches one of the `triggers` and the `filters` match the transaction, the rule's `actions` are applied.
+ */
+type ExpenseDefaultRule = {
+    /** Transaction lifecycle events that fire this rule. */
+    triggers: ExpenseDefaultTriggers;
+
+    /** Conditions that must match the transaction for the rule to fire. */
+    filters: RuleFilterNode;
+
+    /** What gets applied to matching expenses. */
+    actions: ExpenseDefaultActions;
+};
+
+export type {ExpenseDefaultAction, ExpenseDefaultActionField, ExpenseDefaultActions, ExpenseDefaultRule, ExpenseDefaultTaxValue, ExpenseDefaultTriggers};
diff --git a/src/types/onyx/InsightsDashboard.ts b/src/types/onyx/InsightsDashboard.ts
index 0120ef64206e..a4fabe370695 100644
--- a/src/types/onyx/InsightsDashboard.ts
+++ b/src/types/onyx/InsightsDashboard.ts
@@ -17,11 +17,17 @@ type InsightsGraphKey = ValueOf<typeof CONST.INSIGHTS.GRAPH>;
 type InsightsGraph = {
     /** Hash of the graph's search snapshot */
     snapshotHash?: number;
+
+    /** Hash of the snapshot holding the data for the "Previous period" compare mode */
+    previousPeriodSnapshotHash?: number;
+
+    /** Hash of the snapshot holding the data for the "Average" compare mode */
+    averageSnapshotHash?: number;
 };
 
 /** What the backend returns for one dashboard and set of filters */
 type InsightsDashboard = {
-    /** Where each chart finds its data, keyed by the graph slot its spec declares */
+    /** Snapshots the response filled, keyed by the graph slot each chart's spec declares */
     graphs?: Partial<Record<InsightsGraphKey, InsightsGraph>>;
 
     /** Whether the account has any expenses at all, regardless of the query, so an empty account can be told apart from filters that matched nothing */
@@ -31,6 +37,9 @@ type InsightsDashboard = {
     inputQuery?: string;
 
     errors?: Errors;
+
+    /** JSON code of the failed GetInsights request stored with errors */
+    responseJsonCode?: number;
 };
 
 export type {InsightsDashboardID, InsightsGraphKey, InsightsSearchKey};
diff --git a/src/types/onyx/OnboardingRHPVariant.ts b/src/types/onyx/OnboardingRHPVariant.ts
index 8d1739c1fe5f..d5db63e9c449 100644
--- a/src/types/onyx/OnboardingRHPVariant.ts
+++ b/src/types/onyx/OnboardingRHPVariant.ts
@@ -6,7 +6,8 @@
  * @description 'rhpHomePage' - Navigate to Home page with Concierge Anywhere accessible in #admins room
  * @description 'trackExpensesWithConcierge' - Track workspace admins land on Home page with Concierge side panel (desktop) or Concierge chat (mobile)
  * @description 'inboxAdminsBespoke' - Bespoke welcome message delivered in #admins room instead of onboarding tasks
+ * @description 'homePageNoRHP' - Land on Home with the side panel closed, at every company size. Opening Concierge shows the Concierge DM
  */
-type OnboardingRHPVariant = 'rhpConciergeDm' | 'rhpAdminsRoom' | 'rhpHomePage' | 'trackExpensesWithConcierge' | 'control' | 'inboxAdminsBespoke';
+type OnboardingRHPVariant = 'rhpConciergeDm' | 'rhpAdminsRoom' | 'rhpHomePage' | 'trackExpensesWithConcierge' | 'control' | 'inboxAdminsBespoke' | 'homePageNoRHP';
 
 export default OnboardingRHPVariant;
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index a99ff47bc517..96c19988295b 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -545,6 +545,9 @@ type OriginalMessagePolicyChangeLog = {
     /** Report field type */
     fieldType?: string;
 
+    /** Account ID of the workspace member named in a member-scoped change log */
+    accountID?: number;
+
     field?: string;
 
     /** Array of field changes for consolidated employee updates */
@@ -1626,6 +1629,21 @@ type OriginalMessageTravelNudge = {
     origination: ValueOf<typeof CONST.TRAVEL_NUDGE.ORIGINATION>;
 };
 
+/** Prompt values and modifier identity recorded when an agent's instructions change. */
+type OriginalMessageAgentPromptUpdated = {
+    /** Agent instructions stored before the update */
+    previousPrompt: string;
+
+    /** Agent instructions stored after the update */
+    newPrompt: string;
+
+    /** Account ID of the user who changed the instructions */
+    updatedByAccountID: number;
+
+    /** Login of the user who changed the instructions, displayed in the audit message */
+    updatedBy: string;
+};
+
 /** The map type of original message */
 /* eslint-disable jsdoc/require-jsdoc */
 type OriginalMessageMap = {
@@ -1637,6 +1655,7 @@ type OriginalMessageMap = {
     [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER]: OriginalMessageActionableMentionInviteToSubmitExpenseConfirmWhisper;
     [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_REPORT_MENTION_WHISPER]: OriginalMessageActionableReportMentionWhisper;
     [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER]: OriginalMessageActionableTrackedExpenseWhisper;
+    [CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED]: OriginalMessageAgentPromptUpdated;
     [CONST.REPORT.ACTIONS.TYPE.POLICY_EXPENSE_CHAT_WELCOME_WHISPER]: OriginalMessagePolicyExpenseChatWelcomeWhisper;
     [CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT]: OriginalMessageAddComment;
     [CONST.REPORT.ACTIONS.TYPE.APPROVED]: OriginalMessageApproved;
@@ -1723,6 +1742,7 @@ type OriginalMessageMap = {
     [CONST.REPORT.ACTIONS.TYPE.PERSONAL_CARD_CONNECTION_BROKEN_30_DAYS]: OriginalPersonalCard;
     [CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED]: OriginalMessageIntegrationSyncFailed;
     [CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION]: OriginalMessageDeletedTransaction;
+    [CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION]: OriginalMessageUnreportedTransaction;
     [CONST.REPORT.ACTIONS.TYPE.DEW_SUBMIT_FAILED]: OriginalMessageDEWFailed;
     [CONST.REPORT.ACTIONS.TYPE.DEW_APPROVE_FAILED]: OriginalMessageDEWFailed;
     [CONST.REPORT.ACTIONS.TYPE.CONCIERGE_CATEGORY_OPTIONS]: OriginalMessageConciergeCategoryOptions;
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 62dc5cd15c56..dbc03d643802 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -2671,6 +2671,44 @@ type BusinessCentralCodingFieldMappingsOfflineFeedbackKey = `${typeof CONST.BUSI
  */
 type BusinessCentralCodingOfflineFeedbackKeys = keyof Omit<BusinessCentralCoding, 'fieldMappings'> | BusinessCentralCodingFieldMappingsOfflineFeedbackKey;
 
+/**
+ * Export configuration for Business Central.
+ */
+type BusinessCentralExport = {
+    /** Email of the workspace admin who exports reports to Business Central */
+    exporter: string;
+
+    /** Which date exported documents are dated with */
+    exportDate: ValueOf<typeof CONST.BUSINESS_CENTRAL_EXPORT_DATE>;
+
+    /** Business Central document reimbursable expenses export to */
+    reimbursable: ValueOf<typeof CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION>;
+
+    /** Business Central document non-reimbursable expenses export to */
+    nonReimbursable: ValueOf<typeof CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION>;
+
+    /** ID of the Business Central bank account reimbursable expenses export against */
+    reimbursableAccount: string;
+
+    /** ID of the Business Central bank account non-reimbursable expenses export against */
+    nonReimbursableAccount: string;
+
+    /** ID of the Business Central vendor company card expenses fall back to when no other vendor applies */
+    defaultVendorID: string;
+
+    /** Code of the Business Central payment method added to purchase invoices, empty when none is set */
+    paymentMethodCode: string;
+
+    /** Whether exported documents are only created or also posted in Business Central */
+    postingMode: ValueOf<typeof CONST.BUSINESS_CENTRAL_POSTING_MODE>;
+
+    /** Whether vendors and employees missing in Business Central are created on export */
+    autoCreateEntities: boolean;
+
+    /** Accounting method used during export */
+    accountingMethod: ValueOf<typeof COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD>;
+};
+
 /**
  * Automatic synchronization settings for Business Central.
  */
@@ -2702,6 +2740,9 @@ type BusinessCentralConnectionsConfig = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Coding settings */
         coding?: BusinessCentralCoding;
 
+        /** Export settings */
+        export?: BusinessCentralExport;
+
         /** Auto-sync settings */
         autoSync?: BusinessCentralAutoSync;
 
@@ -2711,7 +2752,7 @@ type BusinessCentralConnectionsConfig = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Collection of form field errors  */
         errorFields?: OnyxCommon.ErrorFields;
     },
-    'companyID' | 'enableNewCategories' | BusinessCentralCodingOfflineFeedbackKeys | keyof BusinessCentralAutoSync
+    'companyID' | 'enableNewCategories' | BusinessCentralCodingOfflineFeedbackKeys | keyof BusinessCentralExport | keyof BusinessCentralAutoSync
 >;
 
 /** Gusto connection data */
@@ -3059,6 +3100,9 @@ type CommuterExclusions = OnyxCommon.OnyxValueWithOfflineFeedback<{
 
     /** Distance unit stored alongside fixedDistance ('mi' or 'km'). Mirrors the policy distance custom unit at the time it was set. */
     fixedDistanceUnit?: string;
+
+    /** Default work arrangement for members without a per-member hasOfficeWorkArrangement. */
+    isOfficeWorkArrangement?: boolean;
 }>;
 
 /** Prohibited expense types */
@@ -3246,11 +3290,11 @@ type CodingRuleTax = {
         /** The external ID of the tax rate */
         externalID: string;
 
-        /** The tax rate value (e.g., "8.5%") */
-        value: string;
+        /** The tax rate value (e.g., "8.5%"). Absent when the rule was saved before the policy's rates loaded. */
+        value?: string;
 
-        /** The name of the tax rate */
-        name: string;
+        /** The name of the tax rate. Absent when the rule was saved before the policy's rates loaded. */
+        name?: string;
     };
 };
 
@@ -3478,6 +3522,9 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Whether new transactions need to be categorized */
         requiresCategory?: boolean;
 
+        /** Whether new uncategorized expenses get a category picked for them automatically. Defaults to true when unset. */
+        autoCategorizeNewExpenses?: boolean;
+
         showCategoryGLCodes?: boolean;
 
         /**
@@ -3790,7 +3837,6 @@ export type {
     ExpenseRule,
     CodingRule,
     CodingRuleFilter,
-    CodingRuleTax,
     NetSuiteConnectionConfig,
     MccGroup,
     Subrate,
@@ -3839,5 +3885,6 @@ export type {
     CampfireSync,
     BusinessCentralCompany,
     BusinessCentralCoding,
+    BusinessCentralExport,
     BusinessCentralCodingOfflineFeedbackKeys,
 };
diff --git a/src/types/onyx/PolicyDataLoadingState.ts b/src/types/onyx/PolicyDataLoadingState.ts
new file mode 100644
index 000000000000..638404bda834
--- /dev/null
+++ b/src/types/onyx/PolicyDataLoadingState.ts
@@ -0,0 +1,18 @@
+/**
+ * Session-scoped loading state for a policy's on-demand categories/tags read, keyed by policyID.
+ *
+ * Frontend-owned and RAM-only so a backend SET on the categories/tags collections cannot wipe the flags.
+ * `hasOnceLoaded` is written only from `successData`, so a read that never landed leaves it false and the
+ * next picker mount retries. Tracking success rather than "we tried once" matters because a partial
+ * collection (only the value already on the expense) is indistinguishable from a complete one, so the
+ * presence of the collection cannot stand in for a successful read.
+ */
+type PolicyDataLoadingState = {
+    /** Whether a read for this policy has succeeded at least once in this session */
+    hasOnceLoaded?: boolean;
+
+    /** Whether a read for this policy is currently in flight */
+    isLoading?: boolean;
+};
+
+export default PolicyDataLoadingState;
diff --git a/src/types/onyx/PolicyEmployee.ts b/src/types/onyx/PolicyEmployee.ts
index 1454bb02e5bc..258b739d8f25 100644
--- a/src/types/onyx/PolicyEmployee.ts
+++ b/src/types/onyx/PolicyEmployee.ts
@@ -30,6 +30,9 @@ type PolicyEmployee = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Email of the user this user forwards all reports to when the report total is over the 'approvalLimit' */
     overLimitForwardsTo?: string;
 
+    /** Whether the member is based in an office. When absent, the workspace default applies. */
+    hasOfficeWorkArrangement?: boolean;
+
     /**
      * Errors from api calls on the specific user
      * {<timestamp>: 'error message', <timestamp2>: 'error message 2'}
diff --git a/src/types/onyx/PurchaseList.ts b/src/types/onyx/PurchaseList.ts
index 68183491465a..e198eb7432b4 100644
--- a/src/types/onyx/PurchaseList.ts
+++ b/src/types/onyx/PurchaseList.ts
@@ -67,6 +67,9 @@ type Message = {
 
     /** Email the balance was transferred to, for a balance-transfer row */
     transferTo?: string;
+
+    /** Purchase ID of the bill a balance transfer was taken from */
+    fromPurchaseID?: number;
     cardSpendSurchargePercent?: number;
     cashBackAmount?: number;
     cashBackPercentage?: number;
diff --git a/src/types/onyx/Rule.ts b/src/types/onyx/Rule.ts
index a48f1defc989..861e1831d070 100644
--- a/src/types/onyx/Rule.ts
+++ b/src/types/onyx/Rule.ts
@@ -3,22 +3,32 @@ import type CONST from '@src/CONST';
 import type {ValueOf} from 'type-fest';
 
 import type {ApprovalWorkflowRule} from './ApprovalWorkflowRules';
+import type {ExpenseDefaultRule} from './ExpenseDefaultRules';
 import type {Errors, OnyxValueWithOfflineFeedback} from './OnyxCommon';
 
-/** The kind of entity a rule is scoped to (currently only workspace policies). */
+/** The kind of entity a rule is scoped to. */
 type RuleScope = ValueOf<typeof CONST.RULES.SCOPE>;
 
+/**
+ * The body of a rule, i.e. the `value` sent to `SetRule`. Which body a rule has is determined by its
+ * triggers and actions rather than by a discriminator field.
+ */
+type RuleBody = ApprovalWorkflowRule | ExpenseDefaultRule;
+
 /**
  * A rule as stored in the `ONYXKEYS.COLLECTION.RULE` collection under `rules_<ruleID>`.
  */
 type Rule = OnyxValueWithOfflineFeedback<
-    ApprovalWorkflowRule & {
+    RuleBody & {
         /** What kind of entity this rule is scoped to. */
         scope: RuleScope;
 
         /** ID of the scoped entity (the policyID for `policy`-scoped rules). */
         scopeID: string;
 
+        /** Determines the order rules are applied in when more than one matches. */
+        priority?: number;
+
         /** ISO timestamp of when the rule was created. */
         created?: string;
 
diff --git a/src/types/onyx/RuleFilters.ts b/src/types/onyx/RuleFilters.ts
new file mode 100644
index 000000000000..72957d91c552
--- /dev/null
+++ b/src/types/onyx/RuleFilters.ts
@@ -0,0 +1,42 @@
+import type CONST from '@src/CONST';
+
+import type {ValueOf} from 'type-fest';
+
+/**
+ * The value a comparison's field is compared against. An array is matched as an OR of its entries.
+ */
+type RuleFilterValue = string | number | string[];
+
+/**
+ * A single comparison node: `<left> <operator> <right>`. Both `left` and `right` are always present.
+ */
+type RuleFilterComparison = {
+    /** The comparison operator. */
+    operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>;
+
+    /** The field identifier being compared, one of the search-syntax filter keys such as `from`, `merchant` or `amount`. */
+    left: string;
+
+    /** The literal value being compared against. */
+    right: RuleFilterValue;
+};
+
+/**
+ * A boolean filter that combines two child nodes. `left` / `right` may each be either a leaf comparison
+ * or a nested boolean filter. Both children are always present.
+ */
+type RuleFilter = {
+    /** Boolean combinator (`and` / `or`). */
+    operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>;
+
+    /** Left-hand child: leaf comparison or nested boolean filter. */
+    left: RuleFilterComparison | RuleFilter;
+
+    /** Right-hand child: leaf comparison or nested boolean filter. */
+    right: RuleFilterComparison | RuleFilter;
+};
+
+/** The root of a rule's filter tree: either a single comparison or a boolean combination of nodes. */
+type RuleFilterNode = RuleFilter | RuleFilterComparison;
+
+export type {RuleFilter, RuleFilterComparison, RuleFilterNode};
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index 80bdf7788ddc..ba33dcb44848 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -48,6 +48,9 @@ type SearchResultsInfo = {
     /** The hash of the current search */
     hash: number;
 
+    /** Client-only query string this snapshot was searched with, used to add optimistic expenses to matching snapshots */
+    inputQuery?: string;
+
     /** Whether the user can fetch more search results */
     hasMoreResults: boolean;
 
diff --git a/src/types/onyx/SuggestedAgentRule.ts b/src/types/onyx/SuggestedAgentRule.ts
index 353111490928..de2018e338b4 100644
--- a/src/types/onyx/SuggestedAgentRule.ts
+++ b/src/types/onyx/SuggestedAgentRule.ts
@@ -11,6 +11,9 @@ type SuggestedAgentRule = {
 
     /** Prompt text written into the add-rule form when selected */
     prompt: string;
+
+    /** Section header shown above the suggestion in the Suggestions tab */
+    category?: string;
 };
 
 export default SuggestedAgentRule;
diff --git a/src/types/onyx/TripData.ts b/src/types/onyx/TripData.ts
index 26549a947260..89f36c15ef1d 100644
--- a/src/types/onyx/TripData.ts
+++ b/src/types/onyx/TripData.ts
@@ -1881,13 +1881,13 @@ type RailPnr = {
         passengerType: string;
 
         /** Organization and user ID associated with the passenger. */
-        userOrgId: {
+        userOrgId?: {
             organizationId: {
                 /** ID of the organization. */
                 id: string;
             };
 
-            userId: {
+            userId?: {
                 id: string;
             };
         };
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index fed8a4d0d576..dabaa67daef2 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -61,8 +61,10 @@ import type DatabaseSizeMeasurement from './DatabaseSizeMeasurement';
 import type {
     CardFeedErrorsDerivedValue,
     GuideAccountIDsDerivedValue,
+    SpendDataSignatureDerivedValue,
     LoginToAccountIDMapDerivedValue,
     NonPersonalAndWorkspaceCardListDerivedValue,
+    OneOnOneChatReportIDsDerivedValue,
     OutstandingReportsByPolicyIDDerivedValue,
     PersonalAndWorkspaceCardListDerivedValue,
     ReportAttributesDerivedValue,
@@ -80,6 +82,7 @@ import type DomainHighlightItems from './DomainHighlightItems';
 import type DomainPendingActions from './DomainPendingActions';
 import type Download from './Download';
 import type DuplicateWorkspace from './DuplicateWorkspace';
+import type EarlyRenewalOfferEligibility from './EarlyRenewalOfferEligibility';
 import type ExpenseRule from './ExpenseRule';
 import type ExpensifyCardBankAccountMetadata from './ExpensifyCardBankAccountMetadata';
 import type ExpensifyCardLoadingState from './ExpensifyCardLoadingState';
@@ -138,6 +141,7 @@ import type PlaidData from './PlaidData';
 import type Policy from './Policy';
 import type {AutoReportingOffset, PolicyConnectionName, PolicyConnectionSyncProgress, PolicyReportField, TaxRate, TaxRates, TaxRatesWithDefault} from './Policy';
 import type {PolicyCategories, PolicyCategory} from './PolicyCategory';
+import type PolicyDataLoadingState from './PolicyDataLoadingState';
 import type {PolicyEmployeeList} from './PolicyEmployee';
 import type PolicyEmployee from './PolicyEmployee';
 import type PolicyJoinMember from './PolicyJoinMember';
@@ -253,6 +257,7 @@ export type {
     CurrencyList,
     CustomStatusDraft,
     DatabaseSizeMeasurement,
+    EarlyRenewalOfferEligibility,
     UnshareBankAccount,
     DismissedReferralBanners,
     Domain,
@@ -319,6 +324,7 @@ export type {
     Policy,
     PolicyCategories,
     PolicyCategory,
+    PolicyDataLoadingState,
     PolicyVendors,
     PolicyEmployee,
     PolicyEmployeeList,
@@ -453,6 +459,8 @@ export type {
     CardFeedErrorsDerivedValue,
     LoginToAccountIDMapDerivedValue,
     GuideAccountIDsDerivedValue,
+    SpendDataSignatureDerivedValue,
+    OneOnOneChatReportIDsDerivedValue,
     ScheduleCallDraft,
     ValidateUserAndGetAccessiblePolicies,
     VacationDelegate,
diff --git a/tests/actions/BankAccountsTest.ts b/tests/actions/BankAccountsTest.ts
index 6360e8b63100..27dd17be7128 100644
--- a/tests/actions/BankAccountsTest.ts
+++ b/tests/actions/BankAccountsTest.ts
@@ -1,4 +1,4 @@
-import {clearPersonalBankAccount, connectBankAccountWithPlaid, openPersonalBankAccountSetupView} from '@libs/actions/BankAccounts';
+import {clearPersonalBankAccount, connectBankAccountWithPlaid, initiateBankAccountUnlock, openPersonalBankAccountSetupView} from '@libs/actions/BankAccounts';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 import Navigation from '@libs/Navigation/Navigation';
@@ -242,4 +242,32 @@ describe('actions/BankAccounts', () => {
             expect(personalBankAccount).toEqual({onSuccessFallbackRoute: ROUTES.ENABLE_PAYMENTS});
         });
     });
+
+    describe('initiateBankAccountUnlock', () => {
+        test('clears both pendingAction and isOptimisticAction on the Concierge unlock message after success', async () => {
+            // Given an optimistic Concierge unlock message, as written when the user presses a locked bank account
+            const conciergeReportID = '98765';
+            const optimisticReportActionID = '12345';
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeReportID}`, {
+                [optimisticReportActionID]: {
+                    reportActionID: optimisticReportActionID,
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                    created: '2026-01-01 00:00:00.000',
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    isOptimisticAction: true,
+                },
+            });
+
+            // When the unlock request succeeds
+            initiateBankAccountUnlock(123, conciergeReportID, optimisticReportActionID);
+            await waitForBatchedUpdates();
+
+            // Then the message is no longer optimistic, so it is not dimmed on later offline transitions
+            TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.INITIATE_BANK_ACCOUNT_UNLOCK, 1);
+            const reportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeReportID}`);
+            const reportAction = reportActions?.[optimisticReportActionID];
+            expect(reportAction?.pendingAction).toBeFalsy();
+            expect(reportAction?.isOptimisticAction).toBeFalsy();
+        });
+    });
 });
diff --git a/tests/actions/ClearOnyxAndSeedFullReconnectTest.ts b/tests/actions/ClearOnyxAndSeedFullReconnectTest.ts
index 490ae961820c..269ef7bff55f 100644
--- a/tests/actions/ClearOnyxAndSeedFullReconnectTest.ts
+++ b/tests/actions/ClearOnyxAndSeedFullReconnectTest.ts
@@ -76,15 +76,16 @@ describe('actions/clearOnyxAndSeedFullReconnect', () => {
         });
     });
 
-    it('applies extraSeeds atomically and keeps seeded keys after the clear', async () => {
+    it('marks the app as loading by default and keeps the loading state after the clear', async () => {
+        // Given a fully loaded app before an Onyx reset
         await Onyx.set(ONYXKEYS.IS_LOADING_APP, false);
         await waitForBatchedUpdates();
 
-        await clearOnyxAndSeedFullReconnect([], {
-            [ONYXKEYS.IS_LOADING_APP]: true,
-        });
+        // When Onyx is reset without an explicit loading-state override
+        await clearOnyxAndSeedFullReconnect([]);
         await waitForBatchedUpdates();
 
+        // Then the app remains marked as loading until the next OpenApp response arrives
         await new Promise<void>((resolve) => {
             const connection = Onyx.connect({
                 key: ONYXKEYS.IS_LOADING_APP,
@@ -109,6 +110,27 @@ describe('actions/clearOnyxAndSeedFullReconnect', () => {
         });
     });
 
+    it('allows extraSeeds to override the default loading state', async () => {
+        // Given a reset that does not lead to another OpenApp call
+        // When the caller explicitly overrides the default loading state
+        await clearOnyxAndSeedFullReconnect([], {
+            [ONYXKEYS.IS_LOADING_APP]: false,
+        });
+        await waitForBatchedUpdates();
+
+        // Then the caller-provided loading state survives the clear
+        await new Promise<void>((resolve) => {
+            const connection = Onyx.connect({
+                key: ONYXKEYS.IS_LOADING_APP,
+                callback: (value) => {
+                    expect(value).toBe(false);
+                    Onyx.disconnect(connection);
+                    resolve();
+                },
+            });
+        });
+    });
+
     it('does not let extraSeeds override the LAST_FULL_RECONNECT_TIME seed', async () => {
         // Caller tries to override the timestamp seed with an empty string — the helper must win.
         await clearOnyxAndSeedFullReconnect([], {
@@ -138,10 +160,8 @@ describe('actions/clearOnyxAndSeedFullReconnect', () => {
         });
         await waitForBatchedUpdates();
 
-        // Preserve SESSION, seed IS_LOADING_APP, leave the rest to be cleared.
-        await clearOnyxAndSeedFullReconnect([ONYXKEYS.SESSION], {
-            [ONYXKEYS.IS_LOADING_APP]: true,
-        });
+        // Preserve SESSION and leave the rest to be cleared.
+        await clearOnyxAndSeedFullReconnect([ONYXKEYS.SESSION]);
         await waitForBatchedUpdates();
 
         await new Promise<void>((resolve) => {
diff --git a/tests/actions/ClearSplitTransactionErrorTest.ts b/tests/actions/ClearSplitTransactionErrorTest.ts
index 81c275ffdff0..654461a30610 100644
--- a/tests/actions/ClearSplitTransactionErrorTest.ts
+++ b/tests/actions/ClearSplitTransactionErrorTest.ts
@@ -6,6 +6,7 @@ import type {Transaction} from '@src/types/onyx';
 
 import Onyx from 'react-native-onyx';
 
+import createRandomTransaction from '../utils/collections/transaction';
 import getOnyxValue from '../utils/getOnyxValue';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
@@ -28,11 +29,12 @@ describe('clearErrorWithOriginalTransactionError', () => {
     });
 
     it("clears both the child's and the hidden container original's errors", async () => {
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${ORIGINAL_ID}`, {transactionID: ORIGINAL_ID, reportID: CONST.REPORT.SPLIT_REPORT_ID, errors: {[ERROR_KEY]: 'original error'}});
+        const originalTransaction: Transaction = {...createRandomTransaction(1), transactionID: ORIGINAL_ID, reportID: CONST.REPORT.SPLIT_REPORT_ID, errors: {[ERROR_KEY]: 'original error'}};
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${ORIGINAL_ID}`, originalTransaction);
         await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${CHILD_ID}`, buildChild());
         await waitForBatchedUpdates();
 
-        clearErrorWithOriginalTransactionError(CHILD_ID);
+        clearErrorWithOriginalTransactionError(CHILD_ID, ORIGINAL_ID, true);
         await waitForBatchedUpdates();
 
         const child = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${CHILD_ID}`);
@@ -42,11 +44,12 @@ describe('clearErrorWithOriginalTransactionError', () => {
     });
 
     it('does not clear the original when it is no longer a split container (e.g. restored after a failed creation)', async () => {
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${ORIGINAL_ID}`, {transactionID: ORIGINAL_ID, reportID: '987654', errors: {[ERROR_KEY]: 'original error'}});
+        const originalTransaction: Transaction = {...createRandomTransaction(1), transactionID: ORIGINAL_ID, reportID: '987654', errors: {[ERROR_KEY]: 'original error'}};
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${ORIGINAL_ID}`, originalTransaction);
         await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${CHILD_ID}`, buildChild());
         await waitForBatchedUpdates();
 
-        clearErrorWithOriginalTransactionError(CHILD_ID);
+        clearErrorWithOriginalTransactionError(CHILD_ID, ORIGINAL_ID, false);
         await waitForBatchedUpdates();
 
         const child = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${CHILD_ID}`);
@@ -59,7 +62,7 @@ describe('clearErrorWithOriginalTransactionError', () => {
         await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${CHILD_ID}`, {transactionID: CHILD_ID, reportID: '987654', errors: {[ERROR_KEY]: 'some error'}});
         await waitForBatchedUpdates();
 
-        clearErrorWithOriginalTransactionError(CHILD_ID);
+        clearErrorWithOriginalTransactionError(CHILD_ID, undefined, undefined);
         await waitForBatchedUpdates();
 
         const child = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${CHILD_ID}`);
diff --git a/tests/actions/CopyPolicySettingsTest.ts b/tests/actions/CopyPolicySettingsTest.ts
index 75a4c0d7e09b..2873642e4c80 100644
--- a/tests/actions/CopyPolicySettingsTest.ts
+++ b/tests/actions/CopyPolicySettingsTest.ts
@@ -181,7 +181,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy();
                 const targetPolicy = makeTargetPolicy();
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], [part], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], [part], {}, {}, {});
 
                 const policy = getOptimisticPolicy(optimisticData);
                 expect(policy).toBeDefined();
@@ -200,7 +200,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy();
                 const targetPolicy = makeTargetPolicy();
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 expect(policy?.areCategoriesEnabled).toEqual(targetPolicy.areCategoriesEnabled);
@@ -211,7 +211,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy({glCodes: true, showTagGLCodes: true});
                 const targetPolicy = makeTargetPolicy({glCodes: false, showTagGLCodes: false});
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['rules'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['rules'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 expect(policy?.glCodes).toBe(true);
@@ -238,7 +238,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     },
                 });
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['travel'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['travel'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 // The travel toggle copies.
@@ -270,7 +270,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 };
                 const targetPolicy = makeTargetPolicy({travelSettings: targetTravelSettings});
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['travel'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['travel'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 expect(policy?.travelSettings).toEqual(targetTravelSettings);
@@ -288,7 +288,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 // Target has never been provisioned for travel, so it has no travelSettings.
                 const targetPolicy = makeTargetPolicy();
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['travel'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['travel'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 // The source's autoAddTripName=false is reflected so the UI does not show the opposite preference.
@@ -311,7 +311,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: targetCategories,
                 };
 
-                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['categories'], allPolicyCategories, {});
+                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['categories'], allPolicyCategories, {}, {});
 
                 const optimisticSet = optimisticData.find((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.SET);
                 const failureSet = failureData.find((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.SET);
@@ -329,7 +329,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_TAGS_KEY]: targetTags,
                 };
 
-                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['tags'], {}, allPolicyTags);
+                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['tags'], {}, allPolicyTags, {});
 
                 const optimisticSet = optimisticData.find((u) => u.key === TARGET_TAGS_KEY && u.onyxMethod === Onyx.METHOD.SET);
                 const failureSet = failureData.find((u) => u.key === TARGET_TAGS_KEY && u.onyxMethod === Onyx.METHOD.SET);
@@ -339,7 +339,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
             });
 
             it('does not emit POLICY_CATEGORIES updates when categories not selected', () => {
-                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['overview'], {}, {});
+                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['overview'], {}, {}, {});
                 expect(optimisticData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
                 expect(failureData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
             });
@@ -366,7 +366,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: targetCategories,
                 };
 
-                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {});
+                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {}, {});
 
                 const optimisticMerge = optimisticData.find((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.MERGE);
                 expect(optimisticMerge?.value).toEqual({
@@ -397,7 +397,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: targetCategories,
                 };
 
-                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules', 'categories'], allPolicyCategories, {});
+                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules', 'categories'], allPolicyCategories, {}, {});
 
                 expect(optimisticData.some((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.MERGE)).toBe(false);
                 expect(optimisticData.find((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.SET)?.value).toEqual(sourceCategories);
@@ -409,7 +409,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: {Food: {name: 'Food', enabled: true}},
                 };
 
-                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {});
+                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {}, {});
 
                 expect(optimisticData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
                 expect(failureData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
@@ -422,7 +422,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: {Food: {name: 'Food', enabled: false}},
                 };
 
-                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {});
+                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {}, {});
 
                 expect(optimisticData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
                 expect(failureData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
@@ -436,7 +436,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: {Food: {name: 'Food', enabled: false}},
                 };
 
-                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {});
+                const {optimisticData, failureData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {}, {});
 
                 expect(optimisticData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
                 expect(failureData.some((u) => u.key === TARGET_CATEGORIES_KEY)).toBe(false);
@@ -448,7 +448,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: {Food: {name: 'Food', enabled: false}},
                 };
 
-                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {});
+                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {}, {});
 
                 const optimisticMerge = optimisticData.find((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.MERGE);
                 expect(optimisticMerge?.value).toEqual({Food: {name: 'Food', enabled: true, commentHint: 'Add the attendee list'}});
@@ -468,21 +468,21 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     [TARGET_CATEGORIES_KEY]: {Food: {name: 'Food', enabled: true}},
                 };
 
-                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {});
+                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['rules'], allPolicyCategories, {}, {});
 
                 const optimisticMerge = optimisticData.find((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.MERGE);
                 expect(optimisticMerge?.value).toEqual({Food: {name: 'Food', enabled: true, maxExpenseAmount: 5000}});
             });
 
             it('falls back to empty object when source has no categories', () => {
-                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['categories'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['categories'], {}, {}, {});
 
                 const optimisticSet = optimisticData.find((u) => u.key === TARGET_CATEGORIES_KEY && u.onyxMethod === Onyx.METHOD.SET);
                 expect(optimisticSet?.value).toEqual({});
             });
 
             it('falls back to empty object when source has no tags', () => {
-                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['tags'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['tags'], {}, {}, {});
 
                 const optimisticSet = optimisticData.find((u) => u.key === TARGET_TAGS_KEY && u.onyxMethod === Onyx.METHOD.SET);
                 expect(optimisticSet?.value).toEqual({});
@@ -494,7 +494,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy({outputCurrency: 'USD', maxExpenseAmount: 50000});
                 const targetPolicy = makeTargetPolicy({outputCurrency: 'EUR', maxExpenseAmount: 1000});
 
-                const {failureData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview', 'rules'], {}, {});
+                const {failureData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview', 'rules'], {}, {}, {});
 
                 const policy = getFailurePolicy(failureData);
 
@@ -508,7 +508,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const targetPolicy = makeTargetPolicy();
                 const sourcePolicyKey = `${ONYXKEYS.COLLECTION.POLICY}${SOURCE_POLICY_ID}` as const;
 
-                const {failureData, successData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview'], {}, {});
+                const {failureData, successData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview'], {}, {}, {});
 
                 const sourceFailure = failureData.find((entry) => entry.key === sourcePolicyKey && entry.onyxMethod === Onyx.METHOD.MERGE);
                 expect(sourceFailure).toBeDefined();
@@ -551,7 +551,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     },
                 });
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {}, {});
 
                 const policy = getOptimisticPolicy(optimisticData);
                 expect(policy?.customUnits).toBeDefined();
@@ -591,7 +591,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     },
                 });
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {}, {});
 
                 const policy = getOptimisticPolicy(optimisticData);
                 expect(Object.keys(policy?.customUnits?.[targetExistingDistanceID]?.rates ?? {})).toEqual(['TGT_DEFAULT']);
@@ -601,7 +601,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy({customUnits: {[sourceDistanceUnit.customUnitID]: sourceDistanceUnit}});
                 const targetPolicy = makeTargetPolicy({customUnits: {}});
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {}, {});
 
                 const policy = getOptimisticPolicy(optimisticData);
                 expect(policy?.customUnits).toEqual({});
@@ -630,7 +630,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     },
                 });
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates', 'perDiem'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates', 'perDiem'], {}, {}, {});
 
                 const policy = getOptimisticPolicy(optimisticData);
                 expect(Object.keys(policy?.customUnits ?? {}).sort()).toEqual([targetExistingDistanceID, targetExistingPerDiemID].sort());
@@ -646,7 +646,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const policyKeyA = `${ONYXKEYS.COLLECTION.POLICY}TARGET_A` as const;
                 const policyKeyB = `${ONYXKEYS.COLLECTION.POLICY}TARGET_B` as const;
 
-                const {optimisticData, failureData, successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetA, targetB], ['overview'], {}, {});
+                const {optimisticData, failureData, successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetA, targetB], ['overview'], {}, {}, {});
 
                 const optimisticSets = optimisticData.filter((u) => u.onyxMethod === Onyx.METHOD.SET && (u.key === policyKeyA || u.key === policyKeyB));
                 expect(optimisticSets).toHaveLength(2);
@@ -665,7 +665,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const catKeyB = `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}TARGET_B` as const;
                 const sourceCategories: PolicyCategories = {Food: {name: 'Food', enabled: true, areCommentsRequired: false}};
 
-                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetA, targetB], ['categories'], {[SOURCE_CATEGORIES_KEY]: sourceCategories}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetA, targetB], ['categories'], {[SOURCE_CATEGORIES_KEY]: sourceCategories}, {}, {});
 
                 expect(optimisticData.find((u) => u.key === catKeyA && u.onyxMethod === Onyx.METHOD.SET)?.value).toEqual(sourceCategories);
                 expect(optimisticData.find((u) => u.key === catKeyB && u.onyxMethod === Onyx.METHOD.SET)?.value).toEqual(sourceCategories);
@@ -674,7 +674,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
 
         describe('COPY_POLICY_SETTINGS lifecycle key', () => {
             it("sets currentStep='loading' optimistically and nulls it on failure", () => {
-                const {optimisticData, failureData, successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['overview'], {}, {});
+                const {optimisticData, failureData, successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [makeTargetPolicy()], ['overview'], {}, {}, {});
 
                 const optLifecycle = optimisticData.find((u) => u.key === ONYXKEYS.COPY_POLICY_SETTINGS);
                 const failLifecycle = failureData.find((u) => u.key === ONYXKEYS.COPY_POLICY_SETTINGS);
@@ -692,7 +692,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy({address: {addressStreet: '1 Src St', city: 'NYC', country: 'US', state: 'NY', zipCode: '10001'}});
                 const targetPolicy = makeTargetPolicy({address: {addressStreet: '2 Tgt Ave', city: 'Berlin', country: 'DE', state: 'BE', zipCode: '10115'}});
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['overview'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 expect(policy?.address).toEqual(sourcePolicy.address);
@@ -719,7 +719,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy({customUnits: {[sourceDistanceUnit.customUnitID]: sourceDistanceUnit}});
                 const targetPolicy = makeTargetPolicy({customUnits: {[targetDistanceUnit.customUnitID]: targetDistanceUnit}});
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 // The optimistic unit is keyed by target's existing ID and carries only the name-matched rate,
@@ -740,7 +740,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                 const sourcePolicy = makeSourcePolicy({customUnits: {[sourceDistanceUnit.customUnitID]: sourceDistanceUnit}});
                 const targetPolicy = makeTargetPolicy({customUnits: {}});
 
-                const {failureData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {});
+                const {failureData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['distanceRates'], {}, {}, {});
                 const policy = getFailurePolicy(failureData);
 
                 // Failure restores the full original target — which had no customUnits
@@ -755,7 +755,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     units: {time: {enabled: false, rate: 10}},
                 });
 
-                const {optimisticData, successData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['timeTracking'], {}, {});
+                const {optimisticData, successData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['timeTracking'], {}, {}, {});
 
                 const policy = getOptimisticPolicy(optimisticData);
                 expect(policy?.units?.time).toEqual({enabled: true, rate: 75});
@@ -775,7 +775,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
                     tax: {trackingEnabled: false},
                 });
 
-                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['taxes'], {}, {});
+                const {optimisticData} = buildCopyPolicySettingsData(sourcePolicy, [targetPolicy], ['taxes'], {}, {}, {});
                 const policy = getOptimisticPolicy(optimisticData);
 
                 expect(policy?.tax).toEqual(sourcePolicy.tax);
@@ -783,7 +783,7 @@ describe('actions/Policy/CopyPolicySettings', () => {
 
             it('successData clears errors on target policies after retry-success', () => {
                 const targetPolicy = makeTargetPolicy();
-                const {successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetPolicy], ['overview', 'currency'], {}, {});
+                const {successData} = buildCopyPolicySettingsData(makeSourcePolicy(), [targetPolicy], ['overview', 'currency'], {}, {}, {});
 
                 const targetSuccess = successData.find((entry) => entry.key === POLICY_KEY && entry.onyxMethod === Onyx.METHOD.MERGE);
                 const successPatch = getMergedPolicyPatch(targetSuccess);
diff --git a/tests/actions/CreateWorkspaceFlowTest.ts b/tests/actions/CreateWorkspaceFlowTest.ts
new file mode 100644
index 000000000000..cbd9bc77f2ea
--- /dev/null
+++ b/tests/actions/CreateWorkspaceFlowTest.ts
@@ -0,0 +1,171 @@
+import getCurrentUrl from '@libs/Navigation/currentUrl';
+import Navigation from '@libs/Navigation/Navigation';
+
+import {createWorkspaceWithPolicyDraft, setUpPoliciesAndNavigate} from '@userActions/Policy/CreateWorkspaceFlow';
+import {createWorkspace} from '@userActions/Policy/Policy';
+import {createDraftInitialWorkspace, generateDefaultWorkspaceName} from '@userActions/Policy/PolicyDraft';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {IntroSelected} from '@src/types/onyx';
+
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {
+        isNavigationReady: jest.fn(() => Promise.resolve()),
+        goBack: jest.fn(),
+        navigate: jest.fn(),
+        dismissModal: jest.fn(),
+        revealRouteBeforeDismissingModal: jest.fn(),
+        isTopmostRouteModalScreen: jest.fn(() => false),
+        waitForProtectedRoutes: jest.fn(() => Promise.resolve()),
+    },
+}));
+
+jest.mock('@libs/Navigation/currentUrl', () => ({
+    __esModule: true,
+    default: jest.fn(() => ''),
+}));
+
+jest.mock('@libs/Navigation/helpers/willRouteNavigateToRHP', () => ({
+    __esModule: true,
+    default: jest.fn(() => false),
+}));
+
+jest.mock('@libs/Navigation/helpers/WorkspaceCreationReveal', () => ({
+    __esModule: true,
+    default: {
+        beginRevealUnderRHP: jest.fn(),
+    },
+}));
+
+jest.mock('@libs/SessionUtils', () => ({
+    isLoggingInAsNewUser: jest.fn(() => false),
+}));
+
+jest.mock('@userActions/Policy/Policy', () => ({
+    createWorkspace: jest.fn(),
+}));
+
+jest.mock('@userActions/Policy/PolicyDraft', () => ({
+    createDraftInitialWorkspace: jest.fn(),
+    generateDefaultWorkspaceName: jest.fn(() => 'Acme workspace'),
+    generatePolicyID: jest.fn(() => 'generated-policy-id'),
+}));
+
+const baseParams = {
+    introSelected: {choice: CONST.ONBOARDING_CHOICES.ADMIN} as IntroSelected,
+    policyName: 'Acme',
+    currency: 'USD',
+    policyID: 'policy-1',
+    activePolicy: undefined,
+    conciergeChat: undefined,
+    currentUserAccountIDParam: 1,
+    currentUserEmailParam: 'member@test.com',
+    isSelfTourViewed: undefined,
+    hasActiveAdminPolicies: false,
+    hasOwnedPaidPolicy: false,
+    delegateAccountID: 99,
+};
+
+const setUpParams = {
+    session: {accountID: 7, email: 'session@test.com'},
+    introSelected: baseParams.introSelected,
+    currency: 'USD',
+    activePolicy: undefined,
+    isSelfTourViewed: undefined,
+    hasActiveAdminPolicies: false,
+    hasOwnedPaidPolicy: false,
+    lastWorkspaceNumber: undefined,
+    translate: TestHelper.translateLocal,
+    conciergeChat: undefined,
+    policyOwnerAccountID: 2,
+    policyOwnerDisplayName: 'Acme owner',
+    delegateAccountID: 99,
+};
+
+describe('actions/Policy/CreateWorkspaceFlow', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.mocked(getCurrentUrl).mockReturnValue('');
+    });
+
+    it('createWorkspaceWithPolicyDraft optimistically creates the draft before saving the workspace', () => {
+        // Given a new-workspace request pinned to a fixed policy ID
+        // When the starter creates a workspace from a draft
+        // Then the draft is created before the workspace is saved, because the optimistic draft has to exist ahead of the create call
+        createWorkspaceWithPolicyDraft(baseParams);
+
+        expect(createDraftInitialWorkspace).toHaveBeenCalledWith(expect.objectContaining({workspaceName: 'Acme', policyID: 'policy-1', currency: 'USD'}));
+        expect(createWorkspace).toHaveBeenCalledWith(expect.objectContaining({policyID: 'policy-1', policyName: 'Acme', delegateAccountID: baseParams.delegateAccountID}));
+    });
+
+    it('createWorkspaceWithPolicyDraft uses the manage-team engagement choice', () => {
+        // Given an onboarding choice that is not a track-workspace choice
+        // When the starter creates the workspace
+        // Then the engagement choice is manage-team because that is the default intent for a non-track onboarding
+        createWorkspaceWithPolicyDraft({...baseParams, introSelected: {choice: CONST.ONBOARDING_CHOICES.ADMIN}});
+
+        expect(createWorkspace).toHaveBeenCalledWith(expect.objectContaining({engagementChoice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM}));
+    });
+
+    it('createWorkspaceWithPolicyDraft uses the track-workspace engagement choice for a track onboarding choice', () => {
+        // Given a track onboarding choice
+        // When the starter creates the workspace
+        // Then the engagement choice is track-workspace so the created workspace matches the personal-spend intent
+        createWorkspaceWithPolicyDraft({...baseParams, introSelected: {choice: CONST.ONBOARDING_CHOICES.PERSONAL_SPEND}});
+
+        expect(createWorkspace).toHaveBeenCalledWith(expect.objectContaining({engagementChoice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE}));
+    });
+
+    it('setUpPoliciesAndNavigate does nothing without an exitTo in the url', () => {
+        // Given a sign-in url that carries no exitTo query param
+        jest.mocked(getCurrentUrl).mockReturnValue('https://new.expensify.com/home');
+
+        // When the init handler runs setUpPoliciesAndNavigate
+        setUpPoliciesAndNavigate(setUpParams);
+
+        // Then nothing is created or navigated because there is no post-sign-in destination to act on
+        expect(createDraftInitialWorkspace).not.toHaveBeenCalled();
+        expect(Navigation.navigate).not.toHaveBeenCalled();
+    });
+
+    it('setUpPoliciesAndNavigate creates a workspace for the transition link and navigates to it', async () => {
+        // Given a transition link whose exitTo asks for a new workspace owned by another email
+        jest.mocked(getCurrentUrl).mockReturnValue('https://new.expensify.com/transition?exitTo=workspace/new&ownerEmail=owner@test.com');
+
+        // When the init handler runs setUpPoliciesAndNavigate
+        setUpPoliciesAndNavigate(setUpParams);
+        await waitForBatchedUpdates();
+
+        // Then a draft is created under a generated policy ID, the workspace is saved for the owner using the session account, and the app navigates to it, because that is exactly the exitTo the transition link requested
+        expect(generateDefaultWorkspaceName).toHaveBeenCalledWith('owner@test.com', 'Acme owner', undefined, setUpParams.translate);
+        expect(createDraftInitialWorkspace).toHaveBeenCalledWith(expect.objectContaining({workspaceName: 'Acme workspace', policyID: 'generated-policy-id'}));
+        expect(createWorkspace).toHaveBeenCalledWith(
+            expect.objectContaining({
+                policyID: 'generated-policy-id',
+                policyOwner: {email: 'owner@test.com', accountID: 2},
+                currentUserAccountIDParam: 7,
+                currentUserEmailParam: 'session@test.com',
+                delegateAccountID: setUpParams.delegateAccountID,
+            }),
+        );
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.WORKSPACE_INITIAL.getRoute('generated-policy-id', ''));
+    });
+
+    it('setUpPoliciesAndNavigate only navigates when the exitTo route is not a new workspace', async () => {
+        // Given a sign-in url whose exitTo is a settings route rather than a new workspace
+        jest.mocked(getCurrentUrl).mockReturnValue('https://new.expensify.com/inbox?exitTo=settings');
+
+        // When the init handler runs setUpPoliciesAndNavigate
+        setUpPoliciesAndNavigate(setUpParams);
+        await waitForBatchedUpdates();
+
+        // Then it only navigates to the exitTo without creating a draft, because only exitTo=workspace/new triggers workspace creation
+        expect(createDraftInitialWorkspace).not.toHaveBeenCalled();
+        expect(Navigation.navigate).toHaveBeenCalledWith('settings');
+    });
+});
diff --git a/tests/actions/EarlyRenewalOfferTest.ts b/tests/actions/EarlyRenewalOfferTest.ts
new file mode 100644
index 000000000000..8cbdb77b164b
--- /dev/null
+++ b/tests/actions/EarlyRenewalOfferTest.ts
@@ -0,0 +1,57 @@
+import {acceptEarlyRenewalOffer, clearEarlyRenewalOfferErrors} from '@libs/actions/EarlyRenewalOffer';
+import {write} from '@libs/API';
+import {WRITE_COMMANDS} from '@libs/API/types';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@libs/API', () => ({
+    write: jest.fn(),
+}));
+
+describe('actions/EarlyRenewalOffer', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        return Onyx.clear();
+    });
+
+    it('accepts the non-incentivized offer as a queued write', () => {
+        // Given the non-incentivized offer is available to the billing owner
+        // When they claim the offer
+        acceptEarlyRenewalOffer(CONST.SUBSCRIPTION.EARLY_RENEWAL.OFFER_ID.NON_INCENTIVIZED_ONE_YEAR);
+
+        // Then App sends only the offer ID Auth needs, marks the offer pending, and records a generic error if Auth rejects it
+        expect(write).toHaveBeenCalledWith(
+            WRITE_COMMANDS.ACCEPT_EARLY_RENEWAL_OFFER,
+            {offerID: CONST.SUBSCRIPTION.EARLY_RENEWAL.OFFER_ID.NON_INCENTIVIZED_ONE_YEAR},
+            expect.objectContaining({
+                optimisticData: [expect.objectContaining({key: ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY, value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, errors: null}})],
+                failureData: [expect.objectContaining({key: ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY, value: expect.objectContaining({pendingAction: null})})],
+            }),
+        );
+    });
+
+    it('dismisses a failed renewal error without touching eligibility', async () => {
+        // Given a renewal attempt failed and left an error on the offer
+        await Onyx.set(ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY, {canClaim: true, errors: {renewFailed: 'Something went wrong'}});
+
+        // When the billing owner dismisses the error
+        clearEarlyRenewalOfferErrors();
+        await waitForBatchedUpdates();
+
+        // Then the error is gone and the offer is still claimable
+        let eligibility: unknown;
+        const connection = Onyx.connectWithoutView({key: ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY, callback: (value) => (eligibility = value)});
+        await waitForBatchedUpdates();
+        Onyx.disconnect(connection);
+        expect(eligibility).toEqual({canClaim: true});
+    });
+});
diff --git a/tests/actions/IOU/PerDiemTest.ts b/tests/actions/IOU/PerDiemTest.ts
index aaeee06323f9..670ca6297765 100644
--- a/tests/actions/IOU/PerDiemTest.ts
+++ b/tests/actions/IOU/PerDiemTest.ts
@@ -8,6 +8,7 @@ import {
     hasCompletePerDiemCustomUnit,
     removeSubrate,
     submitPerDiemExpense,
+    submitPerDiemExpenseForSelfDM,
     updateSubrate,
 } from '@libs/actions/IOU/PerDiem';
 import type RequestMoneyParticipantParams from '@libs/actions/IOU/types/RequestMoneyParticipantParams';
@@ -1340,6 +1341,57 @@ describe('PerDiem', () => {
         });
     });
 
+    describe('submitPerDiemExpenseForSelfDM', () => {
+        const selfDMCustomUnit: TransactionCustomUnit = {
+            customUnitID: 'unit-1',
+            customUnitRateID: 'rate-1',
+            subRates: [{id: 'sub-1', name: 'Meals', quantity: 1, rate: 2500}],
+            attributes: {dates: {start: '2026-04-24', end: '2026-04-24'}},
+        };
+
+        const submitToSelfDM = (isFromGlobalCreate: boolean) =>
+            submitPerDiemExpenseForSelfDM({
+                dateFnsLocale: undefined,
+                getCurrencyDecimals: getCurrencyDecimalsLocal,
+                selfDMReport: undefined,
+                policy: {...createRandomPolicy(1)},
+                transactionParams: {
+                    created: DateUtils.getDBTime(),
+                    currency: CONST.CURRENCY.USD,
+                    customUnit: selfDMCustomUnit,
+                    isFromGlobalCreate,
+                },
+                currentUserAccountIDParam: currentUserPersonalDetails.accountID,
+                currentUserEmailParam: currentUserPersonalDetails.login ?? '',
+                quickAction: undefined,
+                optimisticChatReportID: 'self-dm-1',
+                delegateAccountID: undefined,
+                isTrackIntentUser: false,
+            });
+
+        it('should signal the expense added growl when submitted from global create', async () => {
+            // Given a per diem expense headed for the self-DM, started from the global create flow
+            // When it is submitted
+            submitToSelfDM(true);
+            await waitForBatchedUpdates();
+
+            // Then the new transaction is queued for the "Expense added" growl
+            const signal = await getOnyxValue(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS);
+            expect(Object.values(signal ?? {})).toEqual([CONST.SEARCH.DATA_TYPES.EXPENSE]);
+        });
+
+        it('should not signal the growl when submitted from within a report', async () => {
+            // Given a per diem expense headed for the self-DM, started from within a report
+            // When it is submitted
+            submitToSelfDM(false);
+            await waitForBatchedUpdates();
+
+            // Then nothing is queued for the growl
+            const signal = await getOnyxValue(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS);
+            expect(signal).toBeUndefined();
+        });
+    });
+
     describe('hasCompletePerDiemCustomUnit', () => {
         const completeCustomUnit: TransactionCustomUnit = {
             customUnitID: 'unit-1',
diff --git a/tests/actions/IOU/SearchUpdateTest.ts b/tests/actions/IOU/SearchUpdateTest.ts
index 4f191375df58..b50abcb1e73c 100644
--- a/tests/actions/IOU/SearchUpdateTest.ts
+++ b/tests/actions/IOU/SearchUpdateTest.ts
@@ -1,3 +1,4 @@
+import type {TransactionMonthGroupListItemType} from '@components/Search/SearchList/ListItem/types';
 import type {SearchQueryJSON} from '@components/Search/types';
 
 import {getGroupPendingDeleteOnyxUpdate, getSearchOnyxUpdate, shouldOptimisticallyUpdateSearch} from '@libs/actions/IOU/SearchUpdate';
@@ -5,13 +6,15 @@ import initOnyxDerivedValues from '@libs/actions/OnyxDerived';
 import '@libs/actions/IOU/MoneyRequest';
 import type * as PolicyUtils from '@libs/PolicyUtils';
 import type * as SearchQueryUtils from '@libs/SearchQueryUtils';
+import {isTransactionMatchWithGroupItem} from '@libs/SearchUIUtils';
+import {hasMissingSmartscanFields} from '@libs/TransactionUtils';
 
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
 import {buildCannedSearchQuery, getCurrentSearchQueryJSON} from '@src/libs/SearchQueryUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, Report} from '@src/types/onyx';
+import type {Policy, Report, Transaction} from '@src/types/onyx';
 import type {SearchResultDataType} from '@src/types/onyx/SearchResults';
 
 import type {OnyxEntry} from 'react-native-onyx';
@@ -23,6 +26,7 @@ import currencyList from '../../unit/currencyList.json';
 import {createRandomReport} from '../../utils/collections/reports';
 import createRandomTransaction from '../../utils/collections/transaction';
 import createMock from '../../utils/createMock';
+import getOnyxValue from '../../utils/getOnyxValue';
 import {getGlobalFetchMock} from '../../utils/TestHelper';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
@@ -556,7 +560,7 @@ describe('actions/IOU', () => {
             expect(result).toBeUndefined();
         });
 
-        it('patches the default Spend > Expenses snapshot even when the page was never visited', async () => {
+        it('patches the default Spend > Expenses snapshot even when the page was never visited', () => {
             // Compute the real canned Expenses hash from the unmocked helpers.
             const actualSearchQueryUtils = jest.requireActual<typeof SearchQueryUtils>('@src/libs/SearchQueryUtils');
             const cannedExpensesQuery = actualSearchQueryUtils.buildCannedSearchQuery();
@@ -566,11 +570,8 @@ describe('actions/IOU', () => {
             // register the canned hashes (the mock returns undefined by default).
             jest.mocked(buildCannedSearchQuery).mockImplementation(actualSearchQueryUtils.buildCannedSearchQuery);
 
-            // Simulate a never-visited Spend > Expenses page: SEARCH_QUERY_BY_HASH holds no entry for the
-            // canned hash and the active search (mocked) is a different hash.
-            await Onyx.set(ONYXKEYS.SEARCH_QUERY_BY_HASH, {});
-            await waitForBatchedUpdates();
-
+            // Simulate a never-visited Spend > Expenses page: no snapshot records a query for the
+            // canned hash (Onyx is cleared before each test) and the active search (mocked) is a different hash.
             const iouReport: Report = {
                 ...createRandomReport(2, undefined),
                 type: CONST.REPORT.TYPE.EXPENSE,
@@ -598,7 +599,7 @@ describe('actions/IOU', () => {
             expect(cannedUpdate?.value).toHaveProperty('search.hash', cannedExpensesHash);
         });
 
-        it('writes the group-by:from drill-down snapshot under a hash that excludes the group limit', async () => {
+        it('writes the group-by:from drill-down snapshot under a hash that excludes the group limit', () => {
             // Given an active `group-by:from` search whose `limit` is meant to bound how many member groups show.
             // `limit` is part of the query hash, so if the optimistic per-member snapshot kept it, the snapshot
             // would land on a hash the group row never reads and expanding the row would show nothing.
@@ -630,10 +631,8 @@ describe('actions/IOU', () => {
             expect(hashWithoutLimit).toBeDefined();
             expect(hashWithoutLimit).not.toBe(hashWithLimit);
 
-            // Only the active search should be patched, so no other recorded query can write the same hash.
-            await Onyx.set(ONYXKEYS.SEARCH_QUERY_BY_HASH, {});
-            await waitForBatchedUpdates();
-
+            // Only the active search should be patched. Onyx is cleared before each test, so no snapshot
+            // records another query that could write the same hash.
             const iouReport: Report = {
                 ...createRandomReport(2, undefined),
                 type: CONST.REPORT.TYPE.EXPENSE,
@@ -704,18 +703,135 @@ describe('actions/IOU', () => {
         // Repro of #99500: a self-DM split submitted to a workspace inherits a stale `(none)`/`Expense` placeholder
         // `modifiedMerchant` in its snapshot at split-creation time. Because `isMerchantMissing` reads
         // `modifiedMerchant` before `merchant`, spreading the fresh transaction via Onyx.merge would keep the stale
-        // placeholder and show a false "Missing Merchant". The snapshot write must clear it with `null` (which
-        // Onyx.merge honors) so `isMerchantMissing` falls through to the merchant the user actually entered.
+        // placeholder and show a false "Missing Merchant". The snapshot write must clear it with `''` (which
+        // Onyx.merge honors and every reader treats as "not set") so `isMerchantMissing` falls through to the
+        // merchant the user actually entered, while keeping the key for later merges to land on (#101700).
         it.each([undefined, '', CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, CONST.TRANSACTION.DEFAULT_MERCHANT])(
-            'clears a non-genuine modifiedMerchant (%s) with null so the stale placeholder cannot survive the Onyx.merge',
+            'clears a non-genuine modifiedMerchant (%s) with an empty string so the stale placeholder cannot survive the Onyx.merge',
             (modifiedMerchant) => {
+                // Given a transaction whose modifiedMerchant is absent or a placeholder
+                // When the optimistic snapshot update is built for it
                 const {update, transactionKey} = getSnapshotUpdateForModifiedMerchant(modifiedMerchant);
+
+                // Then the snapshot keeps the entered merchant and resets modifiedMerchant to the "not set" value
                 expect(update).toBeDefined();
                 expect(update?.value).toHaveProperty(['data', transactionKey, 'merchant'], 'Coffee Shop');
-                expect(update?.value).toHaveProperty(['data', transactionKey, 'modifiedMerchant'], null);
+                expect(update?.value).toHaveProperty(['data', transactionKey, 'modifiedMerchant'], '');
             },
         );
 
+        it('lets the SmartScan result reach the optimistic snapshot entry so Spend does not show Missing merchant', async () => {
+            // Given a scanned expense whose optimistic snapshot entry is written by the client, before the scan
+            // result exists. Onyx only mirrors keys that already exist on a snapshot entry into it, so the entry
+            // must carry the modified* keys for the SmartScan result to reach Spend > Expenses (#101700).
+            const iouReport: Report = {
+                ...createRandomReport(2, undefined),
+                type: CONST.REPORT.TYPE.EXPENSE,
+                stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            };
+            const transaction: Transaction = {
+                ...createRandomTransaction(1),
+                reportID: iouReport.reportID,
+                reimbursable: true,
+                amount: 0,
+                currency: 'UZS',
+                created: '2026-09-28',
+                merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
+                modifiedMerchant: undefined,
+                modifiedAmount: undefined,
+                modifiedCurrency: undefined,
+                modifiedCreated: undefined,
+                receipt: {state: CONST.IOU.RECEIPT_STATE.SCANNING},
+            };
+            const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}` as const;
+            const snapshotKey = `${ONYXKEYS.COLLECTION.SNAPSHOT}${unapprovedCashHash}` as const;
+            const result = getSearchOnyxUpdate({
+                transaction,
+                participant: {accountID: 42, login: 'test@test.com'},
+                iouReport,
+                iouAction: undefined,
+                policy: undefined,
+                transactionThreadReportID: undefined,
+                isFromOneTransactionReport: false,
+                isInvoice: false,
+            });
+            await Onyx.set(transactionKey, transaction);
+            await Onyx.update(result?.optimisticData ?? []);
+            await waitForBatchedUpdates();
+
+            // When SmartScan completes and the server merges its result into the live transaction
+            await Onyx.update([
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: transactionKey,
+                    value: {
+                        modifiedMerchant: 'Blue Bottle Coffee',
+                        modifiedAmount: -3114,
+                        modifiedCurrency: 'USD',
+                        modifiedCreated: '2026-09-15 10:42:00',
+                        receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_COMPLETE},
+                    },
+                },
+            ]);
+            await waitForBatchedUpdates();
+
+            // Then the snapshot entry carries the scanned values and no longer reports missing SmartScan fields
+            const snapshot = await getOnyxValue(snapshotKey);
+            const snapshotTransaction = snapshot?.data?.[transactionKey];
+            expect(snapshotTransaction?.modifiedMerchant).toBe('Blue Bottle Coffee');
+            expect(snapshotTransaction?.modifiedAmount).toBe(-3114);
+            expect(snapshotTransaction?.modifiedCurrency).toBe('USD');
+            expect(snapshotTransaction?.modifiedCreated).toBe('2026-09-15 10:42:00');
+            expect(snapshotTransaction?.receipt?.state).toBe(CONST.IOU.RECEIPT_STATE.SCAN_COMPLETE);
+            expect(hasMissingSmartscanFields(snapshotTransaction, iouReport)).toBe(false);
+        });
+
+        it('seeds modifiedCreated with created so the snapshot row stays in its group-by date bucket before the scan lands', async () => {
+            // Given a scanned expense that has no modifiedCreated yet. The group-by date buckets read
+            // `modifiedCreated ?? created`, so an empty-string seed would win over `created` and drop the row out of its bucket.
+            const iouReport: Report = {
+                ...createRandomReport(2, undefined),
+                type: CONST.REPORT.TYPE.EXPENSE,
+                stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            };
+            const transaction: Transaction = {
+                ...createRandomTransaction(1),
+                reimbursable: true,
+                created: '2026-09-18',
+                modifiedCreated: undefined,
+            };
+
+            // When the optimistic snapshot update is built for it
+            const result = getSearchOnyxUpdate({
+                transaction,
+                participant: {accountID: 42, login: 'test@test.com'},
+                iouReport,
+                iouAction: undefined,
+                policy: undefined,
+                transactionThreadReportID: undefined,
+                isFromOneTransactionReport: false,
+                isInvoice: false,
+            });
+
+            // Then the snapshot row carries the creation date as modifiedCreated and still matches its month bucket
+            const snapshotKey = `${ONYXKEYS.COLLECTION.SNAPSHOT}${unapprovedCashHash}` as const;
+            const update = result?.optimisticData?.find((u) => u.key === snapshotKey);
+            const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}` as const;
+            expect(update?.value).toHaveProperty(['data', transactionKey, 'modifiedCreated'], '2026-09-18');
+            await Onyx.update(result?.optimisticData ?? []);
+            await waitForBatchedUpdates();
+            const snapshot = await getOnyxValue(snapshotKey);
+            const snapshotTransaction = snapshot?.data?.[transactionKey];
+            expect(snapshotTransaction).toBeDefined();
+            if (!snapshotTransaction) {
+                return;
+            }
+            const monthGroup = createMock<TransactionMonthGroupListItemType>({groupedBy: CONST.SEARCH.GROUP_BY.MONTH, year: 2026, month: 9});
+            expect(isTransactionMatchWithGroupItem(snapshotTransaction, monthGroup, CONST.SEARCH.GROUP_BY.MONTH)).toBe(true);
+        });
+
         it('preserves a genuinely edited modifiedMerchant in the snapshot', () => {
             // The clear must only apply to an absent/placeholder modifiedMerchant. A real edited merchant is a
             // genuine value and must be preserved so the Search view keeps showing it.
@@ -811,7 +927,6 @@ describe('actions/IOU', () => {
                 }),
             );
 
-            await Onyx.set(ONYXKEYS.SEARCH_QUERY_BY_HASH, {});
             await Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${groupHash}`, {
                 search: {hash: groupHash, type: CONST.SEARCH.DATA_TYPES.EXPENSE, hasResults: true},
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- fixture mixes transaction + group keys; TS widens computed keys into one signature
@@ -841,6 +956,75 @@ describe('actions/IOU', () => {
             expect(snapshotUpdate?.value).not.toHaveProperty(['data', groupKey]);
             expect(snapshotUpdate?.value).toHaveProperty(['data', transactionKey, 'reportID'], CONST.REPORT.UNREPORTED_REPORT_ID);
         });
+
+        it('uses cached group totals and patches an active canned snapshot only once', async () => {
+            // Given a loaded grouped search and an active canned search that is also cached
+            const actualSearchQueryUtils = jest.requireActual<typeof SearchQueryUtils>('@src/libs/SearchQueryUtils');
+            jest.mocked(buildCannedSearchQuery).mockImplementation(actualSearchQueryUtils.buildCannedSearchQuery);
+            const cannedQuery = actualSearchQueryUtils.buildCannedSearchQuery();
+            const cannedQueryJSON = actualSearchQueryUtils.buildSearchQueryJSON(cannedQuery);
+            const groupedQuery = `type:expense group-by:from from:${RORY_ACCOUNT_ID}`;
+            const groupedQueryJSON = actualSearchQueryUtils.buildSearchQueryJSON(groupedQuery);
+            if (!cannedQueryJSON || !groupedQueryJSON) {
+                throw new Error('Failed to parse the canned or grouped search query');
+            }
+            const cannedSnapshotKey = `${ONYXKEYS.COLLECTION.SNAPSHOT}${cannedQueryJSON.hash}` as const;
+            const groupedSnapshotKey = `${ONYXKEYS.COLLECTION.SNAPSHOT}${groupedQueryJSON.hash}` as const;
+            const groupKey = `${CONST.SEARCH.GROUP_PREFIX}${RORY_ACCOUNT_ID}` as const;
+            await Onyx.merge(cannedSnapshotKey, {search: {hash: cannedQueryJSON.hash, inputQuery: cannedQuery}});
+            await Onyx.merge(groupedSnapshotKey, {
+                search: {hash: groupedQueryJSON.hash, inputQuery: groupedQuery},
+                data: {[groupKey]: {accountID: RORY_ACCOUNT_ID, count: 3, total: -15000, currency: CONST.CURRENCY.USD}},
+            });
+            await waitForBatchedUpdates();
+
+            // When a new expense matches both searches
+            jest.mocked(getCurrentSearchQueryJSON).mockReturnValueOnce(cannedQueryJSON);
+            const result = getSearchOnyxUpdate({
+                transaction: {...createRandomTransaction(1), amount: -5000, reportID: CONST.REPORT.UNREPORTED_REPORT_ID},
+                participant: {accountID: RORY_ACCOUNT_ID, login: RORY_EMAIL},
+                transactionThreadReportID: undefined,
+            });
+
+            // Then each snapshot is written once and the grouped update adds to the cached count and total
+            const cannedUpdates = result?.optimisticData?.filter((update) => update.key === cannedSnapshotKey);
+            const groupedUpdates = result?.optimisticData?.filter((update) => update.key === groupedSnapshotKey);
+            expect(cannedUpdates).toHaveLength(1);
+            expect(groupedUpdates).toHaveLength(1);
+            expect(groupedUpdates?.at(0)?.value).toHaveProperty(['data', groupKey, 'count'], 4);
+            expect(groupedUpdates?.at(0)?.value).toHaveProperty(['data', groupKey, 'total'], -20000);
+        });
+
+        it('patches a loaded snapshot that is not the active search using the query recorded on it', async () => {
+            // Given a loaded `from:<me>` snapshot that is not the active search, with its query recorded on the
+            // snapshot by the search() action, and a second loaded snapshot for the same query that has no recorded query
+            jest.mocked(buildCannedSearchQuery).mockReturnValue('');
+            const actualSearchQueryUtils = jest.requireActual<typeof SearchQueryUtils>('@src/libs/SearchQueryUtils');
+            const fromMeQuery = `type:expense from:${RORY_ACCOUNT_ID}`;
+            const fromMeHash = actualSearchQueryUtils.buildSearchQueryJSON(fromMeQuery)?.hash;
+            const unrecordedHash = 515151;
+            if (fromMeHash === undefined) {
+                throw new Error('Failed to parse the from:<me> search query');
+            }
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${fromMeHash}`, {search: {hash: fromMeHash, type: CONST.SEARCH.DATA_TYPES.EXPENSE, inputQuery: fromMeQuery}});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${unrecordedHash}`, {search: {hash: unrecordedHash, type: CONST.SEARCH.DATA_TYPES.EXPENSE}});
+            await waitForBatchedUpdates();
+
+            // When the user creates an expense from a chat
+            const result = getSearchOnyxUpdate({
+                transaction: {...createRandomTransaction(1), reportID: CONST.REPORT.UNREPORTED_REPORT_ID},
+                participant: {accountID: RORY_ACCOUNT_ID, login: RORY_EMAIL},
+                iouReport: undefined,
+                iouAction: undefined,
+                policy: undefined,
+                transactionThreadReportID: undefined,
+            });
+
+            // Then the snapshot with a recorded query receives the expense, and the one without a recorded query is left alone
+            const optimisticKeys = result?.optimisticData?.map((update) => update.key) ?? [];
+            expect(optimisticKeys).toContain(`${ONYXKEYS.COLLECTION.SNAPSHOT}${fromMeHash}`);
+            expect(optimisticKeys).not.toContain(`${ONYXKEYS.COLLECTION.SNAPSHOT}${unrecordedHash}`);
+        });
     });
 
     describe('getGroupPendingDeleteOnyxUpdate', () => {
diff --git a/tests/actions/IOU/SplitExpenseItemsTest.ts b/tests/actions/IOU/SplitExpenseItemsTest.ts
index 43f5c148549d..7b7446467a1e 100644
--- a/tests/actions/IOU/SplitExpenseItemsTest.ts
+++ b/tests/actions/IOU/SplitExpenseItemsTest.ts
@@ -239,9 +239,9 @@ describe('initSplitExpenseItemData stale tax handling', () => {
  * Tests for `getSplitReimbursable`, which resolves the `reimbursable` value a split is seeded with.
  *
  * The parent expense's stored value is only inherited while the policy leaves the reimbursable field editable.
- * A locked field (one of the two "Always …" cash-expense modes) must win over a stale stored value, and
- * managed-card transactions must stay non-reimbursable regardless, because their toggle is hidden in the split
- * editor and the user would have no way to correct it.
+ * A locked field (one of the two "Always …" cash-expense modes) must win over a stale stored value. Managed-card
+ * transactions always inherit the parent value, because their reimbursable value comes from the card feed, not the
+ * workspace cash-expense rules.
  */
 describe('getSplitReimbursable', () => {
     const buildReimbursablePolicy = (
@@ -335,26 +335,49 @@ describe('getSplitReimbursable', () => {
     });
 
     describe('managed-card transactions', () => {
-        it('stays false under a locked "Always reimbursable" policy — the split editor hides the toggle, so the user could not correct it', () => {
+        it('keeps a non-reimbursable card expense false under a locked "Always reimbursable" policy', () => {
+            // Given a workspace that forces cash expenses to be reimbursable
             const policy = buildReimbursablePolicy({
                 reimbursableLocked: true,
                 defaultReimbursable: true,
             });
 
-            expect(getSplitReimbursable(policy, true, buildReimbursableTransaction({managedCard: true}))).toBe(false);
+            // When a non-reimbursable card expense is split
+            // Then the split keeps the card expense's value, because the workspace rule only applies to cash expenses
+            expect(getSplitReimbursable(policy, false, buildReimbursableTransaction({managedCard: true}))).toBe(false);
         });
 
-        it('stays false when the field is unlocked and the parent expense is reimbursable', () => {
+        it('keeps a reimbursable card expense true under a locked "Always non-reimbursable" policy', () => {
+            // Given a workspace that forces cash expenses to be non-reimbursable
+            const policy = buildReimbursablePolicy({
+                reimbursableLocked: true,
+                defaultReimbursable: false,
+            });
+
+            // When a reimbursable card expense is split
+            // Then the split keeps the card expense's value, because the card feed set it
+            expect(getSplitReimbursable(policy, true, buildReimbursableTransaction({managedCard: true}))).toBe(true);
+        });
+
+        it('inherits the parent value when the field is unlocked', () => {
+            // Given a workspace that leaves the reimbursable field editable
             const policy = buildReimbursablePolicy({
                 reimbursableLocked: false,
-                defaultReimbursable: true,
+                defaultReimbursable: false,
             });
 
-            expect(getSplitReimbursable(policy, true, buildReimbursableTransaction({managedCard: true}))).toBe(false);
+            // When a card expense is split
+            // Then the split keeps the card expense's reimbursable value instead of forcing it to false
+            expect(getSplitReimbursable(policy, true, buildReimbursableTransaction({managedCard: true}))).toBe(true);
+            expect(getSplitReimbursable(policy, false, buildReimbursableTransaction({managedCard: true}))).toBe(false);
         });
 
-        it('stays false with no policy', () => {
-            expect(getSplitReimbursable(undefined, true, buildReimbursableTransaction({managedCard: true}))).toBe(false);
+        it('inherits the parent value with no policy', () => {
+            // Given a card expense split with no workspace (selfDM)
+            // When the split is seeded
+            // Then it keeps the card expense's reimbursable value
+            expect(getSplitReimbursable(undefined, true, buildReimbursableTransaction({managedCard: true}))).toBe(true);
+            expect(getSplitReimbursable(undefined, false, buildReimbursableTransaction({managedCard: true}))).toBe(false);
         });
     });
 
diff --git a/tests/actions/IOU/SplitReportTotalsTest.ts b/tests/actions/IOU/SplitReportTotalsTest.ts
index dbd8117a5339..c0b4fffbd2ff 100644
--- a/tests/actions/IOU/SplitReportTotalsTest.ts
+++ b/tests/actions/IOU/SplitReportTotalsTest.ts
@@ -1,9 +1,7 @@
-import {handleNavigateAfterExpenseCreate} from '@libs/actions/IOU/NavigationHelpers';
 import '@libs/actions/IOU/MoneyRequest';
 import {createSplitsAndOnyxData} from '@libs/actions/IOU/Split';
 import {updateSplitTransactionsFromSplitExpensesFlow} from '@libs/actions/IOU/SplitTransactionUpdate';
 import initOnyxDerivedValues from '@libs/actions/OnyxDerived';
-import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopmostSplitNavigator';
 import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import {rand64} from '@libs/NumberUtils';
 import type * as PolicyUtils from '@libs/PolicyUtils';
@@ -24,6 +22,7 @@ import Onyx from 'react-native-onyx';
 
 import currencyList from '../../unit/currencyList.json';
 import createMock from '../../utils/createMock';
+import getOnyxValue from '../../utils/getOnyxValue';
 import {getGlobalFetchMock, formatPhoneNumber, getCurrencyDecimalsLocal, getCurrencySymbolLocal} from '../../utils/TestHelper';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
@@ -413,33 +412,6 @@ describe('actions/IOU', () => {
         });
     });
 
-    it('handleNavigateAfterExpenseCreate', async () => {
-        const mockedIsReportTopmostSplitNavigator = jest.mocked(isReportTopmostSplitNavigator);
-        const spyOnMergeTransactionIdsHighlightOnSearchRoute = jest.spyOn(require('@libs/actions/Transaction'), 'mergeTransactionIdsHighlightOnSearchRoute');
-        const activeReportID = '1';
-        const transactionID = '1';
-        mockedIsReportTopmostSplitNavigator.mockReturnValue(false);
-
-        handleNavigateAfterExpenseCreate({activeReportID, isFromGlobalCreate: false});
-        expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledTimes(0);
-
-        handleNavigateAfterExpenseCreate({activeReportID, isFromGlobalCreate: true});
-        expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledTimes(0);
-
-        mockedIsReportTopmostSplitNavigator.mockReturnValue(true);
-        handleNavigateAfterExpenseCreate({activeReportID, isFromGlobalCreate: true, transactionID});
-        expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledTimes(0);
-
-        mockedIsReportTopmostSplitNavigator.mockReturnValue(false);
-        handleNavigateAfterExpenseCreate({activeReportID, isFromGlobalCreate: true, transactionID});
-        expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledTimes(0);
-
-        handleNavigateAfterExpenseCreate({activeReportID, isFromGlobalCreate: true, transactionID, isInvoice: true});
-        expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledTimes(0);
-
-        spyOnMergeTransactionIdsHighlightOnSearchRoute.mockReset();
-    });
-
     describe('createSplitsAndOnyxData', () => {
         const mockPersonalDetails: PersonalDetailsList = {
             [RORY_ACCOUNT_ID]: {accountID: RORY_ACCOUNT_ID, login: RORY_EMAIL, displayName: 'Rory'},
@@ -763,6 +735,18 @@ describe('actions/IOU', () => {
             };
         }
 
+        function getPendingNewTransactionIDsFromOnyx(reportID: string) {
+            return new Promise<Record<string, unknown> | undefined>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+                    callback: (metadata) => {
+                        Onyx.disconnect(connection);
+                        resolve(metadata?.pendingNewTransactionIDs);
+                    },
+                });
+            });
+        }
+
         it('skips registration during a reverse split operation', async () => {
             // Given one existing child transaction (triggers isReverseSplitOperation when splitExpenses.length === 1)
             const existingChildTx = {
@@ -821,56 +805,6 @@ describe('actions/IOU', () => {
             expect(pendingNewTransactionIDs?.['new-tx-2']).toBeUndefined();
         });
 
-        it('registers the search-route highlight (not report metadata) when splitting from the Search/Spend page', async () => {
-            // Given the user is on the Search (Spend > Expenses) page, where the expense report is never opened
-            jest.mocked(isSearchTopmostFullScreenRoute).mockReturnValue(true);
-            const spyOnMergeTransactionIdsHighlightOnSearchRoute = jest.spyOn(require('@libs/actions/Transaction'), 'mergeTransactionIdsHighlightOnSearchRoute');
-            const params = buildBaseParams({
-                transactionData: {
-                    reportID: EXPENSE_REPORT_ID,
-                    originalTransactionID: ORIGINAL_TX_ID,
-                    splitExpenses: [
-                        {transactionID: 'new-tx-1', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
-                        {transactionID: 'new-tx-2', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
-                    ],
-                    splitExpensesTotal: 1000,
-                },
-            });
-
-            // When saving the split from the Search page
-            updateSplitTransactionsFromSplitExpensesFlow(params);
-            await waitForBatchedUpdates();
-
-            // Then the new IDs are registered on the search-route highlight, keyed by the current search type.
-            // (The report-metadata rail is asserted separately, in the REPORT_METADATA test below.)
-            // This mechanism highlights optimistically without a server re-search, so it works offline too.
-            expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledWith(
-                'expense',
-                Object.fromEntries([
-                    ['new-tx-1', true],
-                    ['new-tx-2', true],
-                ]),
-            );
-
-            spyOnMergeTransactionIdsHighlightOnSearchRoute.mockRestore();
-        });
-
-        /**
-         * Reads REPORT_METADATA directly: the flags are written as Onyx optimisticData, not through the mocked
-         * addPendingNewTransactionIDs, so mock-only assertions cannot observe them - which is how this regressed.
-         */
-        function getPendingNewTransactionIDsFromOnyx(reportID: string) {
-            return new Promise<Record<string, unknown> | undefined>((resolve) => {
-                const connection = Onyx.connect({
-                    key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
-                    callback: (metadata) => {
-                        Onyx.disconnect(connection);
-                        resolve(metadata?.pendingNewTransactionIDs);
-                    },
-                });
-            });
-        }
-
         it('does not write pendingNewTransactionIDs into report metadata when splitting from the Search/Spend page', async () => {
             // Given the user is on the Search (Spend > Expenses) page and the expense report already holds a transaction,
             // so the new splits would otherwise satisfy the "add makes the report multi-transaction" highlight condition
@@ -945,10 +879,8 @@ describe('actions/IOU', () => {
             expect(pendingNewTransactionIDs?.['existing-tx-2']).toBeUndefined();
         });
 
-        it('skips the search-route highlight during a reverse split from the Search/Spend page', async () => {
-            // Given the user is on the Search page and this is a reverse split (1 expense, existing child present)
-            jest.mocked(isSearchTopmostFullScreenRoute).mockReturnValue(true);
-            const spyOnMergeTransactionIdsHighlightOnSearchRoute = jest.spyOn(require('@libs/actions/Transaction'), 'mergeTransactionIdsHighlightOnSearchRoute');
+        it('does not signal the "Expense added" growl during a reverse split operation', async () => {
+            // Given an existing split is being reversed from the expense report
             const existingChildTx = {
                 transactionID: 'child-tx-1',
                 reportID: EXPENSE_REPORT_ID,
@@ -968,50 +900,58 @@ describe('actions/IOU', () => {
             updateSplitTransactionsFromSplitExpensesFlow(params);
             await waitForBatchedUpdates();
 
-            // Then nothing is highlighted — reverse splits create no new transactions
-            expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).not.toHaveBeenCalled();
-
-            spyOnMergeTransactionIdsHighlightOnSearchRoute.mockRestore();
+            // Then no expense-added growl is queued
+            const growlTransactionIDs = await getOnyxValue(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS);
+            expect(growlTransactionIDs?.['new-merged-tx']).toBeUndefined();
         });
 
-        it('registers the search-route highlight while offline, so the Spend page still highlights', async () => {
-            // Given the user is offline on the Search page. The auto-detect path in useSearchHighlightAndScroll is
-            // skipped while offline (it waits for a server re-search), so this rail is the only thing that can
-            // highlight the new rows - a reviewer caught the highlight silently disappearing offline.
+        it('signals the "Expense added" growl when splitting from Spend', async () => {
+            // Given a transaction is being split from the Search tab
             jest.mocked(isSearchTopmostFullScreenRoute).mockReturnValue(true);
-            const spyOnMergeTransactionIdsHighlightOnSearchRoute = jest.spyOn(require('@libs/actions/Transaction'), 'mergeTransactionIdsHighlightOnSearchRoute');
             const params = buildBaseParams({
-                isOffline: true,
                 transactionData: {
                     reportID: EXPENSE_REPORT_ID,
                     originalTransactionID: ORIGINAL_TX_ID,
                     splitExpenses: [
-                        {transactionID: 'offline-tx-1', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
-                        {transactionID: 'offline-tx-2', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
+                        {transactionID: 'new-search-tx-1', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
+                        {transactionID: 'new-search-tx-2', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
                     ],
                     splitExpensesTotal: 1000,
                 },
             });
 
-            // When saving the split offline
+            // When saving the split
             updateSplitTransactionsFromSplitExpensesFlow(params);
             await waitForBatchedUpdates();
 
-            // Then BOTH new IDs are registered - a reviewer also caught only one of the two rows highlighting
-            expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledWith(
-                'expense',
-                Object.fromEntries([
-                    ['offline-tx-1', true],
-                    ['offline-tx-2', true],
-                ]),
-            );
+            // Then the latest new split is queued for the expense-added growl
+            const growlTransactionIDs = await getOnyxValue(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS);
+            expect(growlTransactionIDs?.['new-search-tx-2']).toBe(CONST.SEARCH.DATA_TYPES.EXPENSE);
+        });
 
-            // And the report-metadata rail stays clean offline too
-            const pendingNewTransactionIDs = await getPendingNewTransactionIDsFromOnyx(EXPENSE_REPORT_ID);
-            expect(pendingNewTransactionIDs?.['offline-tx-1']).toBeUndefined();
-            expect(pendingNewTransactionIDs?.['offline-tx-2']).toBeUndefined();
+        it('does not signal the "Expense added" growl for a report without a parent outside Spend', async () => {
+            // Given a transaction in an Inbox report without a parent is being split
+            jest.mocked(isSearchTopmostFullScreenRoute).mockReturnValue(false);
+            const params = buildBaseParams({
+                transactionReport: {reportID: 'report-without-parent'},
+                transactionData: {
+                    reportID: EXPENSE_REPORT_ID,
+                    originalTransactionID: ORIGINAL_TX_ID,
+                    splitExpenses: [
+                        {transactionID: 'new-inbox-tx-1', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
+                        {transactionID: 'new-inbox-tx-2', reportID: EXPENSE_REPORT_ID, statusNum: 0, amount: 500, created: '2024-01-01'},
+                    ],
+                    splitExpensesTotal: 1000,
+                },
+            });
+
+            // When saving the split
+            updateSplitTransactionsFromSplitExpensesFlow(params);
+            await waitForBatchedUpdates();
 
-            spyOnMergeTransactionIdsHighlightOnSearchRoute.mockRestore();
+            // Then no expense-added growl is queued
+            const growlTransactionIDs = await getOnyxValue(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS);
+            expect(growlTransactionIDs?.['new-inbox-tx-2']).toBeUndefined();
         });
 
         it('leaves no highlight flags anywhere when splits move out to a different report', async () => {
diff --git a/tests/actions/IOUTest/BulkEditTest.ts b/tests/actions/IOUTest/BulkEditTest.ts
index 9862dd7fd144..ebd18b0b5734 100644
--- a/tests/actions/IOUTest/BulkEditTest.ts
+++ b/tests/actions/IOUTest/BulkEditTest.ts
@@ -1220,6 +1220,77 @@ describe('actions/IOU/BulkEdit', () => {
             canEditFieldSpy.mockRestore();
         });
 
+        it('never writes the tag from the flattened changes.tag when no per-level intent is recorded (single source of truth)', () => {
+            const transactionID = 'transaction-flat-only-1';
+            const iouReportID = 'iou-flat-only-1';
+            const policy = {
+                ...createRandomPolicy(71, CONST.POLICY.TYPE.TEAM),
+                areTagsEnabled: true,
+                hasMultipleTagLists: true,
+            };
+
+            const iouReport: Report = {
+                ...createRandomReport(71, undefined),
+                reportID: iouReportID,
+                policyID: policy.id,
+                type: CONST.REPORT.TYPE.EXPENSE,
+            };
+            const reports = {
+                [`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`]: iouReport,
+            };
+
+            const transaction: Transaction = {
+                ...createRandomTransaction(1),
+                transactionID,
+                reportID: iouReportID,
+                transactionThreadReportID: 'thread-flat-only-1',
+                tag: 'CostCenterA:IndicationX',
+            };
+            const transactions = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]: transaction,
+            };
+            const policyTagList = {
+                CostCenter: {name: 'CostCenter', orderWeight: 0, required: false, tags: {CostCenterA: {name: 'CostCenterA', enabled: true}}},
+                Indication: {name: 'Indication', orderWeight: 1, required: false, tags: {IndicationX: {name: 'IndicationX', enabled: true}}},
+            };
+
+            const canEditFieldSpy = jest.spyOn(require('@libs/ReportUtils'), 'canEditFieldOfMoneyRequest').mockReturnValue(true);
+            // eslint-disable-next-line rulesdir/no-multiple-api-calls
+            const writeSpy = jest.spyOn(API, 'write').mockImplementation(jest.fn());
+
+            updateMultipleMoneyRequests({
+                isVendorMatchingBetaEnabled: false,
+                personalDetailsList: undefined,
+                transactionIDs: [transactionID],
+                // Change the category so the request is sent. The tag must not be included.
+                changes: {tag: 'CostCenterA', category: 'Food'},
+                bulkEditTagChanges: undefined,
+                policy,
+                reports,
+                transactions,
+                reportActions: {},
+                policyCategories: undefined,
+                policyTags: {
+                    [`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`]: policyTagList,
+                },
+                violations: undefined,
+                hash: undefined,
+                currentUserAccountID: RORY_ACCOUNT_ID,
+                delegateAccountID: undefined,
+                getCurrencyDecimals: getCurrencyDecimalsLocal,
+                getCurrencySymbol: getCurrencySymbolLocal,
+                rules: undefined,
+            });
+
+            const updates = getBulkEditUpdates(writeSpy);
+            // The flattened changes.tag is display-only; without a per-level intent the tag must not be written.
+            expect(updates.tag).toBeUndefined();
+            expect(updates.category).toBe('Food');
+
+            writeSpy.mockRestore();
+            canEditFieldSpy.mockRestore();
+        });
+
         it('preserves parent levels and re-resolves dependent child levels below the edited one when bulk-editing a middle level (dependent tags)', () => {
             const transactionID = 'transaction-dep-1';
             const iouReportID = 'iou-dep-1';
diff --git a/tests/actions/IOUTest/DuplicateTest.ts b/tests/actions/IOUTest/DuplicateTest.ts
index 96b967818290..f98a16e351a2 100644
--- a/tests/actions/IOUTest/DuplicateTest.ts
+++ b/tests/actions/IOUTest/DuplicateTest.ts
@@ -4,10 +4,12 @@ import type {RenderAPI} from '@testing-library/react-native';
 import {bulkDuplicateExpenses, bulkDuplicateReports, duplicateExpenseTransaction, duplicateReport, mergeDuplicates, resolveDuplicates} from '@libs/actions/IOU/Duplicate';
 import type {BulkDuplicateReportsParams, DuplicateReportParams} from '@libs/actions/IOU/Duplicate';
 import {getReportPreviewReportAction} from '@libs/actions/IOU/MoneyRequestBuilder';
+import signalExpenseAddedGrowl from '@libs/actions/IOU/signalExpenseAddedGrowl';
 import initOnyxDerivedValues from '@libs/actions/OnyxDerived';
 import {addComment, openReport} from '@libs/actions/Report';
 import type {MergeDuplicatesParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
+import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import {getLoginsByAccountIDs} from '@libs/PersonalDetailsUtils';
 import {getOriginalMessage, getReportAction} from '@libs/ReportActionsUtils';
@@ -41,6 +43,8 @@ import {formatPhoneNumber, getCurrencyDecimalsLocal, getGlobalFetchMock, getOnyx
 import {isObject} from '../../utils/typeGuards';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
+jest.mock('@libs/actions/IOU/signalExpenseAddedGrowl', () => jest.fn());
+
 const topMostReportID = '23423423';
 jest.mock('@src/libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
@@ -3808,6 +3812,8 @@ describe('actions/Duplicate', () => {
         });
 
         it('should create a single IOU report for multiple bulk-duplicated expenses', async () => {
+            // Given bulk duplication is initiated from Spend
+            jest.mocked(isSearchTopmostFullScreenRoute).mockReturnValue(true);
             const tx1: Transaction = {
                 ...createRandomTransaction(1),
                 transactionID: 'bulk_1',
@@ -3832,6 +3838,7 @@ describe('actions/Duplicate', () => {
                 [`${ONYXKEYS.COLLECTION.TRANSACTION}bulk_3`]: tx3,
             };
 
+            // When the selected expenses are duplicated
             bulkDuplicateExpenses({
                 isVendorMatchingBetaEnabled: false,
                 dateFnsLocale: undefined,
@@ -3869,9 +3876,15 @@ describe('actions/Duplicate', () => {
 
             const iouReportIDs = new Set(requestMoneyCalls.map((call) => call[1].iouReportID));
             expect(iouReportIDs.size).toBe(1);
+
+            // Then the expense-added growl is signaled
+            expect(signalExpenseAddedGrowl).toHaveBeenCalledTimes(1);
+            expect(jest.mocked(signalExpenseAddedGrowl).mock.calls.at(0)?.at(1)).toBe(CONST.SEARCH.DATA_TYPES.EXPENSE);
         });
 
-        it('should not defer auto submit when the last selected expense is unreported', async () => {
+        it('should not defer auto submit or signal the growl outside Spend when the last selected expense is unreported', async () => {
+            // Given bulk duplication is initiated outside Spend
+            jest.mocked(isSearchTopmostFullScreenRoute).mockReturnValue(false);
             const reportedTransaction: Transaction = {
                 ...createRandomTransaction(1),
                 transactionID: 'bulk_reported',
@@ -3890,6 +3903,7 @@ describe('actions/Duplicate', () => {
                 [`${ONYXKEYS.COLLECTION.TRANSACTION}bulk_unreported`]: unreportedTransaction,
             };
 
+            // When the selected expenses are duplicated
             bulkDuplicateExpenses({
                 isVendorMatchingBetaEnabled: false,
                 dateFnsLocale: undefined,
@@ -3927,6 +3941,9 @@ describe('actions/Duplicate', () => {
             expect(requestMoneyCalls).toHaveLength(1);
             expect(trackExpenseCalls).toHaveLength(1);
             expect(requestMoneyCalls.at(0)?.[1].shouldDeferAutoSubmit).toBeFalsy();
+
+            // Then the expense-added growl is not signaled
+            expect(signalExpenseAddedGrowl).not.toHaveBeenCalled();
         });
     });
 
diff --git a/tests/actions/IOUTest/HoldTest.ts b/tests/actions/IOUTest/HoldTest.ts
index 07da16d74bd2..5095387b74d6 100644
--- a/tests/actions/IOUTest/HoldTest.ts
+++ b/tests/actions/IOUTest/HoldTest.ts
@@ -26,6 +26,7 @@ import type {MockFetch} from '../../utils/TestHelper';
 
 import createRandomPolicy from '../../utils/collections/policies';
 import createMock from '../../utils/createMock';
+import getOnyxValue from '../../utils/getOnyxValue';
 import {createGlobalFetchMock, getCurrencyDecimalsLocal} from '../../utils/TestHelper';
 import {hasDefinedProperty, isObject} from '../../utils/typeGuards';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
@@ -126,7 +127,19 @@ describe('actions/IOU/Hold', () => {
                 .then(() => Onyx.multiSet({...reportCollectionDataSet, ...transactionCollectionDataSet, ...actionCollectionDataSet}))
                 .then(() => {
                     // When an expense is put on hold
-                    putOnHold(transaction.transactionID, comment, transactionThread.reportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined});
+                    putOnHold({
+                        transactionID: transaction.transactionID,
+                        transaction,
+                        comment,
+                        initialReportID: transactionThread.reportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: undefined,
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -188,7 +201,19 @@ describe('actions/IOU/Hold', () => {
                 .then(() => Onyx.multiSet({...reportCollectionDataSet, ...transactionCollectionDataSet, ...actionCollectionDataSet}))
                 .then(() => {
                     // When an expense is put on hold without existing transaction thread (undefined initialReportID)
-                    putOnHold(transaction.transactionID, comment, undefined, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined});
+                    putOnHold({
+                        transactionID: transaction.transactionID,
+                        transaction,
+                        comment,
+                        initialReportID: undefined,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: undefined,
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -268,18 +293,19 @@ describe('actions/IOU/Hold', () => {
                 .then(() => Onyx.multiSet({...reportCollectionDataSet, ...transactionCollectionDataSet, ...actionCollectionDataSet}))
                 .then(() => {
                     // When multiple transactions are put on hold
-                    putTransactionsOnHold(
-                        [transaction1.transactionID, transaction2.transactionID],
+                    putTransactionsOnHold({
+                        transactionsID: [transaction1.transactionID, transaction2.transactionID],
                         comment,
-                        iouReport.reportID,
-                        false,
-                        RORY_EMAIL,
-                        RORY_ACCOUNT_ID,
-                        undefined,
-                        false,
-                        undefined,
-                        {rules: undefined},
-                    );
+                        reportID: iouReport.reportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        allTransactionViolations: undefined,
+                        transactions: [transaction1, transaction2],
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -373,18 +399,19 @@ describe('actions/IOU/Hold', () => {
                 .then(() => {
                     jest.mocked(Navigation.setNavigationActionToMicrotaskQueue).mockClear();
                     // When transactions are put on hold while offline (isOffline: true)
-                    putTransactionsOnHold(
-                        [transaction1.transactionID, transaction2.transactionID],
+                    putTransactionsOnHold({
+                        transactionsID: [transaction1.transactionID, transaction2.transactionID],
                         comment,
-                        iouReport.reportID,
-                        true,
-                        RORY_EMAIL,
-                        RORY_ACCOUNT_ID,
-                        undefined,
-                        false,
-                        undefined,
-                        {rules: undefined},
-                    );
+                        reportID: iouReport.reportID,
+                        isOffline: true,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        allTransactionViolations: undefined,
+                        transactions: [transaction1, transaction2],
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -393,6 +420,97 @@ describe('actions/IOU/Hold', () => {
                     return mockFetch.resume();
                 });
         });
+
+        test('should still hold a transaction missing from the transactions list, without touching report totals for it', () => {
+            const iouReport = buildOptimisticIOUReport(1, 2, 300, '1', 'USD', getCurrencyDecimalsLocal);
+            const transaction1 = buildOptimisticTransaction({
+                transactionParams: {
+                    amount: 100,
+                    currency: 'USD',
+                    reportID: iouReport.reportID,
+                },
+            });
+            const transaction2 = buildOptimisticTransaction({
+                transactionParams: {
+                    amount: 200,
+                    currency: 'USD',
+                    reportID: iouReport.reportID,
+                },
+            });
+
+            const iouAction1: ReportAction = buildOptimisticIOUReportAction({
+                type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                amount: transaction1.amount,
+                currency: transaction1.currency,
+                comment: '',
+                participants: [],
+                transactionID: transaction1.transactionID,
+                getCurrencyDecimals: getCurrencyDecimalsLocal,
+            });
+            const iouAction2: ReportAction = buildOptimisticIOUReportAction({
+                type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                amount: transaction2.amount,
+                currency: transaction2.currency,
+                comment: '',
+                participants: [],
+                transactionID: transaction2.transactionID,
+                getCurrencyDecimals: getCurrencyDecimalsLocal,
+            });
+            const transactionThread1 = buildTransactionThread(iouAction1, iouReport, RORY_ACCOUNT_ID);
+            const transactionThread2 = buildTransactionThread(iouAction2, iouReport, RORY_ACCOUNT_ID);
+
+            const transactionCollectionDataSet: TransactionCollectionDataSet = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction1.transactionID}`]: transaction1,
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`]: transaction2,
+            };
+            const reportCollectionDataSet: ReportCollectionDataSet = {
+                [`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`]: iouReport,
+                [`${ONYXKEYS.COLLECTION.REPORT}${transactionThread1.reportID}`]: transactionThread1,
+                [`${ONYXKEYS.COLLECTION.REPORT}${transactionThread2.reportID}`]: transactionThread2,
+            };
+            const actionCollectionDataSet: ReportActionsCollectionDataSet = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`]: {
+                    [iouAction1.reportActionID]: iouAction1,
+                    [iouAction2.reportActionID]: iouAction2,
+                },
+            };
+            const comment = 'bulk hold reason';
+
+            return waitForBatchedUpdates()
+                .then(() => Onyx.multiSet({...reportCollectionDataSet, ...transactionCollectionDataSet, ...actionCollectionDataSet}))
+                .then(() => {
+                    // When one of the two transaction IDs has no matching entry in the transactions list
+                    putTransactionsOnHold({
+                        transactionsID: [transaction1.transactionID, transaction2.transactionID],
+                        comment,
+                        reportID: iouReport.reportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        allTransactionViolations: undefined,
+                        transactions: [transaction1],
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
+                    return waitForBatchedUpdates();
+                })
+                .then(async () => {
+                    const updatedTransaction2 = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction2.transactionID}`);
+                    const transaction2Violations = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction2.transactionID}`);
+                    const updatedReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`);
+
+                    // Then the transaction that was missing from the list still gets the hold action and violation
+                    expect(updatedTransaction2?.comment?.hold).toBeDefined();
+                    expect(transaction2Violations).toEqual(expect.arrayContaining([expect.objectContaining({name: CONST.VIOLATIONS.HOLD})]));
+
+                    // And the report totals only account for the transaction that was present, so the missing
+                    // transaction's amount is never deducted
+                    expect(updatedReport?.unheldTotal).toBe(200);
+
+                    return mockFetch.resume();
+                });
+        });
     });
 
     describe('putOnHold with isOffline', () => {
@@ -430,7 +548,19 @@ describe('actions/IOU/Hold', () => {
                 .then(() => Onyx.multiSet({...reportCollectionDataSet, ...transactionCollectionDataSet, ...actionCollectionDataSet}))
                 .then(() => {
                     jest.mocked(Navigation.setNavigationActionToMicrotaskQueue).mockClear();
-                    putOnHold(transaction.transactionID, comment, transactionThread.reportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined});
+                    putOnHold({
+                        transactionID: transaction.transactionID,
+                        transaction,
+                        comment,
+                        initialReportID: transactionThread.reportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: undefined,
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -438,7 +568,19 @@ describe('actions/IOU/Hold', () => {
                     expect(Navigation.setNavigationActionToMicrotaskQueue).toHaveBeenCalledTimes(1);
 
                     jest.mocked(Navigation.setNavigationActionToMicrotaskQueue).mockClear();
-                    putOnHold(transaction.transactionID, comment, transactionThread.reportID, true, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined});
+                    putOnHold({
+                        transactionID: transaction.transactionID,
+                        transaction,
+                        comment,
+                        initialReportID: transactionThread.reportID,
+                        isOffline: true,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: undefined,
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -491,7 +633,19 @@ describe('actions/IOU/Hold', () => {
             return waitForBatchedUpdates()
                 .then(() => Onyx.multiSet({...reportCollectionDataSet, ...transactionCollectionDataSet, ...actionCollectionDataSet}))
                 .then(() => {
-                    putOnHold(transaction.transactionID, comment, transactionThread.reportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined});
+                    putOnHold({
+                        transactionID: transaction.transactionID,
+                        transaction,
+                        comment,
+                        initialReportID: transactionThread.reportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: undefined,
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -576,7 +730,19 @@ describe('actions/IOU/Hold', () => {
             return waitForBatchedUpdates()
                 .then(() => Onyx.multiSet({...reportCollectionDataSet, ...transactionCollectionDataSet, ...actionCollectionDataSet}))
                 .then(() => {
-                    putOnHold(transaction.transactionID, comment, transactionThread.reportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined});
+                    putOnHold({
+                        transactionID: transaction.transactionID,
+                        transaction,
+                        comment,
+                        initialReportID: transactionThread.reportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: undefined,
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
diff --git a/tests/actions/IOUTest/PayMoneyRequestTest.ts b/tests/actions/IOUTest/PayMoneyRequestTest.ts
index a4401d13683a..2673ac70bb60 100644
--- a/tests/actions/IOUTest/PayMoneyRequestTest.ts
+++ b/tests/actions/IOUTest/PayMoneyRequestTest.ts
@@ -856,7 +856,20 @@ describe('actions/IOU/PayMoneyRequest', () => {
             return waitForBatchedUpdates()
                 .then(() => Onyx.multiSet({...transactionCollectionDataSet, ...actionCollectionDataSet}))
                 .then(() => {
-                    putOnHold(transaction1.transactionID, 'comment', iouReport.reportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined, ancestors: []});
+                    putOnHold({
+                        transactionID: transaction1.transactionID,
+                        transaction: transaction1,
+                        comment: 'comment',
+                        initialReportID: iouReport.reportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: undefined,
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                        ancestors: [],
+                    });
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
diff --git a/tests/actions/IOUTest/ReportWorkflowTest.ts b/tests/actions/IOUTest/ReportWorkflowTest.ts
index e11c6a0129a0..7b8390a52b57 100644
--- a/tests/actions/IOUTest/ReportWorkflowTest.ts
+++ b/tests/actions/IOUTest/ReportWorkflowTest.ts
@@ -375,7 +375,17 @@ describe('actions/IOU/ReportWorkflow', () => {
             await waitForBatchedUpdates();
 
             // Hold one of the two expenses
-            putOnHold(heldTransaction.transactionID, 'hold reason', expenseReport.reportID, false, CARLOS_EMAIL, CARLOS_ACCOUNT_ID, undefined, false, undefined, {
+            putOnHold({
+                transactionID: heldTransaction.transactionID,
+                transaction: heldTransaction,
+                comment: 'hold reason',
+                initialReportID: expenseReport.reportID,
+                isOffline: false,
+                currentUserLogin: CARLOS_EMAIL,
+                currentUserAccountID: CARLOS_ACCOUNT_ID,
+                transactionViolations: undefined,
+                isTrackIntentUser: false,
+                delegateAccountID: undefined,
                 rules: undefined,
                 ancestors: [],
             });
@@ -500,7 +510,17 @@ describe('actions/IOU/ReportWorkflow', () => {
             await waitForBatchedUpdates();
 
             // Hold one of the two expenses
-            putOnHold(heldTransaction.transactionID, 'hold reason', expenseReport.reportID, false, CARLOS_EMAIL, CARLOS_ACCOUNT_ID, undefined, false, undefined, {
+            putOnHold({
+                transactionID: heldTransaction.transactionID,
+                transaction: heldTransaction,
+                comment: 'hold reason',
+                initialReportID: expenseReport.reportID,
+                isOffline: false,
+                currentUserLogin: CARLOS_EMAIL,
+                currentUserAccountID: CARLOS_ACCOUNT_ID,
+                transactionViolations: undefined,
+                isTrackIntentUser: false,
+                delegateAccountID: undefined,
                 rules: undefined,
                 ancestors: [],
             });
@@ -610,7 +630,17 @@ describe('actions/IOU/ReportWorkflow', () => {
             await waitForBatchedUpdates();
 
             // Hold the only expense on the report
-            putOnHold(heldTransaction.transactionID, 'hold reason', expenseReport.reportID, false, CARLOS_EMAIL, CARLOS_ACCOUNT_ID, undefined, false, undefined, {
+            putOnHold({
+                transactionID: heldTransaction.transactionID,
+                transaction: heldTransaction,
+                comment: 'hold reason',
+                initialReportID: expenseReport.reportID,
+                isOffline: false,
+                currentUserLogin: CARLOS_EMAIL,
+                currentUserAccountID: CARLOS_ACCOUNT_ID,
+                transactionViolations: undefined,
+                isTrackIntentUser: false,
+                delegateAccountID: undefined,
                 rules: undefined,
                 ancestors: [],
             });
@@ -721,7 +751,17 @@ describe('actions/IOU/ReportWorkflow', () => {
             await waitForBatchedUpdates();
 
             // Hold one of the two expenses
-            putOnHold(heldTransaction.transactionID, 'hold reason', expenseReport.reportID, false, CARLOS_EMAIL, CARLOS_ACCOUNT_ID, undefined, false, undefined, {
+            putOnHold({
+                transactionID: heldTransaction.transactionID,
+                transaction: heldTransaction,
+                comment: 'hold reason',
+                initialReportID: expenseReport.reportID,
+                isOffline: false,
+                currentUserLogin: CARLOS_EMAIL,
+                currentUserAccountID: CARLOS_ACCOUNT_ID,
+                transactionViolations: undefined,
+                isTrackIntentUser: false,
+                delegateAccountID: undefined,
                 rules: undefined,
                 ancestors: [],
             });
diff --git a/tests/actions/IOUTest/SplitTest.ts b/tests/actions/IOUTest/SplitTest.ts
index 2a78c91f74f7..dc171db60ef0 100644
--- a/tests/actions/IOUTest/SplitTest.ts
+++ b/tests/actions/IOUTest/SplitTest.ts
@@ -4496,7 +4496,7 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => {
 
         // Then navigation should go to the expense report since it still exists
 
-        expect(Navigation.dismissModalWithReport).toHaveBeenCalledWith({reportID: expenseReport.reportID});
+        expect(Navigation.dismissModalWithReport).toHaveBeenCalledWith({reportID: expenseReport.reportID}, expect.anything(), {forceReplace: false});
     });
 });
 
@@ -5171,7 +5171,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => {
 
         // Put the expense on hold
         if (originalTransactionID && transactionThreadReportID) {
-            putOnHold(originalTransactionID, 'Test hold reason', transactionThreadReportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {
+            const originalTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`);
+            putOnHold({
+                transactionID: originalTransactionID,
+                transaction: originalTransaction,
+                comment: 'Test hold reason',
+                initialReportID: transactionThreadReportID,
+                isOffline: false,
+                currentUserLogin: RORY_EMAIL,
+                currentUserAccountID: RORY_ACCOUNT_ID,
+                transactionViolations: undefined,
+                isTrackIntentUser: false,
+                delegateAccountID: undefined,
                 rules: undefined,
                 ancestors: [],
             });
@@ -6116,7 +6127,22 @@ describe('updateSplitTransactions', () => {
         // Put the original transaction on hold before splitting it.
         const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`];
         const ancestors = getAncestors(transactionThreadReport, allReports, {}, allReportActions);
-        putOnHold(originalTransactionID, 'Test hold reason', transactionThreadReportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined, ancestors});
+        const originalTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`);
+
+        putOnHold({
+            transactionID: originalTransactionID,
+            transaction: originalTransaction,
+            comment: 'Test hold reason',
+            initialReportID: transactionThreadReportID,
+            isOffline: false,
+            currentUserLogin: RORY_EMAIL,
+            currentUserAccountID: RORY_ACCOUNT_ID,
+            transactionViolations: undefined,
+            isTrackIntentUser: false,
+            delegateAccountID: undefined,
+            rules: undefined,
+            ancestors,
+        });
         await waitForBatchedUpdates();
 
         const iouAction = getIOUActionForReportID(expenseReport?.reportID, originalTransactionID);
@@ -6291,7 +6317,22 @@ describe('updateSplitTransactions', () => {
         // Put the split transaction 1 on hold before reverting it
         const {allReports: allReports2, allReportActions: allReportActions2} = await getCollections();
         const ancestors2 = getAncestors(split1ThreadReport, allReports2, {}, allReportActions2);
-        putOnHold(splitTransactionID1, 'Test hold reason', split1ThreadReportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, undefined, false, undefined, {rules: undefined, ancestors: ancestors2});
+        const originalTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${splitTransactionID1}`);
+
+        putOnHold({
+            transactionID: splitTransactionID1,
+            transaction: originalTransaction,
+            comment: 'Test hold reason',
+            initialReportID: split1ThreadReportID,
+            isOffline: false,
+            currentUserLogin: RORY_EMAIL,
+            currentUserAccountID: RORY_ACCOUNT_ID,
+            transactionViolations: undefined,
+            isTrackIntentUser: false,
+            delegateAccountID: undefined,
+            rules: undefined,
+            ancestors: ancestors2,
+        });
         await waitForBatchedUpdates();
 
         const iouAction = getIOUActionForReportID(expenseReport?.reportID, splitTransactionID1);
@@ -10068,7 +10109,7 @@ describe('createDistanceRequest', () => {
         expect(result.transactionID).toBeTruthy();
     });
 
-    it('flags the created transaction for Search highlight on a global-create distance request', async () => {
+    it('flags the created transaction for the "Expense added" growl on a global-create distance request', async () => {
         const recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? [];
 
         const result = createDistanceRequest({
@@ -10078,8 +10119,8 @@ describe('createDistanceRequest', () => {
 
         await waitForBatchedUpdates();
 
-        const highlight = await getOnyxValue(ONYXKEYS.TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE);
-        expect(Object.keys(highlight?.[CONST.SEARCH.DATA_TYPES.EXPENSE] ?? {})).toContain(result.transactionID);
+        const growlSignal = await getOnyxValue(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS);
+        expect(growlSignal?.[result.transactionID]).toBe(CONST.SEARCH.DATA_TYPES.EXPENSE);
     });
 
     it('flags the new transaction for the 1→2 highlight fallback when added to an expense report that already has one transaction', async () => {
diff --git a/tests/actions/IOUTest/TrackExpenseTest.ts b/tests/actions/IOUTest/TrackExpenseTest.ts
index 183482f1cf6b..2f622f819bf2 100644
--- a/tests/actions/IOUTest/TrackExpenseTest.ts
+++ b/tests/actions/IOUTest/TrackExpenseTest.ts
@@ -2547,6 +2547,7 @@ describe('actions/IOU/TrackExpense', () => {
                 isChatReportArchived: false,
                 currentUserAccountID: RORY_ACCOUNT_ID,
                 transactionThreadReportActions: passedThreadReportActions,
+                transactionThread: thread,
             });
             await waitForBatchedUpdates();
 
@@ -2619,6 +2620,7 @@ describe('actions/IOU/TrackExpense', () => {
                 isChatReportArchived: false,
                 currentUserAccountID: RORY_ACCOUNT_ID,
                 transactionThreadReportActions: undefined,
+                transactionThread: undefined,
                 isMovingTransactionFromTrackExpense: true,
             });
             await waitForBatchedUpdates();
diff --git a/tests/actions/MergeTransactionTest.ts b/tests/actions/MergeTransactionTest.ts
index 42c41ae9c58c..ad7ae04714a8 100644
--- a/tests/actions/MergeTransactionTest.ts
+++ b/tests/actions/MergeTransactionTest.ts
@@ -77,6 +77,7 @@ type CrossReportMergeToSourceReportFixtures = {
     mergeTransaction: MergeTransactionType;
     mergeTransactionID: string;
     sourceExpenseReport: Report;
+    sourceChatReport: Report;
     targetReport: Report;
     sourceIOUAction: ReportAction;
     sourceIOUActionID: string;
@@ -96,9 +97,12 @@ async function setupCrossReportMergeToSourceReportFixtures(): Promise<CrossRepor
         category: 'Original Category',
         reportID: 'target-report-456',
     };
+    const sourceChatReport = {...createRandomReport(5, undefined), reportID: 'source-chat-report-123'};
+
     const sourceExpenseReport = {
         ...createExpenseReport(1),
         reportID: 'source-report-123',
+        chatReportID: sourceChatReport.reportID,
     };
     const targetReport = {
         ...createExpenseReport(1),
@@ -166,19 +170,20 @@ async function setupCrossReportMergeToSourceReportFixtures(): Promise<CrossRepor
     await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${targetTransaction.transactionID}`, targetTransaction);
     await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${sourceTransaction.transactionID}`, sourceTransaction);
     await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${sourceExpenseReport.reportID}`, sourceExpenseReport);
+    await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${sourceChatReport.reportID}`, sourceChatReport);
     await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${sourceExpenseReport.reportID}`, {[sourceIOUAction.reportActionID]: sourceIOUAction});
     await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${sourceTransactionThread.reportID}`, sourceTransactionThread);
     await Onyx.set(`${ONYXKEYS.COLLECTION.MERGE_TRANSACTION}${mergeTransactionID}`, mergeTransaction);
     await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${targetReport.reportID}`, targetReport);
     await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetReport.reportID}`, {[targetIOUAction.reportActionID]: targetIOUAction});
     await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${targetTransactionThread.reportID}`, targetTransactionThread);
-
     return {
         targetTransaction,
         sourceTransaction,
         mergeTransaction,
         mergeTransactionID,
         sourceExpenseReport,
+        sourceChatReport,
         targetReport,
         sourceIOUAction,
         sourceIOUActionID,
@@ -190,7 +195,7 @@ async function setupCrossReportMergeToSourceReportFixtures(): Promise<CrossRepor
 }
 
 function runCrossReportMergeToSourceReportRequest(fixtures: CrossReportMergeToSourceReportFixtures) {
-    const {mergeTransactionID, mergeTransaction, targetTransaction, sourceTransaction, mockViolations, targetReport, sourceIOUAction} = fixtures;
+    const {mergeTransactionID, mergeTransaction, targetTransaction, sourceTransaction, mockViolations, targetReport, sourceIOUAction, sourceExpenseReport, sourceChatReport} = fixtures;
 
     mergeTransactionRequest({
         isVendorMatchingBetaEnabled: false,
@@ -216,6 +221,8 @@ function runCrossReportMergeToSourceReportRequest(fixtures: CrossReportMergeToSo
         isTrackIntentUser: false,
         sourceTransactionThreadReportActions: undefined,
         sourceIOUAction,
+        sourceActionIOUReport: sourceExpenseReport,
+        sourceActionChatReport: sourceChatReport,
         getCurrencyDecimals: getCurrencyDecimalsLocal,
         getCurrencySymbol: getCurrencySymbolLocal,
         rules: undefined,
@@ -340,6 +347,8 @@ describe('mergeTransactionRequest', () => {
             isTrackIntentUser: false,
             sourceTransactionThreadReportActions: undefined,
             sourceIOUAction: undefined,
+            sourceActionIOUReport: undefined,
+            sourceActionChatReport: undefined,
             getCurrencyDecimals: getCurrencyDecimalsLocal,
             getCurrencySymbol: getCurrencySymbolLocal,
             rules: undefined,
@@ -465,6 +474,8 @@ describe('mergeTransactionRequest', () => {
             isTrackIntentUser: false,
             sourceTransactionThreadReportActions: undefined,
             sourceIOUAction: undefined,
+            sourceActionIOUReport: undefined,
+            sourceActionChatReport: undefined,
             getCurrencyDecimals: getCurrencyDecimalsLocal,
             getCurrencySymbol: getCurrencySymbolLocal,
             rules: undefined,
@@ -573,6 +584,8 @@ describe('mergeTransactionRequest', () => {
             isTrackIntentUser: false,
             sourceTransactionThreadReportActions: undefined,
             sourceIOUAction: undefined,
+            sourceActionIOUReport: undefined,
+            sourceActionChatReport: undefined,
             getCurrencyDecimals: getCurrencyDecimalsLocal,
             getCurrencySymbol: getCurrencySymbolLocal,
             rules: undefined,
@@ -731,6 +744,8 @@ describe('mergeTransactionRequest', () => {
             isTrackIntentUser: false,
             sourceTransactionThreadReportActions: undefined,
             sourceIOUAction: undefined,
+            sourceActionIOUReport: undefined,
+            sourceActionChatReport: undefined,
             getCurrencyDecimals: getCurrencyDecimalsLocal,
             getCurrencySymbol: getCurrencySymbolLocal,
             rules: undefined,
@@ -844,6 +859,8 @@ describe('mergeTransactionRequest', () => {
             isTrackIntentUser: false,
             sourceTransactionThreadReportActions: undefined,
             sourceIOUAction: undefined,
+            sourceActionIOUReport: undefined,
+            sourceActionChatReport: undefined,
             getCurrencyDecimals: getCurrencyDecimalsLocal,
             getCurrencySymbol: getCurrencySymbolLocal,
             rules: undefined,
@@ -1080,6 +1097,8 @@ describe('mergeTransactionRequest', () => {
                 isTrackIntentUser: false,
                 sourceTransactionThreadReportActions: undefined,
                 sourceIOUAction: undefined,
+                sourceActionIOUReport: undefined,
+                sourceActionChatReport: undefined,
                 getCurrencyDecimals: getCurrencyDecimalsLocal,
                 getCurrencySymbol: getCurrencySymbolLocal,
                 rules: undefined,
@@ -1273,7 +1292,7 @@ describe('mergeTransactionRequest', () => {
                 mergeTransaction,
                 targetTransaction,
                 sourceTransaction,
-                sourceIOUActionThreadReport: undefined,
+                sourceIOUActionThreadReport: thread,
                 targetTransactionThreadReport: {reportID: 'target-report-456'},
                 targetTransactionThreadParentReport: undefined,
                 reportPolicyTags: undefined,
@@ -1290,6 +1309,8 @@ describe('mergeTransactionRequest', () => {
                 isTrackIntentUser: false,
                 sourceTransactionThreadReportActions: undefined,
                 sourceIOUAction,
+                sourceActionIOUReport: sourceReport,
+                sourceActionChatReport: chatReport,
                 getCurrencyDecimals: getCurrencyDecimalsLocal,
                 getCurrencySymbol: getCurrencySymbolLocal,
                 rules: undefined,
@@ -1432,7 +1453,7 @@ describe('mergeTransactionRequest', () => {
                 mergeTransaction,
                 targetTransaction,
                 sourceTransaction,
-                sourceIOUActionThreadReport: undefined,
+                sourceIOUActionThreadReport: thread,
                 targetTransactionThreadReport: {reportID: 'target-report-456'},
                 targetTransactionThreadParentReport: undefined,
                 reportPolicyTags: undefined,
@@ -1449,6 +1470,8 @@ describe('mergeTransactionRequest', () => {
                 isTrackIntentUser: false,
                 sourceTransactionThreadReportActions: undefined,
                 sourceIOUAction: undefined,
+                sourceActionIOUReport: undefined,
+                sourceActionChatReport: undefined,
                 getCurrencyDecimals: getCurrencyDecimalsLocal,
                 getCurrencySymbol: getCurrencySymbolLocal,
                 rules: undefined,
@@ -1584,6 +1607,8 @@ describe('mergeTransactionRequest', () => {
                 isTrackIntentUser: false,
                 sourceTransactionThreadReportActions,
                 sourceIOUAction: undefined,
+                sourceActionIOUReport: undefined,
+                sourceActionChatReport: undefined,
                 getCurrencyDecimals: getCurrencyDecimalsLocal,
                 getCurrencySymbol: getCurrencySymbolLocal,
                 rules: undefined,
@@ -1729,6 +1754,8 @@ describe('mergeTransactionRequest', () => {
                 isTrackIntentUser: false,
                 sourceTransactionThreadReportActions,
                 sourceIOUAction,
+                sourceActionIOUReport: sourceExpenseReport,
+                sourceActionChatReport: undefined,
                 getCurrencyDecimals: getCurrencyDecimalsLocal,
                 getCurrencySymbol: getCurrencySymbolLocal,
                 rules: undefined,
diff --git a/tests/actions/PersonalDetailsTest.ts b/tests/actions/PersonalDetailsTest.ts
index 56461e9f43a5..8ee203e9c1d2 100644
--- a/tests/actions/PersonalDetailsTest.ts
+++ b/tests/actions/PersonalDetailsTest.ts
@@ -50,6 +50,54 @@ describe('actions/PersonalDetails', () => {
         jest.restoreAllMocks();
     });
 
+    describe('setPersonalDetailsAndRevealExpensifyCard', () => {
+        const personalDetails = {
+            legalFirstName: 'Test',
+            legalLastName: 'User',
+            phoneNumber: '+15005550006',
+            addressCity: 'San Francisco',
+            addressStreet: '123 Main St',
+            addressStreet2: '',
+            addressZip: '94105',
+            addressCountry: 'US',
+            dob: '1990-01-01',
+            addressState: 'CA',
+            addressProvince: '',
+        };
+
+        it.each([
+            [CONST.JSON_CODE.TOO_MANY_REQUESTS, 'validateCodeForm.error.tooManyAttempts'],
+            [CONST.JSON_CODE.INCORRECT_VALIDATE_CODE, 'validateCodeForm.error.incorrectSecurityCode'],
+            [CONST.HTTP_STATUS.INTERNAL_SERVER_ERROR, 'cardPage.unexpectedError'],
+            [CONST.HTTP_STATUS.UNAUTHORIZED, 'cardPage.cardDetailsLoadingFailure'],
+        ])('maps response %s to %s', async (jsonCode, translationKey) => {
+            mockAPI.makeRequestWithSideEffects.mockResolvedValue({jsonCode});
+
+            await expect(PersonalDetailsActions.setPersonalDetailsAndRevealExpensifyCard(personalDetails, 123, '123456')).rejects.toBe(translationKey);
+            expect(mockAPI.makeRequestWithSideEffects).toHaveBeenCalledTimes(1);
+        });
+
+        it('returns card details after a successful reveal', async () => {
+            const cardDetails = {
+                pan: '4111111111111111',
+                expiration: '12/30',
+                cvv: '123',
+            };
+            mockAPI.makeRequestWithSideEffects.mockResolvedValue({
+                jsonCode: CONST.JSON_CODE.SUCCESS,
+                ...cardDetails,
+            });
+
+            await expect(PersonalDetailsActions.setPersonalDetailsAndRevealExpensifyCard(personalDetails, 123, '123456')).resolves.toEqual(cardDetails);
+        });
+
+        it('preserves the connection error for failed requests', async () => {
+            mockAPI.makeRequestWithSideEffects.mockRejectedValue(new Error('Network error'));
+
+            await expect(PersonalDetailsActions.setPersonalDetailsAndRevealExpensifyCard(personalDetails, 123, '123456')).rejects.toBe('cardPage.cardDetailsLoadingFailure');
+        });
+    });
+
     describe('updateAddress', () => {
         it('should call API.write with correct parameters and optimistic data for US addresses and navigate back', async () => {
             const addresses: Address[] = [
diff --git a/tests/actions/PolicyCategoryTest.ts b/tests/actions/PolicyCategoryTest.ts
index 5ad6d2569e9d..2587abc3d0f8 100644
--- a/tests/actions/PolicyCategoryTest.ts
+++ b/tests/actions/PolicyCategoryTest.ts
@@ -15,11 +15,19 @@ import {
     setWorkspaceCategoryEnabled,
     setWorkspaceRequiresCategory,
 } from '@libs/actions/Policy/Category';
+import {
+    buildOptimisticMccGroup,
+    buildOptimisticPolicyCategories,
+    buildOptimisticPolicyWithExistingCategories,
+    DEFAULT_MCC_GROUP,
+    isDefaultMccGroupID,
+} from '@libs/actions/Policy/OptimisticPolicyCategoriesAndMccGroups';
+import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
 
 import CONST from '@src/CONST';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, PolicyCategory} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyCategory} from '@src/types/onyx';
 
 import Onyx from 'react-native-onyx';
 import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
@@ -699,6 +707,77 @@ describe('actions/PolicyCategory', () => {
 
             expect(importFinalModal.promptKey).toStrictEqual('spreadsheet.importCategoriesNoneAddedOrUpdated');
         });
+
+        it('Sends payroll code and category rule fields to the API', async () => {
+            // Given a category import that maps every Classic category column
+            const fakePolicy = createRandomPolicy(0);
+            const categoriesToImport: PolicyCategory[] = [
+                {
+                    name: 'Travel',
+                    enabled: true,
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    'GL Code': '6000',
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    'Payroll Code': 'P100',
+                    areCommentsRequired: true,
+                    commentHint: 'Add the trip purpose',
+                    expenseLimitType: CONST.POLICY.EXPENSE_LIMIT_TYPES.DAILY,
+                    maxExpenseAmount: 5000,
+                },
+            ];
+
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            await waitForBatchedUpdates();
+
+            // When the categories are imported
+            await importPolicyCategories(fakePolicy.id, categoriesToImport);
+
+            // Then the new fields are passed through to the backend instead of being dropped from the payload
+            TestHelper.expectAPICommandToHaveBeenCalledWith(SIDE_EFFECT_REQUEST_COMMANDS.IMPORT_CATEGORIES_SPREADSHEET, 0, {
+                policyID: fakePolicy.id,
+                categories: JSON.stringify([
+                    {
+                        name: 'Travel',
+                        enabled: true,
+                        // eslint-disable-next-line @typescript-eslint/naming-convention
+                        'GL Code': '6000',
+                        // eslint-disable-next-line @typescript-eslint/naming-convention
+                        'Payroll Code': 'P100',
+                        areCommentsRequired: true,
+                        commentHint: 'Add the trip purpose',
+                        expenseLimitType: CONST.POLICY.EXPENSE_LIMIT_TYPES.DAILY,
+                        maxExpenseAmount: 5000,
+                    },
+                ]),
+            });
+        });
+
+        it('Counts a category as updated when only its payroll code or description hint changes', async () => {
+            // Given existing categories whose GL code and enabled state will not change
+            const fakePolicy = createRandomPolicy(0);
+            const existingCategories = {
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                Travel: {name: 'Travel', enabled: true, 'GL Code': '6000', 'Payroll Code': 'P100'},
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                Meals: {name: 'Meals', enabled: true, 'GL Code': '6001', commentHint: 'Old hint'},
+            };
+            const categoriesToImport: PolicyCategory[] = [
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                {name: 'Travel', enabled: true, 'GL Code': '6000', 'Payroll Code': 'P200'},
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                {name: 'Meals', enabled: true, 'GL Code': '6001', commentHint: 'New hint'},
+            ];
+
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            await waitForBatchedUpdates();
+
+            // When the categories are imported
+            const importFinalModal = await importPolicyCategories(fakePolicy.id, categoriesToImport, existingCategories);
+
+            // Then both categories are reported as updated in the confirmation modal
+            expect(importFinalModal.promptKey).toBe('spreadsheet.importCategoriesUpdated');
+            expect(importFinalModal.promptKeyParams).toStrictEqual({count: 2});
+        });
     });
 
     describe('setPolicyCategoryReceiptsAndItemizedReceiptRequired', () => {
@@ -848,4 +927,131 @@ describe('actions/PolicyCategory', () => {
             });
         });
     });
+
+    describe('OptimisticPolicyCategoriesAndMccGroups', () => {
+        it('buildOptimisticPolicyCategories adds each category, clears the draft and clears the pending action on success', () => {
+            const policyID = 'policy1';
+
+            const onyxData = buildOptimisticPolicyCategories(policyID, ['Advertising', 'Benefits']);
+
+            expect(onyxData.optimisticData).toStrictEqual([
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}policy1`,
+                    value: {
+                        Advertising: {name: 'Advertising', enabled: true, errors: null, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+                        Benefits: {name: 'Benefits', enabled: true, errors: null, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}policy1`,
+                    value: null,
+                },
+            ]);
+
+            expect(onyxData.successData).toStrictEqual([
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}policy1`,
+                    value: {
+                        Advertising: {errors: null, pendingAction: null},
+                        Benefits: {errors: null, pendingAction: null},
+                    },
+                },
+            ]);
+
+            const failureUpdate = onyxData.failureData?.[0];
+            expect(onyxData.failureData).toHaveLength(1);
+            expect(failureUpdate?.onyxMethod).toBe(Onyx.METHOD.MERGE);
+            expect(failureUpdate?.key).toBe(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}policy1`);
+
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- MERGE value is a partial policy categories patch
+            const failureCategories = failureUpdate && 'value' in failureUpdate ? (failureUpdate.value as PolicyCategories) : undefined;
+            expect(Object.keys(failureCategories ?? {})).toStrictEqual(['Advertising', 'Benefits']);
+            expect(Object.keys(failureCategories?.Advertising?.errors ?? {})).toHaveLength(1);
+            expect(Object.keys(failureCategories?.Benefits?.errors ?? {})).toHaveLength(1);
+        });
+
+        it('buildOptimisticPolicyWithExistingCategories keeps every category field and skips the ones pending delete', () => {
+            const policyID = 'policy2';
+            const categories: PolicyCategories = {
+                Advertising: {name: 'Advertising', enabled: true, areCommentsRequired: true},
+                Travel: {name: 'Travel', enabled: true, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
+            };
+
+            const onyxData = buildOptimisticPolicyWithExistingCategories(policyID, categories);
+
+            expect(onyxData.optimisticData).toStrictEqual([
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}policy2`,
+                    value: {
+                        Advertising: {name: 'Advertising', enabled: true, areCommentsRequired: true, errors: null, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}policy2`,
+                    value: null,
+                },
+            ]);
+
+            expect(onyxData.successData).toStrictEqual([
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}policy2`,
+                    value: {
+                        Advertising: {errors: null, pendingAction: null},
+                        Travel: {errors: null, pendingAction: null},
+                    },
+                },
+            ]);
+
+            const failureUpdate = onyxData.failureData?.[0];
+            expect(onyxData.failureData).toHaveLength(1);
+            expect(failureUpdate?.onyxMethod).toBe(Onyx.METHOD.MERGE);
+            expect(failureUpdate?.key).toBe(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}policy2`);
+
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- MERGE value is a partial policy categories patch
+            const failureCategories = failureUpdate && 'value' in failureUpdate ? (failureUpdate.value as PolicyCategories) : undefined;
+            expect(Object.keys(failureCategories ?? {})).toStrictEqual(['Advertising', 'Travel']);
+            expect(Object.keys(failureCategories?.Advertising?.errors ?? {})).toHaveLength(1);
+            expect(Object.keys(failureCategories?.Travel?.errors ?? {})).toHaveLength(1);
+        });
+
+        it('DEFAULT_MCC_GROUP mirrors the default MCC groups with a pending add action', () => {
+            for (const [groupID, definition] of Object.entries(CONST.POLICY.DEFAULT_MCC_GROUPS)) {
+                expect(DEFAULT_MCC_GROUP[groupID]).toStrictEqual({...definition, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
+            }
+        });
+
+        it('buildOptimisticMccGroup returns copies of the default groups so callers cannot mutate the shared constant', () => {
+            const mccGroupData = buildOptimisticMccGroup();
+
+            expect(Object.keys(mccGroupData.optimisticData.mccGroup)).toStrictEqual(Object.keys(DEFAULT_MCC_GROUP));
+
+            for (const groupID of Object.keys(DEFAULT_MCC_GROUP)) {
+                expect(mccGroupData.optimisticData.mccGroup[groupID]).toStrictEqual(DEFAULT_MCC_GROUP[groupID]);
+                expect(mccGroupData.optimisticData.mccGroup[groupID]).not.toBe(DEFAULT_MCC_GROUP[groupID]);
+            }
+
+            expect(mccGroupData.successData.mccGroup).toStrictEqual(Object.fromEntries(Object.keys(DEFAULT_MCC_GROUP).map((groupID) => [groupID, {pendingAction: null}])));
+            expect(mccGroupData.failureData).toStrictEqual({mccGroup: null});
+        });
+
+        it('isDefaultMccGroupID only accepts IDs present in the default MCC groups', () => {
+            // Given the default MCC group IDs from CONST
+            for (const groupID of Object.keys(CONST.POLICY.DEFAULT_MCC_GROUPS)) {
+                // When the ID is checked
+                // Then it is recognized as a default group ID
+                expect(isDefaultMccGroupID(groupID)).toBe(true);
+            }
+
+            // Given an ID that is not a default MCC group
+            // When it is checked
+            // Then it is rejected
+            expect(isDefaultMccGroupID('notAMccGroupID')).toBe(false);
+        });
+    });
 });
diff --git a/tests/actions/PolicyRulesTest.ts b/tests/actions/PolicyRulesTest.ts
index 7e0ab4552a10..2f9fc87051ea 100644
--- a/tests/actions/PolicyRulesTest.ts
+++ b/tests/actions/PolicyRulesTest.ts
@@ -1,14 +1,26 @@
 import OnyxUpdateManager from '@libs/actions/OnyxUpdateManager';
-import {addPolicyAgentRule, clearPolicyAgentRuleErrors, clearPolicyCodingRuleErrors, deletePolicyAgentRule, updatePolicyAgentRule} from '@libs/actions/Policy/Rules';
+import {
+    addPolicyAgentRule,
+    clearMerchantRuleErrors,
+    clearPolicyAgentRuleErrors,
+    deleteMerchantRule,
+    deletePolicyAgentRule,
+    setMerchantRule,
+    updatePolicyAgentRule,
+} from '@libs/actions/Policy/Rules';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import {flush as flushSequentialQueue} from '@libs/Network/SequentialQueue';
+import {toIndexMap} from '@libs/RuleUtils';
 
 import {getAll as getAllPersistedRequests, getOngoingRequest as getOngoingPersistedRequest, save as savePersistedRequest} from '@userActions/PersistedRequests';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy} from '@src/types/onyx';
-import type {AgentRule, CodingRule} from '@src/types/onyx/Policy';
+import type {Policy, Rule} from '@src/types/onyx';
+import type {ExpenseDefaultAction} from '@src/types/onyx/ExpenseDefaultRules';
+import type {AgentRule} from '@src/types/onyx/Policy';
+
+import type {OnyxCollection} from 'react-native-onyx';
 
 import Onyx from 'react-native-onyx';
 
@@ -34,6 +46,29 @@ function getPolicy(policyID: string): Promise<Policy | undefined> {
     });
 }
 
+async function getRules(): Promise<OnyxCollection<Rule>> {
+    let collection: OnyxCollection<Rule> = {};
+    await TestHelper.getOnyxData({
+        key: ONYXKEYS.COLLECTION.RULE,
+        callback: (value) => {
+            collection = value ?? {};
+        },
+    });
+    return collection;
+}
+
+/** A minimal merchant rule as stored in the rules collection. */
+function buildMerchantRuleForPolicy(policyID: string): Rule {
+    return {
+        scope: CONST.RULES.SCOPE.POLICY,
+        scopeID: policyID,
+        priority: CONST.RULES.EXPENSE_DEFAULT.PRIORITY,
+        triggers: toIndexMap([CONST.RULES.TRIGGERS.CREATE_TRANSACTION]),
+        filters: {left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'},
+        actions: toIndexMap([{name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.CATEGORY, value: 'Coffee'}]),
+    };
+}
+
 describe('actions/PolicyRules', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
@@ -427,60 +462,122 @@ describe('actions/PolicyRules', () => {
         });
     });
 
-    describe('clearPolicyCodingRuleErrors', () => {
-        it('removes the coding rule entirely when its pendingAction was ADD', async () => {
+    describe('setMerchantRule', () => {
+        it('writes the rule under its own key, scoped to the policy', async () => {
             const fakePolicy = createRandomPolicy(0);
-            const ruleID = 'codingRule1';
-            const rule: CodingRule = {
-                ruleID,
-                filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'},
+            mockFetch?.pause?.();
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+
+            setMerchantRule(fakePolicy.id, {merchantToMatch: 'Starbucks', matchType: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, category: 'Coffee'}, fakePolicy);
+            await waitForBatchedUpdates();
+
+            const rules = await getRules();
+            const [ruleKey, rule] = Object.entries(rules ?? {}).at(0) ?? [];
+            expect(ruleKey?.startsWith(ONYXKEYS.COLLECTION.RULE)).toBe(true);
+            expect(rule).toMatchObject({
+                scope: CONST.RULES.SCOPE.POLICY,
+                scopeID: fakePolicy.id,
+                priority: CONST.RULES.EXPENSE_DEFAULT.PRIORITY,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                errors: {[ERROR_KEY]: 'boom'},
-            };
-            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, {
-                ...fakePolicy,
-                rules: {codingRules: {[ruleID]: rule}},
+                triggers: toIndexMap([CONST.RULES.TRIGGERS.CREATE_TRANSACTION]),
+                filters: {left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'},
+                actions: toIndexMap([{name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.CATEGORY, value: 'Coffee'}]),
             });
 
-            clearPolicyCodingRuleErrors(fakePolicy.id, ruleID, rule);
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+
+            const savedRule = Object.values((await getRules()) ?? {}).at(0);
+            expect(savedRule?.pendingAction).toBeFalsy();
+        });
+
+        it('drops an action for a field the edit cleared, rather than merging it with the previous value', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const ruleID = 'merchantRule1';
+            mockFetch?.pause?.();
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+
+            setMerchantRule(fakePolicy.id, {merchantToMatch: 'Starbucks', category: 'Coffee', tag: 'Team A'}, fakePolicy, ruleID);
             await waitForBatchedUpdates();
 
-            const policy = await getPolicy(fakePolicy.id);
-            expect(policy?.rules?.codingRules?.[ruleID]).toBeFalsy();
+            const existingRule = (await getRules())?.[`${ONYXKEYS.COLLECTION.RULE}${ruleID}`];
+            setMerchantRule(fakePolicy.id, {merchantToMatch: 'Starbucks', category: 'Coffee'}, fakePolicy, ruleID, existingRule);
+            await waitForBatchedUpdates();
+
+            const updatedRule = (await getRules())?.[`${ONYXKEYS.COLLECTION.RULE}${ruleID}`];
+            const updatedActions: ExpenseDefaultAction[] = Object.values(updatedRule?.actions ?? {}).filter((action): action is ExpenseDefaultAction => 'field' in action);
+            const fields = updatedActions.map((action) => action.field);
+            expect(fields).toEqual([CONST.RULES.EXPENSE_DEFAULT.FIELD.CATEGORY]);
+            expect(updatedRule?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
         });
 
-        it('clears only the errors when the coding rule has a non-ADD pending action', async () => {
+        it('does nothing when the form has no merchant to match', async () => {
             const fakePolicy = createRandomPolicy(0);
-            const ruleID = 'codingRule1';
-            const rule: CodingRule = {
-                ruleID,
-                filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'},
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+
+            setMerchantRule(fakePolicy.id, {merchantToMatch: '', category: 'Coffee'}, fakePolicy);
+            await waitForBatchedUpdates();
+
+            expect(Object.keys((await getRules()) ?? {})).toHaveLength(0);
+        });
+    });
+
+    describe('deleteMerchantRule', () => {
+        it('marks the rule as pending delete', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const ruleID = 'merchantRule1';
+            const rule = buildMerchantRuleForPolicy(fakePolicy.id);
+            mockFetch?.pause?.();
+            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}${ruleID}`, rule);
+
+            deleteMerchantRule(fakePolicy.id, ruleID, rule);
+            await waitForBatchedUpdates();
+
+            expect((await getRules())?.[`${ONYXKEYS.COLLECTION.RULE}${ruleID}`]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+        });
+    });
+
+    describe('clearMerchantRuleErrors', () => {
+        it('removes the rule entirely when its pendingAction was ADD', async () => {
+            const ruleID = 'merchantRule1';
+            const rule: Rule = {
+                ...buildMerchantRuleForPolicy('policy1'),
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                errors: {[ERROR_KEY]: 'boom'},
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}${ruleID}`, rule);
+
+            clearMerchantRuleErrors(ruleID, rule);
+            await waitForBatchedUpdates();
+
+            expect((await getRules())?.[`${ONYXKEYS.COLLECTION.RULE}${ruleID}`]).toBeFalsy();
+        });
+
+        it('clears only the errors when the rule has a non-ADD pending action', async () => {
+            const ruleID = 'merchantRule1';
+            const rule: Rule = {
+                ...buildMerchantRuleForPolicy('policy1'),
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                 errors: {[ERROR_KEY]: 'boom'},
             };
-            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, {
-                ...fakePolicy,
-                rules: {codingRules: {[ruleID]: rule}},
-            });
+            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}${ruleID}`, rule);
 
-            clearPolicyCodingRuleErrors(fakePolicy.id, ruleID, rule);
+            clearMerchantRuleErrors(ruleID, rule);
             await waitForBatchedUpdates();
 
-            const policy = await getPolicy(fakePolicy.id);
-            const cleared = policy?.rules?.codingRules?.[ruleID];
+            const cleared = (await getRules())?.[`${ONYXKEYS.COLLECTION.RULE}${ruleID}`];
             expect(cleared?.errors).toBeFalsy();
             expect(cleared?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
         });
 
         it('does nothing when no rule is passed', async () => {
-            const fakePolicy = createRandomPolicy(0);
-            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
-
-            clearPolicyCodingRuleErrors(fakePolicy.id, 'missing', undefined);
+            clearMerchantRuleErrors('missing', undefined);
             await waitForBatchedUpdates();
 
-            const policy = await getPolicy(fakePolicy.id);
-            expect(policy?.rules?.codingRules).toBeFalsy();
+            expect(Object.keys((await getRules()) ?? {})).toHaveLength(0);
         });
     });
 });
diff --git a/tests/actions/PolicyTaxTest.ts b/tests/actions/PolicyTaxTest.ts
index e2b7cbf50799..737fe3a2be21 100644
--- a/tests/actions/PolicyTaxTest.ts
+++ b/tests/actions/PolicyTaxTest.ts
@@ -5,12 +5,14 @@ import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
 import * as Policy from '@src/libs/actions/Policy/Policy';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy as PolicyType, TaxRate} from '@src/types/onyx';
+import type {ExpenseRule} from '@src/types/onyx/Policy';
 
 import Onyx from 'react-native-onyx';
 
 import type {MockFetch} from '../utils/TestHelper';
 
 import createRandomPolicy from '../utils/collections/policies';
+import getOnyxValue from '../utils/getOnyxValue';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
@@ -826,6 +828,9 @@ describe('actions/PolicyTax', () => {
         const newTaxCode = 'id_TAX_RATE_2';
         const oldTaxRateName = fakePolicy?.taxRates?.taxes[oldTaxCode]?.name;
 
+        // Release any request a test left paused, so it doesn't hold up the queue for the next test
+        afterEach(() => (mockFetch?.resume?.() as Promise<unknown>).then(waitForBatchedUpdates));
+
         it('Set policy`s tax code', () => {
             mockFetch?.pause?.();
             const distanceRateCustomUnit = fakePolicy?.customUnits?.[CONST.CUSTOM_UNITS.NAME_DISTANCE];
@@ -863,5 +868,58 @@ describe('actions/PolicyTax', () => {
                     }),
             );
         });
+
+        describe('expense rules', () => {
+            const buildRule = (categoryName: string, taxID: string): ExpenseRule => ({
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                tax: {field_id_TAX: {externalID: taxID}},
+                applyWhen: [{condition: CONST.POLICY.RULE_CONDITIONS.MATCHES, field: CONST.POLICY.FIELDS.CATEGORY, value: categoryName}],
+            });
+            const expenseRules = [buildRule('Travel', oldTaxCode), buildRule('Meals', 'id_TAX_EXEMPT')];
+
+            const renameTaxCode = () =>
+                setPolicyTaxCode(
+                    fakePolicy.id,
+                    oldTaxCode,
+                    newTaxCode,
+                    // @ts-expect-error - we can send undefined tax rate here for testing
+                    fakePolicy?.taxRates?.taxes[oldTaxCode],
+                    fakePolicy?.taxRates?.foreignTaxDefault,
+                    fakePolicy?.taxRates?.defaultExternalID,
+                    undefined,
+                    expenseRules,
+                );
+
+            beforeEach(() => Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, {rules: {expenseRules}}).then(waitForBatchedUpdates));
+
+            it('moves the rules that referenced the old tax code onto the new one', async () => {
+                // Given a category tax default rule on the old code and another on a different code, with the request held so only optimistic data applies
+                mockFetch?.pause?.();
+
+                // When the tax code is renamed
+                renameTaxCode();
+                await waitForBatchedUpdates();
+
+                // Then only the rule on the old code points at the new code, mirroring the back end, so its tax rate still resolves
+                const policy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`);
+                expect(policy?.rules?.expenseRules).toEqual([buildRule('Travel', newTaxCode), buildRule('Meals', 'id_TAX_EXEMPT')]);
+            });
+
+            it('restores the rules when the request fails', async () => {
+                // Given a tax code rename that has moved the rules onto the new code optimistically
+                mockFetch?.pause?.();
+                renameTaxCode();
+                await waitForBatchedUpdates();
+
+                // When the server rejects the rename
+                mockFetch?.fail?.();
+                await mockFetch?.resume?.();
+                await waitForBatchedUpdates();
+
+                // Then the rules point at the old code again, matching the tax rate that the failure data restores
+                const policy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`);
+                expect(policy?.rules?.expenseRules).toEqual(expenseRules);
+            });
+        });
     });
 });
diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
index adde28986ed0..242ed1cc80be 100644
--- a/tests/actions/PolicyTest.ts
+++ b/tests/actions/PolicyTest.ts
@@ -13,6 +13,7 @@ import * as Policy from '@src/libs/actions/Policy/Policy';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Onboarding, PolicyJoinMember, PolicyReportField, Policy as PolicyType, Report, ReportAction, ReportActions, Transaction, TransactionViolations} from '@src/types/onyx';
 import type {Participant, ReportNextStep} from '@src/types/onyx/Report';
+import type Rule from '@src/types/onyx/Rule';
 
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
@@ -59,6 +60,22 @@ function requireCallArgument(call: unknown, index: number): unknown {
 jest.mock('@libs/GoogleTagManager');
 
 OnyxUpdateManager();
+/** Build the index-keyed object shape the rules API uses for lists */
+function indexMap<T>(...values: T[]): Record<string, T> {
+    return Object.fromEntries(values.map((value, index) => [String(index + 1), value]));
+}
+
+async function getRulesCollection(): Promise<OnyxCollection<Rule>> {
+    let collection: OnyxCollection<Rule> = {};
+    await TestHelper.getOnyxData({
+        key: ONYXKEYS.COLLECTION.RULE,
+        callback: (value) => {
+            collection = value ?? {};
+        },
+    });
+    return collection;
+}
+
 describe('actions/Policy', () => {
     beforeAll(() => {
         Onyx.init({
@@ -625,8 +642,17 @@ describe('actions/Policy', () => {
                 address: {addressStreet: '1 Main Street', city: 'Paris', country: 'FR', state: '', zipCode: '75001'},
                 isTravelEnabled: true,
                 tax: {trackingEnabled: true},
-                rules: {codingRules: {rule1: {filters: {left: 'merchant', operator: 'eq', right: 'Acme'}, category: 'Travel'}}},
             };
+            const sourceRule: Rule = {
+                scope: CONST.RULES.SCOPE.POLICY,
+                scopeID: fakePolicy.id,
+                triggers: indexMap(CONST.RULES.TRIGGERS.CREATE_TRANSACTION),
+                filters: {left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Acme'},
+                actions: indexMap({name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.CATEGORY, value: 'Travel'}),
+            };
+            // The copies are optimistic only - they are dropped once the server responds with its own rule IDs,
+            // so the request stays paused while they are asserted.
+            mockFetch?.pause?.();
             await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
             await waitForBatchedUpdates();
 
@@ -657,6 +683,7 @@ describe('actions/Policy', () => {
                     codingRules: true,
                 },
                 localCurrency: 'USD',
+                rules: {[`${ONYXKEYS.COLLECTION.RULE}sourceRule`]: sourceRule},
             };
 
             Policy.duplicateWorkspace(fakePolicy, options);
@@ -676,7 +703,22 @@ describe('actions/Policy', () => {
             expect(policy?.address).toEqual(fakePolicy.address);
             expect(policy?.isTravelEnabled).toBe(true);
             expect(policy?.tax).toEqual(fakePolicy.tax);
-            expect(policy?.rules).toEqual({codingRules: fakePolicy.rules?.codingRules});
+
+            // Merchant rules are copied into the rules collection as new rules scoped to the duplicate,
+            // rather than onto the duplicated policy object.
+            const duplicatedRules = Object.values((await getRulesCollection()) ?? {}).filter((rule) => rule?.scopeID === policyID);
+            expect(duplicatedRules).toHaveLength(1);
+            expect(duplicatedRules.at(0)).toMatchObject({
+                scope: CONST.RULES.SCOPE.POLICY,
+                scopeID: policyID,
+                triggers: sourceRule.triggers,
+                filters: sourceRule.filters,
+                actions: sourceRule.actions,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            });
+
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
         });
 
         it('duplicate workspace with 3+ members creates optimistic announce chat using currentUserAccountID', async () => {
@@ -3369,6 +3411,58 @@ describe('actions/Policy', () => {
     });
 
     describe('setWorkspaceApprovalMode', () => {
+        it('should delete the policy approval workflow rules but keep its expense default rules when disabling approvals', async () => {
+            const apiWriteSpy = jest.spyOn(APIModule, 'write').mockImplementation(() => Promise.resolve());
+            await Onyx.set(ONYXKEYS.SESSION, {email: ESH_EMAIL, accountID: ESH_ACCOUNT_ID});
+
+            const policyID = Policy.generatePolicyID();
+            const fakePolicy: PolicyType = {
+                ...createRandomPolicy(0, CONST.POLICY.TYPE.TEAM),
+                id: policyID,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
+                approver: ESH_EMAIL,
+                owner: ESH_EMAIL,
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, fakePolicy);
+            await waitForBatchedUpdates();
+
+            const approvalRuleKey = `${ONYXKEYS.COLLECTION.RULE}approval1` as const;
+            const expenseDefaultRuleKey = `${ONYXKEYS.COLLECTION.RULE}merchant1` as const;
+            const rules: OnyxCollection<Rule> = {
+                [approvalRuleKey]: {
+                    scope: CONST.RULES.SCOPE.POLICY,
+                    scopeID: policyID,
+                    triggers: indexMap(CONST.RULES.TRIGGERS.REPORT_SUBMIT),
+                    filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: [EMPLOYEE_EMAIL]},
+                    actions: indexMap({name: CONST.RULES.ACTIONS.FORWARD_TO, approver: ESH_EMAIL}),
+                },
+                [expenseDefaultRuleKey]: {
+                    scope: CONST.RULES.SCOPE.POLICY,
+                    scopeID: policyID,
+                    triggers: indexMap(CONST.RULES.TRIGGERS.CREATE_TRANSACTION),
+                    filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, right: 'Starbucks'},
+                    actions: indexMap({name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.CATEGORY, value: 'Coffee'}),
+                },
+            };
+
+            Policy.setWorkspaceApprovalMode(fakePolicy, ESH_EMAIL, CONST.POLICY.APPROVAL_MODE.OPTIONAL, ESH_ACCOUNT_ID, ESH_EMAIL, false, rules);
+            await waitForBatchedUpdates();
+
+            // The approval rule is removed with the workflow, the merchant rule on the same policy is left alone.
+            expect(apiWriteSpy).toHaveBeenCalledWith(
+                WRITE_COMMANDS.DISABLE_POLICY_APPROVALS,
+                expect.anything(),
+                expect.objectContaining({optimisticData: expect.arrayContaining([expect.objectContaining({key: approvalRuleKey, value: null})])}),
+            );
+            expect(apiWriteSpy).not.toHaveBeenCalledWith(
+                WRITE_COMMANDS.DISABLE_POLICY_APPROVALS,
+                expect.anything(),
+                expect.objectContaining({optimisticData: expect.arrayContaining([expect.objectContaining({key: expenseDefaultRuleKey})])}),
+            );
+
+            apiWriteSpy.mockRestore();
+        });
+
         it('should not change employee list when disabling approval', async () => {
             mockFetch?.pause?.();
             await Onyx.set(ONYXKEYS.SESSION, {email: ESH_EMAIL, accountID: ESH_ACCOUNT_ID});
@@ -7769,6 +7863,11 @@ describe('actions/Policy', () => {
                 policyID: 'oldPolicyID',
                 currency: CONST.CURRENCY.USD,
                 total: 5000,
+                reimbursableTotal: 5000,
+                nonReimbursableTotal: 0,
+                unheldTotal: 5000,
+                unheldReimbursableTotal: 5000,
+                unheldNonReimbursableTotal: 0,
             };
 
             const transaction: Transaction = {
@@ -7815,6 +7914,31 @@ describe('actions/Policy', () => {
 
             expect(optimisticTransaction?.amount).toBe(-5000);
             expect(optimisticTransaction?.convertedAmount).toBe(-6000);
+
+            // The optimistic report merge has to flip every total column too, not just `total`, because the Total on
+            // screen is read from `reimbursableTotal` in preference to `total`.
+            const optimisticReport: OnyxEntry<Report> = await new Promise((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                    callback: (value) => {
+                        Onyx.disconnect(connection);
+                        resolve(value);
+                    },
+                });
+            });
+
+            expect(optimisticReport?.type).toBe(CONST.REPORT.TYPE.EXPENSE);
+            expect(optimisticReport?.total).toBe(-5000);
+            expect(optimisticReport?.reimbursableTotal).toBe(-5000);
+            expect(optimisticReport?.unheldTotal).toBe(-5000);
+            expect(optimisticReport?.unheldReimbursableTotal).toBe(-5000);
+
+            // `toBe` is `Object.is`, so the already-zero columns have to be matched as -0.
+            expect(optimisticReport?.nonReimbursableTotal).toBe(-0);
+            expect(optimisticReport?.unheldNonReimbursableTotal).toBe(-0);
+
+            // And the Total rendered for the converted report is positive rather than -$50.00
+            expect(ReportUtils.getMoneyRequestSpendBreakdown(optimisticReport).totalDisplaySpend).toBe(5000);
         });
     });
 });
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index 444f1492f998..6f726138fbee 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -12,7 +12,7 @@ import markAllMessagesAsRead from '@libs/actions/Report/MarkAllMessageAsRead';
 import {CONCIERGE_RESPONSE_DELAY_MS, resolveSuggestedFollowup} from '@libs/actions/Report/SuggestedFollowup';
 import {getOnboardingMessages} from '@libs/actions/Welcome/OnboardingFlow';
 import * as API from '@libs/API';
-import {WRITE_COMMANDS} from '@libs/API/types';
+import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import trackConciergeResponse from '@libs/ConciergeResponseIndicator';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import HttpUtils from '@libs/HttpUtils';
@@ -29,6 +29,7 @@ import {toggleEmojiReaction} from '@userActions/EmojiReactions';
 import CONST from '@src/CONST';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
 import * as PersistedRequests from '@src/libs/actions/PersistedRequests';
+import * as Policy from '@src/libs/actions/Policy/Policy';
 import {initReconnect} from '@src/libs/actions/Reconnect';
 import * as Report from '@src/libs/actions/Report';
 import * as User from '@src/libs/actions/User';
@@ -43,6 +44,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Attendee} from '@src/types/onyx/IOU';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 
@@ -224,6 +226,19 @@ const isTransactionMergeUpdate = (value: unknown): value is Extract<OnyxUpdate<t
     );
 };
 
+const isReportMergeUpdate = (value: unknown): value is Extract<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT>, {onyxMethod: typeof Onyx.METHOD.MERGE}> => {
+    if (typeof value !== 'object' || value === null || !('onyxMethod' in value) || !('key' in value) || !('value' in value)) {
+        return false;
+    }
+
+    return (
+        value.onyxMethod === Onyx.METHOD.MERGE &&
+        typeof value.key === 'string' &&
+        value.key.startsWith(ONYXKEYS.COLLECTION.REPORT) &&
+        (value.value === null || typeof value.value === 'object')
+    );
+};
+
 const isGuidedSetupData = (value: unknown): value is GuidedSetupData =>
     Array.isArray(value) && value.every((item: unknown): item is GuidedSetupData[number] => typeof item === 'object' && item !== null && 'type' in item);
 
@@ -3360,6 +3375,165 @@ describe('actions/Report', () => {
             expect(formEntries.userReportedIntegrationName).toBeUndefined();
         });
 
+        // TRACK_WORKSPACE posts the onboarding messages to the Concierge chat
+        const rhpVariantConciergeChat: OnyxTypes.Report = {
+            reportID: '9988776656',
+            type: CONST.REPORT.TYPE.CHAT,
+            participants: {
+                [CONST.ACCOUNT_ID.CONCIERGE]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                [TEST_USER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+            },
+        };
+
+        // Completes onboarding the way the web Track flow does, asking to wait for the RHP variant
+        const completeTrackOnboardingWaitingForRHPVariant = () => {
+            const engagementChoice = CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE;
+            const {onboardingMessages} = getOnboardingMessages();
+            return Report.completeOnboarding({
+                conciergeChat: rhpVariantConciergeChat,
+                engagementChoice,
+                onboardingMessage: onboardingMessages[engagementChoice],
+                adminsChatReportID: '7957055873634071',
+                onboardingPolicyID: 'A70D00C752416811',
+                shouldWaitForRHPVariantInitialization: true,
+                introSelected: {choice: engagementChoice},
+                isSelfTourViewed: false,
+                currentUserAccountID: TEST_USER_ACCOUNT_ID,
+                delegateAccountID: undefined,
+            });
+        };
+
+        it('should queue CompleteGuidedSetup and keep the optimistic onboarding state when offline, even if waiting for the RHP variant', async () => {
+            await Onyx.set(ONYXKEYS.SESSION, {email: TEST_USER_LOGIN, accountID: TEST_USER_ACCOUNT_ID});
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+
+            // Given the user is offline, where any request that reaches the network fails right away,
+            // so a side-effect request (which is never queued or retried) would apply its failure data
+            setHasRadio(false);
+            global.fetch = jest.fn().mockRejectedValue(new TypeError(CONST.ERROR.FAILED_TO_FETCH));
+            await waitForBatchedUpdates();
+
+            // When the web Track flow completes onboarding and asks to wait for the RHP variant
+            completeTrackOnboardingWaitingForRHPVariant();
+            await waitForNetworkPromises();
+
+            // Then the request goes through API.write instead of the side-effect request
+            expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.COMPLETE_GUIDED_SETUP, expect.anything(), expect.anything());
+
+            // And it is persisted in the queue, so it is replayed once the user is back online
+            expect(PersistedRequests.getAll().map((request) => request.command)).toContain(WRITE_COMMANDS.COMPLETE_GUIDED_SETUP);
+
+            // And the optimistic data is not rolled back, so the onboarding modal does not reappear
+            const onboarding = await getOnyxValue(ONYXKEYS.NVP_ONBOARDING);
+            expect(onboarding?.hasCompletedGuidedSetupFlow).toBe(true);
+
+            // And no onboarding message in the Concierge chat gets an "Unexpected error" from the failure data
+            const conciergeReportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${rhpVariantConciergeChat.reportID}`);
+            expect(Object.keys(conciergeReportActions ?? {}).length).toBeGreaterThan(0);
+            const conciergeReportActionsWithErrors = Object.values(conciergeReportActions ?? {}).filter((reportAction) => !isEmptyObject(reportAction?.errors));
+            expect(conciergeReportActionsWithErrors).toHaveLength(0);
+
+            global.fetch = TestHelper.createGlobalFetchMock();
+            setHasRadio(true);
+            await waitForBatchedUpdates();
+        });
+
+        it('should queue CompleteGuidedSetup when the app goes offline while waiting for CreateWorkspace, even if waiting for the RHP variant', async () => {
+            await Onyx.set(ONYXKEYS.SESSION, {email: TEST_USER_LOGIN, accountID: TEST_USER_ACCOUNT_ID});
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await waitForBatchedUpdates();
+
+            // Given the user is online and CreateWorkspace is still in flight, so completeOnboarding has to wait for it.
+            // The in-flight request fails once the connection drops, and so does every request after it.
+            let rejectCreateWorkspace: ((error: Error) => void) | undefined;
+            global.fetch = jest
+                .fn()
+                .mockImplementationOnce(
+                    () =>
+                        new Promise((_resolve, reject) => {
+                            rejectCreateWorkspace = reject;
+                        }),
+                )
+                .mockRejectedValue(new TypeError(CONST.ERROR.FAILED_TO_FETCH));
+            Policy.createWorkspace({
+                conciergeChat: rhpVariantConciergeChat,
+                policyOwner: {email: TEST_USER_LOGIN, accountID: TEST_USER_ACCOUNT_ID},
+                makeMeAdmin: true,
+                policyName: 'Test workspace',
+                policyID: 'A70D00C752416811',
+                engagementChoice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE,
+                introSelected: {choice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE},
+                currentUserAccountIDParam: TEST_USER_ACCOUNT_ID,
+                currentUserEmailParam: TEST_USER_LOGIN,
+                currency: CONST.CURRENCY.USD,
+                isSelfTourViewed: false,
+                hasActiveAdminPolicies: false,
+                hasOwnedPaidPolicy: false,
+                activePolicy: undefined,
+                delegateAccountID: undefined,
+            });
+            await waitForBatchedUpdates();
+            expect(rejectCreateWorkspace).toBeDefined();
+            // eslint-disable-next-line rulesdir/no-multiple-api-calls
+            const makeRequestWithSideEffectsSpy = jest.spyOn(API, 'makeRequestWithSideEffects');
+
+            // When the web Track flow completes onboarding and asks to wait for the RHP variant
+            const completeOnboardingPromise = completeTrackOnboardingWaitingForRHPVariant();
+            await waitForBatchedUpdates();
+
+            // And the app goes offline while completeOnboarding is still waiting for CreateWorkspace, which resolves the wait
+            // even though CreateWorkspace is still queued
+            setHasRadio(false);
+            rejectCreateWorkspace?.(new TypeError(CONST.ERROR.FAILED_TO_FETCH));
+            await completeOnboardingPromise;
+            await waitForNetworkPromises();
+
+            // Then the request goes through API.write instead of the side-effect request, which would fail right away offline
+            expect(makeRequestWithSideEffectsSpy).not.toHaveBeenCalled();
+            expect(apiWriteSpy).toHaveBeenCalledWith(WRITE_COMMANDS.COMPLETE_GUIDED_SETUP, expect.anything(), expect.anything());
+
+            // And it is persisted in the queue behind CreateWorkspace, so both are replayed once the user is back online
+            const persistedCommands = PersistedRequests.getAll().map((request) => request.command);
+            expect(persistedCommands).toContain(WRITE_COMMANDS.COMPLETE_GUIDED_SETUP);
+
+            // And the optimistic data is not rolled back, so the onboarding modal does not reappear
+            const onboarding = await getOnyxValue(ONYXKEYS.NVP_ONBOARDING);
+            expect(onboarding?.hasCompletedGuidedSetupFlow).toBe(true);
+
+            // And no onboarding message in the Concierge chat gets an "Unexpected error" from the failure data
+            const conciergeReportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${rhpVariantConciergeChat.reportID}`);
+            expect(Object.keys(conciergeReportActions ?? {}).length).toBeGreaterThan(0);
+            const conciergeReportActionsWithErrors = Object.values(conciergeReportActions ?? {}).filter((reportAction) => !isEmptyObject(reportAction?.errors));
+            expect(conciergeReportActionsWithErrors).toHaveLength(0);
+
+            makeRequestWithSideEffectsSpy.mockRestore();
+            global.fetch = TestHelper.createGlobalFetchMock();
+            setHasRadio(true);
+            await waitForBatchedUpdates();
+        });
+
+        it('should send CompleteGuidedSetup as a side-effect request when online and waiting for the RHP variant', async () => {
+            await Onyx.set(ONYXKEYS.SESSION, {email: TEST_USER_LOGIN, accountID: TEST_USER_ACCOUNT_ID});
+            await waitForBatchedUpdates();
+            // Spying on the method keeps the real implementation, so the side-effect request still runs against the
+            // mocked fetch. The spy only lets us check which API method completeOnboarding used.
+            // eslint-disable-next-line rulesdir/no-multiple-api-calls
+            const makeRequestWithSideEffectsSpy = jest.spyOn(API, 'makeRequestWithSideEffects');
+
+            // Given the user is online, so the response can carry the server-assigned nvp_onboardingRHPVariant
+            // When the web Track flow completes onboarding and asks to wait for the RHP variant
+            await completeTrackOnboardingWaitingForRHPVariant();
+            await waitForBatchedUpdates();
+
+            // Then the request goes through makeRequestWithSideEffects so the caller can read the RHP variant off the response
+            expect(makeRequestWithSideEffectsSpy).toHaveBeenCalledWith(SIDE_EFFECT_REQUEST_COMMANDS.COMPLETE_GUIDED_SETUP, expect.anything(), expect.anything());
+
+            // And it does not go through API.write, which would not return the response to the caller
+            expect(apiWriteSpy).not.toHaveBeenCalledWith(WRITE_COMMANDS.COMPLETE_GUIDED_SETUP, expect.anything(), expect.anything());
+
+            makeRequestWithSideEffectsSpy.mockRestore();
+        });
+
         it('should post onboarding tasks to the existing Concierge chat', async () => {
             await Onyx.set(ONYXKEYS.SESSION, {email: TEST_USER_LOGIN, accountID: TEST_USER_ACCOUNT_ID});
             await waitForBatchedUpdates();
@@ -4959,6 +5133,141 @@ describe('actions/Report', () => {
                 const reportName = reportUpdate?.value && typeof reportUpdate.value === 'object' && 'reportName' in reportUpdate.value ? reportUpdate.value.reportName : undefined;
                 expect(reportName).toBe(CONST.REPORT.DEFAULT_EXPENSE_REPORT_NAME);
             });
+
+            it('should negate every total column so the displayed Total stays positive', async () => {
+                // Given an IOU report whose totals are all stored positive
+                const policyID = '302';
+                const policy: OnyxTypes.Policy = {
+                    ...createRandomPolicy(Number(policyID)),
+                    id: policyID,
+                    type: CONST.POLICY.TYPE.TEAM,
+                    fieldList: {},
+                    name: 'Test Policy',
+                };
+
+                const iouReport: OnyxTypes.Report = {
+                    ...createRandomReport(3, undefined),
+                    reportID: 'iouReport302',
+                    type: CONST.REPORT.TYPE.IOU,
+                    ownerAccountID: 3,
+                    total: 10000,
+                    reimbursableTotal: 10000,
+                    nonReimbursableTotal: 0,
+                    unheldTotal: 10000,
+                    unheldReimbursableTotal: 10000,
+                    unheldNonReimbursableTotal: 0,
+                };
+
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, iouReport);
+
+                // When converting the IOU report to an expense report
+                const result = Report.convertIOUReportToExpenseReport(iouReport, policy, policyID, 'expenseChat302', undefined, TestHelper.getCurrencyDecimalsLocal, undefined, []);
+
+                // Then every total column flips sign together with `total`
+                const reportUpdate = result.optimisticData.find((update) => update.key === `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`);
+                const expenseReport = isReportMergeUpdate(reportUpdate) ? reportUpdate.value : undefined;
+                expect(expenseReport?.total).toBe(-10000);
+                expect(expenseReport?.reimbursableTotal).toBe(-10000);
+                expect(expenseReport?.unheldTotal).toBe(-10000);
+                expect(expenseReport?.unheldReimbursableTotal).toBe(-10000);
+
+                // The columns that are already zero flip to -0 rather than being dropped, so they keep overwriting the
+                // stale positive values in Onyx (`toBe` is `Object.is`, so -0 does not match 0 here).
+                expect(expenseReport?.nonReimbursableTotal).toBe(-0);
+                expect(expenseReport?.unheldNonReimbursableTotal).toBe(-0);
+
+                // Apply the optimistic update and assert against that converted report, not a report rebuilt with the
+                // helper. The Total rendered for the converted report is positive rather than -$100.00.
+                await Onyx.update(result.optimisticData);
+                const convertedReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`);
+                expect(ReportUtils.getMoneyRequestSpendBreakdown(convertedReport).totalDisplaySpend).toBe(10000);
+            });
+
+            it('should leave absent total columns absent so they keep being derived from `total`', async () => {
+                // Given an IOU report that only carries `total`, with none of the sibling total columns set
+                const policyID = '303';
+                const policy: OnyxTypes.Policy = {
+                    ...createRandomPolicy(Number(policyID)),
+                    id: policyID,
+                    type: CONST.POLICY.TYPE.TEAM,
+                    fieldList: {},
+                    name: 'Test Policy',
+                };
+
+                const iouReport: OnyxTypes.Report = {
+                    ...createRandomReport(4, undefined),
+                    reportID: 'iouReport303',
+                    type: CONST.REPORT.TYPE.IOU,
+                    ownerAccountID: 4,
+                    total: 10000,
+                };
+
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, iouReport);
+
+                // When converting the IOU report to an expense report
+                const result = Report.convertIOUReportToExpenseReport(iouReport, policy, policyID, 'expenseChat303', undefined, TestHelper.getCurrencyDecimalsLocal, undefined, []);
+
+                // Then only `total` is negated. Writing the missing siblings as -0 would make `getReimbursableTotal`
+                // return -0 instead of falling back to `total`, and the Total would render as $0.00.
+                const reportUpdate = result.optimisticData.find((update) => update.key === `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`);
+                const expenseReport = isReportMergeUpdate(reportUpdate) ? reportUpdate.value : undefined;
+                expect(expenseReport?.total).toBe(-10000);
+                expect(expenseReport).not.toHaveProperty('reimbursableTotal');
+                expect(expenseReport).not.toHaveProperty('nonReimbursableTotal');
+                expect(expenseReport).not.toHaveProperty('unheldTotal');
+                expect(expenseReport).not.toHaveProperty('unheldReimbursableTotal');
+                expect(expenseReport).not.toHaveProperty('unheldNonReimbursableTotal');
+
+                // And the Total rendered for the converted report is still positive
+                await Onyx.update(result.optimisticData);
+                const convertedReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`);
+                expect(ReportUtils.getMoneyRequestSpendBreakdown(convertedReport).totalDisplaySpend).toBe(10000);
+            });
+
+            it('should flip the unheld columns independently of `total` when an expense is on hold', async () => {
+                // Given an IOU report with a held expense, so the unheld columns are smaller than `total`
+                const policyID = '304';
+                const policy: OnyxTypes.Policy = {
+                    ...createRandomPolicy(Number(policyID)),
+                    id: policyID,
+                    type: CONST.POLICY.TYPE.TEAM,
+                    fieldList: {},
+                    name: 'Test Policy',
+                };
+
+                const iouReport: OnyxTypes.Report = {
+                    ...createRandomReport(5, undefined),
+                    reportID: 'iouReport304',
+                    type: CONST.REPORT.TYPE.IOU,
+                    ownerAccountID: 5,
+                    currency: CONST.CURRENCY.USD,
+                    total: 10000,
+                    reimbursableTotal: 10000,
+                    nonReimbursableTotal: 0,
+                    unheldTotal: 6000,
+                    unheldReimbursableTotal: 6000,
+                    unheldNonReimbursableTotal: 0,
+                };
+
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, iouReport);
+
+                // When converting the IOU report to an expense report
+                const result = Report.convertIOUReportToExpenseReport(iouReport, policy, policyID, 'expenseChat304', undefined, TestHelper.getCurrencyDecimalsLocal, undefined, []);
+
+                // Then the unheld columns flip on their own value rather than tracking `total`
+                const reportUpdate = result.optimisticData.find((update) => update.key === `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`);
+                const expenseReport = isReportMergeUpdate(reportUpdate) ? reportUpdate.value : undefined;
+                expect(expenseReport?.total).toBe(-10000);
+                expect(expenseReport?.unheldTotal).toBe(-6000);
+                expect(expenseReport?.unheldReimbursableTotal).toBe(-6000);
+
+                // And the hold amounts stay positive, with the non-held amount still below the full amount
+                await Onyx.update(result.optimisticData);
+                const convertedReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`);
+                const {nonHeldAmount, fullAmount} = ReportUtils.getNonHeldAndFullAmount(convertedReport, false, [], TestHelper.convertToDisplayString);
+                expect(nonHeldAmount).toContain('60.00');
+                expect(fullAmount).toContain('100.00');
+            });
         });
     });
 
@@ -5607,6 +5916,92 @@ describe('actions/Report', () => {
             const revertedOriginalMessage = revertedAction ? getOriginalMessage(revertedAction) : undefined;
             expect(revertedOriginalMessage && 'deleted' in revertedOriginalMessage && revertedOriginalMessage.deleted).toBeNull();
         });
+
+        it('should recompute unheldTotal from the unheld destination-currency transactions', async () => {
+            const reportID = 'reportWithHeldExpense';
+            const unheldTransactionID = 'unheldTransactionForPolicyChange';
+            const heldTransactionID = 'heldTransactionForPolicyChange';
+
+            // Expense reports store amounts with the opposite sign, so a $100 expense is stored as -10000.
+            const unheldTransaction = {
+                ...createRandomTransaction(1),
+                transactionID: unheldTransactionID,
+                reportID,
+                amount: -10000,
+                currency: CONST.CURRENCY.USD,
+                reimbursable: true,
+            };
+
+            const heldTransaction = {
+                ...createRandomTransaction(2),
+                transactionID: heldTransactionID,
+                reportID,
+                amount: -5000,
+                currency: CONST.CURRENCY.USD,
+                reimbursable: true,
+                comment: {...createRandomTransaction(2).comment, hold: 'holdReportActionID'},
+            };
+
+            // The report's totals are still in the source currency, including a stale unheldTotal.
+            const report: OnyxTypes.Report = {
+                ...createRandomReport(1, undefined),
+                reportID,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                type: CONST.REPORT.TYPE.EXPENSE,
+                currency: 'AUD',
+                total: -99999,
+                unheldTotal: -88888,
+            };
+
+            const policy = {
+                ...createRandomPolicy(Number(1)),
+                outputCurrency: CONST.CURRENCY.USD,
+            };
+
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, report);
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${unheldTransactionID}`, unheldTransaction);
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${heldTransactionID}`, heldTransaction);
+            await waitForBatchedUpdates();
+
+            const {optimisticData, failureData} = Report.buildOptimisticChangePolicyData({
+                report,
+                getCurrencyDecimals: TestHelper.getCurrencyDecimalsLocal,
+                rules: undefined,
+                parentReport: undefined,
+                policy,
+                currentUserAccountID: 1,
+                currentUserEmail: '',
+                ownerLogin: undefined,
+                managerLogin: '',
+                hasViolationsParam: false,
+                isASAPSubmitBetaEnabled: true,
+                isReportLastVisibleArchived: undefined,
+                reportPreviewAction: undefined,
+                isTrackIntentUser: false,
+                reportTransactions: [unheldTransaction, heldTransaction],
+                delegateAccountID: undefined,
+            });
+
+            const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const;
+            const optimisticTotals = optimisticData.find((update) => update.key === reportKey && isReportMergeUpdate(update) && !!update.value && 'total' in update.value);
+            const failureTotals = failureData.find((update) => update.key === reportKey && isReportMergeUpdate(update) && !!update.value && 'total' in update.value);
+            const optimisticReport = isReportMergeUpdate(optimisticTotals) ? optimisticTotals.value : undefined;
+
+            // The recomputed unheldTotal covers only the unheld expense, so it is not simply equal to total
+            expect(optimisticReport?.total).toBe(-15000);
+            expect(optimisticReport?.unheldTotal).toBe(-10000);
+
+            // And the hold amounts are read from the destination currency rather than the stale AUD value
+            await Onyx.update(optimisticData);
+            const mergedReport = await getOnyxValue(reportKey);
+            const {nonHeldAmount, fullAmount} = ReportUtils.getNonHeldAndFullAmount(mergedReport, false, [unheldTransaction, heldTransaction], TestHelper.convertToDisplayString);
+            expect(nonHeldAmount).toContain('100.00');
+            expect(fullAmount).toContain('150.00');
+
+            // A failed request puts the original unheldTotal back alongside the other totals
+            const failureReport = isReportMergeUpdate(failureTotals) ? failureTotals.value : undefined;
+            expect(failureReport?.unheldTotal).toBe(-88888);
+        });
     });
 
     describe('searchInServer', () => {
@@ -5617,6 +6012,34 @@ describe('actions/Report', () => {
             const lowerCaseRequest = PersistedRequests.getAll().at(1);
             expect(upperCaseRequest?.data?.searchInput).toBe(lowerCaseRequest?.data?.searchInput);
         });
+
+        it("clears the previous search's result order so a new query does not reuse it", async () => {
+            // Given an ordered result list from a previous report search
+            await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['1', '2', '3']);
+            await waitForBatchedUpdates();
+
+            // When a new report search starts
+            Report.searchInServer('new query');
+            await waitForBatchedUpdates();
+
+            // Then the previous result order is cleared
+            const orderedReportIDs = await getOnyxValue(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS);
+            expect(orderedReportIDs).toBeUndefined();
+        });
+
+        it('keeps report search ordering when searching rooms to mention', async () => {
+            // Given an ordered result list from a report search
+            await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['1', '2', '3']);
+            await waitForBatchedUpdates();
+
+            // When a room mention search starts
+            Report.searchInServer('room', 'policyID');
+            await waitForBatchedUpdates();
+
+            // Then the report search order remains available
+            const orderedReportIDs = await getOnyxValue(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS);
+            expect(orderedReportIDs).toEqual(['1', '2', '3']);
+        });
     });
 
     describe('searchUserInServer', () => {
@@ -5628,6 +6051,20 @@ describe('actions/Report', () => {
             expect(upperCaseRequest?.data?.searchInput).toBe(lowerCaseRequest?.data?.searchInput);
         });
 
+        it('keeps report search ordering', async () => {
+            // Given an ordered result list from a report search
+            await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['1', '2', '3']);
+            await waitForBatchedUpdates();
+
+            // When a user search starts
+            Report.searchUserInServer('user');
+            await waitForBatchedUpdates();
+
+            // Then the report search order remains available
+            const orderedReportIDs = await getOnyxValue(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS);
+            expect(orderedReportIDs).toEqual(['1', '2', '3']);
+        });
+
         it('tracks user searches separately from report searches', () => {
             const onyxSetSpy = jest.spyOn(Onyx, 'set');
 
@@ -5883,6 +6320,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
             });
 
@@ -5900,6 +6338,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: true,
             });
 
@@ -5921,6 +6360,7 @@ describe('actions/Report', () => {
                     introSelected: testIntroSelected,
                     currentUserAccountID: TEST_USER_ACCOUNT_ID,
                     isSelfTourViewed: undefined,
+                    conciergePersonalDetails: undefined,
                     shouldDismissModal: false,
                 });
             }).not.toThrow();
@@ -5936,6 +6376,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: true,
                 reportActionID,
             });
@@ -5958,6 +6399,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
                 linkToOptions,
             });
@@ -5979,6 +6421,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
                 checkIfCurrentPageActive,
             });
@@ -6001,6 +6444,7 @@ describe('actions/Report', () => {
                     introSelected: testIntroSelected,
                     currentUserAccountID: TEST_USER_ACCOUNT_ID,
                     isSelfTourViewed: undefined,
+                    conciergePersonalDetails: undefined,
                     shouldDismissModal: false,
                 });
             }).not.toThrow();
@@ -6017,6 +6461,7 @@ describe('actions/Report', () => {
                     introSelected: testIntroSelected,
                     currentUserAccountID: TEST_USER_ACCOUNT_ID,
                     isSelfTourViewed: undefined,
+                    conciergePersonalDetails: undefined,
                     shouldDismissModal: false,
                 });
             }).not.toThrow();
@@ -6035,6 +6480,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: true,
                 checkIfCurrentPageActive,
                 linkToOptions,
@@ -6061,6 +6507,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
             });
 
@@ -6089,6 +6536,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
             });
             await waitForBatchedUpdates();
@@ -6096,6 +6544,60 @@ describe('actions/Report', () => {
             TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
         });
 
+        describe('personalDetails', () => {
+            const TEST_USER_LOGIN = 'test@user.com';
+            const CONCIERGE_PERSONAL_DETAIL: OnyxTypes.PersonalDetails = {
+                accountID: CONST.ACCOUNT_ID.CONCIERGE,
+                login: CONST.EMAIL.CONCIERGE,
+                displayName: 'Concierge',
+            };
+
+            beforeEach(async () => {
+                await TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN);
+                await TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID);
+                // Concierge is a known account in Onyx, so its login resolves to CONST.ACCOUNT_ID.CONCIERGE when the chat is created.
+                await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {[CONST.ACCOUNT_ID.CONCIERGE]: CONCIERGE_PERSONAL_DETAIL});
+                await waitForBatchedUpdates();
+            });
+
+            it('should not create an optimistic personal detail for Concierge when it is in the personal details passed in', async () => {
+                // Given no Concierge chat exists yet and the personal details passed in already contain Concierge
+                Report.navigateToConciergeChat({
+                    conciergeReportID: undefined,
+                    introSelected: testIntroSelected,
+                    currentUserAccountID: TEST_USER_ACCOUNT_ID,
+                    isSelfTourViewed: undefined,
+                    conciergePersonalDetails: {[CONST.ACCOUNT_ID.CONCIERGE]: CONCIERGE_PERSONAL_DETAIL},
+                    shouldDismissModal: false,
+                });
+                await waitForBatchedUpdates();
+
+                // Then the Concierge chat is created without touching Concierge's personal detail
+                TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
+                const personalDetailsList = await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST);
+                expect(personalDetailsList?.[CONST.ACCOUNT_ID.CONCIERGE]).toEqual(CONCIERGE_PERSONAL_DETAIL);
+            });
+
+            it('should not create an optimistic personal detail for Concierge when the personal details passed in are stale', async () => {
+                // Given no Concierge chat exists yet and the personal details passed in were captured before OpenApp loaded Concierge,
+                // so they do not contain Concierge even though Onyx does by the time the server data is ready
+                Report.navigateToConciergeChat({
+                    conciergeReportID: undefined,
+                    introSelected: testIntroSelected,
+                    currentUserAccountID: TEST_USER_ACCOUNT_ID,
+                    isSelfTourViewed: undefined,
+                    conciergePersonalDetails: {},
+                    shouldDismissModal: false,
+                });
+                await waitForBatchedUpdates();
+
+                // Then the Concierge chat is created and the real Concierge personal detail is not overwritten by an optimistic one
+                TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
+                const personalDetailsList = await getOnyxValue(ONYXKEYS.PERSONAL_DETAILS_LIST);
+                expect(personalDetailsList?.[CONST.ACCOUNT_ID.CONCIERGE]).toEqual(CONCIERGE_PERSONAL_DETAIL);
+            });
+        });
+
         it('should not throw with any isSelfTourViewed value when conciergeReportID is undefined', async () => {
             await Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, false);
             await waitForBatchedUpdates();
@@ -6106,6 +6608,7 @@ describe('actions/Report', () => {
                     introSelected: testIntroSelected,
                     currentUserAccountID: TEST_USER_ACCOUNT_ID,
                     isSelfTourViewed: true,
+                    conciergePersonalDetails: undefined,
                     shouldDismissModal: false,
                 });
             }).not.toThrow();
@@ -6116,6 +6619,7 @@ describe('actions/Report', () => {
                     introSelected: testIntroSelected,
                     currentUserAccountID: TEST_USER_ACCOUNT_ID,
                     isSelfTourViewed: false,
+                    conciergePersonalDetails: undefined,
                     shouldDismissModal: false,
                 });
             }).not.toThrow();
@@ -6126,6 +6630,7 @@ describe('actions/Report', () => {
                     introSelected: testIntroSelected,
                     currentUserAccountID: TEST_USER_ACCOUNT_ID,
                     isSelfTourViewed: undefined,
+                    conciergePersonalDetails: undefined,
                     shouldDismissModal: false,
                 });
             }).not.toThrow();
@@ -6139,6 +6644,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: true,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
                 checkIfCurrentPageActive,
             });
@@ -6159,6 +6665,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
                 checkIfCurrentPageActive,
             });
@@ -6178,6 +6685,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: true,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
             });
 
@@ -6196,6 +6704,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: undefined,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: false,
             });
 
@@ -6214,6 +6723,7 @@ describe('actions/Report', () => {
                 introSelected: testIntroSelected,
                 currentUserAccountID: TEST_USER_ACCOUNT_ID,
                 isSelfTourViewed: true,
+                conciergePersonalDetails: undefined,
                 shouldDismissModal: true,
             });
 
@@ -7695,7 +8205,7 @@ describe('actions/Report', () => {
             await Onyx.merge(ONYXKEYS.CONCIERGE_REPORT_ID, TEST_CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined);
+            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined);
             await waitForBatchedUpdates();
 
             TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.LEAVE_GROUP_CHAT, 1);
@@ -7714,7 +8224,7 @@ describe('actions/Report', () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${GROUP_CHAT_REPORT_ID}`, groupChatReport);
             await waitForBatchedUpdates();
 
-            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined);
+            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined);
             await waitForBatchedUpdates();
 
             // After success, the report should be removed from Onyx (set to null)
@@ -7739,7 +8249,7 @@ describe('actions/Report', () => {
             });
             await waitForBatchedUpdates();
 
-            Report.leaveGroupChat(groupChatReport, true, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined);
+            Report.leaveGroupChat(groupChatReport, true, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined);
             await waitForBatchedUpdates();
 
             const quickAction = await getOnyxValue(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
@@ -7766,7 +8276,7 @@ describe('actions/Report', () => {
             await Onyx.merge(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE, quickActionValue);
             await waitForBatchedUpdates();
 
-            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined);
+            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined);
             await waitForBatchedUpdates();
 
             const quickAction = await getOnyxValue(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
@@ -7788,7 +8298,7 @@ describe('actions/Report', () => {
 
             // Should not throw an error with undefined conciergeReportID
             expect(() => {
-                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, undefined, TEST_INTRO_SELECTED, undefined);
+                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, undefined, TEST_INTRO_SELECTED, undefined, undefined);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -7820,7 +8330,7 @@ describe('actions/Report', () => {
             await Onyx.merge(ONYXKEYS.CONCIERGE_REPORT_ID, TEST_CONCIERGE_REPORT_ID);
             await waitForBatchedUpdates();
 
-            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, false);
+            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, false);
             await waitForBatchedUpdates();
 
             TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.LEAVE_ROOM, 1);
@@ -7839,7 +8349,7 @@ describe('actions/Report', () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}`, roomReport);
             await waitForBatchedUpdates();
 
-            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, true);
+            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, true);
             await waitForBatchedUpdates();
 
             const updatedReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}` as const);
@@ -7863,7 +8373,7 @@ describe('actions/Report', () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}`, roomReport);
             await waitForBatchedUpdates();
 
-            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, false);
+            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, false);
             await waitForBatchedUpdates();
 
             // After success, the report should only have reportName (all other fields removed)
@@ -7897,7 +8407,7 @@ describe('actions/Report', () => {
             });
             await waitForBatchedUpdates();
 
-            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, false);
+            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, false);
             await waitForBatchedUpdates();
 
             const updatedParentReportActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${PARENT_REPORT_ID}` as const);
@@ -7919,7 +8429,7 @@ describe('actions/Report', () => {
 
             // Should not throw an error with undefined conciergeReportID
             expect(() => {
-                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, undefined, TEST_INTRO_SELECTED, undefined, false);
+                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, undefined, TEST_INTRO_SELECTED, undefined, undefined, false);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -7944,7 +8454,7 @@ describe('actions/Report', () => {
             await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}`, threadReport);
             await waitForBatchedUpdates();
 
-            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, false);
+            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, false);
             await waitForBatchedUpdates();
 
             const updatedReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}` as const);
@@ -7967,7 +8477,7 @@ describe('actions/Report', () => {
 
             // Should not throw when introSelected is provided
             expect(() => {
-                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, false);
+                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, false);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -7998,7 +8508,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             // Should not throw and should call the API
-            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined);
+            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined);
             await waitForBatchedUpdates();
 
             TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.LEAVE_GROUP_CHAT, 1);
@@ -8021,7 +8531,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, customIntroSelected, undefined);
+                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, customIntroSelected, undefined, undefined);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -8043,7 +8553,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, undefined, undefined);
+                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, undefined, undefined, undefined);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -8075,7 +8585,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, customIntroSelected, undefined, false);
+                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, customIntroSelected, undefined, undefined, false);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -8096,7 +8606,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, undefined, undefined, false);
+                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, undefined, undefined, undefined, false);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -8117,7 +8627,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, {}, undefined, false);
+                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, {}, undefined, undefined, false);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -8148,7 +8658,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, isSelfTourViewed);
+                Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, isSelfTourViewed, undefined);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -8178,7 +8688,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             expect(() => {
-                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, isSelfTourViewed, false);
+                Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, isSelfTourViewed, undefined, false);
             }).not.toThrow();
 
             await waitForBatchedUpdates();
@@ -8223,7 +8733,7 @@ describe('actions/Report', () => {
             await Onyx.merge(ONYXKEYS.SESSION, {accountID: TEST_CURRENT_USER_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
-            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, false);
+            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, false);
             await waitForBatchedUpdates();
 
             // Should navigate via goBack since there's another report to navigate to
@@ -8252,7 +8762,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             // Chat thread with no other report → navigateToMostRecentReport calls navigateToConciergeChat without goBack
-            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, false);
+            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, false);
             await waitForBatchedUpdates();
 
             // For chat threads, goBack should NOT be called before navigating to concierge (the isChatThread branch)
@@ -8295,7 +8805,7 @@ describe('actions/Report', () => {
             await Onyx.merge(ONYXKEYS.SESSION, {accountID: TEST_CURRENT_USER_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
-            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined);
+            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined);
             await waitForBatchedUpdates();
 
             expect(mockNavigation.goBack).toHaveBeenCalled();
@@ -8316,7 +8826,7 @@ describe('actions/Report', () => {
             await Onyx.merge(ONYXKEYS.SESSION, {accountID: TEST_CURRENT_USER_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
-            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined);
+            Report.leaveGroupChat(groupChatReport, false, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined);
             await waitForBatchedUpdates();
 
             // With no other reports, navigateToMostRecentReport calls goBack (not a chat thread) then navigateToConciergeChat
@@ -8350,7 +8860,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             // isWorkspaceMemberLeavingWorkspaceRoom=true and report is NOT a chat thread → should dismissModal
-            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, true);
+            Report.leaveRoom(roomReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, true);
             await waitForBatchedUpdates();
 
             expect(mockNavigation.dismissModal).toHaveBeenCalled();
@@ -8381,7 +8891,7 @@ describe('actions/Report', () => {
             await waitForBatchedUpdates();
 
             // isWorkspaceMemberLeavingWorkspaceRoom=true but report IS a chat thread → should NOT dismissModal, should navigateToMostRecentReport instead
-            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, true);
+            Report.leaveRoom(threadReport, TEST_CURRENT_USER_ACCOUNT_ID, TEST_CONCIERGE_REPORT_ID, TEST_INTRO_SELECTED, undefined, undefined, true);
             await waitForBatchedUpdates();
 
             expect(mockNavigation.dismissModal).not.toHaveBeenCalled();
@@ -8811,7 +9321,7 @@ describe('actions/Report', () => {
             const testIntroSelected: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.ADMIN};
             // No error should be thrown, function should return early
             expect(() => {
-                handleWalletStatementNavigation('123', testIntroSelected, undefined, undefined, undefined);
+                handleWalletStatementNavigation('123', testIntroSelected, undefined, undefined, undefined, undefined);
             }).not.toThrow();
         });
 
@@ -8819,7 +9329,7 @@ describe('actions/Report', () => {
             const testIntroSelected: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.ADMIN};
             const TEST_USER_ACCOUNT_ID = 1;
             expect(() => {
-                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, 'invalidType', undefined);
+                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, 'invalidType', undefined);
             }).not.toThrow();
         });
 
@@ -8830,7 +9340,7 @@ describe('actions/Report', () => {
             const testIntroSelected: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.ADMIN};
             const TEST_USER_ACCOUNT_ID = 1;
 
-            handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+            handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, undefined, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
 
             await waitForBatchedUpdates();
 
@@ -8841,7 +9351,7 @@ describe('actions/Report', () => {
         it('should not throw with undefined introSelected', () => {
             const TEST_USER_ACCOUNT_ID = 1;
             expect(() => {
-                handleWalletStatementNavigation('123', undefined, TEST_USER_ACCOUNT_ID, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+                handleWalletStatementNavigation('123', undefined, TEST_USER_ACCOUNT_ID, undefined, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
             }).not.toThrow();
         });
 
@@ -8862,7 +9372,7 @@ describe('actions/Report', () => {
             const isSelfTourViewed = true;
 
             expect(() => {
-                localHandleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, isSelfTourViewed, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+                localHandleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, isSelfTourViewed, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
             }).not.toThrow();
         });
 
@@ -8872,7 +9382,7 @@ describe('actions/Report', () => {
             const isSelfTourViewed = false;
 
             expect(() => {
-                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, isSelfTourViewed, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
+                handleWalletStatementNavigation('123', testIntroSelected, TEST_USER_ACCOUNT_ID, isSelfTourViewed, undefined, CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE, undefined);
             }).not.toThrow();
         });
     });
@@ -10884,6 +11394,72 @@ describe('actions/Report', () => {
         });
     });
 
+    describe('buildOptimisticModifiedExpenseReportAction failed-scan amount placeholder', () => {
+        const placeholderTransaction = createMock<OnyxTypes.Transaction>({
+            transactionID: '1',
+            reportID: '2',
+            amount: 0,
+            currency: 'USD',
+            iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+            receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+        });
+
+        it('omits oldAmount/oldCurrency when confirming the same placeholder value, matching the backend', () => {
+            // Re-entering 0 to clear the scan error isn't a real change — the backend doesn't persist
+            // oldAmount/oldCurrency in this action's originalMessage either (see #98783), so the optimistic message
+            // must match, rendering "set the amount to X" consistently instead of flipping after a refresh.
+            const result = ReportUtils.buildOptimisticModifiedExpenseReportAction(undefined, placeholderTransaction, {amount: 0, currency: 'USD'}, false, undefined, undefined);
+            const originalMessage = getOriginalMessage(result as OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE>);
+
+            expect(originalMessage?.amount).toBe(0);
+            expect(originalMessage?.currency).toBe('USD');
+            expect(originalMessage?.oldAmount).toBeUndefined();
+            expect(originalMessage?.oldCurrency).toBeUndefined();
+        });
+
+        it('omits oldAmount/oldCurrency when the user provides the first real amount', () => {
+            const result = ReportUtils.buildOptimisticModifiedExpenseReportAction(undefined, placeholderTransaction, {amount: 1550, currency: 'USD'}, false, undefined, undefined);
+            const originalMessage = getOriginalMessage(result as OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE>);
+
+            expect(originalMessage?.amount).toBe(1550);
+            expect(originalMessage?.oldAmount).toBeUndefined();
+            expect(originalMessage?.currency).toBe('USD');
+            expect(originalMessage?.oldCurrency).toBeUndefined();
+        });
+
+        it('records oldAmount/oldCurrency for subsequent edits after the failed-scan amount is confirmed', () => {
+            const confirmedTransaction = createMock<OnyxTypes.Transaction>({
+                ...placeholderTransaction,
+                modifiedAmount: -1550,
+                modifiedCurrency: 'USD',
+            });
+            const result = ReportUtils.buildOptimisticModifiedExpenseReportAction(undefined, confirmedTransaction, {amount: 2500, currency: 'USD'}, false, undefined, undefined);
+            const originalMessage = getOriginalMessage(result as OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE>);
+
+            expect(originalMessage?.amount).toBe(2500);
+            expect(originalMessage?.oldAmount).toBe(1550);
+            expect(originalMessage?.currency).toBe('USD');
+            expect(originalMessage?.oldCurrency).toBe('USD');
+        });
+
+        it('still records oldAmount/oldCurrency for a normal (non-scan) transaction confirming the same amount', () => {
+            const manualTransaction = createMock<OnyxTypes.Transaction>({
+                transactionID: '1',
+                reportID: '2',
+                amount: 0,
+                currency: 'USD',
+                iouRequestType: CONST.IOU.REQUEST_TYPE.MANUAL,
+            });
+            const result = ReportUtils.buildOptimisticModifiedExpenseReportAction(undefined, manualTransaction, {amount: 0, currency: 'USD'}, false, undefined, undefined);
+            const originalMessage = getOriginalMessage(result as OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE>);
+
+            expect(originalMessage?.amount).toBe(0);
+            expect(originalMessage?.oldAmount).toBe(0);
+            expect(originalMessage?.currency).toBe('USD');
+            expect(originalMessage?.oldCurrency).toBe('USD');
+        });
+    });
+
     describe('buildOptimisticIOUReportAction delegateAccountID forwarding', () => {
         const DELEGATE_ACCOUNT_ID = 998;
 
@@ -10992,6 +11568,7 @@ describe('actions/Report', () => {
             statusNum: CONST.REPORT.STATUS_NUM.OPEN,
             currency: CONST.CURRENCY.USD,
             total: 0,
+            unheldTotal: 0,
             transactionCount: 0,
         });
 
@@ -11118,6 +11695,7 @@ describe('actions/Report', () => {
             Report.mergeReports({
                 isVendorMatchingBetaEnabled: false,
                 rules: undefined,
+                cardList: undefined,
                 destinationReportID: DESTINATION_REPORT_ID,
                 sourceReportIDs: [SOURCE_REPORT_1_ID, SOURCE_REPORT_2_ID],
                 isASAPSubmitBetaEnabled: false,
@@ -11187,6 +11765,7 @@ describe('actions/Report', () => {
             Report.mergeReports({
                 isVendorMatchingBetaEnabled: false,
                 rules: undefined,
+                cardList: undefined,
                 destinationReportID: DESTINATION_REPORT_ID,
                 sourceReportIDs: [SOURCE_REPORT_1_ID, SOURCE_REPORT_2_ID],
                 isASAPSubmitBetaEnabled: false,
@@ -11254,6 +11833,7 @@ describe('actions/Report', () => {
             Report.mergeReports({
                 isVendorMatchingBetaEnabled: false,
                 rules: undefined,
+                cardList: undefined,
                 destinationReportID: DESTINATION_REPORT_ID,
                 sourceReportIDs: [SOURCE_REPORT_1_ID, SOURCE_REPORT_2_ID],
                 isASAPSubmitBetaEnabled: false,
@@ -11278,6 +11858,8 @@ describe('actions/Report', () => {
             const snapshotOptimistic = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${SNAPSHOT_HASH}`);
             expect(snapshotOptimistic?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${SOURCE_REPORT_1_ID}`]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
             expect(snapshotOptimistic?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`]?.total).toBe(-3000);
+            // Both moved expenses are unheld, so the destination snapshot has to carry the recomputed unheldTotal too
+            expect(snapshotOptimistic?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`]?.unheldTotal).toBe(-3000);
             expect(snapshotOptimistic?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`]?.transactionCount).toBe(2);
             expect(snapshotOptimistic?.data?.[transaction1Key]?.reportID).toBe(DESTINATION_REPORT_ID);
             expect(snapshotOptimistic?.data?.[transaction2Key]?.reportID).toBe(DESTINATION_REPORT_ID);
@@ -11290,6 +11872,7 @@ describe('actions/Report', () => {
             const snapshotFailure = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${SNAPSHOT_HASH}`);
             expect(snapshotFailure?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${SOURCE_REPORT_1_ID}`]?.reportID).toBe(SOURCE_REPORT_1_ID);
             expect(snapshotFailure?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`]?.total).toBe(0);
+            expect(snapshotFailure?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`]?.unheldTotal).toBe(0);
             expect(snapshotFailure?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`]?.transactionCount).toBe(0);
             expect(snapshotFailure?.data?.[transaction1Key]?.reportID).toBe(SOURCE_REPORT_1_ID);
             expect(snapshotFailure?.data?.[transaction2Key]?.reportID).toBe(SOURCE_REPORT_2_ID);
diff --git a/tests/actions/SessionTest.ts b/tests/actions/SessionTest.ts
index bd0359117cdb..e57328263a1c 100644
--- a/tests/actions/SessionTest.ts
+++ b/tests/actions/SessionTest.ts
@@ -7,7 +7,7 @@ import OnyxUpdateManager from '@libs/actions/OnyxUpdateManager';
 import {getAll as getAllPersistedRequests} from '@libs/actions/PersistedRequests';
 import {initReconnect} from '@libs/actions/Reconnect';
 import * as SignInRedirect from '@libs/actions/SignInRedirect';
-import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import asyncOpenURL from '@libs/asyncOpenURL';
 import buildOldDotURL from '@libs/buildOldDotURL';
 import getPlatform from '@libs/getPlatform';
@@ -807,6 +807,7 @@ describe('Session', () => {
 
     describe('validateTwoFactorAuth', () => {
         test('forced onboarding path updates auth token before clearing Onyx without openApp', async () => {
+            // Given a user completing forced-onboarding 2FA while the success screen remains open.
             const makeRequestSpy = jest.spyOn(API, 'makeRequestWithSideEffects').mockResolvedValue({
                 authToken: 'newAuthToken',
                 encryptedAuthToken: 'newEncryptedAuthToken',
@@ -816,9 +817,11 @@ describe('Session', () => {
             const clearSpy = jest.spyOn(Onyx, 'clear').mockResolvedValue(undefined);
             const writeWithNoDuplicatesSpy = jest.spyOn(API, 'writeWithNoDuplicatesConflictAction').mockResolvedValue(undefined);
 
+            // When the 2FA validation succeeds.
             SessionUtil.validateTwoFactorAuth('123456', false, {shouldKeepTwoFactorAuthFlowOpen: true});
             await waitForBatchedUpdates();
 
+            // Then the next authenticated state is seeded before Onyx is cleared without entering the global loading state.
             expect(makeRequestSpy).toHaveBeenCalledWith(SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE, {twoFactorAuthCode: '123456'}, expect.any(Object));
             expect(setAuthTokenSpy).toHaveBeenCalledWith('newAuthToken');
             expect(setAuthTokenSpy.mock.invocationCallOrder.at(0)).toBeLessThan(multiSetSpy.mock.invocationCallOrder.at(0) ?? Number.MAX_SAFE_INTEGER);
@@ -833,6 +836,7 @@ describe('Session', () => {
                     [ONYXKEYS.NVP_ONBOARDING]: {
                         hasCompletedGuidedSetupFlow: false,
                     },
+                    [ONYXKEYS.IS_LOADING_APP]: false,
                 }),
             );
             expect(clearSpy).toHaveBeenCalled();
@@ -887,7 +891,7 @@ describe('Session', () => {
                 callback: (val) => (session = val),
             });
 
-            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true);
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, undefined, undefined);
             await waitForBatchedUpdates();
 
             expect(session?.signedInWithSAML).toBe(true);
@@ -900,20 +904,56 @@ describe('Session', () => {
                 callback: (val) => (session = val),
             });
 
-            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', false);
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', false, undefined, undefined);
             await waitForBatchedUpdates();
 
             expect(session?.signedInWithSAML).toBe(false);
         });
 
+        test('signInWithShortLivedAuthToken sends the token to the API with the SAML auth method', async () => {
+            const readSpy = jest.spyOn(API, 'read').mockImplementation(() => {});
+
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, undefined, undefined);
+            await waitForBatchedUpdates();
+
+            const call = readSpy.mock.calls.at(0);
+            expect(call?.at(0)).toBe(READ_COMMANDS.SIGN_IN_WITH_SHORT_LIVED_AUTH_TOKEN);
+            expect(call?.at(1)).toEqual(expect.objectContaining({authToken: 'testAuthToken', authMethod: CONST.AUTH_METHOD.SAML, skipReauthentication: true}));
+
+            readSpy.mockRestore();
+        });
+
+        test('signInWithShortLivedAuthToken sends the token to the API with the short-lived-token auth method when it is not a SAML sign in', async () => {
+            const readSpy = jest.spyOn(API, 'read').mockImplementation(() => {});
+
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', false, undefined, undefined);
+            await waitForBatchedUpdates();
+
+            expect(readSpy.mock.calls.at(0)?.at(1)).toEqual(expect.objectContaining({authToken: 'testAuthToken', authMethod: CONST.AUTH_METHOD.SHORT_LIVED_AUTH_TOKEN}));
+
+            readSpy.mockRestore();
+        });
+
+        test('signInWithShortLivedAuthToken does not wait on navigation when no exitTo is passed', async () => {
+            const waitForProtectedRoutesSpy = jest.spyOn(Navigation, 'waitForProtectedRoutes').mockResolvedValue(undefined);
+            const resetRootSpy = jest.spyOn(navigationRef, 'resetRoot').mockImplementation(() => {});
+
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, undefined, 'user@saml.example.com');
+            await waitForBatchedUpdates();
+
+            expect(waitForProtectedRoutesSpy).not.toHaveBeenCalled();
+            expect(resetRootSpy).not.toHaveBeenCalled();
+            jest.restoreAllMocks();
+        });
+
         test('signInWithShortLivedAuthToken rebuilds navigation from exitTo once the same login is signed in', async () => {
-            await Onyx.merge(ONYXKEYS.CREDENTIALS, {login: 'user@saml.example.com'});
+            // CREDENTIALS is empty (cleared in beforeEach), so the restore firing proves the login comes from the param, not the module cache.
             await Onyx.merge(ONYXKEYS.SESSION, {authToken: 'testAuthToken', email: 'User@saml.example.com'});
             await waitForBatchedUpdates();
             jest.spyOn(Navigation, 'waitForProtectedRoutes').mockResolvedValue(undefined);
             const resetRootSpy = jest.spyOn(navigationRef, 'resetRoot').mockImplementation(() => {});
 
-            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, '/search?q=status:outstanding');
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, '/search?q=status:outstanding', 'user@saml.example.com');
             await waitForBatchedUpdates();
 
             expect(resetRootSpy).toHaveBeenCalledTimes(1);
@@ -924,12 +964,14 @@ describe('Session', () => {
         });
 
         test('signInWithShortLivedAuthToken does not navigate to exitTo without a login to compare', async () => {
+            // A login present in the CREDENTIALS Onyx cache must not be used as a fallback when no login is passed.
+            await Onyx.merge(ONYXKEYS.CREDENTIALS, {login: 'user@saml.example.com'});
             await Onyx.merge(ONYXKEYS.SESSION, {authToken: 'testAuthToken', email: 'user@saml.example.com'});
             await waitForBatchedUpdates();
             jest.spyOn(Navigation, 'waitForProtectedRoutes').mockResolvedValue(undefined);
             const resetRootSpy = jest.spyOn(navigationRef, 'resetRoot').mockImplementation(() => {});
 
-            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, '/search?q=status:outstanding');
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, '/search?q=status:outstanding', undefined);
             await waitForBatchedUpdates();
 
             expect(resetRootSpy).not.toHaveBeenCalled();
@@ -937,13 +979,12 @@ describe('Session', () => {
         });
 
         test('signInWithShortLivedAuthToken does not navigate to exitTo when another login signs in', async () => {
-            await Onyx.merge(ONYXKEYS.CREDENTIALS, {login: 'user@saml.example.com'});
             await Onyx.merge(ONYXKEYS.SESSION, {authToken: 'testAuthToken', email: 'other@example.com'});
             await waitForBatchedUpdates();
             jest.spyOn(Navigation, 'waitForProtectedRoutes').mockResolvedValue(undefined);
             const resetRootSpy = jest.spyOn(navigationRef, 'resetRoot').mockImplementation(() => {});
 
-            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, '/search?q=status:outstanding');
+            SessionUtil.signInWithShortLivedAuthToken('testAuthToken', true, '/search?q=status:outstanding', 'user@saml.example.com');
             await waitForBatchedUpdates();
 
             expect(resetRootSpy).not.toHaveBeenCalled();
diff --git a/tests/actions/TransactionTest.ts b/tests/actions/TransactionTest.ts
index 40eecc422a6e..bbf8e9c8b945 100644
--- a/tests/actions/TransactionTest.ts
+++ b/tests/actions/TransactionTest.ts
@@ -20,7 +20,7 @@ import IntlStore from '@src/languages/IntlStore';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
 import DateUtils from '@src/libs/DateUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Policy, Report, ReportActions, ReportNameValuePairs} from '@src/types/onyx';
+import type {CardList, PersonalDetailsList, Policy, Report, ReportActions, ReportNameValuePairs} from '@src/types/onyx';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type Transaction from '@src/types/onyx/Transaction';
@@ -29,6 +29,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 
 import {format} from 'date-fns';
 import Onyx from 'react-native-onyx';
+import {createCashCard} from 'tests/utils/collections/card';
 import createRandomReportAction from 'tests/utils/collections/reportActions';
 
 import {changeTransactionsReport as changeTransactionsReportAction, clearError} from '../../src/libs/actions/Transaction';
@@ -133,6 +134,7 @@ const CARLOS_EMAIL = 'cmartins@expensifail.com';
 const CARLOS_ACCOUNT_ID = 1;
 const RORY_EMAIL = 'rory@expensifail.com';
 const RORY_ACCOUNT_ID = 3;
+const RORY_CASH_CARD_ID = 777;
 
 const getTransactionAndExpenseReports = (reportID: string) => {
     const transactionReport = getReportOrDraftReport(reportID);
@@ -341,6 +343,7 @@ describe('actions/Transaction', () => {
                 transactionViolations: {},
                 selfDMReportActions,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
 
             let updatedTransaction: OnyxEntry<Transaction>;
@@ -450,6 +453,7 @@ describe('actions/Transaction', () => {
                 reports: allReports,
                 selfDMReportActions: {[trackedExpenseAction.reportActionID]: trackedExpenseAction},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -551,6 +555,7 @@ describe('actions/Transaction', () => {
                 reports: reportsSubset.current,
                 selfDMReportActions,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -649,6 +654,7 @@ describe('actions/Transaction', () => {
                 personalPolicyOutputCurrency: 'EUR',
                 reports: undefined,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -661,6 +667,142 @@ describe('actions/Transaction', () => {
             expect(updated?.modifiedMerchant).toContain('mi');
         });
 
+        describe('unheldTotal', () => {
+            const SOURCE_REPORT_ID = 'source-unheld-total';
+            const DESTINATION_REPORT_ID = 'destination-unheld-total';
+            const UNHELD_TRANSACTION_ID = 'txn-unheld';
+            const HELD_TRANSACTION_ID = 'txn-held';
+
+            /**
+             * Seeds a source report carrying a $10 unheld expense and a $20 held expense (so `unheldTotal` is
+             * deliberately not equal to `total`), plus an empty destination report, then moves one of them.
+             */
+            async function moveExpense(transactionIDToMove: string, sourceUnheldTotals: Partial<Report> = {unheldTotal: -1000}) {
+                const policyID = generatePolicyID();
+                const policy: Policy = {...createRandomPolicy(4, CONST.POLICY.TYPE.TEAM, 'Hold Workspace'), id: policyID, outputCurrency: CONST.CURRENCY.USD};
+
+                const sourceReport = {
+                    reportID: SOURCE_REPORT_ID,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                    policyID,
+                    currency: CONST.CURRENCY.USD,
+                    ownerAccountID: RORY_ACCOUNT_ID,
+                    stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                    statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                    total: -3000,
+                    ...sourceUnheldTotals,
+                    transactionCount: 2,
+                } as Report;
+
+                const destinationReport = {
+                    reportID: DESTINATION_REPORT_ID,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                    policyID,
+                    currency: CONST.CURRENCY.USD,
+                    ownerAccountID: RORY_ACCOUNT_ID,
+                    stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                    statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                    total: 0,
+                    unheldTotal: 0,
+                    transactionCount: 0,
+                } as Report;
+
+                const unheldTransaction: Transaction = {
+                    transactionID: UNHELD_TRANSACTION_ID,
+                    reportID: SOURCE_REPORT_ID,
+                    amount: -1000,
+                    currency: CONST.CURRENCY.USD,
+                    merchant: 'Unheld',
+                    created: format(new Date(), CONST.DATE.FNS_FORMAT_STRING),
+                    reimbursable: true,
+                };
+
+                const heldTransaction: Transaction = {
+                    transactionID: HELD_TRANSACTION_ID,
+                    reportID: SOURCE_REPORT_ID,
+                    amount: -2000,
+                    currency: CONST.CURRENCY.USD,
+                    merchant: 'Held',
+                    created: format(new Date(), CONST.DATE.FNS_FORMAT_STRING),
+                    reimbursable: true,
+                    comment: {hold: 'holdReportActionID'},
+                };
+
+                await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, policy);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${SOURCE_REPORT_ID}`, sourceReport);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`, destinationReport);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${UNHELD_TRANSACTION_ID}`, unheldTransaction);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${HELD_TRANSACTION_ID}`, heldTransaction);
+                await waitForBatchedUpdates();
+
+                let reports: OnyxCollection<Report>;
+                await getOnyxData({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    callback: (value) => {
+                        reports = value;
+                    },
+                });
+
+                changeTransactionsReport({
+                    transactionIDs: [transactionIDToMove],
+                    isASAPSubmitBetaEnabled: false,
+                    isVendorMatchingBetaEnabled: false,
+                    accountID: RORY_ACCOUNT_ID,
+                    email: RORY_EMAIL,
+                    newReport: destinationReport,
+                    policy,
+                    allTransactions: {
+                        [`${ONYXKEYS.COLLECTION.TRANSACTION}${UNHELD_TRANSACTION_ID}`]: unheldTransaction,
+                        [`${ONYXKEYS.COLLECTION.TRANSACTION}${HELD_TRANSACTION_ID}`]: heldTransaction,
+                    },
+                    policyTagList: undefined,
+                    transactionViolations: {},
+                    reports,
+                    isTrackIntentUser: false,
+                    cardList: undefined,
+                });
+                await waitForBatchedUpdates();
+
+                return {
+                    source: await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${SOURCE_REPORT_ID}`),
+                    destination: await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT}${DESTINATION_REPORT_ID}`),
+                };
+            }
+
+            it('should move the amount out of unheldTotal on both reports when the expense is not on hold', async () => {
+                // When the $10 unheld expense is moved to the destination report
+                const {source, destination} = await moveExpense(UNHELD_TRANSACTION_ID);
+
+                // Then it leaves the source unheldTotal and arrives in the destination unheldTotal
+                expect(source?.total).toBe(-2000);
+                expect(source?.unheldTotal).toBe(0);
+                expect(destination?.total).toBe(-1000);
+                expect(destination?.unheldTotal).toBe(-1000);
+            });
+
+            it('should leave unheldTotal untouched on both reports when the expense is on hold', async () => {
+                // When the $20 held expense is moved to the destination report
+                const {source, destination} = await moveExpense(HELD_TRANSACTION_ID);
+
+                // Then only `total` moves, because a held expense was never counted in unheldTotal
+                expect(source?.total).toBe(-1000);
+                expect(source?.unheldTotal).toBe(-1000);
+                expect(destination?.total).toBe(-2000);
+                expect(destination?.unheldTotal).toBe(0);
+            });
+
+            it('should not add unheldTotal to a report that does not have one', async () => {
+                // Given a source report without unheldTotal, whose unheld amount is derived from its siblings instead
+                // When the $10 unheld expense is moved to the destination report
+                const {source} = await moveExpense(UNHELD_TRANSACTION_ID, {unheldReimbursableTotal: -1000});
+
+                // Then the source report still has no unheldTotal, because `getNonHeldAndFullAmount` would read a
+                // seeded value in preference to the correct derived sum
+                expect(source?.total).toBe(-2000);
+                expect(source).not.toHaveProperty('unheldTotal');
+            });
+        });
+
         describe('moved system messages', () => {
             const TRANSACTION_ID = 'txn-moved-message';
             const TRANSACTION_THREAD_REPORT_ID = 'txn-thread-moved-message';
@@ -684,6 +826,10 @@ describe('actions/Transaction', () => {
                     ...sourceReportStatus,
                 } as Report;
 
+                const cardList: CardList = {
+                    [RORY_CASH_CARD_ID]: createCashCard(RORY_ACCOUNT_ID, RORY_CASH_CARD_ID),
+                };
+
                 const transaction: Transaction = {
                     transactionID: TRANSACTION_ID,
                     reportID: SOURCE_REPORT_ID,
@@ -691,6 +837,7 @@ describe('actions/Transaction', () => {
                     currency: CONST.CURRENCY.USD,
                     merchant: 'Test Merchant',
                     created: format(new Date(), CONST.DATE.FNS_FORMAT_STRING),
+                    cardID: RORY_CASH_CARD_ID,
                 };
 
                 // The IOU action links the expense to its transaction thread, which is where moved messages land.
@@ -744,6 +891,7 @@ describe('actions/Transaction', () => {
                     transactionViolations: {},
                     reports,
                     isTrackIntentUser: false,
+                    cardList,
                 });
                 await waitForBatchedUpdates();
 
@@ -1470,7 +1618,20 @@ describe('actions/Transaction', () => {
 
                 // Put the expense on hold
                 if (originalTransactionID && transactionThreadReportID) {
-                    putOnHold(originalTransactionID, 'Test hold reason', transactionThreadReportID, false, RORY_EMAIL, RORY_ACCOUNT_ID, [], false, undefined, {rules: undefined});
+                    const originalTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${originalTransactionID}`);
+                    putOnHold({
+                        transactionID: originalTransactionID,
+                        transaction: originalTransaction,
+                        comment: 'Test hold reason',
+                        initialReportID: transactionThreadReportID,
+                        isOffline: false,
+                        currentUserLogin: RORY_EMAIL,
+                        currentUserAccountID: RORY_ACCOUNT_ID,
+                        transactionViolations: [],
+                        isTrackIntentUser: false,
+                        delegateAccountID: undefined,
+                        rules: undefined,
+                    });
                 }
                 await waitForBatchedUpdates();
 
diff --git a/tests/actions/WorkflowTest.ts b/tests/actions/WorkflowTest.ts
index f29a84c6e545..bed7f571639d 100644
--- a/tests/actions/WorkflowTest.ts
+++ b/tests/actions/WorkflowTest.ts
@@ -1,3 +1,4 @@
+import {WRITE_COMMANDS} from '@libs/API/types';
 import {INITIAL_APPROVAL_WORKFLOW} from '@libs/WorkflowUtils';
 
 import CONST from '@src/CONST';
@@ -10,14 +11,24 @@ import {
     createApprovalWorkflowRules,
     removeApprovalWorkflow,
     removeApprovalWorkflowRules,
+    saveFastEditApprovalWorkflow,
     setApprovalWorkflowApprover,
     updateApprovalWorkflow,
     updateApprovalWorkflowRules,
 } from '@src/libs/actions/Workflow';
-import {calculateApprovers, convertApprovalWorkflowRulesToWorkflows, extractSubmitterEmails, getApprovalWorkflowRulesForPolicy} from '@src/libs/WorkflowUtils';
+import {isApprovalWorkflowRule} from '@src/libs/RuleUtils';
+import {
+    buildApprovalWorkflowRules,
+    calculateApprovers,
+    convertApprovalWorkflowRulesToWorkflows,
+    convertPolicyEmployeesToApprovalWorkflows,
+    extractSubmitterEmails,
+    getApprovalWorkflowRulesForPolicy,
+} from '@src/libs/WorkflowUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ApprovalWorkflowOnyx, PersonalDetailsList, Policy, Policy as PolicyType, Report} from '@src/types/onyx';
 import type {Approver} from '@src/types/onyx/ApprovalWorkflow';
+import type {ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
 import type Rule from '@src/types/onyx/Rule';
 
 import type {OnyxCollection} from 'react-native-onyx';
@@ -29,7 +40,7 @@ import type {MockFetch} from '../utils/TestHelper';
 import createRandomPolicy from '../utils/collections/policies';
 import createMock from '../utils/createMock';
 import getOnyxValue from '../utils/getOnyxValue';
-import {createGlobalFetchMock, getOnyxData} from '../utils/TestHelper';
+import {createGlobalFetchMock, getFetchMockCalls, getOnyxData} from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 jest.mock('@src/libs/WorkflowUtils', () => {
@@ -54,6 +65,7 @@ OnyxUpdateManager();
 const employee1Email = 'test1@gmail.com';
 const employee2Email = 'test2@gmail.com';
 const employee3Email = 'test3@gmail.com';
+const employee4Email = 'test4@gmail.com';
 const ownerEmail = 'owner@gmail.com';
 
 /**
@@ -71,10 +83,16 @@ async function getRulesCollection(): Promise<OnyxCollection<Rule>> {
     return collection;
 }
 
-async function getActivePolicyRules(policyID: string): Promise<Rule[]> {
+/** The rules collection also holds rules of other kinds, so these tests narrow it to approval workflow rules. */
+async function getActivePolicyRules(policyID: string): Promise<Array<Rule & ApprovalWorkflowRule>> {
     const collection = await getRulesCollection();
     return Object.values(collection ?? {}).filter(
-        (rule): rule is Rule => !!rule && rule.scope === CONST.RULES.SCOPE.POLICY && rule.scopeID === policyID && rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        (rule): rule is Rule & ApprovalWorkflowRule =>
+            !!rule &&
+            rule.scope === CONST.RULES.SCOPE.POLICY &&
+            rule.scopeID === policyID &&
+            rule.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
+            isApprovalWorkflowRule(rule),
     );
 }
 
@@ -92,21 +110,21 @@ async function createForwardApproveRules(policyID: string, submitters: string[],
     await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}${keyPrefix}1`, {
         scope: CONST.RULES.SCOPE.POLICY,
         scopeID: policyID,
-        triggers: indexMap(CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT),
+        triggers: indexMap(CONST.RULES.TRIGGERS.REPORT_SUBMIT),
         filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: submitters},
-        actions: indexMap({name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver}),
+        actions: indexMap({name: CONST.RULES.ACTIONS.FORWARD_TO, approver}),
         ...defaultMarker,
     });
     await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}${keyPrefix}2`, {
         scope: CONST.RULES.SCOPE.POLICY,
         scopeID: policyID,
-        triggers: indexMap(CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE),
+        triggers: indexMap(CONST.RULES.TRIGGERS.REPORT_APPROVE),
         filters: {
             operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
             left: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: submitters},
             right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: approver},
         },
-        actions: indexMap({name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.APPROVE_REPORT}),
+        actions: indexMap({name: CONST.RULES.ACTIONS.APPROVE_REPORT}),
         ...defaultMarker,
     });
 }
@@ -503,6 +521,55 @@ describe('actions/Workflow', () => {
 
             expect(completeTaskMock).not.toHaveBeenCalled();
         });
+
+        it('makes a workflow with everyone in it the default workflow', async () => {
+            mockFetch.pause();
+
+            // Given a default workflow that routes everyone through the owner and then employee3
+            const everyone = [ownerEmail, employee1Email, employee2Email, employee3Email];
+            const policy = createMock<Policy>({
+                id: '123456789',
+                name: 'Test Workspace',
+                role: 'admin',
+                type: 'corporate',
+                owner: ownerEmail,
+                approver: ownerEmail,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                employeeList: Object.fromEntries(
+                    everyone.map((email) => [email, {email, role: email === ownerEmail ? 'admin' : 'user', submitsTo: ownerEmail, forwardsTo: email === ownerEmail ? employee3Email : ''}]),
+                ),
+            });
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+            await Onyx.merge(ONYXKEYS.SESSION, {authToken: '123456789'});
+            await waitForBatchedUpdates();
+
+            // When a workflow approved by employee1 is created with everyone in it, as the default workflow
+            createApprovalWorkflow({
+                approvalWorkflow: {
+                    members: everyone.map((email) => ({email, displayName: email})),
+                    approvers: [{email: employee1Email, displayName: employee1Email, isCircularReference: false}],
+                    isDefault: true,
+                },
+                policy,
+                addExpenseApprovalsTaskReport: undefined,
+            });
+            await waitForBatchedUpdates();
+
+            // Then employee1 becomes the policy's default approver, both optimistically and in the request
+            const updatedPolicy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`);
+            expect(updatedPolicy?.approver).toBe(employee1Email);
+            const requestBody = getFetchMockCalls(WRITE_COMMANDS.CREATE_WORKSPACE_APPROVAL).at(0)?.[1]?.body;
+            expect(requestBody instanceof FormData ? requestBody.get('defaultApprover') : undefined).toBe(employee1Email);
+
+            // Then the new workflow is the only one left, so the old default workflow with its second approver is gone
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy: updatedPolicy, personalDetails: {}, localeCompare: (a: string, b: string) => a.localeCompare(b)});
+            expect(approvalWorkflows).toHaveLength(1);
+            expect(approvalWorkflows.at(0)?.isDefault).toBe(true);
+            expect(approvalWorkflows.at(0)?.approvers.map((approver) => approver.email)).toEqual([employee1Email]);
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
     });
 
     describe('removeApprovalWorkflow', () => {
@@ -944,14 +1011,14 @@ describe('actions/Workflow', () => {
             const rules = await getActivePolicyRules(policyID);
             expect(rules).toHaveLength(2);
 
-            const submitRule = rules.find((rule) => Object.values(rule.triggers).includes(CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT));
+            const submitRule = rules.find((rule) => Object.values(rule.triggers).includes(CONST.RULES.TRIGGERS.REPORT_SUBMIT));
             expect(submitRule?.scope).toBe(CONST.RULES.SCOPE.POLICY);
             expect(submitRule?.scopeID).toBe(policyID);
             expect(submitRule?.filters).toEqual({operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: [employee1Email]});
-            expect(submitRule?.actions[1]).toEqual({name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: ownerEmail});
+            expect(submitRule?.actions[1]).toEqual({name: CONST.RULES.ACTIONS.FORWARD_TO, approver: ownerEmail});
 
-            const approveRule = rules.find((rule) => Object.values(rule.triggers).includes(CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE));
-            expect(approveRule?.actions[1]).toEqual({name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.APPROVE_REPORT});
+            const approveRule = rules.find((rule) => Object.values(rule.triggers).includes(CONST.RULES.TRIGGERS.REPORT_APPROVE));
+            expect(approveRule?.actions[1]).toEqual({name: CONST.RULES.ACTIONS.APPROVE_REPORT});
 
             await mockFetch.resume();
             await waitForBatchedUpdates();
@@ -1196,7 +1263,7 @@ describe('actions/Workflow', () => {
             expect(rules.length).toBeGreaterThan(0);
             const forwardApprovers = rules
                 .flatMap((rule) => Object.values(rule.actions))
-                .filter((action) => action.name === CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO)
+                .filter((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)
                 .map((action) => action.approver);
             expect(forwardApprovers).toEqual([ownerEmail]);
             for (const rule of rules) {
@@ -1207,6 +1274,69 @@ describe('actions/Workflow', () => {
             await mockFetch.resume();
             await waitForBatchedUpdates();
         });
+
+        it('makes a workflow with everyone in it the default workflow, replacing a default workflow with two approvers', async () => {
+            mockFetch.pause();
+
+            const policyID = '123456789';
+            const everyone = [ownerEmail, employee1Email, employee2Email, employee3Email];
+            const everyoneAsMembers = everyone.map((email) => ({email, displayName: email}));
+            const policy: Policy = {
+                ...createRandomPolicy(1),
+                id: policyID,
+                owner: ownerEmail,
+                approver: ownerEmail,
+                employeeList: Object.fromEntries(everyone.map((email) => [email, {email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail}])),
+                rules: {},
+            };
+
+            // Given a rule-backed default workflow that routes everyone through the owner and then employee3
+            const defaultWorkflowRules = buildApprovalWorkflowRules({
+                members: everyoneAsMembers,
+                approvers: [ownerEmail, employee3Email].map((email) => ({email, displayName: email, isCircularReference: false})),
+                isDefault: true,
+            });
+            for (const [index, rule] of defaultWorkflowRules.entries()) {
+                await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}default${index}`, {...rule, scope: CONST.RULES.SCOPE.POLICY, scopeID: policyID});
+            }
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, policy);
+            await Onyx.merge(ONYXKEYS.SESSION, {authToken: '123456789'});
+            await waitForBatchedUpdates();
+
+            // When a workflow approved by employee1 is created with everyone in it, as the default workflow
+            createApprovalWorkflowRules({
+                approvalWorkflow: {
+                    members: everyoneAsMembers,
+                    approvers: [{email: employee1Email, displayName: employee1Email, isCircularReference: false}],
+                    isDefault: true,
+                },
+                policy,
+                addExpenseApprovalsTaskReport: undefined,
+                rules: await getRulesCollection(),
+            });
+            await waitForBatchedUpdates();
+
+            // Then employee1 becomes the policy's default approver
+            const updatedPolicy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+            expect(updatedPolicy?.approver).toBe(employee1Email);
+
+            // Then the new workflow is the only one left, so the old default workflow with its second approver is gone
+            const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                policy: updatedPolicy,
+                personalDetails: {},
+                localeCompare: (a: string, b: string) => a.localeCompare(b),
+                rules: getApprovalWorkflowRulesForPolicy(await getRulesCollection(), policyID),
+            });
+            expect(approvalWorkflows).toHaveLength(1);
+            expect(approvalWorkflows.at(0)?.isDefault).toBe(true);
+            expect(approvalWorkflows.at(0)?.approvers.map((approver) => approver.email)).toEqual([employee1Email]);
+            const memberEmails = approvalWorkflows.at(0)?.members.map((member) => member.email);
+            expect(memberEmails).toHaveLength(everyone.length);
+            expect(memberEmails).toEqual(expect.arrayContaining(everyone));
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
     });
 
     describe('updateApprovalWorkflowRules', () => {
@@ -1249,7 +1379,7 @@ describe('actions/Workflow', () => {
             const rules = await getActivePolicyRules(policyID);
             const forwardApprovers = rules
                 .flatMap((rule) => Object.values(rule.actions))
-                .filter((action) => action.name === CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO)
+                .filter((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)
                 .map((action) => action.approver);
             expect(forwardApprovers).toContain(employee2Email);
             expect(forwardApprovers).not.toContain(ownerEmail);
@@ -1433,6 +1563,88 @@ describe('actions/Workflow', () => {
             await mockFetch.resume();
             await waitForBatchedUpdates();
         });
+
+        it('E2E: taking a member out of a workflow lists them in the default workflow rules', async () => {
+            mockFetch.pause();
+
+            // Given a default workflow edited to approve through the owner and then employee3, and a custom workflow for
+            // employee1 and employee2 approved by employee4. employeeList still routes everyone to the owner alone,
+            // because saving workflows through rules doesn't touch it.
+            const policyID = '123456789';
+            const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+            const basePolicy: Policy = {
+                ...createRandomPolicy(1),
+                id: policyID,
+                owner: ownerEmail,
+                approver: ownerEmail,
+                employeeList: {
+                    [ownerEmail]: {email: ownerEmail, forwardsTo: '', role: CONST.POLICY.ROLE.ADMIN, submitsTo: ownerEmail},
+                    [employee1Email]: {email: employee1Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail},
+                    [employee2Email]: {email: employee2Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail},
+                    [employee3Email]: {email: employee3Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail},
+                    [employee4Email]: {email: employee4Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail},
+                },
+                rules: {},
+            };
+            await Onyx.set(policyKey, basePolicy);
+            await Onyx.merge(ONYXKEYS.SESSION, {authToken: '123456789'});
+            await waitForBatchedUpdates();
+
+            const buildMember = (email: string) => ({email, displayName: email});
+            const buildApprover = (email: string) => ({email, displayName: email, isCircularReference: false});
+
+            const defaultMembers = [ownerEmail, employee1Email, employee2Email, employee3Email, employee4Email].map(buildMember);
+            updateApprovalWorkflowRules({
+                approvalWorkflow: {members: defaultMembers, approvers: [buildApprover(ownerEmail), buildApprover(employee3Email)], isDefault: true},
+                initialApprovalWorkflow: {members: defaultMembers, approvers: [buildApprover(ownerEmail)], isDefault: true},
+                policy: await getOnyxValue(policyKey),
+                rules: await getRulesCollection(),
+            });
+            await waitForBatchedUpdates();
+
+            const customWorkflow = {members: [buildMember(employee1Email), buildMember(employee2Email)], approvers: [buildApprover(employee4Email)], isDefault: false};
+            createApprovalWorkflowRules({
+                approvalWorkflow: customWorkflow,
+                policy: await getOnyxValue(policyKey),
+                addExpenseApprovalsTaskReport: undefined,
+                rules: await getRulesCollection(),
+            });
+            await waitForBatchedUpdates();
+
+            // When employee2 is taken out of the custom workflow the way the edit page does, handing over the default
+            // workflow the converter resolves
+            const policyAfterCreate = await getOnyxValue(policyKey);
+            const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                policy: policyAfterCreate,
+                personalDetails: {},
+                localeCompare: (a: string, b: string) => a.localeCompare(b),
+                rules: getApprovalWorkflowRulesForPolicy(await getRulesCollection(), policyID),
+            });
+            updateApprovalWorkflowRules({
+                approvalWorkflow: {...customWorkflow, members: [buildMember(employee1Email)]},
+                initialApprovalWorkflow: customWorkflow,
+                policy: policyAfterCreate,
+                rules: await getRulesCollection(),
+                defaultApprovalWorkflow: approvalWorkflows.find((workflow) => workflow.isDefault),
+            });
+            await waitForBatchedUpdates();
+
+            // Then every rule of the default workflow lists employee2, so their reports go to the owner and then
+            // employee3 instead of following employeeList to the owner alone
+            const rules = await getActivePolicyRules(policyID);
+            const defaultRules = rules.filter((rule) => rule.isDefaultApprovalWorkflow);
+            const customRules = rules.filter((rule) => !rule.isDefaultApprovalWorkflow);
+            expect(defaultRules).toHaveLength(3);
+            for (const rule of defaultRules) {
+                expect(extractSubmitterEmails(rule)).toContain(employee2Email);
+            }
+            for (const rule of customRules) {
+                expect(extractSubmitterEmails(rule)).toEqual([employee1Email]);
+            }
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
     });
 
     describe('removeApprovalWorkflowRules', () => {
@@ -1508,7 +1720,7 @@ describe('actions/Workflow', () => {
             }
             const forwardApprovers = defaultRules
                 .flatMap((rule) => Object.values(rule.actions))
-                .filter((action) => action.name === CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO)
+                .filter((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)
                 .map((action) => action.approver);
             expect(forwardApprovers).toEqual([employee3Email]);
             expect(forwardApprovers).not.toContain(ownerEmail);
@@ -1517,6 +1729,118 @@ describe('actions/Workflow', () => {
             await waitForBatchedUpdates();
         });
 
+        it('E2E: deleting a workflow keeps a single default workflow when employeeList still routes members to an older default approver', async () => {
+            mockFetch.pause();
+
+            // Given a default workflow whose rules route employee3 to the owner, while employeeList still names employee1,
+            // who forwards to employee2, as the default approver. No rule covers employee1 or employee2, so employeeList
+            // routes them down that older chain. employee4 is in a custom workflow approved by employee3.
+            const policyID = '123456789';
+            const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+            const policy: Policy = {
+                ...createRandomPolicy(1),
+                id: policyID,
+                owner: ownerEmail,
+                approver: employee1Email,
+                employeeList: {
+                    [employee3Email]: {email: employee3Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: employee1Email},
+                    [employee1Email]: {email: employee1Email, forwardsTo: employee2Email, role: CONST.POLICY.ROLE.USER, submitsTo: employee1Email},
+                    [employee2Email]: {email: employee2Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: employee1Email},
+                    [employee4Email]: {email: employee4Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ''},
+                },
+                rules: {},
+            };
+            await Onyx.set(policyKey, policy);
+            await Onyx.merge(ONYXKEYS.SESSION, {authToken: '123456789'});
+            await createForwardApproveRules(policyID, [employee3Email], ownerEmail, 'default', true);
+            await createForwardApproveRules(policyID, [employee4Email], employee3Email, 'custom');
+            await waitForBatchedUpdates();
+
+            // When the custom workflow is deleted the way the edit page does, handing over the default workflow the
+            // converter resolves
+            const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                policy,
+                personalDetails: {},
+                localeCompare: (a: string, b: string) => a.localeCompare(b),
+                rules: getApprovalWorkflowRulesForPolicy(await getRulesCollection(), policyID),
+            });
+            const customWorkflow = approvalWorkflows.find((workflow) => workflow.approvers.at(0)?.email === employee3Email);
+            expect(customWorkflow).toBeDefined();
+            if (customWorkflow) {
+                removeApprovalWorkflowRules(
+                    customWorkflow,
+                    policy,
+                    await getRulesCollection(),
+                    approvalWorkflows.find((workflow) => workflow.isDefault),
+                );
+            }
+            await waitForBatchedUpdates();
+
+            // Then employee4 joins the default workflow's own rules. Writing the older employeeList chain as default rules
+            // would leave the policy with a second default workflow.
+            const rules = await getActivePolicyRules(policyID);
+            expect(rules).toHaveLength(2);
+            for (const rule of rules) {
+                expect(rule.isDefaultApprovalWorkflow).toBe(true);
+                expect(extractSubmitterEmails(rule)).toEqual([employee3Email, employee4Email]);
+            }
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
+
+        it('folds the removed members into the default workflow rules when handed a default workflow that routes differently', async () => {
+            mockFetch.pause();
+
+            // Given a rule-backed default workflow approved by the owner, and a default workflow approved by employee1 handed
+            // over for it, the way a default workflow resolved from stale data would be
+            const policyID = '123456789';
+            const policy: Policy = {
+                ...createRandomPolicy(1),
+                id: policyID,
+                owner: ownerEmail,
+                approver: ownerEmail,
+                employeeList: {
+                    [employee2Email]: {email: employee2Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ''},
+                    [employee3Email]: {email: employee3Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail},
+                },
+                rules: {},
+            };
+            await createForwardApproveRules(policyID, [employee3Email], ownerEmail, 'default', true);
+            await createForwardApproveRules(policyID, [employee2Email], employee3Email, 'custom');
+
+            const defaultApprovalWorkflow = {
+                members: [],
+                approvers: [{email: employee1Email, displayName: employee1Email, isCircularReference: false}],
+                isDefault: true,
+            };
+            const approvalWorkflow = {
+                members: [{email: employee2Email, displayName: employee2Email}],
+                approvers: [{email: employee3Email, displayName: employee3Email, isCircularReference: false}],
+                isDefault: false,
+            };
+
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, policy);
+            await Onyx.merge(ONYXKEYS.SESSION, {authToken: '123456789'});
+            await waitForBatchedUpdates();
+
+            // When the custom workflow is deleted
+            removeApprovalWorkflowRules(approvalWorkflow, policy, await getRulesCollection(), defaultApprovalWorkflow);
+            await waitForBatchedUpdates();
+
+            // Then employee2 joins the rules that already declare the default workflow, because new rules declaring
+            // themselves default would stand up a second default workflow next to them
+            const rules = await getActivePolicyRules(policyID);
+            expect(rules).toHaveLength(2);
+            for (const rule of rules) {
+                expect(rule.isDefaultApprovalWorkflow).toBe(true);
+                expect(extractSubmitterEmails(rule)).toEqual([employee3Email, employee2Email]);
+            }
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
+
         it('removes the rules that belong only to the workflow members', async () => {
             mockFetch.pause();
 
@@ -1601,6 +1925,58 @@ describe('actions/Workflow', () => {
             await waitForBatchedUpdates();
         });
 
+        it('lists the members of a workflow no rule covers in the rule-backed default workflow when it is deleted', async () => {
+            mockFetch.pause();
+
+            // Given a rule-backed default workflow approved by the owner, and employee1 in a workflow only employeeList
+            // describes. The backend rejects employeeList routing changes once a policy's approvals are rule-based.
+            const policyID = '123456789';
+            const policy: Policy = {
+                ...createRandomPolicy(1),
+                id: policyID,
+                owner: ownerEmail,
+                approver: ownerEmail,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                employeeList: {
+                    [employee1Email]: {email: employee1Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: employee2Email},
+                    [employee2Email]: {email: employee2Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail},
+                    [employee3Email]: {email: employee3Email, forwardsTo: '', role: CONST.POLICY.ROLE.USER, submitsTo: ownerEmail},
+                },
+                rules: {},
+            };
+            await createForwardApproveRules(policyID, [employee3Email], ownerEmail, 'default', true);
+
+            const defaultApprovalWorkflow = {
+                members: [{email: employee3Email, displayName: employee3Email}],
+                approvers: [{email: ownerEmail, displayName: ownerEmail, isCircularReference: false}],
+                isDefault: true,
+            };
+            const approvalWorkflow = {
+                members: [{email: employee1Email, displayName: employee1Email}],
+                approvers: [{email: employee2Email, displayName: employee2Email, isCircularReference: false}],
+                isDefault: false,
+            };
+
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, policy);
+            await Onyx.merge(ONYXKEYS.SESSION, {authToken: '123456789'});
+            await waitForBatchedUpdates();
+
+            // When that workflow is deleted
+            const didRemoveRules = removeApprovalWorkflowRules(approvalWorkflow, policy, await getRulesCollection(), defaultApprovalWorkflow);
+            await waitForBatchedUpdates();
+
+            // Then employee1 joins the default workflow's rules instead of the caller falling back to employeeList
+            expect(didRemoveRules).toBe(true);
+            const rules = await getActivePolicyRules(policyID);
+            expect(rules).toHaveLength(2);
+            for (const rule of rules) {
+                expect(extractSubmitterEmails(rule)).toEqual([employee3Email, employee1Email]);
+            }
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
+
         it('folds the removed workflow members into a rule-backed default workflow', async () => {
             mockFetch.pause();
 
@@ -1809,7 +2185,7 @@ describe('actions/Workflow', () => {
             expect(rules.length).toBeGreaterThan(0);
             const forwardApprovers = rules
                 .flatMap((rule) => Object.values(rule.actions))
-                .filter((action) => action.name === CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO)
+                .filter((action) => action.name === CONST.RULES.ACTIONS.FORWARD_TO)
                 .map((action) => action.approver);
             expect(forwardApprovers).toEqual([employee3Email]);
             expect(forwardApprovers).not.toContain(ownerEmail);
@@ -1822,4 +2198,129 @@ describe('actions/Workflow', () => {
             await waitForBatchedUpdates();
         });
     });
+
+    describe('saveFastEditApprovalWorkflow', () => {
+        const policyID = '123456789';
+
+        // [employee1, employee2] -> employee3, alongside the owner's default workflow
+        const policy = createMock<Policy>({
+            id: policyID,
+            name: 'Test Workspace',
+            role: 'admin',
+            type: 'corporate',
+            owner: ownerEmail,
+            approver: ownerEmail,
+            approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+            employeeList: {
+                [ownerEmail]: {email: ownerEmail, role: 'admin', submitsTo: ownerEmail, forwardsTo: ''},
+                [employee1Email]: {email: employee1Email, role: 'user', submitsTo: employee3Email, forwardsTo: ''},
+                [employee2Email]: {email: employee2Email, role: 'user', submitsTo: employee3Email, forwardsTo: ''},
+                [employee3Email]: {email: employee3Email, role: 'user', submitsTo: ownerEmail, forwardsTo: ''},
+            },
+        });
+
+        const employee1Member = {email: employee1Email, displayName: employee1Email};
+        const employee2Member = {email: employee2Email, displayName: employee2Email};
+        const employee3Approver = {email: employee3Email, displayName: employee3Email, isCircularReference: false};
+
+        function buildFastEditDraft(members: ApprovalWorkflowOnyx['members']): ApprovalWorkflowOnyx {
+            return {
+                members,
+                originalMembers: [employee1Member, employee2Member],
+                approvers: [employee3Approver],
+                originalApprovers: [employee3Approver],
+                availableMembers: [],
+                usedApproverEmails: [],
+                isDefault: false,
+                action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
+                isFastEdit: true,
+            };
+        }
+
+        async function seed(approvalWorkflow: ApprovalWorkflowOnyx) {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, policy);
+            await Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, approvalWorkflow);
+            await Onyx.merge(ONYXKEYS.SESSION, {authToken: '123456789'});
+            await waitForBatchedUpdates();
+        }
+
+        it('moves a deselected member back to the default approver and clears the draft', async () => {
+            mockFetch.pause();
+
+            // Given a "+N more" edit where employee2 was deselected
+            const approvalWorkflow = buildFastEditDraft([employee1Member]);
+            await seed(approvalWorkflow);
+
+            // When the fast edit is saved
+            saveFastEditApprovalWorkflow({approvalWorkflow, policy, rules: {}, isMultipleApproversBetaEnabled: false});
+            await waitForBatchedUpdates();
+
+            // Then employee2 submits to the default approver again, employee1 stays put, and the draft is gone
+            const updatedPolicy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+            expect(updatedPolicy?.employeeList?.[employee2Email]?.submitsTo).toBe(ownerEmail);
+            expect(updatedPolicy?.employeeList?.[employee1Email]?.submitsTo).toBe(employee3Email);
+            await expect(getOnyxValue(ONYXKEYS.APPROVAL_WORKFLOW)).resolves.toBeUndefined();
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
+
+        it('clears the draft even when nothing changed', async () => {
+            mockFetch.pause();
+
+            // Given a "+N more" edit saved with the original members, so updateApprovalWorkflow exits before its optimistic data
+            const approvalWorkflow = buildFastEditDraft([employee1Member, employee2Member]);
+            await seed(approvalWorkflow);
+
+            // When the fast edit is saved
+            saveFastEditApprovalWorkflow({approvalWorkflow, policy, rules: {}, isMultipleApproversBetaEnabled: false});
+            await waitForBatchedUpdates();
+
+            // Then the draft is still cleared, so the next "+N more" starts clean
+            await expect(getOnyxValue(ONYXKEYS.APPROVAL_WORKFLOW)).resolves.toBeUndefined();
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
+
+        it('drops a deselected member from the workflow rules when the rules beta is on', async () => {
+            mockFetch.pause();
+
+            // Given the [employee1, employee2] -> employee3 workflow stored as rules, and a "+N more" edit where employee2 was deselected,
+            // with the owner's default workflow on the draft the way the workflows page stores it
+            await createForwardApproveRules(policyID, [employee1Email, employee2Email], employee3Email);
+            const defaultApprovalWorkflow = {
+                members: [
+                    {email: ownerEmail, displayName: ownerEmail},
+                    {email: employee3Email, displayName: employee3Email},
+                ],
+                approvers: [{email: ownerEmail, displayName: ownerEmail, isCircularReference: false}],
+                isDefault: true,
+            };
+            const approvalWorkflow = {...buildFastEditDraft([employee1Member]), defaultApprovalWorkflow};
+            await seed(approvalWorkflow);
+
+            // When the fast edit is saved with the rules beta on
+            saveFastEditApprovalWorkflow({approvalWorkflow, policy, rules: await getRulesCollection(), isMultipleApproversBetaEnabled: true});
+            await waitForBatchedUpdates();
+
+            // Then the rules that route to employee3 only list employee1 as a submitter, every rule of the default workflow
+            // lists employee2 so their reports go to the owner, and the draft is gone
+            const rules = await getActivePolicyRules(policyID);
+            const workflowRules = rules.filter((rule) => Object.values(rule.actions).some((action) => action.approver === employee3Email));
+            expect(workflowRules.length).toBeGreaterThan(0);
+            for (const rule of workflowRules) {
+                expect(extractSubmitterEmails(rule)).toEqual([employee1Email]);
+            }
+            const defaultRules = rules.filter((rule) => rule.isDefaultApprovalWorkflow);
+            expect(defaultRules.length).toBeGreaterThan(0);
+            for (const rule of defaultRules) {
+                expect(extractSubmitterEmails(rule)).toContain(employee2Email);
+            }
+            await expect(getOnyxValue(ONYXKEYS.APPROVAL_WORKFLOW)).resolves.toBeUndefined();
+
+            await mockFetch.resume();
+            await waitForBatchedUpdates();
+        });
+    });
 });
diff --git a/tests/actions/connections/BusinessCentral.ts b/tests/actions/connections/BusinessCentral.ts
index 3500ae84423f..7ed721f2a039 100644
--- a/tests/actions/connections/BusinessCentral.ts
+++ b/tests/actions/connections/BusinessCentral.ts
@@ -6,8 +6,16 @@ import {
     clearBusinessCentralErrorField,
     connectToBusinessCentral,
     updateBusinessCentralCompany,
+    updateBusinessCentralDefaultVendor,
     updateBusinessCentralEnableNewCategories,
+    updateBusinessCentralExportDate,
+    updateBusinessCentralExporter,
     updateBusinessCentralFieldMapping,
+    updateBusinessCentralNonReimbursableAccount,
+    updateBusinessCentralNonReimbursableExpensesExportDestination,
+    updateBusinessCentralPaymentMethod,
+    updateBusinessCentralReimbursableAccount,
+    updateBusinessCentralReimbursableExpensesExportDestination,
     updateBusinessCentralSyncItems,
     updateBusinessCentralSyncTaxRates,
 } from '@src/libs/actions/connections/BusinessCentral';
@@ -409,4 +417,162 @@ describe('actions/connections/BusinessCentral', () => {
             });
         });
     });
+
+    describe('export settings', () => {
+        const exportCases = [
+            {
+                name: 'updateBusinessCentralExporter',
+                update: () => updateBusinessCentralExporter(MOCK_POLICY_ID, 'exporter@example.com', 'owner@example.com'),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_EXPORTER,
+                parameters: {email: 'exporter@example.com'},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.EXPORTER,
+                value: 'exporter@example.com',
+            },
+            {
+                name: 'updateBusinessCentralExportDate',
+                update: () => updateBusinessCentralExportDate(MOCK_POLICY_ID, CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED, CONST.BUSINESS_CENTRAL_EXPORT_DATE.LAST_EXPENSE),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_EXPORT_DATE,
+                parameters: {value: CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.EXPORT_DATE,
+                value: CONST.BUSINESS_CENTRAL_EXPORT_DATE.REPORT_SUBMITTED,
+            },
+            {
+                name: 'updateBusinessCentralReimbursableExpensesExportDestination',
+                update: () =>
+                    updateBusinessCentralReimbursableExpensesExportDestination(
+                        MOCK_POLICY_ID,
+                        CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE,
+                        CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY,
+                    ),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION,
+                parameters: {value: CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE,
+                value: CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE,
+            },
+            {
+                name: 'updateBusinessCentralNonReimbursableExpensesExportDestination',
+                update: () =>
+                    updateBusinessCentralNonReimbursableExpensesExportDestination(
+                        MOCK_POLICY_ID,
+                        CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY,
+                        CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.PURCHASE_INVOICE,
+                    ),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION,
+                parameters: {value: CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE,
+                value: CONST.BUSINESS_CENTRAL_EXPORT_DESTINATION.JOURNAL_ENTRY,
+            },
+            {
+                name: 'updateBusinessCentralReimbursableAccount',
+                update: () => updateBusinessCentralReimbursableAccount(MOCK_POLICY_ID, 'bank-2', 'bank-1'),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_REIMBURSABLE_ACCOUNT,
+                parameters: {value: 'bank-2'},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT,
+                value: 'bank-2',
+            },
+            {
+                name: 'updateBusinessCentralNonReimbursableAccount',
+                update: () => updateBusinessCentralNonReimbursableAccount(MOCK_POLICY_ID, 'bank-2', 'bank-1'),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_NONREIMBURSABLE_ACCOUNT,
+                parameters: {value: 'bank-2'},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.NON_REIMBURSABLE_ACCOUNT,
+                value: 'bank-2',
+            },
+            {
+                name: 'updateBusinessCentralDefaultVendor',
+                update: () => updateBusinessCentralDefaultVendor(MOCK_POLICY_ID, 'vendor-2', 'vendor-1'),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_DEFAULT_VENDOR,
+                parameters: {vendorID: 'vendor-2'},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID,
+                value: 'vendor-2',
+            },
+            {
+                name: 'updateBusinessCentralPaymentMethod',
+                update: () => updateBusinessCentralPaymentMethod(MOCK_POLICY_ID, 'BANK', 'CASH'),
+                command: WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_PAYMENT_METHOD,
+                parameters: {value: 'BANK'},
+                settingName: CONST.BUSINESS_CENTRAL_CONFIG.PAYMENT_METHOD_CODE,
+                value: 'BANK',
+            },
+        ];
+
+        it.each(exportCases)('$name sends the request parameter the backend reads and optimistically updates the export config', ({update, command, parameters, settingName, value}) => {
+            // Given a connected policy
+            // When an admin changes an export setting
+            update();
+
+            // Then the command carries the parameter name Web-Expensify reads, and the export config shows the new value as pending so the row updates instantly
+            expect(writeSpy).toHaveBeenCalledWith(command, {policyID: MOCK_POLICY_ID, ...parameters}, expect.anything());
+            expect(getFirstWriteOnyxData()).toMatchObject({
+                optimisticData: [
+                    {
+                        key: POLICY_KEY,
+                        value: {
+                            connections: {
+                                businessCentral: {
+                                    config: {
+                                        export: {[settingName]: value},
+                                        pendingFields: {[settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                        errorFields: {[settingName]: null},
+                                    },
+                                },
+                            },
+                        },
+                    },
+                ],
+                successData: [
+                    {
+                        key: POLICY_KEY,
+                        value: {connections: {businessCentral: {config: {pendingFields: {[settingName]: null}}}}},
+                    },
+                ],
+            });
+        });
+
+        it('rolls an export setting back to the old value and sets an error on failure', () => {
+            // Given a policy whose default vendor is vendor-1
+            // When an admin picks vendor-2
+            updateBusinessCentralDefaultVendor(MOCK_POLICY_ID, 'vendor-2', 'vendor-1');
+
+            // Then on failure the export config goes back to vendor-1 and the row shows an error, so the admin sees the change was not saved
+            expect(getFirstWriteOnyxData()).toMatchObject({
+                failureData: [
+                    {
+                        key: POLICY_KEY,
+                        value: {
+                            connections: {
+                                businessCentral: {
+                                    config: {
+                                        export: {[CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID]: 'vendor-1'},
+                                        pendingFields: {[CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID]: null},
+                                        errorFields: {[CONST.BUSINESS_CENTRAL_CONFIG.DEFAULT_VENDOR_ID]: ANY_VALUE},
+                                    },
+                                },
+                            },
+                        },
+                    },
+                ],
+            });
+        });
+
+        it('rolls back to no value when the setting was never saved', () => {
+            // Given a policy that has never had a reimbursable account set
+            // When an admin picks one
+            updateBusinessCentralReimbursableAccount(MOCK_POLICY_ID, 'bank-1');
+
+            // Then on failure the account is cleared again rather than left on the rejected value
+            expect(getFirstWriteOnyxData()).toMatchObject({
+                failureData: [{key: POLICY_KEY, value: {connections: {businessCentral: {config: {export: {[CONST.BUSINESS_CENTRAL_CONFIG.REIMBURSABLE_ACCOUNT]: null}}}}}}],
+            });
+        });
+
+        it('clears the payment method with an empty code', () => {
+            // Given a policy with a payment method set
+            // When an admin picks None
+            updateBusinessCentralPaymentMethod(MOCK_POLICY_ID, '', 'BANK');
+
+            // Then an empty code is sent, which Web-Expensify accepts as clearing the payment method
+            expect(writeSpy).toHaveBeenCalledWith(WRITE_COMMANDS.UPDATE_BUSINESS_CENTRAL_PAYMENT_METHOD, {policyID: MOCK_POLICY_ID, value: ''}, expect.anything());
+        });
+    });
 });
diff --git a/tests/navigation/WorkArrangementRouteTests.tsx b/tests/navigation/WorkArrangementRouteTests.tsx
new file mode 100644
index 000000000000..088301c918a4
--- /dev/null
+++ b/tests/navigation/WorkArrangementRouteTests.tsx
@@ -0,0 +1,93 @@
+import {render} from '@testing-library/react-native';
+
+import {SettingsModalStackNavigator} from '@libs/Navigation/AppNavigator/ModalStackNavigators';
+import getStateFromPath from '@libs/Navigation/helpers/getStateFromPath';
+import {config} from '@libs/Navigation/linkingConfig/config';
+import WORKSPACE_TO_RHP from '@libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP';
+
+import type {SettingsNavigatorParamList} from '@navigation/types';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+
+import {createNavigationContainerRef, NavigationContainer} from '@react-navigation/native';
+import React from 'react';
+
+jest.mock('@hooks/useThemeStyles', () => () => ({modalStackNavigatorContainer: {}, modalStackNavigatorContainerWidth: () => ({})}));
+jest.mock('@libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions', () => () => () => ({}));
+jest.mock('@pages/workspace/members/WorkArrangementPage', () => ({__esModule: true, default: () => null}));
+
+describe('Work arrangement route', () => {
+    function isRecord(value: unknown): value is Record<string, unknown> {
+        return typeof value === 'object' && value !== null;
+    }
+
+    function findScreenPath(screens: unknown): string | undefined {
+        if (!isRecord(screens)) {
+            return undefined;
+        }
+
+        for (const [screenName, configEntry] of Object.entries(screens)) {
+            if (screenName === SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT && isRecord(configEntry) && typeof configEntry.path === 'string') {
+                return configEntry.path;
+            }
+            if (isRecord(configEntry) && 'screens' in configEntry) {
+                const path = findScreenPath(configEntry.screens);
+                if (path) {
+                    return path;
+                }
+            }
+        }
+    }
+
+    it('builds the member selector path from the policy and account IDs', () => {
+        // Given a workspace policy and a member account
+        const policyID = 'policy123';
+        const accountID = 12345;
+
+        // When the work arrangement route is generated
+        const path = ROUTES.WORKSPACE_MEMBER_WORK_ARRANGEMENT.getRoute(policyID, accountID);
+
+        // Then it includes both route parameters
+        expect(ROUTES.WORKSPACE_MEMBER_WORK_ARRANGEMENT.route).toBe('workspaces/:policyID/members/:accountID/work-arrangement');
+        expect(path).toBe(`workspaces/${policyID}/members/${accountID}/work-arrangement`);
+    });
+
+    it('registers the member selector as a workspace members RHP route', () => {
+        // Given the workspace linking configuration
+        // When the screen and RHP relationships are checked
+        const arrangementPath = findScreenPath(config?.screens);
+
+        // Then direct links resolve to the workspace member RHP
+        expect(arrangementPath).toBe(ROUTES.WORKSPACE_MEMBER_WORK_ARRANGEMENT.route);
+        expect(WORKSPACE_TO_RHP[SCREENS.WORKSPACE.MEMBERS]).toContain(SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT);
+    });
+
+    it('loads the selector from its workspace deep link in the settings modal stack', () => {
+        // Given a deep link to a workspace member's work arrangement
+        const path = ROUTES.WORKSPACE_MEMBER_WORK_ARRANGEMENT.getRoute('policy123', 12345);
+        const modalState = getStateFromPath(path).routes.find((route) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR)?.state;
+        const settingsState = modalState?.routes.find((route) => route.name === SCREENS.RIGHT_MODAL.SETTINGS)?.state;
+        expect(settingsState).toBeDefined();
+        const navigation = createNavigationContainerRef<SettingsNavigatorParamList>();
+
+        // When the URL state is rendered by the registered settings modal navigator
+        render(
+            <NavigationContainer
+                ref={navigation}
+                initialState={settingsState}
+            >
+                <SettingsModalStackNavigator />
+            </NavigationContainer>,
+        );
+
+        // Then the lazy screen is loaded with the workspace and member route parameters
+        expect(navigation.getCurrentRoute()).toEqual(
+            expect.objectContaining({
+                name: SCREENS.WORKSPACE.MEMBER_WORK_ARRANGEMENT,
+                params: {policyID: 'policy123', accountID: '12345'},
+            }),
+        );
+    });
+});
diff --git a/tests/navigation/testToolsModalReloadTests.ts b/tests/navigation/testToolsModalReloadTests.ts
new file mode 100644
index 000000000000..c0c6a1cabc1f
--- /dev/null
+++ b/tests/navigation/testToolsModalReloadTests.ts
@@ -0,0 +1,48 @@
+import getAdaptedStateFromPath from '@libs/Navigation/helpers/getAdaptedStateFromPath';
+import getPathFromState from '@libs/Navigation/helpers/getPathFromState';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+
+const SEARCH_PATH = '/search?q=type:expense';
+const SERVER_PATH_WITH_ORIGIN = `/${ROUTES.TEST_TOOLS_SERVER.getRoute(SEARCH_PATH)}`;
+
+function getState(path: string) {
+    const state = getAdaptedStateFromPath(path, undefined);
+    const modalRoute = state?.routes.find((route) => route.name === NAVIGATORS.TEST_TOOLS_MODAL_NAVIGATOR);
+    const tabRoute = state?.routes.find((route) => route.name === NAVIGATORS.TAB_NAVIGATOR);
+
+    return {
+        serverParams: modalRoute?.state?.routes?.find((route) => route.name === SCREENS.TEST_TOOLS_MODAL.SERVER)?.params,
+        screensInModal: modalRoute?.state?.routes?.map((route) => route.name),
+        screensUnderneath: tabRoute?.state?.routes?.map((route) => route.name),
+    };
+}
+
+describe('reloading the test tools server page', () => {
+    it('keeps the page the modal was opened from in the URL', () => {
+        expect(SERVER_PATH_WITH_ORIGIN).toBe(`/test-tools/server?backTo=${encodeURIComponent(SEARCH_PATH)}`);
+    });
+
+    it('hands that page to the selector, so closing the modal can return there', () => {
+        expect(getState(SERVER_PATH_WITH_ORIGIN).serverParams).toEqual({backTo: SEARCH_PATH});
+    });
+
+    it('rebuilds the test tools menu underneath, so going back stays in the modal', () => {
+        expect(getState(SERVER_PATH_WITH_ORIGIN).screensInModal).toEqual([SCREENS.TEST_TOOLS_MODAL.ROOT, SCREENS.TEST_TOOLS_MODAL.SERVER]);
+    });
+
+    it('rebuilds that page underneath the modal rather than defaulting to Home', () => {
+        expect(getState(SERVER_PATH_WITH_ORIGIN).screensUnderneath).toContain(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+    });
+
+    it('round trips back to the same URL', () => {
+        expect(getPathFromState(getAdaptedStateFromPath(SERVER_PATH_WITH_ORIGIN, undefined))).toBe(SERVER_PATH_WITH_ORIGIN);
+    });
+
+    it('opens over Home when the URL carries no origin', () => {
+        expect(getState(`/${ROUTES.TEST_TOOLS_SERVER.getRoute()}`).serverParams).toBeUndefined();
+        expect(getState(`/${ROUTES.TEST_TOOLS_SERVER.getRoute()}`).screensUnderneath).toContain(SCREENS.HOME);
+    });
+});
diff --git a/tests/perf-test/DynamicReportDetailsPage.perf-test.tsx b/tests/perf-test/DynamicReportDetailsPage.perf-test.tsx
new file mode 100644
index 000000000000..a52ff68961b5
--- /dev/null
+++ b/tests/perf-test/DynamicReportDetailsPage.perf-test.tsx
@@ -0,0 +1,448 @@
+import {fireEvent, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import type Navigation from '@libs/Navigation/Navigation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {ReportDetailsNavigatorParamList} from '@libs/Navigation/types';
+import {setHasRadio} from '@libs/NetworkState';
+import {buildParticipantsFromAccountIDs} from '@libs/ReportUtils';
+
+import DynamicReportDetailsPage from '@pages/DynamicReportDetailsPage';
+
+import initOnyxDerivedValues from '@userActions/OnyxDerived';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import type {PersonalDetailsList, Policy, Report, ReportAction, ReportActions, Transaction} from '@src/types/onyx';
+
+import {useIsFocused, useRoute} from '@react-navigation/native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+import {measureRenders} from 'reassure';
+
+import createRandomReportAction from '../utils/collections/reportActions';
+import {createRandomReport} from '../utils/collections/reports';
+import createRandomTransaction from '../utils/collections/transaction';
+import createMock from '../utils/createMock';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@src/components/ConfirmedRoute.tsx');
+jest.mock('@libs/Navigation/helpers/isReportTopmostSplitNavigator', () => jest.fn(() => false));
+
+// Lazy icon loading resolves asynchronously and would add non-deterministic renders to every measurement.
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyIllustrations: () => ({}),
+    useMemoizedLazyExpensifyIcons: () => ({}),
+}));
+
+jest.mock('@react-navigation/native', () => {
+    const actualNav = jest.requireActual<typeof Navigation>('@react-navigation/native');
+    return {
+        ...actualNav,
+        useIsFocused: jest.fn(),
+        useFocusEffect: jest.fn(),
+        useRoute: jest.fn(),
+        usePreventRemove: jest.fn(),
+    };
+});
+
+const CURRENT_USER_ACCOUNT_ID = 1;
+const CURRENT_USER_LOGIN = 'perf@user.com';
+const PARTICIPANT_COUNT = 20;
+const ROOM_ACTIONS_COUNT = 30;
+const UPDATES_PER_SCENARIO = 5;
+
+const POLICY_ID = 'P1';
+const ROOM_REPORT_ID = '100';
+const EXPENSE_REPORT_ID = '200';
+const EXPENSE_CHAT_REPORT_ID = '201';
+const TRANSACTION_THREAD_REPORT_ID = '301';
+const IOU_ACTION_ID = '1001';
+const TRANSACTION_ID = 't1';
+
+const navigationMock = createMock<PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_ROOT>['navigation']>({});
+const getRouteMock = (reportID: string) => createMock<PlatformStackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.DYNAMIC_ROOT>['route']>({params: {reportID}});
+
+const participantAccountIDs = Array.from({length: PARTICIPANT_COUNT}, (_, index) => index + 1);
+
+function buildPersonalDetails(): PersonalDetailsList {
+    return Object.fromEntries(
+        participantAccountIDs.map((accountID) => [
+            accountID,
+            {
+                accountID,
+                login: accountID === CURRENT_USER_ACCOUNT_ID ? CURRENT_USER_LOGIN : `user${accountID}@test.com`,
+                displayName: `User ${accountID}`,
+                firstName: 'User',
+                lastName: `${accountID}`,
+                avatar: `https://example.com/avatar-${accountID}.png`,
+            },
+        ]),
+    );
+}
+
+const policy: Policy = {
+    id: POLICY_ID,
+    name: 'Perf Workspace',
+    type: CONST.POLICY.TYPE.TEAM,
+    role: CONST.POLICY.ROLE.ADMIN,
+    owner: CURRENT_USER_LOGIN,
+    outputCurrency: CONST.CURRENCY.USD,
+    areReportFieldsEnabled: true,
+    employeeList: {
+        [CURRENT_USER_LOGIN]: {
+            email: CURRENT_USER_LOGIN,
+            role: CONST.POLICY.ROLE.ADMIN,
+        },
+    },
+};
+
+const roomReport: Report = {
+    ...createRandomReport(Number(ROOM_REPORT_ID), CONST.REPORT.CHAT_TYPE.POLICY_ROOM),
+    type: CONST.REPORT.TYPE.CHAT,
+    policyID: POLICY_ID,
+    reportName: '#perf-room',
+    description: 'Room used for perf measurements',
+    visibility: CONST.REPORT.VISIBILITY.RESTRICTED,
+    participants: buildParticipantsFromAccountIDs(participantAccountIDs),
+    parentReportID: undefined,
+    parentReportActionID: undefined,
+    isPinned: false,
+};
+
+function buildRoomActions(count: number, startIndex = 1): ReportActions {
+    return Object.fromEntries(
+        Array.from({length: count}, (_, index) => {
+            const actionID = `${startIndex + index}`;
+            return [
+                actionID,
+                {
+                    ...createRandomReportAction(Number(actionID)),
+                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                    actorAccountID: participantAccountIDs.at(index % PARTICIPANT_COUNT),
+                    pendingAction: null,
+                } as ReportAction,
+            ];
+        }),
+    );
+}
+
+const expenseChatReport: Report = {
+    ...createRandomReport(Number(EXPENSE_CHAT_REPORT_ID), CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT),
+    type: CONST.REPORT.TYPE.CHAT,
+    policyID: POLICY_ID,
+    ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+    isOwnPolicyExpenseChat: true,
+    participants: buildParticipantsFromAccountIDs([CURRENT_USER_ACCOUNT_ID, 2]),
+    parentReportID: undefined,
+    parentReportActionID: undefined,
+};
+
+const expenseReport: Report = {
+    ...createRandomReport(Number(EXPENSE_REPORT_ID), undefined),
+    type: CONST.REPORT.TYPE.EXPENSE,
+    policyID: POLICY_ID,
+    chatReportID: EXPENSE_CHAT_REPORT_ID,
+    reportName: 'Perf expense report',
+    ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+    managerID: 2,
+    stateNum: CONST.REPORT.STATE_NUM.OPEN,
+    statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+    total: -5000,
+    currency: CONST.CURRENCY.USD,
+    participants: buildParticipantsFromAccountIDs([CURRENT_USER_ACCOUNT_ID, 2]),
+    parentReportID: undefined,
+    parentReportActionID: undefined,
+    isPinned: false,
+};
+
+const iouAction = {
+    ...createRandomReportAction(Number(IOU_ACTION_ID)),
+    actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+    actorAccountID: CURRENT_USER_ACCOUNT_ID,
+    childReportID: TRANSACTION_THREAD_REPORT_ID,
+    originalMessage: {
+        IOUReportID: EXPENSE_REPORT_ID,
+        IOUTransactionID: TRANSACTION_ID,
+        type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+        amount: 5000,
+        currency: CONST.CURRENCY.USD,
+    },
+    pendingAction: null,
+} as ReportAction;
+
+const transactionThreadReport: Report = {
+    ...createRandomReport(Number(TRANSACTION_THREAD_REPORT_ID), undefined),
+    type: CONST.REPORT.TYPE.CHAT,
+    policyID: POLICY_ID,
+    parentReportID: EXPENSE_REPORT_ID,
+    parentReportActionID: IOU_ACTION_ID,
+    participants: buildParticipantsFromAccountIDs([CURRENT_USER_ACCOUNT_ID, 2]),
+    isPinned: false,
+};
+
+const transaction: Transaction = {
+    ...createRandomTransaction(1),
+    transactionID: TRANSACTION_ID,
+    reportID: EXPENSE_REPORT_ID,
+    amount: 5000,
+    currency: CONST.CURRENCY.USD,
+    cardID: undefined,
+    managedCard: false,
+    bank: '',
+    comment: {
+        comment: 'Perf transaction',
+        liabilityType: CONST.TRANSACTION.LIABILITY_TYPE.ALLOW,
+    },
+};
+
+function Wrapper({children}: {children: React.ReactNode}) {
+    return <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentUserPersonalDetailsProvider]}>{children}</ComposeProviders>;
+}
+
+// withReportOrNotFound reads the report from Onyx by the route reportID, so the report prop only satisfies the wrapped props type.
+function renderPage(report: Report) {
+    return (
+        <DynamicReportDetailsPage
+            isLoadingReportData={false}
+            navigation={navigationMock}
+            policy={undefined}
+            report={report}
+            reportMetadata={undefined}
+            reportLoadingState={undefined}
+            route={getRouteMock(report.reportID)}
+        />
+    );
+}
+
+async function seedCommonData() {
+    await Promise.all([
+        Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, false),
+        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, buildPersonalDetails()),
+        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy),
+        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}`, roomReport),
+        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${EXPENSE_CHAT_REPORT_ID}`, expenseChatReport),
+        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${EXPENSE_REPORT_ID}`, expenseReport),
+        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${TRANSACTION_THREAD_REPORT_ID}`, transactionThreadReport),
+        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${ROOM_REPORT_ID}`, buildRoomActions(ROOM_ACTIONS_COUNT)),
+        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${EXPENSE_REPORT_ID}`, {
+            [IOU_ACTION_ID]: iouAction,
+        }),
+        Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction),
+        Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${ROOM_REPORT_ID}`, {isLoadingInitialReportActions: false}),
+        Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${EXPENSE_REPORT_ID}`, {isLoadingInitialReportActions: false}),
+        Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${TRANSACTION_THREAD_REPORT_ID}`, {isLoadingInitialReportActions: false}),
+    ]);
+    await waitForBatchedUpdates();
+}
+
+async function mergeAndFlush<TKey extends Parameters<typeof Onyx.merge>[0]>(key: TKey, value: Parameters<typeof Onyx.merge<TKey>>[1]) {
+    await Onyx.merge(key, value);
+    await waitForBatchedUpdates();
+}
+
+describe('DynamicReportDetailsPage', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        });
+        initOnyxDerivedValues();
+    });
+
+    beforeEach(async () => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        setHasRadio(true);
+        jest.mocked(useIsFocused).mockReturnValue(true);
+        jest.mocked(useRoute).mockReturnValue({
+            key: 'report-details',
+            name: 'Report_Details_Root',
+            params: {},
+        } as ReturnType<typeof useRoute>);
+        await TestHelper.signInWithTestUser(CURRENT_USER_ACCOUNT_ID, CURRENT_USER_LOGIN);
+        await seedCommonData();
+    });
+
+    afterEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    test('[DynamicReportDetailsPage] should render a workspace room with members and actions', async () => {
+        // Given a workspace room with 20 participants and 30 actions, the heaviest chat variant of the page
+        const scenario = async () => {
+            // When the page mounts and the members row appears, which means the room menu has rendered
+            await screen.findByText(TestHelper.translateLocal('common.members'));
+        };
+
+        // Then reassure measures the mount cost of the room variant
+        await measureRenders(renderPage(roomReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should render an expense report', async () => {
+        // Given an open expense report on a workspace, which renders the money request menu rows
+        const scenario = async () => {
+            // When the page mounts and the long report ID row appears, which only expense reports show
+            await screen.findByText(TestHelper.translateLocal('common.longReportID'));
+        };
+
+        // Then reassure measures the mount cost of the expense report variant
+        await measureRenders(renderPage(expenseReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should render a transaction thread with the delete action', async () => {
+        // Given a transaction thread whose parent IOU action and transaction are in Onyx
+        const scenario = async () => {
+            // When the page mounts and the delete row appears, which needs the parent action and transaction to resolve
+            await screen.findByText(TestHelper.translateLocal('reportActionContextMenu.deleteAction', iouAction));
+        };
+
+        // Then reassure measures the mount cost of the transaction thread variant
+        await measureRenders(renderPage(transactionThreadReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should re-render a workspace room when participant personal details change', async () => {
+        // Reassure calls the scenario once per run while Onyx is seeded once per test, and Onyx skips merges that change nothing,
+        // so every run must write names that don't exist yet
+        let run = 0;
+        const scenario = async () => {
+            // Given the workspace room page has rendered
+            await screen.findByText(TestHelper.translateLocal('common.members'));
+
+            // When several participants are renamed, because the page subscribes to the whole personal details list
+            for (let index = 0; index < UPDATES_PER_SCENARIO; index++) {
+                const accountID = participantAccountIDs.at(index + 1) ?? 2;
+                await mergeAndFlush(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                    [accountID]: {displayName: `Renamed ${run}-${index}`},
+                });
+            }
+            run++;
+        };
+
+        // Then reassure measures the re-renders caused by personal details changes
+        await measureRenders(renderPage(roomReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should re-render a workspace room when new report actions arrive', async () => {
+        const scenario = async () => {
+            // Given the workspace room page has rendered
+            await screen.findByText(TestHelper.translateLocal('common.members'));
+
+            // When new actions arrive one at a time, because the page subscribes to the report actions collection
+            for (let index = 0; index < UPDATES_PER_SCENARIO; index++) {
+                await mergeAndFlush(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${ROOM_REPORT_ID}`, buildRoomActions(1, ROOM_ACTIONS_COUNT + 1 + index));
+            }
+        };
+
+        // Then reassure measures the re-renders caused by report action updates
+        await measureRenders(renderPage(roomReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should re-render a workspace room when the report itself updates', async () => {
+        const scenario = async () => {
+            // Given the workspace room page has rendered
+            await screen.findByText(TestHelper.translateLocal('common.members'));
+
+            // When only last message fields change on the report, which no row on the page displays
+            for (let index = 0; index < UPDATES_PER_SCENARIO; index++) {
+                await mergeAndFlush(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}`, {
+                    lastMessageText: `message ${index}`,
+                    lastVisibleActionCreated: `2026-01-01 00:00:0${index}.000`,
+                });
+            }
+        };
+
+        // Then reassure measures the re-renders caused by report merges alone
+        await measureRenders(renderPage(roomReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should re-render a transaction thread when the transaction updates', async () => {
+        const scenario = async () => {
+            // Given the transaction thread page has rendered
+            await screen.findByText(TestHelper.translateLocal('reportActionContextMenu.deleteAction', iouAction));
+
+            // When the linked transaction changes amount and description, as it does while the expense is edited
+            for (let index = 0; index < UPDATES_PER_SCENARIO; index++) {
+                await mergeAndFlush(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, {
+                    amount: 5000 + index,
+                    comment: {comment: `Perf transaction ${index}`},
+                });
+            }
+        };
+
+        // Then reassure measures the re-renders caused by transaction updates
+        await measureRenders(renderPage(transactionThreadReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should re-render a workspace room when a new message arrives', async () => {
+        const scenario = async () => {
+            // Given the workspace room page has rendered
+            await screen.findByText(TestHelper.translateLocal('common.members'));
+
+            // When a new message arrives, which writes the action and the report in the same batch like a real push
+            for (let index = 0; index < UPDATES_PER_SCENARIO; index++) {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${ROOM_REPORT_ID}`, buildRoomActions(1, ROOM_ACTIONS_COUNT + 1 + index));
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${ROOM_REPORT_ID}`, {
+                    lastMessageText: `message ${index}`,
+                    lastVisibleActionCreated: `2026-01-01 00:00:0${index}.000`,
+                });
+                await waitForBatchedUpdates();
+            }
+        };
+
+        // Then reassure measures the re-renders caused by a combined action and report update
+        await measureRenders(renderPage(roomReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+
+    test('[DynamicReportDetailsPage] should pin and unpin a workspace room', async () => {
+        const scenario = async () => {
+            // Given the workspace room page has rendered with the pin row
+            const pinButton = await screen.findByText(TestHelper.translateLocal('common.pin'));
+            // When the user pins and then unpins the room, which toggles the row label each time
+            fireEvent.press(pinButton);
+            await waitForBatchedUpdates();
+
+            const unpinButton = await screen.findByText(TestHelper.translateLocal('common.unPin'));
+            fireEvent.press(unpinButton);
+            await waitForBatchedUpdates();
+
+            await screen.findByText(TestHelper.translateLocal('common.pin'));
+        };
+
+        // Then reassure measures the re-renders caused by a user interaction on the page
+        await measureRenders(renderPage(roomReport), {
+            scenario,
+            wrapper: Wrapper,
+        });
+    });
+});
diff --git a/tests/perf-test/OptionsListChatPreview.perf-test.ts b/tests/perf-test/OptionsListChatPreview.perf-test.ts
new file mode 100644
index 000000000000..c2e259002792
--- /dev/null
+++ b/tests/perf-test/OptionsListChatPreview.perf-test.ts
@@ -0,0 +1,378 @@
+import type {PrivateIsArchivedMap} from '@hooks/usePrivateIsArchivedMap';
+
+import {clearAlternateTextCache, clearFilteredOptionListCache, createFilteredOptionList, getValidOptions} from '@libs/OptionsListUtils';
+import {buildParticipantsFromAccountIDs} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {PersonalDetails, Policy, Report, ReportAction, ReportActions} from '@src/types/onyx';
+import type Login from '@src/types/onyx/Login';
+
+import type * as NativeNavigation from '@react-navigation/native';
+import type {OnyxEntry} from 'react-native-onyx';
+import type {TupleToUnion} from 'type-fest';
+
+import Onyx from 'react-native-onyx';
+import {measureFunction} from 'reassure';
+
+import {convertToDisplayString, translateLocal} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+/**
+ * The reports built by `tests/utils/collections/reports.ts#createRandomReport` carry neither participants nor a
+ * chatType, so `processReport` discards every one of them before `createOption` runs. That makes the existing
+ * OptionsListUtils / SearchRouter perf suites blind to the chat-preview path (`createOption` ->
+ * `getLastMessageTextForReport` / `getAlternateText` -> `getReportAlternateText`).
+ *
+ * These scenarios build participant-bearing reports with report actions behind them, so the preview path runs for
+ * every option built. `createFilteredOptionList` builds all `REPORTS_COUNT` of them; the `getValidOptions` scenarios
+ * resolve a preview for `maxElements` options, which is what the consumers (SearchRouter, chat finder) actually cap at.
+ *
+ * `ACTIONS_PER_REPORT` is deliberately larger than a couple of actions: the last-visible-action lookup scans the
+ * report's actions, so a short list hides that cost. Expense/IOU reports also get a populated transaction thread, so
+ * the two-collection lookup walks real actions instead of an empty one. Fixtures are deterministic (no falso) to keep
+ * baseline and current runs comparable.
+ */
+
+const CURRENT_USER_ACCOUNT_ID = 1;
+const CURRENT_USER_EMAIL = 'user1@example.com';
+const REPORTS_COUNT = 300;
+const PERSONAL_DETAILS_COUNT = 300;
+const ACTIONS_PER_REPORT = 40;
+const THREAD_ACTIONS_PER_REPORT = 10;
+const MAX_ELEMENTS = 20;
+const WIDE_MAX_ELEMENTS = 100;
+const POLICY_ID = 'policy1';
+
+const REPORT_TYPES = [CONST.REPORT.TYPE.CHAT, CONST.REPORT.TYPE.EXPENSE, CONST.REPORT.TYPE.IOU, CONST.REPORT.TYPE.TASK] as const;
+
+const ACTION_NAMES = [
+    CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+    CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+    CONST.REPORT.ACTIONS.TYPE.IOU,
+    CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW,
+    CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+    CONST.REPORT.ACTIONS.TYPE.RENAMED,
+    CONST.REPORT.ACTIONS.TYPE.SUBMITTED,
+    CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED,
+] as const;
+
+/** Deterministic timestamp, ordered by the action index so the newest action is stable across runs. */
+function buildCreated(reportIndex: number, actionIndex: number): string {
+    const day = (reportIndex % 27) + 1;
+    const totalMinutes = actionIndex * 7;
+    const hour = 10 + Math.floor(totalMinutes / 60);
+    const minute = totalMinutes % 60;
+    return `2026-01-${String(day).padStart(2, '0')} ${String(hour).padStart(2, '0')}:${String(minute).padStart(2, '0')}:00.000`;
+}
+
+function buildOriginalMessage(actionName: TupleToUnion<typeof ACTION_NAMES>, reportIndex: number) {
+    switch (actionName) {
+        case CONST.REPORT.ACTIONS.TYPE.IOU:
+            return {
+                IOUReportID: `${reportIndex}`,
+                IOUTransactionID: `transaction${reportIndex}`,
+                amount: 1000 + reportIndex,
+                currency: CONST.CURRENCY.USD,
+                type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                participantAccountIDs: [CURRENT_USER_ACCOUNT_ID, (reportIndex % PERSONAL_DETAILS_COUNT) + 2],
+            };
+        case CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW:
+            return {linkedReportID: `${reportIndex}`};
+        case CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE:
+            return {
+                amount: 2000 + reportIndex,
+                oldAmount: 1000 + reportIndex,
+                currency: CONST.CURRENCY.USD,
+                oldCurrency: CONST.CURRENCY.USD,
+            };
+        case CONST.REPORT.ACTIONS.TYPE.RENAMED:
+            return {oldName: `Old room ${reportIndex}`, newName: `New room ${reportIndex}`, html: `New room ${reportIndex}`, lastModified: buildCreated(reportIndex, 0)};
+        case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED:
+            return {cardID: reportIndex + 1, assigneeAccountID: CURRENT_USER_ACCOUNT_ID};
+        default:
+            return {html: `<p>Message ${reportIndex}</p>`, lastModified: buildCreated(reportIndex, 0)};
+    }
+}
+
+function buildReportAction(reportIndex: number, actionIndex: number): ReportAction {
+    const actionName = ACTION_NAMES[actionIndex % ACTION_NAMES.length];
+    const actorAccountID = (reportIndex % PERSONAL_DETAILS_COUNT) + 2;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the fixture only carries the fields the chat-preview path reads
+    return {
+        reportActionID: `${reportIndex}_${actionIndex}`,
+        actionName,
+        actorAccountID,
+        created: buildCreated(reportIndex, actionIndex),
+        person: [{type: 'TEXT', style: 'strong', text: `User ${actorAccountID}`}],
+        message: [
+            {
+                type: 'COMMENT',
+                html: `<p>Message ${reportIndex} ${actionIndex}</p>`,
+                text: `Message ${reportIndex} ${actionIndex}`,
+                style: 'normal',
+            },
+        ],
+        originalMessage: buildOriginalMessage(actionName, reportIndex),
+    } as unknown as ReportAction;
+}
+
+const personalDetails: Record<string, PersonalDetails> = {};
+for (let index = 0; index < PERSONAL_DETAILS_COUNT; index++) {
+    const accountID = index + 1;
+    personalDetails[accountID] = {
+        accountID,
+        login: `user${accountID}@example.com`,
+        displayName: `User ${accountID}`,
+        firstName: 'User',
+        lastName: `${accountID}`,
+        avatar: '',
+    } as PersonalDetails;
+}
+
+const reports: Record<string, Report> = {};
+const reportActions: Record<string, ReportActions> = {};
+const threadReports: Record<string, Report> = {};
+const transactionThreadIDs: Record<string, string | undefined> = {};
+const lastActions: Record<string, ReportAction> = {};
+
+for (let index = 0; index < REPORTS_COUNT; index++) {
+    const reportID = `${index}`;
+    const otherAccountID = (index % PERSONAL_DETAILS_COUNT) + 2;
+    const type = REPORT_TYPES[index % REPORT_TYPES.length];
+    const isPolicyExpenseChat = index % 3 === 0;
+    const lastActionIndex = ACTIONS_PER_REPORT - 1;
+
+    reports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] = {
+        reportID,
+        type,
+        chatType: isPolicyExpenseChat ? CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT : undefined,
+        isOwnPolicyExpenseChat: isPolicyExpenseChat,
+        policyID: isPolicyExpenseChat ? POLICY_ID : undefined,
+        reportName: `Report ${index}`,
+        currency: CONST.CURRENCY.USD,
+        ownerAccountID: otherAccountID,
+        lastActorAccountID: otherAccountID,
+        lastVisibleActionCreated: buildCreated(index, lastActionIndex),
+        lastActionType: ACTION_NAMES[lastActionIndex % ACTION_NAMES.length],
+        // Left empty on purpose: the preview then has to be recomputed from the report actions,
+        // which is what the LHN and Search both do for a report whose last message is not cached.
+        lastMessageText: '',
+        participants: buildParticipantsFromAccountIDs([CURRENT_USER_ACCOUNT_ID, otherAccountID]),
+    } as Report;
+
+    const actions: ReportActions = {};
+    for (let actionIndex = 0; actionIndex < ACTIONS_PER_REPORT; actionIndex++) {
+        const action = buildReportAction(index, actionIndex);
+        actions[action.reportActionID] = action;
+        if (actionIndex === lastActionIndex) {
+            lastActions[reportID] = action;
+        }
+    }
+    reportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] = actions;
+
+    if (type === CONST.REPORT.TYPE.EXPENSE || type === CONST.REPORT.TYPE.IOU) {
+        const threadReportID = `${index + REPORTS_COUNT}`;
+        transactionThreadIDs[reportID] = threadReportID;
+
+        // The transaction thread has to exist with actions of its own, otherwise the two-collection
+        // last-visible-action lookup short-circuits on an empty collection and the scenario never pays for it.
+        threadReports[`${ONYXKEYS.COLLECTION.REPORT}${threadReportID}`] = {
+            reportID: threadReportID,
+            type: CONST.REPORT.TYPE.CHAT,
+            reportName: `Transaction thread ${index}`,
+            parentReportID: reportID,
+            parentReportActionID: `${index}_1`,
+            ownerAccountID: otherAccountID,
+            lastActorAccountID: otherAccountID,
+            lastVisibleActionCreated: buildCreated(index + REPORTS_COUNT, THREAD_ACTIONS_PER_REPORT - 1),
+            lastMessageText: '',
+            participants: buildParticipantsFromAccountIDs([CURRENT_USER_ACCOUNT_ID, otherAccountID]),
+        } as Report;
+
+        const threadActions: ReportActions = {};
+        for (let actionIndex = 0; actionIndex < THREAD_ACTIONS_PER_REPORT; actionIndex++) {
+            const action = buildReportAction(index + REPORTS_COUNT, actionIndex);
+            threadActions[action.reportActionID] = action;
+        }
+        reportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${threadReportID}`] = threadActions;
+    }
+}
+
+const allPolicies: Record<string, Policy> = {
+    [`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`]: {
+        id: POLICY_ID,
+        name: 'Test Policy',
+        role: CONST.POLICY.ROLE.ADMIN,
+        type: CONST.POLICY.TYPE.TEAM,
+        owner: CURRENT_USER_EMAIL,
+        outputCurrency: CONST.CURRENCY.USD,
+        approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+    } as Policy,
+};
+
+const EMPTY_PRIVATE_IS_ARCHIVED_MAP: PrivateIsArchivedMap = {};
+const loginList: OnyxEntry<Login> = {};
+
+jest.mock('@react-navigation/native', () => {
+    const actualNav = jest.requireActual<typeof NativeNavigation>('@react-navigation/native');
+    return {
+        ...actualNav,
+        createNavigationContainerRef: () => ({
+            getState: () => jest.fn(),
+        }),
+    };
+});
+
+const buildOptionList = () =>
+    createFilteredOptionList(
+        personalDetails,
+        reports,
+        undefined,
+        EMPTY_PRIVATE_IS_ARCHIVED_MAP,
+        allPolicies,
+        {
+            currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+            currentUserLogin: CURRENT_USER_EMAIL,
+            dateFnsLocale: undefined,
+            convertToDisplayString,
+            conciergeReportID: undefined,
+            maxRecentReports: REPORTS_COUNT,
+            transactionThreadIDs,
+            lastActions,
+        },
+        undefined,
+    );
+
+// Mirrors the resolver production passes in (see `useFilteredOptions`), backed by both fixture report maps.
+const getReportByID = (reportID: string | undefined): Report | undefined => {
+    if (!reportID) {
+        return undefined;
+    }
+    const key = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
+    return reports[key] ?? threadReports[key];
+};
+
+const getPreviewOptionsConfig = (maxElements: number) => ({
+    dateFnsLocale: undefined,
+    convertToDisplayString,
+    getReportByID,
+    betas: Object.values(CONST.BETAS),
+    includeRecentReports: true,
+    includeTasks: true,
+    includeThreads: true,
+    includeMoneyRequests: true,
+    includeMultipleParticipantReports: true,
+    includeSelfDM: true,
+    includeOwnedWorkspaceChats: true,
+    showChatPreviewLine: true,
+    // Left false so the policy expense chats resolve a preview too; with it on, a third of the options
+    // short-circuit to the policy name and never enter the path this suite measures.
+    forcePolicyNamePreview: false,
+    maxElements,
+    personalDetails,
+    sortedActions: undefined,
+    transactionThreadIDs,
+    lastActions,
+    currentUserLogin: CURRENT_USER_EMAIL,
+});
+
+describe('OptionsListChatPreview', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+        Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, {...reports, ...threadReports});
+        Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT_ACTIONS, reportActions);
+        Onyx.mergeCollection(ONYXKEYS.COLLECTION.POLICY, allPolicies);
+    });
+
+    afterAll(() => {
+        Onyx.clear();
+    });
+
+    test('[OptionsListChatPreview] createFilteredOptionList with participant reports', async () => {
+        await waitForBatchedUpdates();
+        await measureFunction(() => {
+            // Inputs are referentially identical across measured runs, so clear the cache to measure the build path.
+            clearFilteredOptionListCache();
+            return buildOptionList();
+        });
+    });
+
+    test('[OptionsListChatPreview] getValidOptions with chat previews', async () => {
+        await waitForBatchedUpdates();
+        const optionList = buildOptionList();
+        await measureFunction(() =>
+            getValidOptions(
+                {reports: optionList.reports, personalDetails: optionList.personalDetails},
+                allPolicies,
+                {},
+                loginList,
+                CURRENT_USER_ACCOUNT_ID,
+                CURRENT_USER_EMAIL,
+                undefined,
+                getPreviewOptionsConfig(MAX_ELEMENTS),
+                translateLocal,
+                undefined,
+            ),
+        );
+    });
+
+    test('[OptionsListChatPreview] getValidOptions with chat previews and a wider result cap', async () => {
+        await waitForBatchedUpdates();
+        const optionList = buildOptionList();
+        await measureFunction(() =>
+            getValidOptions(
+                {reports: optionList.reports, personalDetails: optionList.personalDetails},
+                allPolicies,
+                {},
+                loginList,
+                CURRENT_USER_ACCOUNT_ID,
+                CURRENT_USER_EMAIL,
+                undefined,
+                getPreviewOptionsConfig(WIDE_MAX_ELEMENTS),
+                translateLocal,
+                undefined,
+            ),
+        );
+    });
+
+    test('[OptionsListChatPreview] getValidOptions with chat previews, preview cache cold', async () => {
+        await waitForBatchedUpdates();
+        const optionList = buildOptionList();
+        await measureFunction(() => {
+            clearAlternateTextCache();
+            return getValidOptions(
+                {reports: optionList.reports, personalDetails: optionList.personalDetails},
+                allPolicies,
+                {},
+                loginList,
+                CURRENT_USER_ACCOUNT_ID,
+                CURRENT_USER_EMAIL,
+                undefined,
+                getPreviewOptionsConfig(MAX_ELEMENTS),
+                translateLocal,
+                undefined,
+            );
+        });
+    });
+
+    test('[OptionsListChatPreview] getValidOptions with chat previews and a wider result cap, preview cache cold', async () => {
+        await waitForBatchedUpdates();
+        const optionList = buildOptionList();
+        await measureFunction(() => {
+            clearAlternateTextCache();
+            return getValidOptions(
+                {reports: optionList.reports, personalDetails: optionList.personalDetails},
+                allPolicies,
+                {},
+                loginList,
+                CURRENT_USER_ACCOUNT_ID,
+                CURRENT_USER_EMAIL,
+                undefined,
+                getPreviewOptionsConfig(WIDE_MAX_ELEMENTS),
+                translateLocal,
+                undefined,
+            );
+        });
+    });
+});
diff --git a/tests/perf-test/OptionsListUtils.perf-test.ts b/tests/perf-test/OptionsListUtils.perf-test.ts
index 2134b5569146..c6b03fa48dfa 100644
--- a/tests/perf-test/OptionsListUtils.perf-test.ts
+++ b/tests/perf-test/OptionsListUtils.perf-test.ts
@@ -142,6 +142,9 @@ describe('OptionsListUtils', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
+            initialKeyStates: {
+                [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: 'policy1',
+            },
         });
 
         Onyx.multiSet({
@@ -194,21 +197,23 @@ describe('OptionsListUtils', () => {
             undefined,
         );
         await measureFunction(() => {
-            filterAndOrderOptions(
-                formattedOptions,
-                SEARCH_VALUE,
-                COUNTRY_CODE,
+            filterAndOrderOptions({
+                options: formattedOptions,
+                searchInputValue: SEARCH_VALUE,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                MOCK_CURRENT_USER_EMAIL,
-                MOCK_CURRENT_USER_ACCOUNT_ID,
+                currentUserEmail: MOCK_CURRENT_USER_EMAIL,
+                currentUserAccountID: MOCK_CURRENT_USER_ACCOUNT_ID,
                 personalDetails,
-                {
+                config: {
                     dateFnsLocale: undefined,
                     convertToDisplayString,
                     currentUserAccountID: MOCK_CURRENT_USER_ACCOUNT_ID,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID: 'policy1',
+            });
         });
     });
     test('[OptionsListUtils] getFilteredOptions with empty search value', async () => {
@@ -226,21 +231,23 @@ describe('OptionsListUtils', () => {
             undefined,
         );
         await measureFunction(() => {
-            filterAndOrderOptions(
-                formattedOptions,
-                '',
-                COUNTRY_CODE,
+            filterAndOrderOptions({
+                options: formattedOptions,
+                searchInputValue: '',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                MOCK_CURRENT_USER_EMAIL,
-                MOCK_CURRENT_USER_ACCOUNT_ID,
+                currentUserEmail: MOCK_CURRENT_USER_EMAIL,
+                currentUserAccountID: MOCK_CURRENT_USER_ACCOUNT_ID,
                 personalDetails,
-                {
+                config: {
                     dateFnsLocale: undefined,
                     convertToDisplayString,
                     currentUserAccountID: MOCK_CURRENT_USER_ACCOUNT_ID,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID: 'policy1',
+            });
         });
     });
 
@@ -443,21 +450,23 @@ describe('OptionsListUtils', () => {
         );
 
         await measureFunction(() => {
-            filterAndOrderOptions(
-                formattedOptions,
-                'Email Report Five',
-                COUNTRY_CODE,
+            filterAndOrderOptions({
+                options: formattedOptions,
+                searchInputValue: 'Email Report Five',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                MOCK_CURRENT_USER_EMAIL,
-                MOCK_CURRENT_USER_ACCOUNT_ID,
-                largePersonalDetails,
-                {
+                currentUserEmail: MOCK_CURRENT_USER_EMAIL,
+                currentUserAccountID: MOCK_CURRENT_USER_ACCOUNT_ID,
+                personalDetails: largePersonalDetails,
+                config: {
                     dateFnsLocale: undefined,
                     convertToDisplayString,
                     currentUserAccountID: MOCK_CURRENT_USER_ACCOUNT_ID,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID: 'policy1',
+            });
         });
     });
 
diff --git a/tests/perf-test/ReportUtils.perf-test.ts b/tests/perf-test/ReportUtils.perf-test.ts
index ccc948ece440..bcafd512bebe 100644
--- a/tests/perf-test/ReportUtils.perf-test.ts
+++ b/tests/perf-test/ReportUtils.perf-test.ts
@@ -105,7 +105,7 @@ describe('ReportUtils', () => {
         const reportAction = createMock<ReportAction>({...createRandomReportAction(1), actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT});
 
         await waitForBatchedUpdates();
-        await measureFunction(() => canDeleteReportAction(reportAction, reportID, transaction, undefined, undefined, 1, undefined));
+        await measureFunction(() => canDeleteReportAction(reportAction, reportID, transaction, undefined, undefined, 1, undefined, undefined));
     });
 
     test('[ReportUtils] getReportRecipientAccountID on 1k participants', async () => {
diff --git a/tests/perf-test/SearchRouter.perf-test.tsx b/tests/perf-test/SearchRouter.perf-test.tsx
index 627587ffa5a7..0eefb6da6923 100644
--- a/tests/perf-test/SearchRouter.perf-test.tsx
+++ b/tests/perf-test/SearchRouter.perf-test.tsx
@@ -61,7 +61,6 @@ jest.mock('@hooks/useExportedToFilterOptions', () => ({
     __esModule: true,
     default: () => ({
         exportedToFilterOptions: [],
-        combinedUniqueExportTemplates: [],
         connectedIntegrationNames: new Set<string>(),
     }),
 }));
diff --git a/tests/perf-test/SelectionList.perf-test.tsx b/tests/perf-test/SelectionList.perf-test.tsx
index acfdd793a18d..a479f577423f 100644
--- a/tests/perf-test/SelectionList.perf-test.tsx
+++ b/tests/perf-test/SelectionList.perf-test.tsx
@@ -9,8 +9,8 @@ import type {ListItem} from '@components/SelectionList/ListItem/types';
 import variables from '@styles/variables';
 
 import type * as NativeNavigation from '@react-navigation/native';
-import type ReactNative from 'react-native';
 
+import {measureFirstChildLayout, measureItemLayout, measureParentSize} from '@shopify/flash-list/dist/recyclerview/utils/measureLayout';
 import React, {useState} from 'react';
 import {measureRenders} from 'reassure';
 
@@ -19,18 +19,16 @@ type SelectionListWrapperProps = {
     canSelectMultiple?: boolean;
 };
 
-// FlashList requires layout events to render items; mock it with FlatList for tests.
-jest.mock('@shopify/flash-list', () => {
-    const RN = jest.requireActual<typeof ReactNative>('react-native');
-    return {
-        FlashList: ({data, ...props}: React.ComponentProps<typeof RN.FlatList>) => (
-            <RN.FlatList
-                data={data}
-                {...props}
-                initialNumToRender={data?.length}
-            />
-        ),
-    };
+const ITEM_COUNT = 1000;
+const LIST_WIDTH = 100;
+const VIEWPORT_HEIGHT = variables.optionRowHeight * 5;
+
+// Jest has no layout engine, so FlashList reads row and viewport sizes from the measureLayout mock in
+// jest/setupAfterEnv.ts. Size them from variables here so the scroll event below matches what FlashList renders.
+beforeEach(() => {
+    jest.mocked(measureParentSize).mockImplementation(() => ({x: 0, y: 0, width: LIST_WIDTH, height: VIEWPORT_HEIGHT}));
+    jest.mocked(measureFirstChildLayout).mockImplementation(() => ({x: 0, y: 0, width: LIST_WIDTH, height: VIEWPORT_HEIGHT}));
+    jest.mocked(measureItemLayout).mockImplementation(() => ({x: 0, y: 0, width: LIST_WIDTH, height: variables.optionRowHeight}));
 });
 
 jest.mock('@hooks/useLocalize', () =>
@@ -82,7 +80,7 @@ jest.mock('@src/components/ConfirmedRoute.tsx');
 function SelectionListWrapper({canSelectMultiple}: SelectionListWrapperProps) {
     const [selectedIds, setSelectedIds] = useState<string[]>([]);
 
-    const data = Array.from({length: 1000}, (element, index) => ({
+    const data = Array.from({length: ITEM_COUNT}, (element, index) => ({
         text: `Item ${index}`,
         keyForList: `item-${index}`,
         isSelected: selectedIds.includes(`item-${index}`),
@@ -139,20 +137,21 @@ test('[SelectionList] should render multiple selection and select 3 items', asyn
 });
 
 test('[SelectionList] should scroll and select a few items', async () => {
+    // Scrolls 8 rows down, so the rendered window covers both Item 7 and Item 15.
     const eventData = {
         nativeEvent: {
             contentOffset: {
-                y: variables.optionRowHeight * 5,
+                y: variables.optionRowHeight * 8,
             },
             contentSize: {
                 // Dimensions of the scrollable content
-                height: variables.optionRowHeight * 10,
-                width: 100,
+                height: variables.optionRowHeight * ITEM_COUNT,
+                width: LIST_WIDTH,
             },
             layoutMeasurement: {
                 // Dimensions of the device
-                height: variables.optionRowHeight * 5,
-                width: 100,
+                height: VIEWPORT_HEIGHT,
+                width: LIST_WIDTH,
             },
         },
     };
diff --git a/tests/perf-test/useAdvancedSearchFilters.perf-test.tsx b/tests/perf-test/useAdvancedSearchFilters.perf-test.tsx
index f264b8b8ec66..dbbea6894703 100644
--- a/tests/perf-test/useAdvancedSearchFilters.perf-test.tsx
+++ b/tests/perf-test/useAdvancedSearchFilters.perf-test.tsx
@@ -44,7 +44,6 @@ jest.mock('@hooks/useExportedToFilterOptions', () => ({
     __esModule: true,
     default: () => ({
         exportedToFilterOptions: [],
-        combinedUniqueExportTemplates: [],
         connectedIntegrationNames: new Set<string>(),
     }),
 }));
diff --git a/tests/tooling/SyncVersions.test.ts b/tests/tooling/SyncVersions.test.ts
index a568492be970..cd1aabc540d6 100644
--- a/tests/tooling/SyncVersions.test.ts
+++ b/tests/tooling/SyncVersions.test.ts
@@ -259,10 +259,27 @@ describe('syncVersions.sh sync (submodule only)', () => {
 
         expect(result.status).toBe(0);
         expect(result.outputs.POST_SYNC_APP_VERSION).toBe('9.3.11-48');
+        expect(result.outputs.SUBMODULE_MATCHES_REMOTE).toBe('true');
         expect(git(appDir, 'ls-tree', 'origin/main', 'Mobile-Expensify')).toContain(newSubmoduleSha);
         expect(git(appDir, 'log', '-1', '--format=%s', 'origin/main')).toBe(`Bump Mobile-Expensify submodule to latest main (${newSubmoduleSha})`);
     });
 
+    it('warns instead of failing when Mobile-Expensify main advances mid-sync', () => {
+        setUpFixture('9.3.11-48', '9.3.11-48');
+        const shaAtCheck = advanceMobileExpensify();
+        runScript('check');
+        // Mobile-Expensify main moves again while Node is being set up and the sync runs
+        const laterSha = advanceMobileExpensify();
+
+        const result = runScript('sync', {env: {NEED_FULL_VERSION_SYNC: 'false', EXPECTED_SUBMODULE_SHA: shaAtCheck}});
+
+        expect(result.status).toBe(0);
+        expect(result.stdout).toContain(`::warning::Mobile-Expensify main advanced to ${laterSha} while syncing`);
+        expect(result.outputs.POST_SYNC_APP_VERSION).toBe('9.3.11-48');
+        expect(result.outputs.SUBMODULE_MATCHES_REMOTE).toBe('false');
+        expect(git(appDir, 'ls-tree', 'origin/main', 'Mobile-Expensify')).toContain(shaAtCheck);
+    });
+
     it('rebases and retries when App main moved since the check step', () => {
         setUpFixture('9.3.11-48', '9.3.11-48');
         const newSubmoduleSha = advanceMobileExpensify();
@@ -374,7 +391,7 @@ describeMacOS('syncVersions.sh sync (full version)', () => {
         expect(result.outputs.POST_SYNC_APP_VERSION).toBe('9.3.11-48');
     });
 
-    it('fails verification when the target version does not match Mobile-Expensify', () => {
+    it('rejects a target version that does not match Mobile-Expensify, without touching App main', () => {
         setUpFixture('9.3.10-1', '9.3.11-48', true);
         // A real version drift always comes with the submodule pointer being behind, since Mobile-Expensify is bumped first
         advanceMobileExpensify();
@@ -383,7 +400,33 @@ describeMacOS('syncVersions.sh sync (full version)', () => {
         const result = runScript('sync', {env: {NEED_FULL_VERSION_SYNC: 'true', TARGET_VERSION: '9.9.9-9'}});
 
         expect(result.status).toBe(1);
-        expect(result.stdout).toContain("::error::Sync failed! Versions still don't match");
+        expect(result.stderr).toContain('::error::TARGET_VERSION (9.9.9-9) must match the Mobile-Expensify version (9.3.11-48)');
+        expect(readVersion(path.join(appDir, 'package.json'))).toBe('9.3.10-1');
+        expect(git(appDir, 'log', '-1', '--format=%s', 'origin/main')).toBe('Add Mobile-Expensify submodule');
+    });
+
+    it('fails verification when App main records a submodule commit this run never pinned', () => {
+        setUpFixture('9.3.10-1', '9.3.11-48', true);
+        runScript('check');
+        advanceMobileExpensify();
+
+        const result = runScript('sync', {env: {NEED_FULL_VERSION_SYNC: 'true', EXPECTED_SUBMODULE_SHA: 'f'.repeat(40)}});
+
+        expect(result.status).toBe(1);
+        expect(result.stdout).toContain('::error::Submodule on App main');
+    });
+
+    it('still syncs when the submodule pointer is already current', () => {
+        // Reachable after a previous sync got as far as bumping the submodule pointer but not the versions
+        setUpFixture('9.3.10-1', '9.3.11-48', true);
+        runScript('check');
+
+        const result = runScript('sync', {env: {NEED_FULL_VERSION_SYNC: 'true'}});
+
+        expect(result.status).toBe(0);
+        expect(result.outputs.POST_SYNC_APP_VERSION).toBe('9.3.11-48');
+        expect(readVersion(path.join(appDir, 'package.json'))).toBe('9.3.11-48');
+        expect(git(appDir, 'log', '-1', '--format=%s', 'origin/main')).toBe('Update version to 9.3.11-48 (sync recovery)');
     });
 });
 
diff --git a/tests/tooling/createOrUpdateDeployChecklist.test.ts b/tests/tooling/createOrUpdateDeployChecklist.test.ts
index d6dbc37437cf..3c367942ef7b 100644
--- a/tests/tooling/createOrUpdateDeployChecklist.test.ts
+++ b/tests/tooling/createOrUpdateDeployChecklist.test.ts
@@ -790,6 +790,67 @@ describe('createOrUpdateDeployChecklist', () => {
 
             mockGetDeployChecklistData.mockRestore();
         });
+
+        test('filters out Internal QA PRs that were already included in previous checklist', async () => {
+            // Given a previous checklist where cherry-picked PR 8 sat in the Internal QA section rather than the main PR list
+            vol.reset();
+            vol.fromJSON({
+                [PATH_TO_PACKAGE_JSON]: JSON.stringify({version: '1.0.3-0'}),
+            });
+
+            mockGetInput.mockImplementation((arg) => (arg === 'GITHUB_TOKEN' ? 'fake_token' : ''));
+            mockGetMergedPRsDeployedBetween.mockImplementation(async (fromRef, toRef, repositoryName) => {
+                if (fromRef === '1.0.2-1-staging' && toRef === '1.0.3-0-staging') {
+                    if (repositoryName === CONST.MOBILE_EXPENSIFY_REPO) {
+                        return {mergedPRs: [], submoduleUpdates: []};
+                    }
+                    return toMergedPRs([6, 8, 10, 11]);
+                }
+                return {mergedPRs: [], submoduleUpdates: []};
+            });
+
+            const mockGetDeployChecklistData = jest.spyOn(DeployChecklistUtils, 'getDeployChecklistData');
+            mockGetDeployChecklistData.mockImplementation(() => ({
+                title: 'Previous Checklist',
+                url: `https://github.com/${process.env.GITHUB_REPOSITORY}/issues/29`,
+                number: 29,
+                labels: [LABELS.STAGING_DEPLOY_CASH],
+                PRList: [{url: `https://github.com/${process.env.GITHUB_REPOSITORY}/pull/6`, number: 6, isChecked: true}],
+                PRListMobileExpensify: [],
+                deployBlockers: [],
+                internalQAPRList: [{url: `https://github.com/${process.env.GITHUB_REPOSITORY}/pull/8`, number: 8, isChecked: true}],
+                isSentryChecked: true,
+                isGHStatusChecked: true,
+                version: '1.0.2-1',
+                tag: '1.0.2-1-staging',
+            }));
+
+            mockDeployChecklistIssuesByLabel({
+                [CONST.LABELS.STAGING_DEPLOY]: [
+                    {
+                        number: 29,
+                        state: 'closed',
+                        labels: [LABELS.STAGING_DEPLOY_CASH],
+                    },
+                ],
+            });
+
+            // When a new checklist is created
+            await run();
+            const createCall = mockCreateIssue.mock.lastCall;
+            if (!createCall || !createCall[0]) {
+                throw new Error('Expected issues.create to receive a request payload.');
+            }
+            const createPayload = createCall[0];
+
+            // Then both previously released PRs are excluded, regardless of which section listed them
+            expect(createPayload.body).toContain('https://github.com/Expensify/App/pull/10');
+            expect(createPayload.body).toContain('https://github.com/Expensify/App/pull/11');
+            expect(createPayload.body).not.toContain('https://github.com/Expensify/App/pull/6');
+            expect(createPayload.body).not.toContain('https://github.com/Expensify/App/pull/8');
+
+            mockGetDeployChecklistData.mockRestore();
+        });
     });
 
     describe('chronological section with submodule updates', () => {
diff --git a/tests/tooling/markPullRequestsAsDeployed.test.ts b/tests/tooling/markPullRequestsAsDeployed.test.ts
index 21eac000e4a0..242d14c6969b 100644
--- a/tests/tooling/markPullRequestsAsDeployed.test.ts
+++ b/tests/tooling/markPullRequestsAsDeployed.test.ts
@@ -1,6 +1,7 @@
 import {afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, jest} from 'bun:test';
 
 import * as core from '@actions/core';
+import {RequestError} from '@octokit/request-error';
 
 import type {InternalOctokit} from '../../.github/libs/GithubUtils';
 
@@ -85,7 +86,7 @@ const mockOctokit = {
     },
     paginate: jest.fn().mockImplementation(<T>(objectMethod: () => Promise<ObjectMethodData<T>>) => objectMethod().then(({data}) => data)),
 };
-// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the stub implements only the endpoints this action touches, and the load-order constraint above rules out initialising a real octokit and spying on it
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the stub implements only the endpoints this action touches, and the load-order constraint above rules out initializing a real octokit and spying on it
 GithubUtils.internalOctokit = mockOctokit as unknown as InternalOctokit;
 
 // Must be imported after the GithubUtils.internalOctokit setup above so it picks up the mocks.
@@ -155,6 +156,7 @@ beforeAll(() => {
 });
 
 beforeEach(() => {
+    mockGetInput.mockImplementation(mockGetInputDefaultImplementation);
     mockGetPullRequest.mockImplementation(({pull_number}: PullRequestParams): PullRequestData => (pull_number in PRList ? {data: PRList[pull_number]} : {}));
     mockListTags.mockResolvedValue({
         data: defaultTags,
@@ -166,6 +168,7 @@ afterEach(() => {
     mockGetInput.mockClear();
     mockCreateComment.mockClear();
     mockGetPullRequest.mockClear();
+    mockListTags.mockClear();
 });
 
 afterAll(() => {
@@ -303,4 +306,196 @@ platform | result
             });
         }
     });
+
+    it.each([
+        ['continues processing App pull requests when the optional Mobile-Expensify input is omitted', '', []],
+        ['continues processing App pull requests when the optional Mobile-Expensify input is JSON null', 'null', []],
+        ['continues processing App pull requests when the optional Mobile-Expensify input is a JSON object', '{"unexpected":true}', []],
+        ['continues processing App pull requests when the optional Mobile-Expensify input is a JSON boolean', 'true', []],
+        ['continues processing App pull requests when the optional Mobile-Expensify input is a JSON string', '"1"', []],
+        ['continues processing App pull requests when the optional Mobile-Expensify input is a JSON number', '1', []],
+        ['normalizes mixed string and number Mobile-Expensify pull requests in input order', '["2",1]', [2, 1]],
+        ['rejects a Mobile-Expensify array containing an element other than a string or number', '["1",false]', undefined],
+    ])('%s', async (_scenario, input, mobilePullRequests) => {
+        mockGetInput.mockImplementation((key: string) => (key === 'MOBILE_EXPENSIFY_PR_LIST' ? input : mockGetInputDefaultImplementation(key)));
+        if (!mobilePullRequests) {
+            await expect(run()).rejects.toThrow('Deploy pull request list must be an array of strings or numbers');
+            expect(mockListTags).not.toHaveBeenCalled();
+            expect(mockCreateComment).not.toHaveBeenCalled();
+            return;
+        }
+        await run();
+        expect(mockCreateComment).toHaveBeenCalledTimes(Object.keys(PRList).length + mobilePullRequests.length);
+        expect(mockListTags).toHaveBeenCalledTimes(mobilePullRequests.length > 0 ? 2 : 1);
+        expect(mockListTags).toHaveBeenCalledWith(expect.objectContaining({repo: CONST.APP_REPO}));
+        if (mobilePullRequests.length === 0) {
+            expect(mockCreateComment).not.toHaveBeenCalledWith(expect.objectContaining({repo: CONST.MOBILE_EXPENSIFY_REPO}));
+        }
+        for (const [index, pullRequest] of mobilePullRequests.entries()) {
+            expect(mockCreateComment).toHaveBeenNthCalledWith(index + 3, expect.objectContaining({issue_number: pullRequest, repo: CONST.MOBILE_EXPENSIFY_REPO}));
+        }
+    });
+
+    it.each([
+        ['logs and skips a 404 from the Octokit dependency used by GitHub Actions while processing the remaining pull requests', 404],
+        ['rethrows a non-404 from the Octokit dependency used by GitHub Actions without changing its identity', 503],
+    ])('%s', async (_scenario, status) => {
+        const requestError = new RequestError(status === 404 ? 'Not Found' : 'Service Unavailable', status, {
+            request: {method: 'GET', url: 'https://api.github.com/repos/Expensify/App/pulls/1', headers: {}},
+        });
+        mockGetPullRequest.mockImplementation(({pull_number}: PullRequestParams): PullRequestData => {
+            if (pull_number === 1) {
+                throw requestError;
+            }
+            return {data: PRList[pull_number]};
+        });
+        if (status !== 404) {
+            await expect(run()).rejects.toBe(requestError);
+            return;
+        }
+        const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
+        try {
+            await run();
+            expect(consoleLogSpy).toHaveBeenCalledWith(`Unable to comment on ${CONST.APP_REPO} PR #1. GitHub responded with 404.`);
+            expect(mockGetPullRequest).toHaveBeenCalledTimes(Object.keys(PRList).length);
+            expect(mockCreateComment).toHaveBeenCalledTimes(1);
+            expect(mockCreateComment).toHaveBeenCalledWith(expect.objectContaining({issue_number: 2}));
+        } finally {
+            consoleLogSpy.mockRestore();
+        }
+    });
+
+    it.each([
+        ['null', null],
+        ['undefined', undefined],
+    ])('rejects a %s App pull request error with TypeError', async (_scenario, error) => {
+        mockGetInput.mockImplementation((key: string) => {
+            if (key === 'PR_LIST') {
+                return JSON.stringify([1]);
+            }
+            if (key === 'MOBILE_EXPENSIFY_PR_LIST') {
+                return JSON.stringify([]);
+            }
+            return mockGetInputDefaultImplementation(key);
+        });
+        mockGetPullRequest.mockImplementation(() => {
+            throw error;
+        });
+
+        await expect(run()).rejects.toThrow(TypeError);
+    });
+
+    it.each([
+        ['null', null],
+        ['undefined', undefined],
+    ])('rejects a %s Mobile-Expensify pull request error with TypeError before warning', async (_scenario, error) => {
+        mockGetInput.mockImplementation((key: string) => {
+            if (key === 'PR_LIST') {
+                return JSON.stringify([]);
+            }
+            if (key === 'MOBILE_EXPENSIFY_PR_LIST') {
+                return JSON.stringify([1]);
+            }
+            return mockGetInputDefaultImplementation(key);
+        });
+        mockGetPullRequest.mockImplementation(() => {
+            throw error;
+        });
+        const previousGithubRepository = process.env.GITHUB_REPOSITORY;
+        process.env.GITHUB_REPOSITORY = 'Example/App';
+        const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+        try {
+            await expect(run()).rejects.toThrow(TypeError);
+            expect(consoleWarnSpy).not.toHaveBeenCalled();
+        } finally {
+            if (previousGithubRepository === undefined) {
+                Reflect.deleteProperty(process.env, 'GITHUB_REPOSITORY');
+            } else {
+                process.env.GITHUB_REPOSITORY = previousGithubRepository;
+            }
+            consoleWarnSpy.mockRestore();
+        }
+    });
+
+    it.each([
+        ['E4a-App', 'App', 'absent', undefined, 'rethrow', 0],
+        ['E4a-Mobile', 'Mobile', 'absent', undefined, 'warn', 0],
+        ['E4b-App', 'App', 'own-data', 404, '404', 0],
+        ['E4b-Mobile', 'Mobile', 'inherited-data', 404, '404', 0],
+        ['E4c-App', 'App', 'own-data', 503, 'rethrow', 0],
+        ['E4c-Mobile', 'Mobile', 'inherited-data', 503, 'warn', 0],
+        ['E4d-App', 'App', 'own-getter', 404, '404', 1],
+        ['E4d-Mobile', 'Mobile', 'inherited-getter', 503, 'warn', 1],
+        ['E4d-Throw', 'Mobile', 'own-getter', 'throw', 'throw', 1],
+    ])('%s preserves callable rejection behavior', async (_scenario, consumer, propertyKind, status, outcome, expectedGetterCount) => {
+        mockGetInput.mockImplementation((key: string) => {
+            if (key === 'PR_LIST') {
+                return JSON.stringify(consumer === 'App' ? [1] : []);
+            }
+            if (key === 'MOBILE_EXPENSIFY_PR_LIST') {
+                return JSON.stringify(consumer === 'Mobile' ? [1] : []);
+            }
+            return mockGetInputDefaultImplementation(key);
+        });
+
+        const callable = () => {};
+        const getterError = new Error('status getter failed');
+        let getterCount = 0;
+        if (propertyKind === 'own-data') {
+            Object.assign(callable, {status});
+        } else if (propertyKind === 'inherited-data') {
+            Object.setPrototypeOf(callable, {status});
+        } else if (propertyKind === 'own-getter' || propertyKind === 'inherited-getter') {
+            const target = propertyKind === 'own-getter' ? callable : {};
+            if (propertyKind === 'inherited-getter') {
+                Object.setPrototypeOf(callable, target);
+            }
+            Object.defineProperty(target, 'status', {
+                get: () => {
+                    getterCount++;
+                    if (status === 'throw') {
+                        throw getterError;
+                    }
+                    return status;
+                },
+            });
+        }
+        mockGetPullRequest.mockImplementation(() => {
+            throw callable;
+        });
+
+        const previousGithubRepository = process.env.GITHUB_REPOSITORY;
+        process.env.GITHUB_REPOSITORY = consumer === 'Mobile' ? 'Example/App' : `${CONST.GITHUB_OWNER}/${CONST.APP_REPO}`;
+        const consoleLogSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
+        const consoleWarnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {});
+        const repository = consumer === 'App' ? CONST.APP_REPO : CONST.MOBILE_EXPENSIFY_REPO;
+        const notFoundLog = `Unable to comment on ${repository} PR #1. GitHub responded with 404.`;
+        const forkWarning = `Unable to comment on ${CONST.MOBILE_EXPENSIFY_REPO} PR #1 from forked repository. This is expected.`;
+        try {
+            const runPromise = run();
+            await Promise.allSettled([runPromise]);
+            expect(getterCount).toBe(expectedGetterCount);
+            if (outcome === '404') {
+                await expect(runPromise).resolves.toBeUndefined();
+                expect(consoleLogSpy).toHaveBeenCalledWith(notFoundLog);
+                expect(consoleWarnSpy).not.toHaveBeenCalled();
+            } else if (outcome === 'warn') {
+                await expect(runPromise).resolves.toBeUndefined();
+                expect(consoleWarnSpy).toHaveBeenCalledWith(forkWarning);
+                expect(consoleLogSpy).not.toHaveBeenCalledWith(notFoundLog);
+            } else {
+                await expect(runPromise).rejects.toBe(outcome === 'throw' ? getterError : callable);
+                expect(consoleLogSpy).not.toHaveBeenCalledWith(notFoundLog);
+                expect(consoleWarnSpy).not.toHaveBeenCalled();
+            }
+        } finally {
+            if (previousGithubRepository === undefined) {
+                Reflect.deleteProperty(process.env, 'GITHUB_REPOSITORY');
+            } else {
+                process.env.GITHUB_REPOSITORY = previousGithubRepository;
+            }
+            consoleLogSpy.mockRestore();
+            consoleWarnSpy.mockRestore();
+        }
+    });
 });
diff --git a/tests/ui/AddAgentRuleSuggestionsTabTest.tsx b/tests/ui/AddAgentRuleSuggestionsTabTest.tsx
index 06ab9388f2e8..f12b22d5deec 100644
--- a/tests/ui/AddAgentRuleSuggestionsTabTest.tsx
+++ b/tests/ui/AddAgentRuleSuggestionsTabTest.tsx
@@ -10,17 +10,13 @@ import type SuggestedAgentRule from '@src/types/onyx/SuggestedAgentRule';
 import React from 'react';
 
 jest.mock('@hooks/useLazyAsset', () => ({
-    useMemoizedLazyExpensifyIcons: jest.fn(() => ({
-        ThumbsUp: 'ThumbsUp',
-        CircleSlash: 'CircleSlash',
-        Flag: 'Flag',
-        Coins: 'Coins',
-    })),
+    useMemoizedLazyExpensifyIcons: jest.fn(() => ({DownArrow: 'DownArrow', UpArrow: 'UpArrow'})),
     useMemoizedLazyIllustrations: jest.fn(() => ({Lightbulb: 'Lightbulb'})),
 }));
 jest.mock('@hooks/useLocalize', () =>
     jest.fn(() => ({
         translate: (key: string) => key,
+        localeCompare: (a: string, b: string) => a.localeCompare(b),
     })),
 );
 jest.mock('@hooks/useNetwork');
@@ -118,26 +114,35 @@ jest.mock('@components/Pressable', () => {
 });
 jest.mock('@components/Text', () => {
     const ReactModule = jest.requireActual<typeof React>('react');
-    const {Text} = jest.requireActual<{Text: React.ComponentType<{children?: React.ReactNode}>}>('react-native');
-    return ({children}: {children: React.ReactNode}) => ReactModule.createElement(Text, null, children);
+    const {Text} = jest.requireActual<{Text: React.ComponentType<{children?: React.ReactNode; role?: string}>}>('react-native');
+    return ({children, role}: {children: React.ReactNode; role?: string}) => ReactModule.createElement(Text, {role}, children);
 });
 
 const mockedUseSuggestedAgentRules = jest.mocked(useSuggestedAgentRules);
 const mockedUseNetwork = jest.mocked(useNetwork);
 
+const AMOUNT_CATEGORY = 'Amount and spending';
+const MERCHANT_CATEGORY = 'Merchant';
+
 const SUGGESTIONS: SuggestedAgentRule[] = [
     {
         id: 'approveUnder75',
         title: 'Approve under $75 title',
         prompt: 'Approve any report that consists of expenses under $75',
+        category: AMOUNT_CATEGORY,
     },
     {
         id: 'blockGambling',
         title: 'Block gambling title',
         prompt: 'Block all spend from gambling or shady websites',
+        category: MERCHANT_CATEGORY,
     },
 ];
 
+function getCardLabel(suggestion: SuggestedAgentRule | undefined): string {
+    return `${suggestion?.title ?? ''}, ${suggestion?.prompt ?? ''}`;
+}
+
 describe('AddAgentRuleSuggestionsTab', () => {
     beforeEach(() => {
         jest.clearAllMocks();
@@ -145,13 +150,47 @@ describe('AddAgentRuleSuggestionsTab', () => {
         mockedUseSuggestedAgentRules.mockReturnValue({data: SUGGESTIONS, isLoading: false});
     });
 
-    it('renders suggestion prompts from hook data', () => {
+    it('renders each suggestion as its title with the prompt below it', () => {
+        // Given the default suggestions from the hook
+
+        // When the tab renders
         render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
 
+        // Then each card shows the short title to scan, and the full prompt that Next copies into the rule
+        expect(screen.getByText(SUGGESTIONS.at(0)?.title ?? '')).toBeOnTheScreen();
         expect(screen.getByText(SUGGESTIONS.at(0)?.prompt ?? '')).toBeOnTheScreen();
+        expect(screen.getByText(SUGGESTIONS.at(1)?.title ?? '')).toBeOnTheScreen();
         expect(screen.getByText(SUGGESTIONS.at(1)?.prompt ?? '')).toBeOnTheScreen();
-        expect(screen.queryByText(SUGGESTIONS.at(0)?.title ?? '')).toBeNull();
-        expect(screen.queryByText(SUGGESTIONS.at(1)?.title ?? '')).toBeNull();
+    });
+
+    it('shows one header for each category, in the order each category first appears', () => {
+        // Given a second amount suggestion that comes after the merchant suggestion
+        mockedUseSuggestedAgentRules.mockReturnValue({
+            data: [...SUGGESTIONS, {id: 'reportOver2500', title: 'Report over limit', prompt: 'Reject reports whose total is over $2,500', category: AMOUNT_CATEGORY}],
+            isLoading: false,
+        });
+
+        // When the tab renders
+        render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
+
+        // Then the amount category gets one header, and the headers follow the order of the list
+        const headers = screen.getAllByRole('heading');
+        expect(headers).toHaveLength(2);
+        expect(headers.at(0)).toHaveTextContent(AMOUNT_CATEGORY);
+        expect(headers.at(1)).toHaveTextContent(MERCHANT_CATEGORY);
+    });
+
+    it('shows no header for suggestions without a category', () => {
+        // Given suggestions that have no category
+        mockedUseSuggestedAgentRules.mockReturnValue({data: SUGGESTIONS.map(({id, title, prompt}) => ({id, title, prompt})), isLoading: false});
+
+        // When the tab renders
+        render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
+
+        // Then the cards render as one list with no header, because there is no section name to show
+        expect(screen.getByText(SUGGESTIONS.at(0)?.title ?? '')).toBeOnTheScreen();
+        expect(screen.getByText(SUGGESTIONS.at(1)?.title ?? '')).toBeOnTheScreen();
+        expect(screen.queryByRole('heading')).toBeNull();
     });
 
     it('calls onSelectSuggestion only after a card is chosen and Next is pressed', () => {
@@ -161,7 +200,7 @@ describe('AddAgentRuleSuggestionsTab', () => {
         fireEvent.press(screen.getByText('common.next'));
         expect(onSelectSuggestion).not.toHaveBeenCalled();
 
-        fireEvent.press(screen.getByLabelText(SUGGESTIONS.at(0)?.prompt ?? ''));
+        fireEvent.press(screen.getByLabelText(getCardLabel(SUGGESTIONS.at(0))));
         fireEvent.press(screen.getByText('common.next'));
 
         expect(onSelectSuggestion).toHaveBeenCalledTimes(1);
@@ -177,6 +216,67 @@ describe('AddAgentRuleSuggestionsTab', () => {
         expect(screen.getByText(SUGGESTIONS.at(1)?.prompt ?? '')).toBeOnTheScreen();
     });
 
+    it('removes the header of a category that the search leaves empty', () => {
+        // Given one amount suggestion and one merchant suggestion
+        render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
+
+        // When the search matches only the merchant suggestion
+        fireEvent.changeText(screen.getByLabelText('workspace.rules.agentRules.findSuggestion'), 'gambling');
+
+        // Then the amount header goes away with its only suggestion, so no empty section stays on screen
+        expect(screen.queryByRole('heading', {name: AMOUNT_CATEGORY})).toBeNull();
+        expect(screen.getByRole('heading', {name: MERCHANT_CATEGORY})).toBeOnTheScreen();
+    });
+
+    it('hides the suggestions of a section when its header is pressed', () => {
+        // Given one amount suggestion and one merchant suggestion
+        render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
+
+        // When the amount header is pressed
+        fireEvent.press(screen.getByLabelText(AMOUNT_CATEGORY));
+
+        // Then only the amount suggestion is hidden, and its header stays so the admin can expand the section again
+        expect(screen.queryByText(SUGGESTIONS.at(0)?.title ?? '')).toBeNull();
+        expect(screen.getByText(SUGGESTIONS.at(1)?.title ?? '')).toBeOnTheScreen();
+        expect(screen.getByRole('heading', {name: AMOUNT_CATEGORY})).toBeOnTheScreen();
+    });
+
+    it('shows the suggestions of a collapsed section again when its header is pressed', () => {
+        // Given the amount section is collapsed
+        render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
+        fireEvent.press(screen.getByLabelText(AMOUNT_CATEGORY));
+
+        // When the amount header is pressed again
+        fireEvent.press(screen.getByLabelText(AMOUNT_CATEGORY));
+
+        // Then the amount suggestion shows again
+        expect(screen.getByText(SUGGESTIONS.at(0)?.title ?? '')).toBeOnTheScreen();
+    });
+
+    it('expands every section when the search changes', () => {
+        // Given the amount section is collapsed
+        render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
+        fireEvent.press(screen.getByLabelText(AMOUNT_CATEGORY));
+
+        // When the admin searches for text that only the amount suggestion contains
+        fireEvent.changeText(screen.getByLabelText('workspace.rules.agentRules.findSuggestion'), 'approve');
+
+        // Then the amount suggestion shows, because a collapsed section must not hide a search result
+        expect(screen.getByText(SUGGESTIONS.at(0)?.title ?? '')).toBeOnTheScreen();
+    });
+
+    it('filters the list by search text against categories', () => {
+        // Given one amount suggestion and one merchant suggestion
+        render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
+
+        // When the search matches a header, but no title or prompt
+        fireEvent.changeText(screen.getByLabelText('workspace.rules.agentRules.findSuggestion'), 'merchant');
+
+        // Then the suggestions under that header stay listed, because an admin can search for a header they see
+        expect(screen.getByText(SUGGESTIONS.at(1)?.title ?? '')).toBeOnTheScreen();
+        expect(screen.queryByText(SUGGESTIONS.at(0)?.title ?? '')).toBeNull();
+    });
+
     it('shows a simple no-results message when search matches nothing', () => {
         render(<AddAgentRuleSuggestionsTab onSelectSuggestion={jest.fn()} />);
 
@@ -192,7 +292,7 @@ describe('AddAgentRuleSuggestionsTab', () => {
         const onSelectSuggestion = jest.fn();
         render(<AddAgentRuleSuggestionsTab onSelectSuggestion={onSelectSuggestion} />);
 
-        fireEvent.press(screen.getByLabelText(SUGGESTIONS.at(0)?.prompt ?? ''));
+        fireEvent.press(screen.getByLabelText(getCardLabel(SUGGESTIONS.at(0))));
         fireEvent.changeText(screen.getByLabelText('workspace.rules.agentRules.findSuggestion'), 'gambling');
         fireEvent.press(screen.getByText('common.next'));
 
diff --git a/tests/ui/AssignCardAssigneeStepTest.tsx b/tests/ui/AssignCardAssigneeStepTest.tsx
index c82d341ae211..cf22eec82e40 100644
--- a/tests/ui/AssignCardAssigneeStepTest.tsx
+++ b/tests/ui/AssignCardAssigneeStepTest.tsx
@@ -106,7 +106,6 @@ jest.mock('@libs/PolicyUtils', () => ({
     isDeletedPolicyEmployee: jest.fn(() => false),
 }));
 jest.mock('@libs/OptionsListUtils', () => ({
-    sortAlphabetically: (items: Array<Record<string, string>>, key: string, cmp: (a: string, b: string) => number) => [...items].sort((a, b) => cmp(a[key] ?? '', b[key] ?? '')),
     getSearchValueForPhoneOrEmail: (value: string) => value,
 }));
 jest.mock('@libs/PersonalDetailOptionsListUtils', () => ({
diff --git a/tests/ui/AuthScreensInitHandlerTest.tsx b/tests/ui/AuthScreensInitHandlerTest.tsx
index 1873ca63be69..bf024aebff8c 100644
--- a/tests/ui/AuthScreensInitHandlerTest.tsx
+++ b/tests/ui/AuthScreensInitHandlerTest.tsx
@@ -84,10 +84,13 @@ jest.mock('@libs/ActiveClientManager', () => ({
 jest.mock('@userActions/App', () => ({
     openApp: jest.fn(),
     reconnectApp: jest.fn(),
-    setUpPoliciesAndNavigate: jest.fn(),
     setLocale: jest.fn(),
 }));
 
+jest.mock('@userActions/Policy/CreateWorkspaceFlow', () => ({
+    setUpPoliciesAndNavigate: jest.fn(),
+}));
+
 jest.mock('@userActions/Download', () => ({
     clearDownloads: jest.fn(),
 }));
diff --git a/tests/ui/CategoryListItemHeaderTest.tsx b/tests/ui/CategoryListItemHeaderTest.tsx
index ff90caad5c35..e8c103ccc257 100644
--- a/tests/ui/CategoryListItemHeaderTest.tsx
+++ b/tests/ui/CategoryListItemHeaderTest.tsx
@@ -58,6 +58,9 @@ const mockSearchActionsContext = {
     setLastSearchType: jest.fn(),
     setCurrentSelectedTransactionReportID: jest.fn(),
     setSelectedTransactions: jest.fn(),
+    getSelectedTransactions: jest.fn(() => ({})),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: jest.fn(),
     setSelectedReports: jest.fn(),
     removeTransaction: jest.fn(),
diff --git a/tests/ui/CategoryPickerTest.tsx b/tests/ui/CategoryPickerTest.tsx
index e3b5d0550732..0c6bd8ec6f7b 100644
--- a/tests/ui/CategoryPickerTest.tsx
+++ b/tests/ui/CategoryPickerTest.tsx
@@ -24,7 +24,9 @@ jest.mock('@hooks/useOnyx', () => jest.fn());
 jest.mock('@hooks/useAutoFocusInput', () => jest.fn(() => ({inputCallbackRef: jest.fn()})));
 jest.mock('@hooks/useNetwork', () => jest.fn(() => ({isOffline: false})));
 jest.mock('@hooks/useThemeStyles', () => jest.fn(() => ({})));
-jest.mock('@hooks/useDebouncedState', () => jest.fn(() => ['', '', jest.fn()]));
+// Returns [searchValue, debouncedSearchValue, setter]. Lets a test stand the picker up mid-search.
+let mockDebouncedSearchValue = '';
+jest.mock('@hooks/useDebouncedState', () => jest.fn(() => [mockDebouncedSearchValue, mockDebouncedSearchValue, jest.fn()]));
 jest.mock('@hooks/useLocalize', () =>
     jest.fn(() => ({
         translate: (key: string) => key,
@@ -62,6 +64,7 @@ describe('CategoryPicker', () => {
     const mockedUseOnyxWithoutSnapshots = jest.mocked(useOnyxWithoutSnapshots);
 
     beforeEach(() => {
+        mockDebouncedSearchValue = '';
         jest.mocked(SelectionListWithSections).mockClear();
 
         // `@hooks/useOnyx` (snapshot-aware) provides the categories. GL codes live on the categories
@@ -104,6 +107,87 @@ describe('CategoryPicker', () => {
         expect(findRow('Benefits')?.alternateText).toBeUndefined();
     });
 
+    describe('reported rendered row count', () => {
+        it('counts one row per category when none of them are nested', () => {
+            // Given three flat categories
+            mockedUseOnyxWithoutSnapshots.mockReturnValue([false, {status: 'loaded'}]);
+            mockedUseOnyx.mockImplementation((key) => {
+                if (key === `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${POLICY_ID}`) {
+                    return [{Flights: makeCategory('Flights', ''), Hotels: makeCategory('Hotels', ''), Meals: makeCategory('Meals', '')}, {status: 'loaded'}];
+                }
+                return [undefined, {status: 'loaded'}];
+            });
+            const onRenderedRowCountChange = jest.fn();
+
+            // When the picker renders
+            render(
+                <CategoryPicker
+                    policyID={POLICY_ID}
+                    onSubmit={jest.fn()}
+                    onRenderedRowCountChange={onRenderedRowCountChange}
+                />,
+            );
+
+            // Then it reports the three rows it drew
+            expect(onRenderedRowCountChange).toHaveBeenLastCalledWith(3);
+        });
+
+        it('counts the parent rows a nested category hangs off', () => {
+            // Given the same three categories, two of them under one parent
+            mockedUseOnyxWithoutSnapshots.mockReturnValue([false, {status: 'loaded'}]);
+            mockedUseOnyx.mockImplementation((key) => {
+                if (key === `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${POLICY_ID}`) {
+                    const nestedCategories: PolicyCategories = {};
+                    for (const name of ['Meals', 'Travel: Flights', 'Travel: Hotels']) {
+                        nestedCategories[name] = makeCategory(name, '');
+                    }
+                    return [nestedCategories, {status: 'loaded'}];
+                }
+                return [undefined, {status: 'loaded'}];
+            });
+            const onRenderedRowCountChange = jest.fn();
+
+            // When the picker renders
+            render(
+                <CategoryPicker
+                    policyID={POLICY_ID}
+                    onSubmit={jest.fn()}
+                    onRenderedRowCountChange={onRenderedRowCountChange}
+                />,
+            );
+
+            // Then it reports four rows, not three: the `Travel` parent takes one. Sizing from the category
+            // count left the pop-over a row short and hid an option behind a scroll.
+            expect(onRenderedRowCountChange).toHaveBeenLastCalledWith(4);
+        });
+
+        it('does not report a filtered count while the user is searching', () => {
+            // Given a search that narrows three categories down to one
+            mockedUseOnyxWithoutSnapshots.mockReturnValue([false, {status: 'loaded'}]);
+            mockedUseOnyx.mockImplementation((key) => {
+                if (key === `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${POLICY_ID}`) {
+                    return [{Flights: makeCategory('Flights', ''), Hotels: makeCategory('Hotels', ''), Meals: makeCategory('Meals', '')}, {status: 'loaded'}];
+                }
+                return [undefined, {status: 'loaded'}];
+            });
+            mockDebouncedSearchValue = 'Fli';
+            const onRenderedRowCountChange = jest.fn();
+
+            // When the picker renders mid-search
+            render(
+                <CategoryPicker
+                    policyID={POLICY_ID}
+                    onSubmit={jest.fn()}
+                    onRenderedRowCountChange={onRenderedRowCountChange}
+                />,
+            );
+
+            // Then nothing is reported: resizing as results narrow slides the search input out from under the
+            // cursor, since a container opened above its row is pinned by its bottom edge.
+            expect(onRenderedRowCountChange).not.toHaveBeenCalled();
+        });
+    });
+
     it('never reads a bare collection key when the policy ID is an empty string', () => {
         mockedUseOnyxWithoutSnapshots.mockReturnValue([false, {status: 'loaded'}]);
 
diff --git a/tests/ui/ChangeReceiptBillingAccountPageTest.tsx b/tests/ui/ChangeReceiptBillingAccountPageTest.tsx
index 0e9d0ecf5e0d..ee030b408b37 100644
--- a/tests/ui/ChangeReceiptBillingAccountPageTest.tsx
+++ b/tests/ui/ChangeReceiptBillingAccountPageTest.tsx
@@ -86,7 +86,6 @@ jest.mock('@hooks/useDebouncedState', () =>
 
 jest.mock('@libs/OptionsListUtils', () => ({
     formatMemberForList: (member: Record<string, unknown>) => ({...member}),
-    sortAlphabetically: (items: Array<Record<string, string>>, key: string, cmp: (a: string, b: string) => number) => [...items].sort((a, b) => cmp(a[key] ?? '', b[key] ?? '')),
     getSearchValueForPhoneOrEmail: (value: string) => value,
     getHeaderMessage: () => '',
 }));
diff --git a/tests/ui/ClearReportActionErrorsUITest.tsx b/tests/ui/ClearReportActionErrorsUITest.tsx
index 8167fe2fd489..3dc02221f470 100644
--- a/tests/ui/ClearReportActionErrorsUITest.tsx
+++ b/tests/ui/ClearReportActionErrorsUITest.tsx
@@ -22,6 +22,7 @@ import * as NativeNavigation from '@react-navigation/native';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
+import getOnyxValue from '../utils/getOnyxValue';
 import {createMockReport, getFakeReportAction} from '../utils/ReportTestUtils';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
@@ -34,6 +35,8 @@ const REPORT_ID = '12345';
 const REPORT_ACTION_ID = '99999';
 const CHILD_REPORT_ID = '67890';
 const CHILD_REPORT_ACTION_ID = '88888';
+const SPLIT_CHILD_TRANSACTION_ID = '77777';
+const SPLIT_CONTAINER_TRANSACTION_ID = '66666';
 
 const DEFAULT_ERROR_TIMESTAMP = Date.now() * 1000;
 const DEFAULT_ERRORS = {[DEFAULT_ERROR_TIMESTAMP]: 'Something went wrong. Please try again.'};
@@ -241,6 +244,58 @@ describe('ClearReportActionErrors UI', () => {
         });
     });
 
+    describe('Split container error propagation', () => {
+        it('should clear both the split child and the hidden container errors when dismissed', async () => {
+            // Given a money request action for a split child whose transaction points back to the hidden split
+            // container, with an error on each of them
+            const action = {
+                ...getFakeReportAction(Number(REPORT_ACTION_ID), {actorAccountID: ACTOR_ACCOUNT_ID, errors: DEFAULT_ERRORS}),
+                actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+                originalMessage: {
+                    IOUTransactionID: SPLIT_CHILD_TRANSACTION_ID,
+                    type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                },
+            } as ReportAction;
+            const report = createMockReport({reportID: REPORT_ID, ownerAccountID: ACTOR_ACCOUNT_ID});
+
+            await act(async () => {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {
+                    [REPORT_ACTION_ID]: action,
+                });
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${SPLIT_CHILD_TRANSACTION_ID}`, {
+                    transactionID: SPLIT_CHILD_TRANSACTION_ID,
+                    reportID: REPORT_ID,
+                    amount: 1000,
+                    currency: 'USD',
+                    merchant: 'Test Merchant',
+                    comment: {originalTransactionID: SPLIT_CONTAINER_TRANSACTION_ID},
+                    errors: {[DEFAULT_ERROR_TIMESTAMP]: 'child error'},
+                });
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${SPLIT_CONTAINER_TRANSACTION_ID}`, {
+                    transactionID: SPLIT_CONTAINER_TRANSACTION_ID,
+                    reportID: CONST.REPORT.SPLIT_REPORT_ID,
+                    errors: {[DEFAULT_ERROR_TIMESTAMP]: 'container error'},
+                });
+            });
+            await waitForBatchedUpdatesWithAct();
+
+            renderReportActionItem(action, report);
+            await waitForBatchedUpdatesWithAct();
+
+            // When the user dismisses the error
+            fireEvent.press(screen.getByLabelText('Dismiss'));
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the child's error and the error on its hidden container are both cleared
+            const childTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${SPLIT_CHILD_TRANSACTION_ID}`);
+            const containerTransaction = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${SPLIT_CONTAINER_TRANSACTION_ID}`);
+
+            expect(childTransaction?.errors).toBeFalsy();
+            expect(containerTransaction?.errors).toBeFalsy();
+        });
+    });
+
     describe('Optimistic action deletion', () => {
         it('should delete optimistic action instead of clearing errors', async () => {
             // Given an optimistic report action (pendingAction='add' and isOptimisticAction=true) with errors
diff --git a/tests/ui/ConciergePromptBoxTest.tsx b/tests/ui/ConciergePromptBoxTest.tsx
index 723792861b86..7edc0adeac9e 100644
--- a/tests/ui/ConciergePromptBoxTest.tsx
+++ b/tests/ui/ConciergePromptBoxTest.tsx
@@ -15,6 +15,7 @@ import {isSafari} from '@libs/Browser';
 import ConciergePromptBox, {PLACEHOLDER_SKELETON_TEST_ID} from '@pages/home/ForYouSection/ConciergePromptBox';
 
 import {close} from '@userActions/Modal';
+import type * as ReportActionsModule from '@userActions/Report';
 import {isAnonymousUser, signOutAndRedirectToSignIn} from '@userActions/Session';
 
 import CONST from '@src/CONST';
@@ -162,6 +163,12 @@ jest.mock('@userActions/Modal', () => ({
     close: jest.fn(),
 }));
 
+// Typing a mention searches for users on the server, and that request must not reach the network in tests.
+jest.mock('@userActions/Report', () => ({
+    ...jest.requireActual<typeof ReportActionsModule>('@userActions/Report'),
+    searchUserInServer: jest.fn(),
+}));
+
 jest.mock('@userActions/Session', () => ({
     isAnonymousUser: jest.fn(() => false),
     signOutAndRedirectToSignIn: jest.fn(),
diff --git a/tests/ui/DynamicWorkspaceCompanyCardAccountSelectCardPageTest.tsx b/tests/ui/DynamicWorkspaceCompanyCardAccountSelectCardPageTest.tsx
new file mode 100644
index 000000000000..6936147e3e33
--- /dev/null
+++ b/tests/ui/DynamicWorkspaceCompanyCardAccountSelectCardPageTest.tsx
@@ -0,0 +1,113 @@
+import {render} from '@testing-library/react-native';
+
+import SelectionScreen from '@components/SelectionScreen';
+
+import DynamicWorkspaceCompanyCardAccountSelectCardPage from '@pages/workspace/companyCards/DynamicWorkspaceCompanyCardAccountSelectCardPage';
+import {getExportMenuItem} from '@pages/workspace/companyCards/utils';
+
+import type * as ReactNavigation from '@react-navigation/native';
+
+import React from 'react';
+
+/** Build `count` export-account options; the option at `selectedIndex` is the saved one. */
+function buildExportData(count: number, selectedIndex: number) {
+    return Array.from({length: count}, (_, index) => {
+        const value = `acct${String(index + 1).padStart(2, '0')}`;
+        return {value, keyForList: value, text: value, isSelected: index === selectedIndex};
+    });
+}
+
+jest.mock('@react-navigation/native', () => {
+    const actualNavigation: typeof ReactNavigation = jest.requireActual('@react-navigation/native');
+    return {
+        ...actualNavigation,
+        // No-op focus effect: useInitialSelection still freezes via its useState seed, which is what we assert on.
+        useFocusEffect: jest.fn(),
+    };
+});
+
+jest.mock('@components/SelectionScreen', () => jest.fn(() => null));
+jest.mock('@components/BlockingViews/BlockingView', () => jest.fn(() => null));
+jest.mock(
+    '@pages/workspace/AccessOrNotFoundWrapper',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock('@pages/workspace/companyCards/utils', () => ({getExportMenuItem: jest.fn()}));
+jest.mock('@pages/workspace/accounting/utils', () => ({getCurrentAccountingIntegrationName: jest.fn(() => '')}));
+
+jest.mock('@hooks/useCardsList', () => jest.fn(() => [Object.fromEntries([['07', {}]])]));
+jest.mock('@hooks/useCardFeeds', () => jest.fn(() => [undefined]));
+jest.mock('@hooks/usePolicy', () => jest.fn(() => ({})));
+jest.mock('@hooks/useWorkspaceAccountID', () => jest.fn(() => 1));
+jest.mock('@hooks/useDynamicBackPath', () => jest.fn(() => ''));
+jest.mock('@hooks/useEnvironment', () => jest.fn(() => ({environmentURL: ''})));
+jest.mock('@hooks/useLazyAsset', () => ({useMemoizedLazyIllustrations: jest.fn(() => ({Telescope: undefined}))}));
+jest.mock('@libs/CardUtils', () => ({
+    getCompanyCardFeed: jest.fn(() => 'feed'),
+    getDomainOrWorkspaceAccountID: jest.fn(() => 1),
+    isExpensifyCard: jest.fn(() => false),
+}));
+jest.mock('@libs/PolicyUtils', () => ({getConnectedIntegration: jest.fn(() => 'quickbooksOnline')}));
+jest.mock('@navigation/Navigation', () => ({getActiveRoute: jest.fn(() => ''), goBack: jest.fn()}));
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        translate: (key: string) => key,
+    })),
+);
+
+type MockSelectorItem = {value: string; keyForList: string; isSelected?: boolean};
+
+type MockSelectionScreenProps = {
+    data: MockSelectorItem[];
+    initiallyFocusedOptionKey?: string;
+    shouldUpdateFocusedIndex?: boolean;
+};
+
+function pageElement() {
+    return (
+        <DynamicWorkspaceCompanyCardAccountSelectCardPage
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- only route.params is read in this page
+            route={{params: {policyID: 'policy1', feed: 'feed', cardID: '07'}} as never}
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- navigation object is unused in this test
+            navigation={{} as never}
+        />
+    );
+}
+
+describe('DynamicWorkspaceCompanyCardAccountSelectCardPage', () => {
+    const mockedGetExportMenuItem = jest.mocked(getExportMenuItem);
+    const mockedSelectionScreen = jest.mocked(SelectionScreen);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- narrows the props captured from the mocked SelectionScreen in this test
+    const getScreenProps = () => mockedSelectionScreen.mock.lastCall?.[0] as MockSelectionScreenProps | undefined;
+
+    beforeEach(() => {
+        mockedSelectionScreen.mockClear();
+    });
+
+    it('pins the initially selected export account to the top on open', () => {
+        // 13 options (> STANDARD_LIST_ITEM_LIMIT), saved one in the middle.
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- test builds only the fields this page reads
+        mockedGetExportMenuItem.mockReturnValue({data: buildExportData(13, 6), exportType: 'exportType'} as never);
+        render(pageElement());
+
+        const props = getScreenProps();
+        expect(props?.data.at(0)?.value).toBe('acct07');
+        expect(props?.data.at(0)?.isSelected).toBe(true);
+        // "acct01" would be first if nothing were pinned.
+        expect(props?.data.at(0)?.value).not.toBe('acct01');
+        expect(props?.initiallyFocusedOptionKey).toBe('acct07');
+        expect(props?.shouldUpdateFocusedIndex).toBe(true);
+    });
+
+    it('does not reorder when the list is under the item-limit threshold', () => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- test builds only the fields this page reads
+        mockedGetExportMenuItem.mockReturnValue({data: buildExportData(5, 3), exportType: 'exportType'} as never);
+        render(pageElement());
+
+        const props = getScreenProps();
+        // Below the threshold moveInitialSelectionToTop is a no-op, so the natural order is kept.
+        expect(props?.data.at(0)?.value).toBe('acct01');
+    });
+});
diff --git a/tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageFastEditSaveTest.tsx b/tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageFastEditSaveTest.tsx
new file mode 100644
index 000000000000..7ec2c852c998
--- /dev/null
+++ b/tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageFastEditSaveTest.tsx
@@ -0,0 +1,263 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {saveFastEditApprovalWorkflow} from '@libs/actions/Workflow';
+import Navigation from '@libs/Navigation/Navigation';
+
+import DynamicWorkspaceWorkflowsApprovalsExpensesFromPage from '@pages/workspace/workflows/approvals/DynamicWorkspaceWorkflowsApprovalsExpensesFromPage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Policy} from '@src/types/onyx';
+import type {ApprovalWorkflowOnyx, Approver, Member} from '@src/types/onyx/ApprovalWorkflow';
+import type {PersonalDetailsList} from '@src/types/onyx/PersonalDetails';
+
+import {NavigationContainer} from '@react-navigation/native';
+import {createStackNavigator} from '@react-navigation/stack';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import getOnyxValue from '../utils/getOnyxValue';
+import {buildPersonalDetails} from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const POLICY_ID = 'workflow-approvals-expenses-from-test-policy';
+const ALICE_EMAIL = 'alice@example.com';
+const ALICE_ACCOUNT_ID = 1;
+const BOB_EMAIL = 'bob@example.com';
+const BOB_ACCOUNT_ID = 2;
+const CAROL_EMAIL = 'carol@example.com';
+const CAROL_ACCOUNT_ID = 3;
+// Not in the workspace, so selecting them sends the save through the invite page.
+const DANA_EMAIL = 'dana@example.com';
+const DANA_ACCOUNT_ID = 4;
+
+jest.mock('@react-navigation/native', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const actualNav = jest.requireActual('@react-navigation/native');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actualNav,
+        useIsFocused: () => true,
+        usePreventRemove: jest.fn(),
+    };
+});
+
+// goBack runs afterTransition right away, since no screen transition ever finishes in a test.
+jest.mock('@libs/Navigation/Navigation', () => ({
+    goBack: jest.fn((_route?: string, options?: {afterTransition?: () => void}) => options?.afterTransition?.()),
+    navigate: jest.fn(),
+    getActiveRoute: jest.fn(() => ''),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    dismissModal: jest.fn(),
+}));
+
+jest.mock('@libs/actions/Workflow', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const actual = jest.requireActual('@libs/actions/Workflow');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actual,
+        saveFastEditApprovalWorkflow: jest.fn(),
+    };
+});
+
+const saveFastEditApprovalWorkflowMock = jest.mocked(saveFastEditApprovalWorkflow);
+const goBackMock = jest.mocked(Navigation.goBack);
+const navigateMock = jest.mocked(Navigation.navigate);
+
+const CAROL_APPROVER: Approver = {email: CAROL_EMAIL, displayName: 'carol'};
+const ALICE_MEMBER: Member = {email: ALICE_EMAIL, displayName: 'alice'};
+const BOB_MEMBER: Member = {email: BOB_EMAIL, displayName: 'bob'};
+const DANA_MEMBER: Member = {email: DANA_EMAIL, displayName: 'dana'};
+
+function buildPolicy(): Policy {
+    return {
+        id: POLICY_ID,
+        name: 'Test Workspace',
+        type: CONST.POLICY.TYPE.CORPORATE,
+        role: CONST.POLICY.ROLE.ADMIN,
+        owner: ALICE_EMAIL,
+        employeeList: {
+            [ALICE_EMAIL]: {email: ALICE_EMAIL, submitsTo: ALICE_EMAIL},
+            [BOB_EMAIL]: {email: BOB_EMAIL, submitsTo: CAROL_EMAIL},
+            [CAROL_EMAIL]: {email: CAROL_EMAIL, submitsTo: ALICE_EMAIL},
+        },
+        approver: ALICE_EMAIL,
+        areWorkflowsEnabled: true,
+        outputCurrency: 'USD',
+        avatarURL: '',
+        pendingAction: null,
+        errors: {},
+    } as Policy;
+}
+
+const mockRoute = {
+    key: 'test-route',
+    name: SCREENS.WORKSPACE.DYNAMIC_WORKFLOWS_APPROVALS_EXPENSES_FROM,
+    params: {policyID: POLICY_ID},
+};
+
+const Stack = createStackNavigator();
+
+const renderExpensesFromPage = () =>
+    render(
+        <NavigationContainer>
+            <Stack.Navigator>
+                <Stack.Screen name={SCREENS.WORKSPACE.DYNAMIC_WORKFLOWS_APPROVALS_EXPENSES_FROM}>
+                    {() => (
+                        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+                            {/* @ts-expect-error - the navigator supplies the route and navigation props at runtime */}
+                            <DynamicWorkspaceWorkflowsApprovalsExpensesFromPage route={mockRoute} />
+                        </ComposeProviders>
+                    )}
+                </Stack.Screen>
+            </Stack.Navigator>
+        </NavigationContainer>,
+    );
+
+/** Seeds an EDIT draft where the admin has already deselected Bob, which is the state right before Save is pressed. */
+async function seedWorkflow(overrides: Partial<ApprovalWorkflowOnyx>) {
+    const seededWorkflow: ApprovalWorkflowOnyx = {
+        action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
+        approvers: [CAROL_APPROVER],
+        originalApprovers: [CAROL_APPROVER],
+        originalMembers: [ALICE_MEMBER, BOB_MEMBER],
+        members: [ALICE_MEMBER],
+        availableMembers: [ALICE_MEMBER, BOB_MEMBER],
+        usedApproverEmails: [],
+        isDefault: false,
+        ...overrides,
+    };
+    await act(async () => {
+        await Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, seededWorkflow);
+        await waitForBatchedUpdatesWithAct();
+    });
+}
+
+async function renderAndPressSave() {
+    const rendered = renderExpensesFromPage();
+    await waitForBatchedUpdatesWithAct();
+    fireEvent.press(screen.getByText('Save'));
+    await waitForBatchedUpdatesWithAct();
+    return rendered;
+}
+
+describe('DynamicWorkspaceWorkflowsApprovalsExpensesFromPage fast edit save', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await act(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.HAS_LOADED_APP, true);
+            await Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, false);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, buildPolicy());
+            await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                [ALICE_ACCOUNT_ID]: buildPersonalDetails(ALICE_EMAIL, ALICE_ACCOUNT_ID, 'alice'),
+                [BOB_ACCOUNT_ID]: buildPersonalDetails(BOB_EMAIL, BOB_ACCOUNT_ID, 'bob'),
+                [CAROL_ACCOUNT_ID]: buildPersonalDetails(CAROL_EMAIL, CAROL_ACCOUNT_ID, 'carol'),
+                [DANA_ACCOUNT_ID]: buildPersonalDetails(DANA_EMAIL, DANA_ACCOUNT_ID, 'dana'),
+            } satisfies PersonalDetailsList);
+            await Onyx.merge(ONYXKEYS.SESSION, {email: ALICE_EMAIL, accountID: ALICE_ACCOUNT_ID});
+            await waitForBatchedUpdatesWithAct();
+        });
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+            await waitForBatchedUpdatesWithAct();
+        });
+    });
+
+    it('saves a "+N more" edit with the new members and the original members', async () => {
+        // Given a "+N more" edit where Bob was deselected
+        await seedWorkflow({isFastEdit: true});
+
+        // When the admin presses Save
+        await renderAndPressSave();
+
+        // Then the page goes back and saves the workflow with Alice only, keeping Alice and Bob as the originals
+        expect(goBackMock).toHaveBeenCalledTimes(1);
+        expect(saveFastEditApprovalWorkflowMock).toHaveBeenCalledTimes(1);
+        const [params] = saveFastEditApprovalWorkflowMock.mock.calls.at(0) ?? [];
+        expect(params?.approvalWorkflow.members.map((member) => member.email)).toEqual([ALICE_EMAIL]);
+        expect(params?.approvalWorkflow.originalMembers?.map((member) => member.email)).toEqual([ALICE_EMAIL, BOB_EMAIL]);
+        expect(params?.isMultipleApproversBetaEnabled).toBe(false);
+    });
+
+    it('passes the rules beta flag through', async () => {
+        // Given the rules beta is on and a "+N more" edit is ready to save
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.BETAS, [CONST.BETAS.MULTIPLE_APPROVERS]);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await seedWorkflow({isFastEdit: true});
+
+        // When the admin presses Save
+        await renderAndPressSave();
+
+        // Then the save is told to use the rules path
+        const [params] = saveFastEditApprovalWorkflowMock.mock.calls.at(0) ?? [];
+        expect(params?.isMultipleApproversBetaEnabled).toBe(true);
+    });
+
+    it('leaves the save and the draft to the Edit page when opened from it', async () => {
+        // Given the page was opened from the Edit page, not the "+N more" shortcut
+        await seedWorkflow({isFastEdit: false});
+
+        // When the admin presses Save and the page closes
+        const {unmount} = await renderAndPressSave();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then nothing is saved here, and the draft survives for the Edit page to save
+        expect(saveFastEditApprovalWorkflowMock).not.toHaveBeenCalled();
+        const draft = await getOnyxValue(ONYXKEYS.APPROVAL_WORKFLOW);
+        expect(draft?.members.map((member) => member.email)).toEqual([ALICE_EMAIL]);
+    });
+
+    it('discards the draft when a "+N more" edit is closed without saving', async () => {
+        // Given a "+N more" edit
+        await seedWorkflow({isFastEdit: true});
+        const {unmount} = renderExpensesFromPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the admin backs out without pressing Save
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then nothing is saved and the draft is gone, so it cannot leak into the next session
+        expect(saveFastEditApprovalWorkflowMock).not.toHaveBeenCalled();
+        await expect(getOnyxValue(ONYXKEYS.APPROVAL_WORKFLOW)).resolves.toBeUndefined();
+    });
+
+    it('hands a non-member off to the invite page without saving', async () => {
+        // Given a "+N more" edit where Dana, who is not a workspace member, was selected
+        await seedWorkflow({isFastEdit: true, members: [ALICE_MEMBER, DANA_MEMBER]});
+        await act(async () => {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${POLICY_ID}`, {[DANA_EMAIL]: DANA_ACCOUNT_ID});
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the admin presses Save and the page is replaced by the invite page
+        const {unmount} = await renderAndPressSave();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the invite page opens, nothing is saved yet, and the draft is kept for the invite page to save
+        expect(navigateMock).toHaveBeenCalledTimes(1);
+        expect(saveFastEditApprovalWorkflowMock).not.toHaveBeenCalled();
+        const draft = await getOnyxValue(ONYXKEYS.APPROVAL_WORKFLOW);
+        expect(draft?.members.map((member) => member.email)).toEqual([ALICE_EMAIL, DANA_EMAIL]);
+        expect(draft?.isFastEdit).toBe(true);
+    });
+});
diff --git a/tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageTest.tsx b/tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageTest.tsx
new file mode 100644
index 000000000000..79f26913c1ec
--- /dev/null
+++ b/tests/ui/DynamicWorkspaceWorkflowsApprovalsExpensesFromPageTest.tsx
@@ -0,0 +1,193 @@
+import {act, render} from '@testing-library/react-native';
+
+import ApproverSelectionList from '@components/ApproverSelectionList';
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {INITIAL_APPROVAL_WORKFLOW} from '@libs/WorkflowUtils';
+
+import DynamicWorkspaceWorkflowsApprovalsExpensesFromPage from '@pages/workspace/workflows/approvals/DynamicWorkspaceWorkflowsApprovalsExpensesFromPage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
+import type {PolicyEmployeeList} from '@src/types/onyx/PolicyEmployee';
+
+import type {PropsWithChildren} from 'react';
+import type {ValueOf} from 'type-fest';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import type * as MockUseConfirmModalUtil from '../utils/mockUseConfirmModal';
+
+import getOnyxValue from '../utils/getOnyxValue';
+import {getShowConfirmModalOption, MockModalActions, mockShowConfirmModal, resetMockConfirmModal, resolveShowConfirmModal} from '../utils/mockUseConfirmModal';
+import {translateLocal} from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const POLICY_ID = 'workflow-expenses-from-test-policy';
+const ADMIN_EMAIL = 'admin@example.com';
+const BOB_EMAIL = 'bob@example.com';
+const CAROL_EMAIL = 'carol@example.com';
+
+jest.mock('@hooks/useConfirmModal', () => {
+    const {default: mockUseConfirmModal} = jest.requireActual<typeof MockUseConfirmModalUtil>('../utils/mockUseConfirmModal');
+    return mockUseConfirmModal;
+});
+
+jest.mock('@components/Modal/Global/ModalContext', () => {
+    const {createMockModalContextModule} = jest.requireActual<typeof MockUseConfirmModalUtil>('../utils/mockUseConfirmModal');
+    return createMockModalContextModule();
+});
+
+// The tests select members through the callback the page hands the list, so the list itself renders nothing.
+jest.mock('@components/ApproverSelectionList', () => jest.fn(() => null));
+jest.mock('@pages/workspace/AccessOrNotFoundWrapper', () => jest.fn(({children}: PropsWithChildren) => children));
+jest.mock('@hooks/usePersonalDetailSearchSelector', () =>
+    jest.fn(() => ({
+        setSearchTerm: jest.fn(),
+        debouncedSearchTerm: '',
+        availableOptions: {selectedOptions: [], recentOptions: [], personalDetails: [], userToInvite: null},
+        areOptionsInitialized: true,
+    })),
+);
+
+function buildPolicy(): Policy {
+    const employeeList: PolicyEmployeeList = {};
+    for (const email of [ADMIN_EMAIL, BOB_EMAIL, CAROL_EMAIL]) {
+        employeeList[email] = {email, submitsTo: ADMIN_EMAIL, role: email === ADMIN_EMAIL ? CONST.POLICY.ROLE.ADMIN : CONST.POLICY.ROLE.USER};
+    }
+    return {
+        id: POLICY_ID,
+        name: 'Test Workspace',
+        type: CONST.POLICY.TYPE.CORPORATE,
+        role: CONST.POLICY.ROLE.ADMIN,
+        owner: ADMIN_EMAIL,
+        approver: ADMIN_EMAIL,
+        employeeList,
+        areWorkflowsEnabled: true,
+        outputCurrency: 'USD',
+    } as Policy;
+}
+
+async function renderPage(action: ValueOf<typeof CONST.APPROVAL_WORKFLOW.ACTION>, memberEmails: string[]) {
+    await act(async () => {
+        await Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, {...INITIAL_APPROVAL_WORKFLOW, action, members: memberEmails.map((email) => ({email, displayName: email}))});
+    });
+    render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+            <DynamicWorkspaceWorkflowsApprovalsExpensesFromPage
+                // @ts-expect-error - the page only reads route.params
+                route={{params: {policyID: POLICY_ID}}}
+            />
+        </ComposeProviders>,
+    );
+    await waitForBatchedUpdatesWithAct();
+}
+
+/** Selects a member the way ApproverSelectionList does: by handing back the current selection plus that member. */
+async function selectMember(email: string) {
+    const listProps = jest.mocked(ApproverSelectionList).mock.lastCall?.[0];
+    const member = listProps?.allApprovers.find((approver) => approver.login === email);
+    if (!listProps || !member) {
+        throw new Error(`${email} is not in the member list`);
+    }
+    const selectedMembers = listProps.allApprovers.filter((approver) => approver.isSelected);
+    await act(async () => {
+        listProps.onSelectApprover?.([...selectedMembers, {...member, isSelected: true}]);
+    });
+    await waitForBatchedUpdatesWithAct();
+}
+
+async function getWorkflowMemberEmails() {
+    const approvalWorkflow = await getOnyxValue(ONYXKEYS.APPROVAL_WORKFLOW);
+    return approvalWorkflow?.members.map((member) => member.email);
+}
+
+describe('DynamicWorkspaceWorkflowsApprovalsExpensesFromPage', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        resetMockConfirmModal();
+        jest.mocked(ApproverSelectionList).mockClear();
+        await act(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.HAS_LOADED_APP, true);
+            await Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, false);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, buildPolicy());
+            await Onyx.merge(ONYXKEYS.SESSION, {email: ADMIN_EMAIL, accountID: 1});
+        });
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('warns before moving everyone into a new workflow and adds the last member once confirmed', async () => {
+        // Given a new workflow that already has every workspace member except Carol
+        await renderPage(CONST.APPROVAL_WORKFLOW.ACTION.CREATE, [ADMIN_EMAIL, BOB_EMAIL]);
+
+        // When the admin selects Carol, the last member left
+        await selectMember(CAROL_EMAIL);
+
+        // Then the admin is warned that every other workflow will be deleted, and Carol is not added until they confirm
+        expect(mockShowConfirmModal).toHaveBeenCalledTimes(1);
+        expect(getShowConfirmModalOption('title')).toBe(translateLocal('workflowsExpensesFromPage.moveEveryoneToThisWorkflowTitle'));
+        expect(getShowConfirmModalOption('prompt')).toBe(translateLocal('workflowsExpensesFromPage.moveEveryoneToThisWorkflowPrompt'));
+        expect(await getWorkflowMemberEmails()).toEqual([ADMIN_EMAIL, BOB_EMAIL]);
+
+        // When the admin confirms
+        resolveShowConfirmModal({action: MockModalActions.CONFIRM});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then everyone is in the new workflow
+        expect(await getWorkflowMemberEmails()).toEqual([ADMIN_EMAIL, BOB_EMAIL, CAROL_EMAIL]);
+    });
+
+    it('leaves the last member out of the new workflow when the admin cancels the warning', async () => {
+        // Given a new workflow that already has every workspace member except Carol
+        await renderPage(CONST.APPROVAL_WORKFLOW.ACTION.CREATE, [ADMIN_EMAIL, BOB_EMAIL]);
+
+        // When the admin selects Carol and then cancels the warning
+        await selectMember(CAROL_EMAIL);
+        resolveShowConfirmModal({action: MockModalActions.CLOSE});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then Carol stays out of the new workflow, so the existing workflows are kept
+        expect(await getWorkflowMemberEmails()).toEqual([ADMIN_EMAIL, BOB_EMAIL]);
+    });
+
+    it('does not warn while other members are still unselected', async () => {
+        // Given a new workflow with only the admin in it
+        await renderPage(CONST.APPROVAL_WORKFLOW.ACTION.CREATE, [ADMIN_EMAIL]);
+
+        // When the admin selects Bob, leaving Carol out
+        await selectMember(BOB_EMAIL);
+
+        // Then Bob is added right away because not everyone is moving into the new workflow
+        expect(mockShowConfirmModal).not.toHaveBeenCalled();
+        expect(await getWorkflowMemberEmails()).toEqual([ADMIN_EMAIL, BOB_EMAIL]);
+    });
+
+    it('warns before moving everyone into an existing workflow and adds the last member once confirmed', async () => {
+        // Given an existing workflow being edited that has every workspace member except Carol
+        await renderPage(CONST.APPROVAL_WORKFLOW.ACTION.EDIT, [ADMIN_EMAIL, BOB_EMAIL]);
+
+        // When the admin selects Carol, the last member left
+        await selectMember(CAROL_EMAIL);
+
+        // Then the admin gets the same warning as when creating a workflow, and Carol is not added until they confirm
+        expect(mockShowConfirmModal).toHaveBeenCalledTimes(1);
+        expect(getShowConfirmModalOption('title')).toBe(translateLocal('workflowsExpensesFromPage.moveEveryoneToThisWorkflowTitle'));
+        expect(getShowConfirmModalOption('prompt')).toBe(translateLocal('workflowsExpensesFromPage.moveEveryoneToThisWorkflowPrompt'));
+        expect(await getWorkflowMemberEmails()).toEqual([ADMIN_EMAIL, BOB_EMAIL]);
+
+        // When the admin confirms
+        resolveShowConfirmModal({action: MockModalActions.CONFIRM});
+        await waitForBatchedUpdatesWithAct();
+
+        // Then everyone is in the edited workflow
+        expect(await getWorkflowMemberEmails()).toEqual([ADMIN_EMAIL, BOB_EMAIL, CAROL_EMAIL]);
+    });
+});
diff --git a/tests/ui/EditMerchantRulePageGuardTest.tsx b/tests/ui/EditMerchantRulePageGuardTest.tsx
new file mode 100644
index 000000000000..4b47b48837b5
--- /dev/null
+++ b/tests/ui/EditMerchantRulePageGuardTest.tsx
@@ -0,0 +1,205 @@
+import {act, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import * as API from '@libs/API';
+import {READ_COMMANDS} from '@libs/API/types';
+import {navigationRef} from '@libs/Navigation/Navigation';
+import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {toIndexMap} from '@libs/RuleUtils';
+
+import EditMerchantRulePage from '@pages/workspace/rules/MerchantRules/EditMerchantRulePage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Policy, Rule} from '@src/types/onyx';
+
+import {PortalProvider} from '@gorhom/portal';
+import {NavigationContainer} from '@react-navigation/native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../utils/collections/policies';
+import {buildPersonalDetails} from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const POLICY_ID = 'policy1';
+const OTHER_POLICY_ID = 'policy2';
+const RULE_ID = 'merchantRule1';
+const ADMIN_EMAIL = 'admin@example.com';
+const ADMIN_ACCOUNT_ID = 1;
+
+const {FIELD} = CONST.RULES.EXPENSE_DEFAULT;
+const {TRIGGERS: TRIGGER, ACTIONS: ACTION} = CONST.RULES;
+
+const Stack = createPlatformStackNavigator<SettingsNavigatorParamList>();
+
+function buildRulesEnabledControlPolicy(): Policy {
+    return {
+        ...createRandomPolicy(0),
+        id: POLICY_ID,
+        type: CONST.POLICY.TYPE.CORPORATE,
+        role: CONST.POLICY.ROLE.ADMIN,
+        areRulesEnabled: true,
+        pendingAction: undefined,
+    };
+}
+
+function buildEditableRule(): Rule {
+    return {
+        scope: CONST.RULES.SCOPE.POLICY,
+        scopeID: POLICY_ID,
+        triggers: toIndexMap([TRIGGER.CREATE_TRANSACTION]),
+        filters: {left: FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, right: 'Starbucks'},
+        actions: toIndexMap([{name: ACTION.SET, field: FIELD.CATEGORY, value: 'Coffee'}]),
+    };
+}
+
+/** Stops `GetRules` from actually going out, so a test can hold the collection in whatever fetch state it needs. */
+function stubRulesFetch() {
+    return jest.spyOn(API, 'read').mockImplementation(() => {});
+}
+
+async function seedOnyx(rule?: Rule) {
+    await act(async () => {
+        await Onyx.clear();
+        await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, buildRulesEnabledControlPolicy());
+        await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {[ADMIN_ACCOUNT_ID]: buildPersonalDetails(ADMIN_EMAIL, ADMIN_ACCOUNT_ID, 'admin')});
+        await Onyx.merge(ONYXKEYS.SESSION, {email: ADMIN_EMAIL, accountID: ADMIN_ACCOUNT_ID});
+        if (rule) {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.RULE}${RULE_ID}`, rule);
+        }
+        await waitForBatchedUpdatesWithAct();
+    });
+}
+
+/** The page reads its params off the navigator, and `usePressLoading` needs a real navigation context. */
+function renderEditMerchantRulePage() {
+    return render(
+        <ComposeProviders components={[OnyxListItemProvider, CurrentUserPersonalDetailsProvider, LocaleContextProvider]}>
+            <PortalProvider>
+                <NavigationContainer ref={navigationRef}>
+                    <Stack.Navigator initialRouteName={SCREENS.WORKSPACE.RULES_MERCHANT_EDIT}>
+                        <Stack.Screen
+                            name={SCREENS.WORKSPACE.RULES_MERCHANT_EDIT}
+                            component={EditMerchantRulePage}
+                            initialParams={{policyID: POLICY_ID, ruleID: RULE_ID}}
+                        />
+                    </Stack.Navigator>
+                </NavigationContainer>
+            </PortalProvider>
+        </ComposeProviders>,
+    );
+}
+
+/**
+ * The rules collection is shared across workspaces and rule kinds, so a ruleID reached by a bookmark, a
+ * deeplink or browser history can point at something this editor must not write to. Saving replaces that
+ * ruleID with a freshly built merchant rule, so the page has to refuse rather than render an empty form.
+ */
+describe('EditMerchantRulePage route guard', () => {
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+    });
+
+    it('opens the editor for a rule this policy can edit', async () => {
+        await seedOnyx(buildEditableRule());
+        renderEditMerchantRulePage();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByTestId('EditMerchantRulePage')).toBeOnTheScreen();
+    });
+
+    it('refuses a rule scoped to another policy', async () => {
+        await seedOnyx({...buildEditableRule(), scopeID: OTHER_POLICY_ID});
+        renderEditMerchantRulePage();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.queryByTestId('EditMerchantRulePage')).toBeNull();
+    });
+
+    it('refuses an approval workflow rule that shares the ruleID', async () => {
+        await seedOnyx({
+            ...buildEditableRule(),
+            triggers: toIndexMap([CONST.RULES.TRIGGERS.REPORT_SUBMIT]),
+            actions: toIndexMap([{name: CONST.RULES.ACTIONS.FORWARD_TO, approver: 'approver@example.com'}]),
+        });
+        renderEditMerchantRulePage();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.queryByTestId('EditMerchantRulePage')).toBeNull();
+    });
+
+    it('fetches the rules collection when it is reached without one loaded', async () => {
+        // Given this route is deep linkable, so nothing on the way in has populated the rules collection
+        const readSpy = stubRulesFetch();
+        await seedOnyx();
+
+        // When the editor mounts against an empty collection
+        renderEditMerchantRulePage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it requests the rules rather than settling on not-found for a rule that does exist server side
+        expect(readSpy).toHaveBeenCalledWith(READ_COMMANDS.GET_RULES, expect.anything(), expect.anything());
+        readSpy.mockRestore();
+    });
+
+    it('waits for the fetch instead of showing not-found or an empty form before the collection arrives', async () => {
+        // Given the request is in flight, so Onyx has hydrated the collection as empty but nothing has answered yet
+        const readSpy = stubRulesFetch();
+        await seedOnyx();
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.RAM_ONLY_IS_LOADING_RULES, true);
+        });
+
+        // When the editor mounts
+        renderEditMerchantRulePage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it holds on a loader, because an empty collection here means "not loaded", not "no such rule", and a
+        // form filled in now would save over the rule the link points at
+        expect(screen.getByTestId('EditMerchantRulePageLoading')).toBeOnTheScreen();
+        expect(screen.queryByTestId('EditMerchantRulePage')).toBeNull();
+        readSpy.mockRestore();
+    });
+
+    it('refuses a ruleID that is absent once the collection has been fetched', async () => {
+        // Given the fetch has answered and the rule is genuinely not in the collection
+        const readSpy = stubRulesFetch();
+        await seedOnyx();
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.RAM_ONLY_IS_LOADING_RULES, false);
+            await Onyx.set(ONYXKEYS.RAM_ONLY_HAS_RULES_DATA_BEEN_FETCHED, true);
+        });
+
+        // When the editor mounts
+        renderEditMerchantRulePage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the guard fires, since waiting any longer would never produce the rule
+        expect(screen.queryByTestId('EditMerchantRulePage')).toBeNull();
+        readSpy.mockRestore();
+    });
+
+    it('refuses a nested filter tree the form cannot represent', async () => {
+        await seedOnyx({
+            ...buildEditableRule(),
+            filters: {
+                left: {left: FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, right: 'Starbucks'},
+                operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
+                right: {left: FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.CONTAINS, right: 'Costa'},
+            },
+        });
+        renderEditMerchantRulePage();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.queryByTestId('EditMerchantRulePage')).toBeNull();
+    });
+});
diff --git a/tests/ui/EnableTravel/DomainSelectorStepTest.tsx b/tests/ui/EnableTravel/DomainSelectorStepTest.tsx
new file mode 100644
index 000000000000..903401036c0c
--- /dev/null
+++ b/tests/ui/EnableTravel/DomainSelectorStepTest.tsx
@@ -0,0 +1,188 @@
+import {act, fireEvent, render, screen, within} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {setTravelProvisioningDomain} from '@libs/actions/Travel';
+import type * as TravelActions from '@libs/actions/Travel';
+import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
+
+import DomainSelectorStep from '@pages/Travel/EnableTravel/subPages/DomainSelectorStep';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
+
+import type ReactNative from 'react-native';
+
+import {NavigationContainer} from '@react-navigation/native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../../utils/collections/policies';
+import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithAct';
+
+const RECOMMENDED_DOMAIN = 'domain-a.com';
+const OTHER_DOMAIN = 'domain-b.com';
+const RECOMMENDED_BADGE_TEXT = 'travel.domainSelector.recommended';
+
+const mockOnNext = jest.fn();
+
+jest.mock('@hooks/useLocalize', () => () => ({
+    translate: (key: string) => key,
+}));
+
+jest.mock('@libs/actions/Travel', () => ({
+    ...jest.requireActual<typeof TravelActions>('@libs/actions/Travel'),
+    setTravelProvisioningDomain: jest.fn(),
+}));
+
+// FlashList measures its viewport before rendering rows, which never happens in Jest, so render every row eagerly.
+jest.mock('@shopify/flash-list', () => {
+    const ReactLocal = jest.requireActual<typeof React>('react');
+    const RN = jest.requireActual<typeof ReactNative>('react-native');
+
+    const FlashList = ReactLocal.forwardRef<
+        unknown,
+        Omit<React.ComponentProps<typeof RN.ScrollView>, 'children'> & {
+            data?: unknown[];
+            renderItem?: (info: {item: unknown; index: number; target: string}) => React.ReactNode;
+            keyExtractor?: (item: unknown, index: number) => string;
+            ListHeaderComponent?: React.ReactNode;
+            ListFooterComponent?: React.ReactNode;
+            getItemType?: unknown;
+            extraData?: unknown;
+            initialScrollIndex?: number;
+            onEndReached?: unknown;
+            onEndReachedThreshold?: unknown;
+            ListFooterComponentStyle?: unknown;
+        }
+    >(
+        (
+            {
+                data,
+                renderItem,
+                keyExtractor,
+                ListHeaderComponent,
+                ListFooterComponent,
+                getItemType: _getItemType,
+                extraData: _extraData,
+                initialScrollIndex: _initialScrollIndex,
+                onEndReached: _onEndReached,
+                onEndReachedThreshold: _onEndReachedThreshold,
+                ListFooterComponentStyle: _ListFooterComponentStyle,
+                ...scrollViewProps
+            },
+            ref,
+        ) => {
+            ReactLocal.useImperativeHandle(ref, () => ({scrollToIndex: jest.fn()}));
+
+            return ReactLocal.createElement(
+                RN.ScrollView,
+                scrollViewProps,
+                ListHeaderComponent ?? null,
+                ...(data ?? []).map((item, index) =>
+                    ReactLocal.createElement(ReactLocal.Fragment, {key: keyExtractor?.(item, index) ?? String(index)}, renderItem?.({item, index, target: 'Cell'})),
+                ),
+                ListFooterComponent ?? null,
+            );
+        },
+    );
+
+    return {FlashList};
+});
+
+const mockSetTravelProvisioningDomain = jest.mocked(setTravelProvisioningDomain);
+
+// Two admins on domain-a.com and one on domain-b.com, so domain-a.com is the most frequent admin domain.
+const POLICY: Policy = {
+    ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+    owner: `admin1@${RECOMMENDED_DOMAIN}`,
+    employeeList: {
+        [`admin1@${RECOMMENDED_DOMAIN}`]: {email: `admin1@${RECOMMENDED_DOMAIN}`, role: CONST.POLICY.ROLE.ADMIN},
+        [`admin2@${RECOMMENDED_DOMAIN}`]: {email: `admin2@${RECOMMENDED_DOMAIN}`, role: CONST.POLICY.ROLE.ADMIN},
+        [`admin3@${OTHER_DOMAIN}`]: {email: `admin3@${OTHER_DOMAIN}`, role: CONST.POLICY.ROLE.ADMIN},
+    },
+};
+
+const Stack = createPlatformStackNavigator();
+
+function DomainSelectorStepScreen() {
+    return (
+        <DomainSelectorStep
+            isEditing={false}
+            onNext={mockOnNext}
+            onMove={jest.fn()}
+            policy={POLICY}
+            policyID={POLICY.id}
+            resolvedDomain={RECOMMENDED_DOMAIN}
+        />
+    );
+}
+
+function renderStep() {
+    return render(
+        <ComposeProviders components={[OnyxListItemProvider]}>
+            <NavigationContainer>
+                <Stack.Navigator>
+                    <Stack.Screen
+                        name="DomainSelectorStepScreen"
+                        component={DomainSelectorStepScreen}
+                    />
+                </Stack.Navigator>
+            </NavigationContainer>
+        </ComposeProviders>,
+    );
+}
+
+describe('DomainSelectorStep', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+        jest.clearAllMocks();
+    });
+
+    it('shows the "Recommended" badge only on the most frequent admin email domain', async () => {
+        // Given a workspace whose admins are mostly on domain-a.com
+        renderStep();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the domain selector renders its rows
+        const recommendedRow = screen.getByRole('option', {name: RECOMMENDED_DOMAIN});
+        const otherRow = screen.getByRole('option', {name: OTHER_DOMAIN});
+
+        // Then the badge is composed into the recommended row only
+        expect(screen.getAllByText(RECOMMENDED_BADGE_TEXT)).toHaveLength(1);
+        expect(within(recommendedRow).getByText(RECOMMENDED_BADGE_TEXT)).toBeOnTheScreen();
+        expect(within(otherRow).queryByText(RECOMMENDED_BADGE_TEXT)).not.toBeOnTheScreen();
+    });
+
+    it('stores the selected domain and advances only after a domain is picked', async () => {
+        // Given the domain selector with no domain selected yet
+        renderStep();
+        await waitForBatchedUpdatesWithAct();
+
+        // When Next is pressed before any selection
+        fireEvent.press(screen.getByText('common.next'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then nothing is stored and the flow does not advance
+        expect(mockSetTravelProvisioningDomain).not.toHaveBeenCalled();
+        expect(mockOnNext).not.toHaveBeenCalled();
+
+        // When a non-recommended domain is picked and Next is pressed
+        fireEvent.press(screen.getByRole('option', {name: OTHER_DOMAIN}));
+        await waitForBatchedUpdatesWithAct();
+        fireEvent.press(screen.getByText('common.next'));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then that domain is stored for provisioning and the flow advances once
+        expect(mockSetTravelProvisioningDomain).toHaveBeenCalledWith(OTHER_DOMAIN);
+        expect(mockOnNext).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/tests/ui/ExpenseReportRulesSectionTest.tsx b/tests/ui/ExpenseReportRulesSectionTest.tsx
index 030affaeedac..f72f520b7987 100644
--- a/tests/ui/ExpenseReportRulesSectionTest.tsx
+++ b/tests/ui/ExpenseReportRulesSectionTest.tsx
@@ -2,10 +2,16 @@ import {render} from '@testing-library/react-native';
 
 import usePolicy from '@hooks/usePolicy';
 
+import Navigation from '@libs/Navigation/Navigation';
+import {isControlPolicy} from '@libs/PolicyUtils';
+
 import ExpenseReportRulesSection from '@pages/workspace/rules/ExpenseReportRulesSection';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 
+import {enablePolicyAutoReimbursementLimit} from '@userActions/Policy/Policy';
+
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 
 import React from 'react';
 
@@ -27,7 +33,11 @@ jest.mock('@hooks/useCurrencyList', () => ({
     useCurrencyListActions: () => ({convertToDisplayString: () => '$50.00'}),
 }));
 jest.mock('@hooks/useEnvironment', () => jest.fn(() => ({environmentURL: 'https://new.expensify.com'})));
-jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        translate: (key: string, ...args: unknown[]) => [key, ...args].join('|'),
+    })),
+);
 jest.mock('@hooks/usePolicy', () => jest.fn());
 jest.mock('@hooks/useThemeStyles', () =>
     jest.fn(
@@ -44,6 +54,10 @@ jest.mock('@hooks/useThemeStyles', () =>
 jest.mock('@libs/Navigation/Navigation', () => ({navigate: jest.fn()}));
 jest.mock('@libs/PolicyUtils', () => ({
     getWorkflowApprovalsUnavailable: jest.fn(() => false),
+    isAutoPayApprovedReportsAvailable: jest.fn(
+        (policy?: {areWorkflowsEnabled?: boolean; reimbursementChoice?: string; achAccount?: {bankAccountID?: number}}) =>
+            !!policy?.areWorkflowsEnabled && policy?.reimbursementChoice === 'reimburseYes' && !!policy?.achAccount?.bankAccountID,
+    ),
     isControlPolicy: jest.fn(() => true),
 }));
 
@@ -62,13 +76,31 @@ const POLICY_ID = 'POLICY_1';
 
 // optionItems order: 0=preventSelfApproval, 1=autoApproveCompliantReports, 2=autoPayApprovedReports
 const AUTO_APPROVE_TOGGLE_INDEX = 1;
+const AUTO_PAY_TOGGLE_INDEX = 2;
+
+const AUTO_PAY_UPGRADE_ROUTE = ROUTES.WORKSPACE_UPGRADE.getRoute(POLICY_ID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoPayApprovedReports.alias, ROUTES.WORKSPACE_WORKFLOWS.getRoute(POLICY_ID));
 
-function renderSection() {
+const PAYMENTS_ENABLED_POLICY = {
+    id: POLICY_ID,
+    areWorkflowsEnabled: true,
+    reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+    achAccount: {bankAccountID: 1234},
+};
+
+const mockedIsControlPolicy = jest.mocked(isControlPolicy);
+
+function getAutoPayProps() {
+    const autoPayProps = mockedToggleSettingOptionRow.mock.calls.at(AUTO_PAY_TOGGLE_INDEX)?.[0];
+    expect(autoPayProps).toBeDefined();
+    return autoPayProps;
+}
+
+function renderSection({canWritePayments = true}: {canWritePayments?: boolean} = {}) {
     return render(
         <ExpenseReportRulesSection
             policyID={POLICY_ID}
             canWriteApprovals
-            canWritePayments
+            canWritePayments={canWritePayments}
             withApprovalsReadOnlyFallback={jest.fn(() => undefined)}
             withPaymentsReadOnlyFallback={jest.fn(() => undefined)}
         />,
@@ -78,6 +110,7 @@ function renderSection() {
 describe('ExpenseReportRulesSection', () => {
     beforeEach(() => {
         jest.clearAllMocks();
+        mockedIsControlPolicy.mockReturnValue(true);
     });
 
     it('shows the auto-approve toggle as active when autoApproval.limit is set by Classic and shouldShowAutoApprovalOptions is absent', () => {
@@ -95,4 +128,130 @@ describe('ExpenseReportRulesSection', () => {
         expect(autoApproveProps).toBeDefined();
         expect(autoApproveProps?.isActive).toBe(true);
     });
+
+    describe('auto-pay approved reports', () => {
+        it('tells a non-Control workspace with payments set up that auto-pay requires the Control plan', () => {
+            // Given a non-Control workspace with workflows, reimbursements, and a bank account set up
+            mockedIsControlPolicy.mockReturnValue(false);
+            (mockedUsePolicy as jest.Mock).mockReturnValue(PAYMENTS_ENABLED_POLICY);
+
+            // When the section renders
+            renderSection();
+
+            // Then the auto-pay row shows the Control plan copy with an upgrade link, a lock icon, and stays pressable
+            const autoPayProps = getAutoPayProps();
+            expect(autoPayProps?.subtitle).toBe(`workspace.rules.expenseReportRules.autoPayApprovedReportsControlPlanSubtitle|https://new.expensify.com/${AUTO_PAY_UPGRADE_ROUTE}`);
+            expect(autoPayProps?.shouldParseSubtitle).toBe(true);
+            expect(autoPayProps?.showLockIcon).toBe(true);
+            expect(autoPayProps?.disabled).toBe(false);
+
+            // When the admin turns the switch on
+            autoPayProps?.onToggle(true);
+
+            // Then they are sent to the upgrade page instead of enabling auto-pay
+            expect(Navigation.navigate).toHaveBeenCalledWith(AUTO_PAY_UPGRADE_ROUTE);
+            expect(enablePolicyAutoReimbursementLimit).not.toHaveBeenCalled();
+        });
+
+        it('shows the Control plan copy instead of the payments copy on a non-Control workspace without payments, and keeps the upgrade path reachable', () => {
+            // Given a non-Control workspace without a bank account
+            mockedIsControlPolicy.mockReturnValue(false);
+            (mockedUsePolicy as jest.Mock).mockReturnValue({
+                ...PAYMENTS_ENABLED_POLICY,
+                achAccount: undefined,
+            });
+
+            // When the section renders
+            renderSection();
+
+            // Then the Control plan copy wins over the payments copy and the switch stays pressable
+            const autoPayProps = getAutoPayProps();
+            expect(autoPayProps?.subtitle).toBe(`workspace.rules.expenseReportRules.autoPayApprovedReportsControlPlanSubtitle|https://new.expensify.com/${AUTO_PAY_UPGRADE_ROUTE}`);
+            expect(autoPayProps?.showLockIcon).toBe(true);
+            expect(autoPayProps?.disabled).toBe(false);
+        });
+
+        it('keeps auto-pay usable on a non-Control workspace that already has it on, so it can be turned off', () => {
+            // Given a non-Control workspace with payments set up that already has auto-pay on, e.g. after a downgrade
+            mockedIsControlPolicy.mockReturnValue(false);
+            (mockedUsePolicy as jest.Mock).mockReturnValue({
+                ...PAYMENTS_ENABLED_POLICY,
+                shouldShowAutoReimbursementLimitOption: true,
+            });
+
+            // When the section renders
+            renderSection();
+
+            // Then the auto-pay row shows as on with the regular copy and no upgrade lock
+            const autoPayProps = getAutoPayProps();
+            expect(autoPayProps?.isActive).toBe(true);
+            expect(autoPayProps?.subtitle).toBe('workspace.rules.expenseReportRules.autoPayApprovedReportsSubtitle');
+            expect(autoPayProps?.shouldParseSubtitle).toBe(false);
+            expect(autoPayProps?.showLockIcon).toBe(false);
+            expect(autoPayProps?.disabled).toBe(false);
+
+            // When the admin turns the switch off
+            autoPayProps?.onToggle(false);
+
+            // Then auto-pay is turned off without going through the upgrade page
+            expect(Navigation.navigate).not.toHaveBeenCalled();
+            expect(enablePolicyAutoReimbursementLimit).toHaveBeenCalledWith(POLICY_ID, false, true, undefined);
+        });
+
+        it('keeps the payments copy and locks the toggle on a Control workspace without a bank account', () => {
+            // Given a Control workspace without a bank account
+            (mockedUsePolicy as jest.Mock).mockReturnValue({
+                ...PAYMENTS_ENABLED_POLICY,
+                achAccount: undefined,
+            });
+
+            // When the section renders
+            renderSection();
+
+            // Then the auto-pay row keeps the payments copy and is locked and disabled
+            const autoPayProps = getAutoPayProps();
+            expect(autoPayProps?.subtitle).toBe('workspace.rules.expenseReportRules.unlockFeatureEnableWorkflowsSubtitle|common.payments');
+            expect(autoPayProps?.shouldParseSubtitle).toBe(true);
+            expect(autoPayProps?.showLockIcon).toBe(true);
+            expect(autoPayProps?.disabled).toBe(true);
+        });
+
+        it('does not show the upgrade link on a non-Control workspace the user cannot write payments on', () => {
+            // Given a non-Control workspace with payments set up that the user can't write payments on, e.g. an archived workspace
+            mockedIsControlPolicy.mockReturnValue(false);
+            (mockedUsePolicy as jest.Mock).mockReturnValue(PAYMENTS_ENABLED_POLICY);
+
+            // When the section renders
+            renderSection({canWritePayments: false});
+
+            // Then the auto-pay row shows the regular copy without the upgrade link, and the switch is locked and disabled like the rest of the row
+            const autoPayProps = getAutoPayProps();
+            expect(autoPayProps?.subtitle).toBe('workspace.rules.expenseReportRules.autoPayApprovedReportsSubtitle');
+            expect(autoPayProps?.shouldParseSubtitle).toBe(false);
+            expect(autoPayProps?.showLockIcon).toBe(true);
+            expect(autoPayProps?.disabled).toBe(true);
+        });
+
+        it('unlocks the toggle on a Control workspace with payments set up', () => {
+            // Given a Control workspace with workflows, reimbursements, and a bank account set up
+            (mockedUsePolicy as jest.Mock).mockReturnValue(PAYMENTS_ENABLED_POLICY);
+
+            // When the section renders
+            renderSection();
+
+            // Then the auto-pay row shows the regular copy and is unlocked
+            const autoPayProps = getAutoPayProps();
+            expect(autoPayProps?.subtitle).toBe('workspace.rules.expenseReportRules.autoPayApprovedReportsSubtitle');
+            expect(autoPayProps?.shouldParseSubtitle).toBe(false);
+            expect(autoPayProps?.showLockIcon).toBe(false);
+            expect(autoPayProps?.disabled).toBe(false);
+
+            // When the admin turns the switch on
+            autoPayProps?.onToggle(true);
+
+            // Then auto-pay is enabled directly without going through the upgrade page
+            expect(Navigation.navigate).not.toHaveBeenCalled();
+            expect(enablePolicyAutoReimbursementLimit).toHaveBeenCalledWith(POLICY_ID, true, undefined, undefined);
+        });
+    });
 });
diff --git a/tests/ui/GroupHeaderTest.tsx b/tests/ui/GroupHeaderTest.tsx
index d2213df72de8..edf6e234ea14 100644
--- a/tests/ui/GroupHeaderTest.tsx
+++ b/tests/ui/GroupHeaderTest.tsx
@@ -86,6 +86,9 @@ const baseActions = {
     setLastSearchType: jest.fn(),
     setCurrentSelectedTransactionReportID: jest.fn(),
     setSelectedTransactions: jest.fn(),
+    getSelectedTransactions: jest.fn(() => ({})),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: jest.fn(),
     setSelectedReports: jest.fn(),
     removeTransaction: jest.fn(),
diff --git a/tests/ui/IOURequestRedirectToStartPageTest.tsx b/tests/ui/IOURequestRedirectToStartPageTest.tsx
index ac824f014d7e..f8bc469546af 100644
--- a/tests/ui/IOURequestRedirectToStartPageTest.tsx
+++ b/tests/ui/IOURequestRedirectToStartPageTest.tsx
@@ -20,6 +20,7 @@ import {NavigationContainer} from '@react-navigation/native';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
+import {getGlobalFetchMock} from '../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
 jest.mock('@userActions/Tab');
@@ -70,6 +71,8 @@ describe('IOURequestRedirectToStartPage', () => {
         Onyx.init({
             keys: ONYXKEYS,
         });
+
+        global.fetch = getGlobalFetchMock();
     });
 
     beforeEach(() => {
diff --git a/tests/ui/InSelectorTest.tsx b/tests/ui/InSelectorTest.tsx
index eda4fccfd67b..67409b7bf5aa 100644
--- a/tests/ui/InSelectorTest.tsx
+++ b/tests/ui/InSelectorTest.tsx
@@ -19,7 +19,7 @@ jest.mock('@components/SelectionList/SelectionListWithSections', () => jest.fn((
 jest.mock('@components/SelectionList/ListItem/InviteMemberListItem', () => jest.fn(() => null));
 jest.mock('@components/Search/FilterComponents/ListFilterViewWrapper', () => jest.fn(({children}: {children: React.ReactNode}) => children));
 
-jest.mock('@components/OnyxListItemProvider', () => ({usePersonalDetails: jest.fn(() => ({}))}));
+jest.mock('@components/OnyxListItemProvider', () => ({usePersonalDetails: jest.fn(() => ({})), useCardList: jest.fn(() => ({})), useWorkspaceCardList: jest.fn(() => ({}))}));
 jest.mock('@hooks/useOnyx', () => jest.fn(() => [undefined]));
 jest.mock('@hooks/useDebouncedState', () => jest.fn(() => [mockSearchTerm, mockSearchTerm, jest.fn()]));
 jest.mock('@hooks/useFilteredOptions', () => jest.fn(() => ({options: {recentReports: [], personalDetails: []}, isLoading: false})));
diff --git a/tests/ui/IssueNewCardAssigneeStepTest.tsx b/tests/ui/IssueNewCardAssigneeStepTest.tsx
index bfdeb5c1f99d..46826b25160a 100644
--- a/tests/ui/IssueNewCardAssigneeStepTest.tsx
+++ b/tests/ui/IssueNewCardAssigneeStepTest.tsx
@@ -101,10 +101,6 @@ jest.mock('@libs/PolicyUtils', () => ({
 }));
 jest.mock('@libs/OptionsListUtils', () => ({
     getSearchValueForPhoneOrEmail: (value: string) => value,
-    sortAlphabetically: (items: Array<Record<string, string>>, key: string, cmp: (a: string, b: string) => number) => {
-        items.sort((a, b) => cmp(a[key] ?? '', b[key] ?? ''));
-        return items;
-    },
 }));
 jest.mock('@libs/PersonalDetailOptionsListUtils', () => ({getHeaderMessage: () => ''}));
 jest.mock('@libs/PersonalDetailsUtils', () => ({
diff --git a/tests/ui/LogInWithShortLivedAuthTokenPageTest.tsx b/tests/ui/LogInWithShortLivedAuthTokenPageTest.tsx
index 0d5512a32e32..70841fbbcc3f 100644
--- a/tests/ui/LogInWithShortLivedAuthTokenPageTest.tsx
+++ b/tests/ui/LogInWithShortLivedAuthTokenPageTest.tsx
@@ -71,14 +71,26 @@ describe('LogInWithShortLivedAuthTokenPage', () => {
         renderPage({shortLivedAuthToken: 'token', isSAML: true, shouldForceLogin: ''});
         await waitForBatchedUpdatesWithAct();
 
-        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding');
+        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding', undefined);
+    });
+
+    it('passes the stored login to the sign-in so it can compare against the signed-in session', async () => {
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.CREDENTIALS, {login: 'user@saml.example.com'});
+            await Onyx.set(ONYXKEYS.LAST_VISITED_PATH, '/search?q=status:outstanding');
+        });
+
+        renderPage({shortLivedAuthToken: 'token', isSAML: true, shouldForceLogin: ''});
+        await waitForBatchedUpdatesWithAct();
+
+        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding', 'user@saml.example.com');
     });
 
     it('signs in with SAML without a landing page when nothing was kept', async () => {
         renderPage({shortLivedAuthToken: 'token', isSAML: true, shouldForceLogin: ''});
         await waitForBatchedUpdatesWithAct();
 
-        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, undefined);
+        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, undefined, undefined);
     });
 
     it('signs in with a SAML token while the account is still marked loading by a forced re-auth', async () => {
@@ -90,7 +102,7 @@ describe('LogInWithShortLivedAuthTokenPage', () => {
         renderPage({shortLivedAuthToken: 'token', isSAML: true, shouldForceLogin: ''});
         await waitForBatchedUpdatesWithAct();
 
-        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding');
+        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding', undefined);
     });
 
     it('waits for the account while it is loading for a non-SAML sign-in', async () => {
@@ -112,6 +124,6 @@ describe('LogInWithShortLivedAuthTokenPage', () => {
         renderPage({shortLivedAuthToken: 'token', shouldForceLogin: ''});
         await waitForBatchedUpdatesWithAct();
 
-        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', false, undefined);
+        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', false, undefined, undefined);
     });
 });
diff --git a/tests/ui/MerchantListItemHeaderTest.tsx b/tests/ui/MerchantListItemHeaderTest.tsx
index ee1b37c7634f..a1a4de1f4788 100644
--- a/tests/ui/MerchantListItemHeaderTest.tsx
+++ b/tests/ui/MerchantListItemHeaderTest.tsx
@@ -58,6 +58,9 @@ const mockSearchActionsContext = {
     setLastSearchType: jest.fn(),
     setCurrentSelectedTransactionReportID: jest.fn(),
     setSelectedTransactions: jest.fn(),
+    getSelectedTransactions: jest.fn(() => ({})),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: jest.fn(),
     setSelectedReports: jest.fn(),
     removeTransaction: jest.fn(),
diff --git a/tests/ui/MergeTransactionDetailsReviewTest.tsx b/tests/ui/MergeTransactionDetailsReviewTest.tsx
index 6cb6ffdf72f2..d1de939709e2 100644
--- a/tests/ui/MergeTransactionDetailsReviewTest.tsx
+++ b/tests/ui/MergeTransactionDetailsReviewTest.tsx
@@ -41,16 +41,6 @@ jest.mock('@libs/Navigation/Navigation', () => {
 
 const Stack = createPlatformStackNavigator<Record<string, {transactionID: string}>>();
 
-// Expose each field row's description and title so the rendered distance can be read back
-jest.mock('@components/MenuItemWithTopDescription', () => {
-    const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
-    return ({description, title}: {description?: string; title?: string}) => (
-        <RN.View testID={`field-${description}`}>
-            <RN.Text>{title}</RN.Text>
-        </RN.View>
-    );
-});
-
 TestHelper.setupGlobalFetchMock();
 
 const MERGE_TRANSACTION_ID = 'mergeDistanceTransaction';
@@ -186,7 +176,7 @@ describe('Merging distance expenses across workspaces', () => {
         );
         await waitForBatchedUpdatesWithAct();
         // Matched loosely because the unit label reads as either "mi" or "miles", depending on the field's short form flag
-        expect(screen.getByTestId('field-Distance • Original: 10.20 mi')).toHaveTextContent(/^9\.20 (mi|miles)$/);
+        expect(screen.getByLabelText(/^Distance • Original: 10\.20 mi, 9\.20 (mi|miles)$/)).toBeOnTheScreen();
     });
 
     it('deducts nothing when the merged expense is put on the report of a workspace that excludes nothing', async () => {
@@ -285,7 +275,7 @@ describe('Merging identical distance expenses without conflicts', () => {
         // And the confirmation page renders the reimbursable distance against the distance it was deducted from
         await renderConfirmationPage();
         // Matched loosely because the unit label reads as either "mi" or "miles", depending on the field's short form flag
-        expect(screen.getByTestId('field-Distance • Original: 10.20 mi')).toHaveTextContent(/^9\.20 (mi|miles)$/);
+        expect(screen.getByLabelText(/^Distance • Original: 10\.20 mi, 9\.20 (mi|miles)$/)).toBeOnTheScreen();
     });
 
     it('deducts nothing from a manually entered distance, which the workspace cannot recognize a commute in', async () => {
@@ -302,6 +292,6 @@ describe('Merging identical distance expenses without conflicts', () => {
 
         // And the confirmation page renders the whole distance, with no distance deducted from it
         await renderConfirmationPage();
-        expect(screen.getByTestId('field-Distance')).toHaveTextContent(/^10\.20 (mi|miles)$/);
+        expect(screen.getByLabelText(/^Distance, 10\.20 (mi|miles)$/)).toBeOnTheScreen();
     });
 });
diff --git a/tests/ui/MoneyRequestReportFooter.tsx b/tests/ui/MoneyRequestReportFooter.tsx
index a18051b84242..48c977b3d6e1 100644
--- a/tests/ui/MoneyRequestReportFooter.tsx
+++ b/tests/ui/MoneyRequestReportFooter.tsx
@@ -2,7 +2,6 @@ import {act, render, screen} from '@testing-library/react-native';
 
 import ComposeProviders from '@components/ComposeProviders';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
-import type {MenuItemProps} from '@components/MenuItem';
 import ConfirmationFieldsProvider from '@components/MoneyRequestConfirmationFields/Provider';
 import type {ExpenseFieldRowProps} from '@components/MoneyRequestConfirmationList/sections/ExpenseFieldRow';
 import ManualFooter from '@components/MoneyRequestConfirmationListFooter/variants/ManualFooter';
@@ -22,29 +21,8 @@ import {transactionR14932 as mockTransaction} from '../../__mocks__/reportData/t
 import createRandomPolicy from '../utils/collections/policies';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
-jest.mock('@libs/Navigation/Navigation', () => ({
-    navigate: jest.fn(),
-    getActiveRoute: jest.fn(() => 'activeRoute'),
-}));
-
-jest.mock('@components/MenuItemWithTopDescription', () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const {View, Text} = require('react-native');
-    return (props: MenuItemProps) => (
-        <View
-            testID={`menu-item-${props.description}`}
-            accessibilityLabel={props.description}
-            onPress={props.onPress}
-            accessibilityState={{disabled: !props.interactive}}
-        >
-            <Text>{props.description}</Text>
-            <Text>{props.title}</Text>
-        </View>
-    );
-});
-
-// The manual form renders its selectable rows as bordered fields. Stand them in for the same shape the
-// `MenuItemWithTopDescription` mock above produces, so the assertions read the same either way.
+// The manual form renders its selectable rows as bordered fields, stood in for a plain View exposing name, value and
+// disabled state.
 jest.mock('@components/MoneyRequestConfirmationList/sections/ExpenseFieldRow', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {View, Text} = require('react-native');
diff --git a/tests/ui/MoneyRequestReportPreview.test.tsx b/tests/ui/MoneyRequestReportPreview.test.tsx
index 7b2071ac4193..c7f2638e4fd2 100644
--- a/tests/ui/MoneyRequestReportPreview.test.tsx
+++ b/tests/ui/MoneyRequestReportPreview.test.tsx
@@ -830,7 +830,14 @@ describe('MoneyRequestReportPreview', () => {
             await pressSecondTransaction();
 
             // Online, delete-pending rows are already filtered upstream, so the seed must equal the full visible list.
-            expect(setActiveTransactionIDsSpy).toHaveBeenCalledWith(defaultPreviewTransactions.map((transaction) => transaction.transactionID));
+            expect(setActiveTransactionIDsSpy).toHaveBeenCalledWith(
+                defaultPreviewTransactions.map((transaction) => transaction.transactionID),
+                {
+                    // Stamped so the press owns the carousel it seeds: an unowned list can't be released by any screen
+                    // and any other writer is free to overwrite it while the expense is still open.
+                    source: TransactionThreadNavigation.CAROUSEL_SOURCE.reportPreview(mockIOUReport.reportID),
+                },
+            );
         });
 
         it('still renders an offline-deleted expense card in the carousel', async () => {
@@ -1229,8 +1236,8 @@ describe('MoneyRequestReportPreview', () => {
             fireEvent.press(screen.getByText(getTransactionDisplayAmountAndMetadataText(olderTransaction).transactionDisplayAmount));
             await waitForBatchedUpdatesWithAct();
 
-            expect(setActiveTransactionIDsSpy).toHaveBeenCalledWith([olderTransaction.transactionID, newerTransaction.transactionID]);
-            expect(setActiveTransactionIDsSpy).not.toHaveBeenCalledWith([newerTransaction.transactionID, olderTransaction.transactionID]);
+            expect(setActiveTransactionIDsSpy).toHaveBeenCalledWith([olderTransaction.transactionID, newerTransaction.transactionID], expect.anything());
+            expect(setActiveTransactionIDsSpy).not.toHaveBeenCalledWith([newerTransaction.transactionID, olderTransaction.transactionID], expect.anything());
         });
 
         it('does not open the pressed expense over the report when "View" is tapped during the cascade delay', async () => {
@@ -1287,7 +1294,10 @@ describe('MoneyRequestReportPreview', () => {
             fireEvent.press(screen.getByText(getTransactionDisplayAmountAndMetadataText(many.at(0) ?? mockTransaction).transactionDisplayAmount));
             await waitForBatchedUpdatesWithAct();
 
-            expect(setActiveTransactionIDsSpy).toHaveBeenCalledWith(many.map((transaction) => transaction.transactionID));
+            expect(setActiveTransactionIDsSpy).toHaveBeenCalledWith(
+                many.map((transaction) => transaction.transactionID),
+                expect.anything(),
+            );
         });
 
         it('opens the report instead of the lone expense for a single-expense report', async () => {
diff --git a/tests/ui/MoneyRequestReportTransactionsNavigationTest.tsx b/tests/ui/MoneyRequestReportTransactionsNavigationTest.tsx
index 47aa8f6c718b..5bb5c274d029 100644
--- a/tests/ui/MoneyRequestReportTransactionsNavigationTest.tsx
+++ b/tests/ui/MoneyRequestReportTransactionsNavigationTest.tsx
@@ -225,11 +225,10 @@ describe('MoneyRequestReportTransactionsNavigation', () => {
         expect(createThreadSpy).not.toHaveBeenCalled();
     });
 
-    it('still builds the thread optimistically when offline, rather than leaving the arrow dead', async () => {
+    it('resolves the sibling offline rather than leaving the arrow dead', async () => {
         mockIsOffline.value = true;
         const openReportSpy = jest.spyOn(ReportActions, 'openReport').mockImplementation(() => {});
-        const createThreadSpy = jest.spyOn(ReportActions, 'createTransactionThreadReport');
-        jest.spyOn(Navigation, 'setParams').mockImplementation(() => {});
+        const setParamsSpy = jest.spyOn(Navigation, 'setParams').mockImplementation(() => {});
 
         render(<MoneyRequestReportTransactionsNavigation currentTransactionID={FIRST_TRANSACTION_ID} />);
         await waitForBatchedUpdates();
@@ -241,9 +240,11 @@ describe('MoneyRequestReportTransactionsNavigation', () => {
         }
         fireEvent.press(nextButton);
 
-        // Offline there is nothing to fetch, so the press must fall through instead of being staged.
+        // Offline there is nothing to fetch, so the press must fall through instead of being staged. Without a
+        // cached IOU action there is no thread to resolve either, so the sibling's own report is the target: a
+        // thread minted from a missing parent action could not be built at all.
         await waitFor(() => {
-            expect(createThreadSpy).toHaveBeenCalled();
+            expect(setParamsSpy).toHaveBeenCalledWith(expect.objectContaining({reportID: IOU_REPORT_ID, anchorTransactionID: SECOND_TRANSACTION_ID}));
         });
         expect(openReportSpy).not.toHaveBeenCalled();
     });
diff --git a/tests/ui/MoneyRequestViewReceiptTest.tsx b/tests/ui/MoneyRequestViewReceiptTest.tsx
index baa1fa7d3797..8b38f1dc49c0 100644
--- a/tests/ui/MoneyRequestViewReceiptTest.tsx
+++ b/tests/ui/MoneyRequestViewReceiptTest.tsx
@@ -71,7 +71,8 @@ jest.mock('@components/MenuItemWithTopDescription', () => {
 
 jest.mock('@components/MenuItem', () => {
     const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
-    return ({title}: {title?: string}) => <RN.Text testID={`menu-item-simple-${title}`}>{title}</RN.Text>;
+    const {default: actualMenuItem} = jest.requireActual<{default: Record<string, unknown>}>('@components/MenuItem');
+    return Object.assign(({title}: {title?: string}) => <RN.Text testID={`menu-item-simple-${title}`}>{title}</RN.Text>, {...actualMenuItem});
 });
 
 jest.mock('@hooks/useCardFeedsForDisplay', () => jest.fn(() => ({defaultCardFeed: null, cardFeedsByPolicy: {}})));
diff --git a/tests/ui/MoneyRequestViewTest.tsx b/tests/ui/MoneyRequestViewTest.tsx
index 15c42f230253..29f8f9989ef5 100644
--- a/tests/ui/MoneyRequestViewTest.tsx
+++ b/tests/ui/MoneyRequestViewTest.tsx
@@ -14,6 +14,7 @@ import type {Policy} from '@src/types/onyx';
 import type * as NativeNavigation from '@react-navigation/native';
 import type {PartialDeep} from 'type-fest';
 
+import escapeRegExp from 'lodash/escapeRegExp';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
@@ -72,10 +73,11 @@ jest.mock('@components/MenuItemWithTopDescription', () => {
     );
 });
 
-// Mock MenuItem (used for some fields like billable)
+// Mock the legacy MenuItem (used for some fields like billable), but keep the real compound parts the migrated rows render with
 jest.mock('@components/MenuItem', () => {
     const RN = jest.requireActual<Record<string, React.ComponentType<{testID?: string; children?: React.ReactNode}>>>('react-native');
-    return ({title}: {title?: string}) => <RN.Text testID={`menu-item-simple-${title}`}>{title}</RN.Text>;
+    const {default: actualMenuItem} = jest.requireActual<{default: Record<string, unknown>}>('@components/MenuItem');
+    return Object.assign(({title}: {title?: string}) => <RN.Text testID={`menu-item-simple-${title}`}>{title}</RN.Text>, {...actualMenuItem});
 });
 
 jest.mock('@hooks/useCardFeedsForDisplay', () => jest.fn(() => ({defaultCardFeed: null, cardFeedsByPolicy: {}})));
@@ -94,6 +96,9 @@ jest.mock('@hooks/useCurrencyList', () => ({
 
 TestHelper.setupGlobalFetchMock();
 
+/** Matches the accessibility label a compound field row builds from its name, followed by its value when it has one */
+const fieldLabel = (name: string) => new RegExp(`^${escapeRegExp(name)}(,|$)`);
+
 const currentUserAccountID = 10;
 const currentUserEmail = 'test@test.com';
 const policyID = 'policy_mrv_test';
@@ -243,7 +248,7 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.getByTestId('menu-item-common.category')).toBeOnTheScreen();
+            expect(screen.getByLabelText(fieldLabel('common.category'))).toBeOnTheScreen();
             expect(screen.getByTestId('menu-item-Location')).toBeOnTheScreen();
         });
     });
@@ -272,7 +277,7 @@ describe('MoneyRequestView edit fields', () => {
         await waitFor(() => {
             expect(screen.getByTestId('menu-item-common.merchant')).toBeOnTheScreen();
         });
-        expect(screen.queryByTestId('menu-item-common.category')).not.toBeOnTheScreen();
+        expect(screen.queryByLabelText(fieldLabel('common.category'))).not.toBeOnTheScreen();
         expect(screen.queryByTestId('menu-item-Location')).not.toBeOnTheScreen();
     });
 
@@ -298,8 +303,8 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.getByTestId('menu-item-common.tax')).toBeOnTheScreen();
-            expect(screen.getByTestId('menu-item-iou.taxAmount')).toBeOnTheScreen();
+            expect(screen.getByLabelText(fieldLabel('common.tax'))).toBeOnTheScreen();
+            expect(screen.getByLabelText(fieldLabel('iou.taxAmount'))).toBeOnTheScreen();
         });
     });
 
@@ -317,8 +322,8 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.queryByTestId('menu-item-common.tax')).not.toBeOnTheScreen();
-            expect(screen.queryByTestId('menu-item-iou.taxAmount')).not.toBeOnTheScreen();
+            expect(screen.queryByLabelText(fieldLabel('common.tax'))).not.toBeOnTheScreen();
+            expect(screen.queryByLabelText(fieldLabel('iou.taxAmount'))).not.toBeOnTheScreen();
         });
     });
 
@@ -345,8 +350,8 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.queryByTestId('menu-item-common.tax')).not.toBeOnTheScreen();
-            expect(screen.queryByTestId('menu-item-iou.taxAmount')).not.toBeOnTheScreen();
+            expect(screen.queryByLabelText(fieldLabel('common.tax'))).not.toBeOnTheScreen();
+            expect(screen.queryByLabelText(fieldLabel('iou.taxAmount'))).not.toBeOnTheScreen();
         });
     });
 
@@ -409,7 +414,7 @@ describe('MoneyRequestView edit fields', () => {
         await waitFor(() => {
             expect(screen.getByTestId(/^menu-item-iou\.amount/)).toHaveTextContent('editable');
             expect(screen.getByTestId('menu-item-common.merchant')).toHaveTextContent('editable');
-            expect(screen.getByTestId('menu-item-common.date')).toHaveTextContent('editable');
+            expect(screen.getByRole('button', {name: fieldLabel('common.date')})).toBeOnTheScreen();
         });
     });
 
@@ -450,7 +455,8 @@ describe('MoneyRequestView edit fields', () => {
         await waitFor(() => {
             expect(screen.getByTestId(/^menu-item-iou\.amount/)).toHaveTextContent('readonly');
             expect(screen.getByTestId('menu-item-common.merchant')).toHaveTextContent('readonly');
-            expect(screen.getByTestId('menu-item-common.date')).toHaveTextContent('readonly');
+            expect(screen.getByLabelText(fieldLabel('common.date'))).toBeOnTheScreen();
+            expect(screen.queryByRole('button', {name: fieldLabel('common.date')})).not.toBeOnTheScreen();
         });
     });
 
@@ -597,7 +603,7 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.getByTestId(/^menu-item-iou\.taxAmount.*common\.converted/i)).toBeOnTheScreen();
+            expect(screen.getByLabelText(/^iou\.taxAmount.*common\.converted/i)).toBeOnTheScreen();
         });
     });
 
@@ -625,8 +631,8 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.getByTestId('menu-item-iou.taxAmount')).toBeOnTheScreen();
-            expect(screen.queryByTestId(/^menu-item-iou\.taxAmount.*common\.converted/i)).not.toBeOnTheScreen();
+            expect(screen.getByLabelText(fieldLabel('iou.taxAmount'))).toBeOnTheScreen();
+            expect(screen.queryByLabelText(/^iou\.taxAmount.*common\.converted/i)).not.toBeOnTheScreen();
         });
     });
 
@@ -654,8 +660,8 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.getByTestId('menu-item-iou.taxAmount')).toBeOnTheScreen();
-            expect(screen.queryByTestId(/^menu-item-iou\.taxAmount.*common\.converted/i)).not.toBeOnTheScreen();
+            expect(screen.getByLabelText(fieldLabel('iou.taxAmount'))).toBeOnTheScreen();
+            expect(screen.queryByLabelText(/^iou\.taxAmount.*common\.converted/i)).not.toBeOnTheScreen();
         });
     });
 
@@ -686,7 +692,7 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(screen.getByTestId('menu-item-title-common.vendor')).toHaveTextContent('Acme Co');
+            expect(screen.getByLabelText(fieldLabel('common.vendor'))).toHaveTextContent(/Acme Co/);
         });
     });
 
@@ -718,11 +724,12 @@ describe('MoneyRequestView edit fields', () => {
 
         // Intacct keeps the "Vendor" label and shows the vendor's display name, which Intacct stores in `value`.
         await waitFor(() => {
-            expect(screen.getByTestId('menu-item-title-common.vendor')).toHaveTextContent('Acme Intacct');
+            expect(screen.getByLabelText(fieldLabel('common.vendor'))).toHaveTextContent(/Acme Intacct/);
         });
     });
 
-    it('hides the vendor row on Xero without the vendorMatching beta because Xero (R3) is still pre-GA', async () => {
+    it('shows the supplier row on Xero without the vendorMatching beta because Xero (R3) is generally available', async () => {
+        // Given a non-reimbursable expense whose vendor is one of the synced Xero contacts
         const threadReport = {
             ...LHNTestUtils.getFakeReport(),
             parentReportID: expenseReportID,
@@ -738,6 +745,7 @@ describe('MoneyRequestView edit fields', () => {
         });
         await waitForBatchedUpdatesWithAct();
 
+        // When the expense renders on a configured Xero workspace without the vendorMatching beta
         renderMoneyRequestView(threadReport, {
             connections: {
                 [CONST.POLICY.CONNECTIONS.NAME.XERO]: {
@@ -748,9 +756,57 @@ describe('MoneyRequestView edit fields', () => {
         });
         await waitForBatchedUpdatesWithAct();
 
+        // Then the row is shown with the Supplier label and the contact name because Xero does not depend on the beta
+        await waitFor(() => {
+            expect(screen.getByLabelText(fieldLabel('common.supplier'))).toHaveTextContent(/Acme Xero/);
+        });
+        expect(screen.queryByTestId('menu-item-common.vendor')).not.toBeOnTheScreen();
+    });
+
+    it('hides the vendor row on Business Central without the vendorMatching beta because Business Central is still beta-gated', async () => {
+        // Given a non-reimbursable expense whose vendor is one of the synced Business Central vendors
+        const threadReport = {
+            ...LHNTestUtils.getFakeReport(),
+            parentReportID: expenseReportID,
+            parentReportActionID,
+        };
+
+        await setupTestData();
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
+                reimbursable: false,
+                comment: {vendor: {externalID: 'bc-1', wasManuallySet: false}},
+            });
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // When the expense renders on a configured Business Central workspace without the vendorMatching beta
+        renderMoneyRequestView(threadReport, {
+            connections: {
+                [CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL]: {
+                    config: {isConfigured: true},
+                    data: {
+                        vendors: [
+                            {
+                                id: 'bc-1',
+                                number: 'V00010',
+                                name: 'Contoso Supplies',
+                                email: 'ap@contoso.com',
+                                blocked: CONST.BUSINESS_CENTRAL_VENDOR_BLOCKED.NONE,
+                                expensifyVendorId: '',
+                                lastModifiedDateTime: '',
+                            },
+                        ],
+                    },
+                },
+            },
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // Then no vendor row is shown because Business Central still depends on the beta
         await waitFor(() => {
-            expect(screen.queryByTestId('menu-item-common.supplier')).not.toBeOnTheScreen();
-            expect(screen.queryByTestId('menu-item-common.vendor')).not.toBeOnTheScreen();
+            expect(screen.queryByLabelText(fieldLabel('common.supplier'))).not.toBeOnTheScreen();
+            expect(screen.queryByLabelText(fieldLabel('common.vendor'))).not.toBeOnTheScreen();
         });
     });
 
@@ -782,9 +838,9 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            const vendorTitle = screen.getByTestId('menu-item-title-common.vendor');
-            expect(vendorTitle).toHaveTextContent('stale-vendor-id');
-            expect(vendorTitle).not.toHaveTextContent('violations.inactiveVendor');
+            const vendorTitle = screen.getByLabelText(fieldLabel('common.vendor'));
+            expect(vendorTitle).toHaveTextContent(/stale-vendor-id/);
+            expect(vendorTitle).not.toHaveTextContent(/violations\.inactiveVendor/);
         });
     });
 
@@ -819,9 +875,9 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            const vendorTitle = screen.getByTestId('menu-item-title-common.vendor');
-            expect(vendorTitle).toHaveTextContent('Amazon');
-            expect(vendorTitle).not.toHaveTextContent('stale-vendor-id');
+            const vendorTitle = screen.getByLabelText(fieldLabel('common.vendor'));
+            expect(vendorTitle).toHaveTextContent(/Amazon/);
+            expect(vendorTitle).not.toHaveTextContent(/stale-vendor-id/);
         });
     });
 
@@ -852,9 +908,9 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            const vendorTitle = screen.getByTestId('menu-item-title-common.vendor');
-            expect(vendorTitle).toHaveTextContent('still-valid-vendor-id');
-            expect(vendorTitle).not.toHaveTextContent('violations.inactiveVendor');
+            const vendorTitle = screen.getByLabelText(fieldLabel('common.vendor'));
+            expect(vendorTitle).toHaveTextContent(/still-valid-vendor-id/);
+            expect(vendorTitle).not.toHaveTextContent(/violations\.inactiveVendor/);
         });
     });
 
@@ -889,9 +945,9 @@ describe('MoneyRequestView edit fields', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            const vendorTitle = screen.getByTestId('menu-item-title-common.vendor');
-            expect(vendorTitle).toHaveTextContent('Stale Intacct Vendor');
-            expect(vendorTitle).not.toHaveTextContent('violations.inactiveVendor');
+            const vendorTitle = screen.getByLabelText(fieldLabel('common.vendor'));
+            expect(vendorTitle).toHaveTextContent(/Stale Intacct Vendor/);
+            expect(vendorTitle).not.toHaveTextContent(/violations\.inactiveVendor/);
         });
     });
 
@@ -932,7 +988,7 @@ describe('MoneyRequestView edit fields', () => {
             await waitForBatchedUpdatesWithAct();
 
             await waitFor(() => {
-                expect(screen.getByTestId(`menu-item-${commuterDistanceDescription}`)).toBeOnTheScreen();
+                expect(screen.getByLabelText(fieldLabel(commuterDistanceDescription))).toBeOnTheScreen();
             });
         });
 
@@ -1012,10 +1068,10 @@ describe('MoneyRequestView edit fields', () => {
             await waitForBatchedUpdatesWithAct();
 
             await waitFor(() => {
-                expect(screen.getByTestId('menu-item-common.distance')).toBeOnTheScreen();
+                expect(screen.getByLabelText(fieldLabel('common.distance'))).toBeOnTheScreen();
                 expect(screen.getByTestId(/^menu-item-title-iou\.amount/)).toHaveTextContent('USD-268');
             });
-            expect(screen.queryByTestId(`menu-item-${commuterDistanceDescription}`)).not.toBeOnTheScreen();
+            expect(screen.queryByLabelText(fieldLabel(commuterDistanceDescription))).not.toBeOnTheScreen();
         });
     });
 });
diff --git a/tests/ui/MonthListItemHeaderTest.tsx b/tests/ui/MonthListItemHeaderTest.tsx
index ee87b616d9cb..e2814c96fe01 100644
--- a/tests/ui/MonthListItemHeaderTest.tsx
+++ b/tests/ui/MonthListItemHeaderTest.tsx
@@ -58,6 +58,9 @@ const mockSearchActionsContext = {
     setLastSearchType: jest.fn(),
     setCurrentSelectedTransactionReportID: jest.fn(),
     setSelectedTransactions: jest.fn(),
+    getSelectedTransactions: jest.fn(() => ({})),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: jest.fn(),
     setSelectedReports: jest.fn(),
     removeTransaction: jest.fn(),
diff --git a/tests/ui/ProfilePageTest.tsx b/tests/ui/ProfilePageTest.tsx
index 65c74b67d065..e28481374bd9 100644
--- a/tests/ui/ProfilePageTest.tsx
+++ b/tests/ui/ProfilePageTest.tsx
@@ -546,7 +546,7 @@ const CURRENT_USER_ACCOUNT_ID = 1;
 const CURRENT_USER_EMAIL = 'current@expensify.com';
 const PUBLIC_PROFILE_ACCOUNT_ID = 123;
 
-describe('ProfilePage - View member history', () => {
+describe('ProfilePage - See chat history', () => {
     beforeAll(async () => {
         Onyx.init({
             keys: ONYXKEYS,
@@ -612,7 +612,7 @@ describe('ProfilePage - View member history', () => {
         renderPublicProfilePage();
         await waitForBatchedUpdatesWithAct();
 
-        expect(screen.getByText('View member history')).toBeOnTheScreen();
+        expect(screen.getByText('See chat history')).toBeOnTheScreen();
         expect(screen.queryByText('View agent history')).not.toBeOnTheScreen();
     });
 
@@ -623,7 +623,7 @@ describe('ProfilePage - View member history', () => {
         await waitForBatchedUpdatesWithAct();
 
         expect(screen.getByText('View agent history')).toBeOnTheScreen();
-        expect(screen.queryByText('View member history')).not.toBeOnTheScreen();
+        expect(screen.queryByText('See chat history')).not.toBeOnTheScreen();
     });
 
     it('navigates to a chat search filtered by the profile account when pressed', async () => {
@@ -633,7 +633,7 @@ describe('ProfilePage - View member history', () => {
         await waitForBatchedUpdatesWithAct();
 
         // MenuItem only forwards the press to onPress when it receives an event, so pass a minimal one.
-        fireEvent.press(screen.getByText('View member history'), {nativeEvent: {}});
+        fireEvent.press(screen.getByText('See chat history'), {nativeEvent: {}});
         await waitForBatchedUpdatesWithAct();
 
         expect(Navigation.revealRouteBeforeDismissingModal).toHaveBeenCalledWith(
@@ -655,7 +655,7 @@ describe('ProfilePage - View member history', () => {
         renderPublicProfilePage();
         await waitForBatchedUpdatesWithAct();
 
-        expect(screen.queryByText('View member history')).not.toBeOnTheScreen();
+        expect(screen.queryByText('See chat history')).not.toBeOnTheScreen();
     });
 
     it.each(['0', 'not-a-number'])('hides the search entry for the invalid accountID %s', async (invalidAccountID) => {
@@ -664,7 +664,7 @@ describe('ProfilePage - View member history', () => {
         renderPublicProfilePage(invalidAccountID);
         await waitForBatchedUpdatesWithAct();
 
-        expect(screen.queryByText('View member history')).not.toBeOnTheScreen();
+        expect(screen.queryByText('See chat history')).not.toBeOnTheScreen();
         expect(screen.queryByText('View agent history')).not.toBeOnTheScreen();
     });
 });
diff --git a/tests/ui/RecentlyAddedSectionTest.tsx b/tests/ui/RecentlyAddedSectionTest.tsx
index 4fe5aa89360c..6ac402f7ad8f 100644
--- a/tests/ui/RecentlyAddedSectionTest.tsx
+++ b/tests/ui/RecentlyAddedSectionTest.tsx
@@ -323,7 +323,7 @@ describe('RecentlyAddedSection', () => {
             await waitForBatchedUpdatesWithAct();
 
             expect(mockNavigate).toHaveBeenCalledTimes(1);
-            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: ROW_1.reportID, backTo: ROUTES.HOME}));
+            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: ROW_1.reportID, backTo: ROUTES.HOME, anchorTransactionID: ROW_1.transactionID}));
         });
 
         it('navigates to SEARCH_REPORT with backTo Home on narrow layout (carousel available on both layouts)', async () => {
@@ -337,7 +337,7 @@ describe('RecentlyAddedSection', () => {
             await waitForBatchedUpdatesWithAct();
 
             expect(mockNavigate).toHaveBeenCalledTimes(1);
-            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: ROW_1.reportID, backTo: ROUTES.HOME}));
+            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: ROW_1.reportID, backTo: ROUTES.HOME, anchorTransactionID: ROW_1.transactionID}));
         });
 
         it('opens the tapped expense in a multi-expense report by navigating to its transaction thread', async () => {
@@ -366,7 +366,7 @@ describe('RecentlyAddedSection', () => {
             await waitForBatchedUpdatesWithAct();
 
             expect(mockNavigate).toHaveBeenCalledTimes(1);
-            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: threadReportID, backTo: ROUTES.HOME}));
+            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: threadReportID, backTo: ROUTES.HOME, anchorTransactionID: ROW_1.transactionID}));
         });
 
         it('opens (creating if needed) the transaction thread for an expense in a one-transaction report, not the parent report', async () => {
@@ -390,7 +390,7 @@ describe('RecentlyAddedSection', () => {
 
             expect(mockCreateTransactionThreadReport).toHaveBeenCalledTimes(1);
             expect(mockNavigate).toHaveBeenCalledTimes(1);
-            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'created_thread_report', backTo: ROUTES.HOME}));
+            expect(mockNavigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'created_thread_report', backTo: ROUTES.HOME, anchorTransactionID: ROW_1.transactionID}));
         });
 
         it('seeds the prev/next carousel with the IDs and a lazy descriptor for every recently added expense', async () => {
diff --git a/tests/ui/ReportActionItemTest.tsx b/tests/ui/ReportActionItemTest.tsx
index 1ba1545efc78..7dd68df422a6 100644
--- a/tests/ui/ReportActionItemTest.tsx
+++ b/tests/ui/ReportActionItemTest.tsx
@@ -8,6 +8,8 @@ import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
 
+import useThemeStyles from '@hooks/useThemeStyles';
+
 import {openLink} from '@libs/actions/Link';
 import DateUtils from '@libs/DateUtils';
 import {setHasRadio} from '@libs/NetworkState';
@@ -34,6 +36,7 @@ import type ReportActionName from '@src/types/onyx/ReportActionName';
 import {PortalProvider} from '@gorhom/portal';
 import * as NativeNavigation from '@react-navigation/native';
 import React from 'react';
+import {StyleSheet} from 'react-native';
 import Onyx from 'react-native-onyx';
 
 import createMock from '../utils/createMock';
@@ -1303,6 +1306,27 @@ describe('ReportActionItem', () => {
             expect(textElement).toHaveStyle({color: colors.productDark800});
         });
 
+        it('AGENT_PROMPT_UPDATED action shows the modifier and prompt diff', async () => {
+            const action = createReportAction(CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED, {
+                previousPrompt: 'Categorize coffee as Meals.',
+                newPrompt: 'Categorize coffee as Meals and taxi trips as Travel.',
+                updatedByAccountID: ACTOR_ACCOUNT_ID,
+                updatedBy: actorEmail,
+            });
+            action.message = [];
+            renderItemWithAction(action);
+            await waitForBatchedUpdatesWithAct();
+
+            expect(screen.getByTestId('mention-user')).toHaveTextContent(`@${actorEmail}`);
+            const promptDiff = ` updated this agent's instructions.\nPrevious instructions:\nCategorize coffee as Meals.\nNew instructions:\nCategorize coffee as Meals and taxi trips as Travel.`;
+            expect(screen.getByText(promptDiff)).toBeOnTheScreen();
+            expect(
+                screen.getByLabelText(
+                    /test@test\.com updated this agent's instructions\.[\s\S]*Previous instructions:[\s\S]*Categorize coffee as Meals\.[\s\S]*New instructions:[\s\S]*taxi trips as Travel\./,
+                ),
+            ).toBeOnTheScreen();
+        });
+
         it('DELETED_TRANSACTION action shows deleted transaction message', async () => {
             const action = createReportAction(CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION, {
                 amount: 1500,
@@ -1315,6 +1339,16 @@ describe('ReportActionItem', () => {
             expect(screen.getByText(/deleted/i)).toBeOnTheScreen();
         });
 
+        it('UNDELETED_TRANSACTION action shows undeleted transaction message', async () => {
+            const action = createReportAction(CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION, {
+                fromReportID: '123',
+            });
+            renderItemWithAction(action);
+            await waitForBatchedUpdatesWithAct();
+
+            expect(screen.getByText(/undeleted/i)).toBeOnTheScreen();
+        });
+
         it('MARKED_REIMBURSED action from OldDot shows reimbursement message', async () => {
             const action = createReportAction(CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED, {
                 isNewDot: false,
@@ -1631,6 +1665,52 @@ describe('ReportActionItem', () => {
             expect(screen.getByText(/QuickBooks Online/)).toBeOnTheScreen();
         });
 
+        it('INTEGRATION_SYNC_FAILED action lets an unbreakable token in the error wrap instead of overflowing', async () => {
+            // Given a sync failure whose error names an address long enough to exceed the RHP message column
+            const action = createReportAction(CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED, {
+                label: 'QuickBooks Online',
+                errorMessage: 'We were unable to find a vendor/supplier for applausetester+bp3108od@applause.expensifail.com',
+            });
+            let renderHTMLStyle: ReturnType<typeof useThemeStyles>['renderHTML'] | undefined;
+            function StyleProbe() {
+                renderHTMLStyle = useThemeStyles().renderHTML;
+                return null;
+            }
+
+            // When the action renders through the children branch of ReportActionItemBasicMessage
+            render(
+                <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, HTMLEngineProvider]}>
+                    <ScreenWrapper testID="test">
+                        <PortalProvider>
+                            <StyleProbe />
+                            <ReportActionItem
+                                chatReport={undefined}
+                                report={{reportID: 'testReport', policyID: 'pol123'}}
+                                transactionThreadReport={undefined}
+                                parentReportAction={undefined}
+                                action={action}
+                                displayAsGroup={false}
+                                shouldDisplayNewMarker={false}
+                                isFirstVisibleReportAction={false}
+                            />
+                        </PortalProvider>
+                    </ScreenWrapper>
+                </ComposeProviders>,
+            );
+            await waitForBatchedUpdatesWithAct();
+
+            // Then a wrapper carries the wrapping styles, which the children branch gets from nowhere else.
+            // `styles.renderHTML` also holds wordBreak/whiteSpace, but both resolve to {} under the native
+            // style variants Jest loads, so the width constraint is all that is observable here.
+            const ancestorStyles: unknown[] = [];
+            let ancestor = screen.getByText(/there was a problem syncing with/).parent;
+            while (ancestor) {
+                ancestorStyles.push(StyleSheet.flatten(ancestor.props.style));
+                ancestor = ancestor.parent;
+            }
+            expect(ancestorStyles).toEqual(expect.arrayContaining([StyleSheet.flatten(renderHTMLStyle)]));
+        });
+
         it('INTEGRATION_SYNC_FAILED action keeps the stored IES label after switching to QBO', async () => {
             const policyID = 'iesPolicy';
             await act(async () => {
diff --git a/tests/ui/ReportActionsListTest.tsx b/tests/ui/ReportActionsListTest.tsx
index 80accba1f201..9b5234228c42 100644
--- a/tests/ui/ReportActionsListTest.tsx
+++ b/tests/ui/ReportActionsListTest.tsx
@@ -1,4 +1,4 @@
-import {render, screen} from '@testing-library/react-native';
+import {render, screen, waitFor} from '@testing-library/react-native';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import {useIsReportLoadPending} from '@hooks/useInFlightRequests';
@@ -391,8 +391,9 @@ describe('ReportActionsList (body)', () => {
         });
 
         it('marks the reply once streaming finishes even when the draft HTML differs from the saved comment', () => {
-            // The draft keeps HTML entities that the saved comment does not have, so the draft can stay in the list after it completes
+            // Given a completed draft whose HTML serialization differs from its saved reply
             const completedDraft: OnyxTypes.ReportAction = {...conciergeReply, message: [{type: 'COMMENT', html: 'Here&apos;s it', text: "Here's it"}]};
+            const savedReply: OnyxTypes.ReportAction = {...conciergeReply, message: [{type: 'COMMENT', html: "Here's it", text: "Here's it"}]};
             mockUseConciergeDraft.mockReturnValue({
                 draftReportAction: completedDraft,
                 hasActiveDraft: true,
@@ -400,13 +401,16 @@ describe('ReportActionsList (body)', () => {
             });
             mockUsePaginatedReportActions.mockReturnValue({
                 ...defaultPaginatedReportActionsResult,
-                reportActions: [...mockReportActions, {...conciergeReply, message: [{type: 'COMMENT', html: "Here's it", text: "Here's it"}]}],
+                reportActions: [savedReply, ...mockReportActions],
             });
 
+            // When the saved reply is available after streaming finishes
             renderReportActionsList();
 
-            expect(getCapturedVisibleActions()).toContain(completedDraft);
-            expect(getRenderedReportActionsListItemProps(completedDraft).isLatestConciergeFeedbackAction).toBe(true);
+            // Then the saved reply replaces the draft and retains its feedback prompt
+            expect(getCapturedVisibleActions()).toContain(savedReply);
+            expect(getCapturedVisibleActions()).not.toContain(completedDraft);
+            expect(getRenderedReportActionsListItemProps(savedReply).isLatestConciergeFeedbackAction).toBe(true);
         });
 
         it('marks nothing inside the feedback thread the backend opens after a thumbs down', () => {
@@ -489,6 +493,126 @@ describe('ReportActionsList (body)', () => {
             expect(getRenderedReportActionsListItemProps(conciergeDraftReportAction).shouldDisableContextMenuForConciergeDraft).toBe(false);
             expect((getCapturedListProps()?.extraData as unknown[]).at(DRAFT_PENDING_EXTRA_DATA_INDEX)).toBe(false);
         });
+
+        it('reconciles a pending draft when the matching persisted action has identical HTML', async () => {
+            // Given a saved reply matching the last draft update while its completion event is missing
+            const persistedReportAction = mockReportActions.at(-1);
+            const revealDraftFromReportAction = jest.fn();
+            mockUseConciergeDraft.mockReturnValue({
+                draftReportAction: persistedReportAction ?? null,
+                hasActiveDraft: true,
+                isDraftPendingCompletion: true,
+            });
+            mockUseConciergeDraftActions.mockReturnValue({
+                clearDraft: jest.fn(),
+                dispatchLocalDraftEvent: jest.fn(),
+                revealDraftFromReportAction,
+            });
+
+            // When the saved reply reaches the list
+            renderReportActionsList();
+
+            // Then the saved identity completes reconciliation even without a change to its HTML
+            await waitFor(() => {
+                expect(revealDraftFromReportAction).toHaveBeenCalledWith(persistedReportAction);
+            });
+        });
+
+        it('clears a completed draft when its saved action is outside the visible page', async () => {
+            // Given a saved reply outside the pagination window while its draft is still revealing
+            const persistedReportAction: OnyxTypes.ReportAction = {
+                ...conciergeDraftReportAction,
+                reportActionID: 'persisted-outside-visible-page',
+            };
+            const revealingDraft: OnyxTypes.ReportAction = {...persistedReportAction, message: [{type: 'COMMENT', html: 'Bot', text: 'Bot'}]};
+            const clearDraft = jest.fn();
+            const revealDraftFromReportAction = jest.fn();
+            mockUsePaginatedReportActions.mockReturnValue({
+                ...defaultPaginatedReportActionsResult,
+                reportActions: mockReportActions,
+                sortedAllReportActions: [...mockReportActions, persistedReportAction],
+            });
+            const revealingDraftState = {
+                draftReportAction: revealingDraft,
+                hasActiveDraft: true,
+                isDraftPendingCompletion: true,
+            };
+            const TestDraftContext = React.createContext(revealingDraftState);
+            const useTestConciergeDraft = () => React.useContext(TestDraftContext);
+            mockUseConciergeDraft.mockImplementation(useTestConciergeDraft);
+            mockUseConciergeDraftActions.mockReturnValue({
+                clearDraft,
+                dispatchLocalDraftEvent: jest.fn(),
+                revealDraftFromReportAction,
+            });
+
+            // When the list reconciles against all saved actions
+            const {rerender} = render(
+                <TestDraftContext.Provider value={revealingDraftState}>
+                    <ReportActionsList
+                        reportID={mockReport.reportID}
+                        conciergeChat={undefined}
+                    />
+                </TestDraftContext.Provider>,
+            );
+
+            // Then the partial draft remains visible until its saved content finishes revealing
+            await waitFor(() => {
+                expect(revealDraftFromReportAction).toHaveBeenCalledWith(persistedReportAction);
+            });
+            expect(getCapturedVisibleActions()).toContain(revealingDraft);
+            expect(clearDraft).not.toHaveBeenCalled();
+
+            // When the reveal completes without changing the visible pagination window
+            rerender(
+                <TestDraftContext.Provider value={{draftReportAction: persistedReportAction, hasActiveDraft: true, isDraftPendingCompletion: false}}>
+                    <ReportActionsList
+                        reportID={mockReport.reportID}
+                        conciergeChat={undefined}
+                    />
+                </TestDraftContext.Provider>,
+            );
+
+            // Then the synthetic bubble disappears and its cached draft is cleared
+            await waitFor(() => {
+                expect(clearDraft).toHaveBeenCalledTimes(1);
+            });
+            expect(getCapturedVisibleActions()?.some((action) => action.reportActionID === persistedReportAction.reportActionID)).toBe(false);
+        });
+
+        it.each([true, false])('does not reconcile from an optimistic action when draft completion is pending: %s', (isDraftPendingCompletion) => {
+            // Given a matching optimistic placeholder that has not been saved, even if streaming completed
+            const optimisticReportAction: OnyxTypes.ReportAction = {
+                ...conciergeDraftReportAction,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                isOptimisticAction: true,
+            };
+            const clearDraft = jest.fn();
+            const revealDraftFromReportAction = jest.fn();
+            mockUsePaginatedReportActions.mockReturnValue({
+                ...defaultPaginatedReportActionsResult,
+                reportActions: [...mockReportActions, optimisticReportAction],
+                sortedAllReportActions: [...mockReportActions, optimisticReportAction],
+            });
+            mockUseConciergeDraft.mockReturnValue({
+                draftReportAction: optimisticReportAction,
+                hasActiveDraft: true,
+                isDraftPendingCompletion,
+            });
+            mockUseConciergeDraftActions.mockReturnValue({
+                clearDraft,
+                dispatchLocalDraftEvent: jest.fn(),
+                revealDraftFromReportAction,
+            });
+
+            // When the list renders the draft beside that placeholder
+            renderReportActionsList();
+
+            // Then the placeholder cannot complete reconciliation or clear the draft
+            expect(revealDraftFromReportAction).not.toHaveBeenCalled();
+            expect(clearDraft).not.toHaveBeenCalled();
+            expect(getCapturedVisibleActions()).toContain(optimisticReportAction);
+        });
     });
 
     describe('Skeleton Loading States', () => {
diff --git a/tests/ui/ReportListItemHeaderTest.tsx b/tests/ui/ReportListItemHeaderTest.tsx
index 4444b552af5b..7a56f8e53df2 100644
--- a/tests/ui/ReportListItemHeaderTest.tsx
+++ b/tests/ui/ReportListItemHeaderTest.tsx
@@ -64,6 +64,9 @@ const mockSearchActionsContext = {
     setLastSearchType: jest.fn(),
     setCurrentSelectedTransactionReportID: jest.fn(),
     setSelectedTransactions: jest.fn(),
+    getSelectedTransactions: jest.fn(() => ({})),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: jest.fn(),
     setSelectedReports: jest.fn(),
     setShouldShowFiltersBarLoading: jest.fn(),
diff --git a/tests/ui/ReportSubmitToContentTest.tsx b/tests/ui/ReportSubmitToContentTest.tsx
index 2943c93f19cb..e9ea051cdab5 100644
--- a/tests/ui/ReportSubmitToContentTest.tsx
+++ b/tests/ui/ReportSubmitToContentTest.tsx
@@ -65,12 +65,10 @@ jest.mock('@hooks/useNetwork', () => jest.fn(() => ({isOffline: false})));
 // flag, billing/violations, country code) is deliberately `undefined` so a newly added dependency fails loudly here
 // rather than silently receiving the submitter login.
 jest.mock('@hooks/useOnyx', () =>
-    jest.fn((key: string, options?: {selector?: unknown}) => {
+    jest.fn((key: string) => {
         switch (key) {
             case mockPersonalDetailsListKey:
-                // With a selector this read is `submitterLogin` (the report owner's login); without one it is the
-                // full personal-details map.
-                return options?.selector ? ['submitter@example.com'] : [mockPersonalDetailsList];
+                return [mockPersonalDetailsList];
             case mockLoginsKey:
                 return [{}];
             default:
@@ -88,10 +86,10 @@ jest.mock('@libs/Navigation/Navigation', () => ({dismissToPreviousRHP: jest.fn()
 jest.mock('@libs/OptionsListUtils', () => ({
     getSearchValueForPhoneOrEmail: jest.fn((value: string) => value),
     getUserToInviteOption: jest.fn(() => null),
-    sortAlphabetically: jest.fn((items: unknown[]) => items),
 }));
 jest.mock('@libs/PersonalDetailsUtils', () => ({
     getKnownAccountIDByLogin: jest.fn(() => undefined),
+    getLoginByAccountID: jest.fn(() => 'submitter@example.com'),
     getPersonalDetailsByID: jest.fn(() => undefined),
 }));
 jest.mock('@libs/PolicyUtils', () => ({
@@ -118,7 +116,6 @@ jest.mock('@userActions/IOU/ReportWorkflow', () => ({submitReport: jest.fn()}));
 
 jest.mock('@selectors/Account', () => ({delegateEmailSelector: jest.fn()}));
 jest.mock('@selectors/Onboarding', () => ({isTrackIntentUserSelector: jest.fn()}));
-jest.mock('@src/selectors/PersonalDetails', () => ({personalDetailsLoginSelector: jest.fn(() => jest.fn())}));
 
 // Read the props off the real `SelectionList` mock (no re-derived narrowed shape), so the test stops compiling if a
 // prop it reads (`confirmButtonOptions`, `listEmptyContent`, `textInputOptions`, `children`…) is renamed or retyped.
diff --git a/tests/ui/SAMLSignInPageTest.tsx b/tests/ui/SAMLSignInPageTest.tsx
index 2b883a575686..0e62e258f3c5 100644
--- a/tests/ui/SAMLSignInPageTest.tsx
+++ b/tests/ui/SAMLSignInPageTest.tsx
@@ -169,7 +169,7 @@ describe('SAMLSignInPage', () => {
         renderPage();
         await waitForBatchedUpdatesWithAct();
 
-        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding');
+        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding', 'user@saml.example.com');
         expect(clearSignInData).not.toHaveBeenCalled();
     });
 
@@ -181,6 +181,6 @@ describe('SAMLSignInPage', () => {
         renderPage();
         await waitForBatchedUpdatesWithAct();
 
-        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding');
+        expect(signInWithShortLivedAuthToken).toHaveBeenCalledWith('token', true, '/search?q=status:outstanding', 'user@saml.example.com');
     });
 });
diff --git a/tests/ui/SearchEditMultiplePageTest.tsx b/tests/ui/SearchEditMultiplePageTest.tsx
index c92aef69a1da..e89d39835848 100644
--- a/tests/ui/SearchEditMultiplePageTest.tsx
+++ b/tests/ui/SearchEditMultiplePageTest.tsx
@@ -4,7 +4,6 @@ import ComposeProviders from '@components/ComposeProviders';
 import {CurrencyListContextProvider} from '@components/CurrencyListContextProvider';
 import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
-import type {MenuItemProps} from '@components/MenuItem';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import {SearchContextProvider} from '@components/Search/SearchContextProvider';
 import ThemeProvider from '@components/ThemeProvider';
@@ -33,21 +32,6 @@ import {createExpenseReport} from '../utils/collections/reports';
 import createRandomTransaction from '../utils/collections/transaction';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
-// The page renders every bulk-editable field through this component, so mocking it exposes each
-// field's `disabled` state directly instead of asserting on MenuItem internals.
-jest.mock('@components/MenuItemWithTopDescription', () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const {View, Text} = require('react-native');
-    return (props: MenuItemProps) => (
-        <View
-            testID={`menu-item-${props.description}`}
-            accessibilityState={{disabled: !!props.disabled}}
-        >
-            <Text>{props.description}</Text>
-        </View>
-    );
-});
-
 const CURRENT_USER_ACCOUNT_ID = 5;
 const CURRENT_USER_EMAIL = 'bjorn@vikings.net';
 const POLICY_ID = 'policy1';
@@ -177,7 +161,7 @@ describe('SearchEditMultiplePage', () => {
         renderPage();
         await waitForBatchedUpdatesWithAct();
 
-        expect(screen.getByTestId('menu-item-Reimbursable').props.accessibilityState).toEqual(expect.objectContaining({disabled: false}));
+        expect(screen.getByLabelText(/^Reimbursable/).props.accessibilityState).toEqual(expect.objectContaining({disabled: false}));
     });
 
     it('disables Reimbursable when the selection contains a marked-as-done expense', async () => {
@@ -186,6 +170,6 @@ describe('SearchEditMultiplePage', () => {
         renderPage();
         await waitForBatchedUpdatesWithAct();
 
-        expect(screen.getByTestId('menu-item-Reimbursable').props.accessibilityState).toEqual(expect.objectContaining({disabled: true}));
+        expect(screen.getByLabelText(/^Reimbursable/).props.accessibilityState).toEqual(expect.objectContaining({disabled: true}));
     });
 });
diff --git a/tests/ui/SearchPageTest.tsx b/tests/ui/SearchPageTest.tsx
index d8e3caadf2ea..56e05a816278 100644
--- a/tests/ui/SearchPageTest.tsx
+++ b/tests/ui/SearchPageTest.tsx
@@ -1,4 +1,4 @@
-import {act, render, screen} from '@testing-library/react-native';
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
 
 import ComposeProviders from '@components/ComposeProviders';
 import FullScreenBlockingViewContextProvider from '@components/FullScreenBlockingViewContextProvider';
@@ -362,7 +362,7 @@ describe('SearchPageNarrow', () => {
 
     // Reproduces the reload case: the errored snapshot survives but the in-memory response code does not,
     // so the persisted code is the only thing left that can tell the two failure kinds apart.
-    const setFailedSnapshot = (responseJsonCode: number) =>
+    const setFailedSnapshot = (responseJsonCode: number | undefined) =>
         act(async () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.SNAPSHOT}${failedQueryJSON?.hash}`, {
                 errors: {error: 'Something went wrong'},
@@ -424,6 +424,50 @@ describe('SearchPageNarrow', () => {
         expect(screen.queryByText('Refresh needed')).toBeNull();
     });
 
+    it('sends the retry with the same recent search flag as the page-level request', async () => {
+        // Given a search that failed after the page requested it
+        renderPage();
+
+        await act(async () => {
+            jest.runAllTimers();
+        });
+        await setFailedSnapshot(CONST.JSON_CODE.EXP_ERROR);
+        mockSearch.mockClear();
+
+        // When the user presses Try again
+        fireEvent.press(screen.getByText('Try again'));
+
+        // Then the flag matches the page-level request, so search() dedupes it instead of re-sending the query
+        expect(mockSearch).toHaveBeenCalledWith(expect.objectContaining({shouldSaveRecentSearch: true}));
+    });
+
+    it('holds the loading frame instead of an error copy until the failure has a response code', async () => {
+        // Given the page already requested the query
+        renderPage();
+
+        await act(async () => {
+            jest.runAllTimers();
+        });
+
+        // When failureData lands with the errors but search() has not stored the response code yet
+        await setFailedSnapshot(undefined);
+
+        // Then neither error copy renders, because the copy depends on a classification that is one write away and
+        // rendering a guess flashed "Refresh needed" over the real error page (#101615)
+        expect(screen.queryByText('Refresh needed')).toBeNull();
+        expect(screen.queryByText('Oops... Something went wrong')).toBeNull();
+
+        // When the response code lands
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${failedQueryJSON?.hash}`, {search: {responseJsonCode: CONST.JSON_CODE.EXP_ERROR}});
+        });
+
+        // Then the view goes straight to the copy for that code
+        expect(screen.getByText('Oops... Something went wrong')).toBeTruthy();
+        expect(screen.getByText('Try again')).toBeTruthy();
+        expect(screen.queryByText('Refresh needed')).toBeNull();
+    });
+
     it('shows the refresh copy when the request failed without a server response code', async () => {
         renderPage();
 
@@ -431,7 +475,7 @@ describe('SearchPageNarrow', () => {
             jest.runAllTimers();
         });
 
-        // When the request failed before the server could answer, which failureData records as NO_RESPONSE
+        // When the request failed before the server could answer, which search() records as NO_RESPONSE
         await setFailedSnapshot(CONST.JSON_CODE.NO_RESPONSE);
 
         // Then the results are only out of date, so the refresh copy shows
diff --git a/tests/ui/ServerSelectionTest.tsx b/tests/ui/ServerSelectionTest.tsx
new file mode 100644
index 000000000000..afad7b9f38db
--- /dev/null
+++ b/tests/ui/ServerSelectionTest.tsx
@@ -0,0 +1,310 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import SelectionList from '@components/SelectionList';
+import TestToolMenu from '@components/TestToolMenu';
+
+import type {ActiveServerState} from '@libs/ApiUtils';
+import {isQAAuthConfigured} from '@libs/CloudflareAccess/Config';
+import Navigation from '@libs/Navigation/Navigation';
+import type navigationRef from '@libs/Navigation/navigationRef';
+
+import ServerSelector from '@pages/settings/Troubleshoot/ServerSelector';
+
+import toggleTestToolsModal from '@userActions/TestTool';
+import {setActiveServer} from '@userActions/User';
+
+import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+
+import type {ValueOf} from 'type-fest';
+
+import React from 'react';
+
+import createMock from '../utils/createMock';
+
+// jest.mock factories cannot close over non-`mock`-prefixed module scope
+const mockQAServer = CONST.SERVER.QA;
+let mockActiveServer: ValueOf<typeof CONST.SERVER> = CONST.SERVER.PRODUCTION;
+let mockIsPinnedByEnvironment = false;
+let mockIsStagingIgnored = false;
+let mockIsQASelectable = true;
+
+jest.mock('@hooks/useActiveServer', () => ({
+    __esModule: true,
+    default: (): ActiveServerState => ({
+        activeServer: mockActiveServer,
+        isPinnedByEnvironment: mockIsPinnedByEnvironment,
+        isStagingIgnored: mockIsStagingIgnored,
+        isQASelectable: mockIsQASelectable,
+    }),
+}));
+
+jest.mock('@libs/ApiUtils', () => ({
+    ...jest.requireActual<Record<string, unknown>>('@libs/ApiUtils'),
+    getActiveServer: () => mockActiveServer,
+    isQAServerActive: () => mockActiveServer === mockQAServer,
+    getCommandURL: () => 'https://test-api.expensify.com/api/Ping?',
+}));
+
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: () => [undefined, {status: 'loaded'}],
+}));
+
+jest.mock('@libs/CloudflareAccess/Config', () => ({isQAAuthConfigured: jest.fn()}));
+
+jest.mock('@hooks/useLocalize', () => ({
+    __esModule: true,
+    default: () => ({translate: (key: string) => key}),
+}));
+
+jest.mock('@src/CONFIG', () => ({
+    __esModule: true,
+    default: {...jest.requireActual<{default: Record<string, unknown>}>('@src/CONFIG').default, IS_USING_LOCAL_WEB: false},
+}));
+
+jest.mock('@components/SelectionList', () => jest.fn(() => null));
+jest.mock('@components/HeaderWithBackButton', () => jest.fn(() => null));
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {navigate: jest.fn(), goBack: jest.fn(), pop: jest.fn(), getActiveRoute: jest.fn(() => '/test-tools')},
+}));
+
+type RootState = ReturnType<NonNullable<typeof navigationRef.current>['getRootState']>;
+
+const mockGetRootState = jest.fn<RootState | undefined, []>();
+
+jest.mock('@libs/Navigation/navigationRef', () => ({
+    __esModule: true,
+    // The factory is hoisted above mockGetRootState's initialization, so it has to be read at call time
+    default: {current: {getRootState: () => mockGetRootState()}},
+}));
+jest.mock('@userActions/User', () => ({
+    setActiveServer: jest.fn(),
+    setIsDebugModeEnabled: jest.fn(),
+    setShouldShowBranchNameInTitle: jest.fn(),
+}));
+
+const getSelectionListProps = () => {
+    const props = jest.mocked(SelectionList).mock.calls.at(-1)?.at(0);
+    if (!props) {
+        throw new Error('SelectionList was never rendered');
+    }
+    return props;
+};
+
+const getConfirmButtonOptions = () => {
+    const confirmButtonOptions = getSelectionListProps().confirmButtonOptions;
+    if (!confirmButtonOptions) {
+        throw new Error('SelectionList was rendered without a confirm button');
+    }
+    return confirmButtonOptions;
+};
+
+const getListedServers = () => getSelectionListProps().data.map((item) => item.keyForList);
+
+const pressBack = () => {
+    const onBackButtonPress = jest.mocked(HeaderWithBackButton).mock.calls.at(-1)?.at(0)?.onBackButtonPress;
+    if (!onBackButtonPress) {
+        throw new Error('The header was rendered without an onBackButtonPress');
+    }
+    onBackButtonPress();
+};
+
+const pressSave = () => {
+    const {onConfirm} = getConfirmButtonOptions();
+    if (!onConfirm) {
+        throw new Error('The confirm button was rendered without an onConfirm');
+    }
+    onConfirm();
+};
+
+const ROOT_STATE_KEY = 'stack-root';
+
+const mockTestToolsModalState = (backTo?: string) => {
+    mockGetRootState.mockReturnValue(
+        createMock<RootState>({
+            key: ROOT_STATE_KEY,
+            routes: [
+                {
+                    name: NAVIGATORS.TEST_TOOLS_MODAL_NAVIGATOR,
+                    state: {routes: [{name: SCREENS.TEST_TOOLS_MODAL.ROOT, params: backTo ? {backTo} : undefined}]},
+                },
+            ],
+        }),
+    );
+};
+
+const mockReloadedServerPageState = (backTo: string) => {
+    mockGetRootState.mockReturnValue(
+        createMock<RootState>({
+            key: ROOT_STATE_KEY,
+            routes: [
+                {
+                    name: NAVIGATORS.TEST_TOOLS_MODAL_NAVIGATOR,
+                    state: {routes: [{name: SCREENS.TEST_TOOLS_MODAL.SERVER, params: {backTo}}]},
+                },
+            ],
+        }),
+    );
+};
+
+describe('Server selection', () => {
+    beforeEach(() => {
+        mockActiveServer = CONST.SERVER.PRODUCTION;
+        mockIsPinnedByEnvironment = false;
+        mockIsStagingIgnored = false;
+        mockIsQASelectable = true;
+        jest.clearAllMocks();
+        jest.mocked(isQAAuthConfigured).mockReturnValue(false);
+    });
+
+    describe('the server row in the test tools', () => {
+        it('shows the active server and opens the route it was given', () => {
+            mockActiveServer = CONST.SERVER.STAGING;
+            render(<TestToolMenu serverPageRoute={ROUTES.TEST_TOOLS_SERVER.getRoute(ROUTES.SETTINGS_TROUBLESHOOT)} />);
+
+            expect(screen.getByText('initialSettingsPage.troubleshoot.servers.staging.label')).toBeOnTheScreen();
+
+            fireEvent.press(screen.getByLabelText('initialSettingsPage.troubleshoot.server'));
+            expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.TEST_TOOLS_SERVER.getRoute(ROUTES.SETTINGS_TROUBLESHOOT));
+        });
+
+        it('no longer renders a staging toggle, so the server is only changed from the page', () => {
+            render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
+
+            expect(screen.getByLabelText('initialSettingsPage.troubleshoot.server')).toBeOnTheScreen();
+            expect(screen.queryByText('initialSettingsPage.troubleshoot.useStagingServer')).not.toBeOnTheScreen();
+        });
+
+        it('states the pinned server without offering the page, so a QA build cannot advertise a choice it ignores', () => {
+            mockActiveServer = CONST.SERVER.QA;
+            mockIsPinnedByEnvironment = true;
+            render(<TestToolMenu serverPageRoute={ROUTES.TEST_TOOLS_SERVER.getRoute()} />);
+
+            expect(screen.getByText('initialSettingsPage.troubleshoot.servers.qa.label')).toBeOnTheScreen();
+            expect(screen.queryByLabelText('initialSettingsPage.troubleshoot.server')).not.toBeOnTheScreen();
+            expect(Navigation.navigate).not.toHaveBeenCalled();
+        });
+    });
+
+    describe('the server selector', () => {
+        it('offers production and staging, with the active one selected', () => {
+            mockActiveServer = CONST.SERVER.STAGING;
+            render(<ServerSelector />);
+
+            expect(getListedServers()).toEqual([CONST.SERVER.PRODUCTION, CONST.SERVER.STAGING]);
+            expect(getSelectionListProps().data.find((item) => item.isSelected)?.keyForList).toBe(CONST.SERVER.STAGING);
+        });
+
+        it('keeps Save disabled until a different server is picked', () => {
+            render(<ServerSelector />);
+            expect(getConfirmButtonOptions().isDisabled).toBe(true);
+
+            act(() => getSelectionListProps().onSelectRow({keyForList: CONST.SERVER.STAGING}));
+
+            expect(getConfirmButtonOptions().isDisabled).toBe(false);
+        });
+
+        it('stores the picked server on Save and leaves the page, so the pick does not need a second press to dismiss', () => {
+            render(<ServerSelector />);
+            act(() => getSelectionListProps().onSelectRow({keyForList: CONST.SERVER.STAGING}));
+            pressSave();
+
+            expect(setActiveServer).toHaveBeenCalledWith(CONST.SERVER.STAGING);
+            expect(Navigation.goBack).toHaveBeenCalledWith(undefined, {compareParams: false});
+        });
+
+        it('drops the pick when the back caret is used, so only Save commits', () => {
+            render(<ServerSelector />);
+            act(() => getSelectionListProps().onSelectRow({keyForList: CONST.SERVER.STAGING}));
+            expect(getSelectionListProps().data.find((item) => item.isSelected)?.keyForList).toBe(CONST.SERVER.STAGING);
+
+            pressBack();
+
+            expect(setActiveServer).not.toHaveBeenCalled();
+            expect(Navigation.goBack).toHaveBeenCalledWith(undefined, {compareParams: false});
+        });
+
+        it('returns to the page it was given, carrying its params, so a reload does not strip them from the URL', () => {
+            const testToolsWithOrigin = ROUTES.TEST_TOOLS_MODAL.getRoute(ROUTES.SETTINGS_TROUBLESHOOT);
+            render(<ServerSelector backToRoute={testToolsWithOrigin} />);
+
+            pressBack();
+
+            expect(Navigation.goBack).toHaveBeenCalledWith(testToolsWithOrigin, {compareParams: false});
+        });
+
+        it('reports every server as fixed on a build that pins one, the pinned server included', () => {
+            mockActiveServer = CONST.SERVER.QA;
+            mockIsPinnedByEnvironment = true;
+            render(<ServerSelector />);
+
+            const {data, isDisabled, customListHeaderContent} = getSelectionListProps();
+            expect(getListedServers()).toEqual([CONST.SERVER.PRODUCTION, CONST.SERVER.STAGING, CONST.SERVER.QA]);
+            expect(isDisabled).toBe(true);
+            expect(data.find((item) => item.isSelected)?.keyForList).toBe(CONST.SERVER.QA);
+            expect(customListHeaderContent).toBeTruthy();
+            expect(getConfirmButtonOptions().showButton).toBe(false);
+        });
+
+        it('offers QA as a third option once its auth is configured', () => {
+            jest.mocked(isQAAuthConfigured).mockReturnValue(true);
+            render(<ServerSelector />);
+
+            expect(getListedServers()).toEqual([CONST.SERVER.PRODUCTION, CONST.SERVER.STAGING, CONST.SERVER.QA]);
+        });
+
+        it('hides QA where a stored QA would be ignored, so the list cannot offer a pick the resolver drops', () => {
+            mockIsQASelectable = false;
+            jest.mocked(isQAAuthConfigured).mockReturnValue(true);
+            render(<ServerSelector />);
+
+            expect(getListedServers()).toEqual([CONST.SERVER.PRODUCTION, CONST.SERVER.STAGING]);
+        });
+
+        it('drops staging where a stored staging is ignored, and still commits QA, which is not', () => {
+            mockIsStagingIgnored = true;
+            jest.mocked(isQAAuthConfigured).mockReturnValue(true);
+            render(<ServerSelector />);
+
+            expect(getListedServers()).toEqual([CONST.SERVER.PRODUCTION, CONST.SERVER.QA]);
+
+            act(() => getSelectionListProps().onSelectRow({keyForList: CONST.SERVER.QA}));
+            pressSave();
+
+            expect(setActiveServer).toHaveBeenCalledWith(CONST.SERVER.QA);
+        });
+    });
+
+    describe('dismissing the test tools modal', () => {
+        // toggleTestToolsModal is throttled at module scope, so each toggle needs the window advanced past
+        beforeEach(() => jest.useFakeTimers());
+        afterEach(() => jest.useRealTimers());
+
+        it('goes back to where the modal was opened from, and pops the whole modal when it was opened without a backTo', () => {
+            mockTestToolsModalState(ROUTES.SETTINGS_TROUBLESHOOT);
+            toggleTestToolsModal();
+            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_TROUBLESHOOT);
+            expect(Navigation.pop).not.toHaveBeenCalled();
+
+            jest.advanceTimersByTime(CONST.TIMING.TEST_TOOLS_MODAL_THROTTLE_TIME);
+
+            mockTestToolsModalState();
+            toggleTestToolsModal();
+            expect(Navigation.pop).toHaveBeenCalledWith(ROOT_STATE_KEY);
+            expect(Navigation.goBack).toHaveBeenCalledTimes(1);
+        });
+
+        it('still goes back to where the modal was opened from after a reload left only the server page', () => {
+            mockReloadedServerPageState(ROUTES.SETTINGS_TROUBLESHOOT);
+            toggleTestToolsModal();
+
+            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.SETTINGS_TROUBLESHOOT);
+            expect(Navigation.pop).not.toHaveBeenCalled();
+        });
+    });
+});
diff --git a/tests/ui/SessionTest.tsx b/tests/ui/SessionTest.tsx
index 48f936636152..e8fab6024baa 100644
--- a/tests/ui/SessionTest.tsx
+++ b/tests/ui/SessionTest.tsx
@@ -119,7 +119,7 @@ describe('Deep linking', () => {
                 },
                 [ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID]: 'randomID',
             });
-            return originalSignInWithShortLivedAuthToken(TEST_AUTH_TOKEN_1);
+            return originalSignInWithShortLivedAuthToken(TEST_AUTH_TOKEN_1, false, undefined, undefined);
         });
 
         // Set the keys the app needs to finish loading rather than going through
@@ -414,7 +414,7 @@ describe('signInWithShortLivedAuthToken', () => {
             }),
         );
 
-        Session.signInWithShortLivedAuthToken('token', true);
+        Session.signInWithShortLivedAuthToken('token', true, undefined, undefined);
         await waitForBatchedUpdates();
 
         let isAuthenticating: boolean | undefined;
diff --git a/tests/ui/ShareSubmitScanFieldsTest.tsx b/tests/ui/ShareSubmitScanFieldsTest.tsx
new file mode 100644
index 000000000000..c21466ed1865
--- /dev/null
+++ b/tests/ui/ShareSubmitScanFieldsTest.tsx
@@ -0,0 +1,240 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
+import HTMLEngineProvider from '@components/HTMLEngineProvider';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {clearMoneyRequestAmount, setMoneyRequestAmount} from '@libs/actions/IOU/MoneyRequest';
+
+import SubmitDetailsPage from '@pages/Share/SubmitDetailsPage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Report, Transaction} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createMock from '../utils/createMock';
+import {signInWithTestUser, translateLocal} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@rnmapbox/maps', () => ({default: jest.fn(), MarkerView: jest.fn(), setAccessToken: jest.fn()}));
+
+jest.mock('@libs/ReceiptStorage', () => ({
+    __esModule: true,
+    default: {
+        adopt: jest.fn((uriOrPath: string) => Promise.resolve(uriOrPath)),
+        toLocalUri: jest.fn((durableName: string) => durableName),
+        retain: jest.fn(),
+        resolve: jest.fn((source: string) => source),
+    },
+}));
+
+jest.mock('@pages/Share/ShareRootPage', () => ({showErrorAlert: jest.fn()}));
+jest.mock('@pages/Share/useShareFileSizeValidation', () => jest.fn());
+
+const SHARED_REPORT_ID = 'report-share-1';
+const PREVIOUS_REPORT_ID = 'report-share-0';
+const POLICY_ID = 'policy-1';
+const ACCOUNT_ID = 1;
+
+function getDraft(): Promise<OnyxEntry<Transaction>> {
+    return new Promise((resolve) => {
+        const connection = Onyx.connect({
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`,
+            callback: (value) => {
+                Onyx.disconnect(connection);
+                resolve(value);
+            },
+        });
+    });
+}
+
+/** Renders the share Submit confirmation with the real confirmation list and opens the fields behind "Show more". */
+async function renderShareConfirmationAndShowMore() {
+    render(
+        <OnyxListItemProvider>
+            <HTMLEngineProvider>
+                <CurrentUserPersonalDetailsProvider>
+                    <LocaleContextProvider>
+                        <SubmitDetailsPage
+                            route={{key: 'submit-details-test', name: SCREENS.SHARE.SUBMIT_DETAILS, params: {reportOrAccountID: SHARED_REPORT_ID}}}
+                            navigation={createMock<React.ComponentProps<typeof SubmitDetailsPage>['navigation']>({})}
+                        />
+                    </LocaleContextProvider>
+                </CurrentUserPersonalDetailsProvider>
+            </HTMLEngineProvider>
+        </OnyxListItemProvider>,
+    );
+    await waitForBatchedUpdatesWithAct();
+    fireEvent.press(await screen.findByText(translateLocal('common.showMore')));
+    await waitForBatchedUpdatesWithAct();
+}
+
+describe('SubmitDetailsPage — manually entered Scan fields', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS, evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS]});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+        await signInWithTestUser(ACCOUNT_ID, 'tester@example.com');
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${SHARED_REPORT_ID}`, {
+                reportID: SHARED_REPORT_ID,
+                chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
+                policyID: POLICY_ID,
+                ownerAccountID: ACCOUNT_ID,
+                type: CONST.REPORT.TYPE.CHAT,
+                isOwnPolicyExpenseChat: true,
+                participants: {[ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}},
+            } as Report);
+            await Onyx.merge(ONYXKEYS.SHARE_TEMP_FILE, {content: 'file://shared.jpg', mimeType: 'image/jpeg'});
+            await Onyx.merge(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT, new Date().toISOString());
+        });
+    });
+
+    it('reveals the amount, merchant and date fields behind "Show more", all empty', async () => {
+        // Given a receipt shared into the Submit flow
+        // When the confirmation opens and the user taps "Show more"
+        await renderShareConfirmationAndShowMore();
+
+        // Then the three fields the in-app Scan confirmation offers are here too, and all start empty because
+        // their values belong to the receipt until the user chooses to enter them.
+        expect(screen.getByLabelText(translateLocal('iou.amount'))).toHaveDisplayValue('');
+        expect(screen.getByLabelText(translateLocal('common.merchant'))).toHaveDisplayValue('');
+        expect(screen.getByLabelText(translateLocal('common.date'))).toHaveDisplayValue('');
+    });
+
+    it('persists an entered merchant and drops the "Automatic" label from all three fields', async () => {
+        // Given the revealed Scan fields, each labelled as SmartScan's to fill in
+        await renderShareConfirmationAndShowMore();
+        const automaticLabelCount = screen.getAllByText(translateLocal('common.automatic')).length;
+        expect(automaticLabelCount).toBeGreaterThanOrEqual(3);
+
+        // When the user enters a merchant
+        fireEvent.changeText(screen.getByLabelText(translateLocal('common.merchant')), 'Starbucks');
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it lands on the draft the share flow submits from, and the expense stops being a scanned one,
+        // so none of the three fields reads as automatic any more.
+        const draft = await getDraft();
+        expect(draft?.merchant).toBe('Starbucks');
+        expect(draft?.isMerchantSet).toBe(true);
+        expect(screen.queryAllByText(translateLocal('common.automatic'))).toHaveLength(automaticLabelCount - 3);
+    });
+
+    // The share flow re-seeds its draft from an effect that re-runs whenever late Onyx data lands, and
+    // `initMoneyRequest` rewrites `created` to today on every run. That reset was silently discarding the date the
+    // user had just picked, leaving the field empty and blocking Create expense on the all-or-nothing rule.
+    it('keeps a date the user picked when the policy arrives after they entered it', async () => {
+        // Given a user who has entered a merchant and picked a date on the shared receipt
+        await renderShareConfirmationAndShowMore();
+        fireEvent.changeText(screen.getByLabelText(translateLocal('common.merchant')), 'Starbucks');
+        await waitForBatchedUpdatesWithAct();
+        fireEvent(screen.getByLabelText(translateLocal('common.date')), 'onInputChange', '2026-01-15');
+        await waitForBatchedUpdatesWithAct();
+        expect(screen.getByLabelText(translateLocal('common.date'))).toHaveDisplayValue('2026-01-15');
+
+        // When the workspace policy resolves afterwards, re-running the draft-seeding effect
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {
+                id: POLICY_ID,
+                name: 'Workspace',
+                type: CONST.POLICY.TYPE.TEAM,
+                outputCurrency: 'USD',
+                role: CONST.POLICY.ROLE.ADMIN,
+            });
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the picked date is still there rather than being reset to today
+        const draft = await getDraft();
+        expect(draft?.created).toBe('2026-01-15');
+        expect(draft?.isCreatedSet).toBe(true);
+        expect(screen.getByLabelText(translateLocal('common.date'))).toHaveDisplayValue('2026-01-15');
+    });
+
+    it('re-seeds the destination on mount while keeping an already-entered merchant and currency', async () => {
+        // Given a leftover draft the user already typed a merchant and a non-policy currency into, still pointing at
+        // the chat they picked before backing out
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {
+                id: POLICY_ID,
+                name: 'Workspace',
+                type: CONST.POLICY.TYPE.TEAM,
+                outputCurrency: 'USD',
+                role: CONST.POLICY.ROLE.ADMIN,
+            });
+            await Onyx.merge<`${typeof ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${string}`>(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`, {
+                transactionID: CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
+                iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                reportID: PREVIOUS_REPORT_ID,
+                amount: 1000,
+                currency: 'EUR',
+                merchant: 'Starbucks',
+                isAmountSet: true,
+                isMerchantSet: true,
+            });
+        });
+
+        // When the Submit page mounts for the newly picked chat
+        await renderShareConfirmationAndShowMore();
+
+        // Then the draft follows the new destination, and neither the merchant nor the currency the user entered is
+        // overwritten by the policy's output currency.
+        const draft = await getDraft();
+        expect(draft?.reportID).toBe(SHARED_REPORT_ID);
+        expect(draft?.currency).toBe('EUR');
+        expect(draft?.merchant).toBe('Starbucks');
+    });
+
+    // Clearing the amount sets `isAmountSet` back to false while the picked currency stays on the draft, so the
+    // re-seeding effect used to stop feeding the currency back and swapped it for the policy's output currency —
+    // the currency changed under the user just because they deleted the amount they had typed.
+    it('keeps the currency the user picked when they clear the amount again', async () => {
+        // Given a user on the shared receipt who picked a currency other than their workspace's and typed an amount
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {
+                id: POLICY_ID,
+                name: 'Workspace',
+                type: CONST.POLICY.TYPE.TEAM,
+                outputCurrency: 'USD',
+                role: CONST.POLICY.ROLE.ADMIN,
+            });
+        });
+        await renderShareConfirmationAndShowMore();
+        // This is the write both the currency picker and the amount input make.
+        await act(async () => {
+            setMoneyRequestAmount(CONST.IOU.OPTIMISTIC_TRANSACTION_ID, 1000, 'EUR');
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // When they delete what they typed, so the amount goes back to being SmartScan's to fill in
+        await act(async () => {
+            clearMoneyRequestAmount(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the amount field is empty again but their currency survived instead of reverting to the policy's USD
+        expect(screen.getByLabelText(translateLocal('iou.amount'))).toHaveDisplayValue('');
+        const clearedDraft = await getDraft();
+        expect(clearedDraft?.isAmountSet).toBe(false);
+        expect(clearedDraft?.currency).toBe('EUR');
+
+        // And a later Onyx update re-running the seeding effect still can't take it back
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {name: 'Workspace renamed'});
+        });
+        await waitForBatchedUpdatesWithAct();
+        expect((await getDraft())?.currency).toBe('EUR');
+    });
+});
diff --git a/tests/ui/SpendRuleCardPageTest.tsx b/tests/ui/SpendRuleCardPageTest.tsx
index 347c223ac049..9c977438a523 100644
--- a/tests/ui/SpendRuleCardPageTest.tsx
+++ b/tests/ui/SpendRuleCardPageTest.tsx
@@ -46,7 +46,7 @@ jest.mock('@react-navigation/native', () => {
 
 jest.mock('@components/SelectionList', () => jest.fn(() => null));
 jest.mock('@components/SelectionList/ListItem/CardListItem', () => jest.fn(() => null));
-jest.mock('@components/HeaderWithBackButton', () => jest.fn(() => null));
+jest.mock('@components/Header/composed/HeaderWithBackButtonAndTitle', () => jest.fn(() => null));
 jest.mock('@components/BlockingViews/BlockingView', () => jest.fn(() => null));
 jest.mock('@components/FullscreenLoadingIndicator', () => jest.fn(() => null));
 jest.mock('@components/FormAlertWithSubmitButton', () => jest.fn(() => null));
diff --git a/tests/ui/SubmitDetailsPageTest.tsx b/tests/ui/SubmitDetailsPageTest.tsx
index c27f364ef3c9..ee6e7f80955e 100644
--- a/tests/ui/SubmitDetailsPageTest.tsx
+++ b/tests/ui/SubmitDetailsPageTest.tsx
@@ -71,6 +71,7 @@ jest.mock('@libs/ReceiptStorage', () => ({
     default: {
         adopt: jest.fn((uriOrPath: string) => Promise.resolve(uriOrPath)),
         toLocalUri: jest.fn((durableName: string) => durableName),
+        retain: jest.fn(),
         resolve: jest.fn((source: string) => source),
     },
 }));
@@ -164,18 +165,24 @@ jest.mock('@components/HeaderWithBackButton', () => {
     };
 });
 
+// The props the mocked confirmation list was last rendered with, so tests can assert what the page hands it without
+// pulling in the real form. The `mock` prefix is what lets the hoisted jest.mock factory reference it.
+let mockConfirmationListProps: Record<string, unknown> = {};
+
 // Mock the confirmation list down to a button that fires onConfirm — isolates the test from the form internals.
 jest.mock('@components/MoneyRequestConfirmationList', () => {
     const React2 = require('react');
     const {Pressable, Text} = require('react-native');
     return {
         __esModule: true,
-        default: ({onConfirm}: {onConfirm: (participants?: Array<{accountID: number; login: string}>) => void}) =>
-            React2.createElement(
+        default: (props: {onConfirm: (participants?: Array<{accountID: number; login: string}>) => void}) => {
+            mockConfirmationListProps = props;
+            return React2.createElement(
                 Pressable,
-                {testID: 'mock-confirm-button', onPress: () => onConfirm([{accountID: 2, login: 'participant@example.com'}])},
+                {testID: 'mock-confirm-button', onPress: () => props.onConfirm([{accountID: 2, login: 'participant@example.com'}])},
                 React2.createElement(Text, null, 'confirm'),
-            ),
+            );
+        },
     };
 });
 
@@ -269,6 +276,7 @@ describe('SubmitDetailsPage', () => {
 
     beforeEach(async () => {
         jest.clearAllMocks();
+        mockConfirmationListProps = {};
         const actualGetReportOrDraftReport = jest.requireActual<ReportUtilsActual>('@libs/ReportUtils').getReportOrDraftReport;
         jest.mocked(getReportOrDraftReport).mockImplementation(actualGetReportOrDraftReport);
         resetNavigationMocksForSubmitDetailsPageTests();
@@ -588,4 +596,56 @@ describe('SubmitDetailsPage', () => {
         // depending on how code handles the race — critical is no crash and proper cleanup
         expect(jest.mocked(cleanupAndNavigateAfterExpenseCreate).mock.calls.at(0)?.[0]).toBeDefined();
     });
+
+    // The share flow always creates a Scan expense, so it must offer the same manually entered amount / merchant /
+    // date the in-app Scan confirmation does. Hardcoding `shouldShowSmartScanFields={false}` hid all three (#101168).
+    it('reveals the amount, merchant and date fields on the shared Scan confirmation', async () => {
+        // Given a shared file seeded into the Submit flow
+        // When the confirmation list renders
+        renderSubmitDetailsPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it is told to show the three smart-scan fields and to allow entering them by hand
+        expect(mockConfirmationListProps.shouldShowSmartScanFields).toBe(true);
+        expect(mockConfirmationListProps.canEnterScanFieldsManually).toBe(true);
+    });
+
+    // The share flow builds its receipt by hand, so it has to derive the receipt state the way ReceiptFileValidator
+    // does. Without this, SmartScan would re-read the receipt and overwrite whatever the user typed.
+    it('submits a receipt in the open state when the user filled in amount, merchant and date themselves', async () => {
+        // Given a Scan draft whose three fields the user has all filled in
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`, {
+                iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                isAmountSet: true,
+                isMerchantSet: true,
+                isCreatedSet: true,
+            });
+        });
+
+        // When the expense is confirmed
+        await renderAndConfirm();
+
+        // Then the receipt is submitted as `open`, which keeps SmartScan from scanning over the entered values
+        const requestMoneyArg = jest.mocked(TrackExpense.requestMoney).mock.calls.at(0)?.[0];
+        expect(requestMoneyArg?.transactionParams?.receipt?.state).toBe(CONST.IOU.RECEIPT_STATE.OPEN);
+    });
+
+    it('submits a receipt in the scanready state when the user left one of the three fields to SmartScan', async () => {
+        // Given a Scan draft where only the amount and merchant were entered, so the date is still SmartScan's to read
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`, {
+                iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                isAmountSet: true,
+                isMerchantSet: true,
+            });
+        });
+
+        // When the expense is confirmed
+        await renderAndConfirm();
+
+        // Then the receipt is still submitted for scanning
+        const requestMoneyArg = jest.mocked(TrackExpense.requestMoney).mock.calls.at(0)?.[0];
+        expect(requestMoneyArg?.transactionParams?.receipt?.state).toBe(CONST.IOU.RECEIPT_STATE.SCAN_READY);
+    });
 });
diff --git a/tests/ui/SubscriptionCardSectionBannerTest.tsx b/tests/ui/SubscriptionCardSectionBannerTest.tsx
index 2534e462f44b..2b4db69b410e 100644
--- a/tests/ui/SubscriptionCardSectionBannerTest.tsx
+++ b/tests/ui/SubscriptionCardSectionBannerTest.tsx
@@ -44,8 +44,16 @@ jest.mock('@pages/settings/Subscription/CardSection/BillingBanner/SubscriptionEx
     const {Text: MockText} = jest.requireActual<typeof import('react-native')>('react-native');
     return () => <MockText>SubscriptionExpiringSoonBanner</MockText>;
 });
+jest.mock('@pages/settings/Subscription/CardSection/BillingBanner/EarlyRenewalBillingBanner', () => {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+    const {Text: MockText} = jest.requireActual<typeof import('react-native')>('react-native');
+    return () => <MockText>EarlyRenewalBillingBanner</MockText>;
+});
 jest.mock('@pages/settings/Subscription/CardSection/CardSectionDataEmpty', () => () => null);
 
+// Pin the campaign to its non-incentivized window so the offer's visibility depends only on eligibility
+jest.mock('@hooks/useEarlyRenewalPeriod', () => () => ({isNonIncentivizedPeriod: true, isIncentivizedPeriod: false}));
+
 function renderCardSection() {
     return render(
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
@@ -82,4 +90,24 @@ describe('CardSection billing banner', () => {
         expect(screen.getByText('SubscriptionExpiringSoonBanner')).toBeOnTheScreen();
         expect(screen.queryByText('PreTrialBillingBanner')).not.toBeOnTheScreen();
     });
+
+    it('shows the early renewal offer instead of the expiring soon banner when the owner can claim it', async () => {
+        // Given an annual subscriber whose subscription is expiring soon and who is eligible to renew early,
+        // since renewing early is what resolves the expiring subscription
+        await Onyx.merge(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION, {
+            type: CONST.SUBSCRIPTION.TYPE.ANNUAL,
+            autoRenew: false,
+            endDate: format(addDays(new Date(), 10), CONST.DATE.FNS_FORMAT_STRING),
+        });
+        await Onyx.set(ONYXKEYS.EARLY_RENEWAL_OFFER_ELIGIBILITY, {canClaim: true});
+        await waitForBatchedUpdatesWithAct();
+
+        // When the Subscription page card section renders
+        renderCardSection();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the owner sees the early renewal offer, not the expiring soon warning
+        expect(screen.getByText('EarlyRenewalBillingBanner')).toBeOnTheScreen();
+        expect(screen.queryByText('SubscriptionExpiringSoonBanner')).not.toBeOnTheScreen();
+    });
 });
diff --git a/tests/ui/TestToolMenuTest.tsx b/tests/ui/TestToolMenuTest.tsx
index 50ad542b8241..a108f1b29e5a 100644
--- a/tests/ui/TestToolMenuTest.tsx
+++ b/tests/ui/TestToolMenuTest.tsx
@@ -82,7 +82,14 @@ jest.mock('@libs/actions/MultifactorAuthentication', () => ({
 }));
 
 const mockProductionServer = CONST.SERVER.PRODUCTION;
+
+jest.mock('@hooks/useActiveServer', () => ({
+    __esModule: true,
+    default: () => ({activeServer: mockProductionServer, isPinnedByEnvironment: false, isStagingIgnored: false, isQASelectable: false}),
+}));
+
 jest.mock('@libs/ApiUtils', () => ({
+    ...jest.requireActual<Record<string, unknown>>('@libs/ApiUtils'),
     isQAServerActive: () => false,
     getActiveServer: () => mockProductionServer,
     getCommandURL: () => 'https://test-api.expensify.com/api/Ping?',
@@ -208,7 +215,7 @@ describe('TestToolMenu biometrics', () => {
     it('renders biometrics title with "Never registered" status', () => {
         setBiometricStatus({registrationStatus: REGISTRATION_STATUS.NEVER_REGISTERED});
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         screen.getByText(/troubleshootBiometricsStatus.*statusNeverRegistered/);
     });
@@ -220,7 +227,7 @@ describe('TestToolMenu biometrics', () => {
             registrationStatus: REGISTRATION_STATUS.REGISTERED_THIS_DEVICE,
         });
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         screen.getByText(/troubleshootBiometricsStatus.*statusRegisteredThisDevice/);
     });
@@ -231,7 +238,7 @@ describe('TestToolMenu biometrics', () => {
             registrationStatus: REGISTRATION_STATUS.REGISTERED_OTHER_DEVICE,
         });
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         screen.getByText(/troubleshootBiometricsStatus.*statusRegisteredOtherDevice/);
     });
@@ -239,7 +246,7 @@ describe('TestToolMenu biometrics', () => {
     it('renders biometrics title with "Not registered" status', () => {
         setBiometricStatus({registrationStatus: REGISTRATION_STATUS.NOT_REGISTERED});
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         screen.getByText(/troubleshootBiometricsStatus.*statusNotRegistered/);
     });
@@ -247,7 +254,7 @@ describe('TestToolMenu biometrics', () => {
     it('does not show the Revoke button when device is not registered', () => {
         setBiometricStatus({isCurrentDeviceRegistered: false});
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         expect(screen.queryByText('multifactorAuthentication.revoke.revoke')).toBeNull();
     });
@@ -259,7 +266,7 @@ describe('TestToolMenu biometrics', () => {
             registrationStatus: REGISTRATION_STATUS.REGISTERED_THIS_DEVICE,
         });
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         screen.getByText('multifactorAuthentication.revoke.revoke');
     });
@@ -271,7 +278,7 @@ describe('TestToolMenu biometrics', () => {
             registrationStatus: REGISTRATION_STATUS.REGISTERED_THIS_DEVICE,
         });
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         const revokeButton = screen.getByText('multifactorAuthentication.revoke.revoke');
         fireEvent.press(revokeButton);
@@ -282,7 +289,7 @@ describe('TestToolMenu biometrics', () => {
     it('always shows the Test button and invokes executeScenario with BIOMETRICS_TEST when pressed', () => {
         setBiometricStatus({registrationStatus: REGISTRATION_STATUS.NEVER_REGISTERED});
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         const testButton = screen.getByText('multifactorAuthentication.biometricsTest.test');
         fireEvent.press(testButton);
@@ -294,7 +301,7 @@ describe('TestToolMenu biometrics', () => {
         setBiometricStatus({registrationStatus: REGISTRATION_STATUS.NEVER_REGISTERED});
         mockGetActiveRoute.mockReturnValue(ROUTES.TEST_TOOLS_MODAL.route);
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         fireEvent.press(screen.getByText('multifactorAuthentication.biometricsTest.test'));
 
@@ -306,7 +313,7 @@ describe('TestToolMenu biometrics', () => {
         setBiometricStatus({registrationStatus: REGISTRATION_STATUS.NEVER_REGISTERED});
         mockGetActiveRoute.mockReturnValue(ROUTES.SETTINGS_TROUBLESHOOT);
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         fireEvent.press(screen.getByText('multifactorAuthentication.biometricsTest.test'));
 
@@ -318,7 +325,7 @@ describe('TestToolMenu biometrics', () => {
         mockIsAgentAccount = true;
         setBiometricStatus({registrationStatus: REGISTRATION_STATUS.NEVER_REGISTERED});
 
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         expect(screen.queryByText(/troubleshootBiometricsStatus/)).toBeNull();
         expect(screen.queryByText('multifactorAuthentication.biometricsTest.test')).toBeNull();
@@ -338,7 +345,7 @@ describe('TestToolMenu beta overrides', () => {
     it('renders the beta overrides row outside production', () => {
         // Given a build that is not production
         // When the menu is rendered
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         // Then the beta overrides row is offered
         screen.getByText('initialSettingsPage.troubleshoot.betaOverrides');
@@ -349,7 +356,7 @@ describe('TestToolMenu beta overrides', () => {
         mockIsProduction = true;
 
         // When the menu is rendered
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         // Then the beta overrides row is not offered
         expect(screen.queryByText('initialSettingsPage.troubleshoot.betaOverrides')).toBeNull();
@@ -358,7 +365,7 @@ describe('TestToolMenu beta overrides', () => {
     it('dismisses the Test Tools modal before opening the overrides page', () => {
         // Given The menu rendered inside the Test Tools modal
         mockGetActiveRoute.mockReturnValue(ROUTES.TEST_TOOLS_MODAL.route);
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         // When The row is pressed
         fireEvent.press(screen.getByText('common.view'));
@@ -371,7 +378,7 @@ describe('TestToolMenu beta overrides', () => {
     it('does not dismiss any modal when opened inline on the Troubleshoot page', () => {
         // Given The menu rendered inline on the Troubleshoot page
         mockGetActiveRoute.mockReturnValue(ROUTES.SETTINGS_TROUBLESHOOT);
-        render(<TestToolMenu />);
+        render(<TestToolMenu serverPageRoute={ROUTES.SETTINGS_TROUBLESHOOT_SERVER} />);
 
         // When The row is pressed
         fireEvent.press(screen.getByText('common.view'));
diff --git a/tests/ui/TotalCellTest.tsx b/tests/ui/TotalCellTest.tsx
new file mode 100644
index 000000000000..03e525652e5c
--- /dev/null
+++ b/tests/ui/TotalCellTest.tsx
@@ -0,0 +1,219 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+import TotalCell from '@components/TransactionItemRow/DataCells/TotalCell';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Transaction} from '@src/types/onyx';
+
+import type * as NativeNavigation from '@react-navigation/native';
+import type ReactNative from 'react-native';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomTransaction from '../utils/collections/transaction';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@libs/Navigation/Navigation');
+
+// The amount edit input (NumberWithSymbolForm) calls useIsFocused/useNavigation, which need a NavigationContainer
+// ancestor we don't render here. Matches the mock pattern in NumberWithSymbolFormTest.tsx.
+jest.mock('@react-navigation/native', () => ({
+    ...jest.requireActual<typeof NativeNavigation>('@react-navigation/native'),
+    useNavigation: jest.fn(() => ({
+        navigate: jest.fn(),
+        addListener: jest.fn(() => jest.fn()),
+    })),
+    useIsFocused: () => true,
+    useRoute: jest.fn(() => ({key: '', name: '', params: {}})),
+}));
+jest.mock('@hooks/useCurrencyList', () => ({
+    useCurrencyListActions: () => ({
+        convertToDisplayString: (amount?: number, currency?: string) => `${currency === 'USD' ? '$' : `${currency ?? 'USD'} `}${((amount ?? 0) / 100).toFixed(2)}`,
+        getCurrencyDecimals: () => 2,
+        getCurrencySymbol: () => '$',
+    }),
+}));
+
+// Forces the cell into the "wide/editable" layout branch, which jsdom's default viewport doesn't naturally satisfy.
+jest.mock('@hooks/useResponsiveLayoutOnWideRHP', () => ({
+    __esModule: true,
+    default: () => ({isLargeScreenWidth: true, shouldUseNarrowLayout: false, isInNarrowPaneModal: false}),
+}));
+
+// EditableCell only shows/enables the edit-pencil button while the cell is hovered (isCellHovered from Hoverable),
+// which jsdom can't simulate reliably. Force it hovered so the wrapping View's pointerEvents isn't "none". RNTL
+// v13's fireEvent.press respects pointerEvents and silently no-ops when a "none" ancestor blocks the target.
+jest.mock('@components/Hoverable', () => ({
+    __esModule: true,
+    default: ({children}: {children: ((isHovered: boolean) => React.ReactNode) | React.ReactNode}) => (typeof children === 'function' ? children(true) : children),
+}));
+
+// Mirrors the mock pattern used in AgentsTableRowTest.tsx to make the pencil button directly pressable.
+jest.mock('@components/Pressable/PressableWithFeedback', () => {
+    const {TouchableOpacity} = jest.requireActual<typeof ReactNative>('react-native');
+    function mockPressableWithFeedback({
+        children,
+        onPress,
+        accessibilityLabel,
+    }: {
+        children: React.ReactNode | ((state: {hovered: boolean; pressed: boolean}) => React.ReactNode);
+        onPress: () => void;
+        accessibilityLabel?: string;
+    }) {
+        const content = typeof children === 'function' ? children({hovered: false, pressed: false}) : children;
+        return (
+            <TouchableOpacity
+                testID="mock-edit-button"
+                onPress={onPress}
+                accessibilityLabel={accessibilityLabel}
+            >
+                {content}
+            </TouchableOpacity>
+        );
+    }
+    return {__esModule: true, default: mockPressableWithFeedback};
+});
+
+const MOCK_TRANSACTION_ID = '1';
+
+const createBaseTransaction = (overrides: Partial<Transaction> = {}): Transaction => ({
+    ...createRandomTransaction(1),
+    transactionID: MOCK_TRANSACTION_ID,
+    currency: CONST.CURRENCY.USD,
+    modifiedAmount: undefined,
+    ...overrides,
+});
+
+const renderTotalCell = (transactionItem: Transaction) => {
+    return render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+            <TotalCell
+                transactionItem={transactionItem}
+                shouldShowTooltip={false}
+                canEdit
+                onSave={jest.fn()}
+            />
+        </ComposeProviders>,
+    );
+};
+
+describe('TotalCell', () => {
+    beforeAll(async () => {
+        Onyx.init({keys: ONYXKEYS});
+        await Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.DEFAULT);
+        return waitForBatchedUpdates();
+    });
+
+    it('blanks the amount for a failed-scan amount placeholder', async () => {
+        const mockTransaction = createBaseTransaction({
+            amount: 0,
+            iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+            receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+        });
+
+        renderTotalCell(mockTransaction);
+        await waitForBatchedUpdates();
+
+        expect(screen.queryByText('$0.00')).not.toBeOnTheScreen();
+    });
+
+    it('shows the formatted amount for a normal transaction', async () => {
+        const mockTransaction = createBaseTransaction({
+            amount: 1000,
+            iouRequestType: CONST.IOU.REQUEST_TYPE.MANUAL,
+        });
+
+        renderTotalCell(mockTransaction);
+        await waitForBatchedUpdates();
+
+        expect(screen.getByText('$10.00')).toBeOnTheScreen();
+    });
+
+    it('does not blank a legitimate manual $0.00 amount', async () => {
+        const mockTransaction = createBaseTransaction({
+            amount: 0,
+            iouRequestType: CONST.IOU.REQUEST_TYPE.MANUAL,
+        });
+
+        renderTotalCell(mockTransaction);
+        await waitForBatchedUpdates();
+
+        expect(screen.getByText('$0.00')).toBeOnTheScreen();
+    });
+
+    it('does not blank the amount once the failed-scan placeholder amount is confirmed', async () => {
+        const mockTransaction = createBaseTransaction({
+            amount: 0,
+            modifiedAmount: 0,
+            iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+            receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+        });
+
+        renderTotalCell(mockTransaction);
+        await waitForBatchedUpdates();
+
+        expect(screen.getByText('$0.00')).toBeOnTheScreen();
+    });
+
+    it('saves when the user types 0 to confirm a failed-scan placeholder amount', async () => {
+        const onSave = jest.fn();
+        const mockTransaction = createBaseTransaction({
+            amount: 0,
+            iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+            receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+        });
+
+        render(
+            <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+                <TotalCell
+                    transactionItem={mockTransaction}
+                    shouldShowTooltip={false}
+                    canEdit
+                    onSave={onSave}
+                />
+            </ComposeProviders>,
+        );
+        await waitForBatchedUpdates();
+
+        fireEvent.press(await screen.findByTestId('mock-edit-button'));
+        const input = await screen.findByLabelText('Amount (USD)');
+
+        fireEvent.changeText(input, '0');
+        fireEvent(input, 'blur');
+
+        expect(onSave).toHaveBeenCalledWith(0);
+    });
+
+    it('does not save when the cell is opened and blurred without typing', async () => {
+        const onSave = jest.fn();
+        const mockTransaction = createBaseTransaction({
+            amount: 0,
+            iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+            receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+        });
+
+        render(
+            <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+                <TotalCell
+                    transactionItem={mockTransaction}
+                    shouldShowTooltip={false}
+                    canEdit
+                    onSave={onSave}
+                />
+            </ComposeProviders>,
+        );
+        await waitForBatchedUpdates();
+
+        fireEvent.press(await screen.findByTestId('mock-edit-button'));
+        const input = await screen.findByLabelText('Amount (USD)');
+
+        fireEvent(input, 'blur');
+
+        expect(onSave).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/ui/WeekListItemHeaderTest.tsx b/tests/ui/WeekListItemHeaderTest.tsx
index 41824f649236..85eba37f157a 100644
--- a/tests/ui/WeekListItemHeaderTest.tsx
+++ b/tests/ui/WeekListItemHeaderTest.tsx
@@ -57,6 +57,9 @@ const mockSearchActionsContext = {
     setLastSearchType: jest.fn(),
     setCurrentSelectedTransactionReportID: jest.fn(),
     setSelectedTransactions: jest.fn(),
+    getSelectedTransactions: jest.fn(() => ({})),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: jest.fn(),
     setSelectedReports: jest.fn(),
     removeTransaction: jest.fn(),
diff --git a/tests/ui/WorkArrangementPageTest.tsx b/tests/ui/WorkArrangementPageTest.tsx
new file mode 100644
index 000000000000..f88756cdc58f
--- /dev/null
+++ b/tests/ui/WorkArrangementPageTest.tsx
@@ -0,0 +1,120 @@
+import {act, render} from '@testing-library/react-native';
+
+import SelectionList from '@components/SelectionList';
+
+import {setEmployeeWorkArrangement} from '@libs/actions/Policy/DistanceRate';
+import Navigation from '@libs/Navigation/Navigation';
+import {canMemberWrite} from '@libs/PolicyUtils';
+
+import WorkArrangementPage from '@pages/workspace/members/WorkArrangementPage';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {PersonalDetailsList, Policy} from '@src/types/onyx';
+
+import type React from 'react';
+import type {PropsWithChildren} from 'react';
+
+import createMock from '../utils/createMock';
+
+jest.mock('@components/HeaderWithBackButton', () => jest.fn(() => null));
+jest.mock('@components/ScreenWrapper', () => jest.fn(({children}: PropsWithChildren) => children));
+jest.mock('@components/SelectionList', () => jest.fn(() => null));
+jest.mock('@components/SelectionList/ListItem/SingleSelectListItem', () => jest.fn(() => null));
+jest.mock('@components/Text', () => jest.fn(() => null));
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => jest.fn(() => ({login: 'admin@example.com'})));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+jest.mock('@hooks/usePermissions', () => jest.fn(() => ({isBetaEnabled: () => true})));
+jest.mock('@hooks/useThemeStyles', () => jest.fn(() => new Proxy({}, {get: () => ({})})));
+jest.mock('@libs/Navigation/Navigation', () => ({goBack: jest.fn()}));
+jest.mock('@libs/actions/Policy/DistanceRate', () => ({setEmployeeWorkArrangement: jest.fn()}));
+jest.mock('@libs/PolicyUtils', () => ({
+    canMemberWrite: jest.fn(() => true),
+    isMemberInHomeAndOfficeWorkspace: jest.fn(() => true),
+}));
+jest.mock('@pages/workspace/AccessOrNotFoundWrapper', () => ({__esModule: true, default: ({children}: PropsWithChildren) => children}));
+jest.mock('@pages/workspace/withPolicyAndFullscreenLoading', () => (Component: React.ComponentType) => Component);
+
+type MockWorkArrangementOption = {value: boolean};
+
+type MockSelectionListProps = {
+    data: MockWorkArrangementOption[];
+    onSelectRow?: (item: MockWorkArrangementOption) => void;
+};
+
+type WorkArrangementPageTestProps = React.ComponentProps<typeof WorkArrangementPage> & {policy: Policy; personalDetails: PersonalDetailsList};
+
+describe('WorkArrangementPage', () => {
+    const policyID = 'policy123';
+    const accountID = 12345;
+    const memberLogin = 'member@example.com';
+    const personalDetails = {[accountID]: {login: memberLogin}};
+    const policy = {
+        id: policyID,
+        employeeList: {[memberLogin]: {email: memberLogin}},
+        commuterExclusions: {method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE, isOfficeWorkArrangement: false},
+    };
+    const mockedSelectionList = jest.mocked(SelectionList);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- narrows props captured from the mocked SelectionList
+    const getSelectionListProps = () => mockedSelectionList.mock.lastCall?.[0] as MockSelectionListProps | undefined;
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.mocked(canMemberWrite).mockReturnValue(true);
+    });
+
+    const renderPage = () => {
+        const props = createMock<WorkArrangementPageTestProps>({
+            policy: createMock<Policy>(policy),
+            personalDetails,
+            route: {params: {policyID, accountID: String(accountID)}},
+        });
+        // The HOC mock exposes the wrapped screen directly, which accepts the policy prop that the production HOC normally injects.
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the test HOC mock returns the unwrapped component with its injected policy props restored
+        const UnwrappedWorkArrangementPage = WorkArrangementPage as React.ComponentType<WorkArrangementPageTestProps>;
+        return render(<UnwrappedWorkArrangementPage {...props} />);
+    };
+
+    it('does nothing when the selected arrangement is already active', () => {
+        // Given the workspace default is no regular workspace
+        renderPage();
+
+        // When the user selects that already active arrangement
+        act(() => {
+            getSelectionListProps()?.onSelectRow?.({value: false});
+        });
+
+        // Then the action is not sent and the page stays open
+        expect(setEmployeeWorkArrangement).not.toHaveBeenCalled();
+        expect(Navigation.goBack).not.toHaveBeenCalled();
+    });
+
+    it('does nothing when the current user cannot access the work arrangement page', () => {
+        // Given the user lacks write access to workspace members
+        jest.mocked(canMemberWrite).mockReturnValue(false);
+        renderPage();
+
+        // When they try to select another arrangement
+        act(() => {
+            getSelectionListProps()?.onSelectRow?.({value: true});
+        });
+
+        // Then no update or navigation occurs
+        expect(setEmployeeWorkArrangement).not.toHaveBeenCalled();
+        expect(Navigation.goBack).not.toHaveBeenCalled();
+    });
+
+    it('updates the arrangement and returns to member details when a different option is selected', () => {
+        // Given the page is open for a member whose current arrangement is no regular workspace
+        renderPage();
+
+        // When the user selects office-based
+        act(() => {
+            getSelectionListProps()?.onSelectRow?.({value: true});
+        });
+
+        // Then the update is requested and the member details page is shown
+        expect(setEmployeeWorkArrangement).toHaveBeenCalledWith(policy, [accountID], true, personalDetails, expect.any(Function));
+        expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
+    });
+});
diff --git a/tests/ui/WorkEmailOnboarding.tsx b/tests/ui/WorkEmailOnboarding.tsx
index 338c2eff7ffe..4628f9e34eea 100644
--- a/tests/ui/WorkEmailOnboarding.tsx
+++ b/tests/ui/WorkEmailOnboarding.tsx
@@ -418,7 +418,7 @@ describe('OnboardingWorkEmail Page', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute());
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute(), {forceReplace: true});
         });
 
         unmount();
@@ -539,7 +539,7 @@ describe('OnboardingWorkEmail Page', () => {
         await waitForBatchedUpdatesWithAct();
 
         await waitFor(() => {
-            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute());
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_WORK_EMAIL_VALIDATION.getRoute(), {forceReplace: true});
         });
 
         unmount();
@@ -693,6 +693,121 @@ describe('OnboardingWorkEmail Page', () => {
         unmount();
         await waitForBatchedUpdatesWithAct();
     });
+
+    it('should move on to Onboarding private domain without an error or a new request when the prefilled work email is already the account login', async () => {
+        await TestHelper.signInWithTestUser();
+
+        // Given the state after an unvalidated public-domain user added a work email and went back from the private domain screen:
+        // AddWorkEmail made the work email the account's login, going back cleared shouldValidate, and the form still holds the email
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.SESSION, {email: workEmail});
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {onboardingWorkEmail: workEmail});
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM_DRAFT, {onboardingWorkEmail: workEmail});
+        });
+        const xhrSpy = jest.spyOn(HttpUtils, 'xhr');
+
+        const {unmount} = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, undefined);
+        await waitForBatchedUpdatesWithAct();
+        expect(screen.getByDisplayValue(workEmail)).toBeOnTheScreen();
+
+        // When the user submits the prefilled email again
+        fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')}));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the email is not rejected as the signup email, it is not sent again (the backend would treat the account's own login as an account to merge),
+        // and the user moves on to the private domain screen just like after the first submit
+        await waitFor(() => {
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PRIVATE_DOMAIN.getRoute(), {forceReplace: true});
+        });
+        expect(screen.queryByText(TestHelper.translateLocal('onboarding.workEmailValidationError.sameAsSignupEmail'))).not.toBeOnTheScreen();
+        expect(xhrSpy.mock.calls.filter(([command]) => command === 'AddWorkEmail')).toHaveLength(0);
+
+        xhrSpy.mockRestore();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should still send AddWorkEmail when a different work email is entered after the account login was switched to a work email', async () => {
+        await TestHelper.signInWithTestUser();
+
+        // Given an account whose login was already switched to a work email by an earlier AddWorkEmail
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.SESSION, {email: workEmail});
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+        });
+        const xhrSpy = jest.spyOn(HttpUtils, 'xhr').mockImplementation(() => {
+            const mockedResponse: OnyxResponse<typeof ONYXKEYS.NVP_ONBOARDING> = {
+                jsonCode: 200,
+                onyxData: [{onyxMethod: Onyx.METHOD.MERGE, key: ONYXKEYS.NVP_ONBOARDING, value: {shouldValidate: false}}],
+            };
+            return Promise.resolve(mockedResponse);
+        });
+
+        const {unmount} = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, undefined);
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user enters a different work email and submits it
+        fireEvent.changeText(screen.getByLabelText(TestHelper.translateLocal('common.workEmail')), 'anotherworkemail@privateEmail.com');
+        await waitForBatchedUpdatesWithAct();
+        fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')}));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the new email is sent to the backend, because only the email that is already the account's login skips the request
+        await waitFor(() => {
+            expect(xhrSpy.mock.calls.filter(([command]) => command === 'AddWorkEmail')).toHaveLength(1);
+        });
+        await waitFor(() => {
+            expect(navigate).toHaveBeenCalledWith(ROUTES.ONBOARDING_PRIVATE_DOMAIN.getRoute(), {forceReplace: true});
+        });
+
+        xhrSpy.mockRestore();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should reject the public signup email with the signup email message and other public emails with the public domain message', async () => {
+        const publicSignupEmail = 'testsignup@gmail.com';
+        await TestHelper.signInWithTestUser();
+
+        // Given an unvalidated user who signed up with a public-domain email and hasn't added a work email yet
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.SESSION, {email: publicSignupEmail});
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+        });
+        const xhrSpy = jest.spyOn(HttpUtils, 'xhr');
+
+        const {unmount} = renderOnboardingWorkEmailPage(SCREENS.ONBOARDING.WORK_EMAIL, undefined);
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user submits their signup email as the work email
+        fireEvent.changeText(screen.getByLabelText(TestHelper.translateLocal('common.workEmail')), publicSignupEmail);
+        await waitForBatchedUpdatesWithAct();
+        fireEvent.press(screen.getByRole('button', {name: TestHelper.translateLocal('onboarding.workEmail.addWorkEmail')}));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it is rejected with the message that points at the signup email
+        await waitFor(() => {
+            expect(screen.getByText(TestHelper.translateLocal('onboarding.workEmailValidationError.sameAsSignupEmail'))).toBeOnTheScreen();
+        });
+
+        // When the user changes it to a different public-domain email
+        fireEvent.changeText(screen.getByLabelText(TestHelper.translateLocal('common.workEmail')), 'someoneelse@gmail.com');
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it is rejected with the public domain message, and neither email was sent to the backend
+        await waitFor(() => {
+            expect(screen.getByText(TestHelper.translateLocal('onboarding.workEmailValidationError.publicEmail'))).toBeOnTheScreen();
+        });
+        expect(xhrSpy.mock.calls.filter(([command]) => command === 'AddWorkEmail')).toHaveLength(0);
+
+        xhrSpy.mockRestore();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
 });
 
 describe('OnboardingWorkEmailValidation Page', () => {
@@ -859,6 +974,62 @@ describe('OnboardingWorkEmailValidation Page', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
+    it('should ignore the header back button while the magic code is being submitted', async () => {
+        const goBack = jest.spyOn(Navigation, 'goBack').mockImplementation(() => {});
+
+        // Given the validation screen with a merge request in flight. The request cannot be cancelled, so leaving now
+        // would let the work email screen consume its success and skip "Join a workspace".
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: true, loadingForm: CONST.FORMS.VALIDATE_CODE_FORM});
+        });
+
+        const {unmount} = renderOnboardingWorkEmailValidationPage(SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION, undefined);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // When the header back button is pressed
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the user stays on validation and `shouldValidate` is untouched, so the merge response routes as normal
+        expect(goBack).not.toHaveBeenCalled();
+        let shouldValidateWhileSubmitting: boolean | undefined;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.NVP_ONBOARDING,
+            callback: (value) => {
+                shouldValidateWhileSubmitting = value?.shouldValidate;
+            },
+        });
+        expect(shouldValidateWhileSubmitting).toBe(true);
+
+        // When the request settles and the header back button is pressed again
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
+        });
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then it goes back to the work email screen, so the first press was blocked by the submit guard alone
+        await waitFor(() => {
+            expect(goBack).toHaveBeenCalledWith(ROUTES.ONBOARDING_WORK_EMAIL.getRoute());
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+        goBack.mockRestore();
+    });
+
     it('should redirect to classic when merging is completed and shouldRedirectToClassicAfterMerge is returned as `true` by the API', async () => {
         await TestHelper.signInWithTestUser();
 
diff --git a/tests/ui/WorkEmailOnboardingNativeBack.tsx b/tests/ui/WorkEmailOnboardingNativeBack.tsx
new file mode 100644
index 000000000000..68464ebcdc7a
--- /dev/null
+++ b/tests/ui/WorkEmailOnboardingNativeBack.tsx
@@ -0,0 +1,325 @@
+import {act, render, waitFor} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import HTMLEngineProvider from '@components/HTMLEngineProvider';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
+import * as useResponsiveLayoutModule from '@hooks/useResponsiveLayout';
+import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
+
+import navigationRef from '@libs/Navigation/navigationRef';
+import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
+import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
+
+import OnboardingWorkEmail from '@pages/OnboardingWorkEmail/index.native';
+import OnboardingWorkEmailValidation from '@pages/OnboardingWorkEmailValidation/index.native';
+import OnboardingWorkspaces from '@pages/OnboardingWorkspaces/index.native';
+
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Onboarding} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+import type {HardwareBackPressEvent} from 'react-native/Libraries/Utilities/BackHandler';
+
+import {PortalProvider} from '@gorhom/portal';
+import {NavigationContainer} from '@react-navigation/native';
+import React from 'react';
+import {BackHandler, View} from 'react-native';
+import Onyx from 'react-native-onyx';
+
+import createMock from '../utils/createMock';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@rnmapbox/maps', () => {
+    return {
+        default: jest.fn(),
+        MarkerView: jest.fn(),
+        setAccessToken: jest.fn(),
+    };
+});
+
+// Jest resolves the platform-neutral no-op variant, so use the Android one that actually registers the handler.
+jest.mock('@hooks/useAndroidBackButtonHandler', () => jest.requireActual<Record<string, unknown>>('@hooks/useAndroidBackButtonHandler/index.android'));
+
+TestHelper.setupGlobalFetchMock();
+
+const RootStack = createPlatformStackNavigator<{[NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR]: undefined}>();
+const OnboardingStack = createPlatformStackNavigator<OnboardingModalNavigatorParamList>();
+
+const workEmail = 'testprivateemail@privateEmail.com';
+const mockHardwareBackPressEvent: HardwareBackPressEvent = {type: 'hardwareBackPress', timeStamp: 0};
+
+// Stands in for whatever screen precedes a later visit to "Join a workspace"; only its presence on the stack matters.
+function OnboardingPersonalDetailsStub() {
+    return <View testID="onboarding-personal-details-stub" />;
+}
+
+// The native (`index.native.tsx`) screens are imported directly: only those register the hardware back handler under
+// test, and Jest resolves the web `index.tsx` for a bare `@pages/...` import.
+function OnboardingModalNavigator() {
+    return (
+        <OnboardingStack.Navigator screenOptions={{headerShown: false}}>
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORK_EMAIL}
+                component={OnboardingWorkEmail}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION}
+                component={OnboardingWorkEmailValidation}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
+                component={OnboardingPersonalDetailsStub}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORKSPACES}
+                component={OnboardingWorkspaces}
+            />
+        </OnboardingStack.Navigator>
+    );
+}
+
+function HTMLProviderWrapper({children}: {children: React.ReactNode}) {
+    return <HTMLEngineProvider>{children}</HTMLEngineProvider>;
+}
+
+/** Renders the onboarding screens behind a real `navigationRef`, so the back press acts on an actual navigation state. */
+function renderOnboardingStack(initialRouteNames: Array<keyof OnboardingModalNavigatorParamList>) {
+    return render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
+            <PortalProvider>
+                <NavigationContainer
+                    ref={navigationRef}
+                    initialState={{
+                        index: 0,
+                        routes: [
+                            {
+                                name: NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR,
+                                state: {
+                                    index: initialRouteNames.length - 1,
+                                    routes: initialRouteNames.map((name) => ({name})),
+                                },
+                            },
+                        ],
+                    }}
+                >
+                    <RootStack.Navigator screenOptions={{headerShown: false}}>
+                        <RootStack.Screen
+                            name={NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR}
+                            component={OnboardingModalNavigator}
+                        />
+                    </RootStack.Navigator>
+                </NavigationContainer>
+            </PortalProvider>
+        </ComposeProviders>,
+        {wrapper: HTMLProviderWrapper},
+    );
+}
+
+function getOnboardingRouteNames() {
+    const rootState = navigationRef.getRootState();
+    return rootState?.routes.at(0)?.state?.routes.map((route) => route.name) ?? [];
+}
+
+async function getOnboardingValues() {
+    let onboardingValues: OnyxEntry<Onboarding>;
+    await TestHelper.getOnyxData({
+        key: ONYXKEYS.NVP_ONBOARDING,
+        callback: (value) => {
+            onboardingValues = value;
+        },
+    });
+    return onboardingValues;
+}
+
+describe('Onboarding work email validation (Android system back)', () => {
+    let backHandlerSpy: jest.SpyInstance;
+    const hardwareBackHandlers: Array<(event: HardwareBackPressEvent) => boolean | null | undefined> = [];
+
+    /**
+     * React Native calls `hardwareBackPress` subscribers newest first and stops at the first one that returns true, so
+     * this does the same. NavigationContainer subscribes too (it pops the stack when it can go back), and asserting
+     * against a single captured handler would only ever test whichever one happened to subscribe last.
+     */
+    const pressHardwareBack = (): boolean => {
+        let consumed = false;
+        act(() => {
+            consumed = [...hardwareBackHandlers].reverse().some((handler) => handler(mockHardwareBackPressEvent) === true);
+        });
+        return consumed;
+    };
+
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+        return IntlStore.load(CONST.LOCALES.EN);
+    });
+
+    beforeEach(() => {
+        hardwareBackHandlers.length = 0;
+        backHandlerSpy = jest.spyOn(BackHandler, 'addEventListener').mockImplementation((event, handler) => {
+            hardwareBackHandlers.push(handler);
+            return {
+                remove: () => {
+                    const index = hardwareBackHandlers.indexOf(handler);
+                    if (index < 0) {
+                        return;
+                    }
+                    hardwareBackHandlers.splice(index, 1);
+                },
+            };
+        });
+        jest.spyOn(useResponsiveLayoutModule, 'default').mockReturnValue(
+            createMock<ResponsiveLayoutResult>({
+                isSmallScreenWidth: false,
+                shouldUseNarrowLayout: false,
+            }),
+        );
+    });
+
+    afterEach(async () => {
+        backHandlerSpy.mockRestore();
+        await act(async () => {
+            await Onyx.clear();
+        });
+        jest.clearAllMocks();
+    });
+
+    it('should clear shouldValidate and return to the work email screen on a system back press', async () => {
+        // Given the stack BaseOnboardingWorkEmail leaves behind once it force-replaces itself: validation is the only
+        // route, so an unhandled system back would escape the onboarding modal entirely.
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+            // Keeps both screens' navigate-away effects from firing, so the only navigation under test is the back press.
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false});
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+        expect((await getOnboardingValues())?.shouldValidate).toBe(true);
+
+        // When Android's system back button is pressed
+        const consumed = pressHardwareBack();
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the press is handled here rather than bubbling to the parent stack and popping the onboarding modal
+        expect(consumed).toBe(true);
+
+        // Then it runs the same fallback as the header back button and lands on the work email screen
+        await waitFor(() => {
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL]);
+        });
+
+        // Then `shouldValidate` is cleared, otherwise validation reopens as soon as onboarding resumes
+        expect((await getOnboardingValues())?.shouldValidate).toBeUndefined();
+    });
+
+    it('should ignore a system back press while the magic code is being submitted', async () => {
+        // Given the validation screen with a merge request in flight. The request cannot be cancelled, so leaving now
+        // would let the work email screen consume its success and skip "Join a workspace".
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isLoading: true, loadingForm: CONST.FORMS.VALIDATE_CODE_FORM});
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // When Android's system back button is pressed
+        const consumed = pressHardwareBack();
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the press is consumed so it cannot pop the onboarding modal either
+        expect(consumed).toBe(true);
+
+        // Then the user stays on validation and `shouldValidate` is untouched, so the merge response routes as normal
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+        expect((await getOnboardingValues())?.shouldValidate).toBe(true);
+    });
+
+    it('should swallow a system back press on the post-merge Join a workspace screen', async () => {
+        // Given the stack the merge leaves behind: "Join a workspace" is the only onboarding route, so an unhandled
+        // system back would bubble to the root stack and pop the whole onboarding modal mid-flow
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                isMergeAccountStepCompleted: true,
+                isMergeAccountStepSkipped: false,
+            });
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.WORKSPACES]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORKSPACES]);
+
+        // When Android's system back button is pressed
+        const consumed = pressHardwareBack();
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the press is consumed and the user stays in onboarding, matching the hidden header back button
+        expect(consumed).toBe(true);
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORKSPACES]);
+    });
+
+    it('should let a system back press through on a later visit to Join a workspace', async () => {
+        // Given the same merge flags but a real screen behind this one, which is the state a later visit leaves
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                isMergeAccountStepCompleted: true,
+                isMergeAccountStepSkipped: false,
+            });
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.PERSONAL_DETAILS, SCREENS.ONBOARDING.WORKSPACES]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // When Android's system back button is pressed
+        pressHardwareBack();
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then no handler swallows it and the onboarding stack pops as normal
+        await waitFor(() => {
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
+        });
+    });
+});
diff --git a/tests/ui/WorkEmailOnboardingNavigation.tsx b/tests/ui/WorkEmailOnboardingNavigation.tsx
new file mode 100644
index 000000000000..9f5097b61342
--- /dev/null
+++ b/tests/ui/WorkEmailOnboardingNavigation.tsx
@@ -0,0 +1,349 @@
+import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import HTMLEngineProvider from '@components/HTMLEngineProvider';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
+import * as useResponsiveLayoutModule from '@hooks/useResponsiveLayout';
+import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
+
+import {AddWorkEmail, MergeIntoAccountAndLogin} from '@libs/actions/Session';
+import HttpUtils from '@libs/HttpUtils';
+import navigationRef from '@libs/Navigation/navigationRef';
+import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
+import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
+
+import OnboardingWorkEmail from '@pages/OnboardingWorkEmail';
+import OnboardingWorkEmailValidation from '@pages/OnboardingWorkEmailValidation';
+import OnboardingWorkspaces from '@pages/OnboardingWorkspaces';
+
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Onboarding, Response as OnyxResponse} from '@src/types/onyx';
+
+import type {OnyxEntry} from 'react-native-onyx';
+
+import {PortalProvider} from '@gorhom/portal';
+import {NavigationContainer} from '@react-navigation/native';
+import React from 'react';
+import {View} from 'react-native';
+import Onyx from 'react-native-onyx';
+
+import createMock from '../utils/createMock';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@rnmapbox/maps', () => {
+    return {
+        default: jest.fn(),
+        MarkerView: jest.fn(),
+        setAccessToken: jest.fn(),
+    };
+});
+
+TestHelper.setupGlobalFetchMock();
+
+const RootStack = createPlatformStackNavigator<{[NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR]: undefined}>();
+const OnboardingStack = createPlatformStackNavigator<OnboardingModalNavigatorParamList>();
+
+const workEmail = 'testprivateemail@privateEmail.com';
+
+// The real "Join a workspace" screen is not under test here, only how many times it ends up on the stack, so a stub
+// keeps this test about navigation instead of about SelectionList and the getAccessiblePolicies request.
+function OnboardingWorkspacesStub() {
+    return <View testID="onboarding-workspaces-stub" />;
+}
+
+// Stands in for whatever screen precedes a later visit to "Join a workspace"; only its presence on the stack matters.
+function OnboardingPersonalDetailsStub() {
+    return <View testID="onboarding-personal-details-stub" />;
+}
+
+function OnboardingModalNavigator() {
+    return (
+        <OnboardingStack.Navigator screenOptions={{headerShown: false}}>
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORK_EMAIL}
+                component={OnboardingWorkEmail}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION}
+                component={OnboardingWorkEmailValidation}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORKSPACES}
+                component={OnboardingWorkspacesStub}
+            />
+        </OnboardingStack.Navigator>
+    );
+}
+
+// Drives the whole merge like `OnboardingModalNavigator`, but with the real "Join a workspace" screen, so the absence
+// of its Back button can be asserted against the stack the merge actually leaves behind.
+function OnboardingModalNavigatorWithRealWorkspaces() {
+    return (
+        <OnboardingStack.Navigator screenOptions={{headerShown: false}}>
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORK_EMAIL}
+                component={OnboardingWorkEmail}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION}
+                component={OnboardingWorkEmailValidation}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORKSPACES}
+                component={OnboardingWorkspaces}
+            />
+        </OnboardingStack.Navigator>
+    );
+}
+
+// The back button is what is under test in the second-visit case, so that one navigator renders the real screen.
+function OnboardingModalNavigatorWithWorkspaces() {
+    return (
+        <OnboardingStack.Navigator screenOptions={{headerShown: false}}>
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
+                component={OnboardingPersonalDetailsStub}
+            />
+            <OnboardingStack.Screen
+                name={SCREENS.ONBOARDING.WORKSPACES}
+                component={OnboardingWorkspaces}
+            />
+        </OnboardingStack.Navigator>
+    );
+}
+
+function HTMLProviderWrapper({children}: {children: React.ReactNode}) {
+    return <HTMLEngineProvider>{children}</HTMLEngineProvider>;
+}
+
+/**
+ * Renders the onboarding screens behind a real `navigationRef`, so `Navigation.navigate` and `Navigation.goBack` act on
+ * an actual navigation state. The per-screen tests in `WorkEmailOnboarding.tsx` spy on `Navigation.navigate` and render
+ * one screen at a time, so they structurally cannot see a screen that is still mounted underneath another one.
+ */
+function renderOnboardingStack(initialRouteNames: Array<keyof OnboardingModalNavigatorParamList>, navigator: React.ComponentType = OnboardingModalNavigator) {
+    return render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
+            <PortalProvider>
+                <NavigationContainer
+                    ref={navigationRef}
+                    initialState={{
+                        index: 0,
+                        routes: [
+                            {
+                                name: NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR,
+                                state: {
+                                    index: initialRouteNames.length - 1,
+                                    routes: initialRouteNames.map((name) => ({name})),
+                                },
+                            },
+                        ],
+                    }}
+                >
+                    <RootStack.Navigator screenOptions={{headerShown: false}}>
+                        <RootStack.Screen
+                            name={NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR}
+                            component={navigator}
+                        />
+                    </RootStack.Navigator>
+                </NavigationContainer>
+            </PortalProvider>
+        </ComposeProviders>,
+        {wrapper: HTMLProviderWrapper},
+    );
+}
+
+function getOnboardingRouteNames() {
+    const rootState = navigationRef.getRootState();
+    return rootState?.routes.at(0)?.state?.routes.map((route) => route.name) ?? [];
+}
+
+function mockResponseOnce(value: Partial<Onboarding>) {
+    const originalXhr = HttpUtils.xhr;
+    HttpUtils.xhr = jest.fn().mockImplementation(() => {
+        const mockedResponse: OnyxResponse<typeof ONYXKEYS.NVP_ONBOARDING> = {
+            jsonCode: 200,
+            onyxData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.NVP_ONBOARDING,
+                    value,
+                },
+            ],
+        };
+
+        return Promise.resolve(mockedResponse);
+    });
+    return () => {
+        HttpUtils.xhr = originalXhr;
+    };
+}
+
+describe('Onboarding work email navigation', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+        return IntlStore.load(CONST.LOCALES.EN);
+    });
+
+    beforeEach(() => {
+        jest.spyOn(useResponsiveLayoutModule, 'default').mockReturnValue(
+            createMock<ResponsiveLayoutResult>({
+                isSmallScreenWidth: false,
+                shouldUseNarrowLayout: false,
+            }),
+        );
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+        jest.clearAllMocks();
+    });
+
+    it('should leave exactly one Join a workspace route on the stack after merging a work email', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+            // AddWorkEmail is gated on an unvalidated caller; signInWithTestUser sets validated:true by default.
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false, isFromPublicDomain: true});
+        });
+
+        renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL], OnboardingModalNavigatorWithRealWorkspaces);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Submitting a work email that needs validation must replace the work email screen, not push on top of it.
+        let restoreXhr = mockResponseOnce({shouldValidate: true});
+        await act(async () => {
+            AddWorkEmail(workEmail);
+            await waitForBatchedUpdates();
+        });
+        restoreXhr();
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+
+        // The merge succeeds and moves the flow on to "Join a workspace".
+        restoreXhr = mockResponseOnce({isMergeAccountStepCompleted: true});
+        await act(async () => {
+            MergeIntoAccountAndLogin(workEmail, '123456', 1);
+            await waitForBatchedUpdates();
+        });
+        restoreXhr();
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORKSPACES]);
+
+        // Nothing is left behind this screen, so it must not offer Back. Asserted here, on the stack the real merge
+        // produced, rather than against an injected prop: this is the only place the whole chain is exercised.
+        await waitFor(() => {
+            expect(screen.queryByLabelText(TestHelper.translateLocal('common.back'))).not.toBeOnTheScreen();
+        });
+
+        // OpenApp lands after the merge and flips the account fields the work email screen's effect depends on. When
+        // that screen was pushed rather than replaced it was still mounted here, re-ran its effect, and stacked a
+        // second copy of the flow, which is what made Back on "Join a workspace" look dead.
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: true, isFromPublicDomain: false});
+        });
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORKSPACES]);
+    });
+
+    it('should land back on the work email screen even though the force replace removed it from the stack', async () => {
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+            });
+            await Onyx.merge(ONYXKEYS.FORMS.ONBOARDING_WORK_EMAIL_FORM, {
+                onboardingWorkEmail: workEmail,
+            });
+            // Keeps both screens' navigate-away effects from firing, so the only navigation under test is the Back press.
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {validated: false});
+        });
+
+        // The stack BaseOnboardingWorkEmail leaves behind once it force-replaces itself: validation is the only route.
+        renderOnboardingStack([SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+
+        await waitForBatchedUpdatesWithAct();
+
+        expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL_VALIDATION]);
+
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+
+        await waitForBatchedUpdatesWithAct();
+
+        // `goBack` was given an explicit ONBOARDING_WORK_EMAIL fallback, and `goUp` replaces into a fallback route that
+        // is no longer on the stack rather than popping, so the user still lands on the work email screen.
+        await waitFor(() => {
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.WORK_EMAIL]);
+        });
+
+        // Leaving the validation screen clears `shouldValidate`, otherwise the work email screen would immediately
+        // bounce forward again.
+        let onboardingValues: OnyxEntry<Onboarding>;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.NVP_ONBOARDING,
+            callback: (value) => {
+                onboardingValues = value;
+            },
+        });
+        expect(onboardingValues?.shouldValidate).toBeUndefined();
+    });
+
+    it('should keep Back working on a later visit to Join a workspace after the merge', async () => {
+        await TestHelper.signInWithTestUser();
+
+        // The merge already happened, so its Onyx flags stay set for the rest of onboarding. They cannot tell the
+        // post-merge entry point apart from this later visit; the stack behind the screen is what distinguishes them.
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                isMergeAccountStepCompleted: true,
+                isMergeAccountStepSkipped: false,
+            });
+        });
+
+        // Skip for now -> Employer -> Personal Details -> forward to here again, so a real screen sits behind it.
+        renderOnboardingStack([SCREENS.ONBOARDING.PERSONAL_DETAILS, SCREENS.ONBOARDING.WORKSPACES], OnboardingModalNavigatorWithWorkspaces);
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(screen.getByLabelText(TestHelper.translateLocal('common.back'))).toBeOnTheScreen();
+        });
+
+        fireEvent.press(screen.getByLabelText(TestHelper.translateLocal('common.back')));
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(getOnboardingRouteNames()).toEqual([SCREENS.ONBOARDING.PERSONAL_DETAILS]);
+        });
+    });
+});
diff --git a/tests/ui/WorkspaceAutoReportingMonthlyOffsetPageTest.tsx b/tests/ui/WorkspaceAutoReportingMonthlyOffsetPageTest.tsx
new file mode 100644
index 000000000000..fb5de394b24d
--- /dev/null
+++ b/tests/ui/WorkspaceAutoReportingMonthlyOffsetPageTest.tsx
@@ -0,0 +1,120 @@
+import {act, render} from '@testing-library/react-native';
+
+import SelectionList from '@components/SelectionList';
+
+import WorkspaceAutoReportingMonthlyOffsetPage from '@pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage';
+
+import type {Policy} from '@src/types/onyx';
+
+import type * as ReactNavigation from '@react-navigation/native';
+
+import React from 'react';
+
+jest.mock('@react-navigation/native', () => {
+    const actualNavigation: typeof ReactNavigation = jest.requireActual('@react-navigation/native');
+    return {
+        ...actualNavigation,
+        // No-op focus effect: useInitialSelection still freezes via its useState seed, which is what we assert on.
+        useFocusEffect: jest.fn(),
+    };
+});
+
+// withPolicy injects the policy from Onyx; the test injects it directly instead.
+jest.mock('@pages/workspace/withPolicy', () => (component: unknown) => component);
+jest.mock(
+    '@pages/workspace/AccessOrNotFoundWrapper',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock(
+    '@components/BlockingViews/FullPageNotFoundView',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock(
+    '@components/ScreenWrapper',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock('@components/HeaderWithBackButton', () => jest.fn(() => null));
+jest.mock('@components/SelectionList', () => jest.fn(() => null));
+jest.mock('@components/SelectionList/ListItem/SingleSelectListItem', () => jest.fn(() => null));
+jest.mock('@hooks/useReviewWorkspaceSettingsTaskCompletion', () => jest.fn(() => () => undefined));
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        translate: (key: string) => key,
+        toLocaleOrdinal: (day: number) => String(day),
+    })),
+);
+
+type MockListItem = {value: string; keyForList: string; isSelected?: boolean; text?: string; isNumber?: boolean};
+
+type MockSelectionListProps = {
+    data: MockListItem[];
+    initiallyFocusedItemKey?: string;
+    shouldScrollToFocusedIndexOnMount?: boolean;
+    shouldUpdateFocusedIndex?: boolean;
+    disableMaintainingScrollPosition?: boolean;
+    onSelectRow: (item: MockListItem) => void;
+};
+
+type PageProps = {policy: Policy; route: {params: {policyID: string}}};
+
+// The identity-mocked withPolicy renders the inner component, so re-type the export to the props it actually accepts.
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- re-typing the identity-mocked HOC export to its inner component props
+const Page = WorkspaceAutoReportingMonthlyOffsetPage as unknown as React.ComponentType<PageProps>;
+
+function pageElement(offset: number) {
+    return (
+        <Page
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- only the offset field is read in this page
+            policy={{id: 'policy1', autoReportingOffset: offset} as Policy}
+            route={{params: {policyID: 'policy1'}}}
+        />
+    );
+}
+
+describe('WorkspaceAutoReportingMonthlyOffsetPage', () => {
+    const mockedSelectionList = jest.mocked(SelectionList);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- narrows the props captured from the mocked SelectionList in this test
+    const getSelectionListProps = () => mockedSelectionList.mock.lastCall?.[0] as MockSelectionListProps | undefined;
+
+    beforeEach(() => {
+        mockedSelectionList.mockClear();
+    });
+
+    it('pins the initially selected day to the top on open', () => {
+        // The 15th sorts to the middle, so seeing it first proves pinning (not the natural day order) put it there.
+        render(pageElement(15));
+
+        const props = getSelectionListProps();
+        expect(props?.data.at(0)?.value).toBe('15');
+        expect(props?.data.at(0)?.isSelected).toBe(true);
+        // The 1st would be first if nothing were pinned.
+        expect(props?.data.at(0)?.value).not.toBe('1');
+        expect(props?.initiallyFocusedItemKey).toBe('15');
+        expect(props?.shouldScrollToFocusedIndexOnMount).toBe(false);
+        expect(props?.shouldUpdateFocusedIndex).toBe(true);
+        expect(props?.disableMaintainingScrollPosition).toBe(true);
+    });
+
+    it('keeps the originally pinned day at the top while the live selection changes', () => {
+        render(pageElement(15));
+
+        // Simulate the user picking a different day. The frozen pin must not jump to it.
+        act(() => {
+            getSelectionListProps()?.onSelectRow({value: '3', keyForList: '3', isNumber: true});
+        });
+
+        const props = getSelectionListProps();
+        const order = props?.data.map((item) => item.value) ?? [];
+        expect(order.at(0)).toBe('15');
+        expect(order.indexOf('15')).toBeLessThan(order.indexOf('3'));
+        // The checkmark still follows the live value.
+        expect(props?.data.find((item) => item.value === '3')?.isSelected).toBe(true);
+        expect(props?.data.find((item) => item.value === '15')?.isSelected).toBe(false);
+    });
+});
diff --git a/tests/ui/WorkspaceExpensifyCardFeedSelectorPageTest.tsx b/tests/ui/WorkspaceExpensifyCardFeedSelectorPageTest.tsx
new file mode 100644
index 000000000000..1f059b167187
--- /dev/null
+++ b/tests/ui/WorkspaceExpensifyCardFeedSelectorPageTest.tsx
@@ -0,0 +1,132 @@
+import {render, screen} from '@testing-library/react-native';
+
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+
+import WorkspaceExpensifyCardFeedSelectorPage from '@pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage';
+
+import SCREENS from '@src/SCREENS';
+
+import type ReactNative from 'react-native';
+
+import React from 'react';
+
+import createMock from '../utils/createMock';
+
+const POLICY_ID = 'policy123';
+
+jest.mock('@components/BlockingViews/BlockingView', () => {
+    const {Text, View} = jest.requireActual<typeof ReactNative>('react-native');
+    return ({title, subtitle}: {title: string; subtitle: string}) => (
+        <View>
+            <Text>{title}</Text>
+            <Text>{subtitle}</Text>
+        </View>
+    );
+});
+jest.mock('@components/DelegateNoAccessModalProvider', () => ({
+    useDelegateNoAccessActions: () => ({}),
+    useDelegateNoAccessState: () => ({isDelegateAccessRestricted: false}),
+}));
+jest.mock('@components/HeaderWithBackButton', () => () => null);
+jest.mock('@components/LockedAccountModalProvider', () => ({
+    useLockedAccountActions: () => ({}),
+    useLockedAccountState: () => ({isAccountLocked: false}),
+}));
+jest.mock(
+    '@components/ScreenWrapper',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock(
+    '@components/ScrollView',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock('@hooks/useCanEnrollNewExpensifyCardProgram', () => ({
+    __esModule: true,
+    default: () => ({canEnrollNewCardProgram: false}),
+}));
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({
+    __esModule: true,
+    default: () => ({login: 'member@example.com'}),
+}));
+jest.mock('@hooks/useDefaultFundID', () => ({
+    __esModule: true,
+    default: () => 1,
+}));
+jest.mock('@hooks/useExpensifyCardFeedsForFeedSelector', () => ({
+    __esModule: true,
+    default: () => ({primaryFeeds: [], otherFeeds: []}),
+}));
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: () => ({Plus: 'Plus'}),
+    useMemoizedLazyIllustrations: () => ({
+        ExpensifyCardImage: 'ExpensifyCardImage',
+        Telescope: 'Telescope',
+    }),
+}));
+jest.mock('@hooks/useLocalize', () => ({
+    __esModule: true,
+    default: () => ({translate: (key: string) => key}),
+}));
+jest.mock('@hooks/useNetwork', () => ({
+    __esModule: true,
+    default: () => ({isOffline: false}),
+}));
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: () => [undefined],
+}));
+jest.mock('@hooks/usePolicy', () => ({
+    __esModule: true,
+    default: () => ({id: POLICY_ID}),
+}));
+jest.mock('@hooks/usePrimaryContactMethod', () => ({
+    __esModule: true,
+    default: () => 'member@example.com',
+}));
+jest.mock('@hooks/useThemeStyles', () => ({
+    __esModule: true,
+    default: () => ({flex1: {flex: 1}}),
+}));
+jest.mock('@libs/PolicyUtils', () => ({
+    canEditWorkspaceSettings: () => false,
+    canMemberWrite: () => false,
+}));
+jest.mock('@navigation/Navigation', () => ({
+    __esModule: true,
+    default: {goBack: jest.fn(), navigate: jest.fn()},
+}));
+jest.mock('@pages/workspace/AccessOrNotFoundWrapper', () => ({
+    __esModule: true,
+    default: ({children}: {children: React.ReactNode}) => children,
+}));
+jest.mock('@selectors/Account', () => ({isUserValidatedSelector: jest.fn()}));
+jest.mock('@userActions/CompanyCards', () => ({
+    linkCardFeedToPolicy: jest.fn(),
+}));
+
+type FeedSelectorScreenProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED>;
+const route: FeedSelectorScreenProps['route'] = {
+    key: 'workspace-expensify-card-select-feed',
+    name: SCREENS.WORKSPACE.DYNAMIC_WORKSPACE_EXPENSIFY_CARD_SELECT_FEED,
+    params: {policyID: POLICY_ID},
+};
+const navigation = createMock<FeedSelectorScreenProps['navigation']>({});
+
+describe('WorkspaceExpensifyCardFeedSelectorPage', () => {
+    it('shows an empty state when no feeds or actions are available', () => {
+        render(
+            <WorkspaceExpensifyCardFeedSelectorPage
+                route={route}
+                navigation={navigation}
+            />,
+        );
+
+        expect(screen.getByText('workspace.expensifyCard.noCardFeedsAvailable')).toBeOnTheScreen();
+        expect(screen.getByText('workspace.expensifyCard.noCardFeedsAvailableDescription')).toBeOnTheScreen();
+    });
+});
diff --git a/tests/ui/WorkspaceExpensifyCardsExportAccountColumnTest.tsx b/tests/ui/WorkspaceExpensifyCardsExportAccountColumnTest.tsx
index c9c5a16b0e36..bf5f6a777bd9 100644
--- a/tests/ui/WorkspaceExpensifyCardsExportAccountColumnTest.tsx
+++ b/tests/ui/WorkspaceExpensifyCardsExportAccountColumnTest.tsx
@@ -116,6 +116,7 @@ function renderTable(cards: WorkspaceExpensifyCardTableRowData[], shouldShowExpo
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
             <WorkspaceExpensifyCardsTable
                 policyID="policy123"
+                policy={undefined}
                 cards={cards}
                 selectionEnabled={false}
                 selectedKeys={[]}
diff --git a/tests/ui/WorkspaceInviteMessageFastEditSaveTest.tsx b/tests/ui/WorkspaceInviteMessageFastEditSaveTest.tsx
new file mode 100644
index 000000000000..64c6eb928374
--- /dev/null
+++ b/tests/ui/WorkspaceInviteMessageFastEditSaveTest.tsx
@@ -0,0 +1,232 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {saveFastEditApprovalWorkflow} from '@libs/actions/Workflow';
+import Navigation from '@libs/Navigation/Navigation';
+
+import WorkspaceInviteMessageComponent from '@pages/workspace/members/WorkspaceInviteMessageComponent';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
+import type {Policy} from '@src/types/onyx';
+import type {ApprovalWorkflowOnyx, Approver, Member} from '@src/types/onyx/ApprovalWorkflow';
+import type {CurrentUserPersonalDetails, PersonalDetailsList} from '@src/types/onyx/PersonalDetails';
+
+import {PortalProvider} from '@gorhom/portal';
+import {NavigationContainer} from '@react-navigation/native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import {buildPersonalDetails} from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const POLICY_ID = 'workflow-fast-edit-invite-test-policy';
+const ALICE_EMAIL = 'alice@example.com';
+const ALICE_ACCOUNT_ID = 1;
+const BOB_EMAIL = 'bob@example.com';
+const BOB_ACCOUNT_ID = 2;
+const CAROL_EMAIL = 'carol@example.com';
+const CAROL_ACCOUNT_ID = 3;
+// Not in the workspace yet, so picking them on the expenses-from page is what leads to the invite page.
+const DANA_EMAIL = 'dana@example.com';
+const DANA_ACCOUNT_ID = 4;
+
+// "+N more" and the create flow open expenses-from with no nested backTo. The Edit page passes itself as the nested backTo.
+const NO_NESTED_BACK_TO = `workspaces/${POLICY_ID}/workflows/approvals/expenses-from` as Route;
+const EDIT_PAGE_ROUTE = `workspaces/${POLICY_ID}/workflows/approvals/edit`;
+const EDIT_PAGE_BACK_TO = `workspaces/${POLICY_ID}/workflows/approvals/expenses-from?backTo=${encodeURIComponent(EDIT_PAGE_ROUTE)}` as Route;
+
+jest.mock('@react-navigation/native', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const actualNav = jest.requireActual('@react-navigation/native');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actualNav,
+        useIsFocused: () => true,
+        usePreventRemove: jest.fn(),
+    };
+});
+
+// goBack runs afterTransition right away, since no screen transition ever finishes in a test.
+jest.mock('@libs/Navigation/Navigation', () => ({
+    goBack: jest.fn((_route?: string, options?: {afterTransition?: () => void}) => options?.afterTransition?.()),
+    navigate: jest.fn(),
+    getActiveRoute: jest.fn(() => ''),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    dismissModal: jest.fn(),
+}));
+
+jest.mock('@libs/actions/Workflow', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const actual = jest.requireActual('@libs/actions/Workflow');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actual,
+        saveFastEditApprovalWorkflow: jest.fn(),
+    };
+});
+
+jest.mock('@libs/actions/Policy/Member', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const actual = jest.requireActual('@libs/actions/Policy/Member');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actual,
+        addMembersToWorkspace: jest.fn(),
+    };
+});
+
+const saveFastEditApprovalWorkflowMock = jest.mocked(saveFastEditApprovalWorkflow);
+const goBackMock = jest.mocked(Navigation.goBack);
+const navigateMock = jest.mocked(Navigation.navigate);
+
+const CAROL_APPROVER: Approver = {email: CAROL_EMAIL, displayName: 'carol'};
+const ALICE_MEMBER: Member = {email: ALICE_EMAIL, displayName: 'alice'};
+const BOB_MEMBER: Member = {email: BOB_EMAIL, displayName: 'bob'};
+const DANA_MEMBER: Member = {email: DANA_EMAIL, displayName: 'dana'};
+
+function buildPolicy(): Policy {
+    return {
+        id: POLICY_ID,
+        name: 'Test Workspace',
+        type: CONST.POLICY.TYPE.CORPORATE,
+        role: CONST.POLICY.ROLE.ADMIN,
+        owner: ALICE_EMAIL,
+        employeeList: {
+            [ALICE_EMAIL]: {email: ALICE_EMAIL, submitsTo: ALICE_EMAIL, role: CONST.POLICY.ROLE.ADMIN},
+            [BOB_EMAIL]: {email: BOB_EMAIL, submitsTo: CAROL_EMAIL, role: CONST.POLICY.ROLE.USER},
+            [CAROL_EMAIL]: {email: CAROL_EMAIL, submitsTo: ALICE_EMAIL, role: CONST.POLICY.ROLE.USER},
+        },
+        approver: ALICE_EMAIL,
+        approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+        areWorkflowsEnabled: true,
+        outputCurrency: 'USD',
+        avatarURL: '',
+        pendingAction: null,
+        errors: {},
+    } as Policy;
+}
+
+const currentUserPersonalDetails = {
+    accountID: ALICE_ACCOUNT_ID,
+    login: ALICE_EMAIL,
+    email: ALICE_EMAIL,
+    displayName: 'alice',
+} as CurrentUserPersonalDetails;
+
+/** Seeds what the expenses-from page hands off: Dana is in the draft's members and in the invite draft, but not in the workspace yet. */
+async function seedHandOff(overrides: Partial<ApprovalWorkflowOnyx>) {
+    const seededWorkflow: ApprovalWorkflowOnyx = {
+        action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
+        approvers: [CAROL_APPROVER],
+        originalApprovers: [CAROL_APPROVER],
+        originalMembers: [ALICE_MEMBER, BOB_MEMBER],
+        members: [ALICE_MEMBER, BOB_MEMBER, DANA_MEMBER],
+        availableMembers: [ALICE_MEMBER, BOB_MEMBER],
+        usedApproverEmails: [],
+        isDefault: false,
+        ...overrides,
+    };
+    await act(async () => {
+        await Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, seededWorkflow);
+        await Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${POLICY_ID}`, {[DANA_EMAIL]: DANA_ACCOUNT_ID});
+        await waitForBatchedUpdatesWithAct();
+    });
+}
+
+async function renderAndPressInvite(backTo: Route) {
+    render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+            <PortalProvider>
+                <NavigationContainer>
+                    <WorkspaceInviteMessageComponent
+                        policy={buildPolicy()}
+                        policyID={POLICY_ID}
+                        backTo={backTo}
+                        currentUserPersonalDetails={currentUserPersonalDetails}
+                    />
+                </NavigationContainer>
+            </PortalProvider>
+        </ComposeProviders>,
+    );
+    await waitForBatchedUpdatesWithAct();
+    fireEvent.press(screen.getByText('Invite'));
+    await waitForBatchedUpdatesWithAct();
+}
+
+describe('WorkspaceInviteMessageComponent - "+N more" workflow edit', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await act(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.HAS_LOADED_APP, true);
+            await Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, false);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, buildPolicy());
+            await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                [ALICE_ACCOUNT_ID]: buildPersonalDetails(ALICE_EMAIL, ALICE_ACCOUNT_ID, 'alice'),
+                [BOB_ACCOUNT_ID]: buildPersonalDetails(BOB_EMAIL, BOB_ACCOUNT_ID, 'bob'),
+                [CAROL_ACCOUNT_ID]: buildPersonalDetails(CAROL_EMAIL, CAROL_ACCOUNT_ID, 'carol'),
+                [DANA_ACCOUNT_ID]: buildPersonalDetails(DANA_EMAIL, DANA_ACCOUNT_ID, 'dana'),
+            } satisfies PersonalDetailsList);
+            await Onyx.merge(ONYXKEYS.SESSION, {email: ALICE_EMAIL, accountID: ALICE_ACCOUNT_ID});
+            await waitForBatchedUpdatesWithAct();
+        });
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+            await waitForBatchedUpdatesWithAct();
+        });
+    });
+
+    it('goes back to Workflows and saves the workflow with the invited member on a "+N more" edit', async () => {
+        // Given a "+N more" edit that came here to invite Dana
+        await seedHandOff({isFastEdit: true});
+
+        // When the admin sends the invite
+        await renderAndPressInvite(NO_NESTED_BACK_TO);
+
+        // Then the admin lands on the Workflows page and the workflow is saved with Dana in it
+        expect(goBackMock).toHaveBeenCalledTimes(1);
+        expect(goBackMock.mock.calls.at(0)?.at(0)).toBe(`workspaces/${POLICY_ID}/workflows`);
+        expect(saveFastEditApprovalWorkflowMock).toHaveBeenCalledTimes(1);
+        const [params] = saveFastEditApprovalWorkflowMock.mock.calls.at(0) ?? [];
+        expect(params?.approvalWorkflow.members.map((member) => member.email)).toEqual([ALICE_EMAIL, BOB_EMAIL, DANA_EMAIL]);
+        expect(navigateMock).not.toHaveBeenCalled();
+    });
+
+    it('returns to the Edit page without saving when the invite came from the Edit page', async () => {
+        // Given an invite reached from the Edit page, which owns the save
+        await seedHandOff({isFastEdit: false});
+
+        // When the admin sends the invite
+        await renderAndPressInvite(EDIT_PAGE_BACK_TO);
+
+        // Then the admin goes back to the Edit page and nothing is saved here
+        expect(goBackMock.mock.calls.at(0)?.at(0)).toBe(EDIT_PAGE_ROUTE);
+        expect(saveFastEditApprovalWorkflowMock).not.toHaveBeenCalled();
+    });
+
+    it('still continues the create flow to the approver step', async () => {
+        // Given an invite reached from the first step of creating a workflow
+        await seedHandOff({action: CONST.APPROVAL_WORKFLOW.ACTION.CREATE, isInitialFlow: true});
+
+        // When the admin sends the invite
+        await renderAndPressInvite(NO_NESTED_BACK_TO);
+
+        // Then the admin continues to the approver step and nothing is saved yet
+        expect(navigateMock).toHaveBeenCalledTimes(1);
+        expect(navigateMock.mock.calls.at(0)?.at(0)).toBe(`workspaces/${POLICY_ID}/workflows/approvals/approver?approverIndex=0`);
+        expect(saveFastEditApprovalWorkflowMock).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/ui/WorkspaceMemberDetailsPageTest.tsx b/tests/ui/WorkspaceMemberDetailsPageTest.tsx
index 67aebf037e97..61ef607f8613 100644
--- a/tests/ui/WorkspaceMemberDetailsPageTest.tsx
+++ b/tests/ui/WorkspaceMemberDetailsPageTest.tsx
@@ -21,12 +21,14 @@ import WorkspaceMemberDetailsPage from '@pages/workspace/members/WorkspaceMember
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
+import type {Policy} from '@src/types/onyx';
 
 import {PortalProvider} from '@gorhom/portal';
 import {NavigationContainer} from '@react-navigation/native';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
+import createMock from '../utils/createMock';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
@@ -130,9 +132,110 @@ describe('WorkspaceMemberDetailsPage', () => {
         await act(async () => {
             await Onyx.clear();
         });
+        jest.restoreAllMocks();
         jest.clearAllMocks();
     });
 
+    const setupWorkArrangement = async ({
+        isOfficeWorkArrangement,
+        memberArrangement,
+        method,
+        betaEnabled = true,
+    }: {
+        isOfficeWorkArrangement?: boolean;
+        memberArrangement?: boolean;
+        method: NonNullable<NonNullable<Policy['commuterExclusions']>['method']>;
+        betaEnabled?: boolean;
+    }) => {
+        const typedPolicy = createMock<Policy>(policy);
+        const employeeList = {
+            ...typedPolicy.employeeList,
+            [invitedEmail]: {...typedPolicy.employeeList?.[invitedEmail], ...(memberArrangement !== undefined ? {hasOfficeWorkArrangement: memberArrangement} : {})},
+        };
+        const workArrangementPolicy = createMock<Policy>({...typedPolicy, commuterExclusions: {method, isOfficeWorkArrangement}, employeeList});
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.BETAS, betaEnabled ? [CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS] : []);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, workArrangementPolicy);
+        });
+        const {unmount} = renderPage({policyID: policy.id, accountID: String(invitedAccountID)});
+        await waitForBatchedUpdatesWithAct();
+        return unmount;
+    };
+
+    it('shows the work arrangement item for home and office workspaces when the beta is enabled', async () => {
+        // Given a home and office workspace and the work arrangement beta is enabled
+        const unmount = await setupWorkArrangement({method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE});
+
+        // Then the member details include the work arrangement item
+        expect(await screen.findByTestId('member-work-arrangement-menu-item')).toBeOnTheScreen();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('hides the work arrangement item for other commuter exclusion methods', async () => {
+        // Given a workspace using a commuter exclusion method other than home and office
+        const unmount = await setupWorkArrangement({method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE});
+
+        // Then the work arrangement item is hidden
+        expect(screen.queryByTestId('member-work-arrangement-menu-item')).not.toBeOnTheScreen();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('hides the work arrangement item when the beta is disabled', async () => {
+        // Given a home and office workspace but the work arrangement beta is disabled
+        const unmount = await setupWorkArrangement({method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE, betaEnabled: false});
+
+        // Then the work arrangement item is hidden
+        expect(screen.queryByTestId('member-work-arrangement-menu-item')).not.toBeOnTheScreen();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('uses the member override for the work arrangement title', async () => {
+        // Given the member override is office-based while the workspace default is no regular workspace
+        const unmount = await setupWorkArrangement({
+            method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE,
+            isOfficeWorkArrangement: false,
+            memberArrangement: true,
+        });
+
+        // Then the member override supplies the title
+        const row = await screen.findByTestId('member-work-arrangement-menu-item');
+        expect(within(row).getByText(TestHelper.translateLocal('workspace.people.officeBased'))).toBeOnTheScreen();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('falls back to the workspace default when the member arrangement is unset', async () => {
+        // Given the member override is unset and the workspace default is office-based
+        const unmount = await setupWorkArrangement({
+            method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE,
+            isOfficeWorkArrangement: true,
+        });
+
+        // Then the workspace default supplies the title
+        const row = await screen.findByTestId('member-work-arrangement-menu-item');
+        expect(within(row).getByText(TestHelper.translateLocal('workspace.people.officeBased'))).toBeOnTheScreen();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('prefers a no regular workspace member override over an office-based workspace default', async () => {
+        // Given the member override is no regular workspace while the workspace default is office-based
+        const unmount = await setupWorkArrangement({
+            method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE,
+            isOfficeWorkArrangement: true,
+            memberArrangement: false,
+        });
+
+        // Then the member override still takes precedence
+        const row = await screen.findByTestId('member-work-arrangement-menu-item');
+        expect(within(row).getByText(TestHelper.translateLocal('workspace.people.noRegularWorkspace'))).toBeOnTheScreen();
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
     it('should show the member details when the route accountID matches their personal details entry', async () => {
         const {unmount} = renderPage({policyID: policy.id, accountID: String(invitedAccountID)});
         await waitForBatchedUpdatesWithAct();
diff --git a/tests/ui/WorkspaceMembersTest.tsx b/tests/ui/WorkspaceMembersTest.tsx
index 4053871aff27..3c06fa8976eb 100644
--- a/tests/ui/WorkspaceMembersTest.tsx
+++ b/tests/ui/WorkspaceMembersTest.tsx
@@ -640,6 +640,35 @@ describe('WorkspaceMembers', () => {
         });
     });
 
+    describe('Secondary login invite', () => {
+        it('hides an empty employeeList entry and still shows a member whose personal details are missing', async () => {
+            // Given a secondary login left as an empty object after the backend nulls it and successData clears pendingAction,
+            // plus a real member who has no personal details
+            const secondaryEmail = 'secondary@example.com';
+            const memberWithoutDetails = 'nodetails@example.com';
+            await act(async () => {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, {
+                    employeeList: {
+                        [secondaryEmail]: {},
+                        [memberWithoutDetails]: {email: memberWithoutDetails, role: CONST.POLICY.ROLE.USER},
+                    },
+                });
+            });
+
+            // When the members page renders
+            const {unmount} = renderPage(SCREENS.WORKSPACE.MEMBERS, {policyID: policy.id});
+            await waitForBatchedUpdatesWithAct();
+
+            // Then the empty secondary entry is not a row, and the member without personal details still is
+            await waitFor(() => {
+                expect(screen.getAllByText(memberWithoutDetails).length).toBeGreaterThan(0);
+            });
+            expect(screen.queryAllByText(secondaryEmail)).toHaveLength(0);
+
+            unmount();
+        });
+    });
+
     describe('Role display on Submit workspaces', () => {
         it('should show the workspace owner as Editor instead of Owner', async () => {
             // Given a Submit workspace, where every member (including the owner) uses the flat Editor role
diff --git a/tests/ui/WorkspaceMoreFeaturesPageTest.tsx b/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
index 4231d5ac5ced..544ff837ecb5 100644
--- a/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
+++ b/tests/ui/WorkspaceMoreFeaturesPageTest.tsx
@@ -526,9 +526,38 @@ describe('WorkspaceMoreFeaturesPage', () => {
             await expect(findLockedSwitch('workspace.moreFeatures.vendors.subtitle')).resolves.toBeOnTheScreen();
         });
 
-        // Xero (R3) is still beta-gated, so it stays hidden when the beta is off.
-        it('hides the Vendors row for a beta-gated integration (Xero) when the beta is disabled', async () => {
-            await renderWithVendorMatching({[CONST.POLICY.CONNECTIONS.NAME.XERO]: {config: {}}}, false);
+        // Xero (R3) is GA, so a connected Xero workspace shows the row regardless of the vendorMatching beta.
+        it('shows the Vendors row locked ON for Xero scoping vendors even with the beta disabled (Xero is GA)', async () => {
+            // Given a configured Xero connection
+            const connections = {[CONST.POLICY.CONNECTIONS.NAME.XERO]: {config: {isConfigured: true}}};
+
+            // When the More features page renders without the vendorMatching beta
+            await renderWithVendorMatching(connections, false);
+
+            // Then the Vendors row is visible because Xero does not depend on the beta
+            await expect(findLockedSwitch('workspace.moreFeatures.vendors.subtitle')).resolves.toBeOnTheScreen();
+        });
+
+        it('shows the Vendors row locked OFF for Xero not scoping vendors even with the beta disabled (discovery state, Xero is GA)', async () => {
+            // Given a Xero connection that is not configured yet, so it does not scope vendors
+            const connections = {[CONST.POLICY.CONNECTIONS.NAME.XERO]: {config: {}}};
+
+            // When the More features page renders without the vendorMatching beta
+            await renderWithVendorMatching(connections, false);
+
+            // Then the Vendors row is still visible so admins can discover the feature
+            await expect(findLockedSwitch('workspace.moreFeatures.vendors.subtitle')).resolves.toBeOnTheScreen();
+        });
+
+        // Business Central is still beta-gated, so it stays hidden when the beta is off.
+        it('hides the Vendors row for a beta-gated integration (Business Central) when the beta is disabled', async () => {
+            // Given a configured Business Central connection
+            const connections = {[CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL]: {config: {isConfigured: true}}};
+
+            // When the More features page renders without the vendorMatching beta
+            await renderWithVendorMatching(connections, false);
+
+            // Then the Vendors row is hidden because Business Central still depends on the beta
             expect(vendorsSwitchQuery()).toBeNull();
         });
 
diff --git a/tests/ui/WorkspaceOnboarding.tsx b/tests/ui/WorkspaceOnboarding.tsx
index 1b5f4fc21876..1ffec106b181 100644
--- a/tests/ui/WorkspaceOnboarding.tsx
+++ b/tests/ui/WorkspaceOnboarding.tsx
@@ -21,13 +21,17 @@ import {completeOnboarding} from '@userActions/Report';
 
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
+import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
+import type {OnyxEntry} from 'react-native-onyx';
+
 import {PortalProvider} from '@gorhom/portal';
 import {NavigationContainer} from '@react-navigation/native';
 import React from 'react';
+import {View} from 'react-native';
 import Onyx from 'react-native-onyx';
 
 import createMock from '../utils/createMock';
@@ -77,12 +81,39 @@ const Stack = createPlatformStackNavigator<OnboardingModalNavigatorParamList>();
 
 const navigate = jest.spyOn(Navigation, 'navigate');
 
-const renderOnboardingWorkspacesPage = (initialRouteName: typeof SCREENS.ONBOARDING.WORKSPACES, initialParams: OnboardingModalNavigatorParamList[typeof SCREENS.ONBOARDING.WORKSPACES]) => {
+// Stands in for whatever screen precedes a later visit to "Join a workspace"; only its presence on the stack matters.
+function OnboardingPersonalDetailsStub() {
+    return <View testID="onboarding-personal-details-stub" />;
+}
+
+/**
+ * `shouldRenderScreenBehind` seeds a real route behind "Join a workspace". Leaving it off is not a detail of the
+ * harness: it is the stack the work email merge and the private domain screen actually leave behind when they
+ * force-replace into this screen, which is what makes Back impossible there.
+ */
+const renderOnboardingWorkspacesPage = (
+    initialRouteName: typeof SCREENS.ONBOARDING.WORKSPACES,
+    initialParams: OnboardingModalNavigatorParamList[typeof SCREENS.ONBOARDING.WORKSPACES],
+    shouldRenderScreenBehind = false,
+) => {
     return render(
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
             <PortalProvider>
-                <NavigationContainer>
+                <NavigationContainer
+                    initialState={
+                        shouldRenderScreenBehind
+                            ? {
+                                  index: 1,
+                                  routes: [{name: SCREENS.ONBOARDING.PERSONAL_DETAILS}, {name: initialRouteName, params: initialParams}],
+                              }
+                            : undefined
+                    }
+                >
                     <Stack.Navigator initialRouteName={initialRouteName}>
+                        <Stack.Screen
+                            name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
+                            component={OnboardingPersonalDetailsStub}
+                        />
                         <Stack.Screen
                             name={SCREENS.ONBOARDING.WORKSPACES}
                             component={OnboardingWorkspaces}
@@ -185,17 +216,54 @@ describe('OnboardingWorkspaces Page', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
-    it('should not show the back button on join workspace after Add work email flow', async () => {
+    it('should clear the blocked-back error message when skip is pressed', async () => {
+        // Given this screen after a blocked Back press, which leaves the navigation guard's error in Onyx
+        await TestHelper.signInWithTestUser();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
+            await Onyx.set(ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY, 'onboarding.purpose.errorBackButton');
+        });
+
+        const {unmount} = renderOnboardingWorkspacesPage(SCREENS.ONBOARDING.WORKSPACES, {backTo: ''});
+
+        await waitForBatchedUpdatesWithAct();
+
+        // When "Skip for now" moves the flow forward
+        fireEvent.press(screen.getByTestId('onboardingWorkSpaceSkipButton'));
+
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the message is cleared, so the next screen does not open showing an error the user just resolved
+        let onboardingErrorMessage: OnyxEntry<TranslationPaths>;
+        await TestHelper.getOnyxData({
+            key: ONYXKEYS.ONBOARDING_ERROR_MESSAGE_TRANSLATION_KEY,
+            callback: (value) => {
+                onboardingErrorMessage = value;
+            },
+        });
+
+        expect(onboardingErrorMessage).toBeFalsy();
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should not show the back button on join workspace after merging a work email', async () => {
         await TestHelper.signInWithTestUser();
 
         await act(async () => {
             await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
                 hasCompletedGuidedSetupFlow: false,
-                shouldValidate: false,
+                shouldValidate: true,
+                isMergeAccountStepCompleted: true,
+                isMergeAccountStepSkipped: false,
             });
         });
 
-        const {unmount} = renderOnboardingWorkspacesPage(SCREENS.ONBOARDING.WORKSPACES, {backTo: ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute()});
+        // The merge force-replaces into this screen, which discards every route before it, so this screen is the only
+        // one left in the onboarding stack and there is nothing to go back to.
+        const {unmount} = renderOnboardingWorkspacesPage(SCREENS.ONBOARDING.WORKSPACES, {backTo: undefined});
 
         await waitForBatchedUpdatesWithAct();
 
@@ -207,6 +275,33 @@ describe('OnboardingWorkspaces Page', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
+    it('should show the back button on a later visit to join workspace after merging a work email', async () => {
+        await TestHelper.signInWithTestUser();
+
+        // Identical Onyx state to the post-merge case above: the merge flags stay set for the rest of onboarding and
+        // cannot tell the two apart. What differs is the stack — reaching this screen again (Skip for now, Employer,
+        // Personal Details, forward to here) leaves a real screen behind it, so Back must work.
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+                shouldValidate: true,
+                isMergeAccountStepCompleted: true,
+                isMergeAccountStepSkipped: false,
+            });
+        });
+
+        const {unmount} = renderOnboardingWorkspacesPage(SCREENS.ONBOARDING.WORKSPACES, {backTo: undefined}, true);
+
+        await waitForBatchedUpdatesWithAct();
+
+        await waitFor(() => {
+            expect(screen.getByLabelText(TestHelper.translateLocal('common.back'))).toBeOnTheScreen();
+        });
+
+        unmount();
+        await waitForBatchedUpdatesWithAct();
+    });
+
     it('should show the back button on join workspace for the standard personal details flow', async () => {
         await TestHelper.signInWithTestUser();
 
@@ -216,7 +311,8 @@ describe('OnboardingWorkspaces Page', () => {
             });
         });
 
-        const {unmount} = renderOnboardingWorkspacesPage(SCREENS.ONBOARDING.WORKSPACES, {backTo: ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute()});
+        // Personal Details sits behind this screen, so Back stays.
+        const {unmount} = renderOnboardingWorkspacesPage(SCREENS.ONBOARDING.WORKSPACES, {backTo: ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute()}, true);
 
         await waitForBatchedUpdatesWithAct();
 
diff --git a/tests/ui/WorkspaceOverviewCurrencyPageTest.tsx b/tests/ui/WorkspaceOverviewCurrencyPageTest.tsx
new file mode 100644
index 000000000000..e1a0618df34a
--- /dev/null
+++ b/tests/ui/WorkspaceOverviewCurrencyPageTest.tsx
@@ -0,0 +1,190 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import type {CurrencyListItem} from '@components/CurrencySelectionList/types';
+
+import Navigation from '@libs/Navigation/Navigation';
+
+import {WorkspaceOverviewCurrencyPage} from '@pages/workspace/WorkspaceOverviewCurrencyPage';
+import type {WorkspaceOverviewCurrencyPageProps} from '@pages/workspace/WorkspaceOverviewCurrencyPage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {Policy} from '@src/types/onyx';
+
+import type ReactNative from 'react-native';
+
+import {useRoute} from '@react-navigation/native';
+import React from 'react';
+
+import createMock from '../utils/createMock';
+
+const POLICY_ID = 'policy123';
+const mockPolicy = createMock<Policy>({
+    id: POLICY_ID,
+    name: 'Acme',
+    outputCurrency: CONST.CURRENCY.AUD,
+});
+let mockEnrollmentRoute = '';
+let mockIsBetaEnabled = false;
+let mockIsUkEuCurrencySupported = false;
+const mockOnyxKeys = ONYXKEYS;
+
+jest.mock('@components/CurrencySelectionList', () => {
+    const {Pressable, Text} = jest.requireActual<typeof ReactNative>('react-native');
+    return ({onSelect}: {onSelect: (item: CurrencyListItem) => void}) => (
+        <>
+            {['USD', 'GBP', 'EUR', 'AUD'].map((currencyCode) => (
+                <Pressable
+                    key={currencyCode}
+                    testID={`currency-${currencyCode}`}
+                    accessibilityRole="button"
+                    onPress={() =>
+                        onSelect({
+                            currencyCode,
+                            currencyName: currencyCode,
+                            keyForList: currencyCode,
+                            text: currencyCode,
+                        })
+                    }
+                >
+                    <Text>{currencyCode}</Text>
+                </Pressable>
+            ))}
+        </>
+    );
+});
+jest.mock('@components/HeaderWithBackButton', () => () => null);
+jest.mock(
+    '@components/ScreenWrapper',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock('@hooks/useLocalize', () => ({
+    __esModule: true,
+    default: () => ({translate: (key: string) => key}),
+}));
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: (key: string): unknown[] => {
+        if (key === mockOnyxKeys.BANK_ACCOUNT_LIST || key === mockOnyxKeys.CARD_SUPPORTED_COUNTRIES) {
+            return [{}];
+        }
+        if (key === mockOnyxKeys.REIMBURSEMENT_ACCOUNT) {
+            return [{achData: {}}];
+        }
+        return [undefined];
+    },
+}));
+jest.mock('@hooks/usePermissions', () => ({
+    __esModule: true,
+    default: () => ({isBetaEnabled: () => mockIsBetaEnabled}),
+}));
+jest.mock('@hooks/useReviewWorkspaceSettingsTaskCompletion', () => ({
+    __esModule: true,
+    default: () => jest.fn(),
+}));
+jest.mock('@hooks/useShouldBlockCurrencyChange', () => ({
+    __esModule: true,
+    default: () => false,
+}));
+jest.mock('@libs/CardUtils', () => ({
+    getExpensifyCardEnrollmentRoute: () => mockEnrollmentRoute,
+    isCurrencySupportedForECards: () => mockIsUkEuCurrencySupported,
+}));
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {
+        goBack: jest.fn(),
+        navigate: jest.fn(),
+        setNavigationActionToMicrotaskQueue: jest.fn(),
+    },
+}));
+jest.mock('@libs/PolicyUtils', () => ({goBackFromInvalidPolicy: jest.fn()}));
+jest.mock('@libs/ReimbursementAccountUtils', () => ({
+    hasInProgressUSDVBBA: () => false,
+}));
+jest.mock('@libs/WorkflowUtils', () => ({
+    getEligibleExistingBusinessBankAccounts: () => [],
+}));
+jest.mock('@pages/workspace/AccessOrNotFoundWrapper', () => ({
+    __esModule: true,
+    default: ({children}: {children: React.ReactNode}) => children,
+}));
+jest.mock('@userActions/BankAccounts', () => ({
+    clearCorpayBankAccountFields: jest.fn(),
+}));
+jest.mock('@userActions/FormActions', () => ({clearDraftValues: jest.fn()}));
+jest.mock('@userActions/Policy/Policy', () => ({
+    isCurrencySupportedForGlobalReimbursement: () => false,
+    updateGeneralSettings: jest.fn(),
+}));
+jest.mock('@userActions/ReimbursementAccount', () => ({
+    navigateToBankAccountRoute: jest.fn(),
+}));
+jest.mock('@react-navigation/native', () => ({
+    createNavigationContainerRef: () => ({}),
+    useRoute: jest.fn(),
+}));
+
+const mockUseRoute = jest.mocked(useRoute);
+const mockNavigate = jest.mocked(Navigation.navigate);
+
+function renderPage(shouldStartExpensifyCardEnrollment = true) {
+    mockUseRoute.mockReturnValue(createMock<ReturnType<typeof useRoute>>({params: {shouldStartExpensifyCardEnrollment}}));
+    const props = createMock<WorkspaceOverviewCurrencyPageProps>({policy: mockPolicy});
+    render(<WorkspaceOverviewCurrencyPage {...props} />);
+}
+
+describe('WorkspaceOverviewCurrencyPage', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockEnrollmentRoute = ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute({policyID: POLICY_ID, backTo: ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(POLICY_ID)});
+        mockIsBetaEnabled = false;
+        mockIsUkEuCurrencySupported = false;
+    });
+
+    it('opens the add bank account flow after selecting USD when no eligible account exists', () => {
+        renderPage();
+
+        fireEvent.press(screen.getByTestId(`currency-${CONST.CURRENCY.USD}`));
+
+        expect(mockNavigate).toHaveBeenCalledWith(
+            ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute({
+                policyID: POLICY_ID,
+                backTo: ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(POLICY_ID),
+            }),
+            {forceReplace: true},
+        );
+    });
+
+    it('opens the bank account selector after selecting a supported currency when an eligible account exists', () => {
+        mockEnrollmentRoute = ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.getRoute(POLICY_ID);
+        mockIsBetaEnabled = true;
+        mockIsUkEuCurrencySupported = true;
+        renderPage();
+
+        fireEvent.press(screen.getByTestId(`currency-${CONST.CURRENCY.GBP}`));
+
+        expect(mockNavigate).toHaveBeenCalledWith(ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.getRoute(POLICY_ID), {forceReplace: true});
+    });
+
+    it('does not start enrollment after selecting an unsupported currency', () => {
+        renderPage();
+
+        fireEvent.press(screen.getByTestId(`currency-${CONST.CURRENCY.AUD}`));
+
+        expect(mockNavigate).not.toHaveBeenCalled();
+        expect(Navigation.setNavigationActionToMicrotaskQueue).toHaveBeenCalledWith(Navigation.goBack);
+    });
+
+    it('preserves the normal currency selection behavior outside Expensify Card enrollment', () => {
+        renderPage(false);
+
+        fireEvent.press(screen.getByTestId(`currency-${CONST.CURRENCY.USD}`));
+
+        expect(mockNavigate).not.toHaveBeenCalled();
+        expect(Navigation.setNavigationActionToMicrotaskQueue).toHaveBeenCalledWith(Navigation.goBack);
+    });
+});
diff --git a/tests/ui/WorkspaceUpgradeTest.tsx b/tests/ui/WorkspaceUpgradeTest.tsx
index bb897ea60f98..e02a26131f79 100644
--- a/tests/ui/WorkspaceUpgradeTest.tsx
+++ b/tests/ui/WorkspaceUpgradeTest.tsx
@@ -121,6 +121,59 @@ describe('WorkspaceUpgrade', () => {
         TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, 1);
     });
 
+    it('should not turn on auto-pay approved reports after upgrading when payments are not set up', async () => {
+        const policy: Policy = {
+            ...LHNTestUtils.getFakePolicy(),
+            areWorkflowsEnabled: true,
+            reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+        };
+
+        // Given a Collect workspace with reimbursements on but no business bank account
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+        });
+
+        // And the upgrade page is opened for auto-pay approved reports
+        const {unmount} = renderPage(SCREENS.WORKSPACE.UPGRADE, {policyID: policy.id, featureName: CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoPayApprovedReports.alias});
+
+        // When the workspace is upgraded and the upgrade page is left
+        fireEvent.press(screen.getByTestId('upgrade-button'));
+        await waitForBatchedUpdatesWithAct();
+        TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.UPGRADE_TO_CORPORATE, 1);
+        unmount();
+        await waitForBatchedUpdates();
+
+        // Then auto-pay is not turned on, so it can't activate by itself once a bank account is connected later
+        TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.ENABLE_POLICY_AUTO_REIMBURSEMENT_LIMIT, 0);
+    });
+
+    it('should turn on auto-pay approved reports after upgrading when payments are set up', async () => {
+        const policy: Policy = {
+            ...LHNTestUtils.getFakePolicy(),
+            areWorkflowsEnabled: true,
+            reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+            achAccount: {bankAccountID: 1234, accountNumber: '', routingNumber: '', addressName: '', bankName: '', reimburser: ''},
+        };
+
+        // Given a Collect workspace with workflows, reimbursements, and a business bank account set up
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+        });
+
+        // And the upgrade page is opened for auto-pay approved reports
+        const {unmount} = renderPage(SCREENS.WORKSPACE.UPGRADE, {policyID: policy.id, featureName: CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoPayApprovedReports.alias});
+
+        // When the workspace is upgraded and the upgrade page is left
+        fireEvent.press(screen.getByTestId('upgrade-button'));
+        await waitForBatchedUpdatesWithAct();
+        TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.UPGRADE_TO_CORPORATE, 1);
+        unmount();
+        await waitForBatchedUpdates();
+
+        // Then auto-pay is turned on
+        TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.ENABLE_POLICY_AUTO_REIMBURSEMENT_LIMIT, 1);
+    });
+
     it('should upgrade a Submit workspace to Corporate when unlocking a Control-tier rules feature', async () => {
         const policy: Policy = {...LHNTestUtils.getFakePolicy(), type: CONST.POLICY.TYPE.SUBMIT};
 
diff --git a/tests/ui/WorkspaceWorkflowsApprovalsCreatePageTest.tsx b/tests/ui/WorkspaceWorkflowsApprovalsCreatePageTest.tsx
new file mode 100644
index 000000000000..0ae6390a539d
--- /dev/null
+++ b/tests/ui/WorkspaceWorkflowsApprovalsCreatePageTest.tsx
@@ -0,0 +1,164 @@
+import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {convertPolicyEmployeesToApprovalWorkflows, INITIAL_APPROVAL_WORKFLOW} from '@libs/WorkflowUtils';
+
+import WorkspaceWorkflowsApprovalsCreatePage from '@pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Policy} from '@src/types/onyx';
+
+import {NavigationContainer} from '@react-navigation/native';
+import {createStackNavigator} from '@react-navigation/stack';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import getOnyxValue from '../utils/getOnyxValue';
+import {buildPersonalDetails, translateLocal} from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const POLICY_ID = 'workflow-approvals-create-test-policy';
+const ALICE_EMAIL = 'alice@example.com';
+const ALICE_ACCOUNT_ID = 1;
+const BOB_EMAIL = 'bob@example.com';
+const BOB_ACCOUNT_ID = 2;
+const CAROL_EMAIL = 'carol@example.com';
+const CAROL_ACCOUNT_ID = 3;
+const EVERYONE = [ALICE_EMAIL, BOB_EMAIL, CAROL_EMAIL];
+
+jest.mock('@react-navigation/native', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const actualNav = jest.requireActual('@react-navigation/native');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actualNav,
+        useIsFocused: () => true,
+        usePreventRemove: jest.fn(),
+    };
+});
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    goBack: jest.fn(),
+    getActiveRouteWithoutParams: jest.fn(() => ''),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    dismissModal: jest.fn(),
+}));
+
+/** A workspace where everyone submits to Alice, the default approver. */
+function buildPolicy(): Policy {
+    return {
+        id: POLICY_ID,
+        name: 'Test Workspace',
+        type: CONST.POLICY.TYPE.CORPORATE,
+        role: CONST.POLICY.ROLE.ADMIN,
+        owner: ALICE_EMAIL,
+        employeeList: Object.fromEntries(EVERYONE.map((email) => [email, {email, submitsTo: ALICE_EMAIL}])),
+        approver: ALICE_EMAIL,
+        areWorkflowsEnabled: true,
+        outputCurrency: 'USD',
+    } as Policy;
+}
+
+const mockRoute = {
+    key: 'test-route',
+    name: 'Workspace_Approvals_New',
+    params: {policyID: POLICY_ID},
+};
+
+const Stack = createStackNavigator();
+
+async function renderCreatePageWithMembers(memberEmails: string[]) {
+    await act(async () => {
+        await Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, {
+            ...INITIAL_APPROVAL_WORKFLOW,
+            approvers: [{email: BOB_EMAIL, displayName: 'bob'}],
+            members: memberEmails.map((email) => ({email, displayName: email})),
+        });
+    });
+    render(
+        <NavigationContainer>
+            <Stack.Navigator>
+                <Stack.Screen name={SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_NEW}>
+                    {() => (
+                        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+                            <WorkspaceWorkflowsApprovalsCreatePage
+                                // @ts-expect-error - route type from navigator
+                                route={mockRoute}
+                            />
+                        </ComposeProviders>
+                    )}
+                </Stack.Screen>
+            </Stack.Navigator>
+        </NavigationContainer>,
+    );
+    await waitForBatchedUpdatesWithAct();
+}
+
+async function getApprovalWorkflows() {
+    const policy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`);
+    return convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails: {}, localeCompare: (a: string, b: string) => a.localeCompare(b)}).approvalWorkflows;
+}
+
+describe('WorkspaceWorkflowsApprovalsCreatePage', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.HAS_LOADED_APP, true);
+            await Onyx.set(ONYXKEYS.IS_LOADING_REPORT_DATA, false);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, buildPolicy());
+            await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                [ALICE_ACCOUNT_ID]: buildPersonalDetails(ALICE_EMAIL, ALICE_ACCOUNT_ID, 'alice'),
+                [BOB_ACCOUNT_ID]: buildPersonalDetails(BOB_EMAIL, BOB_ACCOUNT_ID, 'bob'),
+                [CAROL_ACCOUNT_ID]: buildPersonalDetails(CAROL_EMAIL, CAROL_ACCOUNT_ID, 'carol'),
+            });
+            await Onyx.merge(ONYXKEYS.SESSION, {email: ALICE_EMAIL, accountID: ALICE_ACCOUNT_ID});
+            await waitForBatchedUpdatesWithAct();
+        });
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+            await waitForBatchedUpdatesWithAct();
+        });
+    });
+
+    it('makes a new workflow with everyone in it the default one', async () => {
+        // Given a new workflow approved by Bob with everyone in it
+        await renderCreatePageWithMembers(EVERYONE);
+
+        // When the admin adds the workflow
+        fireEvent.press(screen.getByText(translateLocal('workflowsCreateApprovalsPage.submitButton')));
+
+        // Then Bob's workflow replaces Alice's as the default one, rather than leaving Alice's behind with no one in it
+        await waitFor(async () => expect((await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`))?.approver).toBe(BOB_EMAIL));
+        const approvalWorkflows = await getApprovalWorkflows();
+        expect(approvalWorkflows).toHaveLength(1);
+        expect(approvalWorkflows.at(0)?.isDefault).toBe(true);
+        expect(approvalWorkflows.at(0)?.approvers.map((approver) => approver.email)).toEqual([BOB_EMAIL]);
+    });
+
+    it('keeps the current default workflow when the new workflow leaves someone out', async () => {
+        // Given a new workflow approved by Bob with everyone except Alice
+        await renderCreatePageWithMembers([BOB_EMAIL, CAROL_EMAIL]);
+
+        // When the admin adds the workflow
+        fireEvent.press(screen.getByText(translateLocal('workflowsCreateApprovalsPage.submitButton')));
+
+        // Then Alice stays the default approver for herself, next to Bob's new workflow
+        await waitFor(async () => expect((await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`))?.employeeList?.[CAROL_EMAIL]?.submitsTo).toBe(BOB_EMAIL));
+        expect((await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`))?.approver).toBe(ALICE_EMAIL);
+        const approvalWorkflows = await getApprovalWorkflows();
+        expect(approvalWorkflows).toHaveLength(2);
+        expect(approvalWorkflows.find((workflow) => workflow.isDefault)?.approvers.map((approver) => approver.email)).toEqual([ALICE_EMAIL]);
+    });
+});
diff --git a/tests/ui/WorkspaceWorkflowsApprovalsEditPageTest.tsx b/tests/ui/WorkspaceWorkflowsApprovalsEditPageTest.tsx
index dfb092b8fadc..38e46d731a04 100644
--- a/tests/ui/WorkspaceWorkflowsApprovalsEditPageTest.tsx
+++ b/tests/ui/WorkspaceWorkflowsApprovalsEditPageTest.tsx
@@ -1,9 +1,12 @@
-import {act, render, screen} from '@testing-library/react-native';
+import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
 
 import ComposeProviders from '@components/ComposeProviders';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 
+import Navigation from '@libs/Navigation/Navigation';
+import {convertPolicyEmployeesToApprovalWorkflows} from '@libs/WorkflowUtils';
+
 import WorkspaceWorkflowsApprovalsEditPage from '@pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage';
 
 import CONST from '@src/CONST';
@@ -19,6 +22,7 @@ import {createStackNavigator} from '@react-navigation/stack';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
+import getOnyxValue from '../utils/getOnyxValue';
 import {buildPersonalDetails, translateLocal} from '../utils/TestHelper';
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 
@@ -86,7 +90,7 @@ const mockRoute = {
 
 const Stack = createStackNavigator();
 
-const renderEditPage = () =>
+const renderEditPage = (route = mockRoute) =>
     render(
         <NavigationContainer>
             <Stack.Navigator>
@@ -95,7 +99,7 @@ const renderEditPage = () =>
                         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
                             <WorkspaceWorkflowsApprovalsEditPage
                                 // @ts-expect-error - route type from navigator
-                                route={mockRoute}
+                                route={route}
                             />
                         </ComposeProviders>
                     )}
@@ -193,6 +197,54 @@ describe('WorkspaceWorkflowsApprovalsEditPage', () => {
         expect(emails).toContain(ALICE_EMAIL);
     });
 
+    it('makes the workflow the default one when it is saved with everyone in it', async () => {
+        // Given Bob approves Carol's workflow while the default workflow routes Alice and Bob to Alice
+        const bobEmail = 'bob@example.com';
+        const bobAccountID = 2;
+        const carolEmail = 'carol@example.com';
+        const carolAccountID = 3;
+        const bobApprover: Approver = {email: bobEmail, displayName: 'bob'};
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {
+                employeeList: {
+                    [bobEmail]: {email: bobEmail, submitsTo: ALICE_EMAIL},
+                    [carolEmail]: {email: carolEmail, submitsTo: bobEmail},
+                },
+            });
+            await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                [bobAccountID]: buildPersonalDetails(bobEmail, bobAccountID, 'bob'),
+                [carolAccountID]: buildPersonalDetails(carolEmail, carolAccountID, 'carol'),
+            });
+
+            // And the admin has added everyone to Bob's workflow
+            await Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, {
+                action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
+                approvers: [bobApprover],
+                originalApprovers: [bobApprover],
+                members: [ALICE_EMAIL, bobEmail, carolEmail].map((email) => ({email, displayName: email})),
+                availableMembers: [],
+                usedApproverEmails: [],
+                isDefault: false,
+            });
+            await waitForBatchedUpdatesWithAct();
+        });
+        jest.mocked(Navigation.dismissModal).mockImplementationOnce((options) => options?.afterTransition?.());
+
+        renderEditPage({...mockRoute, params: {policyID: POLICY_ID, firstApproverEmail: bobEmail}});
+        await waitForBatchedUpdatesWithAct();
+
+        // When the admin saves the workflow
+        fireEvent.press(screen.getByText(translateLocal('common.save')));
+
+        // Then Bob becomes the default approver, so Bob's workflow is the only one left and it is the default one
+        await waitFor(async () => expect((await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`))?.approver).toBe(bobEmail));
+        const policy = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`);
+        const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails: {}, localeCompare: (a: string, b: string) => a.localeCompare(b)});
+        expect(approvalWorkflows).toHaveLength(1);
+        expect(approvalWorkflows.at(0)?.isDefault).toBe(true);
+        expect(approvalWorkflows.at(0)?.approvers.map((approver) => approver.email)).toEqual([bobEmail]);
+    });
+
     describe('shared approver hint', () => {
         const aliceApprover: Approver = {
             email: ALICE_EMAIL,
diff --git a/tests/ui/WorkspaceWorkflowsLockedBankAccountTest.tsx b/tests/ui/WorkspaceWorkflowsLockedBankAccountTest.tsx
index 5430df73fab3..7e0cca73270b 100644
--- a/tests/ui/WorkspaceWorkflowsLockedBankAccountTest.tsx
+++ b/tests/ui/WorkspaceWorkflowsLockedBankAccountTest.tsx
@@ -17,12 +17,13 @@ import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
 
 import WorkspaceWorkflowsPageRevamp from '@pages/workspace/workflows/WorkspaceWorkflowsPageRevamp';
 
+import type * as ReimbursementAccountActionsModule from '@userActions/ReimbursementAccount';
 import type * as ReportUserActionsModule from '@userActions/Report';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
-import type {Policy} from '@src/types/onyx';
+import type {BankAccountList, Policy} from '@src/types/onyx';
 
 import {PortalProvider} from '@gorhom/portal';
 import {NavigationContainer} from '@react-navigation/native';
@@ -60,6 +61,14 @@ jest.mock('@userActions/Report', () => ({
     },
 }));
 
+const mockNavigateToBankAccountRoute = jest.fn();
+jest.mock('@userActions/ReimbursementAccount', () => ({
+    ...jest.requireActual<typeof ReimbursementAccountActionsModule>('@userActions/ReimbursementAccount'),
+    navigateToBankAccountRoute: () => {
+        mockNavigateToBankAccountRoute();
+    },
+}));
+
 TestHelper.setupGlobalFetchMock();
 
 const POLICY_ID = 'workflows-locked-bank-account-test';
@@ -118,6 +127,28 @@ const setUpLockedBankAccount = async (reimburser: string) => {
     });
 };
 
+const setUpIncompleteBankAccount = async () => {
+    await TestHelper.signInWithTestUser(1, CURRENT_USER_LOGIN);
+    await act(async () => {
+        await Onyx.merge(ONYXKEYS.ACCOUNT, {primaryLogin: CURRENT_USER_LOGIN});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {...buildPolicyWithLockedBankAccount(CURRENT_USER_LOGIN), owner: CURRENT_USER_LOGIN, achAccount: undefined});
+        await Onyx.merge(
+            ONYXKEYS.BANK_ACCOUNT_LIST,
+            createMock<BankAccountList>({
+                [BANK_ACCOUNT_ID]: {
+                    methodID: BANK_ACCOUNT_ID,
+                    accountData: {
+                        bankAccountID: BANK_ACCOUNT_ID,
+                        addressName: 'Test Address',
+                        state: CONST.BANK_ACCOUNT.STATE.SETUP,
+                        additionalData: {policyID: POLICY_ID},
+                    },
+                },
+            }),
+        );
+    });
+};
+
 const getInitiatingBankAccountUnlock = () =>
     new Promise((resolve) => {
         const connection = Onyx.connect({
@@ -129,7 +160,7 @@ const getInitiatingBankAccountUnlock = () =>
         });
     });
 
-describe('WorkspaceWorkflowsPageRevamp - locked bank account row', () => {
+describe('WorkspaceWorkflowsPageRevamp - bank account row', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
     });
@@ -149,6 +180,7 @@ describe('WorkspaceWorkflowsPageRevamp - locked bank account row', () => {
     afterEach(async () => {
         setForceOffline(false);
         mockNavigateToConciergeChat.mockClear();
+        mockNavigateToBankAccountRoute.mockClear();
         await act(async () => {
             await Onyx.clear();
         });
@@ -180,4 +212,36 @@ describe('WorkspaceWorkflowsPageRevamp - locked bank account row', () => {
         expect(screen.queryByText(TestHelper.translateLocal('walletPage.bankAccountStatus.unlock'))).not.toBeOnTheScreen();
         await expect(getInitiatingBankAccountUnlock()).resolves.toBeUndefined();
     });
+
+    it('lets the user continue an incomplete bank account setup while online', async () => {
+        // Given a workspace whose bank account setup was left incomplete
+        await setUpIncompleteBankAccount();
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user presses Finish while online
+        fireEvent.press(screen.getByText(TestHelper.translateLocal('walletPage.bankAccountStatus.finish')));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the bank account flow opens so they can continue the setup
+        expect(mockNavigateToBankAccountRoute).toHaveBeenCalled();
+    });
+
+    it('does not open an incomplete bank account offline, because the bank account flow needs a connection', async () => {
+        // Given a workspace whose bank account setup was left incomplete, and the user is offline
+        await setUpIncompleteBankAccount();
+        setForceOffline(true);
+
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user presses the bank account row and the Finish button
+        fireEvent.press(screen.getByText('Test Address'));
+        fireEvent.press(screen.getByText(TestHelper.translateLocal('walletPage.bankAccountStatus.finish')));
+        await waitForBatchedUpdatesWithAct();
+
+        // Then neither press opens the bank account flow, which would only show the offline blocking view
+        expect(mockNavigateToBankAccountRoute).not.toHaveBeenCalled();
+    });
 });
diff --git a/tests/ui/WorkspaceWorkflowsPayerPageTest.tsx b/tests/ui/WorkspaceWorkflowsPayerPageTest.tsx
new file mode 100644
index 000000000000..dde4202384f3
--- /dev/null
+++ b/tests/ui/WorkspaceWorkflowsPayerPageTest.tsx
@@ -0,0 +1,208 @@
+import {act, render} from '@testing-library/react-native';
+
+import SelectionListWithSections from '@components/SelectionList/SelectionListWithSections';
+
+// eslint-disable-next-line no-restricted-imports -- type-only wildcard import used solely to type jest.requireActual below; isPaidGroupPolicy is not referenced
+import type * as PolicyUtilsModule from '@libs/PolicyUtils';
+
+import WorkspaceWorkflowsPayerPage from '@pages/workspace/workflows/WorkspaceWorkflowsPayerPage';
+
+import type {PersonalDetailsList, Policy} from '@src/types/onyx';
+
+import type * as ReactNavigation from '@react-navigation/native';
+
+import React from 'react';
+
+// Capture the latest focus-effect callback so a test can simulate the page regaining focus (e.g. returning after toggling a setting).
+const mockFocus: {callback?: () => void} = {};
+jest.mock('@react-navigation/native', () => {
+    const actualNavigation: typeof ReactNavigation = jest.requireActual('@react-navigation/native');
+    return {
+        ...actualNavigation,
+        useFocusEffect: jest.fn((callback: () => void) => {
+            mockFocus.callback = callback;
+        }),
+    };
+});
+
+// The HOC injects policy/personalDetails from Onyx; the test injects them directly instead.
+jest.mock('@pages/workspace/withPolicyAndFullscreenLoading', () => (component: unknown) => component);
+jest.mock(
+    '@pages/workspace/AccessOrNotFoundWrapper',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock(
+    '@components/BlockingViews/FullPageNotFoundView',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock(
+    '@components/ScreenWrapper',
+    () =>
+        ({children}: {children: React.ReactNode}) =>
+            children,
+);
+jest.mock('@components/HeaderWithBackButton', () => jest.fn(() => null));
+jest.mock('@pages/workspace/workflows/WorkspaceWorkflowsPayerSuccessPage', () => jest.fn(() => null));
+jest.mock('@components/SelectionList/SelectionListWithSections', () => jest.fn(() => null));
+jest.mock('@components/SelectionList/ListItem/UserListItem', () => jest.fn(() => null));
+
+jest.mock('@hooks/useOnyx', () => jest.fn(() => [undefined]));
+jest.mock('@hooks/useNetwork', () => jest.fn(() => ({isOffline: false})));
+jest.mock('@hooks/useConfirmModal', () => jest.fn(() => ({showConfirmModal: jest.fn(), closeModal: jest.fn()})));
+jest.mock('@hooks/usePressLoading', () => jest.fn(() => ({isLoading: false, startWithLoading: jest.fn()})));
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => jest.fn(() => ({accountID: 1, login: 'owner@test.com'})));
+jest.mock('@hooks/usePersonalDetailByLogin', () => ({
+    __esModule: true,
+    default: jest.fn(() => 'Display Name'),
+    // employeePersonalDetails is only forwarded to the mocked getMemberAccountIDsForWorkspace, so the value is irrelevant.
+    usePersonalDetailsByLogins: jest.fn(() => ({})),
+}));
+jest.mock('@hooks/useLazyAsset', () => ({useMemoizedLazyExpensifyIcons: jest.fn(() => ({FallbackAvatar: 'FallbackAvatar'}))}));
+jest.mock('@libs/BankAccountUtils', () => ({isBankAccountPartiallySetup: jest.fn(() => false)}));
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        translate: (key: string) => key,
+        formatPhoneNumber: (value: string) => value,
+    })),
+);
+jest.mock('@libs/PolicyUtils', () => {
+    const actual = jest.requireActual<typeof PolicyUtilsModule>('@libs/PolicyUtils');
+    return {
+        ...actual,
+        canMemberWrite: jest.fn(() => true),
+        isExpensifyTeam: jest.fn(() => false),
+        isPendingDeletePolicy: jest.fn(() => false),
+        goBackFromInvalidPolicy: jest.fn(),
+        getMemberAccountIDsForWorkspace: jest.fn(() =>
+            Object.fromEntries([
+                ['payer@test.com', 2],
+                ['admin@test.com', 3],
+            ]),
+        ),
+    };
+});
+
+type MockMember = {keyForList: string; accountID: number; isSelected?: boolean};
+type MockSection = {data: MockMember[]};
+
+type MockSectionsListProps = {
+    sections: MockSection[];
+    onSelectRow: (item: MockMember) => void;
+    shouldUpdateFocusedIndex?: boolean;
+    initiallyFocusedItemKey?: string;
+    textInputOptions?: {onChangeText?: (text: string) => void};
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- only the login field of each entry is read in this page
+const PERSONAL_DETAILS = Object.fromEntries([
+    // Display names share the "Test" prefix so a single search term matches both members.
+    [2, {accountID: 2, login: 'payer@test.com', displayName: 'Test Payer'}],
+    [3, {accountID: 3, login: 'admin@test.com', displayName: 'Test Admin'}],
+]) as unknown as PersonalDetailsList;
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- only a handful of policy fields are read in this page
+const POLICY = {
+    id: 'policy1',
+    owner: 'owner@test.com',
+    ownerAccountID: 1,
+    reimbursementChoice: 'reimburseManual',
+    achAccount: {reimburser: 'payer@test.com', bankAccountID: 55, state: 'OPEN'},
+    employeeList: Object.fromEntries([
+        ['payer@test.com', {role: 'admin'}],
+        ['admin@test.com', {role: 'admin'}],
+    ]),
+} as unknown as Policy;
+
+type PageProps = {policy: Policy; personalDetails: PersonalDetailsList; isLoadingReportData: boolean; route: {params: {policyID: string}}};
+
+// The identity-mocked HOC renders the inner component, so re-type the export to the props it actually accepts.
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- re-typing the identity-mocked HOC export to its inner component props
+const Page = WorkspaceWorkflowsPayerPage as unknown as React.ComponentType<PageProps>;
+
+function pageElement() {
+    return (
+        <Page
+            policy={POLICY}
+            personalDetails={PERSONAL_DETAILS}
+            isLoadingReportData={false}
+            route={{params: {policyID: 'policy1'}}}
+        />
+    );
+}
+
+describe('WorkspaceWorkflowsPayerPage', () => {
+    const mockedList = jest.mocked(SelectionListWithSections);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- narrows the props captured from the mocked list in this test
+    const getListProps = () => mockedList.mock.lastCall?.[0] as MockSectionsListProps | undefined;
+
+    beforeEach(() => {
+        mockedList.mockClear();
+    });
+
+    it('pins the initially selected payer to the top section on open', () => {
+        render(pageElement());
+
+        const props = getListProps();
+        // First (untitled) section holds the frozen initial payer.
+        expect(props?.sections.at(0)?.data.at(0)?.keyForList).toBe('2');
+        expect(props?.sections.at(0)?.data.at(0)?.isSelected).toBe(true);
+        expect(props?.initiallyFocusedItemKey).toBe('2');
+        expect(props?.shouldUpdateFocusedIndex).toBe(true);
+    });
+
+    it('keeps the initial payer pinned in the top section while the live selection changes', () => {
+        render(pageElement());
+
+        // Simulate the user picking a different admin. The frozen section placement must not jump.
+        act(() => {
+            getListProps()?.onSelectRow({keyForList: '3', accountID: 3});
+        });
+
+        const props = getListProps();
+        // The initial payer is still alone at the top section...
+        expect(props?.sections.at(0)?.data.at(0)?.keyForList).toBe('2');
+        expect(props?.sections.at(0)?.data.at(0)?.isSelected).toBe(false);
+        // ...and the newly picked admin only got the checkmark, staying in the admins section.
+        const admin = props?.sections.at(1)?.data.find((member) => member.keyForList === '3');
+        expect(admin?.isSelected).toBe(true);
+    });
+
+    it('pins the saved payer to the top of the search results', () => {
+        render(pageElement());
+
+        // Searching collapses the two sections into one filtered list.
+        act(() => {
+            getListProps()?.textInputOptions?.onChangeText?.('Test');
+        });
+
+        const props = getListProps();
+        // The saved payer leads the filtered results instead of appearing after the admins.
+        expect(props?.sections.at(0)?.data.at(0)?.keyForList).toBe('2');
+    });
+
+    it('keeps the saved payer in the top section (not the unsaved pick) when the page regains focus', () => {
+        render(pageElement());
+
+        // Pick a different admin without saving.
+        act(() => {
+            getListProps()?.onSelectRow({keyForList: '3', accountID: 3});
+        });
+
+        // Simulate returning to the page (e.g. after toggling a setting), which fires the focus effect.
+        act(() => {
+            mockFocus.callback?.();
+        });
+
+        const props = getListProps();
+        // The saved payer stays alone at the top section; the unsaved pick must not jump there.
+        expect(props?.sections.at(0)?.data.at(0)?.keyForList).toBe('2');
+        expect(props?.sections.at(0)?.data.at(0)?.isSelected).toBe(false);
+        // The unsaved pick keeps only the checkmark, still in the admins section.
+        const admin = props?.sections.at(1)?.data.find((member) => member.keyForList === '3');
+        expect(admin?.isSelected).toBe(true);
+    });
+});
diff --git a/tests/ui/WorkspaceWorkflowsSmartLimitApprovalsTest.tsx b/tests/ui/WorkspaceWorkflowsSmartLimitApprovalsTest.tsx
new file mode 100644
index 000000000000..3a5c4e691bc0
--- /dev/null
+++ b/tests/ui/WorkspaceWorkflowsSmartLimitApprovalsTest.tsx
@@ -0,0 +1,229 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import {ModalProvider} from '@components/Modal/Global/ModalContext';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
+import * as useResponsiveLayoutModule from '@hooks/useResponsiveLayout';
+import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types';
+
+import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
+
+import type {WorkspaceSplitNavigatorParamList} from '@navigation/types';
+
+import WorkspaceWorkflowsPageRevamp from '@pages/workspace/workflows/WorkspaceWorkflowsPageRevamp';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Policy} from '@src/types/onyx';
+
+import {PortalProvider} from '@gorhom/portal';
+import {NavigationContainer} from '@react-navigation/native';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import * as LHNTestUtils from '../utils/LHNTestUtils';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@src/components/ConfirmedRoute.tsx');
+
+TestHelper.setupGlobalFetchMock();
+
+const POLICY_ID = 'workflows-smart-limit-approvals-test';
+const OWNER_EMAIL = 'test@user.com';
+const OWNER_ACCOUNT_ID = 1;
+const Stack = createPlatformStackNavigator<WorkspaceSplitNavigatorParamList>();
+
+const buildPolicy = (policyOverrides: Partial<Policy>): Policy =>
+    ({
+        ...LHNTestUtils.getFakePolicy(POLICY_ID),
+        type: CONST.POLICY.TYPE.CORPORATE,
+        role: CONST.POLICY.ROLE.ADMIN,
+        owner: OWNER_EMAIL,
+        approver: OWNER_EMAIL,
+        outputCurrency: 'USD',
+        areWorkflowsEnabled: true,
+        reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
+        employeeList: {[OWNER_EMAIL]: {email: OWNER_EMAIL, submitsTo: OWNER_EMAIL, forwardsTo: undefined}},
+        ...policyOverrides,
+    }) as Policy;
+
+const setupPolicy = async (policyOverrides: Partial<Policy>) => {
+    await act(async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, buildPolicy(policyOverrides));
+        await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {[OWNER_ACCOUNT_ID]: TestHelper.buildPersonalDetails(OWNER_EMAIL, OWNER_ACCOUNT_ID, 'Owner')});
+    });
+};
+
+const renderPage = () =>
+    render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
+            <PortalProvider>
+                <ModalProvider>
+                    <NavigationContainer>
+                        <Stack.Navigator initialRouteName={SCREENS.WORKSPACE.WORKFLOWS}>
+                            <Stack.Screen
+                                name={SCREENS.WORKSPACE.WORKFLOWS}
+                                component={WorkspaceWorkflowsPageRevamp}
+                                initialParams={{policyID: POLICY_ID, tab: CONST.TAB.WORKFLOWS.APPROVALS}}
+                            />
+                        </Stack.Navigator>
+                    </NavigationContainer>
+                </ModalProvider>
+            </PortalProvider>
+        </ComposeProviders>,
+    );
+
+const addApprovalsDescription = () => TestHelper.translateLocal('workflowsPage.addApprovalsDescription');
+const smartLimitPrompt = () => TestHelper.translateLocal('workspace.moreFeatures.workflows.disableApprovalPrompt');
+const configureViaProvider = (provider: string) => TestHelper.translateLocal('workflowsPage.configureViaProvider', {provider});
+const lockedSwitchLabel = () => `${smartLimitPrompt()}, ${TestHelper.translateLocal('common.locked')}`;
+const querySubtitle = (text: string) => screen.queryByText(text, {includeHiddenElements: true});
+
+const getApprovalMode = () =>
+    new Promise<string | undefined>((resolve) => {
+        const connection = Onyx.connect({
+            key: `${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`,
+            callback: (policy) => {
+                Onyx.disconnect(connection);
+                resolve(policy?.approvalMode);
+            },
+        });
+    });
+
+describe('WorkspaceWorkflowsPageRevamp - Smart Limit approvals lock', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.EN);
+        });
+        const wideLayout: ResponsiveLayoutResult = {
+            shouldUseNarrowLayout: false,
+            isSmallScreenWidth: false,
+            isInNarrowPaneModal: false,
+            isExtraSmallScreenHeight: false,
+            isMediumScreenWidth: false,
+            isLargeScreenWidth: true,
+            isExtraLargeScreenWidth: false,
+            isExtraSmallScreenWidth: false,
+            isSmallScreen: false,
+            onboardingIsMediumOrLargerScreenWidth: true,
+            isInLandscapeMode: false,
+        };
+        jest.spyOn(useResponsiveLayoutModule, 'default').mockReturnValue(wideLayout);
+        await TestHelper.signInWithTestUser(OWNER_ACCOUNT_ID, OWNER_EMAIL);
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+        jest.clearAllMocks();
+    });
+
+    it('lets an admin enable approvals when Smart Limit cards exist and the mode is OPTIONAL', async () => {
+        // Given a loaded group policy with Smart Limit cards and approvals currently off.
+        await setupPolicy({areApprovalsLockedByExpensifyCard: true, approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the switch is off, enabled, and shows the regular description.
+        expect(querySubtitle(smartLimitPrompt())).not.toBeOnTheScreen();
+        expect(querySubtitle(addApprovalsDescription())).toBeOnTheScreen();
+        const approvalsSwitch = screen.getByRole(CONST.ROLE.SWITCH, {name: addApprovalsDescription()});
+        expect(approvalsSwitch.props.accessibilityState).toEqual(expect.objectContaining({checked: false, disabled: false}));
+
+        // When the admin enables approvals.
+        fireEvent.press(approvalsSwitch);
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the approval mode changes to an enabled workflow.
+        expect(await getApprovalMode()).toBe(CONST.POLICY.APPROVAL_MODE.BASIC);
+    });
+
+    it('keeps the Smart Limit accessibility label for an integration-managed workflow with OPTIONAL mode', async () => {
+        // Given a workspace with Smart Limit cards, no configured approval mode, and a connected HR workflow source.
+        await setupPolicy({
+            areApprovalsLockedByExpensifyCard: true,
+            approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+            connections: {
+                [CONST.POLICY.CONNECTIONS.NAME.GUSTO]: {
+                    config: {finalApprover: null, approvalMode: CONST.GUSTO.APPROVAL_MODE.CUSTOM},
+                },
+            },
+        });
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then integration guidance remains visible and the switch announces the Smart Limit lock while staying pressable for the integration prompt.
+        expect(querySubtitle(configureViaProvider('Gusto'))).toBeOnTheScreen();
+        expect(querySubtitle(smartLimitPrompt())).not.toBeOnTheScreen();
+        const approvalsSwitch = screen.getByRole(CONST.ROLE.SWITCH, {name: lockedSwitchLabel()});
+        expect(approvalsSwitch.props.accessibilityState).toEqual(expect.objectContaining({checked: true, disabled: false}));
+    });
+
+    it.each([
+        [CONST.POLICY.APPROVAL_MODE.BASIC, true],
+        [CONST.POLICY.APPROVAL_MODE.ADVANCED, true],
+        [CONST.POLICY.APPROVAL_MODE.SMARTREPORT, false],
+        [CONST.POLICY.APPROVAL_MODE.BILLCOM, false],
+    ] as const)('keeps the %s approval mode locked with its established displayed state', async (approvalMode, isActive) => {
+        // Given a loaded group policy with Smart Limit cards and a configured approval mode.
+        await setupPolicy({areApprovalsLockedByExpensifyCard: true, approvalMode});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then every configured mode remains locked, and legacy modes retain their existing off display.
+        expect(querySubtitle(smartLimitPrompt())).toBeOnTheScreen();
+        expect(screen.getByRole(CONST.ROLE.SWITCH, {name: lockedSwitchLabel()}).props.accessibilityState).toEqual(expect.objectContaining({checked: isActive, disabled: true}));
+    });
+
+    it('locks a loaded group policy with a missing mode using the effective ADVANCED default', async () => {
+        // Given a loaded group policy with Smart Limit cards and no stored mode, which getApprovalWorkflow treats as ADVANCED.
+        await setupPolicy({areApprovalsLockedByExpensifyCard: true, approvalMode: undefined});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the toggle keeps its established off display but remains locked with the Smart Limit warning.
+        expect(querySubtitle(smartLimitPrompt())).toBeOnTheScreen();
+        expect(screen.getByRole(CONST.ROLE.SWITCH, {name: lockedSwitchLabel()}).props.accessibilityState).toEqual(expect.objectContaining({checked: false, disabled: true}));
+    });
+
+    it('does not let the Smart Limit lock block the Submit workspace upgrade path', async () => {
+        // Given a Submit workspace with a Smart Limit flag and stored ADVANCED mode, which the UI still treats as off.
+        await setupPolicy({type: CONST.POLICY.TYPE.SUBMIT, role: CONST.POLICY.ROLE.EDITOR, areApprovalsLockedByExpensifyCard: true, approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the switch remains off and available so its existing enable handler can route to the upgrade flow.
+        expect(screen.getByRole(CONST.ROLE.SWITCH, {name: addApprovalsDescription()}).props.accessibilityState).toEqual(expect.objectContaining({checked: false, disabled: false}));
+    });
+
+    it('keeps the Smart Limit lock when a configured mode has an approval update error', async () => {
+        // Given a persisted ADVANCED mode and a failure error, the mode still indicates that approvals are configured.
+        await setupPolicy({areApprovalsLockedByExpensifyCard: true, approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED, errorFields: {approvalMode: {error: 'Update failed'}}});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the error does not unlock the switch, although the existing active-state logic may display it as off.
+        expect(screen.getByRole(CONST.ROLE.SWITCH, {name: lockedSwitchLabel()}).props.accessibilityState).toEqual(expect.objectContaining({checked: false, disabled: true}));
+    });
+
+    it('leaves approvals unlocked when Smart Limit cards are absent', async () => {
+        // Given approvals are configured but the Smart Limit policy flag is false.
+        await setupPolicy({areApprovalsLockedByExpensifyCard: false, approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC});
+        renderPage();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the switch keeps the existing behavior and is available to disable approvals.
+        expect(querySubtitle(smartLimitPrompt())).not.toBeOnTheScreen();
+        expect(screen.getByRole(CONST.ROLE.SWITCH, {name: addApprovalsDescription()}).props.accessibilityState).toEqual(expect.objectContaining({checked: true, disabled: false}));
+    });
+});
diff --git a/tests/ui/YearListItemHeaderTest.tsx b/tests/ui/YearListItemHeaderTest.tsx
index 16db43d4e610..02f0bd868569 100644
--- a/tests/ui/YearListItemHeaderTest.tsx
+++ b/tests/ui/YearListItemHeaderTest.tsx
@@ -58,6 +58,9 @@ const mockSearchActionsContext = {
     setLastSearchType: jest.fn(),
     setCurrentSelectedTransactionReportID: jest.fn(),
     setSelectedTransactions: jest.fn(),
+    getSelectedTransactions: jest.fn(() => ({})),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: jest.fn(),
     setSelectedReports: jest.fn(),
     removeTransaction: jest.fn(),
diff --git a/tests/ui/YearPickerModalTest.tsx b/tests/ui/YearPickerModalTest.tsx
index c35f5c1b1167..cc45b7720e29 100644
--- a/tests/ui/YearPickerModalTest.tsx
+++ b/tests/ui/YearPickerModalTest.tsx
@@ -50,6 +50,7 @@ describe('YearPickerModal', () => {
     });
 
     it('pins the current year to the top on open', () => {
+        // Given a year list long enough for the pin to apply
         render(
             <YearPickerModal
                 isVisible
@@ -59,16 +60,18 @@ describe('YearPickerModal', () => {
             />,
         );
 
+        // When the picker opens
         const props = getSelectionListProps();
+
+        // Then the current year leads the list and is the focused item
         expect(props?.data.at(0)?.value).toBe(2020);
-        // The list sorts newest-first, so 2027 would lead if nothing were pinned.
-        expect(props?.data.at(0)?.value).not.toBe(2027);
         expect(props?.initiallyFocusedItemKey).toBe('2020');
         expect(props?.shouldScrollToFocusedIndexOnMount).toBe(false);
         expect(props?.shouldUpdateFocusedIndex).toBe(true);
     });
 
-    it('keeps the current year pinned at the top of the search results', () => {
+    it('lists upcoming years ascending, then past years nearest first, after the pinned year', () => {
+        // Given a year list long enough for the pin to apply, with 2020 selected
         render(
             <YearPickerModal
                 isVisible
@@ -78,15 +81,58 @@ describe('YearPickerModal', () => {
             />,
         );
 
-        // "202" matches 2020-2027. 2027 sorts first, so 2020 leading proves the pin held.
+        // When the picker opens
+        const values = getSelectionListProps()?.data.map((year) => year.value);
+
+        // Then the row after the pinned year is the next year, not the latest year in the list
+        expect(values).toEqual([2020, 2021, 2022, 2023, 2024, 2025, 2026, 2027, 2019, 2018, 2017, 2016, 2015, 2014]);
+    });
+
+    it.each([
+        // The newest year is selected, so there are no upcoming years and only past years follow, nearest first
+        [2027, [2027, 2026, 2025, 2024, 2023, 2022, 2021, 2020, 2019, 2018, 2017, 2016, 2015, 2014]],
+        // The oldest year is selected, so there are no past years and only upcoming years follow, ascending
+        [2014, [2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026, 2027]],
+    ])('orders correctly when %i is at the edge of the list', (currentYear, expected) => {
+        // Given a year list long enough for the pin to apply, with a year at one end of the list selected
+        render(
+            <YearPickerModal
+                isVisible
+                years={buildYears(2014, 14)}
+                currentYear={currentYear}
+                onClose={jest.fn()}
+            />,
+        );
+
+        // When the picker opens
+        const values = getSelectionListProps()?.data.map((year) => year.value);
+
+        // Then the selected year leads and the rest of the list is ordered from the only side that has years
+        expect(values).toEqual(expected);
+    });
+
+    it('keeps the current year pinned at the top of the search results', () => {
+        // Given a year list long enough for the pin to apply, with 2024 selected so "202" matches years on both sides of it
+        render(
+            <YearPickerModal
+                isVisible
+                years={buildYears(2014, 14)}
+                currentYear={2024}
+                onClose={jest.fn()}
+            />,
+        );
+
+        // When the user searches "202", which matches 2020-2027
         act(() => {
             getSelectionListProps()?.textInputOptions?.onChangeText?.('202');
         });
 
-        expect(getSelectionListProps()?.data.at(0)?.value).toBe(2020);
+        // Then 2024 stays first, the upcoming years follow in ascending order, and the past years come last, nearest first
+        expect(getSelectionListProps()?.data.map((year) => year.value)).toEqual([2024, 2025, 2026, 2027, 2023, 2022, 2021, 2020]);
     });
 
     it('does not reorder when the year list is under the item-limit threshold', () => {
+        // Given a year list shorter than the item-limit threshold
         render(
             <YearPickerModal
                 isVisible
@@ -96,7 +142,10 @@ describe('YearPickerModal', () => {
             />,
         );
 
-        // Below the threshold moveInitialSelectionToTop is a no-op, so newest-first order is kept.
-        expect(getSelectionListProps()?.data.at(0)?.value).toBe(2024);
+        // When the picker opens
+        const values = getSelectionListProps()?.data.map((year) => year.value);
+
+        // Then nothing is pinned and the newest-first order is kept
+        expect(values).toEqual([2024, 2023, 2022, 2021, 2020]);
     });
 });
diff --git a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
index 61fadcd4b4e4..6b099fb91f5a 100644
--- a/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
+++ b/tests/ui/components/IOURequestStepConfirmationPageTest.tsx
@@ -1317,7 +1317,6 @@ describe('IOURequestStepConfirmationPageTest', () => {
             const chatReportID = 'p2p-chat-1';
             const iouReportID = 'p2p-iou-report-1';
             const transactionID = 'tx-from-iou-report';
-            const getChatByParticipantsSpy = jest.spyOn(ReportUtils, 'getChatByParticipants').mockReturnValue({reportID: chatReportID});
             jest.mocked(getIsNarrowLayout).mockReturnValue(true);
 
             try {
@@ -1345,6 +1344,12 @@ describe('IOURequestStepConfirmationPageTest', () => {
                         iouRequestType: CONST.IOU.REQUEST_TYPE.MANUAL,
                         participants: [{accountID: PARTICIPANT_ACCOUNT_ID, reportID: chatReportID, selected: true}],
                     });
+                    // The page resolves the participant chat through the derived index, so seed the entry the
+                    // derived value would produce for this chat report.
+                    await Onyx.merge(ONYXKEYS.DERIVED.ONE_ON_ONE_CHAT_REPORT_IDS, {
+                        reportIDs: {[ReportUtils.getParticipantsChatKey([PARTICIPANT_ACCOUNT_ID, ACCOUNT_ID])]: chatReportID},
+                        accountID: ACCOUNT_ID,
+                    });
                 });
 
                 render(
@@ -1375,11 +1380,9 @@ describe('IOURequestStepConfirmationPageTest', () => {
                 await waitForBatchedUpdatesWithAct();
 
                 // Then the IOU report the flow started from is pre-inserted, not the participant chat the lookup resolved
-                expect(getChatByParticipantsSpy).toHaveBeenCalled();
                 await waitFor(() => expect(Navigation.preInsertFullscreenUnderRHP).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(iouReportID)), {timeout: 2000});
                 expect(Navigation.preInsertFullscreenUnderRHP).not.toHaveBeenCalledWith(expect.stringContaining(chatReportID));
             } finally {
-                getChatByParticipantsSpy.mockRestore();
                 jest.mocked(getIsNarrowLayout).mockReturnValue(false);
             }
         });
diff --git a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
index 05fdfa622f50..86c36815ec57 100644
--- a/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
+++ b/tests/ui/components/MenuItem/MenuItemFieldTest.tsx
@@ -1,6 +1,7 @@
 import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import MenuItemTrailing from '@components/MenuItem/layout/MenuItemTrailing';
 import MenuItemField from '@components/MenuItem/presets/MenuItemField';
 import Text from '@components/Text';
 
@@ -178,6 +179,27 @@ describe('MenuItemField', () => {
             expect(screen.getByText('Badge')).toBeOnTheScreen();
             expect(screen.getByTestId(CHEVRON_TEST_ID)).toBeOnTheScreen();
         });
+
+        it.each([
+            ['no children', undefined],
+            ['sibling conditionals that all come out false', [false, false]],
+        ])('renders no trailing cell given %s', (_, children) => {
+            // Given a row that is not pressable, so there is no chevron to put in the trailing cell
+            // When its children render nothing, including several conditionals that all came out false
+            render(
+                <Wrapper>
+                    <MenuItemField
+                        name={NAME}
+                        value={VALUE}
+                    >
+                        {children}
+                    </MenuItemField>
+                </Wrapper>,
+            );
+
+            // Then no empty trailing cell is drawn to take up the row gap
+            expect(screen.UNSAFE_queryAllByType(MenuItemTrailing)).toHaveLength(0);
+        });
     });
 
     describe('press handling', () => {
diff --git a/tests/ui/components/MoneyReportHeaderActionsPlacementTest.tsx b/tests/ui/components/MoneyReportHeaderActionsPlacementTest.tsx
new file mode 100644
index 000000000000..5b9a84c8e9ae
--- /dev/null
+++ b/tests/ui/components/MoneyReportHeaderActionsPlacementTest.tsx
@@ -0,0 +1,357 @@
+import {render} from '@testing-library/react-native';
+
+import MoneyReportHeader from '@components/MoneyReportHeader';
+import MoneyReportHeaderActions from '@components/MoneyReportHeaderActions';
+import MoneyReportHeaderMoreContent from '@components/MoneyReportHeaderMoreContent';
+
+import useMoneyReportHeaderMoreContentVisibility from '@hooks/useMoneyReportHeaderMoreContentVisibility';
+import useOnyx from '@hooks/useOnyx';
+import useReportPrimaryAction from '@hooks/useReportPrimaryAction';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {Report} from '@src/types/onyx';
+
+import type * as ReactNavigationNative from '@react-navigation/native';
+
+import {useRoute} from '@react-navigation/native';
+import React from 'react';
+
+const REPORT_ID = '1001';
+const CHAT_REPORT_ID = '2001';
+
+const HEADER_ROW_TEST_ID = 'header-row';
+const ACTIONS_TEST_ID = 'header-actions';
+const REPORT_CAROUSEL_TEST_ID = 'report-carousel';
+const TRANSACTIONS_CAROUSEL_TEST_ID = 'transactions-carousel';
+
+const PARENT_REPORT_ID = '3001';
+const PARENT_ACTION_ID = 'parentAction1';
+const THREAD_TRANSACTION_ID = 'thread-tx-1';
+
+/** A 1:1 DM IOU report: `isDM` is true for its chat report, and there is no next step or status bar to show. */
+const iouReport = {reportID: REPORT_ID, chatReportID: CHAT_REPORT_ID, type: CONST.REPORT.TYPE.IOU} as Report;
+const dmChatReport = {reportID: CHAT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT} as Report;
+
+jest.mock('@hooks/useOnyx', () => jest.fn());
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn());
+jest.mock('@hooks/useReportPrimaryAction', () => jest.fn());
+jest.mock('@hooks/useMoneyReportHeaderMoreContentVisibility', () => jest.fn());
+jest.mock('@hooks/useResponsiveLayoutOnWideRHP', () => jest.fn(() => ({isWideRHPDisplayedOnWideLayout: false, isSuperWideRHPDisplayedOnWideLayout: false})));
+jest.mock('@hooks/useNetwork', () => jest.fn(() => ({isOffline: false})));
+jest.mock('@hooks/useMobileSelectionMode', () => jest.fn(() => false));
+jest.mock('@hooks/useTransactionsAndViolationsForReport', () => jest.fn(() => ({transactions: {}, violations: {}})));
+jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: (key: string) => key})));
+
+// useThemeStyles throws without a <ThemeStylesProvider>; return a proxy that yields an empty style object
+// for any key so the (mostly-mocked) tree renders without wiring up the full provider stack.
+jest.mock('@hooks/useThemeStyles', () => {
+    const styleProxy = new Proxy({}, {get: () => ({})});
+    return jest.fn(() => styleProxy);
+});
+
+// Only `useRoute` and `useIsFocused` are stubbed: the rest of the module is used by the navigation imports
+// ReportUtils pulls in. The header reads `useIsFocused` to decide whether it owns the shared mobile selection mode,
+// and these tests render it on its own rather than inside a navigator, so there is no navigation object to read.
+jest.mock('@react-navigation/native', () => ({
+    ...jest.requireActual<typeof ReactNavigationNative>('@react-navigation/native'),
+    __esModule: true,
+    useRoute: jest.fn(),
+    useIsFocused: () => true,
+}));
+
+// The providers only supply context to the (mocked) leaves, so pass children straight through.
+jest.mock('@components/MoneyReportHeaderModals', () => {
+    const reactModule = jest.requireActual<typeof React>('react');
+    return jest.fn(({children}: {children: React.ReactNode}) => reactModule.createElement(reactModule.Fragment, null, children));
+});
+jest.mock('@components/PaymentAnimationsContext', () => {
+    const reactModule = jest.requireActual<typeof React>('react');
+    return {
+        __esModule: true,
+        PaymentAnimationsProvider: jest.fn(({children}: {children: React.ReactNode}) => reactModule.createElement(reactModule.Fragment, null, children)),
+    };
+});
+jest.mock('@components/Search/SearchContext', () => ({
+    __esModule: true,
+    useSearchSelectionActions: jest.fn(() => ({clearSelectedTransactions: jest.fn()})),
+}));
+
+// HeaderWithBackButton stands in for the title row: it renders only its children, tagged so the test can
+// assert what landed on the title row and in which order.
+jest.mock('@components/HeaderWithBackButton', () => {
+    const reactModule = jest.requireActual<typeof React>('react');
+    const {View} = jest.requireActual<{View: React.ComponentType<{testID?: string; children?: React.ReactNode}>}>('react-native');
+    return jest.fn(({children}: {children: React.ReactNode}) => reactModule.createElement(View, {testID: 'header-row'}, children));
+});
+jest.mock('@components/HeaderLoadingBar', () => jest.fn(() => null));
+jest.mock('@components/MoneyReportHeaderActions', () => {
+    const reactModule = jest.requireActual<typeof React>('react');
+    const {View} = jest.requireActual<{View: React.ComponentType<{testID?: string; children?: React.ReactNode}>}>('react-native');
+    return jest.fn(() => reactModule.createElement(View, {testID: 'header-actions'}));
+});
+jest.mock('@components/MoneyReportHeaderMoreContent', () => jest.fn(() => null));
+jest.mock('@components/MoneyRequestReportView/MoneyRequestReportNavigation', () => {
+    const reactModule = jest.requireActual<typeof React>('react');
+    const {View} = jest.requireActual<{View: React.ComponentType<{testID?: string; children?: React.ReactNode}>}>('react-native');
+    return jest.fn(() => reactModule.createElement(View, {testID: 'report-carousel'}));
+});
+jest.mock('@components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation', () => {
+    const reactModule = jest.requireActual<typeof React>('react');
+    const {View} = jest.requireActual<{View: React.ComponentType<{testID?: string; children?: React.ReactNode}>}>('react-native');
+    return jest.fn(() => reactModule.createElement(View, {testID: 'transactions-carousel'}));
+});
+
+const mockedUseOnyx = jest.mocked(useOnyx);
+const mockedUseRoute = jest.mocked(useRoute);
+const mockedUseResponsiveLayout = jest.mocked(useResponsiveLayout);
+const mockedUseReportPrimaryAction = jest.mocked(useReportPrimaryAction);
+const mockedMoreContentVisibility = jest.mocked(useMoneyReportHeaderMoreContentVisibility);
+const mockedActions = jest.mocked(MoneyReportHeaderActions);
+const mockedMoreContent = jest.mocked(MoneyReportHeaderMoreContent);
+
+/** Collects the tagged testIDs in render order so the test can assert left-to-right placement on the title row. */
+function getHeaderRowTestIDs(node: ReturnType<ReturnType<typeof render>['toJSON']>): string[] {
+    const found: string[] = [];
+    const walk = (current: unknown, isInsideHeaderRow: boolean) => {
+        if (!current || typeof current !== 'object') {
+            return;
+        }
+        if (Array.isArray(current)) {
+            for (const child of current) {
+                walk(child, isInsideHeaderRow);
+            }
+            return;
+        }
+        const element = current as {props?: Record<string, unknown>; children?: unknown};
+        const testID = element.props?.testID;
+        const isHeaderRow = testID === HEADER_ROW_TEST_ID;
+        if (isInsideHeaderRow && typeof testID === 'string' && testID !== HEADER_ROW_TEST_ID) {
+            found.push(testID);
+        }
+        walk(element.children, isInsideHeaderRow || isHeaderRow);
+    };
+    walk(node, false);
+    return found;
+}
+
+function renderHeader() {
+    return render(
+        <MoneyReportHeader
+            reportID={REPORT_ID}
+            onBackButtonPress={jest.fn()}
+        />,
+    );
+}
+
+/**
+ * Regression guard for https://github.com/Expensify/App/issues/98200: the report actions must sit on the title row
+ * whenever the more-content row would otherwise be blank, no matter whether the report was opened directly or from
+ * Search. Placement used to flip between the two entry points, moving the buttons onto a row of their own in Search.
+ */
+describe('MoneyReportHeader actions placement', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+
+        // A wide layout, so the header-row placement is in play at all.
+        mockedUseResponsiveLayout.mockReturnValue({
+            shouldUseNarrowLayout: false,
+            isSmallScreenWidth: false,
+            isInNarrowPaneModal: false,
+            isExtraSmallScreenHeight: false,
+            isMediumScreenWidth: false,
+            isLargeScreenWidth: true,
+            isExtraLargeScreenWidth: false,
+            isExtraSmallScreenWidth: false,
+            isSmallScreen: false,
+            onboardingIsMediumOrLargerScreenWidth: true,
+            isInLandscapeMode: false,
+        });
+        mockedUseReportPrimaryAction.mockReturnValue(CONST.REPORT.PRIMARY_ACTIONS.PAY);
+        mockedMoreContentVisibility.mockReturnValue({statusBarType: undefined, shouldShowNextStep: false, hasStatusOrNextStep: false});
+        mockedUseOnyx.mockImplementation((key) => {
+            if (key === `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`) {
+                return [iouReport, {status: 'loaded'}];
+            }
+            if (key === `${ONYXKEYS.COLLECTION.REPORT}${CHAT_REPORT_ID}`) {
+                return [dmChatReport, {status: 'loaded'}];
+            }
+            return [undefined, {status: 'loaded'}];
+        });
+    });
+
+    it.each([
+        ['opened directly', SCREENS.REPORT],
+        ['opened from Search', SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT],
+        ['opened from Search as an expense', SCREENS.RIGHT_MODAL.SEARCH_REPORT],
+    ])('keeps the actions on the title row when the report is %s', (_label, routeName) => {
+        mockedUseRoute.mockReturnValue({key: 'route-1', name: routeName, params: {}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).toContain(ACTIONS_TEST_ID);
+        // The actions row under the title must stay empty, otherwise the buttons would render twice.
+        expect(mockedMoreContent).toHaveBeenCalled();
+        expect(mockedMoreContent.mock.calls.at(-1)?.at(0)).toEqual(expect.objectContaining({shouldRenderActionsInRow: false}));
+    });
+
+    it.each([
+        ['an invoice report, whose chat report is an invoice room', {reportID: CHAT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM} as Report],
+        [
+            'a workspace report, whose chat report is a policy expense chat',
+            {reportID: CHAT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT} as Report,
+        ],
+    ])('keeps the actions on the title row for %s', (_label, chatReport) => {
+        mockedUseOnyx.mockImplementation((key) => {
+            if (key === `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`) {
+                return [iouReport, {status: 'loaded'}];
+            }
+            if (key === `${ONYXKEYS.COLLECTION.REPORT}${CHAT_REPORT_ID}`) {
+                return [chatReport, {status: 'loaded'}];
+            }
+            return [undefined, {status: 'loaded'}];
+        });
+        mockedUseRoute.mockReturnValue({key: 'route-1', name: SCREENS.REPORT, params: {}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).toContain(ACTIONS_TEST_ID);
+        expect(mockedMoreContent.mock.calls.at(-1)?.at(0)).toEqual(expect.objectContaining({shouldRenderActionsInRow: false}));
+    });
+
+    it('renders the actions before the carousel so the carousel stays pinned to the top right', () => {
+        mockedUseRoute.mockReturnValue({key: 'route-1', name: SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, params: {}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).toEqual([ACTIONS_TEST_ID, REPORT_CAROUSEL_TEST_ID]);
+    });
+
+    it('moves the actions down to the more-content row when that row has a status or next step', () => {
+        mockedMoreContentVisibility.mockReturnValue({statusBarType: CONST.REPORT.STATUS_BAR_TYPE.ON_HOLD, shouldShowNextStep: false, hasStatusOrNextStep: true});
+        mockedUseRoute.mockReturnValue({key: 'route-1', name: SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, params: {}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).not.toContain(ACTIONS_TEST_ID);
+        expect(mockedActions).not.toHaveBeenCalled();
+        expect(mockedMoreContent.mock.calls.at(-1)?.at(0)).toEqual(expect.objectContaining({shouldRenderActionsInRow: true}));
+    });
+});
+
+describe('MoneyReportHeader transaction carousel anchor', () => {
+    const threadReport = {
+        reportID: REPORT_ID,
+        chatReportID: CHAT_REPORT_ID,
+        parentReportID: PARENT_REPORT_ID,
+        parentReportActionID: PARENT_ACTION_ID,
+        type: CONST.REPORT.TYPE.CHAT,
+    } as Report;
+
+    const parentIOUAction = {
+        reportActionID: PARENT_ACTION_ID,
+        actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+        originalMessage: {IOUTransactionID: THREAD_TRANSACTION_ID, type: CONST.IOU.REPORT_ACTION_TYPE.CREATE},
+    };
+
+    function mockThread({
+        activeIDs,
+        parentActions,
+        transactions = Object.fromEntries(activeIDs.map((id) => [`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`, {transactionID: id, reportID: PARENT_REPORT_ID}])),
+    }: {
+        activeIDs: string[];
+        parentActions: Record<string, unknown> | undefined;
+        transactions?: Record<string, unknown>;
+    }) {
+        // The anchor is read through a `selector`, so the mock has to apply it the way useOnyx does.
+        mockedUseOnyx.mockImplementation((key, options) => {
+            const rawValue = (() => {
+                if (key === `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`) {
+                    return threadReport;
+                }
+                if (key === ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS) {
+                    return activeIDs;
+                }
+                if (key === ONYXKEYS.COLLECTION.TRANSACTION) {
+                    return transactions;
+                }
+                if (key === `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${PARENT_REPORT_ID}`) {
+                    return parentActions;
+                }
+                return undefined;
+            })();
+            const {selector} = options ?? {};
+            const value = selector ? selector(rawValue) : rawValue;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- useOnyx's result type can't express "value depends on the key", and each branch above returns the shape its own key really holds
+            return [value as NonNullable<unknown> | undefined, {status: 'loaded'}];
+        });
+        mockedUseRoute.mockReturnValue({key: 'route-1', name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, params: {}});
+    }
+
+    beforeEach(() => {
+        mockedMoreContentVisibility.mockReturnValue({statusBarType: undefined, shouldShowNextStep: false, hasStatusOrNextStep: false});
+        mockedUseReportPrimaryAction.mockReturnValue(CONST.REPORT.PRIMARY_ACTIONS.PAY);
+    });
+
+    it('renders the transaction carousel using the parent IOU action when the derived index is cold', () => {
+        mockThread({activeIDs: ['other-tx', THREAD_TRANSACTION_ID], parentActions: {[PARENT_ACTION_ID]: parentIOUAction}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).toContain(TRANSACTIONS_CAROUSEL_TEST_ID);
+    });
+
+    it('does not render it when the resolved expense is not one of the carousel siblings', () => {
+        mockThread({activeIDs: ['other-tx', 'unrelated-tx'], parentActions: {[PARENT_ACTION_ID]: parentIOUAction}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).not.toContain(TRANSACTIONS_CAROUSEL_TEST_ID);
+    });
+
+    it('does not render it when the parent action is unavailable, so there is no expense to anchor to', () => {
+        mockThread({activeIDs: ['other-tx', THREAD_TRANSACTION_ID], parentActions: undefined});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).not.toContain(TRANSACTIONS_CAROUSEL_TEST_ID);
+    });
+
+    it('falls through to the report carousel when a sibling has been deleted out from under the list', () => {
+        mockThread({
+            activeIDs: ['other-tx', THREAD_TRANSACTION_ID],
+            parentActions: {[PARENT_ACTION_ID]: parentIOUAction},
+            transactions: {
+                // 'other-tx' is absent: a confirmed delete SETs its key to null, leaving one sibling behind.
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${THREAD_TRANSACTION_ID}`]: {transactionID: THREAD_TRANSACTION_ID, reportID: PARENT_REPORT_ID},
+            },
+        });
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).not.toContain(TRANSACTIONS_CAROUSEL_TEST_ID);
+        expect(getHeaderRowTestIDs(toJSON())).toContain(REPORT_CAROUSEL_TEST_ID);
+    });
+
+    it('does not render the expense carousel in the Inbox central pane', () => {
+        mockThread({activeIDs: ['other-tx', THREAD_TRANSACTION_ID], parentActions: {[PARENT_ACTION_ID]: parentIOUAction}});
+        mockedUseRoute.mockReturnValue({key: 'route-1', name: SCREENS.REPORT, params: {}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).not.toContain(TRANSACTIONS_CAROUSEL_TEST_ID);
+        expect(getHeaderRowTestIDs(toJSON())).not.toContain(REPORT_CAROUSEL_TEST_ID);
+    });
+
+    it('keeps the report carousel on a report opened from the Reports list', () => {
+        mockThread({activeIDs: ['other-tx', THREAD_TRANSACTION_ID], parentActions: {[PARENT_ACTION_ID]: parentIOUAction}});
+        mockedUseRoute.mockReturnValue({key: 'route-1', name: SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, params: {}});
+
+        const {toJSON} = renderHeader();
+
+        expect(getHeaderRowTestIDs(toJSON())).not.toContain(TRANSACTIONS_CAROUSEL_TEST_ID);
+        expect(getHeaderRowTestIDs(toJSON())).toContain(REPORT_CAROUSEL_TEST_ID);
+    });
+});
diff --git a/tests/ui/components/MoneyReportHeaderMoreContentTest.tsx b/tests/ui/components/MoneyReportHeaderMoreContentTest.tsx
deleted file mode 100644
index 0cb04c080d37..000000000000
--- a/tests/ui/components/MoneyReportHeaderMoreContentTest.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import {render} from '@testing-library/react-native';
-
-import MoneyReportHeaderMoreContent from '@components/MoneyReportHeaderMoreContent';
-import MoneyReportHeaderNextStep from '@components/MoneyReportHeaderNextStep';
-
-import useMoneyReportHeaderStatusBar from '@hooks/useMoneyReportHeaderStatusBar';
-import useOnyx from '@hooks/useOnyx';
-
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, Report} from '@src/types/onyx';
-
-import type {UseOnyxResult} from 'react-native-onyx';
-
-import React from 'react';
-
-import createRandomPolicy from '../../utils/collections/policies';
-
-const TEST_REPORT_ID = '1001';
-const TEST_POLICY_ID = 'policy1';
-
-const report = {
-    reportID: TEST_REPORT_ID,
-    policyID: TEST_POLICY_ID,
-    type: CONST.REPORT.TYPE.EXPENSE,
-} as Report;
-
-function createOnyxResult<T>(value: NonNullable<T> | undefined): UseOnyxResult<T> {
-    return [value, {status: 'loaded'}];
-}
-
-// `useRoute` is only used to detect Search routes; default to a regular report route so `isReportInSearch` is false.
-// Spread the real module so navigation internals (e.g. createNavigationContainerRef) pulled in by the real
-// PolicyUtils import chain keep working.
-jest.mock('@react-navigation/native', () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const actualNavigation = jest.requireActual('@react-navigation/native');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return {
-        ...actualNavigation,
-        __esModule: true,
-        useRoute: jest.fn(() => ({name: 'report'})),
-    };
-});
-
-// The next-step bar is the element under test; render nothing but track whether it was mounted via the visibility gate.
-jest.mock('@components/MoneyReportHeaderNextStep', () => ({__esModule: true, default: jest.fn(() => null)}));
-jest.mock('@components/MoneyReportHeaderStatusBarSection', () => ({__esModule: true, default: () => null}));
-jest.mock('@components/MoneyRequestReportView/MoneyRequestReportNavigation', () => ({__esModule: true, default: () => null}));
-jest.mock('@components/MoneyReportTransactionThreadContext', () => ({__esModule: true, useMoneyReportTransactionThread: jest.fn(() => ({iouTransactionID: undefined}))}));
-
-// Spread the real module: the live PolicyUtils import chain relies on many other ReportUtils exports.
-jest.mock('@libs/ReportUtils', () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const actualReportUtils = jest.requireActual('@libs/ReportUtils');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return {
-        ...actualReportUtils,
-        __esModule: true,
-        isInvoiceReport: jest.fn(() => false),
-    };
-});
-
-jest.mock('@hooks/useThemeStyles', () => ({__esModule: true, default: jest.fn(() => ({}))}));
-jest.mock('@hooks/useResponsiveLayout', () => ({__esModule: true, default: jest.fn(() => ({shouldUseNarrowLayout: false, isMediumScreenWidth: false}))}));
-jest.mock('@hooks/useResponsiveLayoutOnWideRHP', () => ({__esModule: true, default: jest.fn(() => ({isWideRHPDisplayedOnWideLayout: false, isSuperWideRHPDisplayedOnWideLayout: false}))}));
-jest.mock('@hooks/useMoneyReportHeaderStatusBar', () => ({__esModule: true, default: jest.fn(() => ({shouldShowStatusBar: false, statusBarType: undefined}))}));
-jest.mock('@hooks/useOnyx', () => jest.fn());
-
-const mockedUseOnyx = jest.mocked(useOnyx);
-const mockedStatusBar = jest.mocked(useMoneyReportHeaderStatusBar);
-const mockedNextStepBar = jest.mocked(MoneyReportHeaderNextStep);
-
-let policyValue: Policy | undefined;
-
-function mockPolicyType(type: Policy['type']) {
-    policyValue = {...createRandomPolicy(1, type), id: TEST_POLICY_ID};
-}
-
-describe('MoneyReportHeaderMoreContent', () => {
-    beforeEach(() => {
-        jest.clearAllMocks();
-        policyValue = undefined;
-        mockedStatusBar.mockReturnValue({shouldShowStatusBar: false, statusBarType: undefined});
-        mockedUseOnyx.mockImplementation((key) => {
-            if (key === `${ONYXKEYS.COLLECTION.REPORT}${TEST_REPORT_ID}`) {
-                return createOnyxResult<Report>(report);
-            }
-            if (key === `${ONYXKEYS.COLLECTION.POLICY}${TEST_POLICY_ID}`) {
-                return createOnyxResult<Policy>(policyValue);
-            }
-            return createOnyxResult(undefined);
-        });
-    });
-
-    it('renders the next step bar for a Submit workspace', () => {
-        mockPolicyType(CONST.POLICY.TYPE.SUBMIT);
-        render(<MoneyReportHeaderMoreContent reportID={TEST_REPORT_ID} />);
-        expect(mockedNextStepBar).toHaveBeenCalled();
-    });
-
-    it('renders the next step bar for a paid (team) workspace', () => {
-        mockPolicyType(CONST.POLICY.TYPE.TEAM);
-        render(<MoneyReportHeaderMoreContent reportID={TEST_REPORT_ID} />);
-        expect(mockedNextStepBar).toHaveBeenCalled();
-    });
-
-    it('does not render the next step bar for a personal workspace', () => {
-        mockPolicyType(CONST.POLICY.TYPE.PERSONAL);
-        render(<MoneyReportHeaderMoreContent reportID={TEST_REPORT_ID} />);
-        expect(mockedNextStepBar).not.toHaveBeenCalled();
-    });
-
-    it('does not render the next step bar when a status bar is shown', () => {
-        mockPolicyType(CONST.POLICY.TYPE.SUBMIT);
-        mockedStatusBar.mockReturnValue({shouldShowStatusBar: true, statusBarType: CONST.REPORT.STATUS_BAR_TYPE.ON_HOLD});
-        render(<MoneyReportHeaderMoreContent reportID={TEST_REPORT_ID} />);
-        expect(mockedNextStepBar).not.toHaveBeenCalled();
-    });
-});
diff --git a/tests/ui/components/MoneyReportHeaderMoreContentVisibilityTest.tsx b/tests/ui/components/MoneyReportHeaderMoreContentVisibilityTest.tsx
new file mode 100644
index 000000000000..d52e54138a91
--- /dev/null
+++ b/tests/ui/components/MoneyReportHeaderMoreContentVisibilityTest.tsx
@@ -0,0 +1,120 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useMoneyReportHeaderMoreContentVisibility from '@hooks/useMoneyReportHeaderMoreContentVisibility';
+import useMoneyReportHeaderStatusBar from '@hooks/useMoneyReportHeaderStatusBar';
+import useOnyx from '@hooks/useOnyx';
+
+import {isInvoiceReport} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, Report} from '@src/types/onyx';
+
+import type {UseOnyxResult} from 'react-native-onyx';
+
+import createRandomPolicy from '../../utils/collections/policies';
+
+const TEST_REPORT_ID = '1001';
+const TEST_POLICY_ID = 'policy1';
+
+const report = {
+    reportID: TEST_REPORT_ID,
+    policyID: TEST_POLICY_ID,
+    type: CONST.REPORT.TYPE.EXPENSE,
+} as Report;
+
+function createOnyxResult<T>(value: NonNullable<T> | undefined): UseOnyxResult<T> {
+    return [value, {status: 'loaded'}];
+}
+
+// Spread the real module: the live PolicyUtils import chain relies on many other ReportUtils exports.
+jest.mock('@libs/ReportUtils', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const actualReportUtils = jest.requireActual('@libs/ReportUtils');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actualReportUtils,
+        __esModule: true,
+        isInvoiceReport: jest.fn(() => false),
+    };
+});
+
+jest.mock('@hooks/useMoneyReportHeaderStatusBar', () => ({__esModule: true, default: jest.fn(() => ({shouldShowStatusBar: false, statusBarType: undefined}))}));
+jest.mock('@hooks/useOnyx', () => jest.fn());
+
+const mockedUseOnyx = jest.mocked(useOnyx);
+const mockedStatusBar = jest.mocked(useMoneyReportHeaderStatusBar);
+const mockedIsInvoiceReport = jest.mocked(isInvoiceReport);
+
+let policyValue: Policy | undefined;
+
+function mockPolicyType(type: Policy['type']) {
+    policyValue = {...createRandomPolicy(1, type), id: TEST_POLICY_ID};
+}
+
+/**
+ * `hasStatusOrNextStep` is what the header uses to decide where the report actions go: at the end of the
+ * more-content row when that row has its own content, or in the header row when it would otherwise be blank.
+ */
+describe('useMoneyReportHeaderMoreContentVisibility', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        policyValue = undefined;
+        mockedIsInvoiceReport.mockReturnValue(false);
+        mockedStatusBar.mockReturnValue({shouldShowStatusBar: false, statusBarType: undefined});
+        mockedUseOnyx.mockImplementation((key) => {
+            if (key === `${ONYXKEYS.COLLECTION.REPORT}${TEST_REPORT_ID}`) {
+                return createOnyxResult<Report>(report);
+            }
+            if (key === `${ONYXKEYS.COLLECTION.POLICY}${TEST_POLICY_ID}`) {
+                return createOnyxResult<Policy>(policyValue);
+            }
+            return createOnyxResult(undefined);
+        });
+    });
+
+    it('shows the next step for a Submit workspace', () => {
+        mockPolicyType(CONST.POLICY.TYPE.SUBMIT);
+        const {result} = renderHook(() => useMoneyReportHeaderMoreContentVisibility(TEST_REPORT_ID));
+        expect(result.current.shouldShowNextStep).toBe(true);
+        expect(result.current.hasStatusOrNextStep).toBe(true);
+    });
+
+    it('shows the next step for a paid (team) workspace', () => {
+        mockPolicyType(CONST.POLICY.TYPE.TEAM);
+        const {result} = renderHook(() => useMoneyReportHeaderMoreContentVisibility(TEST_REPORT_ID));
+        expect(result.current.shouldShowNextStep).toBe(true);
+        expect(result.current.hasStatusOrNextStep).toBe(true);
+    });
+
+    it('does not show the next step for a personal workspace', () => {
+        mockPolicyType(CONST.POLICY.TYPE.PERSONAL);
+        const {result} = renderHook(() => useMoneyReportHeaderMoreContentVisibility(TEST_REPORT_ID));
+        expect(result.current.shouldShowNextStep).toBe(false);
+    });
+
+    it('does not show the next step when a status bar is shown', () => {
+        mockPolicyType(CONST.POLICY.TYPE.SUBMIT);
+        mockedStatusBar.mockReturnValue({shouldShowStatusBar: true, statusBarType: CONST.REPORT.STATUS_BAR_TYPE.ON_HOLD});
+        const {result} = renderHook(() => useMoneyReportHeaderMoreContentVisibility(TEST_REPORT_ID));
+        expect(result.current.shouldShowNextStep).toBe(false);
+        // A status bar still fills the more-content row, so the actions stay in it.
+        expect(result.current.hasStatusOrNextStep).toBe(true);
+    });
+
+    it('reports an empty more-content row for a personal workspace with no status bar', () => {
+        mockPolicyType(CONST.POLICY.TYPE.PERSONAL);
+        const {result} = renderHook(() => useMoneyReportHeaderMoreContentVisibility(TEST_REPORT_ID));
+        // This is the 1:1 DM IOU case: nothing to show, so the actions move up into the header row
+        // instead of sitting alone on a blank line under the title.
+        expect(result.current.hasStatusOrNextStep).toBe(false);
+    });
+
+    it('reports an empty more-content row for an invoice report, even on a paid workspace', () => {
+        mockPolicyType(CONST.POLICY.TYPE.TEAM);
+        mockedIsInvoiceReport.mockReturnValue(true);
+        const {result} = renderHook(() => useMoneyReportHeaderMoreContentVisibility(TEST_REPORT_ID));
+        expect(result.current.shouldShowNextStep).toBe(false);
+        expect(result.current.hasStatusOrNextStep).toBe(false);
+    });
+});
diff --git a/tests/ui/components/MoneyReportHeaderSelectionModeTest.tsx b/tests/ui/components/MoneyReportHeaderSelectionModeTest.tsx
index a6b2bf67464b..323e51a4fca4 100644
--- a/tests/ui/components/MoneyReportHeaderSelectionModeTest.tsx
+++ b/tests/ui/components/MoneyReportHeaderSelectionModeTest.tsx
@@ -5,6 +5,7 @@ import MoneyReportHeader from '@components/MoneyReportHeader';
 import MoneyReportHeaderActions from '@components/MoneyReportHeaderActions';
 
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
+import useMoneyReportHeaderMoreContentVisibility from '@hooks/useMoneyReportHeaderMoreContentVisibility';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -57,6 +58,12 @@ jest.mock('@components/MoneyReportHeaderActions', () => jest.fn(() => null));
 jest.mock('@components/MoneyReportHeaderMoreContent', () => jest.fn(() => null));
 jest.mock('@components/HeaderLoadingBar', () => jest.fn(() => null));
 
+// The route mocked above is a search route, so the wide branch of the header renders the report carousel beside the
+// title. These tests are about which header branch renders, not about the arrows, and the real carousels read the
+// search contexts and Onyx directly, which the mocks below deliberately do not provide.
+jest.mock('@components/MoneyRequestReportView/MoneyRequestReportNavigation', () => jest.fn(() => null));
+jest.mock('@components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation', () => jest.fn(() => null));
+
 // The modal host and the payment animation provider only wrap the content, so render each as a plain
 // wrapper that yields its children instead of wiring up their full Onyx/context dependency chains.
 jest.mock('@components/MoneyReportHeaderModals', () => {
@@ -79,6 +86,10 @@ jest.mock('@components/Search/SearchContext', () => ({__esModule: true, useSearc
 jest.mock('@libs/actions/MobileSelectionMode', () => ({__esModule: true, turnOffMobileSelectionMode: jest.fn(), turnOnMobileSelectionMode: jest.fn()}));
 
 jest.mock('@hooks/useMobileSelectionMode', () => jest.fn());
+// The more-content row decides whether the actions sit in the header row or under it. These tests are about the
+// selection-mode branch rather than that placement, and the row's real visibility is derived from the filler
+// transactions below, so it is pinned to "nothing to show" and the actions stay in the header row.
+jest.mock('@hooks/useMoneyReportHeaderMoreContentVisibility', () => jest.fn());
 jest.mock('@hooks/useNetwork', () => jest.fn());
 jest.mock('@hooks/useOnyx', () => jest.fn());
 jest.mock('@hooks/useResponsiveLayout', () => jest.fn());
@@ -91,6 +102,7 @@ jest.mock('@hooks/useLocalize', () => jest.fn(() => ({translate: jest.fn((key: s
 const mockHeaderWithBackButton = jest.mocked(HeaderWithBackButton);
 const mockMoneyReportHeaderActions = jest.mocked(MoneyReportHeaderActions);
 const mockUseMobileSelectionMode = jest.mocked(useMobileSelectionMode);
+const mockUseMoneyReportHeaderMoreContentVisibility = jest.mocked(useMoneyReportHeaderMoreContentVisibility);
 const mockUseNetwork = jest.mocked(useNetwork);
 const mockUseOnyx = jest.mocked(useOnyx);
 const mockUseResponsiveLayout = jest.mocked(useResponsiveLayout);
@@ -188,6 +200,7 @@ describe('MoneyReportHeader selection mode header', () => {
 
         mockUseNetwork.mockReturnValue({isOffline: false});
         mockUseMobileSelectionMode.mockReturnValue(true);
+        mockUseMoneyReportHeaderMoreContentVisibility.mockReturnValue({statusBarType: undefined, shouldShowNextStep: false, hasStatusOrNextStep: false});
         mockUseOnyx.mockImplementation((key) => {
             if (key === `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`) {
                 return createOnyxResult<Report>(report);
diff --git a/tests/ui/components/ReportPreviewActionButtonTest.tsx b/tests/ui/components/ReportPreviewActionButtonTest.tsx
index ea9221f37cf7..e1cc2874ff26 100644
--- a/tests/ui/components/ReportPreviewActionButtonTest.tsx
+++ b/tests/ui/components/ReportPreviewActionButtonTest.tsx
@@ -65,8 +65,8 @@ jest.mock('@components/ReportActionItem/MoneyRequestReportPreview/AddExpenseActi
     },
 }));
 jest.mock('@components/Button', () => {
-    function MockButton() {
-        mockView();
+    function MockButton(props: unknown) {
+        mockView(props);
         return null;
     }
 
@@ -135,4 +135,17 @@ describe('ReportPreviewActionButton', () => {
         const viewOnly = render(<ReportPreviewActionButton />);
         expect(flattenContainerStyle(viewOnly)).not.toEqual(expect.arrayContaining([mockStyles.flexRow]));
     });
+
+    it('splits the row evenly between the primary action and View', () => {
+        // Given a report whose preview shows a primary action next to View
+        mockActionState.reportPreviewAction = CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
+
+        // When the buttons render
+        const rendered = render(<ReportPreviewActionButton />);
+
+        // Then both children of the row flex equally, so neither button hugs its label while the other fills the rest
+        const primaryWrapperStyle: unknown = rendered.UNSAFE_getAllByType(View).at(1)?.props.style;
+        expect(primaryWrapperStyle).toEqual(expect.arrayContaining([mockStyles.flex1]));
+        expect(mockView).toHaveBeenCalledWith(expect.objectContaining({style: mockStyles.flex1}));
+    });
 });
diff --git a/tests/ui/components/SearchAutocompleteListTest.tsx b/tests/ui/components/SearchAutocompleteListTest.tsx
index d3af9a6354dd..3735aa245954 100644
--- a/tests/ui/components/SearchAutocompleteListTest.tsx
+++ b/tests/ui/components/SearchAutocompleteListTest.tsx
@@ -195,10 +195,11 @@ describe('SearchAutocompleteList', () => {
         const mockUseFilteredOptions = jest.mocked(useFilteredOptions);
         const mockCombineOrdering = jest.mocked(combineOrderingOfReportsAndPersonalDetails);
 
-        // Before the report loads, the DM is just a personal detail keyed by accountID.
+        // Given a locally available DM represented by its participant accountID
         const dmAsPersonalDetail: OptionData = {reportID: '', keyForList: '123', accountID: 123, text: 'Alice', alternateText: '', lastMessageText: ''};
         mockCombineOrdering.mockReturnValue({recentReports: [dmAsPersonalDetail], personalDetails: []});
 
+        // When the search results are first rendered
         const {rerender, toJSON} = render(
             <OnyxListItemProvider>
                 <LocaleContextProvider>
@@ -213,18 +214,15 @@ describe('SearchAutocompleteList', () => {
 
         await waitForBatchedUpdatesWithAct();
 
-        // The DM shows up under "Recent chats" and its position is now frozen.
+        // Then the DM is shown in the "Recent chats" section
         const treeAfterFreeze = JSON.stringify(toJSON());
         expect(treeAfterFreeze).toContain('Recent chats');
         expect(treeAfterFreeze).toContain('Alice');
         expect(treeAfterFreeze.indexOf('Recent chats')).toBeLessThan(treeAfterFreeze.indexOf('Alice'));
 
-        // Now the search results come back. The DM's report loads, so its keyForList flips to the reportID
-        // (accountID stays the same). We hand back a new options reference so the list recomputes without
-        // touching the query, otherwise the frozen ranks would be rebuilt.
+        // When the server response hydrates the DM report and adds server-only reports
         const dmAsReport: OptionData = {reportID: '456', keyForList: '456', accountID: 123, isDM: true, text: 'Alice', alternateText: '', lastMessageText: ''};
-        // Alice also has a task report. It carries her accountID too, but it isn't the DM, so it should end up
-        // in the server section rather than pinned under "Recent chats".
+        // And a task report shares Alice's accountID without being the DM
         const aliceTaskReport: OptionData = {reportID: '999', keyForList: '999', accountID: 123, isDM: false, isTaskReport: true, text: 'Alice Task', alternateText: '', lastMessageText: ''};
         const brandNewServerReport: OptionData = {reportID: '789', keyForList: '789', accountID: 0, text: 'Bob', alternateText: '', lastMessageText: ''};
         mockUseFilteredOptions.mockReturnValue({
@@ -238,6 +236,10 @@ describe('SearchAutocompleteList', () => {
         });
         mockCombineOrdering.mockReturnValue({recentReports: [dmAsReport, aliceTaskReport, brandNewServerReport], personalDetails: []});
 
+        await act(async () => {
+            await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['999', '789', '456']);
+        });
+
         rerender(
             <OnyxListItemProvider>
                 <LocaleContextProvider>
@@ -260,20 +262,19 @@ describe('SearchAutocompleteList', () => {
         const aliceTaskIndex = treeAfterServer.indexOf('Alice Task');
         const bobIndex = treeAfterServer.indexOf('Bob');
 
-        // Both section headers and all three rows rendered.
+        // Then the hydrated DM remains in the "Recent chats" section, and the other reports appear in "Search results"
         expect(recentChatsIndex).toBeGreaterThanOrEqual(0);
         expect(serverResultsIndex).toBeGreaterThan(recentChatsIndex);
         expect(aliceDMIndex).toBeGreaterThanOrEqual(0);
         expect(aliceTaskIndex).toBeGreaterThanOrEqual(0);
         expect(bobIndex).toBeGreaterThanOrEqual(0);
 
-        // The DM stayed under "Recent chats" (before the "Search results" header) despite the keyForList flip.
         expect(aliceDMIndex).toBeGreaterThan(recentChatsIndex);
         expect(aliceDMIndex).toBeLessThan(serverResultsIndex);
 
-        // Alice's task report and Bob's report are in the server section - the task wasn't pinned just
-        // because it shares Alice's accountID.
+        // And "Search results" follows Auth's order without treating Alice's task as her DM
         expect(aliceTaskIndex).toBeGreaterThan(serverResultsIndex);
         expect(bobIndex).toBeGreaterThan(serverResultsIndex);
+        expect(aliceTaskIndex).toBeLessThan(bobIndex);
     });
 });
diff --git a/tests/ui/components/SwitchTest.tsx b/tests/ui/components/SwitchTest.tsx
new file mode 100644
index 000000000000..c4520306fe64
--- /dev/null
+++ b/tests/ui/components/SwitchTest.tsx
@@ -0,0 +1,62 @@
+import {render, screen} from '@testing-library/react-native';
+
+import Switch from '@components/Switch';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        translate: (key: string) => (key === 'common.locked' ? 'Locked' : key),
+    })),
+);
+
+const LABEL = 'Auto-pay approved reports';
+const LOCKED_LABEL = `${LABEL}, Locked`;
+
+function renderSwitch(props: Partial<React.ComponentProps<typeof Switch>> = {}) {
+    return render(
+        <Switch
+            isOn={false}
+            onToggle={jest.fn()}
+            accessibilityLabel={LABEL}
+            {...props}
+        />,
+    );
+}
+
+describe('Switch', () => {
+    it('does not announce a locked state when the switch is enabled and shows no lock icon', () => {
+        // Given an enabled switch without a lock icon
+        renderSwitch();
+
+        // When a screen reader reads the switch
+        const switchElement = screen.getByRole(CONST.ROLE.SWITCH);
+
+        // Then the label is left as is
+        expect(switchElement).toHaveProp('accessibilityLabel', LABEL);
+    });
+
+    it('announces a locked state when the switch is disabled', () => {
+        // Given a disabled switch
+        renderSwitch({disabled: true});
+
+        // When a screen reader reads the switch
+        const switchElement = screen.getByRole(CONST.ROLE.SWITCH);
+
+        // Then the label says the switch is locked
+        expect(switchElement).toHaveProp('accessibilityLabel', LOCKED_LABEL);
+    });
+
+    it('announces a locked state when the switch is pressable but shows the lock icon', () => {
+        // Given a pressable switch that shows the lock icon, e.g. one that routes to an upgrade page
+        renderSwitch({showLockIcon: true});
+
+        // When a screen reader reads the switch
+        const switchElement = screen.getByRole(CONST.ROLE.SWITCH);
+
+        // Then the label says the switch is locked, matching the icon
+        expect(switchElement).toHaveProp('accessibilityLabel', LOCKED_LABEL);
+    });
+});
diff --git a/tests/ui/components/ToggleSettingsOptionRowTest.tsx b/tests/ui/components/ToggleSettingsOptionRowTest.tsx
new file mode 100644
index 000000000000..0539ab7ad7a3
--- /dev/null
+++ b/tests/ui/components/ToggleSettingsOptionRowTest.tsx
@@ -0,0 +1,58 @@
+import {render, screen} from '@testing-library/react-native';
+
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+
+import type ReactNative from 'react-native';
+
+import React from 'react';
+
+jest.mock('@components/RenderHTML', () => {
+    const {Text} = jest.requireActual<typeof ReactNative>('react-native');
+    return ({html}: {html: string}) => <Text testID="parsed-subtitle">{html}</Text>;
+});
+
+const SUBTITLE_STYLE = {paddingTop: 4};
+
+function renderRow(shouldParseSubtitle: boolean) {
+    return render(
+        <ToggleSettingOptionRow
+            title="Auto-pay approved reports"
+            subtitle="Auto-pay is only available on the Control plan."
+            subtitleStyle={SUBTITLE_STYLE}
+            parsedSubtitleContainerStyle={SUBTITLE_STYLE}
+            switchAccessibilityLabel="Auto-pay approved reports"
+            shouldPlaceSubtitleBelowSwitch
+            shouldParseSubtitle={shouldParseSubtitle}
+            isActive={false}
+            onToggle={jest.fn()}
+        />,
+    );
+}
+
+describe('ToggleSettingOptionRow', () => {
+    it('applies subtitleStyle to a plain-text subtitle', () => {
+        // Given a row with a plain-text subtitle and a custom subtitle style
+        renderRow(false);
+
+        // When the subtitle renders
+        const subtitle = screen.getByText('Auto-pay is only available on the Control plan.');
+
+        // Then it gets the custom style
+        expect(subtitle).toHaveStyle(SUBTITLE_STYLE);
+    });
+
+    it('applies parsedSubtitleContainerStyle to a parsed HTML subtitle so the row is as tall as with a plain-text subtitle', () => {
+        // Given a row with a parsed HTML subtitle (e.g. one with an upgrade link) and a custom subtitle style
+        renderRow(true);
+
+        // When the subtitle renders
+        const subtitleText = screen.getByTestId('parsed-subtitle');
+        let subtitleWrapper = subtitleText.parent;
+        while (subtitleWrapper && typeof subtitleWrapper.type !== 'string') {
+            subtitleWrapper = subtitleWrapper.parent;
+        }
+
+        // Then its wrapper gets the same custom style as the plain-text subtitle
+        expect(subtitleWrapper).toHaveStyle(SUBTITLE_STYLE);
+    });
+});
diff --git a/tests/ui/hooks/useHtmlPasteTest/index.tsx b/tests/ui/hooks/useHtmlPasteTest/index.tsx
index 39994021dd4a..b5a4f2e755e6 100644
--- a/tests/ui/hooks/useHtmlPasteTest/index.tsx
+++ b/tests/ui/hooks/useHtmlPasteTest/index.tsx
@@ -2,8 +2,13 @@ import {act, renderHook} from '@testing-library/react-native';
 
 import useHtmlPaste from '@hooks/useHtmlPaste';
 
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+
 import type {RefObject} from 'react';
 
+import Onyx from 'react-native-onyx';
+
 import createMock from '../../../utils/createMock';
 import waitForBatchedUpdatesWithAct from '../../../utils/waitForBatchedUpdatesWithAct';
 
@@ -156,3 +161,85 @@ describe('useHtmlPaste - handlePastePlainText', () => {
         }
     });
 });
+
+describe('useHtmlPaste - handlePastedHTML', () => {
+    const MENTIONED_REPORT_ID = '1';
+    const ROOM_NAME = '#general';
+    const PASTED_HTML = `Hey <mention-report reportID="${MENTIONED_REPORT_ID}"/> team`;
+
+    let textInputRef: RefObject<HTMLDivElement | null>;
+    let textInputElement: HTMLDivElement;
+
+    /** The HTML flavour of the clipboard, which is what Clipboard.setHtml writes when copying a message. */
+    const createHtmlClipboardEvent = (html: string): Event => {
+        const event = new Event('paste', {bubbles: true, cancelable: true});
+        Object.defineProperty(event, 'clipboardData', {
+            value: {
+                getData: (type: string) => (type === 'text/html' ? html : ''),
+                types: ['text/html'],
+                files: [],
+                items: [],
+            },
+        });
+        return event;
+    };
+
+    const pasteHtmlIntoActiveInput = async (html: string) => {
+        // @ts-expect-error -- this web test intentionally passes a contenteditable DOM ref to the shared hybrid hook.
+        renderHook(() => useHtmlPaste(textInputRef, undefined, true));
+        await waitForBatchedUpdatesWithAct();
+        await act(async () => {
+            document.dispatchEvent(createHtmlClipboardEvent(html));
+            await waitForBatchedUpdatesWithAct();
+        });
+    };
+
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await Onyx.clear();
+
+        textInputElement = document.createElement('div');
+        textInputElement.setAttribute('contenteditable', 'true');
+        textInputElement.textContent = '';
+        document.body.appendChild(textInputElement);
+        // The hook ignores a paste when the input is not focused, and a bare DOM node has no isFocused().
+        Object.defineProperty(textInputElement, 'isFocused', {value: () => true, configurable: true});
+        textInputRef = {current: textInputElement};
+
+        const range = document.createRange();
+        range.selectNodeContents(textInputElement);
+        const selection = window.getSelection();
+        selection?.removeAllRanges();
+        selection?.addRange(range);
+    });
+
+    afterEach(() => {
+        document.body.removeChild(textInputElement);
+    });
+
+    it('resolves a pasted report mention to the room name', async () => {
+        // Given the mentioned report is in Onyx, as it is when copying from a chat you can see
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${MENTIONED_REPORT_ID}`, {reportID: MENTIONED_REPORT_ID, reportName: ROOM_NAME} as Report);
+
+        // When the HTML flavour of the clipboard is pasted into the input
+        await pasteHtmlIntoActiveInput(PASTED_HTML);
+
+        // Then the mention lands as the room name. Without the map ExpensiMark cannot resolve the
+        // reportID and the user would silently paste "#Hidden" over a real mention.
+        expect(textInputElement.textContent).toBe(`Hey ${ROOM_NAME} team`);
+    });
+
+    it('falls back to #Hidden when the mentioned report is not available', async () => {
+        // Given a mention of a report the user has no access to, so it is absent from Onyx
+
+        // When that HTML is pasted
+        await pasteHtmlIntoActiveInput(PASTED_HTML);
+
+        // Then ExpensiMark's own fallback shows, rather than leaking a raw reportID
+        expect(textInputElement.textContent).toBe('Hey #Hidden team');
+    });
+});
diff --git a/tests/unit/AccountManagerBannerTest.tsx b/tests/unit/AccountManagerBannerTest.tsx
deleted file mode 100644
index 34d5b042aa5a..000000000000
--- a/tests/unit/AccountManagerBannerTest.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import {render, screen} from '@testing-library/react-native';
-
-import {LocaleContextProvider} from '@components/LocaleContextProvider';
-import OnyxListItemProvider from '@components/OnyxListItemProvider';
-
-import AccountManagerBanner from '@pages/inbox/AccountManagerBanner';
-
-import ONYXKEYS from '@src/ONYXKEYS';
-
-import React from 'react';
-import Onyx from 'react-native-onyx';
-
-import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
-
-jest.mock('@libs/Navigation/Navigation', () => ({
-    getActiveRouteWithoutParams: jest.fn(() => ''),
-    isNavigationReady: jest.fn(() => Promise.resolve()),
-    navigate: jest.fn(),
-}));
-
-jest.mock('@hooks/useLazyAsset', () => ({
-    useMemoizedLazyExpensifyIcons: jest.fn(() => ({
-        Lightbulb: 'Lightbulb',
-    })),
-}));
-
-const CONCIERGE_REPORT_ID = '1';
-const ACCOUNT_MANAGER_REPORT_ID = '2';
-const ACCOUNT_MANAGER_ACCOUNT_ID = 42;
-const ACCOUNT_MANAGER_LOGIN = 'am@expensify.com';
-const ACCOUNT_MANAGER_DISPLAY_NAME = 'Jamie Manager';
-
-function renderBanner() {
-    return render(
-        <OnyxListItemProvider>
-            <LocaleContextProvider>
-                <AccountManagerBanner reportID={CONCIERGE_REPORT_ID} />
-            </LocaleContextProvider>
-        </OnyxListItemProvider>,
-    );
-}
-
-describe('AccountManagerBanner', () => {
-    beforeAll(() => {
-        Onyx.init({keys: ONYXKEYS});
-    });
-
-    beforeEach(async () => {
-        jest.clearAllMocks();
-        await Onyx.clear();
-        await Onyx.merge(ONYXKEYS.CONCIERGE_REPORT_ID, CONCIERGE_REPORT_ID);
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${CONCIERGE_REPORT_ID}`, {
-            reportID: CONCIERGE_REPORT_ID,
-        });
-        await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
-            [ACCOUNT_MANAGER_ACCOUNT_ID]: {
-                accountID: ACCOUNT_MANAGER_ACCOUNT_ID,
-                login: ACCOUNT_MANAGER_LOGIN,
-                displayName: ACCOUNT_MANAGER_DISPLAY_NAME,
-            },
-        });
-    });
-
-    it('renders the banner body using account.accountManagerAccountID (the OpenApp-populated field)', async () => {
-        await Onyx.merge(ONYXKEYS.ACCOUNT, {
-            accountManagerReportID: ACCOUNT_MANAGER_REPORT_ID,
-            accountManagerAccountID: ACCOUNT_MANAGER_ACCOUNT_ID,
-        });
-
-        renderBanner();
-        await waitForBatchedUpdatesWithAct();
-
-        expect(screen.getByText(new RegExp(ACCOUNT_MANAGER_DISPLAY_NAME))).toBeTruthy();
-        expect(screen.getByText(new RegExp(ACCOUNT_MANAGER_LOGIN))).toBeTruthy();
-    });
-
-    it('renders nothing when account.accountManagerReportID is not set', async () => {
-        renderBanner();
-        await waitForBatchedUpdatesWithAct();
-
-        expect(screen.queryByText(new RegExp(ACCOUNT_MANAGER_DISPLAY_NAME))).toBeNull();
-    });
-
-    it('does not populate the banner from the legacy top-level ACCOUNT_MANAGER_REPORT_ID key (regression guard)', async () => {
-        // The legacy standalone key is never written to by OpenApp. If the banner regresses to reading it,
-        // this test will start showing the banner text even though `account` is empty — and fail.
-        await Onyx.merge(ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID, ACCOUNT_MANAGER_REPORT_ID);
-
-        renderBanner();
-        await waitForBatchedUpdatesWithAct();
-
-        expect(screen.queryByText(new RegExp(ACCOUNT_MANAGER_DISPLAY_NAME))).toBeNull();
-    });
-});
diff --git a/tests/unit/AccountingUtilsTest.ts b/tests/unit/AccountingUtilsTest.ts
index 406072ee50b4..68e901b0a148 100644
--- a/tests/unit/AccountingUtilsTest.ts
+++ b/tests/unit/AccountingUtilsTest.ts
@@ -2,14 +2,19 @@ import {
     getAccountingIntegrationDisplayName,
     getExportLabelForConnection,
     getExportLabelsForConnection,
+    getQBORefreshTokenExpiryDate,
+    getQBORefreshTokenExpiryStatus,
     getQuickbooksOnlineIntegrationName,
     isIntuitEnterpriseSuiteConnection,
+    isQBORefreshTokenExpiringSoon,
 } from '@libs/AccountingUtils';
 
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import type {Policy} from '@src/types/onyx';
 
+import {addDays, getUnixTime, subDays} from 'date-fns';
+
 import createMock from '../utils/createMock';
 import {translateLocal} from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
@@ -32,12 +37,96 @@ function buildQBOConnectionPolicy(scope?: string): Policy {
     });
 }
 
+function buildQBOPolicyWithRefreshTokenExpiry(refreshTokenExpiresAt: number, isAuthenticationError = false): Policy {
+    return createMock<Policy>({
+        connections: {
+            quickbooksOnline: {
+                config: {
+                    credentials: {
+                        companyID: '12345',
+                        refreshTokenExpiresAt,
+                    },
+                },
+                lastSync: {
+                    isAuthenticationError,
+                },
+            },
+        },
+    });
+}
+
 describe('AccountingUtils', () => {
     beforeAll(() => {
         IntlStore.load(CONST.LOCALES.DEFAULT);
         return waitForBatchedUpdates();
     });
 
+    describe('getQBORefreshTokenExpiryDate', () => {
+        it('converts the stored epoch seconds into a date', () => {
+            const expiry = addDays(new Date(), 10);
+
+            expect(getQBORefreshTokenExpiryDate(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(expiry)))?.getTime()).toBe(Math.floor(expiry.getTime() / 1000) * 1000);
+        });
+
+        it('returns undefined when the connection or the expiry is missing', () => {
+            expect(getQBORefreshTokenExpiryDate(buildQBOConnectionPolicy('com.intuit.quickbooks.accounting'))).toBeUndefined();
+            expect(getQBORefreshTokenExpiryDate(buildQBOConnectionPolicy())).toBeUndefined();
+            expect(getQBORefreshTokenExpiryDate(undefined)).toBeUndefined();
+        });
+    });
+
+    describe('getQBORefreshTokenExpiryStatus', () => {
+        const now = new Date('2026-09-15T12:00:00Z');
+
+        it('reports a token inside the warning window as expiring soon', () => {
+            expect(getQBORefreshTokenExpiryStatus(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, 3))), now)).toBe(
+                CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_STATUS.EXPIRING_SOON,
+            );
+        });
+
+        it('reports a token past its expiry as expired', () => {
+            expect(getQBORefreshTokenExpiryStatus(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(subDays(now, 1))), now)).toBe(
+                CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_STATUS.EXPIRED,
+            );
+        });
+
+        it('reports nothing for a healthy token or a connection that already failed to authenticate', () => {
+            expect(getQBORefreshTokenExpiryStatus(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, 90))), now)).toBeUndefined();
+            expect(getQBORefreshTokenExpiryStatus(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, 3)), true), now)).toBeUndefined();
+        });
+    });
+
+    describe('isQBORefreshTokenExpiringSoon', () => {
+        const now = new Date('2026-09-15T12:00:00Z');
+
+        it('returns true when the refresh token expires within the warning window', () => {
+            expect(isQBORefreshTokenExpiringSoon(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, 3))), now)).toBe(true);
+            expect(isQBORefreshTokenExpiringSoon(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_WARNING_DAYS))), now)).toBe(
+                true,
+            );
+        });
+
+        it('returns true when the refresh token has already expired without a sync failing yet', () => {
+            expect(isQBORefreshTokenExpiringSoon(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(subDays(now, 1))), now)).toBe(true);
+        });
+
+        it('returns false while the refresh token is still far from expiring', () => {
+            expect(
+                isQBORefreshTokenExpiringSoon(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_WARNING_DAYS + 1))), now),
+            ).toBe(false);
+            expect(isQBORefreshTokenExpiringSoon(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, 90))), now)).toBe(false);
+        });
+
+        it('returns false when the connection already reports an authentication error', () => {
+            expect(isQBORefreshTokenExpiringSoon(buildQBOPolicyWithRefreshTokenExpiry(getUnixTime(addDays(now, 3)), true), now)).toBe(false);
+        });
+
+        it('returns false when there is no expiry to compare against', () => {
+            expect(isQBORefreshTokenExpiringSoon(buildQBOConnectionPolicy('com.intuit.quickbooks.accounting'), now)).toBe(false);
+            expect(isQBORefreshTokenExpiringSoon(undefined, now)).toBe(false);
+        });
+    });
+
     describe('isIntuitEnterpriseSuiteConnection', () => {
         it('returns true when QBO credentials contain the IES scope', () => {
             const policy = buildQBOConnectionPolicy(`com.intuit.quickbooks.accounting ${CONST.POLICY.CONNECTIONS.INTUIT_ENTERPRISE_SUITE_SCOPE}`);
diff --git a/tests/unit/ActiveSpansBenchmarkTest.ts b/tests/unit/ActiveSpansBenchmarkTest.ts
index 5f222490ff4e..759bc81574df 100644
--- a/tests/unit/ActiveSpansBenchmarkTest.ts
+++ b/tests/unit/ActiveSpansBenchmarkTest.ts
@@ -57,7 +57,7 @@ describe('activeSpans benchmark logging', () => {
         startSpan('ManualAppStartup', {name: 'ManualAppStartup'});
         endSpan('ManualAppStartup');
 
-        expect(mockStartInactiveSpan).toHaveBeenCalledWith({name: 'ManualAppStartup'});
+        expect(mockStartInactiveSpan).toHaveBeenCalledWith({name: 'ManualAppStartup', forceTransaction: true});
         expect(mockLogBenchmarkSpanEnd).toHaveBeenCalledWith('ManualAppStartup', expect.any(Number));
     });
 
diff --git a/tests/unit/ActiveSpansTest.ts b/tests/unit/ActiveSpansTest.ts
index 742e0339a770..8be8ce4977c6 100644
--- a/tests/unit/ActiveSpansTest.ts
+++ b/tests/unit/ActiveSpansTest.ts
@@ -1,23 +1,34 @@
-import {endSpan, getSpanByPrefix, startSpan} from '@libs/telemetry/activeSpans';
+import {endSpan, getSpan, getSpanByPrefix, startSpan} from '@libs/telemetry/activeSpans';
 
 import CONST from '@src/CONST';
 
+import type {Span, StartSpanOptions} from '@sentry/core';
+
+type MockInactiveSpan = {
+    setAttribute: jest.Mock<void, Parameters<Span['setAttribute']>>;
+    setStatus: jest.Mock<void, Parameters<Span['setStatus']>>;
+    end: jest.Mock<void, Parameters<Span['end']>>;
+};
+
+const mockStartInactiveSpan = jest.fn<MockInactiveSpan, [StartSpanOptions]>(() => ({
+    setAttribute: jest.fn<void, Parameters<Span['setAttribute']>>(),
+    setStatus: jest.fn<void, Parameters<Span['setStatus']>>(),
+    end: jest.fn<void, Parameters<Span['end']>>(),
+}));
+
 jest.mock('@libs/telemetry/logBenchmarkSpanEnd', () => ({
     __esModule: true,
     default: jest.fn(),
     isBenchmarkSpanEnabled: () => false,
 }));
 jest.mock('@sentry/react-native', () => ({
-    startInactiveSpan: () => ({
-        setAttribute: jest.fn(),
-        setStatus: jest.fn(),
-        end: jest.fn(),
-    }),
+    startInactiveSpan: (options: StartSpanOptions) => mockStartInactiveSpan(options),
     spanToJSON: () => ({data: {}}),
 }));
 
 afterEach(() => {
     jest.restoreAllMocks();
+    mockStartInactiveSpan.mockClear();
 });
 
 describe('activeSpans', () => {
@@ -37,6 +48,52 @@ describe('activeSpans', () => {
 
         expect(consoleDebugSpy).toHaveBeenLastCalledWith(expect.stringContaining('Ending span (750ms)'), expect.objectContaining({durationMs: 750, timestamp: 1_786_362_201_750}));
     });
+    describe('span parenting', () => {
+        beforeEach(() => {
+            jest.spyOn(console, 'debug').mockImplementation(() => {});
+        });
+
+        it('forces a span with no declared parent into its own transaction', () => {
+            // Given options from a caller that names no parent, which is how almost every span in the app is started
+            const options = {name: 'RootedSpan'};
+
+            // When the span is started
+            startSpan('RootedSpan', options);
+
+            // Then it is forced into its own transaction, because a child can be ended by whatever span sits on the scope
+            expect(mockStartInactiveSpan).toHaveBeenCalledWith(expect.objectContaining({name: 'RootedSpan', forceTransaction: true}));
+
+            endSpan('RootedSpan');
+        });
+
+        it('keeps a parent the caller declared', () => {
+            // Given another tracked span used as a parent, the way the send-message phases nest under the visible span
+            startSpan('ParentSpan', {name: 'ParentSpan'});
+            const parentSpan = getSpan('ParentSpan');
+
+            // When the span is started
+            startSpan('NestedSpan', {name: 'NestedSpan', parentSpan});
+
+            // Then it stays a child of that parent, so deliberate nesting is not broken
+            expect(mockStartInactiveSpan).toHaveBeenCalledWith(expect.objectContaining({name: 'NestedSpan', parentSpan, forceTransaction: false}));
+
+            endSpan('NestedSpan');
+            endSpan('ParentSpan');
+        });
+
+        it('keeps a caller that opts back into the span on the scope', () => {
+            // Given a caller that passes forceTransaction: false, as the Onyx derived recomputes do because they are short and want whatever transaction is open
+            const options = {name: 'InheritingSpan', forceTransaction: false};
+
+            // When the span is started
+            startSpan('InheritingSpan', options);
+
+            // Then the caller's choice wins over the no-parent default, so the span is left as a child
+            expect(mockStartInactiveSpan).toHaveBeenCalledWith({name: 'InheritingSpan', forceTransaction: false});
+
+            endSpan('InheritingSpan');
+        });
+    });
     describe('getSpanByPrefix', () => {
         const prefix = CONST.TELEMETRY.SPAN_STARTUP_DATA.APPLY;
 
diff --git a/tests/unit/AddVendorPageTest.ts b/tests/unit/AddVendorPageTest.ts
index 52299fd967bb..ade2877e4058 100644
--- a/tests/unit/AddVendorPageTest.ts
+++ b/tests/unit/AddVendorPageTest.ts
@@ -161,8 +161,13 @@ describe('AddVendorPage', () => {
             expect(hasVendorFeature(intacctPolicy, false)).toBe(true);
         });
 
-        it('hides the row on Xero when the beta is off because Xero vendor matching is not generally available yet', () => {
-            expect(hasVendorFeature(xeroPolicy, false)).toBe(false);
+        it('shows the row on Xero with the beta off because Xero vendor matching is generally available', () => {
+            // Given a configured Xero workspace with synced contacts
+            // When the vendor feature is checked without the vendorMatching beta
+            const isVendorFeatureAvailable = hasVendorFeature(xeroPolicy, false);
+
+            // Then the row is shown because Xero does not depend on the beta
+            expect(isVendorFeatureAvailable).toBe(true);
         });
 
         it('hides the row when no vendor integration is connected', () => {
diff --git a/tests/unit/AgentRulesUtilsTest.ts b/tests/unit/AgentRulesUtilsTest.ts
index 1121b93a268e..f1655834c786 100644
--- a/tests/unit/AgentRulesUtilsTest.ts
+++ b/tests/unit/AgentRulesUtilsTest.ts
@@ -1,8 +1,9 @@
-import {getAgentRuleDisplayTitle, getVisibleAgentRules, isRuleBotEnforcingRules, isRuleBotEnforcingRulesOnAnyPolicy} from '@libs/AgentRulesUtils';
+import {getAgentRuleDisplayTitle, getVisibleAgentRules, groupSuggestedAgentRulesByCategory, isRuleBotEnforcingRules, isRuleBotEnforcingRulesOnAnyPolicy} from '@libs/AgentRulesUtils';
 
 import CONST from '@src/CONST';
 import type {Policy} from '@src/types/onyx';
 import type {AgentRule} from '@src/types/onyx/Policy';
+import type SuggestedAgentRule from '@src/types/onyx/SuggestedAgentRule';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
@@ -19,6 +20,14 @@ function buildAgentRule(ruleID: string, overrides: Partial<AgentRule> = {}): Age
     };
 }
 
+function buildSuggestion(id: string, category?: string, title = `Title for ${id}`): SuggestedAgentRule {
+    return {id, category, title, prompt: `Prompt for ${id}`};
+}
+
+function localeCompare(a: string, b: string): number {
+    return a.localeCompare(b);
+}
+
 function buildPolicyWithAgentRules(agentRules: Record<string, AgentRule> | undefined, ruleBotAccountID: number | undefined = RULE_BOT_ACCOUNT_ID): Policy {
     const policy = createRandomPolicy(1);
     return {
@@ -129,4 +138,46 @@ describe('AgentRulesUtils', () => {
             expect(isRuleBotEnforcingRulesOnAnyPolicy(RULE_BOT_ACCOUNT_ID, undefined)).toBe(false);
         });
     });
+
+    describe('groupSuggestedAgentRulesByCategory', () => {
+        it('groups suggestions by category in the order each category first appears', () => {
+            // Given a list where a second amount suggestion comes after a merchant suggestion
+            const expenseOver = buildSuggestion('expense-amount-over', 'Amount and spending');
+            const merchantIs = buildSuggestion('merchant-is', 'Merchant');
+            const reportTotalOver = buildSuggestion('report-total-over', 'Amount and spending');
+
+            // When the suggestions are grouped
+            const sections = groupSuggestedAgentRulesByCategory([expenseOver, merchantIs, reportTotalOver], localeCompare);
+
+            // Then each category is one section, so the Suggestions tab shows no duplicate header, and the sections keep the list order
+            expect(sections).toEqual([
+                {category: 'Amount and spending', suggestions: [expenseOver, reportTotalOver]},
+                {category: 'Merchant', suggestions: [merchantIs]},
+            ]);
+        });
+
+        it('puts suggestions without a category into one section with an empty category', () => {
+            // Given suggestions whose category is missing or empty
+            const missingCategory = buildSuggestion('missing');
+            const emptyCategory = buildSuggestion('empty', '');
+
+            // When the suggestions are grouped
+            const sections = groupSuggestedAgentRulesByCategory([missingCategory, emptyCategory], localeCompare);
+
+            // Then they share one section, which the Suggestions tab renders without a header
+            expect(sections).toEqual([{category: '', suggestions: [emptyCategory, missingCategory]}]);
+        });
+
+        it('sorts the suggestions in each section by title', () => {
+            // Given a section whose suggestions arrive out of alphabetical order
+            const reportOverLimit = buildSuggestion('report-total-over', 'Amount and spending', 'Report over limit');
+            const expenseOverLimit = buildSuggestion('expense-amount-over', 'Amount and spending', 'Expense over limit');
+
+            // When the suggestions are grouped
+            const sections = groupSuggestedAgentRulesByCategory([reportOverLimit, expenseOverLimit], localeCompare);
+
+            // Then the section lists them by title, so an admin can scan the section in a predictable order
+            expect(sections).toEqual([{category: 'Amount and spending', suggestions: [expenseOverLimit, reportOverLimit]}]);
+        });
+    });
 });
diff --git a/tests/unit/AuthPrefetchTest.ts b/tests/unit/AuthPrefetchTest.ts
index 379e7a1fc2b1..1dfece97b6b2 100644
--- a/tests/unit/AuthPrefetchTest.ts
+++ b/tests/unit/AuthPrefetchTest.ts
@@ -55,7 +55,7 @@ describe('auth startup prefetch cleanup', () => {
     it('clears native startup prefetches before resetting Onyx for an identity transition', async () => {
         const clearOnyxAndSeedFullReconnect = (await import('@userActions/clearOnyxAndSeedFullReconnect')).default;
 
-        await clearOnyxAndSeedFullReconnect([ONYXKEYS.SESSION], {[ONYXKEYS.IS_LOADING_APP]: true});
+        await clearOnyxAndSeedFullReconnect([ONYXKEYS.SESSION]);
 
         expect(mockClearPrefetchOnAppStart).toHaveBeenCalledTimes(2);
         expect(mockMultiSet).toHaveBeenCalledWith({
diff --git a/tests/unit/BaseTextInputImplementationTest.tsx b/tests/unit/BaseTextInputImplementationTest.tsx
new file mode 100644
index 000000000000..f543a8d7c8c0
--- /dev/null
+++ b/tests/unit/BaseTextInputImplementationTest.tsx
@@ -0,0 +1,62 @@
+import {render} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+import BaseTextInputImplementation from '@components/TextInput/BaseTextInput/implementation';
+
+import React from 'react';
+
+/**
+ * Covers behaviour that lives in `BaseTextInput/implementation`. It is separate from
+ * BaseTextInputTest because that file mocks the implementation module away to inspect the props
+ * BaseTextInput forwards, so anything that needs the real implementation rendered belongs here.
+ */
+const mockUseHtmlPaste = jest.fn<void, unknown[]>();
+jest.mock('@hooks/useHtmlPaste', () => ({
+    __esModule: true,
+    default: (...args: unknown[]): void => {
+        mockUseHtmlPaste(...args);
+    },
+}));
+
+function renderWithProviders(children: React.ReactNode) {
+    return render(<ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>{children}</ComposeProviders>);
+}
+
+describe('BaseTextInput implementation - HTML paste handler scoping', () => {
+    /*
+     * `useHtmlPaste` subscribes to the report collection so a pasted room mention resolves to its
+     * name. Only markdown inputs can receive pasted HTML, so the hook is scoped to them via
+     * `HtmlPasteHandler` — otherwise every text field in the app holds that subscription and
+     * rebuilds the name map on each report write, for a paste path it never registers.
+     */
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('subscribes for a markdown input, which can receive pasted HTML', () => {
+        // Given a text input declared as markdown
+        // When it renders
+        renderWithProviders(
+            <BaseTextInputImplementation
+                type="markdown"
+                accessibilityLabel="markdown input"
+            />,
+        );
+
+        // Then the paste hook is mounted, so a pasted report mention can be resolved
+        expect(mockUseHtmlPaste).toHaveBeenCalled();
+    });
+
+    it('does NOT subscribe for a plain input, which never registers a paste listener', () => {
+        // Given a default (non-markdown) text input
+        // When it renders
+        renderWithProviders(<BaseTextInputImplementation accessibilityLabel="plain input" />);
+
+        // Then the hook is never called, so the field holds no report subscription.
+        // This is the regression guard: calling useHtmlPaste unconditionally from BaseTextInput
+        // made every form field in the app subscribe to reports for a path it cannot reach.
+        expect(mockUseHtmlPaste).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/CardUtilsTest.ts b/tests/unit/CardUtilsTest.ts
index 6e9b1fed8d30..76eb6f94646f 100644
--- a/tests/unit/CardUtilsTest.ts
+++ b/tests/unit/CardUtilsTest.ts
@@ -9,6 +9,7 @@ import type {CombinedCardFeeds} from '@src/hooks/useCardFeeds';
 import IntlStore from '@src/languages/IntlStore';
 import type * as CardArtworkColorsModule from '@src/libs/CardArtworkColors';
 import {
+    checkIfNewFeedConnected,
     doesCardFeedExist,
     feedHasCards,
     filterAllInactiveCards,
@@ -28,6 +29,7 @@ import {
     getCardFeedIcon,
     getCardFeedWithDomainID,
     getCardHintText,
+    getCardNameError,
     getCardsByCardholderName,
     getCardSettings,
     getCommercialFeedCardDescription,
@@ -42,12 +44,18 @@ import {
     getCustomOrFormattedFeedName,
     getDefaultCommercialFeedDisplayName,
     getDefaultExpensifyCardLimitType,
+    getDisplayedExpensifyCardLimitType,
+    getExpensifyCardLimitChangeWarningKey,
+    getExpensifyCardLimitError,
+    getExpensifyCardLimitTypeChangeWarningKey,
+    getExpensifyCardNewAvailableSpend,
     getDisplayableExpensifyCards,
     getDisplayableThirdPartyCards,
     getDomainByFundID,
     getDomainOrWorkspaceAccountID,
     getEligibleBankAccountsForCard,
     getEligibleBankAccountsForUkEuCard,
+    getExpensifyCardEnrollmentRoute,
     getFeedNameForDisplay,
     getFeedType,
     getFilteredCardList,
@@ -57,6 +65,7 @@ import {
     getPlaidInstitutionId,
     getSelectedFeed,
     getTranslationKeyForCardStatus,
+    getVisibleExpensifyCardLimitTypes,
     getWalletProviderNameKey,
     getYearFromExpirationDateString,
     hasActiveExpensifyCard,
@@ -64,6 +73,8 @@ import {
     hasCardPendingDigitalWalletApproval,
     hasIssuedExpensifyCard,
     hasOnlyOneCardToAssign,
+    shouldConfirmExpensifyCardLimitTypeChange,
+    shouldShowExpensifyCardFixedLimitType,
     isBrokenConnectionPastDismissThreshold,
     isCardAlreadyAssigned,
     isCardFrozen,
@@ -92,6 +103,7 @@ import {
 } from '@src/libs/CardUtils';
 import DateUtils from '@src/libs/DateUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type {
     BankAccountList,
     Card,
@@ -107,6 +119,7 @@ import type {
 } from '@src/types/onyx';
 import type {CardFeedWithNumber, CompanyFeeds} from '@src/types/onyx/CardFeeds';
 import type {Connections} from '@src/types/onyx/Policy';
+import type {ACHDataReimbursementAccount} from '@src/types/onyx/ReimbursementAccount';
 import type IconAsset from '@src/types/utils/IconAsset';
 
 import type {FC} from 'react';
@@ -1324,6 +1337,23 @@ describe('CardUtils', () => {
         });
     });
 
+    describe('checkIfNewFeedConnected', () => {
+        it('Should retain the Plaid feed after the initial feed update', () => {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Plaid institution IDs are dynamic runtime feed keys that CompanyCardFeedWithDomainID cannot represent.
+            const plaidFeed = 'plaid.ins_123456#1' as CompanyCardFeedWithDomainID;
+            const cardFeeds = createMock<CombinedCardFeeds>({
+                [plaidFeed]: {
+                    domainID: 1,
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Plaid institution IDs are dynamic runtime feed keys that CompanyCardFeed cannot represent.
+                    feed: 'plaid.ins_123456' as CompanyCardFeed,
+                    pending: false,
+                },
+            });
+
+            expect(checkIfNewFeedConnected(cardFeeds, cardFeeds, 'ins_123456')).toEqual({isNewFeedConnected: plaidFeed, newFeed: undefined});
+        });
+    });
+
     describe('isCSVUploadFeed', () => {
         it('Should return true for ccupload feed', () => {
             expect(isCSVUploadFeed(CONST.COMPANY_CARD.FEED_BANK_NAME.CSV)).toBe(true);
@@ -2235,6 +2265,243 @@ describe('CardUtils', () => {
         });
     });
 
+    describe('getDisplayedExpensifyCardLimitType', () => {
+        it('keeps a stored limit type', () => {
+            // Given a card that already has a limit type, on a workspace whose default is a different type
+            // When the displayed type is resolved
+            const displayedLimitType = getDisplayedExpensifyCardLimitType(CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY);
+
+            // Then the stored type is shown, because the default only fills in a missing type
+            expect(displayedLimitType).toBe(CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED);
+        });
+
+        it('uses the workspace default when the card has no stored limit type', () => {
+            // Given a card issued before a limit type was stored, on a workspace that defaults to Monthly
+            // When the displayed type is resolved
+            const displayedLimitType = getDisplayedExpensifyCardLimitType(undefined, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY);
+
+            // Then Monthly is shown, rather than the Smart limit that getTranslationKeyForLimitType falls back to for a missing type
+            expect(displayedLimitType).toBe(CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY);
+        });
+    });
+
+    describe('shouldShowExpensifyCardFixedLimitType', () => {
+        it('hides Fixed when a monthly card has already spent its full unapproved limit', () => {
+            const card = createMock<Card>({
+                totalSpend: -5000,
+                nameValuePairs: {
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            expect(shouldShowExpensifyCardFixedLimitType(card)).toBe(false);
+        });
+
+        it('shows Fixed when spend is under the unapproved limit', () => {
+            const card = createMock<Card>({
+                totalSpend: -2000,
+                nameValuePairs: {
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            expect(shouldShowExpensifyCardFixedLimitType(card)).toBe(true);
+        });
+
+        it('shows Fixed when the current type is already Fixed', () => {
+            const card = createMock<Card>({
+                totalSpend: -5000,
+                nameValuePairs: {
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            expect(shouldShowExpensifyCardFixedLimitType(card)).toBe(true);
+        });
+
+        it('uses the fallback limit type when the card has no limitType', () => {
+            const card = createMock<Card>({
+                totalSpend: -5000,
+                nameValuePairs: {
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            expect(shouldShowExpensifyCardFixedLimitType(card)).toBe(true);
+            expect(shouldShowExpensifyCardFixedLimitType(card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY)).toBe(false);
+        });
+    });
+
+    describe('getVisibleExpensifyCardLimitTypes', () => {
+        const policy = createMock<Policy>({
+            type: CONST.POLICY.TYPE.CORPORATE,
+            approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+        });
+
+        it('offers Smart, Monthly, and Fixed on a physical card that has not spent its limit', () => {
+            // Given a physical card whose unapproved spend is still under the limit
+            const card = createMock<Card>({
+                totalSpend: -1000,
+                nameValuePairs: {
+                    isVirtual: false,
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            // When the limit types this card can show are resolved
+            const limitTypes = getVisibleExpensifyCardLimitTypes(card, policy);
+
+            // Then Single Use is omitted, because it only exists on virtual cards
+            expect(limitTypes).toEqual([CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED]);
+        });
+
+        it('hides Fixed when a monthly card has already spent its full unapproved limit', () => {
+            // Given a monthly card that has already spent its full unapproved limit
+            const card = createMock<Card>({
+                totalSpend: -5000,
+                nameValuePairs: {
+                    isVirtual: false,
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            // When the limit types this card can show are resolved
+            const limitTypes = getVisibleExpensifyCardLimitTypes(card, policy);
+
+            // Then Fixed is hidden, so the card cannot be switched onto a type that would decline new spend
+            expect(limitTypes).toEqual([CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY]);
+        });
+
+        it('offers Single Use on a virtual card', () => {
+            // Given a virtual card that has already spent its full unapproved limit
+            const card = createMock<Card>({
+                totalSpend: -5000,
+                nameValuePairs: {
+                    isVirtual: true,
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            // When the limit types this card can show are resolved
+            const limitTypes = getVisibleExpensifyCardLimitTypes(card, policy);
+
+            // Then Single Use is offered and Fixed stays hidden
+            expect(limitTypes).toEqual([CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE]);
+        });
+    });
+
+    describe('shouldConfirmExpensifyCardLimitTypeChange', () => {
+        const overLimitCard = createMock<Card>({
+            unapprovedSpend: -5000,
+            nameValuePairs: {
+                limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                unapprovedExpenseLimit: 4000,
+            },
+        });
+
+        it('confirms switching from Monthly to Smart when unapproved spend is over the limit', () => {
+            expect(shouldConfirmExpensifyCardLimitTypeChange(overLimitCard, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART)).toBe(true);
+        });
+
+        it('does not confirm switching from Monthly to Fixed', () => {
+            expect(shouldConfirmExpensifyCardLimitTypeChange(overLimitCard, CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED)).toBe(false);
+        });
+
+        it('does not confirm when unapproved spend is under the limit', () => {
+            const card = createMock<Card>({
+                unapprovedSpend: -2000,
+                nameValuePairs: {
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            expect(shouldConfirmExpensifyCardLimitTypeChange(card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART)).toBe(false);
+        });
+
+        it('uses the fallback limit type when the card has no limitType', () => {
+            const card = createMock<Card>({
+                unapprovedSpend: -5000,
+                nameValuePairs: {
+                    unapprovedExpenseLimit: 4000,
+                },
+            });
+
+            expect(shouldConfirmExpensifyCardLimitTypeChange(card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART)).toBe(false);
+            expect(shouldConfirmExpensifyCardLimitTypeChange(card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY)).toBe(true);
+        });
+    });
+
+    describe('getExpensifyCardLimitTypeChangeWarningKey', () => {
+        it('warns about Smart Limit when the current type is Monthly or Fixed', () => {
+            expect(getExpensifyCardLimitTypeChangeWarningKey(CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY)).toBe('workspace.expensifyCard.changeCardSmartLimitTypeWarning');
+            expect(getExpensifyCardLimitTypeChangeWarningKey(CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED)).toBe('workspace.expensifyCard.changeCardSmartLimitTypeWarning');
+        });
+
+        it('warns about Monthly when the current type is Smart', () => {
+            expect(getExpensifyCardLimitTypeChangeWarningKey(CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART)).toBe('workspace.expensifyCard.changeCardMonthlyLimitTypeWarning');
+        });
+    });
+
+    describe('getExpensifyCardNewAvailableSpend', () => {
+        it('subtracts current spend from the new limit', () => {
+            const card = createMock<Card>({
+                availableSpend: 4000,
+                nameValuePairs: {
+                    unapprovedExpenseLimit: 10000,
+                },
+            });
+
+            expect(getExpensifyCardNewAvailableSpend(card, 5000)).toBe(-1000);
+            expect(getExpensifyCardNewAvailableSpend(card, 20000)).toBe(14000);
+        });
+    });
+
+    describe('getExpensifyCardLimitChangeWarningKey', () => {
+        it('returns the warning for the current limit type', () => {
+            expect(getExpensifyCardLimitChangeWarningKey(CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART)).toBe('workspace.expensifyCard.smartLimitWarning');
+            expect(getExpensifyCardLimitChangeWarningKey(CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY)).toBe('workspace.expensifyCard.monthlyLimitWarning');
+            expect(getExpensifyCardLimitChangeWarningKey(CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED)).toBe('workspace.expensifyCard.fixedLimitWarning');
+            expect(getExpensifyCardLimitChangeWarningKey(undefined)).toBe('workspace.expensifyCard.fixedLimitWarning');
+        });
+    });
+
+    describe('getCardNameError', () => {
+        it('rejects empty, whitespace-only, and invisible-only names', () => {
+            expect(getCardNameError('')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getCardNameError('   ')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getCardNameError('\u200B')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+        });
+
+        it('measures length after sanitizing so padding does not count', () => {
+            const paddedName = `${'a'.repeat(CONST.STANDARD_LENGTH_LIMIT)}   `;
+
+            expect(getCardNameError(paddedName)).toBeUndefined();
+            expect(getCardNameError('a'.repeat(CONST.STANDARD_LENGTH_LIMIT + 1))).toBe(CONST.INPUT_VALIDATION_ERRORS.TOO_LONG);
+        });
+    });
+
+    describe('getExpensifyCardLimitError', () => {
+        it('rejects empty, non-numeric, fractional, and oversized limits', () => {
+            expect(getExpensifyCardLimitError('')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getExpensifyCardLimitError('abc')).toBe(CONST.INPUT_VALIDATION_ERRORS.INVALID);
+            expect(getExpensifyCardLimitError('10.5')).toBe(CONST.INPUT_VALIDATION_ERRORS.NOT_INTEGER);
+            expect(getExpensifyCardLimitError(String(CONST.EXPENSIFY_CARD.LIMIT_VALUE + 1))).toBe(CONST.INPUT_VALIDATION_ERRORS.TOO_HIGH);
+        });
+
+        it('accepts integer amounts at or below the max', () => {
+            expect(getExpensifyCardLimitError('0')).toBeUndefined();
+            expect(getExpensifyCardLimitError('1000')).toBeUndefined();
+            expect(getExpensifyCardLimitError(String(CONST.EXPENSIFY_CARD.LIMIT_VALUE))).toBeUndefined();
+        });
+    });
+
     describe('filterInactiveCards', () => {
         it('should filter out closed, deactivated and suspended cards', () => {
             const activeCards = {card1: {cardID: 1, state: CONST.EXPENSIFY_CARD.STATE.OPEN}};
@@ -4688,6 +4955,72 @@ describe('getEligibleBankAccountsForUkEuCard', () => {
     });
 });
 
+describe('getExpensifyCardEnrollmentRoute', () => {
+    const policyID = 'policy123';
+    const addBankAccountRoute = ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute({policyID, backTo: ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID)});
+    const eligibleBankAccounts: BankAccountList = {
+        '1': {
+            accountData: {type: CONST.BANK_ACCOUNT.TYPE.BUSINESS, allowDebit: true, state: CONST.BANK_ACCOUNT.STATE.OPEN},
+            bankCurrency: CONST.CURRENCY.USD,
+            bankCountry: 'US',
+        },
+    };
+
+    it('returns the add bank account route when no eligible account exists', () => {
+        expect(
+            getExpensifyCardEnrollmentRoute({
+                policyID,
+                currencyCode: CONST.CURRENCY.USD,
+                isUkEuCurrencySupported: false,
+                bankAccountsList: {},
+                supportedCountriesByCurrency: undefined,
+                achData: undefined,
+            }),
+        ).toBe(addBankAccountRoute);
+    });
+
+    it('returns the bank account selector route when an eligible account exists', () => {
+        expect(
+            getExpensifyCardEnrollmentRoute({
+                policyID,
+                currencyCode: CONST.CURRENCY.USD,
+                isUkEuCurrencySupported: false,
+                bankAccountsList: eligibleBankAccounts,
+                supportedCountriesByCurrency: undefined,
+                achData: undefined,
+            }),
+        ).toBe(ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.getRoute(policyID));
+    });
+
+    it('returns the add bank account route when setup is in progress', () => {
+        const achData = createMock<ACHDataReimbursementAccount>({bankAccountID: 1, state: CONST.BANK_ACCOUNT.STATE.SETUP, policyID});
+        expect(
+            getExpensifyCardEnrollmentRoute({
+                policyID,
+                currencyCode: CONST.CURRENCY.USD,
+                isUkEuCurrencySupported: false,
+                bankAccountsList: eligibleBankAccounts,
+                supportedCountriesByCurrency: undefined,
+                achData,
+            }),
+        ).toBe(addBankAccountRoute);
+    });
+
+    it('returns the bank account selector route when another workspace has setup in progress', () => {
+        const achData = createMock<ACHDataReimbursementAccount>({bankAccountID: 1, state: CONST.BANK_ACCOUNT.STATE.SETUP, policyID: 'anotherPolicy'});
+        expect(
+            getExpensifyCardEnrollmentRoute({
+                policyID,
+                currencyCode: CONST.CURRENCY.USD,
+                isUkEuCurrencySupported: false,
+                bankAccountsList: eligibleBankAccounts,
+                supportedCountriesByCurrency: undefined,
+                achData,
+            }),
+        ).toBe(ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.getRoute(policyID));
+    });
+});
+
 describe('getConnectionBankAccountsForReconciliation', () => {
     it('returns empty array when connections is undefined', () => {
         expect(getConnectionBankAccountsForReconciliation(undefined, CONST.POLICY.CONNECTIONS.NAME.QBO)).toEqual([]);
diff --git a/tests/unit/CategoryContextualRulesUtilsTest.ts b/tests/unit/CategoryContextualRulesUtilsTest.ts
index cefaba0f7a93..5be5c76e16b8 100644
--- a/tests/unit/CategoryContextualRulesUtilsTest.ts
+++ b/tests/unit/CategoryContextualRulesUtilsTest.ts
@@ -3,7 +3,7 @@ import getCategoryContextualRules from '@libs/CategoryContextualRulesUtils';
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
 import {DYNAMIC_ROUTES} from '@src/ROUTES';
-import type {PolicyCategory} from '@src/types/onyx';
+import type {Policy, PolicyCategory} from '@src/types/onyx';
 
 import createRandomPolicy from '../utils/collections/policies';
 import {convertToDisplayString, translateLocal} from '../utils/TestHelper';
@@ -27,6 +27,7 @@ describe('getCategoryContextualRules', () => {
         expect(
             getCategoryContextualRules({
                 policy,
+                policyCategories: undefined,
                 category,
                 categoryName: 'Travel',
                 translate: translateLocal,
@@ -47,6 +48,7 @@ describe('getCategoryContextualRules', () => {
 
         const rules = getCategoryContextualRules({
             policy,
+            policyCategories: undefined,
             category,
             categoryName: 'Travel',
             translate: translateLocal,
@@ -77,6 +79,7 @@ describe('getCategoryContextualRules', () => {
 
         const rules = getCategoryContextualRules({
             policy,
+            policyCategories: undefined,
             category,
             categoryName: 'Travel',
             translate: translateLocal,
@@ -109,6 +112,7 @@ describe('getCategoryContextualRules', () => {
         expect(
             getCategoryContextualRules({
                 policy,
+                policyCategories: undefined,
                 category,
                 categoryName: 'Travel',
                 translate: translateLocal,
@@ -117,4 +121,101 @@ describe('getCategoryContextualRules', () => {
             }),
         ).toEqual([]);
     });
+
+    describe('category tax default', () => {
+        const policyWithTaxRule: Policy = {
+            ...policy,
+            taxRates: {
+                name: 'Tax',
+                defaultExternalID: 'TAX_EXEMPT',
+                defaultValue: '0%',
+                foreignTaxDefault: 'TAX_EXEMPT',
+                taxes: {
+                    TAX_EXEMPT: {name: 'Tax exempt', value: '0%'},
+                    TAX_VAT: {name: 'VAT', value: '20%'},
+                },
+            },
+            rules: {
+                expenseRules: [
+                    {
+                        // eslint-disable-next-line @typescript-eslint/naming-convention -- matches the backend's expense rule shape
+                        tax: {field_id_TAX: {externalID: 'TAX_VAT'}},
+                        applyWhen: [{condition: CONST.POLICY.RULE_CONDITIONS.MATCHES, field: CONST.POLICY.FIELDS.CATEGORY, value: 'Travel'}],
+                    },
+                ],
+            },
+        };
+        const category: PolicyCategory = {name: 'Travel', enabled: true};
+
+        it('lists the tax default the Rules page shows for the category', () => {
+            // Given a category whose tax default lives in the policy's expense rules rather than on the category
+            // When the category details RHP builds its rules
+            const rules = getCategoryContextualRules({
+                policy: policyWithTaxRule,
+                policyCategories: undefined,
+                category,
+                categoryName: 'Travel',
+                translate: translateLocal,
+                convertToDisplayString,
+                isOffline: false,
+            });
+
+            // Then the tax default is listed and opens the category-scoped editor, so the RHP matches the Rules page
+            expect(rules).toHaveLength(1);
+            expect(rules.at(0)?.summary).toBe('Update tax to "VAT (20%)"');
+            expect(rules.at(0)?.dynamicRoutePath).toBe(DYNAMIC_ROUTES.WORKSPACE_CATEGORY_RULES_TAX_EDIT.path);
+        });
+
+        it('does not list a tax default belonging to another category', () => {
+            // Given a tax default that only matches Travel
+            // When the rules are built for a different category
+            const rules = getCategoryContextualRules({
+                policy: policyWithTaxRule,
+                policyCategories: undefined,
+                category: {name: 'Meals', enabled: true},
+                categoryName: 'Meals',
+                translate: translateLocal,
+                convertToDisplayString,
+                isOffline: false,
+            });
+
+            // Then nothing is listed, since the workspace default rate is not a rule of its own
+            expect(rules).toEqual([]);
+        });
+
+        it('shows the tax default as deleting offline while its rate is being deleted', () => {
+            // Given the rate the tax default uses is pending delete, which takes the rule down with it
+            const policyWithDeletingRate: Policy = {
+                ...policyWithTaxRule,
+                taxRates: {
+                    ...policyWithTaxRule.taxRates,
+                    name: 'Tax',
+                    defaultExternalID: 'TAX_EXEMPT',
+                    defaultValue: '0%',
+                    foreignTaxDefault: 'TAX_EXEMPT',
+                    taxes: {
+                        TAX_EXEMPT: {name: 'Tax exempt', value: '0%'},
+                        TAX_VAT: {name: 'VAT', value: '20%', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
+                    },
+                },
+            };
+            const params = {
+                policy: policyWithDeletingRate,
+                policyCategories: undefined,
+                category,
+                categoryName: 'Travel',
+                translate: translateLocal,
+                convertToDisplayString,
+            };
+
+            // When the rules are built offline and online
+            const offlineRules = getCategoryContextualRules({...params, isOffline: true});
+            const onlineRules = getCategoryContextualRules({...params, isOffline: false});
+
+            // Then offline keeps it listed but disabled, and online drops it since the delete resolves in a moment
+            expect(offlineRules.at(0)?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+            expect(offlineRules.at(0)?.isDisabled).toBe(true);
+            expect(onlineRules).toEqual([]);
+        });
+    });
 });
diff --git a/tests/unit/CategoryUtilsTest.ts b/tests/unit/CategoryUtilsTest.ts
index 765e3a3871a8..a71cf418175a 100644
--- a/tests/unit/CategoryUtilsTest.ts
+++ b/tests/unit/CategoryUtilsTest.ts
@@ -3,6 +3,7 @@ import {
     getAvailableNonPersonalPolicyCategories,
     getCategoryDefaultTaxRate,
     getCategoryGLCode,
+    getCategoryNameError,
     getDecodedFullCategoryName,
     getDecodedLeafCategoryName,
     hasAnyCategoryRules,
@@ -474,6 +475,47 @@ describe('getCategoryGLCode', () => {
     });
 });
 
+describe('getCategoryNameError', () => {
+    const encodedFoodAndDrink = 'Food &amp; Drink';
+    const categories: PolicyCategories = {
+        Food: {name: 'Food', enabled: true, pendingAction: null},
+        [encodedFoodAndDrink]: {name: encodedFoodAndDrink, enabled: true, pendingAction: null},
+    };
+
+    it('does not flag an HTML-encoded category as a duplicate of its decoded name', () => {
+        // Given a category stored under an HTML-encoded key
+        // When the caller passes the already-decoded display name as the name being edited
+        // Then keeping that display name is allowed, because decoding it again would change the comparison
+        expect(getCategoryNameError(categories, 'Food & Drink', 'Food & Drink')).toBeUndefined();
+    });
+
+    it('keeps a display name that still contains an entity distinct from its decoded form', () => {
+        const doubleEncodedFoodAndDrink = 'Food &amp;amp; Drink';
+        const categoriesWithEntityName: PolicyCategories = {
+            ...categories,
+            [doubleEncodedFoodAndDrink]: {name: doubleEncodedFoodAndDrink, enabled: true, pendingAction: null},
+        };
+
+        // Given a category whose once-decoded name still contains an entity, beside a different category named Food & Drink
+        // When validation receives that once-decoded name as the name being edited
+        // Then renaming it to Food & Drink is a duplicate, because decoding currentName again would treat the two as the same category
+        expect(getCategoryNameError(categoriesWithEntityName, 'Food & Drink', 'Food &amp; Drink')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+
+        // Then saving the unchanged display name is allowed, because a second decode would make it look like a different category
+        expect(getCategoryNameError(categoriesWithEntityName, 'Food &amp; Drink', 'Food &amp; Drink')).toBeUndefined();
+    });
+
+    it('flags a decoded name that already exists as an encoded category', () => {
+        expect(getCategoryNameError(categories, 'Food & Drink')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+        expect(getCategoryNameError(categories, 'Food & Drink', 'Food')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+    });
+
+    it('still flags an exact-key duplicate', () => {
+        expect(getCategoryNameError(categories, 'Food')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+        expect(getCategoryNameError(categories, 'Food', 'Food')).toBeUndefined();
+    });
+});
+
 describe('getCategoryDefaultTaxRate', () => {
     const buildCategoryTaxRule = (categoryName: string, taxID: string): ExpenseRule => ({
         applyWhen: [{condition: CONST.POLICY.RULE_CONDITIONS.MATCHES, field: CONST.POLICY.FIELDS.CATEGORY, value: categoryName}],
diff --git a/tests/unit/ContextMenuActionsCopyMessageTest.ts b/tests/unit/ContextMenuActionsCopyMessageTest.ts
index a8e34a03ec9d..1d8a6f6f14e9 100644
--- a/tests/unit/ContextMenuActionsCopyMessageTest.ts
+++ b/tests/unit/ContextMenuActionsCopyMessageTest.ts
@@ -49,6 +49,9 @@ if (!copyMessageAction || !('onPress' in copyMessageAction)) {
 }
 type CopyMessagePayload = Parameters<typeof copyMessageAction.onPress>[1];
 
+const MENTIONED_REPORT_ID = '1';
+const REPORT_ID_TO_NAME = {[MENTIONED_REPORT_ID]: '#general'};
+
 const createPayload = (selection: string): CopyMessagePayload =>
     createMock<CopyMessagePayload>({
         reportAction: {
@@ -56,6 +59,7 @@ const createPayload = (selection: string): CopyMessagePayload =>
             message: [{html: selection}],
         },
         selection,
+        reportIDToName: REPORT_ID_TO_NAME,
         report: {},
         originalReport: {},
         getLocalDateFromDatetime: jest.fn(),
@@ -74,6 +78,7 @@ const createReportActionPayload = (reportAction: CopyMessagePayload['reportActio
     createMock<CopyMessagePayload>({
         reportAction,
         selection: '',
+        reportIDToName: REPORT_ID_TO_NAME,
         report: {},
         originalReport: {},
         getLocalDateFromDatetime: jest.fn(),
@@ -103,7 +108,7 @@ describe('ContextMenuActions copy message', () => {
 
         copyMessageAction.onPress(false, createPayload(selection));
 
-        expect(mockGetClipboardText).toHaveBeenCalledWith(selection);
+        expect(mockGetClipboardText).toHaveBeenCalledWith(selection, REPORT_ID_TO_NAME);
         expect(mockSetString).toHaveBeenCalledWith('Expensify');
         expect(mockSetHtml).not.toHaveBeenCalled();
     });
@@ -119,7 +124,7 @@ describe('ContextMenuActions copy message', () => {
 
         copyMessageAction.onPress(false, createPayload(selection));
 
-        expect(mockGetClipboardText).toHaveBeenCalledWith(selection);
+        expect(mockGetClipboardText).toHaveBeenCalledWith(selection, REPORT_ID_TO_NAME);
         expect(mockSetHtml).toHaveBeenCalledWith(selection, 'Expensify');
         expect(mockSetString).not.toHaveBeenCalled();
     });
@@ -155,7 +160,7 @@ describe('ContextMenuActions copy message', () => {
             ),
         );
 
-        expect(mockGetClipboardText).toHaveBeenCalledWith(expectedTranslationKey);
+        expect(mockGetClipboardText).toHaveBeenCalledWith(expectedTranslationKey, undefined);
         expect(mockSetString).toHaveBeenCalledWith('mocked clipboard text');
     });
 
@@ -179,4 +184,104 @@ describe('ContextMenuActions copy message', () => {
 
         expect(mockSetString).toHaveBeenCalledWith('workspaceActions.updateAreAttendeesRequired');
     });
+
+    it('copies the localized message for an agent prompt update action', () => {
+        if (!copyMessageAction?.onPress) {
+            throw new Error('Copy message context menu action was not found');
+        }
+
+        copyMessageAction.onPress(
+            false,
+            createReportActionPayload(
+                createMock<CopyMessagePayload['reportAction']>({
+                    actionName: CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED,
+                    message: [
+                        {
+                            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                            style: 'normal',
+                            text: "owner@expensify.com updated this agent's instructions.",
+                        },
+                    ],
+                    originalMessage: {
+                        previousPrompt: 'Review every expense',
+                        newPrompt: 'Review expenses over $100',
+                        updatedByAccountID: 1,
+                        updatedBy: 'owner@expensify.com',
+                    },
+                }),
+            ),
+        );
+
+        expect(mockSetString).toHaveBeenCalledWith('agentPromptUpdated');
+    });
+
+    it('copies the report action text when an agent prompt update has no original message', () => {
+        const actionText = "owner@expensify.com updated this agent's instructions.";
+
+        copyMessageAction.onPress(
+            false,
+            createReportActionPayload(
+                createMock<CopyMessagePayload['reportAction']>({
+                    actionName: CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED,
+                    message: [
+                        {
+                            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                            style: 'normal',
+                            text: actionText,
+                        },
+                    ],
+                }),
+            ),
+        );
+
+        expect(mockSetString).toHaveBeenCalledWith(actionText);
+    });
+
+    it('copies the localized message for a member work arrangement update action', () => {
+        mockCanSetHtml.mockReturnValue(false);
+        mockGetClipboardText.mockReturnValue('updated work arrangement');
+
+        if (!copyMessageAction?.onPress) {
+            throw new Error('Copy message context menu action was not found');
+        }
+
+        copyMessageAction.onPress(
+            false,
+            createReportActionPayload(
+                createMock<CopyMessagePayload['reportAction']>({
+                    actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT,
+                    message: [{text: 'updated work arrangement', html: 'updated work arrangement'}],
+                    originalMessage: {name: 'Member One', newValue: true, oldValue: false},
+                }),
+            ),
+        );
+
+        expect(mockGetClipboardText).toHaveBeenCalledWith('workspaceActions.updatedMemberWorkArrangement', undefined);
+        expect(mockSetString).toHaveBeenCalledWith('updated work arrangement');
+    });
+
+    it('copies the localized member work arrangement message as html when supported', () => {
+        // Given the clipboard supports HTML, when the member arrangement message is copied, then the shared rich clipboard path is used.
+        mockCanSetHtml.mockReturnValue(true);
+        mockGetClipboardText.mockReturnValue('updated work arrangement');
+
+        if (!copyMessageAction?.onPress) {
+            throw new Error('Copy message context menu action was not found');
+        }
+
+        copyMessageAction.onPress(
+            false,
+            createReportActionPayload(
+                createMock<CopyMessagePayload['reportAction']>({
+                    actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT,
+                    message: [{text: 'updated work arrangement', html: 'updated work arrangement'}],
+                    originalMessage: {name: 'Member One', newValue: true, oldValue: false},
+                }),
+            ),
+        );
+
+        expect(mockGetClipboardText).toHaveBeenCalledWith('workspaceActions.updatedMemberWorkArrangement', undefined);
+        expect(mockSetHtml).toHaveBeenCalledWith('workspaceActions.updatedMemberWorkArrangement', 'updated work arrangement');
+        expect(mockSetString).not.toHaveBeenCalled();
+    });
 });
diff --git a/tests/unit/CopyPolicySettingsUpgradeTest.tsx b/tests/unit/CopyPolicySettingsUpgradeTest.tsx
index 1d2ac36edab8..3dda6b242ba1 100644
--- a/tests/unit/CopyPolicySettingsUpgradeTest.tsx
+++ b/tests/unit/CopyPolicySettingsUpgradeTest.tsx
@@ -26,6 +26,8 @@ const TEST_USER_ACCOUNT_ID = 12345;
 
 // Capture the props passed to the upgrade intro card so the test can drive onUpgrade and read loading.
 let capturedIntroProps: UpgradeIntroViewProps | null = null;
+type UpgradeConfirmationProps = {afterUpgradeAcknowledged: () => void};
+let mockCapturedUpgradeConfirmationProps: UpgradeConfirmationProps | null = null;
 
 // jest.mock factories can't reference imported bindings, but `mock`-prefixed locals are allowed.
 const MockView = View;
@@ -40,7 +42,10 @@ jest.mock('@pages/workspace/upgrade/UpgradeIntroView', () => ({
 
 jest.mock('@pages/workspace/upgrade/UpgradeConfirmation', () => ({
     __esModule: true,
-    default: () => <MockView testID="upgrade-success" />,
+    default: (props: UpgradeConfirmationProps) => {
+        mockCapturedUpgradeConfirmationProps = props;
+        return <MockView testID="upgrade-success" />;
+    },
 }));
 
 // Track the bulk upgrade call without performing the real API write; the test drives Onyx manually.
@@ -130,6 +135,7 @@ describe('CopyPolicySettingsUpgradePage', () => {
     beforeEach(async () => {
         jest.clearAllMocks();
         capturedIntroProps = null;
+        mockCapturedUpgradeConfirmationProps = null;
         await Onyx.clear();
         // Control source, Collect (Team) target, with a Control-only part selected so an upgrade is required.
         await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${SOURCE_POLICY_ID}`, createTestPolicy(SOURCE_POLICY_ID, 'Source Workspace', CONST.POLICY.TYPE.CORPORATE));
@@ -184,6 +190,25 @@ describe('CopyPolicySettingsUpgradePage', () => {
         expect(screen.queryByTestId('upgrade-intro')).toBeNull();
         // Showing success must not, by itself, navigate to Confirm.
         expect(mockNavigate).not.toHaveBeenCalledWith(ROUTES.POLICY_COPY_SETTINGS_CONFIRM.getRoute(SOURCE_POLICY_ID));
+
+        // Given the user acknowledged a successful upgrade, when Continue is activated, then the completed Upgrade route is replaced.
+        act(() => {
+            mockCapturedUpgradeConfirmationProps?.afterUpgradeAcknowledged();
+        });
+        expect(mockNavigate).toHaveBeenCalledWith(ROUTES.POLICY_COPY_SETTINGS_CONFIRM.getRoute(SOURCE_POLICY_ID), {forceReplace: true});
+    });
+
+    it('replaces the upgrade page when the upgrade is no longer needed', async () => {
+        // Given the target workspace is already Control, when the Upgrade page loads, then it replaces itself with Confirm.
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${TARGET_POLICY_ID}`, {type: CONST.POLICY.TYPE.CORPORATE});
+        });
+        await waitForBatchedUpdates();
+
+        renderUpgradePage();
+        await waitForBatchedUpdates();
+
+        expect(mockNavigate).toHaveBeenCalledWith(ROUTES.POLICY_COPY_SETTINGS_CONFIRM.getRoute(SOURCE_POLICY_ID), {forceReplace: true});
     });
 
     it('does not show success when the bulk upgrade fails', async () => {
diff --git a/tests/unit/CurrentUserStoreTest.ts b/tests/unit/CurrentUserStoreTest.ts
new file mode 100644
index 000000000000..b6ad7dfbe59c
--- /dev/null
+++ b/tests/unit/CurrentUserStoreTest.ts
@@ -0,0 +1,30 @@
+import {hasAuthToken} from '@libs/CurrentUserStore';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+describe('hasAuthToken', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(() => Onyx.clear());
+
+    it('returns false while the session holds no auth token', () =>
+        Onyx.merge(ONYXKEYS.SESSION, {email: 'user@test.com'}).then(() => {
+            expect(hasAuthToken()).toBe(false);
+        }));
+
+    it('returns true once the session holds an auth token', () =>
+        Onyx.merge(ONYXKEYS.SESSION, {authToken: 'abc123'}).then(() => {
+            expect(hasAuthToken()).toBe(true);
+        }));
+
+    it('returns false again once the auth token is cleared', () =>
+        Onyx.merge(ONYXKEYS.SESSION, {authToken: 'abc123'})
+            .then(() => Onyx.merge(ONYXKEYS.SESSION, {authToken: null}))
+            .then(() => {
+                expect(hasAuthToken()).toBe(false);
+            }));
+});
diff --git a/tests/unit/DateUtilsTest.ts b/tests/unit/DateUtilsTest.ts
index a102802626be..99f41524cb77 100644
--- a/tests/unit/DateUtilsTest.ts
+++ b/tests/unit/DateUtilsTest.ts
@@ -170,6 +170,30 @@ describe('DateUtils', () => {
         });
     });
 
+    it('should normalize a legacy timezone alias from Intl to its supported timezone', async () => {
+        jest.spyOn(Intl, 'DateTimeFormat').mockImplementation(
+            () =>
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                ({
+                    resolvedOptions: () => ({timeZone: 'Asia/Calcutta'}),
+                }) as Intl.DateTimeFormat,
+        );
+        Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {'999': {accountID: 999, timezone: {selected: 'Asia/Kolkata', automatic: true}}});
+        await waitForBatchedUpdates();
+
+        // Given the stored timezone is already the supported equivalent of the Intl alias, it should stay unchanged
+        expect(DateUtils.getCurrentTimezone({selected: 'Asia/Kolkata', automatic: true})).toEqual({
+            selected: 'Asia/Kolkata',
+            automatic: true,
+        });
+
+        // Given a stored timezone that differs, it should be updated to the supported timezone rather than the alias
+        expect(DateUtils.getCurrentTimezone({selected: 'Europe/London', automatic: true})).toEqual({
+            selected: 'Asia/Kolkata',
+            automatic: true,
+        });
+    });
+
     it('canUpdateTimezone should return true when lastUpdatedTimezoneTime is more than 5 minutes ago', () => {
         // Use fake timers to control the current time
         jest.useFakeTimers();
diff --git a/tests/unit/DistanceRateTest.ts b/tests/unit/DistanceRateTest.ts
index 3609d1f5945d..f25bc3200e03 100644
--- a/tests/unit/DistanceRateTest.ts
+++ b/tests/unit/DistanceRateTest.ts
@@ -1,10 +1,13 @@
-import {deletePolicyDistanceRates, enablePolicyDistanceRates, setWorkspaceDistanceAutoUpdate} from '@libs/actions/Policy/DistanceRate';
+import type {LocalizedTranslate} from '@components/LocaleContextProvider';
+
+import {deletePolicyDistanceRates, enablePolicyDistanceRates, setEmployeeWorkArrangement, setWorkspaceDistanceAutoUpdate} from '@libs/actions/Policy/DistanceRate';
+import * as API from '@libs/API';
 import {pause, resetQueue} from '@libs/Network/SequentialQueue';
 import {isGovernmentRateUnmodified} from '@libs/PolicyDistanceRatesUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {GovernmentMileageRate, Policy, Transaction, TransactionViolations} from '@src/types/onyx';
+import type {GovernmentMileageRate, Policy, Report, ReportActions, Transaction, TransactionViolations} from '@src/types/onyx';
 import type {CustomUnit, Rate, Unit} from '@src/types/onyx/Policy';
 
 import Onyx from 'react-native-onyx';
@@ -13,6 +16,23 @@ import createRandomPolicy from '../utils/collections/policies';
 import createRandomTransaction from '../utils/collections/transaction';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
+const translate: LocalizedTranslate = (phrase, ...parameters) => {
+    if (phrase === 'workspace.people.officeBased') {
+        return 'Office-based';
+    }
+    if (phrase === 'workspace.people.noRegularWorkspace') {
+        return 'Remote or mobile';
+    }
+    if (phrase === 'workspaceActions.updatedMemberWorkArrangement') {
+        const arrangement = parameters[0];
+        if (typeof arrangement === 'object' && arrangement !== null && 'displayName' in arrangement && 'newArrangement' in arrangement && 'oldArrangement' in arrangement) {
+            return `changed ${String(arrangement.displayName)}'s work arrangement to ${String(arrangement.newArrangement)} (previously ${String(arrangement.oldArrangement)})`;
+        }
+        return String(phrase);
+    }
+    return String(phrase);
+};
+
 describe('DistanceRate', () => {
     beforeAll(() => {
         Onyx.init({keys: ONYXKEYS});
@@ -365,4 +385,295 @@ describe('DistanceRate', () => {
             expect(onyxPolicy.customUnits?.[customUnitID].rates[existingRateID]).toMatchObject({rate: 72.5, startDate: '2026-01-01'});
         });
     });
+
+    describe('setEmployeeWorkArrangement', () => {
+        const member1AccountID = 11;
+        const member2AccountID = 12;
+        const member1Email = 'member1@test.com';
+        const member2Email = 'member2@test.com';
+        const personalDetails = {
+            [member1AccountID]: {accountID: member1AccountID, login: member1Email, displayName: 'Member One'},
+            [member2AccountID]: {accountID: member2AccountID, login: member2Email, displayName: 'Member Two'},
+        };
+
+        afterEach(() => {
+            jest.restoreAllMocks();
+        });
+
+        function getPolicyFromOnyx(policyID: string): Promise<Policy> {
+            return new Promise<Policy>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const,
+                    // eslint-disable-next-line rulesdir/prefer-early-return
+                    callback: (value) => {
+                        if (value !== undefined) {
+                            Onyx.disconnect(connection);
+                            resolve(value);
+                        }
+                    },
+                });
+            });
+        }
+
+        function getReportActionsFromOnyx(reportID: string) {
+            return new Promise<ReportActions>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}` as const,
+                    // eslint-disable-next-line rulesdir/prefer-early-return
+                    callback: (value) => {
+                        if (value !== undefined) {
+                            Onyx.disconnect(connection);
+                            resolve(value);
+                        }
+                    },
+                });
+            });
+        }
+
+        function getSingleUpdateValue(value: unknown): unknown {
+            if (typeof value !== 'object' || value === null) {
+                return undefined;
+            }
+            const values = Object.values(value);
+            return values.length === 1 ? values.at(0) : undefined;
+        }
+
+        async function seedWorkArrangementPolicy(policy: Policy) {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+            await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetails);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}1`, {reportID: '1', policyID: policy.id, chatType: CONST.REPORT.CHAT_TYPE.POLICY_ADMINS} as Report);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`, {});
+            await waitForBatchedUpdates();
+        }
+
+        it('should optimistically update the member and create one changelog action with pending ADD', async () => {
+            // Given two members in the policy and only one needs an arrangement change
+            const policy: Policy = {
+                ...createRandomPolicy(20),
+                employeeList: {
+                    [member1Email]: {email: member1Email},
+                    [member2Email]: {email: member2Email, hasOfficeWorkArrangement: true},
+                },
+            };
+            await seedWorkArrangementPolicy(policy);
+
+            pause();
+            // When both members are assigned the office-based arrangement
+            setEmployeeWorkArrangement(policy, [member1AccountID, member2AccountID], true, personalDetails, translate);
+            await waitForBatchedUpdates();
+
+            // Then only the changed member and one pending changelog entry are updated
+            const onyxPolicy = await getPolicyFromOnyx(policy.id);
+            expect(onyxPolicy.employeeList?.[member1Email]).toEqual({email: member1Email, hasOfficeWorkArrangement: true, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE});
+            // Member2 already matches, so it is skipped without any optimistic footprint
+            expect(onyxPolicy.employeeList?.[member2Email]).toEqual({email: member2Email, hasOfficeWorkArrangement: true});
+
+            const reportActions = await getReportActionsFromOnyx('1');
+            const actions = Object.values(reportActions);
+            expect(actions).toHaveLength(1);
+            expect(actions.at(0)).toMatchObject({
+                actionName: CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                message: [
+                    {
+                        text: translate('workspaceActions.updatedMemberWorkArrangement', {
+                            displayName: 'Member One',
+                            newArrangement: translate('workspace.people.officeBased'),
+                            oldArrangement: translate('workspace.people.noRegularWorkspace'),
+                        }),
+                    },
+                ],
+                originalMessage: {accountID: member1AccountID, email: member1Email, name: 'Member One', newValue: true, oldValue: false},
+            });
+
+            resetQueue();
+        });
+
+        it('should do nothing when every member already matches the requested arrangement', async () => {
+            // Given all eligible members already have the requested arrangement
+            const policy: Policy = {
+                ...createRandomPolicy(21),
+                employeeList: {[member1Email]: {email: member1Email, hasOfficeWorkArrangement: false}},
+            };
+            await seedWorkArrangementPolicy(policy);
+
+            pause();
+            // When the matching member and an unknown account are passed
+            setEmployeeWorkArrangement(policy, [member1AccountID, 999999001], false, personalDetails, translate);
+            await waitForBatchedUpdates();
+
+            // Then no member data or changelog entry is changed
+            const onyxPolicy = await getPolicyFromOnyx(policy.id);
+            expect(onyxPolicy.employeeList?.[member1Email]).toEqual({email: member1Email, hasOfficeWorkArrangement: false});
+
+            const reportActions = await getReportActionsFromOnyx('1');
+            expect(reportActions).toEqual({});
+
+            resetQueue();
+        });
+
+        it('should clear pending states on success', async () => {
+            // Given the member and admins room are in Onyx
+            const policy: Policy = {
+                ...createRandomPolicy(22),
+                employeeList: {[member1Email]: {email: member1Email}},
+            };
+            await seedWorkArrangementPolicy(policy);
+            const writeSpy = jest.spyOn(API, 'write').mockResolvedValue(undefined);
+
+            // When the member's work arrangement is updated
+            setEmployeeWorkArrangement(policy, [member1AccountID], true, personalDetails, translate);
+
+            // Then success updates clear the pending state for both the member and changelog action
+            const onyxData = writeSpy.mock.calls.at(0)?.[2];
+            expect(onyxData?.successData?.[0]).toEqual({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
+                value: {employeeList: {[member1Email]: {pendingAction: null}}},
+            });
+            expect(getSingleUpdateValue(onyxData?.successData?.[1]?.value)).toEqual({pendingAction: null});
+        });
+
+        it('should revert the member and drop the changelog entry on failure', async () => {
+            // Given the member and admins room are in Onyx
+            const policy: Policy = {
+                ...createRandomPolicy(23),
+                employeeList: {[member1Email]: {email: member1Email}},
+            };
+            await seedWorkArrangementPolicy(policy);
+            // eslint-disable-next-line rulesdir/no-multiple-api-calls -- The API spy captures the action updates without sending a request.
+            const writeSpy = jest.spyOn(API, 'write').mockResolvedValue(undefined);
+
+            // When the member's work arrangement is updated
+            setEmployeeWorkArrangement(policy, [member1AccountID], true, personalDetails, translate);
+
+            // Then failure data restores the member value, retains UPDATE so dismissing the error preserves the member, and removes the changelog action
+            const onyxData = writeSpy.mock.calls.at(0)?.[2];
+            expect(onyxData?.failureData?.[0]).toMatchObject({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
+                value: {
+                    employeeList: {
+                        [member1Email]: {
+                            hasOfficeWorkArrangement: null,
+                            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        },
+                    },
+                },
+            });
+            const failureValue = onyxData?.failureData?.[0]?.value;
+            const failureEmployeeList = typeof failureValue === 'object' && failureValue !== null && 'employeeList' in failureValue ? failureValue.employeeList : undefined;
+            const failureMember =
+                typeof failureEmployeeList === 'object' && failureEmployeeList !== null && member1Email in failureEmployeeList ? failureEmployeeList[member1Email] : undefined;
+            expect(typeof failureMember === 'object' && failureMember !== null && 'errors' in failureMember && failureMember.errors).toBeTruthy();
+            expect(failureMember).not.toHaveProperty('email');
+
+            const failureArrangementPatch =
+                typeof failureMember === 'object' && failureMember !== null && 'hasOfficeWorkArrangement' in failureMember ? failureMember.hasOfficeWorkArrangement : undefined;
+            expect(failureArrangementPatch).toBeNull();
+            if (failureArrangementPatch !== null) {
+                throw new Error('Expected the failure update to clear the unset work arrangement');
+            }
+
+            // Given Onyx contains the optimistic value,
+            // When applying the failure patch's explicit null,
+            // Then the member-level override is removed so the workspace default applies again.
+            const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policy.id}` as const;
+            await Onyx.merge(policyKey, {employeeList: {[member1Email]: {hasOfficeWorkArrangement: true}}});
+            await waitForBatchedUpdates();
+            expect((await getPolicyFromOnyx(policy.id)).employeeList?.[member1Email]?.hasOfficeWorkArrangement).toBe(true);
+
+            await Onyx.merge(policyKey, {employeeList: {[member1Email]: {hasOfficeWorkArrangement: failureArrangementPatch}}});
+            await waitForBatchedUpdates();
+            expect((await getPolicyFromOnyx(policy.id)).employeeList?.[member1Email]?.hasOfficeWorkArrangement).toBeUndefined();
+
+            expect(onyxData?.failureData?.[1]).toMatchObject({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`,
+            });
+            expect(getSingleUpdateValue(onyxData?.failureData?.[1]?.value)).toBeNull();
+        });
+
+        it('should update members without changelog actions when there is no admins room', async () => {
+            // Given the member is in the policy but the admins room is unavailable
+            const policy: Policy = {
+                ...createRandomPolicy(24),
+                employeeList: {[member1Email]: {email: member1Email}},
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy);
+            await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                [member1AccountID]: {accountID: member1AccountID, login: member1Email, displayName: 'Member One'},
+            });
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`, {});
+            await waitForBatchedUpdates();
+
+            pause();
+            // When the member's work arrangement is updated
+            setEmployeeWorkArrangement(policy, [member1AccountID], true, personalDetails, translate);
+            await waitForBatchedUpdates();
+
+            // Then the member is updated without creating a changelog action
+            const onyxPolicy = await getPolicyFromOnyx(policy.id);
+            expect(onyxPolicy.employeeList?.[member1Email]).toMatchObject({email: member1Email, hasOfficeWorkArrangement: true});
+
+            const reportActions = await getReportActionsFromOnyx('1');
+            expect(reportActions).toEqual({});
+
+            resetQueue();
+        });
+
+        it('should skip members missing from the employee list', async () => {
+            // Given one account is missing from the policy employee list
+            const missingMemberAccountID = 999999002;
+            const policy: Policy = {
+                ...createRandomPolicy(25),
+                employeeList: {[member1Email]: {email: member1Email, hasOfficeWorkArrangement: false}},
+            };
+            await seedWorkArrangementPolicy(policy);
+
+            pause();
+            // The missing account has personal details but no employeeList entry
+            const personalDetailsWithGhost = {
+                ...personalDetails,
+                [missingMemberAccountID]: {accountID: missingMemberAccountID, login: 'ghost@test.com', displayName: 'Ghost'},
+            };
+            await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, personalDetailsWithGhost);
+            await waitForBatchedUpdates();
+            // When the member missing from the policy employee list is passed
+            setEmployeeWorkArrangement(policy, [missingMemberAccountID], true, personalDetailsWithGhost, translate);
+            await waitForBatchedUpdates();
+
+            // Then no member data or changelog action is created
+            const onyxPolicy = await getPolicyFromOnyx(policy.id);
+            expect(onyxPolicy.employeeList?.[member1Email]).toEqual({email: member1Email, hasOfficeWorkArrangement: false});
+
+            const reportActions = await getReportActionsFromOnyx('1');
+            expect(reportActions).toEqual({});
+
+            resetQueue();
+        });
+
+        it('should do nothing without a policy ID', async () => {
+            // Given a valid member and a policy without an ID
+            const policy: Policy = {
+                ...createRandomPolicy(26),
+                employeeList: {[member1Email]: {email: member1Email, hasOfficeWorkArrangement: false}},
+            };
+            await seedWorkArrangementPolicy(policy);
+
+            pause();
+            // When the member is assigned an arrangement without a policy ID
+            setEmployeeWorkArrangement({...policy, id: ''}, [member1AccountID], true, personalDetails, translate);
+            await waitForBatchedUpdates();
+
+            // Then neither the policy nor the admins room changelog is changed
+            const onyxPolicy = await getPolicyFromOnyx(policy.id);
+            expect(onyxPolicy.employeeList?.[member1Email]).toEqual({email: member1Email, hasOfficeWorkArrangement: false});
+
+            const reportActions = await getReportActionsFromOnyx('1');
+            expect(reportActions).toEqual({});
+
+            resetQueue();
+        });
+    });
 });
diff --git a/tests/unit/EarlyRenewalOfferUtilsTest.ts b/tests/unit/EarlyRenewalOfferUtilsTest.ts
new file mode 100644
index 000000000000..6cc5693016b5
--- /dev/null
+++ b/tests/unit/EarlyRenewalOfferUtilsTest.ts
@@ -0,0 +1,47 @@
+import isNonIncentivizedEarlyRenewalPeriod, {getNonIncentivizedEarlyRenewalDates, isIncentivizedEarlyRenewalPeriod} from '@libs/EarlyRenewalOfferUtils';
+
+import CONST from '@src/CONST';
+
+describe('EarlyRenewalOfferUtils', () => {
+    test.each([
+        ['2026-10-05T16:20:00Z', '2026-10-01T00:00:00.000Z', '2027-10-01T00:00:00.000Z'],
+        ['2026-11-15T12:00:00Z', '2026-11-01T00:00:00.000Z', '2027-11-01T00:00:00.000Z'],
+        ['2026-12-31T23:59:59Z', '2026-12-01T00:00:00.000Z', '2027-12-01T00:00:00.000Z'],
+        ['2026-09-30T20:00:00-07:00', '2026-10-01T00:00:00.000Z', '2027-10-01T00:00:00.000Z'],
+    ])('shows a full year anchored to the UTC acceptance month: %s', (timestamp, startDate, endDate) => {
+        // Given an acceptance timestamp, including a local date that falls in a different UTC month
+        // When the confirmation dates are calculated
+        const dates = getNonIncentivizedEarlyRenewalDates(Date.parse(timestamp));
+
+        // Then both dates match Auth's first-of-month boundaries exactly one year apart
+        expect(dates).toEqual({startDate, endDate});
+    });
+
+    test.each([
+        ['before the campaign', new Date(Date.parse(CONST.SUBSCRIPTION.EARLY_RENEWAL.NON_INCENTIVIZED_START) - 1).toISOString(), false],
+        ['at the campaign start', CONST.SUBSCRIPTION.EARLY_RENEWAL.NON_INCENTIVIZED_START, true],
+        ['during the non-incentivized phase', '2026-10-14T23:59:59Z', true],
+        ['at the incentivized phase start', '2026-10-15T00:00:00Z', false],
+    ])('returns the expected result %s', (_description, timestamp, expected) => {
+        // Given a timestamp near a campaign phase boundary
+        // When App determines whether the non-incentivized offer is active
+        const isActive = isNonIncentivizedEarlyRenewalPeriod(Date.parse(timestamp));
+
+        // Then the result matches the UTC campaign window
+        expect(isActive).toBe(expected);
+    });
+
+    test.each([
+        ['before incentives', '2026-10-14T23:59:59Z', false],
+        ['at the incentive start', '2026-10-15T00:00:00Z', true],
+        ['before the campaign ends', '2026-12-31T23:59:59Z', true],
+        ['at the campaign end', '2027-01-01T00:00:00Z', false],
+    ])('shows the admin draft CTA only during incentives: %s', (_description, timestamp, expected) => {
+        // Given a timestamp near the incentive window boundaries
+        // When App checks whether to show the admin CTA
+        const isActive = isIncentivizedEarlyRenewalPeriod(Date.parse(timestamp));
+
+        // Then no admin CTA is shown before incentives or after the campaign
+        expect(isActive).toBe(expected);
+    });
+});
diff --git a/tests/unit/ErrorBoundaryLogErrorTest.ts b/tests/unit/ErrorBoundaryLogErrorTest.ts
new file mode 100644
index 000000000000..dfed6e0db69f
--- /dev/null
+++ b/tests/unit/ErrorBoundaryLogErrorTest.ts
@@ -0,0 +1,59 @@
+// Regression coverage for app-blocking boundary errors and expected upgrade notifications.
+import logError from '@components/ErrorBoundary/logError';
+
+import CONST from '@src/CONST';
+
+import * as Sentry from '@sentry/react-native';
+
+jest.mock('@libs/Log', () => ({alert: jest.fn()}));
+
+jest.mock('@sentry/react-native', () => ({
+    addBreadcrumb: jest.fn(),
+    captureException: jest.fn(),
+}));
+
+const logMock = jest.requireMock<{alert: jest.Mock}>('@libs/Log');
+
+describe('ErrorBoundary logError', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('reports unexpected boundary errors as fatal, unhandled, and app-blocking', () => {
+        // Given a render failure that replaces the main app with the generic error screen
+        const error = new TypeError("Cannot read properties of undefined (reading 'userId')");
+        const errorMessage = 'NewExpensify crash caught by error boundary';
+        const errorInfo = JSON.stringify({componentStack: 'UpcomingTravelSection'});
+
+        // When the root error boundary reports the failure
+        logError(errorMessage, error, errorInfo);
+
+        // Then Sentry can distinguish the app-blocking failure from a recoverable handled error
+        expect(Sentry.captureException).toHaveBeenCalledTimes(1);
+        expect(Sentry.captureException).toHaveBeenCalledWith(error, {
+            mechanism: {type: 'generic', handled: false},
+            captureContext: {
+                level: 'fatal',
+                extra: {errorInfo},
+                tags: {[CONST.TELEMETRY.TAGS.APP_BLOCKING]: 'true'},
+            },
+        });
+        expect(Sentry.addBreadcrumb).toHaveBeenCalledWith({message: `errorInfo: ${errorInfo}`});
+        expect(logMock.alert).toHaveBeenCalledWith(`${errorMessage} - ${error.message}`, {errorInfo}, false);
+    });
+
+    it('keeps update-required notifications out of Sentry while preserving server logging', () => {
+        // Given an expected minimum-version notification rather than an unexpected app failure
+        const error = new Error(CONST.ERROR.UPDATE_REQUIRED);
+        const errorMessage = 'NewExpensify crash caught by error boundary';
+        const errorInfo = JSON.stringify({componentStack: 'Expensify'});
+
+        // When the error boundary reports the update-required notification
+        logError(errorMessage, error, errorInfo);
+
+        // Then no Sentry exception or breadcrumb is created, but the existing server log remains
+        expect(Sentry.captureException).not.toHaveBeenCalled();
+        expect(Sentry.addBreadcrumb).not.toHaveBeenCalled();
+        expect(logMock.alert).toHaveBeenCalledWith(`${errorMessage} - ${CONST.ERROR.UPDATE_REQUIRED}`, {errorInfo}, false);
+    });
+});
diff --git a/tests/unit/ExpenseAddedGrowlTest.tsx b/tests/unit/ExpenseAddedGrowlTest.tsx
new file mode 100644
index 000000000000..bb4b75348c11
--- /dev/null
+++ b/tests/unit/ExpenseAddedGrowlTest.tsx
@@ -0,0 +1,339 @@
+import {act, render} from '@testing-library/react-native';
+
+import ExpenseAddedGrowl from '@components/ExpenseAddedGrowl';
+import type GrowlNotificationContent from '@components/GrowlNotification/GrowlNotificationContent';
+
+import {onModalDidClose, setCloseModal} from '@libs/actions/Modal';
+import {createTransactionThreadReport, setOptimisticTransactionThread} from '@libs/actions/Report';
+import navigateToCreatedExpense from '@libs/Navigation/helpers/navigateToCreatedExpense';
+import {getOriginalMessage} from '@libs/ReportActionsUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+
+import type {ComponentProps} from 'react';
+
+import Onyx from 'react-native-onyx';
+
+import {actionR14932} from '../../__mocks__/reportData/actions';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+type GrowlContentProps = ComponentProps<typeof GrowlNotificationContent>;
+
+const mockGetTopmostReportId = jest.fn<string | undefined, []>();
+const mockGetFocusedReportId = jest.fn<string | undefined, []>();
+
+const mockGrowlContent = jest.fn<void, [GrowlContentProps]>();
+jest.mock('@components/GrowlNotification/GrowlNotificationContent', () => (props: GrowlContentProps) => {
+    mockGrowlContent(props);
+    return null;
+});
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    getTopmostReportId: () => mockGetTopmostReportId(),
+    getFocusedReportId: () => mockGetFocusedReportId(),
+    getActiveRoute: () => '',
+}));
+jest.mock('@libs/Navigation/helpers/navigateToCreatedExpense', () => jest.fn());
+jest.mock('@libs/actions/Report', () => ({
+    createTransactionThreadReport: jest.fn(),
+    setOptimisticTransactionThread: jest.fn(),
+}));
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => () => ({accountID: 1, login: 'me@example.com'}));
+
+const mockCreateTransactionThreadReport = jest.mocked(createTransactionThreadReport);
+const mockSetOptimisticTransactionThread = jest.mocked(setOptimisticTransactionThread);
+const mockNavigateToCreatedExpense = jest.mocked(navigateToCreatedExpense);
+
+const EXPENSE = CONST.SEARCH.DATA_TYPES.EXPENSE;
+const INVOICE = CONST.SEARCH.DATA_TYPES.INVOICE;
+
+function flush(mutate: () => unknown) {
+    return act(async () => {
+        await mutate();
+        await waitForBatchedUpdates();
+    });
+}
+
+function seedExpense(transactionID: string, reportID: string, dataType: SearchDataTypes = EXPENSE) {
+    return flush(async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {transactionID, reportID});
+        await Onyx.merge(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS, {[transactionID]: dataType});
+    });
+}
+
+function lastGrowlProps() {
+    return mockGrowlContent.mock.calls.at(-1)?.[0];
+}
+
+describe('ExpenseAddedGrowl', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        mockCreateTransactionThreadReport.mockReset();
+        mockGetTopmostReportId.mockReturnValue(undefined);
+        mockGetFocusedReportId.mockReturnValue(undefined);
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('shows the "Expense added" growl for a pending transaction when the user is not viewing its report', async () => {
+        // Given the growl is mounted and the user is not viewing any report
+        render(<ExpenseAddedGrowl />);
+
+        // When an expense is created
+        await seedExpense('1', 'report-1');
+
+        // Then the "Expense added" success growl shows
+        expect(mockGrowlContent).toHaveBeenCalled();
+        expect(lastGrowlProps()?.bodyText).toBe('iou.expenseAdded');
+        expect(lastGrowlProps()?.type).toBe(CONST.GROWL.SUCCESS);
+        expect(lastGrowlProps()?.action?.label).toBe('common.view');
+    });
+
+    it('uses the invoice copy for an invoice', async () => {
+        // Given the growl is mounted and the user is not viewing any report
+        render(<ExpenseAddedGrowl />);
+
+        // When an invoice is created
+        await seedExpense('1', 'report-1', INVOICE);
+
+        // Then the invoice copy is used instead of the expense one
+        expect(lastGrowlProps()?.bodyText).toBe('iou.invoiceSent');
+    });
+
+    it("suppresses the growl when the user is already viewing the expense's report", async () => {
+        // Given the user is already viewing report-1
+        mockGetFocusedReportId.mockReturnValue('report-1');
+        render(<ExpenseAddedGrowl />);
+
+        // When an expense is created in that same report
+        await seedExpense('1', 'report-1');
+
+        // Then no growl shows, because the report already highlights the new expense
+        expect(mockGrowlContent).not.toHaveBeenCalled();
+    });
+
+    it("still shows the growl when the expense's report is only left open on an inactive tab", async () => {
+        // Given report-1 sits in the Inbox stack the user isn't looking at, so only the central-pane read sees it
+        mockGetTopmostReportId.mockReturnValue('report-1');
+        mockGetFocusedReportId.mockReturnValue(undefined);
+        render(<ExpenseAddedGrowl />);
+
+        // When an expense is created in report-1 from another tab, e.g. splitting an expense in Spend
+        await seedExpense('1', 'report-1');
+
+        // Then the growl still shows, because nothing on screen highlights the new expense
+        expect(mockGrowlContent).toHaveBeenCalled();
+    });
+
+    it('still shows for a tracked/unreported (self-DM) expense even when a report is open, since its reportID is UNREPORTED', async () => {
+        // Given the user is viewing some report
+        mockGetFocusedReportId.mockReturnValue('some-open-report');
+        render(<ExpenseAddedGrowl />);
+
+        // When a tracked expense is created, which has no report to be viewed in
+        await seedExpense('1', CONST.REPORT.UNREPORTED_REPORT_ID);
+
+        // Then the growl still shows
+        expect(mockGrowlContent).toHaveBeenCalled();
+    });
+
+    it('shows a single growl for a batch of new expenses and clears the whole signal', async () => {
+        // Given the growl is mounted
+        render(<ExpenseAddedGrowl />);
+
+        // When two expenses are created in the same batch
+        await flush(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}1`, {transactionID: '1', reportID: 'report-1'});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}2`, {transactionID: '2', reportID: 'report-1'});
+            const signal: Record<string, SearchDataTypes> = {};
+            signal['1'] = EXPENSE;
+            signal['2'] = EXPENSE;
+            await Onyx.merge(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS, signal);
+        });
+
+        // Then exactly one growl shows for the batch
+        expect(mockGrowlContent).toHaveBeenCalledTimes(1);
+
+        // And the whole signal is consumed so it can't re-fire
+        const remaining = await new Promise<Record<string, SearchDataTypes> | undefined>((resolve) => {
+            const connection = Onyx.connect({
+                key: ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS,
+                callback: (value) => {
+                    Onyx.disconnect(connection);
+                    resolve(value);
+                },
+            });
+        });
+        expect(remaining ?? {}).toEqual({});
+    });
+
+    it('shows the next queued expense after dismissal and ignores a stale dismissal', async () => {
+        // Given one growl is active and another expense is queued
+        render(<ExpenseAddedGrowl />);
+        await seedExpense('1', 'report-1');
+        const firstGrowl = lastGrowlProps();
+        expect(firstGrowl).toBeDefined();
+
+        await seedExpense('2', 'report-2');
+        expect(lastGrowlProps()?.nonce).toBe(firstGrowl?.nonce);
+
+        // When the active growl is dismissed
+        await flush(() => firstGrowl?.onDismissed(firstGrowl.nonce));
+        const secondGrowl = lastGrowlProps();
+
+        // Then the queued expense is shown
+        expect(secondGrowl?.nonce).toBeGreaterThan(firstGrowl?.nonce ?? 0);
+
+        // When the old growl reports another, stale dismissal and a third expense is queued
+        await flush(() => firstGrowl?.onDismissed(firstGrowl.nonce));
+        await seedExpense('3', 'report-3');
+
+        // Then the current growl remains active until its own dismissal
+        expect(lastGrowlProps()?.nonce).toBe(secondGrowl?.nonce);
+        await flush(() => secondGrowl?.onDismissed(secondGrowl.nonce));
+        expect(lastGrowlProps()?.nonce).toBeGreaterThan(secondGrowl?.nonce ?? 0);
+    });
+
+    it('navigates to an existing transaction thread when View is pressed', async () => {
+        // Given an expense already has a transaction thread
+        render(<ExpenseAddedGrowl />);
+        await flush(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}1`, {
+                transactionID: '1',
+                reportID: 'report-1',
+                transactionThreadReportID: 'thread-1',
+            });
+            const signal: Record<string, SearchDataTypes> = {};
+            signal['1'] = EXPENSE;
+            await Onyx.merge(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS, signal);
+        });
+
+        // When View is pressed
+        lastGrowlProps()?.action?.onPress();
+
+        // Then the existing thread is initialized and opened without creating a replacement
+        expect(mockSetOptimisticTransactionThread).toHaveBeenCalledWith('thread-1', undefined, undefined, undefined);
+        expect(mockCreateTransactionThreadReport).not.toHaveBeenCalled();
+        expect(mockNavigateToCreatedExpense).toHaveBeenCalledWith({threadReportID: 'thread-1', transactionID: '1', iouReportID: undefined, reportTransactions: []});
+    });
+
+    it('does nothing when View is pressed after the expense was deleted offline', async () => {
+        // Given the expense was deleted offline while its growl was showing, so it is only pending delete
+        render(<ExpenseAddedGrowl />);
+        await flush(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}1`, {
+                transactionID: '1',
+                reportID: 'report-1',
+                transactionThreadReportID: 'thread-1',
+            });
+            const signal: Record<string, SearchDataTypes> = {};
+            signal['1'] = EXPENSE;
+            await Onyx.merge(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS, signal);
+        });
+        await flush(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}1`, {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE});
+        });
+
+        // When View is pressed
+        lastGrowlProps()?.action?.onPress();
+
+        // Then no thread is rebuilt or opened, since it would only show a loading skeleton
+        expect(mockSetOptimisticTransactionThread).not.toHaveBeenCalled();
+        expect(mockCreateTransactionThreadReport).not.toHaveBeenCalled();
+        expect(mockNavigateToCreatedExpense).not.toHaveBeenCalled();
+    });
+
+    it('closes an open popover before opening the expense when View is pressed', async () => {
+        // Given a popover menu is open while the growl shows above it
+        const closePopover = jest.fn();
+        const removeCloseListener = setCloseModal(closePopover);
+        render(<ExpenseAddedGrowl />);
+        await flush(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}1`, {
+                transactionID: '1',
+                reportID: 'report-1',
+                transactionThreadReportID: 'thread-1',
+            });
+            const signal: Record<string, SearchDataTypes> = {};
+            signal['1'] = EXPENSE;
+            await Onyx.merge(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS, signal);
+        });
+
+        // When View is pressed
+        lastGrowlProps()?.action?.onPress();
+
+        // Then the popover closes first, and the expense only opens once it has closed so it isn't left on top
+        expect(closePopover).toHaveBeenCalled();
+        expect(mockNavigateToCreatedExpense).not.toHaveBeenCalled();
+        onModalDidClose();
+        expect(mockNavigateToCreatedExpense).toHaveBeenCalledWith({threadReportID: 'thread-1', transactionID: '1', iouReportID: undefined, reportTransactions: []});
+        removeCloseListener();
+    });
+
+    it('resolves an existing transaction thread from the IOU action when View is pressed', async () => {
+        // Given the transaction thread is recorded on its IOU action
+        const transactionID = getOriginalMessage(actionR14932)?.IOUTransactionID;
+        if (!transactionID) {
+            throw new Error('Expected the IOU action fixture to contain a transaction ID');
+        }
+        const reportID = actionR14932.reportID;
+        render(<ExpenseAddedGrowl />);
+        await flush(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {transactionID, reportID});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {[actionR14932.reportActionID]: actionR14932});
+            const signal: Record<string, SearchDataTypes> = {};
+            signal[transactionID] = EXPENSE;
+            await Onyx.merge(ONYXKEYS.RAM_ONLY_EXPENSE_ADDED_GROWL_TRANSACTION_IDS, signal);
+        });
+
+        // When View is pressed
+        lastGrowlProps()?.action?.onPress();
+
+        // Then the IOU action's thread is initialized and opened
+        expect(mockSetOptimisticTransactionThread).toHaveBeenCalledWith(actionR14932.childReportID, undefined, actionR14932.reportActionID, undefined);
+        expect(mockCreateTransactionThreadReport).not.toHaveBeenCalled();
+        expect(mockNavigateToCreatedExpense).toHaveBeenCalledWith({
+            threadReportID: actionR14932.childReportID,
+            transactionID,
+            iouReportID: undefined,
+            reportTransactions: [],
+        });
+    });
+
+    it('creates and navigates to a transaction thread when View is pressed without an existing thread', async () => {
+        // Given an expense does not have a transaction thread yet
+        mockCreateTransactionThreadReport.mockReturnValue({reportID: 'created-thread'});
+        render(<ExpenseAddedGrowl />);
+        await seedExpense('1', 'report-1');
+
+        // When View is pressed
+        lastGrowlProps()?.action?.onPress();
+
+        // Then a thread is created from the current expense data and opened
+        expect(mockCreateTransactionThreadReport).toHaveBeenCalledWith(
+            expect.objectContaining({
+                currentUserLogin: 'me@example.com',
+                currentUserAccountID: 1,
+                transaction: expect.objectContaining({transactionID: '1', reportID: 'report-1'}),
+            }),
+        );
+        expect(mockSetOptimisticTransactionThread).not.toHaveBeenCalled();
+        expect(mockNavigateToCreatedExpense).toHaveBeenCalledWith({threadReportID: 'created-thread', transactionID: '1', iouReportID: undefined, reportTransactions: []});
+    });
+
+    it('does not show a growl when there is no pending signal', () => {
+        // Given no expense was created
+        // When the growl mounts
+        render(<ExpenseAddedGrowl />);
+
+        // Then the growl doesn't show
+        expect(mockGrowlContent).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/ExpenseDefaultRuleUtilsTest.ts b/tests/unit/ExpenseDefaultRuleUtilsTest.ts
new file mode 100644
index 000000000000..d067e4fcfa92
--- /dev/null
+++ b/tests/unit/ExpenseDefaultRuleUtilsTest.ts
@@ -0,0 +1,458 @@
+import {
+    buildMerchantRule,
+    canEditMerchantRule,
+    getExpenseDefaultRuleCount,
+    getExpenseDefaultRuleSummaryFields,
+    getMerchantRuleFormValues,
+    getPolicyExpenseDefaultRules,
+    getRuleMerchantMatchSummary,
+    hasExpenseDefaultRuleErrors,
+} from '@libs/ExpenseDefaultRuleUtils';
+import type {MerchantRuleFormValues} from '@libs/ExpenseDefaultRuleUtils';
+import Parser from '@libs/Parser';
+import {getRuleFilterLeaves, isExpenseDefaultRule, toIndexMap} from '@libs/RuleUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, Rule} from '@src/types/onyx';
+import type {ExpenseDefaultAction, ExpenseDefaultRule} from '@src/types/onyx/ExpenseDefaultRules';
+import type {RuleFilterComparison, RuleFilterNode} from '@src/types/onyx/RuleFilters';
+
+import createRandomPolicy from '../utils/collections/policies';
+
+const {FIELD} = CONST.RULES.EXPENSE_DEFAULT;
+const {TRIGGERS: TRIGGER, ACTIONS: ACTION} = CONST.RULES;
+const {EQUAL_TO, CONTAINS, AND, OR, GREATER_THAN} = CONST.SEARCH.SYNTAX_OPERATORS;
+
+const POLICY_ID = 'ABC123';
+const OTHER_POLICY_ID = 'DEF456';
+const TAX_KEY = 'id_TAX_RATE_1';
+
+const policy: Policy = {
+    ...createRandomPolicy(1),
+    id: POLICY_ID,
+    taxRates: {
+        name: 'Tax',
+        defaultExternalID: TAX_KEY,
+        defaultValue: '10%',
+        foreignTaxDefault: TAX_KEY,
+        taxes: {
+            [TAX_KEY]: {name: 'GST', value: '10%'},
+        },
+    },
+};
+
+const merchantFilter: RuleFilterComparison = {left: FIELD.MERCHANT, operator: CONTAINS, right: 'Starbucks'};
+const setCategoryAction: ExpenseDefaultAction = {name: ACTION.SET, field: FIELD.CATEGORY, value: 'Coffee'};
+
+const merchantRuleBody: ExpenseDefaultRule = {
+    triggers: toIndexMap([TRIGGER.CREATE_TRANSACTION]),
+    filters: merchantFilter,
+    actions: toIndexMap([setCategoryAction]),
+};
+
+/** Wraps a rule body into a collection-shaped rule so the collection helpers can be tested. */
+function asStoredRule(body: ExpenseDefaultRule, scopeID = POLICY_ID, scope: Rule['scope'] = CONST.RULES.SCOPE.POLICY): Rule {
+    return {...body, scope, scopeID};
+}
+
+/** Builds a rule body the merchant rule form can't represent, by overriding one part of a valid one. */
+function buildRuleWithOverrides(overrides: Record<string, unknown>): ExpenseDefaultRule {
+    return {...merchantRuleBody, ...overrides} as ExpenseDefaultRule;
+}
+
+describe('ExpenseDefaultRuleUtils', () => {
+    describe('buildMerchantRule', () => {
+        it('builds the CreateTransaction trigger, the merchant filter and one Set action per field', () => {
+            const rule = buildMerchantRule(
+                {
+                    merchantToMatch: 'Starbucks',
+                    matchType: EQUAL_TO,
+                    merchant: 'Starbucks Coffee',
+                    category: 'Coffee',
+                    tag: 'Team A',
+                    tax: TAX_KEY,
+                    vendorID: 'vendor-1',
+                    comment: 'A description',
+                    reimbursable: true,
+                    billable: false,
+                },
+                policy,
+            );
+
+            expect(rule).toEqual({
+                triggers: toIndexMap([TRIGGER.CREATE_TRANSACTION]),
+                filters: {left: FIELD.MERCHANT, operator: EQUAL_TO, right: 'Starbucks'},
+                actions: toIndexMap([
+                    {name: ACTION.SET, field: FIELD.MERCHANT, value: 'Starbucks Coffee'},
+                    {name: ACTION.SET, field: FIELD.CATEGORY, value: 'Coffee'},
+                    {name: ACTION.SET, field: FIELD.TAG, value: 'Team A'},
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    {name: ACTION.SET, field: FIELD.TAX, value: {field_id_TAX: {externalID: TAX_KEY, value: '10%', name: 'GST'}}},
+                    {name: ACTION.SET, field: FIELD.VENDOR_ID, value: 'vendor-1'},
+                    {name: ACTION.SET, field: FIELD.COMMENT, value: Parser.replace('A description')},
+                    {name: ACTION.SET, field: FIELD.REIMBURSABLE, value: true},
+                    {name: ACTION.SET, field: FIELD.BILLABLE, value: false},
+                ]),
+            });
+        });
+
+        it('defaults the match type to contains and trims the matched merchant', () => {
+            const rule = buildMerchantRule({merchantToMatch: '  Uber  ', category: 'Travel'}, policy);
+
+            expect(rule?.filters).toEqual({left: FIELD.MERCHANT, operator: CONTAINS, right: 'Uber'});
+        });
+
+        it('keeps false booleans, which are meaningful values rather than empty ones', () => {
+            const rule = buildMerchantRule({merchantToMatch: 'Uber', billable: false, reimbursable: false}, policy);
+
+            expect(Object.values(rule?.actions ?? {})).toEqual([
+                {name: ACTION.SET, field: FIELD.REIMBURSABLE, value: false},
+                {name: ACTION.SET, field: FIELD.BILLABLE, value: false},
+            ]);
+        });
+
+        it('returns undefined when there is nothing to match on', () => {
+            expect(buildMerchantRule({merchantToMatch: '   ', category: 'Coffee'}, policy)).toBeUndefined();
+        });
+
+        it('returns undefined when there is nothing to set', () => {
+            expect(buildMerchantRule({merchantToMatch: 'Starbucks'}, policy)).toBeUndefined();
+        });
+
+        it('treats a whitespace-only description as nothing to set', () => {
+            expect(buildMerchantRule({merchantToMatch: 'Starbucks', comment: '   '}, policy)).toBeUndefined();
+        });
+
+        it('still records the tax external ID when the rate is missing from the policy', () => {
+            const rule = buildMerchantRule({merchantToMatch: 'Starbucks', tax: 'id_UNKNOWN'}, policy);
+
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            expect(Object.values(rule?.actions ?? {}).at(0)?.value).toEqual({field_id_TAX: {externalID: 'id_UNKNOWN'}});
+        });
+    });
+
+    describe('getMerchantRuleFormValues round trip', () => {
+        it('returns the values it was built from', () => {
+            const formValues: MerchantRuleFormValues = {
+                merchantToMatch: 'Starbucks',
+                matchType: EQUAL_TO,
+                merchant: 'Starbucks Coffee',
+                category: 'Coffee',
+                tag: 'Team A',
+                tax: TAX_KEY,
+                vendorID: 'vendor-1',
+                comment: 'A description',
+                reimbursable: true,
+                billable: false,
+            };
+
+            expect(getMerchantRuleFormValues(buildMerchantRule(formValues, policy))).toEqual(formValues);
+        });
+
+        it('round trips a rule that only renames the merchant', () => {
+            const formValues: MerchantRuleFormValues = {merchantToMatch: 'STARBUCKS #123', matchType: CONTAINS, merchant: 'Starbucks'};
+
+            expect(getMerchantRuleFormValues(buildMerchantRule(formValues, policy))).toEqual(formValues);
+        });
+
+        it('converts the description back to markdown', () => {
+            const rule = buildMerchantRule({merchantToMatch: 'Starbucks', comment: 'A description'}, policy);
+
+            expect(getMerchantRuleFormValues(rule)?.comment).toBe('A description');
+        });
+
+        it('accepts a single-value list on the right of the merchant filter', () => {
+            const rule = buildRuleWithOverrides({filters: {left: FIELD.MERCHANT, operator: CONTAINS, right: ['Starbucks']}});
+
+            expect(getMerchantRuleFormValues(rule)).toEqual({merchantToMatch: 'Starbucks', matchType: CONTAINS, category: 'Coffee'});
+        });
+    });
+
+    describe('getMerchantRuleFormValues rejects rules the form cannot represent', () => {
+        it.each([
+            [
+                'a nested filter tree',
+                {
+                    filters: {
+                        left: merchantFilter,
+                        operator: AND,
+                        right: {left: FIELD.CATEGORY, operator: EQUAL_TO, right: 'Coffee'},
+                    },
+                },
+            ],
+            ['a filter on a field the form has no input for', {filters: {left: FIELD.CATEGORY, operator: EQUAL_TO, right: 'Coffee'}}],
+            ['an operator the form has no control for', {filters: {left: FIELD.MERCHANT, operator: GREATER_THAN, right: 'Starbucks'}}],
+            ['a list of merchants, which the form has one input for', {filters: {left: FIELD.MERCHANT, operator: OR, right: ['Starbucks', 'Costa']}}],
+            ['a trigger the form does not set', {triggers: toIndexMap([TRIGGER.CREATE_TRANSACTION, CONST.RULES.TRIGGERS.REPORT_SUBMIT])}],
+            ['no triggers at all', {triggers: {}}],
+            ['no actions at all', {actions: {}}],
+            ['an action the form cannot produce', {actions: toIndexMap([{name: CONST.RULES.ACTIONS.FORWARD_TO, approver: 'a@b.com'}])}],
+            ['an unknown field', {actions: toIndexMap([{name: ACTION.SET, field: 'attendees', value: 'someone'}])}],
+            [
+                'two actions writing the same field',
+                {
+                    actions: toIndexMap([setCategoryAction, {name: ACTION.SET, field: FIELD.CATEGORY, value: 'Travel'}]),
+                },
+            ],
+            ['a value of the wrong type', {actions: toIndexMap([{name: ACTION.SET, field: FIELD.BILLABLE, value: 'true'}])}],
+            ['a malformed tax value', {actions: toIndexMap([{name: ACTION.SET, field: FIELD.TAX, value: TAX_KEY}])}],
+        ])('returns undefined for %s', (_description, overrides) => {
+            expect(getMerchantRuleFormValues(buildRuleWithOverrides(overrides))).toBeUndefined();
+        });
+
+        it('returns undefined for an undefined rule', () => {
+            expect(getMerchantRuleFormValues(undefined)).toBeUndefined();
+        });
+    });
+
+    describe('isExpenseDefaultRule', () => {
+        it('is true for a rule that runs on transaction creation and sets a field', () => {
+            expect(isExpenseDefaultRule(asStoredRule(merchantRuleBody))).toBe(true);
+        });
+
+        it('is false for a rule with no Set action', () => {
+            const rule = asStoredRule(buildRuleWithOverrides({actions: toIndexMap([{name: CONST.RULES.ACTIONS.FORWARD_TO, approver: 'a@b.com'}])}));
+
+            expect(isExpenseDefaultRule(rule)).toBe(false);
+        });
+
+        it('is false for a rule that does not run on transaction creation', () => {
+            const rule = asStoredRule(buildRuleWithOverrides({triggers: toIndexMap([CONST.RULES.TRIGGERS.REPORT_SUBMIT])}));
+
+            expect(isExpenseDefaultRule(rule)).toBe(false);
+        });
+
+        it('is false for a rule that matches on something other than a merchant', () => {
+            // Given a category rule, which the merchant rule editor has no way to open
+            const rule = asStoredRule(buildRuleWithOverrides({filters: {left: FIELD.CATEGORY, operator: CONTAINS, right: 'Coffee'}}));
+
+            // When it is tested
+            // Then it is not an expense default, so a client that cannot edit it does not list it either
+            expect(isExpenseDefaultRule(rule)).toBe(false);
+        });
+
+        it('is true for a merchant condition nested inside a combination', () => {
+            // Given a rule whose merchant condition sits one level down, which is how two merchants are matched
+            const rule = asStoredRule(
+                buildRuleWithOverrides({
+                    filters: {left: merchantFilter, operator: CONST.SEARCH.SYNTAX_OPERATORS.OR, right: {left: FIELD.MERCHANT, operator: CONTAINS, right: 'Costa'}},
+                }),
+            );
+
+            // When it is tested
+            // Then the nesting does not hide the merchant condition
+            expect(isExpenseDefaultRule(rule)).toBe(true);
+        });
+    });
+
+    describe('getPolicyExpenseDefaultRules', () => {
+        it('keeps only the expense default rules scoped to the given policy', () => {
+            const collection = {
+                [`${ONYXKEYS.COLLECTION.RULE}1`]: asStoredRule(merchantRuleBody),
+                [`${ONYXKEYS.COLLECTION.RULE}2`]: asStoredRule(merchantRuleBody, OTHER_POLICY_ID),
+                [`${ONYXKEYS.COLLECTION.RULE}3`]: asStoredRule(merchantRuleBody, '5555', CONST.RULES.SCOPE.ACCOUNT),
+                [`${ONYXKEYS.COLLECTION.RULE}4`]: asStoredRule(buildRuleWithOverrides({triggers: toIndexMap([CONST.RULES.TRIGGERS.REPORT_SUBMIT])})),
+            };
+
+            expect(getPolicyExpenseDefaultRules(collection, POLICY_ID)).toEqual([{ruleID: '1', rule: collection[`${ONYXKEYS.COLLECTION.RULE}1`]}]);
+        });
+
+        it('returns an empty list without a policy ID', () => {
+            expect(getPolicyExpenseDefaultRules({[`${ONYXKEYS.COLLECTION.RULE}1`]: asStoredRule(merchantRuleBody)}, undefined)).toEqual([]);
+        });
+    });
+
+    describe('getExpenseDefaultRuleCount', () => {
+        it('counts only the rules scoped to the given policy', () => {
+            const collection = {
+                [`${ONYXKEYS.COLLECTION.RULE}1`]: asStoredRule(merchantRuleBody),
+                [`${ONYXKEYS.COLLECTION.RULE}2`]: asStoredRule(merchantRuleBody, OTHER_POLICY_ID),
+            };
+
+            expect(getExpenseDefaultRuleCount(collection, POLICY_ID)).toBe(1);
+        });
+
+        it('ignores rules being deleted', () => {
+            const collection = {
+                [`${ONYXKEYS.COLLECTION.RULE}1`]: {...asStoredRule(merchantRuleBody), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
+            };
+
+            expect(getExpenseDefaultRuleCount(collection, POLICY_ID)).toBe(0);
+        });
+
+        it('is zero for an empty collection', () => {
+            expect(getExpenseDefaultRuleCount({}, POLICY_ID)).toBe(0);
+        });
+    });
+
+    describe('hasExpenseDefaultRuleErrors', () => {
+        const failedRule = {...asStoredRule(merchantRuleBody), errors: {error: 'Whoops'}};
+
+        it("is true when one of the policy's rules failed to save", () => {
+            expect(hasExpenseDefaultRuleErrors({[`${ONYXKEYS.COLLECTION.RULE}1`]: failedRule}, POLICY_ID)).toBe(true);
+        });
+
+        it('is false when the failed rule belongs to another policy', () => {
+            expect(hasExpenseDefaultRuleErrors({[`${ONYXKEYS.COLLECTION.RULE}1`]: {...failedRule, scopeID: OTHER_POLICY_ID}}, POLICY_ID)).toBe(false);
+        });
+
+        it('is false when no rule carries an error', () => {
+            expect(hasExpenseDefaultRuleErrors({[`${ONYXKEYS.COLLECTION.RULE}1`]: asStoredRule(merchantRuleBody)}, POLICY_ID)).toBe(false);
+        });
+    });
+
+    describe('canEditMerchantRule', () => {
+        it('allows a representable rule scoped to the policy', () => {
+            expect(canEditMerchantRule(asStoredRule(merchantRuleBody), POLICY_ID)).toBe(true);
+        });
+
+        it('refuses a rule belonging to another policy', () => {
+            expect(canEditMerchantRule(asStoredRule(merchantRuleBody, OTHER_POLICY_ID), POLICY_ID)).toBe(false);
+        });
+
+        it('refuses an account scoped rule', () => {
+            expect(canEditMerchantRule(asStoredRule(merchantRuleBody, POLICY_ID, CONST.RULES.SCOPE.ACCOUNT), POLICY_ID)).toBe(false);
+        });
+
+        it('refuses an approval workflow rule that happens to share the ruleID', () => {
+            const approvalWorkflowRule = asStoredRule(
+                buildRuleWithOverrides({
+                    triggers: toIndexMap([CONST.RULES.TRIGGERS.REPORT_SUBMIT]),
+                    actions: toIndexMap([{name: CONST.RULES.ACTIONS.FORWARD_TO, approver: 'a@b.com'}]),
+                }),
+            );
+
+            expect(canEditMerchantRule(approvalWorkflowRule, POLICY_ID)).toBe(false);
+        });
+
+        it('refuses a rule the form cannot represent, so saving cannot overwrite it', () => {
+            const nested = asStoredRule(
+                buildRuleWithOverrides({
+                    filters: {left: merchantFilter, operator: AND, right: {left: FIELD.MERCHANT, operator: CONTAINS, right: 'Costa'}},
+                }),
+            );
+
+            expect(canEditMerchantRule(nested, POLICY_ID)).toBe(false);
+        });
+
+        it('refuses without a rule or without a policy', () => {
+            expect(canEditMerchantRule(undefined, POLICY_ID)).toBe(false);
+            expect(canEditMerchantRule(asStoredRule(merchantRuleBody), undefined)).toBe(false);
+        });
+    });
+
+    describe('getRuleMerchantMatchSummary', () => {
+        it('reads a single merchant leaf', () => {
+            expect(getRuleMerchantMatchSummary(merchantFilter)).toEqual({merchants: 'Starbucks', isExactMatch: false});
+        });
+
+        it('flags an exact match', () => {
+            expect(getRuleMerchantMatchSummary({left: FIELD.MERCHANT, operator: EQUAL_TO, right: 'Starbucks'})).toEqual({merchants: 'Starbucks', isExactMatch: true});
+        });
+
+        it('joins the values of a merchant leaf holding a list, which the editor cannot represent', () => {
+            const filters: RuleFilterComparison = {left: FIELD.MERCHANT, operator: EQUAL_TO, right: ['Starbucks', 'Costa']};
+
+            expect(getRuleMerchantMatchSummary(filters)).toEqual({merchants: 'Starbucks, Costa', isExactMatch: true});
+        });
+
+        it('joins the merchants of a nested tree, which the editor cannot represent', () => {
+            const filters: RuleFilterNode = {
+                left: merchantFilter,
+                operator: AND,
+                right: {left: FIELD.MERCHANT, operator: CONTAINS, right: 'Costa'},
+            };
+
+            expect(getRuleMerchantMatchSummary(filters)).toEqual({merchants: 'Starbucks, Costa', isExactMatch: false});
+            // The same rule stays read-only, so the summary is the only thing the row can show.
+            expect(getMerchantRuleFormValues(asStoredRule({...merchantRuleBody, filters}))).toBeUndefined();
+        });
+
+        it('is not an exact match when the merchant leaves disagree on the operator', () => {
+            const filters: RuleFilterNode = {
+                left: {left: FIELD.MERCHANT, operator: EQUAL_TO, right: 'Starbucks'},
+                operator: OR,
+                right: {left: FIELD.MERCHANT, operator: CONTAINS, right: 'Costa'},
+            };
+
+            expect(getRuleMerchantMatchSummary(filters).isExactMatch).toBe(false);
+        });
+
+        it('ignores leaves on other fields', () => {
+            const filters: RuleFilterNode = {
+                left: merchantFilter,
+                operator: AND,
+                right: {left: FIELD.CATEGORY, operator: EQUAL_TO, right: 'Coffee'},
+            };
+
+            expect(getRuleMerchantMatchSummary(filters)).toEqual({merchants: 'Starbucks', isExactMatch: false});
+        });
+
+        it('is empty without a merchant leaf', () => {
+            expect(getRuleMerchantMatchSummary({left: FIELD.CATEGORY, operator: EQUAL_TO, right: 'Coffee'})).toEqual({merchants: '', isExactMatch: false});
+        });
+
+        it('is empty without filters', () => {
+            expect(getRuleMerchantMatchSummary(undefined)).toEqual({merchants: '', isExactMatch: false});
+        });
+    });
+
+    describe('getRuleFilterLeaves', () => {
+        it('flattens a nested tree left to right', () => {
+            const middleLeaf: RuleFilterComparison = {left: FIELD.CATEGORY, operator: EQUAL_TO, right: 'Coffee'};
+            const rightLeaf: RuleFilterComparison = {left: FIELD.TAG, operator: EQUAL_TO, right: 'Team A'};
+            const tree: RuleFilterNode = {left: {left: merchantFilter, operator: OR, right: middleLeaf}, operator: AND, right: rightLeaf};
+
+            expect(getRuleFilterLeaves(tree)).toEqual([merchantFilter, middleLeaf, rightLeaf]);
+        });
+
+        it('returns a single leaf unchanged', () => {
+            expect(getRuleFilterLeaves(merchantFilter)).toEqual([merchantFilter]);
+        });
+    });
+
+    describe('getExpenseDefaultRuleSummaryFields', () => {
+        it('lists the fields a rule sets in the editor field order, including rules the form cannot open', () => {
+            // Given actions whose keys are out of numeric order, where "10" would also sort before "2" as a string
+            const rule = buildRuleWithOverrides({
+                actions: Object.fromEntries([
+                    ['0', setCategoryAction],
+                    ['10', {name: ACTION.SET, field: FIELD.BILLABLE, value: true}],
+                    ['2', {name: ACTION.SET, field: FIELD.COMMENT, value: Parser.replace('A description')}],
+                ]),
+            });
+
+            // When the summary fields are read back
+            // Then they come out in editor field order rather than key order
+            expect(getExpenseDefaultRuleSummaryFields(rule)).toEqual([
+                {field: FIELD.CATEGORY, value: 'Coffee'},
+                {field: FIELD.COMMENT, value: 'A description'},
+                {field: FIELD.BILLABLE, value: true},
+            ]);
+        });
+
+        it('orders the same rule identically however the actions are indexed', () => {
+            // Given one rule indexed the way the editor writes it and the same rule indexed the way the backend returns it
+            const setMerchant = {name: ACTION.SET, field: FIELD.MERCHANT, value: 'Starbucks'};
+            const setComment = {name: ACTION.SET, field: FIELD.COMMENT, value: Parser.replace('A description')};
+            const asWritten = buildRuleWithOverrides({actions: toIndexMap([setMerchant, setCategoryAction, setComment])});
+            const asReturned = buildRuleWithOverrides({actions: toIndexMap([setCategoryAction, setComment, setMerchant])});
+
+            // When both are summarized
+            // Then the differing action keys do not reshuffle the summary, so the row text does not jump when a save comes back
+            expect(getExpenseDefaultRuleSummaryFields(asReturned)).toEqual(getExpenseDefaultRuleSummaryFields(asWritten));
+            expect(getExpenseDefaultRuleSummaryFields(asReturned)).toEqual([
+                {field: FIELD.MERCHANT, value: 'Starbucks'},
+                {field: FIELD.CATEGORY, value: 'Coffee'},
+                {field: FIELD.COMMENT, value: 'A description'},
+            ]);
+        });
+
+        it('skips actions that do not set a field', () => {
+            const rule = buildRuleWithOverrides({actions: toIndexMap([{name: CONST.RULES.ACTIONS.FORWARD_TO, approver: 'a@b.com'}])});
+
+            expect(getExpenseDefaultRuleSummaryFields(rule)).toEqual([]);
+        });
+    });
+});
diff --git a/tests/unit/GetRHPFrameStyleTest.ts b/tests/unit/GetRHPFrameStyleTest.ts
new file mode 100644
index 000000000000..09bbc5def33a
--- /dev/null
+++ b/tests/unit/GetRHPFrameStyleTest.ts
@@ -0,0 +1,155 @@
+import type GetRHPFrameStyle from '@libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/types';
+
+import type {ThemeStyles} from '@styles/index';
+import variables from '@styles/variables';
+
+// The frame width is a react-native Animated node, so the test builds one the way navigation does.
+// eslint-disable-next-line no-restricted-imports
+import {Animated} from 'react-native';
+
+import createMock from '../utils/createMock';
+
+// Both variants are loaded explicitly because jest-expo resolves the bare specifier to index.native.ts, which would leave the web card uncovered.
+const getRHPFrameStyleWeb = jest.requireActual<{default: GetRHPFrameStyle}>('@libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.ts').default;
+const getRHPFrameStyleNative = jest.requireActual<{default: GetRHPFrameStyle}>('@libs/Navigation/AppNavigator/Navigators/getRHPFrameStyle/index.native.ts').default;
+
+const RHP_WIDTH = 375;
+
+const styles = createMock<ThemeStyles>({
+    pAbsolute: {position: 'absolute'},
+    r0: {right: 0},
+    h100: {height: '100%'},
+    overflowHidden: {overflow: 'hidden'},
+    RHPFloatingCard: {borderWidth: variables.rhpFloatingCardBorderWidth},
+    RHPCenteredFrame: {right: variables.rhpFloatingCardMargin},
+});
+
+function buildAnimatedWidth() {
+    return Animated.subtract(new Animated.Value(RHP_WIDTH), new Animated.Value(0));
+}
+
+function getWidth(style: ReturnType<GetRHPFrameStyle>) {
+    // The style array mixes theme objects with the width entry, so the width has to be read through a cast.
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    return (style as Array<{width?: unknown}>).at(-1)?.width;
+}
+
+// An animated node only exposes its current value through this internal getter, hence the cast and the underscored-name disables.
+function readAnimatedValue(width: unknown) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/naming-convention, no-underscore-dangle
+    return (width as {__getValue: () => number}).__getValue();
+}
+
+describe('getRHPFrameStyle', () => {
+    it('gives a standalone web RHP a floating card whose width absorbs the border', () => {
+        // Given one RHP card on web with nothing stacked on or under it, the only case where the frame itself has to look like a card
+        const params = {styles, animatedWidth: buildAnimatedWidth(), shouldUseNarrowLayout: false, shouldUseCenteredFrame: false};
+
+        // When the frame style is built for it
+        const style = getRHPFrameStyleWeb(params);
+
+        // Then it gets the floating card with the width absorbing the border, because the card is border-box and its fixed-width panes clip without the compensation.
+        expect(style).toContain(styles.RHPFloatingCard);
+        expect(style).not.toContain(styles.RHPCenteredFrame);
+        expect(style).not.toContain(styles.r0);
+        expect(readAnimatedValue(getWidth(style))).toBe(RHP_WIDTH + 2 * variables.rhpFloatingCardBorderWidth);
+    });
+
+    it('gives the stacked report flow an invisible frame that neither clips nor compensates for a border', () => {
+        // Given a report with an expense stacked on top, where every card draws its own border and shadow and the frame only has to position them
+        const animatedWidth = buildAnimatedWidth();
+        const params = {styles, animatedWidth, shouldUseNarrowLayout: false, shouldUseCenteredFrame: true};
+
+        // When the frame style is built for it
+        const style = getRHPFrameStyleWeb(params);
+
+        // Then the frame stays invisible and clips nothing, at the animated width untouched, since each card draws its own border and shadow and the frame has none to absorb.
+        expect(style).toContain(styles.RHPCenteredFrame);
+        expect(style).not.toContain(styles.RHPFloatingCard);
+        expect(style).not.toContain(styles.overflowHidden);
+        expect(getWidth(style)).toBe(animatedWidth);
+    });
+
+    it('keeps the web narrow layout full-bleed', () => {
+        // Given a phone-width window, where the RHP is the whole viewport and there is nothing to float or dim beside it
+        const params = {styles, animatedWidth: buildAnimatedWidth(), shouldUseNarrowLayout: true, shouldUseCenteredFrame: true};
+
+        // When the frame style is built on web
+        const style = getRHPFrameStyleWeb(params);
+
+        // Then it covers the viewport edge to edge, because a floating card here would leave the dimmed margins of the desktop layout hanging around a full screen sheet.
+        expect(style).toContain(styles.r0);
+        expect(style).toContain(styles.h100);
+        expect(style).not.toContain(styles.RHPFloatingCard);
+        expect(style).not.toContain(styles.RHPCenteredFrame);
+        expect(getWidth(style)).toBe('100%');
+    });
+
+    it('keeps native full-bleed and leaves the width untouched', () => {
+        // Given the same wide window on native, where the floating card treatment does not exist at all
+        const animatedWidth = buildAnimatedWidth();
+        const params = {styles, animatedWidth, shouldUseNarrowLayout: false, shouldUseCenteredFrame: true};
+
+        // When the native frame style is built for it
+        const style = getRHPFrameStyleNative(params);
+
+        // Then it stays full-bleed with the animated width passed through untouched, because native draws no card border that would need absorbing into the width.
+        expect(style).toContain(styles.r0);
+        expect(style).toContain(styles.h100);
+        expect(style).not.toContain(styles.RHPFloatingCard);
+        expect(style).not.toContain(styles.RHPCenteredFrame);
+        expect(getWidth(style)).toBe(animatedWidth);
+    });
+});
+
+// Regression for PR #101093: the two-factor security-code panel feeds the shared RHP width through getRHPFrameStyle, so it matches a normal RHP card.
+describe('getRHPFrameStyle - two-factor (MFA) security-code panel', () => {
+    // The panel never animates its width, so it hands the helper a plain number, as MultifactorAuthenticationModalNavigator does.
+    const mfaPanelWidth = variables.rhpWidth;
+    const mfaParams = {styles, shouldUseNarrowLayout: false, shouldUseCenteredFrame: false} as const;
+
+    it('floats the panel as a card on wide web', () => {
+        // Given the two-factor security-code panel on web, which measured 65px narrower than the RHP cards beside it because it sized off the sidebar width instead of variables.rhpWidth
+        const params = {...mfaParams, animatedWidth: mfaPanelWidth};
+
+        // When the frame style is built for it
+        const style = getRHPFrameStyleWeb(params);
+
+        // Then it floats like any other RHP card, border included, so it lines up with the skinny cards behind it instead of standing out as a narrower panel.
+        // The width stays a plain number, since a panel that never animates its width must not need an Animated component.
+        expect(style).toContain(styles.RHPFloatingCard);
+        expect(style).not.toContain(styles.r0);
+        expect(style).not.toContain(styles.h100);
+        expect(style).not.toContain(styles.RHPCenteredFrame);
+        expect(getWidth(style)).toBe(variables.rhpWidth + 2 * variables.rhpFloatingCardBorderWidth);
+    });
+
+    it('keeps the panel full-bleed on native', () => {
+        // Given the same panel on native, where the RHP slides in over the whole screen
+        const animatedWidth = mfaPanelWidth;
+        const params = {...mfaParams, animatedWidth};
+
+        // When the native frame style is built for it
+        const style = getRHPFrameStyleNative(params);
+
+        // Then it keeps the full-bleed panel the apps shipped with, at the width it was given, so the web floating card treatment cannot leak into native layouts.
+        expect(style).toContain(styles.r0);
+        expect(style).toContain(styles.h100);
+        expect(style).not.toContain(styles.RHPFloatingCard);
+        expect(getWidth(style)).toBe(animatedWidth);
+    });
+
+    it('keeps the panel full width on a narrow layout', () => {
+        // Given the panel opened on a phone-width window, where it is the only thing on screen
+        const params = {...mfaParams, shouldUseNarrowLayout: true, animatedWidth: mfaPanelWidth};
+
+        // When the web frame style is built for it
+        const style = getRHPFrameStyleWeb(params);
+
+        // Then it fills the viewport, because at that width there is no card behind it to float above.
+        expect(style).toContain(styles.r0);
+        expect(style).toContain(styles.h100);
+        expect(style).not.toContain(styles.RHPFloatingCard);
+        expect(getWidth(style)).toBe('100%');
+    });
+});
diff --git a/tests/unit/HomePage/InsightsSection/useInsightDataRefreshTest.ts b/tests/unit/HomePage/InsightsSection/useInsightDataRefreshTest.ts
new file mode 100644
index 000000000000..705de9f053b8
--- /dev/null
+++ b/tests/unit/HomePage/InsightsSection/useInsightDataRefreshTest.ts
@@ -0,0 +1,171 @@
+/**
+ * Contracts asserted:
+ *   - the Insights chart fetches once when Home is the active tab
+ *   - closing an RHP over Home does not refetch it
+ *   - an expense change moves the derived spend counter and does refetch it
+ *   - joining a workspace fetches it again
+ */
+import {renderHook} from '@testing-library/react-native';
+
+import type {SearchQueryJSON} from '@components/Search/types';
+
+import useIsTabFocused from '@hooks/useIsTabFocused';
+
+import {search} from '@libs/actions/Search';
+import type {SearchTypeMenuItem} from '@libs/SearchUIUtils';
+
+import useInsightData from '@pages/home/InsightsSection/useInsightData';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import {useIsFocused} from '@react-navigation/native';
+
+const SNAPSHOT_HASH = 4242;
+
+const queryJSON: SearchQueryJSON = {
+    inputQuery: 'type:expense groupBy:month',
+    hash: SNAPSHOT_HASH,
+    recentSearchHash: SNAPSHOT_HASH,
+    similarSearchHash: SNAPSHOT_HASH,
+    type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+    groupBy: CONST.SEARCH.GROUP_BY.MONTH,
+    view: CONST.SEARCH.VIEW.LINE,
+    sortBy: CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH,
+    sortOrder: CONST.SEARCH.SORT_ORDER.ASC,
+    flatFilters: [],
+    filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TYPE, right: CONST.SEARCH.DATA_TYPES.EXPENSE},
+};
+
+const config: SearchTypeMenuItem = {
+    key: CONST.SEARCH.SEARCH_KEYS.EXPENSES,
+    translationPath: 'common.expenses',
+    type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+    icon: 'Receipt',
+    searchQuery: queryJSON.inputQuery,
+    searchQueryJSON: queryJSON,
+    hash: SNAPSHOT_HASH,
+    similarSearchHash: SNAPSHOT_HASH,
+    recentSearchHash: SNAPSHOT_HASH,
+};
+
+// Module mocks
+
+jest.mock('@react-navigation/native', () => ({
+    useIsFocused: jest.fn(() => true),
+    createNavigationContainerRef: () => ({}),
+}));
+
+// Mandatory: the real hook reads the root navigation state, which is never ready under Jest, so it
+// would report "not focused" and the search would silently never fire.
+jest.mock('@hooks/useIsTabFocused', () => ({
+    __esModule: true,
+    default: jest.fn(() => true),
+}));
+
+jest.mock('@libs/actions/Search', () => ({
+    search: jest.fn(),
+}));
+
+jest.mock('@hooks/useNetwork', () => ({
+    __esModule: true,
+    default: jest.fn(() => ({isOffline: false})),
+}));
+
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({
+    __esModule: true,
+    default: jest.fn(() => ({accountID: 1, login: 'user@test.com'})),
+}));
+
+jest.mock('@hooks/useLocalize', () => ({
+    __esModule: true,
+    default: jest.fn(() => ({translate: (key: string) => key, localeCompare: () => 0, formatPhoneNumber: (value: string) => value, dateFnsLocale: undefined})),
+}));
+
+jest.mock('@hooks/useCurrencyList', () => ({
+    useCurrencyListActions: jest.fn(() => ({convertToDisplayString: (value: number) => String(value)})),
+}));
+
+const onyxData: Record<string, unknown> = {};
+
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: jest.fn((key: string, options?: {selector?: (value: unknown) => unknown}) => [options?.selector ? options.selector(onyxData[key]) : onyxData[key]]),
+}));
+
+const mockedSearch = jest.mocked(search);
+const mockedUseIsFocused = jest.mocked(useIsFocused);
+const mockedUseIsTabFocused = jest.mocked(useIsTabFocused);
+
+beforeEach(() => {
+    for (const key of Object.keys(onyxData)) {
+        delete onyxData[key];
+    }
+    mockedSearch.mockClear();
+    mockedUseIsFocused.mockReturnValue(true);
+    mockedUseIsTabFocused.mockReturnValue(true);
+});
+
+describe('useInsightData — refresh gating', () => {
+    it('fetches once when Home is the active tab', () => {
+        // Given the Home tab is active and visible
+
+        // When the chart hook mounts
+        renderHook(() => useInsightData(config));
+
+        // Then it fetches its snapshot once
+        expect(mockedSearch).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not refetch when an RHP opens and closes over Home', () => {
+        // Given the chart has already fetched
+        const {rerender} = renderHook(() => useInsightData(config));
+        expect(mockedSearch).toHaveBeenCalledTimes(1);
+
+        // When an RHP is pushed over Home and popped again
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender(undefined);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender(undefined);
+
+        // Then nothing is refetched, since nothing changed
+        expect(mockedSearch).toHaveBeenCalledTimes(1);
+    });
+
+    it('fetches again when an expense changes', () => {
+        // Given the chart has already fetched
+        const {rerender} = renderHook(() => useInsightData(config));
+
+        // When an expense changes, which moves the derived counter but no query
+        onyxData[ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE] = {expenses: 1, cardExpenses: 0};
+        rerender(undefined);
+
+        // Then the chart fetches again instead of showing a snapshot it knows nothing about
+        expect(mockedSearch).toHaveBeenCalledTimes(2);
+    });
+
+    it('fetches again when the user joins a workspace', () => {
+        // Given the chart has already fetched
+        const {rerender} = renderHook(() => useInsightData(config));
+
+        // When a workspace arrives, which brings its members' spend into the chart without changing any local expense
+        onyxData[ONYXKEYS.COLLECTION.POLICY] = {[`${ONYXKEYS.COLLECTION.POLICY}W1`]: {id: 'W1'}};
+        rerender(undefined);
+
+        // Then the chart fetches again so the new spend shows up
+        expect(mockedSearch).toHaveBeenCalledTimes(2);
+    });
+
+    it('does not refetch when a workspace it already knows changes', () => {
+        // Given the chart has fetched with one workspace
+        onyxData[ONYXKEYS.COLLECTION.POLICY] = {[`${ONYXKEYS.COLLECTION.POLICY}W1`]: {id: 'W1'}};
+        const {rerender} = renderHook(() => useInsightData(config));
+
+        // When that workspace is edited, so the set of workspaces stays the same
+        onyxData[ONYXKEYS.COLLECTION.POLICY] = {[`${ONYXKEYS.COLLECTION.POLICY}W1`]: {id: 'W1', name: 'Renamed'}};
+        rerender(undefined);
+
+        // Then nothing is refetched, since the chart only cares which workspaces the user is in
+        expect(mockedSearch).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/tests/unit/HomePage/RecentlyAddedSection/useRecentlyAddedDataTest.ts b/tests/unit/HomePage/RecentlyAddedSection/useRecentlyAddedDataTest.ts
index e69aabbe0701..44661ed7e307 100644
--- a/tests/unit/HomePage/RecentlyAddedSection/useRecentlyAddedDataTest.ts
+++ b/tests/unit/HomePage/RecentlyAddedSection/useRecentlyAddedDataTest.ts
@@ -17,8 +17,10 @@ import {renderHook} from '@testing-library/react-native';
 import type {SearchQueryJSON} from '@components/Search/types';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useIsTabFocused from '@hooks/useIsTabFocused';
 import useNetwork from '@hooks/useNetwork';
 
+import {search} from '@libs/actions/Search';
 import {buildQueryStringFromFilterFormValues, buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 
 import type {RecentlyAddedExpense} from '@pages/home/RecentlyAddedSection/useRecentlyAddedData';
@@ -29,6 +31,8 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report, SearchResults, Transaction} from '@src/types/onyx';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 
+import {useIsFocused} from '@react-navigation/native';
+
 const ACCOUNT_ID = 12345;
 const OTHER_ACCOUNT_ID = 67890;
 const SNAPSHOT_HASH = 1;
@@ -51,10 +55,17 @@ jest.mock('@hooks/useNetwork', () => ({
 }));
 
 jest.mock('@react-navigation/native', () => ({
-    useIsFocused: () => true,
+    useIsFocused: jest.fn(() => true),
     createNavigationContainerRef: () => ({}),
 }));
 
+// Mandatory: the real hook reads the root navigation state, which is never ready under Jest, so it
+// would report "not focused" and the search would silently never fire.
+jest.mock('@hooks/useIsTabFocused', () => ({
+    __esModule: true,
+    default: jest.fn(() => true),
+}));
+
 jest.mock('@libs/actions/Search', () => ({
     search: jest.fn(),
 }));
@@ -66,6 +77,9 @@ jest.mock('@libs/SearchQueryUtils', () => ({
 }));
 
 const mockedUseNetwork = jest.mocked(useNetwork);
+const mockedSearch = jest.mocked(search);
+const mockedUseIsTabFocused = jest.mocked(useIsTabFocused);
+const mockedUseIsFocused = jest.mocked(useIsFocused);
 const mockedBuildQueryStringFromFilterFormValues = jest.mocked(buildQueryStringFromFilterFormValues);
 const mockedBuildSearchQueryJSON = jest.mocked(buildSearchQueryJSON);
 
@@ -171,6 +185,9 @@ beforeEach(() => {
         delete onyxData[k];
     }
     mockUseOnyx.mockClear();
+    mockedSearch.mockClear();
+    mockedUseIsTabFocused.mockReturnValue(true);
+    mockedUseIsFocused.mockReturnValue(true);
     mockedBuildQueryStringFromFilterFormValues.mockClear();
     mockedUseNetwork.mockReturnValue({isOffline: false});
     // Hash follows the account, as in production. A fixed hash would let the hook's `queryJSON` memo hide the change.
@@ -639,3 +656,58 @@ describe('useRecentlyAddedData — awaiting the first result', () => {
         expect(result.current.isAwaitingFirstResult).toBe(false);
     });
 });
+
+describe('useRecentlyAddedData — refresh gating', () => {
+    it('searches once when Home is the active tab and visible', () => {
+        // Given the Home tab is active
+
+        // When the hook mounts
+        renderHook(() => useRecentlyAddedData());
+
+        // Then the expense list is fetched once
+        expect(mockedSearch).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not search again when an RHP opens and closes over Home', () => {
+        // Given Home has already fetched the list
+        const {rerender} = renderHook(() => useRecentlyAddedData());
+        expect(mockedSearch).toHaveBeenCalledTimes(1);
+
+        // When an RHP is pushed over Home and popped again, leaving the Home tab active throughout
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender(undefined);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender(undefined);
+
+        // Then closing it does not refetch the same list
+        expect(mockedSearch).toHaveBeenCalledTimes(1);
+    });
+
+    it('searches again after the user switches tabs away and back', () => {
+        // Given Home has already fetched the list
+        const {rerender} = renderHook(() => useRecentlyAddedData());
+
+        // When the user switches to another tab and returns
+        mockedUseIsTabFocused.mockReturnValue(false);
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender(undefined);
+        mockedUseIsTabFocused.mockReturnValue(true);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender(undefined);
+
+        // Then arriving back on Home refreshes the list
+        expect(mockedSearch).toHaveBeenCalledTimes(2);
+    });
+
+    it('does not search while another tab is active', () => {
+        // Given the user is on another tab
+        mockedUseIsTabFocused.mockReturnValue(false);
+        mockedUseIsFocused.mockReturnValue(false);
+
+        // When the hook renders
+        renderHook(() => useRecentlyAddedData());
+
+        // Then nothing is fetched for a screen the user isn't on
+        expect(mockedSearch).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/HomePage/YourSpendSection/useYourSpendDataTest.ts b/tests/unit/HomePage/YourSpendSection/useYourSpendDataTest.ts
index 9e9b928cf2d3..d3eea9fc6650 100644
--- a/tests/unit/HomePage/YourSpendSection/useYourSpendDataTest.ts
+++ b/tests/unit/HomePage/YourSpendSection/useYourSpendDataTest.ts
@@ -17,6 +17,7 @@
 import {act, renderHook} from '@testing-library/react-native';
 
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useIsTabFocused from '@hooks/useIsTabFocused';
 import useNetwork from '@hooks/useNetwork';
 
 import {search} from '@libs/actions/Search';
@@ -38,6 +39,8 @@ import type SearchResults from '@src/types/onyx/SearchResults';
 
 import type {OnyxCollection} from 'react-native-onyx';
 
+import {useIsFocused} from '@react-navigation/native';
+
 import createMock from '../../../utils/createMock';
 
 // Constants
@@ -81,6 +84,13 @@ jest.mock('@react-navigation/native', () => ({
     createNavigationContainerRef: () => ({}),
 }));
 
+// Mandatory: the real hook reads the root navigation state, which is never ready under Jest, so it
+// would report "not focused" and the searches would silently never fire.
+jest.mock('@hooks/useIsTabFocused', () => ({
+    __esModule: true,
+    default: jest.fn(() => true),
+}));
+
 jest.mock('@libs/actions/Search', () => ({
     search: jest.fn(),
 }));
@@ -109,6 +119,8 @@ jest.mock('@libs/PolicyUtils', () => ({
 // Typed references to mocked modules
 
 const mockedUseNetwork = jest.mocked(useNetwork);
+const mockedUseIsTabFocused = jest.mocked(useIsTabFocused);
+const mockedUseIsFocused = jest.mocked(useIsFocused);
 const mockedUseCurrentUserPersonalDetails = jest.mocked(useCurrentUserPersonalDetails);
 const mockedSearch = jest.mocked(search);
 const mockedGetDisplayableExpensifyCards = jest.mocked(getDisplayableExpensifyCards);
@@ -263,6 +275,8 @@ beforeEach(() => {
     }
     mockUseOnyx.mockClear();
     mockedSearch.mockClear();
+    mockedUseIsTabFocused.mockReturnValue(true);
+    mockedUseIsFocused.mockReturnValue(true);
 
     mockedBuildAwaitingApprovalQuery.mockReturnValue(APPROVAL_QUERY);
     mockedBuildRepaidLast30DaysQuery.mockReturnValue(PAYMENT_QUERY);
@@ -543,6 +557,23 @@ describe('useYourSpendData — search dispatch', () => {
         );
     });
 
+    it('does not replay the set when an RHP opens and closes over Home', () => {
+        // Given Home has already fired its searches
+        mockedIsPaidGroupPolicy.mockReturnValue(true);
+        const {rerender} = renderHook(() => useYourSpendData());
+        const callsAfterFirstRender = mockedSearch.mock.calls.length;
+        expect(callsAfterFirstRender).toBeGreaterThan(0);
+
+        // When an RHP is pushed over Home and popped again, leaving the Home tab active throughout
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender(undefined);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender(undefined);
+
+        // Then closing it does not refetch a set the account already has
+        expect(mockedSearch).toHaveBeenCalledTimes(callsAfterFirstRender);
+    });
+
     it('does not dispatch search() when offline', () => {
         mockedIsPaidGroupPolicy.mockReturnValue(true);
         mockedUseNetwork.mockReturnValue(networkState(true));
@@ -810,11 +841,96 @@ describe('useYourSpendData — refires search when a relevant report state chang
         return mockedSearch.mock.calls.filter((call) => call.at(0)?.queryJSON?.hash === approvalHash).length;
     }
 
+    function paymentSearchCallCount(): number {
+        const paymentHash = buildSearchQueryJSON(PAYMENT_QUERY)?.hash;
+        return mockedSearch.mock.calls.filter((call) => call.at(0)?.queryJSON?.hash === paymentHash).length;
+    }
+
+    function cardGroupSearchCallCount(): number {
+        const cardGroupHash = buildSearchQueryJSON(CARD_GROUP_QUERY)?.hash;
+        return mockedSearch.mock.calls.filter((call) => call.at(0)?.queryJSON?.hash === cardGroupHash).length;
+    }
+
     beforeEach(() => {
         mockedIsPaidGroupPolicy.mockReturnValue(true);
         setupPolicies([makeCorporatePolicy({id: 'policy_1'})]);
     });
 
+    it('holds an approval behind an open RHP and refires once it closes', () => {
+        // Given Home has searched with one OUTSTANDING report
+        setupReports([makeReport()]);
+        const {rerender} = renderHook(() => useYourSpendData());
+        const before = approvalSearchCallCount();
+
+        // When the report is approved behind an open RHP, and the RHP is then closed
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender(undefined);
+        setupReports([makeReport({stateNum: CONST.REPORT.STATE_NUM.APPROVED, statusNum: CONST.REPORT.STATUS_NUM.APPROVED})]);
+        rerender(undefined);
+        expect(approvalSearchCallCount()).toBe(before);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender(undefined);
+
+        // Then the refresh is not lost: it fires once, after Home is visible again
+        expect(approvalSearchCallCount()).toBe(before + 1);
+    });
+
+    it('refires the payment search when an owned report is reimbursed', () => {
+        // Given an owned report that has been approved but not yet paid
+        setupReports([makeReport({stateNum: CONST.REPORT.STATE_NUM.APPROVED, statusNum: CONST.REPORT.STATUS_NUM.APPROVED})]);
+        const {rerender} = renderHook(() => useYourSpendData());
+        const before = paymentSearchCallCount();
+
+        // When the report is reimbursed, which no snapshot update ever patches
+        setupReports([makeReport({stateNum: CONST.REPORT.STATE_NUM.APPROVED, statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED})]);
+        rerender(undefined);
+
+        // Then the repaid row fetches again instead of showing the pre-payment total
+        expect(paymentSearchCallCount()).toBeGreaterThan(before);
+    });
+
+    it('refires the card search when an expense on the user`s card changes', () => {
+        // Given Home has loaded with one displayable card
+        mockedGetDisplayableExpensifyCards.mockReturnValue(makeDisplayableCards([{cardID: CARD_ID_1, lastFourPAN: CARD_LAST_FOUR_1}]));
+        const {rerender} = renderHook(() => useYourSpendData());
+        const before = cardGroupSearchCallCount();
+
+        // When a card expense changes, which moves the derived counter but no query
+        onyxData[ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE] = {expenses: 1, cardExpenses: 1};
+        rerender(undefined);
+
+        // Then the grouped card totals refetch
+        expect(cardGroupSearchCallCount()).toBeGreaterThan(before);
+    });
+
+    it('does not refire the card search for an expense that is not on the user`s card', () => {
+        // Given Home has loaded with one displayable card
+        mockedGetDisplayableExpensifyCards.mockReturnValue(makeDisplayableCards([{cardID: CARD_ID_1, lastFourPAN: CARD_LAST_FOUR_1}]));
+        const {rerender} = renderHook(() => useYourSpendData());
+        const before = cardGroupSearchCallCount();
+
+        // When an expense changes that is not charged to one of the user's cards
+        onyxData[ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE] = {expenses: 1, cardExpenses: 0};
+        rerender(undefined);
+
+        // Then the card totals are left alone
+        expect(cardGroupSearchCallCount()).toBe(before);
+    });
+
+    it('refires the approval search when an expense on an outstanding report changes', () => {
+        // Given Home has searched with one OUTSTANDING report
+        setupReports([makeReport()]);
+        const {rerender} = renderHook(() => useYourSpendData());
+        const before = approvalSearchCallCount();
+
+        // When an expense on it is marked non-reimbursable, which keeps the report OUTSTANDING and moves only the expense counter
+        onyxData[ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE] = {expenses: 1, cardExpenses: 0};
+        rerender(undefined);
+
+        // Then Awaiting approval fetches again instead of still counting the expense
+        expect(approvalSearchCallCount()).toBe(before + 1);
+    });
+
     it('refires the approval search when an owned report leaves the OUTSTANDING state', () => {
         setupReports([makeReport()]);
         const {rerender} = renderHook(() => useYourSpendData());
diff --git a/tests/unit/ImportCategoriesUtilsTest.ts b/tests/unit/ImportCategoriesUtilsTest.ts
new file mode 100644
index 000000000000..077263c58815
--- /dev/null
+++ b/tests/unit/ImportCategoriesUtilsTest.ts
@@ -0,0 +1,97 @@
+import {buildCategoriesFromSpreadsheet, parseCsvAmountValue, parseCsvReceiptValue} from '@libs/ImportCategoriesUtils';
+
+import CONST from '@src/CONST';
+import type {ImportedSpreadsheet, PolicyCategories} from '@src/types/onyx';
+
+/**
+ * Builds a spreadsheet from rows of cells. The imported spreadsheet stores its data by column,
+ * so the rows are transposed the same way the import flow does it.
+ */
+function buildSpreadsheet(rows: string[][], columnRoles: string[]): ImportedSpreadsheet {
+    return {
+        data: columnRoles.map((_, columnIndex) => rows.map((row) => row.at(columnIndex) ?? '')),
+        columns: Object.fromEntries(columnRoles.map((role, index) => [index, role])),
+        containsHeader: true,
+        isImportingMultiLevelTags: false,
+        isImportingIndependentMultiLevelTags: false,
+        isGLAdjacent: false,
+    };
+}
+
+describe('ImportCategoriesUtils', () => {
+    describe('parseCsvAmountValue', () => {
+        it('reads amounts that use commas as thousands separators', () => {
+            // Given amounts formatted the way Expensify Classic exports them
+            // When they are parsed
+            // Then the commas are treated as thousands separators instead of making the value invalid
+            expect(parseCsvAmountValue('299,393.00')).toBe(29939300);
+            expect(parseCsvAmountValue('1,000')).toBe(100000);
+            expect(parseCsvAmountValue('1,234,567.89')).toBe(123456789);
+        });
+
+        it('still reads plain amounts', () => {
+            // Given amounts without thousands separators
+            // When they are parsed
+            // Then they keep working as before
+            expect(parseCsvAmountValue('50')).toBe(5000);
+            expect(parseCsvAmountValue(' 75.25 ')).toBe(7525);
+        });
+
+        it('ignores values whose commas are not thousands separators', () => {
+            // Given values that only look like numbers, such as a European decimal comma
+            // When they are parsed
+            // Then they are skipped instead of being misread as a different amount
+            expect(parseCsvAmountValue('1,5')).toBeUndefined();
+            expect(parseCsvAmountValue('1.234,56')).toBeUndefined();
+            expect(parseCsvAmountValue('12,34,567')).toBeUndefined();
+            expect(parseCsvAmountValue('')).toBeUndefined();
+            expect(parseCsvAmountValue(undefined)).toBeUndefined();
+        });
+    });
+
+    describe('parseCsvReceiptValue', () => {
+        it('reads receipt amounts that use commas as thousands separators', () => {
+            // Given a "Require receipts over" amount formatted the way Expensify Classic exports it
+            // When it is parsed
+            // Then the commas are treated as thousands separators
+            expect(parseCsvReceiptValue('1,000.00')).toBe(100000);
+        });
+
+        it('keeps the keyword values', () => {
+            // Given the keyword values that Expensify Classic uses for receipt rules
+            // When they are parsed
+            // Then they map to the same values as before
+            expect(parseCsvReceiptValue('required')).toBe(0);
+            expect(parseCsvReceiptValue('not_required')).toBe(CONST.DISABLED_MAX_EXPENSE_VALUE);
+            expect(parseCsvReceiptValue('default')).toBeUndefined();
+        });
+    });
+
+    describe('buildCategoriesFromSpreadsheet', () => {
+        const columnRoles = [CONST.CSV_IMPORT_COLUMNS.NAME, CONST.CSV_IMPORT_COLUMNS.ENABLED, CONST.CSV_IMPORT_COLUMNS.MAX_EXPENSE_AMOUNT, CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_RECEIPT];
+        const classicExportRows = [
+            ['Category', 'Enabled', 'Max Expense amount', 'Receipts Required'],
+            ['Travel', 'TRUE', '299,393.00', '1,000.00'],
+            ['Meals', 'TRUE', '299,393.00', '1,000.00'],
+        ];
+
+        it('imports the max expense amount from a Classic export row for new and existing categories', () => {
+            // Given a Classic export where amounts use thousands separators, and a workspace that already has the Meals category with another limit
+            const spreadsheet = buildSpreadsheet(classicExportRows, columnRoles);
+            const policyCategories: PolicyCategories = {
+                Meals: {name: 'Meals', enabled: true, maxExpenseAmount: 5000, maxAmountNoReceipt: 2500},
+            };
+
+            // When the categories are built from the spreadsheet
+            const categories = buildCategoriesFromSpreadsheet(spreadsheet, policyCategories);
+
+            // Then both the new Travel category and the existing Meals category get the exported limits instead of silently dropping them
+            expect(categories).toStrictEqual([
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                {name: 'Travel', enabled: true, 'GL Code': '', maxExpenseAmount: 29939300, maxAmountNoReceipt: 100000},
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                {name: 'Meals', enabled: true, 'GL Code': '', maxExpenseAmount: 29939300, maxAmountNoReceipt: 100000},
+            ]);
+        });
+    });
+});
diff --git a/tests/unit/ImportColumnTest.ts b/tests/unit/ImportColumnTest.ts
index 8f084547736b..faf378dbd069 100644
--- a/tests/unit/ImportColumnTest.ts
+++ b/tests/unit/ImportColumnTest.ts
@@ -36,4 +36,40 @@ describe('findColumnName', () => {
         // Then it stays unmapped instead of being picked up as another column
         expect(findColumnName('Label', columnRoles)).toBe('');
     });
+
+    it('maps the Classic category export headers to the category import roles', () => {
+        // Given the column roles offered by the categories import
+        const columnRoles = [
+            {text: 'Ignore', value: CONST.CSV_IMPORT_COLUMNS.IGNORE},
+            {text: 'Name', value: CONST.CSV_IMPORT_COLUMNS.NAME},
+            {text: 'Payroll code', value: CONST.CSV_IMPORT_COLUMNS.PAYROLL_CODE},
+            {text: 'Require itemized receipts over', value: CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_ITEMIZED_RECEIPT},
+            {text: 'Require description', value: CONST.CSV_IMPORT_COLUMNS.ARE_COMMENTS_REQUIRED},
+            {text: 'Description hint', value: CONST.CSV_IMPORT_COLUMNS.COMMENT_HINT},
+            {text: 'Flag amounts over', value: CONST.CSV_IMPORT_COLUMNS.MAX_EXPENSE_AMOUNT},
+            {text: 'Expense limit type', value: CONST.CSV_IMPORT_COLUMNS.EXPENSE_LIMIT_TYPE},
+        ];
+
+        // When the headers of a Classic category export are auto-detected
+        // Then each one maps to its role so the admin doesn't have to map it by hand
+        expect(findColumnName('Payroll Code', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.PAYROLL_CODE);
+        expect(findColumnName('Payroll', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.PAYROLL_CODE);
+        expect(findColumnName('Itemized Receipts Required', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.MAX_AMOUNT_NO_ITEMIZED_RECEIPT);
+        expect(findColumnName('Comments', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.ARE_COMMENTS_REQUIRED);
+        expect(findColumnName('Comment Hint', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.COMMENT_HINT);
+        expect(findColumnName('Max Expense amount', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.MAX_EXPENSE_AMOUNT);
+        expect(findColumnName('Expense Limit Type', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.EXPENSE_LIMIT_TYPE);
+    });
+
+    it('keeps mapping a "Payroll Code" header to CUSTOM_FIELD_2 in the members import', () => {
+        // Given the members import, which offers CUSTOM_FIELD_2 but not PAYROLL_CODE
+        const columnRoles = [
+            {text: 'Ignore', value: CONST.CSV_IMPORT_COLUMNS.IGNORE},
+            {text: 'Payroll ID', value: CONST.CSV_IMPORT_COLUMNS.CUSTOM_FIELD_2},
+        ];
+
+        // When a "Payroll Code" header is auto-detected
+        // Then it maps to the members-import payroll role
+        expect(findColumnName('Payroll Code', columnRoles)).toBe(CONST.CSV_IMPORT_COLUMNS.CUSTOM_FIELD_2);
+    });
 });
diff --git a/tests/unit/ImportedMerchantRulesPageTest.tsx b/tests/unit/ImportedMerchantRulesPageTest.tsx
index 175b9e8285c9..2e775762e7e9 100644
--- a/tests/unit/ImportedMerchantRulesPageTest.tsx
+++ b/tests/unit/ImportedMerchantRulesPageTest.tsx
@@ -6,6 +6,7 @@ import OnyxListItemProvider from '@components/OnyxListItemProvider';
 
 import * as Rules from '@libs/actions/Policy/Rules';
 import * as API from '@libs/API';
+import {toIndexMap} from '@libs/RuleUtils';
 
 import ImportedMerchantRulesPage, {
     buildImportedCategoryLookup,
@@ -17,7 +18,7 @@ import ImportedMerchantRulesPage, {
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {ImportedSpreadsheet, Policy, PolicyCategories} from '@src/types/onyx';
+import type {ImportedSpreadsheet, Policy, PolicyCategories, Rule} from '@src/types/onyx';
 import type {Connections} from '@src/types/onyx/Policy';
 
 import React from 'react';
@@ -340,7 +341,7 @@ describe('ImportedMerchantRulesPage', () => {
 
     describe('parseSpreadsheetRules', () => {
         it('builds a net-new rule from a mapped row', () => {
-            const result = parseSpreadsheetRules(buildSpreadsheet(), true, buildRulesEnabledControlPolicy(), undefined, true);
+            const result = parseSpreadsheetRules(buildSpreadsheet(), true, buildRulesEnabledControlPolicy(), undefined, {}, true);
 
             expect(Object.keys(result.rules)).toHaveLength(1);
             expect(Object.values(result.rules).at(0)).toMatchObject({
@@ -352,22 +353,40 @@ describe('ImportedMerchantRulesPage', () => {
             expect(result.invalidVendorNames.size).toBe(0);
         });
 
-        it('skips a row that duplicates an existing coding rule', () => {
+        it('skips a row that duplicates an existing merchant rule', () => {
             const policy = buildRulesEnabledControlPolicy();
-            policy.rules = {
-                codingRules: {
-                    existing: {filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'}, merchant: 'SBUX'},
-                },
+            const existingRule: Rule = {
+                scope: CONST.RULES.SCOPE.POLICY,
+                scopeID: policy.id,
+                triggers: toIndexMap([CONST.RULES.TRIGGERS.CREATE_TRANSACTION]),
+                filters: {left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'},
+                actions: toIndexMap([{name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, value: 'SBUX'}]),
             };
 
-            const result = parseSpreadsheetRules(buildSpreadsheet(), true, policy, undefined, true);
+            const result = parseSpreadsheetRules(buildSpreadsheet(), true, policy, undefined, {[`${ONYXKEYS.COLLECTION.RULE}existing`]: existingRule}, true);
 
             expect(Object.keys(result.rules)).toHaveLength(0);
             expect(result.skippedDuplicateCount).toBe(1);
         });
 
+        it('does not treat a rule from another policy as a duplicate', () => {
+            const policy = buildRulesEnabledControlPolicy();
+            const otherPolicyRule: Rule = {
+                scope: CONST.RULES.SCOPE.POLICY,
+                scopeID: 'another-policy',
+                triggers: toIndexMap([CONST.RULES.TRIGGERS.CREATE_TRANSACTION]),
+                filters: {left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'},
+                actions: toIndexMap([{name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, value: 'SBUX'}]),
+            };
+
+            const result = parseSpreadsheetRules(buildSpreadsheet(), true, policy, undefined, {[`${ONYXKEYS.COLLECTION.RULE}other`]: otherPolicyRule}, true);
+
+            expect(Object.keys(result.rules)).toHaveLength(1);
+            expect(result.skippedDuplicateCount).toBe(0);
+        });
+
         it('drops a row whose category cell does not match a workspace category', () => {
-            const result = parseSpreadsheetRules(buildInvalidCategorySpreadsheet(), true, buildRulesEnabledControlPolicy(), undefined, true);
+            const result = parseSpreadsheetRules(buildInvalidCategorySpreadsheet(), true, buildRulesEnabledControlPolicy(), undefined, {}, true);
 
             expect(Object.keys(result.rules)).toHaveLength(0);
             expect([...result.invalidCategoryNames]).toEqual(['nonexistent category']);
@@ -375,7 +394,7 @@ describe('ImportedMerchantRulesPage', () => {
 
         it('resolves a vendor cell to the matching vendor external ID', () => {
             const policy = buildQBOPolicyWithVendors([{id: 'v-1', name: 'Acme Co', currency: 'USD'}]);
-            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Acme Co'), true, policy, undefined, true);
+            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Acme Co'), true, policy, undefined, {}, true);
 
             expect(Object.keys(result.rules)).toHaveLength(1);
             expect(Object.values(result.rules).at(0)).toMatchObject({vendorID: 'v-1'});
@@ -402,7 +421,7 @@ describe('ImportedMerchantRulesPage', () => {
                 isGLAdjacent: false,
             };
 
-            const result = parseSpreadsheetRules(spreadsheet, true, policy, undefined, true);
+            const result = parseSpreadsheetRules(spreadsheet, true, policy, undefined, {}, true);
 
             expect(Object.keys(result.rules)).toHaveLength(1);
             expect(Object.values(result.rules).at(0)).toMatchObject({merchant: 'SBUX'});
@@ -415,7 +434,7 @@ describe('ImportedMerchantRulesPage', () => {
                 {id: 'v-1', name: 'Duplicate Name', currency: 'USD'},
                 {id: 'v-2', name: 'Duplicate Name', currency: 'USD'},
             ]);
-            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Duplicate Name'), true, policy, undefined, true);
+            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Duplicate Name'), true, policy, undefined, {}, true);
 
             expect(Object.keys(result.rules)).toHaveLength(0);
             expect([...result.invalidVendorNames]).toEqual(['duplicate name']);
@@ -423,7 +442,7 @@ describe('ImportedMerchantRulesPage', () => {
 
         it('skips a row whose only action is an invalid vendor cell', () => {
             const policy = buildQBOPolicyWithVendors([{id: 'v-1', name: 'Acme Co', currency: 'USD'}]);
-            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Nonexistent Vendor'), true, policy, undefined, true);
+            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Nonexistent Vendor'), true, policy, undefined, {}, true);
 
             expect(Object.keys(result.rules)).toHaveLength(0);
             expect([...result.invalidVendorNames]).toEqual(['nonexistent vendor']);
@@ -431,7 +450,7 @@ describe('ImportedMerchantRulesPage', () => {
 
         it('does not flag any vendor cell invalid while the vendor list has not loaded yet', () => {
             const policy = buildQBOPolicyWithVendors(undefined);
-            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Acme Co'), true, policy, undefined, false);
+            const result = parseSpreadsheetRules(buildVendorSpreadsheet('Acme Co'), true, policy, undefined, {}, false);
 
             expect(result.invalidVendorNames.size).toBe(0);
             expect(Object.keys(result.rules)).toHaveLength(0);
@@ -456,7 +475,7 @@ describe('ImportedMerchantRulesPage', () => {
                 isGLAdjacent: false,
             };
 
-            const result = parseSpreadsheetRules(spreadsheet, true, buildRulesEnabledControlPolicy(), undefined, true);
+            const result = parseSpreadsheetRules(spreadsheet, true, buildRulesEnabledControlPolicy(), undefined, {}, true);
 
             expect(Object.values(result.rules).at(0)).toMatchObject({reimbursable: true, billable: false});
         });
diff --git a/tests/unit/InviteMemberListItemTest.tsx b/tests/unit/InviteMemberListItemTest.tsx
index c1ef4cc9e3e5..ff7351488bf8 100644
--- a/tests/unit/InviteMemberListItemTest.tsx
+++ b/tests/unit/InviteMemberListItemTest.tsx
@@ -2,7 +2,7 @@ import {render, screen} from '@testing-library/react-native';
 
 import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import InviteMemberListItem from '@components/SelectionList/ListItem/InviteMemberListItem';
-import type {InviteMemberListItemProps, ListItem} from '@components/SelectionList/ListItem/types';
+import type {ListItem, ListItemProps} from '@components/SelectionList/ListItem/types';
 import ListItemReportAvatar from '@components/SelectionList/ListItemComposed/primitives/ListItemReportAvatar';
 import ListItemUserAvatar from '@components/SelectionList/ListItemComposed/primitives/ListItemUserAvatar';
 
@@ -38,7 +38,7 @@ const buildItem = (extra: Partial<ListItem> = {}): ListItem => ({
     ...extra,
 });
 
-const renderItem = ({item = buildItem(), ...props}: Partial<InviteMemberListItemProps<ListItem>> = {}) =>
+const renderItem = ({item = buildItem(), ...props}: Partial<ListItemProps<ListItem>> = {}) =>
     render(
         <OnyxListItemProvider>
             <InviteMemberListItem
@@ -72,10 +72,11 @@ describe('InviteMemberListItem', () => {
     });
 
     it.each([
-        [2, true],
-        [1, false],
-    ])('renders the title with %s line(s) when isMultilineSupported=%s', (expectedNumberOfLines, isMultilineSupported) => {
-        renderItem({isMultilineSupported});
+        [2, 2],
+        [1, 1],
+        [1, undefined],
+    ])('renders the title with %s line(s) when titleNumberOfLines=%s', (expectedNumberOfLines, titleNumberOfLines) => {
+        renderItem({titleNumberOfLines});
 
         expect(screen.getByText('Invitee').props.numberOfLines).toBe(expectedNumberOfLines);
     });
diff --git a/tests/unit/IsAllowedPDFLinkTest.ts b/tests/unit/IsAllowedPDFLinkTest.ts
new file mode 100644
index 000000000000..d10ba2f27f17
--- /dev/null
+++ b/tests/unit/IsAllowedPDFLinkTest.ts
@@ -0,0 +1,84 @@
+import isAllowedPDFLink from '@components/PDFView/isAllowedPDFLink';
+
+import prefixes from '@libs/Navigation/linkingConfig/prefixes';
+
+describe('isAllowedPDFLink', () => {
+    it.each([
+        'new-expensify://transition',
+        'new-expensify://transition?email=stranger@example.com',
+        'new-expensify://transition?email=victim@example.com',
+        'new-expensify://settings/security/closeAccount',
+        'NEW-EXPENSIFY://transition',
+        'app://-/transition',
+        'expensify://transition',
+        // eslint-disable-next-line no-script-url -- Verify that untrusted script annotations are rejected.
+        'javascript:alert(1)',
+        'file:///receipt.pdf',
+        'data:text/html,test',
+        'mailto:security@example.com',
+        'tel:+15555555555',
+    ])('blocks non-web annotation URL %s', (url) => {
+        // Given a PDF annotation that could launch an app or execute an action
+        // When its URL is checked
+        const result = isAllowedPDFLink(url);
+
+        // Then it is not forwarded to the operating system
+        expect(result).toBe(false);
+    });
+
+    it.each(prefixes.filter((prefix) => prefix.startsWith('https://')))('blocks app links on %s', (prefix) => {
+        // Given a PDF annotation targeting an app host instead of its custom scheme
+        const url = new URL('/transition?email=stranger@example.com', prefix).toString();
+
+        // When its URL is checked
+        const result = isAllowedPDFLink(url);
+
+        // Then the HTTPS equivalent cannot bypass the annotation filter
+        expect(result).toBe(false);
+    });
+
+    it.each([
+        'https://NEW.EXPENSIFY.COM/transition',
+        'HTTPS://NEW.EXPENSIFY.COM/transition',
+        'https://%6eew.expensify.com/transition',
+        'https://new.expensify.com:443/transition',
+        'https://new.expensify.com./transition',
+        'https://example.com@new.expensify.com/transition',
+        'http://new.expensify.com/transition',
+        'https://dev.new.expensify.com:8082/transition',
+        'https://new.expensify.com/settings/about',
+    ])('blocks app-host variant %s', (url) => {
+        // Given an annotation that disguises or changes an app URL
+        // When its URL is checked
+        const result = isAllowedPDFLink(url);
+
+        // Then host normalization and protocol changes do not bypass the filter
+        expect(result).toBe(false);
+    });
+
+    it.each(['', 'not a URL', '/transition', '//new.expensify.com/transition', 'https://'])('blocks malformed or relative annotation URL %s', (url) => {
+        // Given an annotation without a valid absolute URL
+        // When its URL is checked
+        const result = isAllowedPDFLink(url);
+
+        // Then parsing fails closed
+        expect(result).toBe(false);
+    });
+
+    it.each([
+        'https://example.com/receipt',
+        'HTTPS://EXAMPLE.COM/receipt',
+        'http://example.com/receipt',
+        'https://help.expensify.com/articles/receipt',
+        'https://travel.expensify.com/trips/123',
+        'https://example.com/?url=new-expensify%3A%2F%2Ftransition',
+        'https://new.expensify.com.example.com/receipt',
+    ])('allows external web URL %s', (url) => {
+        // Given a legitimate web link in a PDF annotation
+        // When its URL is checked
+        const result = isAllowedPDFLink(url);
+
+        // Then ordinary external links remain usable
+        expect(result).toBe(true);
+    });
+});
diff --git a/tests/unit/LhnSearchPreviewParityTest.ts b/tests/unit/LhnSearchPreviewParityTest.ts
new file mode 100644
index 000000000000..da619e66777b
--- /dev/null
+++ b/tests/unit/LhnSearchPreviewParityTest.ts
@@ -0,0 +1,1149 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {act} from '@testing-library/react-native';
+
+import type {PrivateIsArchivedMap} from '@hooks/usePrivateIsArchivedMap';
+
+import {getMovedReportID} from '@libs/ModifiedExpenseMessage';
+import {clearFilteredOptionListCache, createFilteredOptionList, getSearchOptions} from '@libs/OptionsListUtils';
+import {getLastVisibleActionIncludingTransactionThread, getOriginalMessage, isInviteOrRemovedAction} from '@libs/ReportActionsUtils';
+import {getExpensifyCardFromReportAction} from '@libs/ReportAlternateTextUtils';
+import {canUserPerformWriteAction} from '@libs/ReportUtils';
+import SidebarUtils from '@libs/SidebarUtils';
+
+import initOnyxDerivedValues from '@userActions/OnyxDerived';
+
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Card, CardList, PersonalDetailsList, Policy, PolicyTagLists, Report, ReportAction, ReportActions, Transaction} from '@src/types/onyx';
+
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../utils/collections/policies';
+import getOnyxValue from '../utils/getOnyxValue';
+import {convertToDisplayString, convertToDisplayStringWithoutCurrency, formatPhoneNumber, localeCompare, translateLocal} from '../utils/TestHelper';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const CURRENT_USER_LOGIN = 'test@example.com';
+const CURRENT_USER_ACCOUNT_ID = 5;
+const CONCIERGE_REPORT_ID = '999';
+
+const PERSONAL_DETAILS: PersonalDetailsList = {
+    1: {accountID: 1, login: 'alice@test.com', displayName: 'Alice Aluminum', firstName: 'Alice'},
+    2: {accountID: 2, login: 'bob@test.com', displayName: 'Bob Boron', firstName: 'Bob'},
+    3: {accountID: 3, login: 'carol@test.com', displayName: 'Carol Carbon', firstName: 'Carol'},
+    [CURRENT_USER_ACCOUNT_ID]: {accountID: CURRENT_USER_ACCOUNT_ID, login: CURRENT_USER_LOGIN, displayName: 'Current User'},
+};
+
+// `Onyx.clear()` does not purge the module-level report-action caches these utils read (their
+// subscriber callbacks short-circuit on a falsy value), so every case works on its own report IDs.
+let caseIndex = 0;
+function rid(offset: number): string {
+    return String(caseIndex * 1000 + offset);
+}
+
+function makeReport(overrides: Partial<Report> = {}): Report {
+    return {
+        reportID: rid(100),
+        type: CONST.REPORT.TYPE.CHAT,
+        reportName: '#test-room',
+        chatType: CONST.REPORT.CHAT_TYPE.POLICY_ADMINS,
+        policyID: '6',
+        lastVisibleActionCreated: '2024-01-01 00:00:00.000',
+        lastReadTime: '2023-12-31 00:00:00.000',
+        lastMessageText: 'Fixture last message',
+        lastMessageHtml: 'Fixture last message',
+        participants: {
+            1: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+            [CURRENT_USER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+        },
+        ...overrides,
+    };
+}
+
+// Minimal `originalMessage` payloads for the chain branches that build their text from one.
+// Without these the branch runs, produces an empty string and the snapshot pins the generic
+// `lastMessageText` fallback instead of the branch output.
+const ORIGINAL_MESSAGE_BY_ACTION: Partial<Record<ReportAction['actionName'], Record<string, unknown>>> = {
+    [CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED]: {label: 'QuickBooks Online', errorMessage: 'Invalid credentials', recurrenceCount: 1},
+    [CONST.REPORT.ACTIONS.TYPE.COMPANY_CARD_CONNECTION_BROKEN]: {feedName: 'Visa', policyID: '6'},
+    [CONST.REPORT.ACTIONS.TYPE.PLAID_BALANCE_FAILURE]: {maskedAccountNumber: '1234'},
+    [CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED]: {maskedBankAccountNumber: '1234', policyID: '6'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EMPLOYEE]: {email: 'bob@test.com', role: 'member', didJoinPolicy: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE]: {email: 'bob@test.com', role: 'member'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OVER_LIMIT_FORWARDS_TO]: {
+        member: {email: 'bob@test.com', name: 'Bob Boron', accountID: 2},
+        overLimitForwardsTo: {email: 'carol@test.com', name: 'Carol Carbon', accountID: 3},
+        previousOverLimitForwardsTo: {email: 'alice@test.com', name: 'Alice Aluminum', accountID: 1},
+        limit: 50000,
+        previousLimit: 25000,
+        currency: 'USD',
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_NAME]: {oldName: 'Old workspace', newName: 'New workspace'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DESCRIPTION]: {oldDescription: 'Old description', newDescription: 'New description'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CURRENCY]: {oldCurrency: 'USD', newCurrency: 'EUR'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REPORTING_FREQUENCY]: {
+        oldFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
+        newFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MONTHLY,
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CATEGORY]: {categoryName: 'Travel'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CATEGORY]: {categoryName: 'Travel'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CATEGORY]: {categoryName: 'Travel', updatedField: 'enabled', oldValue: false, newValue: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CATEGORIES]: {count: 3},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAX]: {taxName: 'VAT'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_TAX]: {taxName: 'VAT'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAX]: {taxName: 'VAT', updatedField: 'rate', oldValue: '10%', newValue: '20%'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_TAX_NAME]: {oldName: 'Tax', newName: 'VAT'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CURRENCY_DEFAULT_TAX]: {oldName: 'Tax', newName: 'VAT'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FOREIGN_CURRENCY_DEFAULT_TAX]: {oldName: 'Tax', newName: 'VAT'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_LIST]: {tagListName: 'Region'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_LIST_REQUIRED]: {tagListsName: 'Region', isRequired: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_LIST_NAME]: {oldName: 'Region', newName: 'Area'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG]: {tagListName: 'Region', tagName: 'North'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_TAG]: {tagListName: 'Region', tagName: 'North'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG]: {tagListName: 'Region', tagName: 'North', updatedField: 'name', oldValue: 'North', newValue: 'South'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_UNIT]: {customUnitName: 'Distance', updatedField: 'defaultCategory', oldValue: 'Car', newValue: 'Travel'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.IMPORT_CUSTOM_UNIT_RATES]: {customUnitName: 'Distance'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CUSTOM_UNIT_RATE]: {
+        customUnitName: 'Distance',
+        rateName: 'Default Rate',
+        rate: 70,
+        currency: 'USD',
+        unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_UNIT_RATE]: {
+        customUnitName: 'Distance',
+        customUnitRateName: 'Default Rate',
+        updatedField: CONST.CUSTOM_UNITS.RATE_CHANGELOG_UPDATED_FIELD.RATE,
+        oldRate: 60,
+        newRate: 70,
+        currency: 'USD',
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CUSTOM_UNIT_RATE]: {customUnitName: 'Distance', rateName: 'Default Rate'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_UNIT_SUB_RATE]: {
+        customUnitName: 'Distance',
+        customUnitRateName: 'Default Rate',
+        customUnitSubRateName: 'Trailer',
+        updatedField: 'rate',
+        oldValue: '0.60',
+        newValue: '0.70',
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CUSTOM_UNIT_SUB_RATE]: {customUnitName: 'Distance', customUnitRateName: 'Default Rate', removedSubRateName: 'Trailer'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_REPORT_FIELD]: {fieldName: 'Department', fieldType: 'text', defaultValue: 'Sales'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REPORT_FIELD]: {updateType: 'addedOption', fieldName: 'Department', optionName: 'Sales'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_REPORT_FIELD]: {fieldName: 'Department', fieldType: 'text'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FIELD]: {updatedField: CONST.POLICY.COLLECTION_KEYS.APPROVAL_MODE, oldValue: 'OPTIONAL', newValue: 'BASIC'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FEATURE_ENABLED]: {featureName: 'categories', enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_IS_ATTENDEE_TRACKING_ENABLED]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRE_COMPANY_CARDS_ENABLED]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_TAG]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_GLOBAL_REIMBURSEMENTS_FX_PREFERENCE]: {preference: CONST.POLICY.GLOBAL_REIMBURSEMENT_FX_PREFERENCE.COMPANY},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_PAY_APPROVED_REPORTS_ENABLED]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REIMBURSEMENT]: {currency: 'USD', oldLimit: 10000, newLimit: 20000},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CATEGORY_TAX_RATE]: {categoryName: 'Travel', oldTaxName: 'VAT', oldTaxPercentage: '10%', newTaxName: 'GST', newTaxPercentage: '20%'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MCC_GROUP_CATEGORY]: {mccGroupName: CONST.MCC_GROUPS.AIRLINES, oldCategory: 'Travel', newCategory: 'Flights'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_APPROVER]: {approver: {email: 'carol@test.com'}, previousApprover: {email: 'bob@test.com'}},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_SUBMITS_TO]: {
+        members: [{email: 'bob@test.com', name: 'Bob Boron', accountID: 2}],
+        approver: {email: 'carol@test.com', name: 'Carol Carbon', accountID: 3},
+        isDefaultApprover: false,
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FORWARDS_TO]: {
+        approvers: [{email: 'bob@test.com', name: 'Bob Boron', accountID: 2}],
+        forwardsTo: {email: 'carol@test.com', name: 'Carol Carbon', accountID: 3},
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_APPROVAL_LIMIT]: {member: {email: 'bob@test.com'}, limit: 50000, previousLimit: 25000, currency: 'USD'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_INVOICE_COMPANY_NAME]: {oldValue: 'Old Co', newValue: 'New Co'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_INVOICE_COMPANY_WEBSITE]: {oldValue: 'https://old.example.com', newValue: 'https://new.example.com'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSER]: {reimburser: {email: 'carol@test.com'}, previousReimburser: {email: 'bob@test.com'}},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSEMENT_ENABLED]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_ACH_ACCOUNT]: {bankAccountName: 'Checking', maskedBankAccountNumber: '1234'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_ADDRESS]: {
+        oldAddress: {addressStreet: '1 Old St', city: 'Portland', state: 'OR', zipCode: '97205', country: 'US'},
+        newAddress: {addressStreet: '2 New St', city: 'Portland', state: 'OR', zipCode: '97205', country: 'US'},
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AMOUNT_NO_RECEIPT]: {currency: 'USD', oldMaxExpenseAmountNoReceipt: 2500, newMaxExpenseAmountNoReceipt: 5000},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AMOUNT_NO_ITEMIZED_RECEIPT]: {
+        currency: 'USD',
+        oldMaxExpenseAmountNoItemizedReceipt: 2500,
+        newMaxExpenseAmountNoItemizedReceipt: 5000,
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AMOUNT]: {currency: 'USD', oldMaxExpenseAmount: 10000, newMaxExpenseAmount: 20000},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AGE]: {oldMaxExpenseAge: 30, newMaxExpenseAge: 60},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_BILLABLE]: {oldDefaultBillable: 'false', newDefaultBillable: 'true'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_REIMBURSABLE]: {oldDefaultReimbursable: 'false', newDefaultReimbursable: 'true'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_TITLE_ENFORCED]: {value: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_TITLE]: {oldDefaultTitle: 'Old title', newDefaultTitle: 'New title'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CARD_FEED]: {feedName: 'Visa'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CARD_FEED]: {feedName: 'Visa'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.RENAME_CARD_FEED]: {oldName: 'Visa', newName: 'Visa Corporate'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ASSIGN_COMPANY_CARD]: {email: 'bob@test.com', feedName: 'Visa', cardLastFour: '1234'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UNASSIGN_COMPANY_CARD]: {email: 'bob@test.com', feedName: 'Visa', cardLastFour: '1234'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CARD_FEED_LIABILITY]: {feedName: 'Visa', liabilityType: CONST.TRANSACTION.LIABILITY_TYPE.ALLOW},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CARD_FEED_STATEMENT_PERIOD]: {feedName: 'Visa', statementPeriodEndDay: 15, previousStatementPeriodEndDay: 1},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUDIT_RATE]: {oldAuditRate: 0.1, newAuditRate: 0.5},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_APPROVER_RULE]: {name: 'Travel', field: 'category', approverEmail: 'bob@test.com', approverName: 'Bob Boron', approverAccountID: 2},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_APPROVER_RULE]: {name: 'Travel', field: 'category', approverEmail: 'bob@test.com', approverName: 'Bob Boron', approverAccountID: 2},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_APPROVER_RULE]: {
+        name: 'Travel',
+        field: 'category',
+        oldApproverEmail: 'bob@test.com',
+        oldApproverName: 'Bob Boron',
+        newApproverEmail: 'carol@test.com',
+        newApproverName: 'Carol Carbon',
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EXPENSIFY_CARD_RULE]: {
+        action: CONST.SPEND_RULES.ACTION.ALLOW,
+        oldMerchants: ['Amazon'],
+        merchants: ['Amazon', 'Uber'],
+        currency: 'USD',
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MANUAL_APPROVAL_THRESHOLD]: {currency: 'USD', oldLimit: 10000, newLimit: 20000},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_BUDGET]: {entityType: 'category', categoryName: 'Travel', newValue: {frequency: 'monthly', shared: 100000, individual: 50000}},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_BUDGET]: {
+        entityType: 'category',
+        categoryName: 'Travel',
+        oldValue: {frequency: 'monthly', shared: 100000, individual: 50000, notificationThreshold: 80},
+        newValue: {frequency: 'yearly', shared: 200000, individual: 100000, notificationThreshold: 90},
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_BUDGET]: {entityType: 'category', categoryName: 'Travel', oldValue: {frequency: 'monthly', shared: 100000, individual: 50000}},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TIME_ENABLED]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TIME_RATE]: {currency: 'USD', oldRate: 50, newRate: 60},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_PROHIBITED_EXPENSES]: {
+        oldProhibitedExpenses: {[CONST.POLICY.PROHIBITED_EXPENSES.ALCOHOL]: false},
+        newProhibitedExpenses: {[CONST.POLICY.PROHIBITED_EXPENSES.ALCOHOL]: true},
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSEMENT_CHOICE]: {
+        oldChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
+        newChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SET_AUTO_JOIN]: {enabled: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_HARVESTING]: {value: true},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OWNERSHIP]: {oldOwnerEmail: 'bob@test.com', oldOwnerName: 'Bob Boron'},
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INDIVIDUAL_BUDGET_NOTIFICATION]: {
+        budgetAmount: 100000,
+        budgetFrequency: 'monthly',
+        budgetName: 'Travel',
+        budgetTypeForNotificationMessage: 'category',
+        thresholdPercentage: 80,
+        totalSpend: 80000,
+        unsubmittedSpend: 10000,
+        awaitingApprovalSpend: 20000,
+        approvedReimbursedClosedSpend: 50000,
+        userEmail: 'bob@test.com',
+    },
+    [CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SHARED_BUDGET_NOTIFICATION]: {
+        budgetAmount: 100000,
+        budgetFrequency: 'monthly',
+        budgetName: 'Travel',
+        budgetTypeForNotificationMessage: 'category',
+        thresholdPercentage: 80,
+        totalSpend: 80000,
+        unsubmittedSpend: 10000,
+        awaitingApprovalSpend: 20000,
+        approvedReimbursedClosedSpend: 50000,
+    },
+};
+function makeAction(actionName: ReportAction['actionName'], overrides: Partial<ReportAction> = {}): ReportAction {
+    const originalMessage = ORIGINAL_MESSAGE_BY_ACTION[actionName];
+    return {
+        reportActionID: '1',
+        actionName,
+        created: '2024-01-01 00:00:00.000',
+        actorAccountID: 1,
+        person: [{type: 'TEXT', style: 'strong', text: 'Alice Aluminum'}],
+        message: [{type: 'COMMENT', html: '<em>Fixture message html</em>', text: 'Fixture message text', isDeletedParentAction: false, deleted: ''}],
+        ...(originalMessage ? {originalMessage} : {}),
+        ...overrides,
+    } as ReportAction;
+}
+
+type ParityCase = {
+    report?: Report;
+    lastAction?: ReportAction;
+    mainReportActions?: ReportAction[];
+    extraReports?: Report[];
+    extraReportActions?: Record<string, ReportAction[]>;
+    lateReportActions?: Record<string, ReportAction[]>;
+    policy?: OnyxEntry<Policy>;
+    invoiceReceiverPolicy?: OnyxEntry<Policy>;
+    policyTags?: PolicyTagLists;
+    transactions?: Transaction[];
+    cardList?: OnyxEntry<CardList>;
+    isReportArchived?: boolean;
+    isTrackIntentUser?: boolean;
+    /** Leaves `convertToDisplayStringWithoutCurrency` off the Search config so the lib-side fallback is exercised. */
+    useSearchCurrencyFallback?: boolean;
+};
+
+function toReportActions(actions: ReportAction[]): ReportActions {
+    return Object.fromEntries(actions.map((action) => [action.reportActionID, action]));
+}
+
+async function computeBothSurfaces({
+    report = makeReport(),
+    lastAction,
+    mainReportActions,
+    extraReports = [],
+    extraReportActions = {},
+    lateReportActions = {},
+    policy,
+    invoiceReceiverPolicy,
+    policyTags,
+    transactions = [],
+    cardList,
+    isReportArchived = false,
+    isTrackIntentUser = false,
+    useSearchCurrencyFallback = false,
+}: ParityCase) {
+    const reportsById: Record<string, Report> = {[report.reportID]: report};
+    for (const extra of extraReports) {
+        reportsById[extra.reportID] = extra;
+    }
+
+    const seededMainActions = mainReportActions ?? (lastAction ? [lastAction] : undefined);
+
+    await act(async () => {
+        await Promise.all(Object.values(reportsById).map((seeded) => Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${seeded.reportID}`, seeded)));
+        if (seededMainActions) {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`, toReportActions(seededMainActions));
+        }
+        await Promise.all(Object.entries(extraReportActions).map(([reportID, actions]) => Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, toReportActions(actions))));
+        await Promise.all(transactions.map((transaction) => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction)));
+    });
+    await waitForBatchedUpdatesWithAct();
+
+    if (Object.keys(lateReportActions).length > 0) {
+        await act(async () => {
+            await Promise.all(Object.entries(lateReportActions).map(([reportID, actions]) => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, toReportActions(actions))));
+        });
+        await waitForBatchedUpdatesWithAct();
+    }
+
+    const sortedData = await getOnyxValue(ONYXKEYS.DERIVED.RAM_ONLY_SORTED_REPORT_ACTIONS);
+    const reportAttributesValue = await getOnyxValue(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES);
+    const reportAttributesDerived = reportAttributesValue?.reports;
+
+    const canWrite = canUserPerformWriteAction(report, isReportArchived);
+    const oneTransactionThreadReportID = sortedData?.transactionThreadIDs?.[report.reportID];
+    const actionsCollection: OnyxCollection<ReportActions> = {
+        [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`]: seededMainActions ? toReportActions(seededMainActions) : undefined,
+    };
+    for (const [reportID, actions] of Object.entries(extraReportActions)) {
+        actionsCollection[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] = toReportActions(actions);
+    }
+    for (const [reportID, actions] of Object.entries(lateReportActions)) {
+        actionsCollection[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] = {...actionsCollection[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`], ...toReportActions(actions)};
+    }
+    const lhnLastAction = getLastVisibleActionIncludingTransactionThread(report.reportID, canWrite, actionsCollection, undefined, oneTransactionThreadReportID);
+    let lastActionReport: OnyxEntry<Report>;
+    if (isInviteOrRemovedAction(lhnLastAction)) {
+        const originalMessage = getOriginalMessage(lhnLastAction);
+        lastActionReport = originalMessage?.reportID ? reportsById[String(originalMessage.reportID)] : undefined;
+    }
+    const movedFromReportID = getMovedReportID(lhnLastAction, CONST.REPORT.MOVE_TYPE.FROM);
+    const movedToReportID = getMovedReportID(lhnLastAction, CONST.REPORT.MOVE_TYPE.TO);
+    const card: Card | undefined = getExpensifyCardFromReportAction({reportAction: lhnLastAction, policy, cardList, workspaceCardList: undefined});
+
+    const lhnOption = SidebarUtils.getOptionData({
+        report,
+        reportAttributes: reportAttributesDerived?.[report.reportID],
+        oneTransactionThreadReport: oneTransactionThreadReportID ? reportsById[oneTransactionThreadReportID] : undefined,
+        reportNameValuePairs: isReportArchived ? {private_isArchived: '2024-01-02 00:00:00.000'} : {},
+        personalDetails: PERSONAL_DETAILS,
+        policy,
+        parentReportAction: undefined,
+        conciergeReportID: CONCIERGE_REPORT_ID,
+        invoiceReceiverPolicy,
+        lastMessageTextFromReport: undefined,
+        card,
+        lastAction: lhnLastAction,
+        translate: translateLocal,
+        dateFnsLocale: undefined,
+        convertToDisplayString,
+        convertToDisplayStringWithoutCurrency,
+        localeCompare,
+        isReportArchived,
+        lastActionReport,
+        movedFromReport: movedFromReportID ? reportsById[movedFromReportID] : undefined,
+        movedToReport: movedToReportID ? reportsById[movedToReportID] : undefined,
+        currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+        visibleReportActionsData: undefined,
+        reportAttributesDerived,
+        policyTags,
+        currentUserLogin: CURRENT_USER_LOGIN,
+        isTrackIntentUser,
+        formatPhoneNumber,
+        rules: undefined,
+    });
+
+    const reportsCollection: OnyxCollection<Report> = {};
+    for (const [id, seeded] of Object.entries(reportsById)) {
+        reportsCollection[`${ONYXKEYS.COLLECTION.REPORT}${id}`] = seeded;
+    }
+    const privateIsArchivedMap: PrivateIsArchivedMap = isReportArchived ? {[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID}`]: true} : {};
+    const policiesCollection: OnyxCollection<Policy> = policy ? {[`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`]: policy} : {};
+    if (invoiceReceiverPolicy) {
+        policiesCollection[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicy.id}`] = invoiceReceiverPolicy;
+    }
+
+    const optionList = createFilteredOptionList(
+        PERSONAL_DETAILS,
+        reportsCollection,
+        reportAttributesDerived,
+        privateIsArchivedMap,
+        policiesCollection,
+        {
+            currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+            currentUserLogin: CURRENT_USER_LOGIN,
+            transactionThreadIDs: sortedData?.transactionThreadIDs,
+            lastActions: sortedData?.lastActions,
+            dateFnsLocale: undefined,
+            convertToDisplayString,
+            conciergeReportID: CONCIERGE_REPORT_ID,
+            isSearching: true,
+        },
+        undefined,
+        undefined,
+        undefined,
+        isTrackIntentUser,
+        sortedData?.sortedActions,
+    );
+
+    const {options: searchResults} = getSearchOptions({
+        dateFnsLocale: undefined,
+        convertToDisplayString,
+        convertToDisplayStringWithoutCurrency: useSearchCurrencyFallback ? undefined : convertToDisplayStringWithoutCurrency,
+        options: optionList,
+        draftComments: {},
+        loginList: {},
+        isDefaultRoomsBetaEnabled: true,
+        policyCollection: policiesCollection,
+        allPolicyTags: policyTags ? {[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report.policyID}`]: policyTags} : undefined,
+        currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+        currentUserEmail: CURRENT_USER_LOGIN,
+        currentUserLogin: CURRENT_USER_LOGIN,
+        personalDetails: PERSONAL_DETAILS,
+        reportAttributesDerived,
+        sortedActions: sortedData?.sortedActions,
+        transactionThreadIDs: sortedData?.transactionThreadIDs,
+        lastActions: sortedData?.lastActions,
+        localeCompare,
+        formatPhoneNumber,
+        conciergeReportID: CONCIERGE_REPORT_ID,
+        isTrackIntentUser,
+        translate: translateLocal,
+        getReportByID: (reportID: string | undefined) => (reportID ? reportsCollection[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] : undefined),
+        rules: undefined,
+    });
+
+    const searchOption = searchResults.recentReports.find((option) => option.reportID === report.reportID);
+    return {lhnText: lhnOption?.alternateText, searchText: searchOption?.alternateText, searchOptionFound: !!searchOption};
+}
+
+async function expectParity(parityCase: ParityCase) {
+    const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces(parityCase);
+    expect(searchOptionFound).toBe(true);
+    expect(lhnText).toBeTruthy();
+    expect(searchText).toBe(lhnText);
+}
+
+const SIMPLE_CHAIN_ACTIONS: Array<ReportAction['actionName']> = [
+    CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_ROOM,
+    CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.LEAVE_ROOM,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_NAME,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DESCRIPTION,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CURRENCY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REPORTING_FREQUENCY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.CORPORATE_UPGRADE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.CORPORATE_FORCE_UPGRADE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.TEAM_DOWNGRADE,
+    CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED,
+    CONST.REPORT.ACTIONS.TYPE.COMPANY_CARD_CONNECTION_BROKEN,
+    CONST.REPORT.ACTIONS.TYPE.PLAID_BALANCE_FAILURE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CATEGORY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CATEGORY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CATEGORY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CATEGORIES,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.IMPORT_TAGS,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_ALL_TAGS,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_LIST,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_LIST_REQUIRED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAX,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_TAX,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAX,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_TAX_NAME,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CURRENCY_DEFAULT_TAX,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FOREIGN_CURRENCY_DEFAULT_TAX,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG_LIST_NAME,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TAG,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_TAG,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_UNIT,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.IMPORT_CUSTOM_UNIT_RATES,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CUSTOM_UNIT_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_UNIT_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CUSTOM_UNIT_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CUSTOM_UNIT_SUB_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CUSTOM_UNIT_SUB_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_REPORT_FIELD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REPORT_FIELD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_REPORT_FIELD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FIELD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FEATURE_ENABLED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_IS_ATTENDEE_TRACKING_ENABLED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRE_COMPANY_CARDS_ENABLED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_CATEGORY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REQUIRES_TAG,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_GLOBAL_REIMBURSEMENTS_FX_PREFERENCE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_PAY_APPROVED_REPORTS_ENABLED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REIMBURSEMENT,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CATEGORY_TAX_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MCC_GROUP_CATEGORY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_APPROVER,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_SUBMITS_TO,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_FORWARDS_TO,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_INVOICE_COMPANY_NAME,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_INVOICE_COMPANY_WEBSITE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSER,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSEMENT_ENABLED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_ACH_ACCOUNT,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_ADDRESS,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AMOUNT_NO_RECEIPT,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AMOUNT_NO_ITEMIZED_RECEIPT,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AMOUNT,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MAX_EXPENSE_AGE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_BILLABLE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_REIMBURSABLE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_TITLE_ENFORCED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY,
+    CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION,
+    CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_AVATAR,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EMPLOYEE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE,
+    CONST.REPORT.ACTIONS.TYPE.UNREPORTED_TRANSACTION,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CARD_FEED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_CARD_FEED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.RENAME_CARD_FEED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ASSIGN_COMPANY_CARD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UNASSIGN_COMPANY_CARD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CARD_FEED_LIABILITY,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_CARD_FEED_STATEMENT_PERIOD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUDIT_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_APPROVER_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_APPROVER_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_APPROVER_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EXPENSIFY_CARD_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EXPENSIFY_CARD_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_EXPENSIFY_CARD_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_AGENT_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AGENT_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_AGENT_RULE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MANUAL_APPROVAL_THRESHOLD,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_BUDGET,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_BUDGET,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_BUDGET,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TIME_ENABLED,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_TIME_RATE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_PROHIBITED_EXPENSES,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_REIMBURSEMENT_CHOICE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SET_AUTO_JOIN,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_DEFAULT_TITLE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_HARVESTING,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INDIVIDUAL_BUDGET_NOTIFICATION,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.SHARED_BUDGET_NOTIFICATION,
+    CONST.REPORT.ACTIONS.TYPE.RETRACTED,
+    CONST.REPORT.ACTIONS.TYPE.REOPENED,
+    CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL,
+    CONST.REPORT.ACTIONS.TYPE.REROUTE,
+    CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_OWNERSHIP,
+    CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED,
+    CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL,
+    CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT,
+    CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT,
+];
+
+describe('LHN vs Search preview parity', () => {
+    beforeAll(async () => {
+        Onyx.init({
+            keys: ONYXKEYS,
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        });
+        IntlStore.load(CONST.LOCALES.EN);
+        initOnyxDerivedValues();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    beforeEach(() => {
+        caseIndex += 1;
+        clearFilteredOptionListCache();
+    });
+
+    afterEach(async () => {
+        await act(async () => {
+            await Onyx.clear();
+        });
+    });
+
+    describe('special-action chain branches (policy room)', () => {
+        it.each(SIMPLE_CHAIN_ACTIONS)('should match for %s', async (actionName) => {
+            await expectParity({lastAction: makeAction(actionName)});
+        });
+    });
+
+    describe('branches with bespoke payloads', () => {
+        it('should match for RENAMED with old/new name', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.RENAMED, {originalMessage: {oldName: 'Old room name', newName: 'New room name'}}),
+            });
+        });
+
+        it('should match for ROOM invite with targetAccountIDs and room name from originalMessage', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, {originalMessage: {targetAccountIDs: [2, 3], roomName: 'general'}}),
+            });
+        });
+
+        it('should match for POLICY remove with single target', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_FROM_ROOM, {originalMessage: {targetAccountIDs: [2]}}),
+            });
+        });
+
+        it('should match for invite with room name resolved from lastActionReport', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, {originalMessage: {targetAccountIDs: [2], reportID: Number(rid(200))}}),
+                extraReports: [makeReport({reportID: rid(200), reportName: '#target-room'})],
+            });
+        });
+
+        it('should match for ACTIONABLE_CARD_FRAUD_ALERT with resolution', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_FRAUD_ALERT, {
+                    originalMessage: {resolution: CONST.CARD_FRAUD_ALERT_RESOLUTION.RECOGNIZED, cardID: 11, maskedCardNumber: '4444', triggerAmount: 1000, triggerMerchant: 'ACME'},
+                }),
+            });
+        });
+
+        it('should match for CARD_ISSUED without card', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, {originalMessage: {assigneeAccountID: 2, cardID: 11}}),
+            });
+        });
+
+        it('should match for CARD_ISSUED with card', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, {originalMessage: {assigneeAccountID: 2, cardID: 11}}),
+                cardList: {
+                    11: {
+                        cardID: 11,
+                        state: CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED,
+                        bank: CONST.EXPENSIFY_CARD.BANK,
+                        domainName: 'test.com',
+                        lastUpdated: '2024-01-01',
+                        fraud: CONST.EXPENSIFY_CARD.FRAUD_TYPES.NONE,
+                        lastFourPAN: '1234',
+                    },
+                },
+            });
+        });
+
+        it('should match when ROOM invite without targetAccountIDs falls back to mention-user count in lastMessageHtml', async () => {
+            await expectParity({
+                report: makeReport({lastMessageHtml: '<mention-user></mention-user><mention-user></mention-user>'}),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, {originalMessage: {}}),
+            });
+        });
+
+        it('should match for ADD_INTEGRATION with connection name', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_INTEGRATION, {originalMessage: {connectionName: CONST.POLICY.CONNECTIONS.NAME.QBO}}),
+            });
+        });
+
+        it('should match for DELETE_INTEGRATION with connection name', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_INTEGRATION, {originalMessage: {connectionName: CONST.POLICY.CONNECTIONS.NAME.XERO}}),
+            });
+        });
+
+        it('should match for UPDATE_EMPLOYEE with role change', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE, {
+                    originalMessage: {email: 'bob@test.com', field: 'role', oldValue: CONST.POLICY.ROLE.USER, newValue: CONST.POLICY.ROLE.ADMIN},
+                }),
+            });
+        });
+
+        it('should match for REASSIGN_APPROVER with new approver', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.REASSIGN_APPROVER, {originalMessage: {newApproverID: 2}}),
+            });
+        });
+
+        it('should match for TRAVEL_UPDATE booking ticketed', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.TRAVEL_UPDATE, {
+                    originalMessage: {
+                        type: CONST.RESERVATION_TYPE.FLIGHT,
+                        operation: CONST.TRAVEL.UPDATE_OPERATION_TYPE.BOOKING_TICKETED,
+                        start: {date: '2024-03-01 10:00:00', shortName: 'KRK'},
+                        end: {date: '2024-03-01 14:00:00', shortName: 'SFO'},
+                        route: {airlineCode: 'LO 3925', number: '3925'},
+                        confirmations: [{name: 'PNR', value: 'ABC123'}],
+                    },
+                }),
+            });
+        });
+
+        it('should match for MOVED_TRANSACTION with derived report name', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.MOVED_TRANSACTION, {originalMessage: {toReportID: rid(300), fromReportID: rid(100)}}),
+                extraReports: [makeReport({reportID: rid(300), reportName: 'Target Expense Report', chatType: undefined, type: CONST.REPORT.TYPE.EXPENSE})],
+            });
+        });
+
+        it('should match when generic ADD_COMMENT in room gets actor prefix', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT),
+            });
+        });
+
+        it('should match for generic ADD_COMMENT from current user in room', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {actorAccountID: CURRENT_USER_ACCOUNT_ID, person: [{type: 'TEXT', style: 'strong', text: 'Current User'}]}),
+            });
+        });
+
+        it('should match when generic branch resolves actor from person[0].text when personalDetails miss the actor', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {actorAccountID: 42, person: [{type: 'TEXT', style: 'strong', text: 'Mystery Person'}]}),
+            });
+        });
+
+        it('should match for REPORT_PREVIEW on policy expense chat', async () => {
+            await expectParity({
+                report: makeReport({chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT, reportName: 'Workspace chat', lastMessageText: 'owes $1.00', lastMessageHtml: 'owes $1.00'}),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW),
+            });
+        });
+    });
+
+    describe('report-type and fallback variants', () => {
+        it('should match when empty room falls back to welcome message', async () => {
+            await expectParity({report: makeReport({lastMessageText: '', lastMessageHtml: ''})});
+        });
+
+        it('should match when empty policy expense chat falls back to welcome message', async () => {
+            await expectParity({
+                report: makeReport({
+                    chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
+                    reportName: 'Workspace chat',
+                    ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+                    lastMessageText: '',
+                    lastMessageHtml: '',
+                }),
+            });
+        });
+
+        it('should match when empty DM falls back to welcome message', async () => {
+            await expectParity({report: makeReport({chatType: undefined, reportName: '', lastMessageText: '', lastMessageHtml: ''})});
+        });
+
+        it('should match for empty self-DM with isTrackIntentUser true', async () => {
+            await expectParity({
+                report: makeReport({
+                    chatType: CONST.REPORT.CHAT_TYPE.SELF_DM,
+                    reportName: '',
+                    lastMessageText: '',
+                    lastMessageHtml: '',
+                    participants: {[CURRENT_USER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}},
+                }),
+                isTrackIntentUser: true,
+            });
+        });
+
+        it('should match for empty self-DM with isTrackIntentUser false', async () => {
+            await expectParity({
+                report: makeReport({
+                    chatType: CONST.REPORT.CHAT_TYPE.SELF_DM,
+                    reportName: '',
+                    lastMessageText: '',
+                    lastMessageHtml: '',
+                    participants: {[CURRENT_USER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}},
+                }),
+            });
+        });
+
+        it('should match when DM with last message shows actor prefix', async () => {
+            await expectParity({
+                report: makeReport({chatType: undefined, reportName: '', lastActorAccountID: 1}),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT),
+            });
+        });
+
+        it('should match when DM last message from current user has no actor prefix', async () => {
+            await expectParity({
+                report: makeReport({chatType: undefined, reportName: '', lastActorAccountID: CURRENT_USER_ACCOUNT_ID}),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {actorAccountID: CURRENT_USER_ACCOUNT_ID, person: [{type: 'TEXT', style: 'strong', text: 'Current User'}]}),
+            });
+        });
+
+        it('should match for group chat with last comment', async () => {
+            await expectParity({
+                report: makeReport({
+                    chatType: CONST.REPORT.CHAT_TYPE.GROUP,
+                    reportName: 'Alice, Bob, Carol',
+                    participants: {
+                        1: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                        2: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                        3: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                        [CURRENT_USER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                    },
+                }),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT),
+            });
+        });
+
+        it('should match when archived room skips the special-action chain', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.RENAMED, {originalMessage: {oldName: 'Old', newName: 'New'}}),
+                isReportArchived: true,
+            });
+        });
+
+        it('should match when multiline last message collapses line breaks', async () => {
+            await expectParity({
+                report: makeReport({lastMessageText: 'line one\nline two\nline three', lastMessageHtml: 'line one<br />line two<br />line three'}),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                    message: [{type: 'COMMENT', html: 'line one<br />line two<br />line three', text: 'line one\nline two\nline three', isDeletedParentAction: false, deleted: ''}],
+                }),
+            });
+        });
+
+        it('should match for empty invoice room where the welcome payer comes from invoiceReceiverPolicy', async () => {
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                report: makeReport({
+                    chatType: CONST.REPORT.CHAT_TYPE.INVOICE,
+                    reportName: 'Invoice room',
+                    lastMessageText: '',
+                    lastMessageHtml: '',
+                    invoiceReceiver: {type: CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS, policyID: 'P1'},
+                }),
+                invoiceReceiverPolicy: {...createRandomPolicy(1), id: 'P1', name: 'Biz Co'},
+            });
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain('Biz Co');
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match for a one-transaction expense report whose newest action is the IOU create action', async () => {
+            const createdAction = makeAction(CONST.REPORT.ACTIONS.TYPE.CREATED, {reportActionID: '1', created: '2024-01-01 00:00:00.000'});
+            const iouAction = makeAction(CONST.REPORT.ACTIONS.TYPE.IOU, {
+                reportActionID: '2',
+                created: '2024-01-02 00:00:00.000',
+                childReportID: rid(400),
+                originalMessage: {
+                    IOUReportID: rid(100),
+                    IOUTransactionID: 't1',
+                    amount: 1234,
+                    currency: 'USD',
+                    type: CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                },
+            });
+            const threadCreatedAction = makeAction(CONST.REPORT.ACTIONS.TYPE.CREATED, {reportActionID: '3', created: '2024-01-02 00:00:01.000'});
+            const threadCommentAction = makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                reportActionID: '4',
+                created: '2024-01-03 00:00:00.000',
+                message: [{type: 'COMMENT', html: 'Thread follow-up', text: 'Thread follow-up', isDeletedParentAction: false, deleted: ''}],
+            });
+
+            await expectParity({
+                report: makeReport({
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                    chatType: undefined,
+                    reportName: 'Expense Report',
+                    ownerAccountID: 1,
+                    managerID: CURRENT_USER_ACCOUNT_ID,
+                    lastVisibleActionCreated: '2024-01-02 00:00:00.000',
+                }),
+                mainReportActions: [createdAction, iouAction],
+                extraReports: [
+                    makeReport({
+                        reportID: rid(400),
+                        chatType: undefined,
+                        reportName: 'Transaction thread',
+                        parentReportID: rid(100),
+                        parentReportActionID: '2',
+                    }),
+                ],
+                extraReportActions: {[rid(400)]: [threadCreatedAction]},
+                lateReportActions: {[rid(400)]: [threadCommentAction]},
+            });
+        });
+
+        it('should match for a tag edit that uses the policy tag list name', async () => {
+            // Given a tag edit on a policy whose tag list is named "Department"; without real tags the preview says "tag"
+            const policyTags: PolicyTagLists = {
+                Department: {name: 'Department', orderWeight: 0, required: false, tags: {Engineering: {name: 'Engineering', enabled: true}, Sales: {name: 'Sales', enabled: true}}},
+            };
+
+            // When both surfaces render the preview with the same policy tags
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE, {originalMessage: {oldTag: 'Sales', tag: 'Engineering'}}),
+                policyTags,
+            });
+
+            // Then Search shows the named tag list exactly like the LHN
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain('Department');
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match for a second-level tag edit on multi-level tags', async () => {
+            // Given multi-level tags where only the second level changed; the default tag list cannot resolve level 2
+            const policyTags: PolicyTagLists = {
+                Department: {name: 'Department', orderWeight: 0, required: false, tags: {Engineering: {name: 'Engineering', enabled: true}}},
+                Team: {name: 'Team', orderWeight: 1, required: false, tags: {Backend: {name: 'Backend', enabled: true}, Frontend: {name: 'Frontend', enabled: true}}},
+            };
+
+            // When both surfaces render the preview with the same policy tags
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE, {originalMessage: {oldTag: 'Engineering:Frontend', tag: 'Engineering:Backend'}}),
+                policyTags,
+            });
+
+            // Then Search names the changed level exactly like the LHN
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain('Team');
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match for a DM whose last action previews a single-expense IOU report', async () => {
+            // Given a DM whose last action previews an IOU report with one expense, so that IOU report has a one-transaction thread
+            const iouReportID = rid(200);
+            const transactionThreadReportID = rid(400);
+            const transactionID = `t${rid(1)}`;
+            const reportPreviewAction = makeAction(CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, {
+                reportActionID: '10',
+                created: '2024-01-02 00:00:00.000',
+                actorAccountID: 2,
+                childReportID: iouReportID,
+                childMoneyRequestCount: 1,
+                originalMessage: {linkedReportID: iouReportID},
+            });
+            const iouCreatedAction = makeAction(CONST.REPORT.ACTIONS.TYPE.CREATED, {reportActionID: '20', created: '2024-01-01 00:00:00.000', actorAccountID: 2});
+            const iouAction = makeAction(CONST.REPORT.ACTIONS.TYPE.IOU, {
+                reportActionID: '21',
+                created: '2024-01-02 00:00:00.000',
+                actorAccountID: 2,
+                childReportID: transactionThreadReportID,
+                originalMessage: {IOUReportID: iouReportID, IOUTransactionID: transactionID, amount: 1234, currency: 'USD', type: CONST.IOU.REPORT_ACTION_TYPE.CREATE},
+            });
+
+            // When both surfaces render the DM preview
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                report: makeReport({
+                    chatType: undefined,
+                    reportName: '',
+                    policyID: CONST.POLICY.ID_FAKE,
+                    lastActorAccountID: 2,
+                    iouReportID,
+                    lastVisibleActionCreated: '2024-01-02 00:00:00.000',
+                    participants: {
+                        2: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                        [CURRENT_USER_ACCOUNT_ID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                    },
+                }),
+                mainReportActions: [reportPreviewAction],
+                extraReports: [
+                    makeReport({
+                        reportID: iouReportID,
+                        type: CONST.REPORT.TYPE.IOU,
+                        chatType: undefined,
+                        reportName: 'IOU',
+                        policyID: CONST.POLICY.ID_FAKE,
+                        chatReportID: rid(100),
+                        ownerAccountID: 2,
+                        managerID: CURRENT_USER_ACCOUNT_ID,
+                        currency: 'USD',
+                        total: 1234,
+                        stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+                        statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+                    }),
+                    makeReport({reportID: transactionThreadReportID, chatType: undefined, reportName: 'Transaction thread', parentReportID: iouReportID, parentReportActionID: '21'}),
+                ],
+                extraReportActions: {[iouReportID]: [iouCreatedAction, iouAction]},
+                transactions: [
+                    {
+                        transactionID,
+                        reportID: iouReportID,
+                        amount: 1234,
+                        currency: 'USD',
+                        merchant: 'Lunch',
+                        comment: {comment: 'Lunch'},
+                        created: '2024-01-02',
+                    } as Transaction,
+                ],
+            });
+
+            // Then Search finds the linked expense like the LHN does, because both read the IOU report's own actions
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain('Lunch');
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match for an attachment-only last message', async () => {
+            const attachmentHtml = '<img src="https://example.com/a.png" data-expensify-source="https://example.com/a.png" />';
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                report: makeReport({lastMessageText: CONST.ATTACHMENT_MESSAGE_TEXT, lastMessageHtml: attachmentHtml}),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                    message: [{type: 'COMMENT', html: attachmentHtml, text: CONST.ATTACHMENT_MESSAGE_TEXT, isDeletedParentAction: false, deleted: ''}],
+                }),
+            });
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain(translateLocal('common.attachment'));
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match when the last action is a deleted parent action', async () => {
+            await expectParity({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                    childVisibleActionCount: 1,
+                    message: [{type: 'COMMENT', html: '', text: '', isDeletedParentAction: true, deleted: '2024-01-01 00:00:01.000'}],
+                }),
+            });
+        });
+
+        it('should match when the newest comment is deleted and the preview falls back to the previous one', async () => {
+            const visibleAction = makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                reportActionID: '1',
+                created: '2024-01-01 00:00:00.000',
+                message: [{type: 'COMMENT', html: 'Still here', text: 'Still here', isDeletedParentAction: false, deleted: ''}],
+            });
+            const deletedAction = makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                reportActionID: '2',
+                created: '2024-01-02 00:00:00.000',
+                message: [{type: 'COMMENT', html: '', text: '', isDeletedParentAction: false, deleted: '2024-01-02 00:00:01.000'}],
+            });
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                report: makeReport({lastVisibleActionCreated: '2024-01-02 00:00:00.000'}),
+                mainReportActions: [visibleAction, deletedAction],
+            });
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain('Still here');
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match when the newest action is a whisper targeted at another user', async () => {
+            const visibleAction = makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                reportActionID: '1',
+                created: '2024-01-01 00:00:00.000',
+                message: [{type: 'COMMENT', html: 'Visible to everyone', text: 'Visible to everyone', isDeletedParentAction: false, deleted: ''}],
+            });
+            const whisperAction = makeAction(CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER, {
+                reportActionID: '2',
+                created: '2024-01-02 00:00:00.000',
+                originalMessage: {whisperedTo: [1], inviteeAccountIDs: [2]},
+            });
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                report: makeReport({lastVisibleActionCreated: '2024-01-02 00:00:00.000'}),
+                mainReportActions: [visibleAction, whisperAction],
+            });
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain('Visible to everyone');
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match for a task report with a completed task action', async () => {
+            await expectParity({
+                report: makeReport({
+                    type: CONST.REPORT.TYPE.TASK,
+                    chatType: undefined,
+                    reportName: 'Write the tests',
+                    ownerAccountID: 1,
+                    managerID: CURRENT_USER_ACCOUNT_ID,
+                }),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED),
+            });
+        });
+
+        it('should match when SMS domain is stripped from last message', async () => {
+            await expectParity({
+                report: makeReport({lastMessageText: 'ping +15551234567@expensify.sms please', lastMessageHtml: 'ping +15551234567@expensify.sms please'}),
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, {
+                    message: [{type: 'COMMENT', html: 'ping +15551234567@expensify.sms please', text: 'ping +15551234567@expensify.sms please', isDeletedParentAction: false, deleted: ''}],
+                }),
+            });
+        });
+    });
+
+    /**
+     * Both surfaces resolve translations and currency formatting from the active locale, so under `en` a fallback that
+     * picks the wrong locale is byte-identical to the injected implementation and nothing here can fail. These cases run
+     * the same paths under `es`.
+     */
+    describe('non-English locale', () => {
+        beforeAll(async () => {
+            await IntlStore.load(CONST.LOCALES.ES);
+        });
+
+        afterAll(async () => {
+            await IntlStore.load(CONST.LOCALES.EN);
+        });
+
+        it('should match for a translated special action', async () => {
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.LEAVE_ROOM),
+            });
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain(translateLocal('report.actions.type.leftTheChat'));
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match for a generic comment', async () => {
+            await expectParity({lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT)});
+        });
+
+        it('should match for a card approval amount formatted with its currency', async () => {
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL, {
+                    originalMessage: {amount: 1234, currency: CONST.CURRENCY.USD, merchant: 'ACME'},
+                }),
+            });
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain(convertToDisplayString(1234, CONST.CURRENCY.USD));
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should match for a currency-less card approval amount when both surfaces get the same formatter', async () => {
+            const {lhnText, searchText, searchOptionFound} = await computeBothSurfaces({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL, {
+                    originalMessage: {amount: 1234, merchant: 'ACME'},
+                }),
+            });
+            expect(searchOptionFound).toBe(true);
+            expect(lhnText).toContain(convertToDisplayStringWithoutCurrency(1234));
+            expect(searchText).toBe(lhnText);
+        });
+
+        it('should format the amount in the active locale when Search falls back to the built-in currency formatter', async () => {
+            const {lhnText, searchText} = await computeBothSurfaces({
+                lastAction: makeAction(CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL, {
+                    originalMessage: {amount: 1234, merchant: 'ACME'},
+                }),
+                useSearchCurrencyFallback: true,
+            });
+            // The test helper is pinned to `en`; the lib fallback follows IntlStore, so the two disagree on the decimal separator.
+            expect(lhnText).toContain('12.34');
+            expect(searchText).toContain('12,34');
+        });
+    });
+});
diff --git a/tests/unit/ListItemPressableTest.tsx b/tests/unit/ListItemPressableTest.tsx
index 763ffec7eb50..3771c1af1ed0 100644
--- a/tests/unit/ListItemPressableTest.tsx
+++ b/tests/unit/ListItemPressableTest.tsx
@@ -1,15 +1,23 @@
 import {fireEvent, render, screen} from '@testing-library/react-native';
 
 import ListItemComposed from '@components/SelectionList/ListItemComposed';
+import {useListItemHovered} from '@components/SelectionList/ListItemContext';
 
 import useHover from '@hooks/useHover';
 
 import CONST from '@src/CONST';
 
+import {View} from 'react-native';
+
 jest.mock('@hooks/useHover', () => jest.fn());
 
 const mockedUseHover = jest.mocked(useHover);
 
+function HoverProbe() {
+    const isHovered = useListItemHovered();
+    return <View testID={`hovered-${isHovered}`} />;
+}
+
 describe('ListItemPressable', () => {
     beforeEach(() => {
         mockedUseHover.mockReturnValue({hovered: false, deviceHasHoverSupport: true, bind: {onMouseEnter: jest.fn(), onMouseLeave: jest.fn()}});
@@ -120,4 +128,28 @@ describe('ListItemPressable', () => {
         );
         expect(screen.getByTestId(`${CONST.BASE_LIST_ITEM_TEST_ID}1`).props.accessibilityState).toEqual(expect.objectContaining({selected: true}));
     });
+
+    it.each([
+        [false, true],
+        [true, false],
+    ])('should report hover=%s to children through ListItemHoverContext when shouldDisableHoverStyle=%s', (expectedHovered, shouldDisableHoverStyle) => {
+        // Given the pointer is over the row
+        mockedUseHover.mockReturnValue({hovered: true, deviceHasHoverSupport: true, bind: {onMouseEnter: jest.fn(), onMouseLeave: jest.fn()}});
+
+        // When the row is rendered with or without hover styling disabled
+        render(
+            <ListItemComposed
+                item={{keyForList: '1'}}
+                onSelectRow={() => {}}
+                shouldShowTooltip={false}
+                isFocused={false}
+                shouldDisableHoverStyle={shouldDisableHoverStyle}
+            >
+                <HoverProbe />
+            </ListItemComposed>,
+        );
+
+        // Then children only see the hover when hover styling is enabled
+        expect(screen.getByTestId(`hovered-${expectedHovered}`)).toBeVisible();
+    });
 });
diff --git a/tests/unit/MerchantRuleTaxSummaryTest.ts b/tests/unit/MerchantRuleTaxSummaryTest.ts
new file mode 100644
index 000000000000..3214b54d5aa0
--- /dev/null
+++ b/tests/unit/MerchantRuleTaxSummaryTest.ts
@@ -0,0 +1,79 @@
+import {getMerchantRulesTableData} from '@libs/MerchantTypeRulesUtils';
+import {toIndexMap} from '@libs/RuleUtils';
+
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, Rule} from '@src/types/onyx';
+import type {ExpenseDefaultTaxValue} from '@src/types/onyx/ExpenseDefaultRules';
+
+import createRandomPolicy from '../utils/collections/policies';
+import {translateLocal} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+const {FIELD} = CONST.RULES.EXPENSE_DEFAULT;
+const {TRIGGERS: TRIGGER, ACTIONS: ACTION} = CONST.RULES;
+const TAX_KEY = 'id_TAX_RATE_1';
+
+/** A policy whose tax list either holds the rate the rule points at, or has not loaded it. */
+const buildPolicy = (taxes?: Record<string, {name: string; value: string}>): Policy => ({
+    ...createRandomPolicy(0),
+    id: 'policy1',
+    taxRates: {
+        name: 'Tax',
+        defaultExternalID: TAX_KEY,
+        defaultValue: '10%',
+        foreignTaxDefault: TAX_KEY,
+        taxes: taxes ?? {},
+    },
+});
+
+/**
+ * The rule stores whatever the rate was called when it was saved. `savedTaxRate` omitted models a rule
+ * saved before the policy's tax rates had loaded, which is when `buildTaxActionValue` writes no snapshot.
+ */
+const buildTaxRule = (savedTaxRate?: {name: string; value: string}): Rule => {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const taxValue: ExpenseDefaultTaxValue = {field_id_TAX: {externalID: TAX_KEY, ...(savedTaxRate ?? {})}};
+
+    return {
+        scope: CONST.RULES.SCOPE.POLICY,
+        scopeID: 'policy1',
+        triggers: toIndexMap([TRIGGER.CREATE_TRANSACTION]),
+        filters: {left: FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Coffee Shop'},
+        actions: toIndexMap([{name: ACTION.SET, field: FIELD.TAX, value: taxValue}]),
+    };
+};
+
+describe('Merchant rule tax summary', () => {
+    beforeEach(() => {
+        IntlStore.load(CONST.LOCALES.EN);
+        return waitForBatchedUpdates();
+    });
+
+    const describeRule = (policy: Policy, rule: Rule) =>
+        getMerchantRulesTableData({
+            policy,
+            policyID: policy.id,
+            rules: {[`${ONYXKEYS.COLLECTION.RULE}rule1`]: rule},
+            translate: translateLocal,
+            isOffline: false,
+            onNavigate: () => {},
+        }).at(0)?.ruleDescription;
+
+    describe('Expense defaults table', () => {
+        it('prefers the live rate over the one captured when the rule was saved', () => {
+            const policy = buildPolicy({[TAX_KEY]: {name: 'GST', value: '15%'}});
+
+            expect(describeRule(policy, buildTaxRule({name: 'Old GST', value: '10%'}))).toContain('Update tax to "GST (15%)"');
+        });
+
+        it('falls back to the saved rate when the policy no longer lists it', () => {
+            expect(describeRule(buildPolicy(), buildTaxRule({name: 'GST', value: '10%'}))).toContain('Update tax to "GST (10%)"');
+        });
+
+        it('falls back to the tax ID rather than dropping the default when there is no saved rate', () => {
+            expect(describeRule(buildPolicy(), buildTaxRule())).toContain(`Update tax to "${TAX_KEY}"`);
+        });
+    });
+});
diff --git a/tests/unit/ModifiedExpenseMessageTest.ts b/tests/unit/ModifiedExpenseMessageTest.ts
index cefce128dc82..9ea2bb7d8b38 100644
--- a/tests/unit/ModifiedExpenseMessageTest.ts
+++ b/tests/unit/ModifiedExpenseMessageTest.ts
@@ -390,6 +390,37 @@ describe('ModifiedExpenseMessage', () => {
             });
         });
 
+        describe('when confirming a failed-scan placeholder amount (oldAmount and oldCurrency both absent)', () => {
+            // Matches the actual shape returned by the backend for this edit (see #98783): only amount/currency are
+            // persisted, oldAmount/oldCurrency are never included since there's no real previous value to report.
+            const reportAction = {
+                ...createRandomReportAction(1),
+                actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+                originalMessage: {
+                    amount: 0,
+                    currency: CONST.CURRENCY.USD,
+                },
+            };
+
+            it('returns "set the amount" instead of falling back to the generic "changed the expense"', () => {
+                const expectedResult = 'set the amount to $0.00';
+
+                const result = getForReportAction({
+                    convertToDisplayString,
+                    translate: translateLocal,
+                    reportAction,
+                    policy: undefined,
+                    policyTags: undefined,
+                    currentUserLogin: CURRENT_USER_LOGIN,
+                    currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                    movedFromReportName: undefined,
+                    formatPhoneNumber,
+                });
+
+                expect(result).toEqual(expectedResult);
+            });
+        });
+
         describe('when the amount is set for the first time and the merchant is also set', () => {
             const reportAction = {
                 ...createRandomReportAction(1),
@@ -1053,6 +1084,35 @@ describe('ModifiedExpenseMessage', () => {
                 });
                 expect(result).toEqual(expectedResult);
             });
+
+            it('uses the current currency for the old amount when oldCurrency is missing', () => {
+                const reportActionWithoutOldCurrency = {
+                    ...createRandomReportAction(1),
+                    actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+                    originalMessage: {
+                        oldMerchant: '1.00 km @ €0.70 / km',
+                        merchant: '10.00 km @ €0.70 / km',
+                        oldAmount: 70,
+                        amount: 700,
+                        currency: CONST.CURRENCY.EUR,
+                    },
+                };
+                const expectedResult = `changed the distance to ${reportActionWithoutOldCurrency.originalMessage.merchant} (previously ${reportActionWithoutOldCurrency.originalMessage.oldMerchant}), which updated the amount to €7.00 (previously €0.70)`;
+
+                const result = getForReportAction({
+                    convertToDisplayString,
+                    translate: translateLocal,
+                    reportAction: reportActionWithoutOldCurrency,
+                    policy: undefined,
+                    policyTags: undefined,
+                    currentUserLogin: CURRENT_USER_LOGIN,
+                    currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                    movedFromReportName: undefined,
+                    formatPhoneNumber,
+                });
+
+                expect(result).toEqual(expectedResult);
+            });
         });
 
         describe('when the distance rate is changed', () => {
diff --git a/tests/unit/MoneyRequestReportShiftRangeTest.tsx b/tests/unit/MoneyRequestReportShiftRangeTest.tsx
new file mode 100644
index 000000000000..ba758083cadd
--- /dev/null
+++ b/tests/unit/MoneyRequestReportShiftRangeTest.tsx
@@ -0,0 +1,270 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useReportTransactionShiftRange from '@components/MoneyRequestReportView/useReportTransactionShiftRange';
+
+import CONST from '@src/CONST';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import createRandomTransaction from '../utils/collections/transaction';
+
+const REPORT_ID = '777';
+
+/** Errors the backend records are keyed by when they happened, and the latest one is the one read. */
+const REJECTED_AT = '1700000000000';
+
+function buildTransaction(transactionID: string, overrides: Partial<OnyxTypes.Transaction> = {}): OnyxTypes.Transaction {
+    return {...createRandomTransaction(Number(transactionID)), transactionID, reportID: REPORT_ID, ...overrides};
+}
+
+const rows = [buildTransaction('1'), buildTransaction('2'), buildTransaction('3'), buildTransaction('4')];
+
+/** Drives the hook the way the list does, holding the selection the component reads from context. */
+function renderShiftRange(initialTransactions: OnyxTypes.Transaction[] = rows) {
+    const state = {selectedTransactionIDs: [] as string[], transactions: initialTransactions, reportID: REPORT_ID};
+    const setSelectedTransactions = jest.fn((transactionIDs: string[]) => {
+        state.selectedTransactionIDs = transactionIDs;
+    });
+    const clearSelectedTransactions = jest.fn(() => {
+        state.selectedTransactionIDs = [];
+    });
+
+    const rendered = renderHook(() =>
+        useReportTransactionShiftRange({
+            reportID: state.reportID,
+            transactions: state.transactions,
+            selectedTransactionIDs: state.selectedTransactionIDs,
+            setSelectedTransactions,
+            clearSelectedTransactions,
+        }),
+    );
+
+    /** The hook reads the selection from its params, so a commit has to be handed back before the next gesture. */
+    const settle = () => rendered.rerender({});
+
+    return {...rendered, state, settle, setSelectedTransactions, clearSelectedTransactions};
+}
+
+describe('MoneyRequestReport shift+click', () => {
+    it('selects the rows between the clicked one and the last one clicked plainly', () => {
+        // Given the second row clicked plainly, which is the anchor the next click ranges from
+        const {result, state, settle} = renderShiftRange();
+        act(() => result.current.toggleTransaction('2'));
+        settle();
+
+        // When a shift+click lands two rows down
+        act(() => result.current.toggleTransaction('4', true));
+
+        // Then the rows between them come with it, which is the whole gesture
+        expect(state.selectedTransactionIDs).toEqual(['2', '3', '4']);
+    });
+
+    it('gives back the rows a shrinking range no longer covers', () => {
+        // Given a range painted from the first row to the fourth
+        const {result, state, settle} = renderShiftRange();
+        act(() => result.current.toggleTransaction('1'));
+        settle();
+        act(() => result.current.toggleTransaction('4', true));
+        settle();
+
+        // When the endpoint is pulled back to the second
+        act(() => result.current.toggleTransaction('2', true));
+
+        // Then the rows it no longer covers are given back, so an overshoot takes one click to undo
+        expect(state.selectedTransactionIDs).toEqual(['1', '2']);
+    });
+
+    it('leaves a row being deleted out of the range it spans', () => {
+        // Given a list whose middle row is on its way out
+        const withDeleted = [rows.at(0), buildTransaction('2', {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}), rows.at(2)].filter((row) => !!row);
+        const {result, state, settle} = renderShiftRange(withDeleted);
+
+        // When a range spans across it
+        act(() => result.current.toggleTransaction('1'));
+        settle();
+        act(() => result.current.toggleTransaction('3', true));
+
+        // Then it is skipped, since its own checkbox is disabled
+        expect(state.selectedTransactionIDs).toEqual(['1', '3']);
+    });
+
+    it('leaves a row the backend rejected out of the range it spans, since its checkbox is disabled too', () => {
+        // Given a list whose middle row carries a reject the backend recorded against it
+        const withRejected = [rows.at(0), buildTransaction('2', {errorFields: {reject: {[REJECTED_AT]: 'iou.rejectReport.couldNotRejectExpense'}}}), rows.at(2)].filter((row) => !!row);
+        const {result, state, settle} = renderShiftRange(withRejected);
+
+        // When a range spans across it
+        act(() => result.current.toggleTransaction('1'));
+        settle();
+        act(() => result.current.toggleTransaction('3', true));
+
+        // Then it is skipped, rather than a range checking what a click cannot
+        expect(state.selectedTransactionIDs).toEqual(['1', '3']);
+    });
+
+    it('runs a cold shift+click from the top of the list, since nothing is selected for it to anchor on', () => {
+        // Given nothing selected and no row clicked yet
+        const {result, state} = renderShiftRange();
+
+        // When the first gesture of all is a shift+click
+        act(() => result.current.toggleTransaction('3', true));
+
+        // Then it ranges from the first selectable row, which is what Excel, Sheets and Finder do
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3']);
+    });
+
+    it('toggles one row off without disturbing the rest', () => {
+        // Given a range painted across three rows
+        const {result, state, settle} = renderShiftRange();
+        act(() => result.current.toggleTransaction('1'));
+        settle();
+        act(() => result.current.toggleTransaction('3', true));
+        settle();
+
+        // When one of them is clicked plainly
+        act(() => result.current.toggleTransaction('2'));
+
+        // Then only that row changes, since a plain click is a toggle and not a range
+        expect(state.selectedTransactionIDs).toEqual(['1', '3']);
+    });
+
+    it('narrows a group selected from its header, since the header records it as a block', () => {
+        // Given a group selected from its header, which records those rows as one block
+        const {result, state, settle} = renderShiftRange();
+        act(() => result.current.toggleGroup(['1', '2', '3']));
+        settle();
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3']);
+
+        // When a shift+click lands inside it
+        act(() => result.current.toggleTransaction('2', true));
+
+        // Then the block narrows onto the span, rather than the click only ever adding
+        expect(state.selectedTransactionIDs).toEqual(['1', '2']);
+    });
+
+    it('drops the block when a group is deselected, so a later shift+click cannot collapse onto it', () => {
+        // Given a group selected from its header and then deselected again
+        const {result, state, settle} = renderShiftRange();
+        act(() => result.current.toggleGroup(['1', '2', '3']));
+        settle();
+        act(() => result.current.toggleGroup(['1', '2', '3']));
+        settle();
+        expect(state.selectedTransactionIDs).toEqual([]);
+
+        // When the next shift+click lands
+        act(() => result.current.toggleTransaction('3', true));
+
+        // Then it runs from the top, since deselecting a group paints no block for a later click to collapse onto
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3']);
+    });
+
+    it('writes nothing for a group with no row it can act on, and leaves the block a later shift+click narrows', () => {
+        const {result, state, settle, setSelectedTransactions} = renderShiftRange();
+
+        // Given a Select All, which seeds the block the next shift+click collapses
+        act(() => result.current.toggleAll(['1', '2', '3', '4']));
+        settle();
+        setSelectedTransactions.mockClear();
+
+        // When a group header is pressed whose rows are all unselectable
+        act(() => result.current.toggleGroup([]));
+        settle();
+
+        // Then nothing is written, rather than a new list of the same rows re-rendering every row
+        expect(setSelectedTransactions).not.toHaveBeenCalled();
+
+        // And the Select All block is still what the next shift+click narrows
+        act(() => result.current.toggleTransaction('2', true));
+
+        expect(state.selectedTransactionIDs).toEqual(['1', '2']);
+    });
+
+    it('collapses a Select All onto the span the next shift+click lands in', () => {
+        // Given Select All, which records the whole list as the block to narrow
+        const {result, state, settle} = renderShiftRange();
+        act(() => result.current.toggleAll(['1', '2', '3', '4']));
+        settle();
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3', '4']);
+
+        // When a shift+click lands on the second row
+        act(() => result.current.toggleTransaction('2', true));
+
+        // Then the selection narrows onto it, which is what makes an overshoot recoverable in one click
+        expect(state.selectedTransactionIDs).toEqual(['1', '2']);
+    });
+
+    it('clears through the clearing action rather than an empty write, and forgets the session with it', () => {
+        // Given every row selected
+        const {result, state, settle, clearSelectedTransactions} = renderShiftRange();
+        act(() => result.current.toggleAll(['1', '2', '3', '4']));
+        settle();
+
+        // When Select All is pressed again
+        act(() => result.current.toggleAll(['1', '2', '3', '4']));
+        settle();
+
+        // Then it clears through the action that owns clearing, rather than writing an empty list past it
+        expect(clearSelectedTransactions).toHaveBeenCalledWith(true);
+
+        // The full-list block went with it, so the next click runs from the top rather than collapsing onto itself
+        act(() => result.current.toggleTransaction('3', true));
+
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3']);
+    });
+
+    it('forgets the session when the list is reused for the next report, so a range cannot shrink across the change', () => {
+        const {result, state, settle, rerender} = renderShiftRange();
+
+        // Given a range painted across every row, which is what a shrink would give back
+        act(() => result.current.toggleTransaction('1'));
+        settle();
+        act(() => result.current.toggleTransaction('4', true));
+        settle();
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3', '4']);
+
+        // When the list is handed the next report
+        state.reportID = '888';
+        rerender({});
+
+        // Then the click that would have shrunk that range keeps every row, since the session it would shrink is gone
+        act(() => result.current.toggleTransaction('2', true));
+
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3', '4']);
+    });
+
+    it('forgets the session when the selection is cleared from outside the list, as the toolbar and bulk actions do', () => {
+        const {result, state, settle, rerender} = renderShiftRange();
+
+        // Given the last row clicked plainly, which becomes the anchor
+        act(() => result.current.toggleTransaction('3'));
+        settle();
+
+        // When something outside the hook clears the selection
+        state.selectedTransactionIDs = [];
+        rerender({});
+
+        // Then a shift+click runs from the top of the list, rather than from the row clicked before the clear
+        act(() => result.current.toggleTransaction('1', true));
+
+        expect(state.selectedTransactionIDs).toEqual(['1']);
+    });
+
+    it('gives nothing back when the selection was written from somewhere else, such as the toolbar’s Select All', () => {
+        const {result, state, settle, rerender} = renderShiftRange();
+
+        // Given a range this session painted across the first three rows
+        act(() => result.current.toggleTransaction('1'));
+        settle();
+        act(() => result.current.toggleTransaction('3', true));
+        settle();
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3']);
+
+        // When something outside the list replaces the selection, here by selecting every row
+        state.selectedTransactionIDs = ['1', '2', '3', '4'];
+        rerender({});
+
+        // Then the next shift+click keeps every row, rather than giving back rows the session painted before that write
+        act(() => result.current.toggleTransaction('2', true));
+
+        expect(state.selectedTransactionIDs).toEqual(['1', '2', '3', '4']);
+    });
+});
diff --git a/tests/unit/MoneyRequestReportUtilsTest.ts b/tests/unit/MoneyRequestReportUtilsTest.ts
index 43f3176a73fe..3da3991823ea 100644
--- a/tests/unit/MoneyRequestReportUtilsTest.ts
+++ b/tests/unit/MoneyRequestReportUtilsTest.ts
@@ -1,9 +1,15 @@
 import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
 
-import {getReportIDForTransaction, isBillableEnabledOnPolicy, shouldWaitForTransactions} from '@libs/MoneyRequestReportUtils';
+import {
+    getReportIDForTransaction,
+    isBillableEnabledOnPolicy,
+    isEveryReportTransactionSelected,
+    isSelectableReportTransaction,
+    shouldWaitForTransactions,
+} from '@libs/MoneyRequestReportUtils';
 
 import CONST from '@src/CONST';
-import type {Policy, Report, ReportAction, ReportLoadingState} from '@src/types/onyx';
+import type {Policy, Report, ReportAction, ReportLoadingState, Transaction} from '@src/types/onyx';
 
 import createMock from '../utils/createMock';
 
@@ -119,6 +125,9 @@ const transactionItemBaseMock: TransactionListItemType = {
     violations: [],
 };
 
+/** Errors the backend records are keyed by when they happened. */
+const REJECTED_AT = '1700000000000';
+
 describe('MoneyRequestReportUtils', () => {
     describe('getReportIDForTransaction', () => {
         it('returns transaction thread ID if its not from one transaction report', () => {
@@ -176,6 +185,69 @@ describe('MoneyRequestReportUtils', () => {
         });
     });
 
+    describe('isSelectableReportTransaction', () => {
+        test('accepts an ordinary expense, which is what a click, Select All and a range all reach', () => {
+            // Given an expense with nothing against it
+            const transaction = createMock<Transaction>({transactionID: '1'});
+
+            // When the list asks whether anything may select it
+            // Then it counts as selectable
+            expect(isSelectableReportTransaction(transaction)).toBe(true);
+        });
+
+        test('refuses an expense being deleted, since its checkbox is disabled', () => {
+            // Given an expense the user has deleted, still on screen until the server drops it
+            const transaction = createMock<Transaction>({transactionID: '1', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE});
+
+            // When the list asks whether anything may select it
+            // Then nothing may select it
+            expect(isSelectableReportTransaction(transaction)).toBe(false);
+        });
+
+        test('refuses an expense the backend rejected, whose checkbox is disabled for the same reason', () => {
+            // Given an expense carrying a reject the backend recorded against it
+            const transaction = createMock<Transaction>({transactionID: '1', errorFields: {reject: {[REJECTED_AT]: 'iou.rejectReport.couldNotRejectExpense'}}});
+
+            // When the list asks whether anything may select it
+            // Then nothing may select it, so Select All and a range agree with the checkbox
+            expect(isSelectableReportTransaction(transaction)).toBe(false);
+        });
+    });
+
+    describe('isEveryReportTransactionSelected', () => {
+        const ordinary = createMock<Transaction>({transactionID: '1'});
+        const other = createMock<Transaction>({transactionID: '2'});
+        const rejected = createMock<Transaction>({transactionID: '3', errorFields: {reject: {[REJECTED_AT]: 'iou.rejectReport.couldNotRejectExpense'}}});
+
+        test('counts a report covered once every row Select All can write is selected', () => {
+            // Given a report whose third expense the backend refused to reject, so no checkbox can put it in the selection
+            // When the other two are selected, which is everything Select All writes
+            // Then the report reads covered, or the report-level actions would be unreachable on it for good
+            expect(isEveryReportTransactionSelected([ordinary, other, rejected], ['1', '2'])).toBe(true);
+        });
+
+        test('does not count a report while a row the user can still check is out', () => {
+            // Given the same report
+            // When only one of its two selectable rows is selected
+            // Then it does not read covered, since a checkbox is left the user has not pressed
+            expect(isEveryReportTransactionSelected([ordinary, other, rejected], ['1'])).toBe(false);
+        });
+
+        test('does not count an empty selection, whichever rows the report holds', () => {
+            // Given a report of two ordinary expenses
+            // When nothing is selected
+            // Then the report is not covered, so pressing nothing cannot offer an action over everything
+            expect(isEveryReportTransactionSelected([ordinary, other], [])).toBe(false);
+        });
+
+        test('does not count a report holding no row anything can select', () => {
+            // Given a report whose only expense carries a refused reject
+            // When a selection is left holding its ID
+            // Then it does not read covered: `every` over an empty list is vacuously true, which would offer the actions on nothing
+            expect(isEveryReportTransactionSelected([rejected], ['3'])).toBe(false);
+        });
+    });
+
     describe('shouldWaitForTransactions', () => {
         const zeroTotalReport = {...reportBaseMock, total: 0};
 
diff --git a/tests/unit/MoveFilesOutOfDocumentsTest.ts b/tests/unit/MoveFilesOutOfDocumentsTest.ts
index 0f92417f8531..2d7554870b63 100644
--- a/tests/unit/MoveFilesOutOfDocumentsTest.ts
+++ b/tests/unit/MoveFilesOutOfDocumentsTest.ts
@@ -165,18 +165,10 @@ describe('MoveFilesOutOfDocuments migration (native)', () => {
         await expect(MoveFilesOutOfDocuments()).resolves.toBeUndefined();
     });
 
-    it('keeps the native database migration patch in sync with the database name', () => {
-        const patchDir = path.resolve(__dirname, '../../patches/react-native-nitro-sqlite');
-        const patchFileName = fs.readdirSync(patchDir).find((fileName) => fileName.includes('store-database-outside-documents'));
-        expect(patchFileName).toBeDefined();
-        const patchContent = fs.readFileSync(path.join(patchDir, String(patchFileName)), 'utf8');
-
-        // The patch migrates database files by name at app startup, before any JS runs, so the
-        // name is hardcoded there. If the database the app opens is ever renamed, the patch (and
-        // this test) must be updated with it, or the migration would silently strand user data.
-        expect(patchContent).toContain(`@"${CONST.DEFAULT_DB_NAME}"`);
-
-        const sqliteProviderContent = fs.readFileSync(path.resolve(__dirname, '../../node_modules/react-native-onyx/dist/storage/providers/SQLiteProvider.js'), 'utf8');
-        expect(sqliteProviderContent).toContain(`'${CONST.DEFAULT_DB_NAME}'`);
+    it('keeps iOS NitroSQLite databases in Application Support', () => {
+        const infoPlist = fs.readFileSync(path.resolve(__dirname, '../../ios/NewExpensify/Info.plist'), 'utf8');
+
+        // Without this opt-in, NitroSQLite stores OnyxDB in the user-visible Documents directory.
+        expect(infoPlist).toMatch(/<key>RNNitroSQLite_DatabaseLocation<\/key>\s*<string>ApplicationSupport<\/string>/);
     });
 });
diff --git a/tests/unit/MoveSearchQueryByHashToSnapshotsTest.ts b/tests/unit/MoveSearchQueryByHashToSnapshotsTest.ts
new file mode 100644
index 000000000000..6bd11ffcda62
--- /dev/null
+++ b/tests/unit/MoveSearchQueryByHashToSnapshotsTest.ts
@@ -0,0 +1,67 @@
+/* eslint-disable @typescript-eslint/no-deprecated -- exercising the migration means writing SEARCH_QUERY_BY_HASH */
+import MoveSearchQueryByHashToSnapshots from '@libs/migrations/MoveSearchQueryByHashToSnapshots';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+import getOnyxValue from '../utils/getOnyxValue';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+const CACHED_HASH = 111;
+const TAGGED_HASH = 222;
+const EVICTED_HASH = 333;
+
+/** Only the snapshot's search metadata matters to the migration. */
+function seedSnapshot(hash: number, inputQuery?: string) {
+    return Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`, {search: {hash, offset: 0, ...(inputQuery && {inputQuery})}, data: {}});
+}
+
+describe('MoveSearchQueryByHashToSnapshots', () => {
+    beforeAll(() => Onyx.init({keys: ONYXKEYS}));
+    beforeEach(() => Onyx.clear().then(waitForBatchedUpdates));
+
+    it('copies legacy queries onto cached snapshots and removes the legacy key', async () => {
+        // Given a snapshot cached by an older version, whose query only lives in the legacy map
+        await seedSnapshot(CACHED_HASH);
+        await Onyx.set(ONYXKEYS.SEARCH_QUERY_BY_HASH, {[CACHED_HASH]: 'type:expense from:1'});
+
+        // When the migration runs
+        await MoveSearchQueryByHashToSnapshots();
+        await waitForBatchedUpdates();
+
+        // Then the snapshot carries its query, so optimistic expenses keep reaching it, and the legacy key is gone
+        const snapshot = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${CACHED_HASH}`);
+        expect(snapshot?.search?.inputQuery).toBe('type:expense from:1');
+        expect(await getOnyxValue(ONYXKEYS.SEARCH_QUERY_BY_HASH)).toBeUndefined();
+    });
+
+    it('keeps a query the snapshot already recorded and creates no snapshot for evicted hashes', async () => {
+        // Given one snapshot that already recorded its query, and a legacy entry whose snapshot was evicted
+        await seedSnapshot(TAGGED_HASH, 'type:expense from:2');
+        await Onyx.set(ONYXKEYS.SEARCH_QUERY_BY_HASH, {[TAGGED_HASH]: 'type:expense stale', [EVICTED_HASH]: 'type:expense from:3'});
+
+        // When the migration runs
+        await MoveSearchQueryByHashToSnapshots();
+        await waitForBatchedUpdates();
+
+        // Then the newer recorded query wins, and no partial snapshot is created for the evicted hash
+        const taggedSnapshot = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${TAGGED_HASH}`);
+        expect(taggedSnapshot?.search?.inputQuery).toBe('type:expense from:2');
+        expect(await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${EVICTED_HASH}`)).toBeUndefined();
+        expect(await getOnyxValue(ONYXKEYS.SEARCH_QUERY_BY_HASH)).toBeUndefined();
+    });
+
+    it('writes nothing when the legacy key is absent', async () => {
+        // Given a snapshot and no legacy map, as on a fresh install
+        await seedSnapshot(CACHED_HASH);
+
+        // When the migration runs
+        await MoveSearchQueryByHashToSnapshots();
+        await waitForBatchedUpdates();
+
+        // Then the snapshot is left as it was
+        const snapshot = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${CACHED_HASH}`);
+        expect(snapshot?.search?.inputQuery).toBeUndefined();
+    });
+});
diff --git a/tests/unit/NativePDFViewTest.tsx b/tests/unit/NativePDFViewTest.tsx
new file mode 100644
index 000000000000..0e5dd0665517
--- /dev/null
+++ b/tests/unit/NativePDFViewTest.tsx
@@ -0,0 +1,100 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import PDFView from '@components/PDFView/index.native';
+
+import {openTravelDotLink} from '@libs/openTravelDotLink';
+
+import type {PdfProps} from 'react-native-pdf';
+
+import React from 'react';
+import {Linking} from 'react-native';
+
+jest.mock('react-native-pdf', () => {
+    const ReactModule = jest.requireActual<typeof React>('react');
+    return function MockPDF({onPressLink}: PdfProps) {
+        return ReactModule.createElement('PDF', {testID: 'pdf', onPressLink});
+    };
+});
+
+jest.mock('@components/KeyboardAvoidingView', () => () => null);
+jest.mock('@components/LoadingIndicator', () => () => null);
+jest.mock('@components/Pressable/PressableWithoutFeedback', () => () => null);
+jest.mock('@components/PDFView/PDFPasswordForm', () => () => null);
+jest.mock('@hooks/useKeyboardState', () => ({__esModule: true, default: () => ({isKeyboardShown: false})}));
+jest.mock('@hooks/useLocalize', () => ({__esModule: true, default: () => ({translate: (key: string) => key})}));
+jest.mock('@hooks/useOnyx', () => ({__esModule: true, default: () => ['123']}));
+jest.mock('@hooks/useResponsiveLayout', () => ({__esModule: true, default: () => ({shouldUseNarrowLayout: true})}));
+jest.mock('@hooks/useSafeAreaPaddings', () => ({__esModule: true, default: () => ({insets: {top: 0, bottom: 0, left: 0, right: 0}})}));
+jest.mock('@hooks/useStyleUtils', () => ({__esModule: true, default: () => ({getPDFViewStyle: () => ({})})}));
+jest.mock('@hooks/useThemeStyles', () => ({__esModule: true, default: () => ({})}));
+jest.mock('@hooks/useWindowDimensions', () => ({__esModule: true, default: () => ({windowWidth: 400, windowHeight: 800})}));
+jest.mock('@libs/openTravelDotLink', () => ({openTravelDotLink: jest.fn()}));
+
+describe('native PDF annotation links', () => {
+    let openURLSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        openURLSpy = jest.spyOn(Linking, 'openURL').mockResolvedValue(undefined);
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it.each([
+        'new-expensify://transition',
+        'new-expensify://transition?email=stranger@example.com',
+        'https://new.expensify.com/transition',
+        // eslint-disable-next-line no-script-url -- Verify that untrusted script annotations are rejected.
+        'javascript:alert(1)',
+    ])('does not open annotation URL %s', (url) => {
+        // Given a PDF rendered in the native attachment viewer
+        render(
+            <PDFView
+                sourceURL="https://example.com/receipt.pdf"
+                onLoadComplete={jest.fn()}
+            />,
+        );
+
+        // When the reader presses an unsafe annotation
+        fireEvent(screen.getByTestId('pdf'), 'pressLink', url);
+
+        // Then neither operating-system nor travel navigation is triggered
+        expect(openURLSpy).not.toHaveBeenCalled();
+        expect(openTravelDotLink).not.toHaveBeenCalled();
+    });
+
+    it('opens an external web annotation', () => {
+        // Given a PDF rendered in the native attachment viewer
+        render(
+            <PDFView
+                sourceURL="https://example.com/receipt.pdf"
+                onLoadComplete={jest.fn()}
+            />,
+        );
+
+        // When the reader presses an external web link
+        fireEvent(screen.getByTestId('pdf'), 'pressLink', 'https://example.com/receipt');
+
+        // Then the existing URL-opening behavior is preserved
+        expect(openURLSpy).toHaveBeenCalledWith('https://example.com/receipt');
+    });
+
+    it('preserves authenticated travel links', () => {
+        // Given a PDF rendered with an active workspace
+        render(
+            <PDFView
+                sourceURL="https://example.com/receipt.pdf"
+                onLoadComplete={jest.fn()}
+            />,
+        );
+
+        // When the reader presses an external travel link
+        fireEvent(screen.getByTestId('pdf'), 'pressLink', 'https://travel.expensify.com/trips/123');
+
+        // Then the existing travel authentication flow is used
+        expect(openTravelDotLink).toHaveBeenCalledWith('123', '/trips/123');
+        expect(openURLSpy).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/Navigation/createScheduleOnceTest.ts b/tests/unit/Navigation/createScheduleOnceTest.ts
new file mode 100644
index 000000000000..b84a3b2e77ac
--- /dev/null
+++ b/tests/unit/Navigation/createScheduleOnceTest.ts
@@ -0,0 +1,22 @@
+import createScheduleOnce from '@libs/Navigation/helpers/createScheduleOnce';
+
+describe('createScheduleOnce', () => {
+    it('coalesces pending calls and can schedule again after the callback runs', async () => {
+        const run = jest.fn();
+        const schedule = createScheduleOnce(run);
+
+        schedule();
+        schedule();
+
+        expect(run).not.toHaveBeenCalled();
+
+        await Promise.resolve();
+
+        expect(run).toHaveBeenCalledTimes(1);
+
+        schedule();
+        await Promise.resolve();
+
+        expect(run).toHaveBeenCalledTimes(2);
+    });
+});
diff --git a/tests/unit/Navigation/guards/MigratedUserWelcomeModalGuard.test.ts b/tests/unit/Navigation/guards/MigratedUserWelcomeModalGuard.test.ts
index e2c02b04c28f..bb0291812b0d 100644
--- a/tests/unit/Navigation/guards/MigratedUserWelcomeModalGuard.test.ts
+++ b/tests/unit/Navigation/guards/MigratedUserWelcomeModalGuard.test.ts
@@ -2,10 +2,13 @@ import MigratedUserWelcomeModalGuard, {onSessionOrLoadingAppChanged, resetDismis
 import type {GuardContext} from '@libs/Navigation/guards/types';
 import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute';
 
+import clearOnyxAndSeedFullReconnect from '@userActions/clearOnyxAndSeedFullReconnect';
+
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
 import type {NavigationAction, NavigationState} from '@react-navigation/native';
@@ -17,11 +20,12 @@ import waitForBatchedUpdates from '../../../utils/waitForBatchedUpdates';
 const migratedUserWelcomeRoute = createDynamicRoute(DYNAMIC_ROUTES.MIGRATED_USER_WELCOME.path, ROUTES.HOME);
 
 const mockNavigate = jest.fn();
+let mockActiveRoute: Route = ROUTES.HOME;
 jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: (...args: unknown[]) => {
         mockNavigate(...args);
     },
-    getActiveRoute: () => 'home',
+    getActiveRoute: () => mockActiveRoute,
 }));
 
 describe('MigratedUserWelcomeModalGuard', () => {
@@ -53,6 +57,7 @@ describe('MigratedUserWelcomeModalGuard', () => {
         onSessionOrLoadingAppChanged(undefined, true);
         resetSessionFlag();
         mockNavigate.mockClear();
+        mockActiveRoute = ROUTES.HOME;
         await Onyx.clear();
         await waitForBatchedUpdates();
     });
@@ -420,10 +425,67 @@ describe('MigratedUserWelcomeModalGuard', () => {
 
             // Now signal that session is ready and app is done loading
             onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, false);
+            await waitForBatchedUpdates();
+
+            expect(mockNavigate).toHaveBeenCalledWith(migratedUserWelcomeRoute);
+        });
+
+        it('should use a valid base when the active route cannot host the modal', async () => {
+            mockActiveRoute = ROUTES.SETTINGS_TROUBLESHOOT;
+            await Onyx.merge(ONYXKEYS.NVP_TRY_NEW_DOT, {
+                nudgeMigration: {
+                    timestamp: new Date(),
+                    cohort: 'test',
+                },
+            });
+            await waitForBatchedUpdates();
+            mockNavigate.mockClear();
+
+            onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, false);
+            await waitForBatchedUpdates();
 
             expect(mockNavigate).toHaveBeenCalledWith(migratedUserWelcomeRoute);
         });
 
+        it('should not navigate while cleared Onyx data is reloading', async () => {
+            // Given an eligible migrated user who dismissed the welcome modal before the app finished loading.
+            const session = {authToken: 'test-token', accountID: 123};
+            mockActiveRoute = ROUTES.SETTINGS_TROUBLESHOOT;
+            await Onyx.merge(ONYXKEYS.NVP_TRY_NEW_DOT, {
+                nudgeMigration: {
+                    timestamp: new Date(),
+                    cohort: 'test',
+                },
+            });
+            await Onyx.merge(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {
+                migratedUserWelcomeModal: {
+                    timestamp: new Date().toISOString(),
+                    dismissedMethod: 'click',
+                },
+            });
+            await Onyx.set(ONYXKEYS.IS_LOADING_APP, false);
+            await waitForBatchedUpdates();
+            onSessionOrLoadingAppChanged(session, false);
+            mockNavigate.mockClear();
+
+            const loadingAppConnection = Onyx.connect({
+                key: ONYXKEYS.IS_LOADING_APP,
+                callback: (isLoadingApp) => onSessionOrLoadingAppChanged(session, isLoadingApp ?? true),
+            });
+
+            // When a full reconnect starts and clears the dismissed state. Preserve migration eligibility
+            // so this test isolates whether the helper raises the loading gate before the clear callbacks.
+            try {
+                await clearOnyxAndSeedFullReconnect([ONYXKEYS.IS_LOADING_APP, ONYXKEYS.NVP_TRY_NEW_DOT]);
+                await waitForBatchedUpdates();
+            } finally {
+                Onyx.disconnect(loadingAppConnection);
+            }
+
+            // Then the guard must not navigate using the transient post-clear state.
+            expect(mockNavigate).not.toHaveBeenCalled();
+        });
+
         it('should not navigate when app is still loading', async () => {
             await Onyx.merge(ONYXKEYS.NVP_TRY_NEW_DOT, {
                 nudgeMigration: {
@@ -435,6 +497,7 @@ describe('MigratedUserWelcomeModalGuard', () => {
             mockNavigate.mockClear();
 
             onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, true);
+            await waitForBatchedUpdates();
 
             expect(mockNavigate).not.toHaveBeenCalled();
         });
@@ -468,6 +531,7 @@ describe('MigratedUserWelcomeModalGuard', () => {
             mockNavigate.mockClear();
 
             onSessionOrLoadingAppChanged(undefined, false);
+            await waitForBatchedUpdates();
 
             expect(mockNavigate).not.toHaveBeenCalled();
         });
@@ -480,6 +544,7 @@ describe('MigratedUserWelcomeModalGuard', () => {
             mockNavigate.mockClear();
 
             onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, false);
+            await waitForBatchedUpdates();
 
             expect(mockNavigate).not.toHaveBeenCalled();
         });
@@ -501,6 +566,7 @@ describe('MigratedUserWelcomeModalGuard', () => {
             mockNavigate.mockClear();
 
             onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, false);
+            await waitForBatchedUpdates();
 
             expect(mockNavigate).not.toHaveBeenCalled();
         });
@@ -517,6 +583,7 @@ describe('MigratedUserWelcomeModalGuard', () => {
 
             onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, false);
             onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, false);
+            await waitForBatchedUpdates();
 
             expect(mockNavigate).toHaveBeenCalledTimes(1);
         });
@@ -524,6 +591,7 @@ describe('MigratedUserWelcomeModalGuard', () => {
         it('should navigate via Onyx NVP_DISMISSED_PRODUCT_TRAINING callback when session is already set', async () => {
             // Set session first
             onSessionOrLoadingAppChanged({authToken: 'test-token', accountID: 123}, false);
+            await waitForBatchedUpdates();
             mockNavigate.mockClear();
 
             // Set up nudge migration and dismissed product training (modal not dismissed)
diff --git a/tests/unit/Navigation/linkingConfigSubscribeTest.ts b/tests/unit/Navigation/linkingConfigSubscribeTest.ts
index d8bc2a91132d..3fb67b066245 100644
--- a/tests/unit/Navigation/linkingConfigSubscribeTest.ts
+++ b/tests/unit/Navigation/linkingConfigSubscribeTest.ts
@@ -1,9 +1,11 @@
-import {hasAuthToken} from '@libs/actions/Session';
+import type * as CurrentUserStore from '@libs/CurrentUserStore';
+import {hasAuthToken} from '@libs/CurrentUserStore';
 import subscribe from '@libs/Navigation/linkingConfig/subscribe';
 
 import {Linking} from 'react-native';
 
-jest.mock('@libs/actions/Session', () => ({
+jest.mock('@libs/CurrentUserStore', () => ({
+    ...jest.requireActual<typeof CurrentUserStore>('@libs/CurrentUserStore'),
     hasAuthToken: jest.fn(),
 }));
 
diff --git a/tests/unit/NetworkTest.tsx b/tests/unit/NetworkTest.tsx
index 244936663f98..ed195350fdc0 100644
--- a/tests/unit/NetworkTest.tsx
+++ b/tests/unit/NetworkTest.tsx
@@ -1,6 +1,6 @@
 import {reconnectApp} from '@libs/actions/App';
 import * as Reconnect from '@libs/actions/Reconnect';
-import {AUTHENTICATION_COMMAND} from '@libs/API/types';
+import {AUTHENTICATION_COMMAND, SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
 import {reset as resetFailureTracker} from '@libs/FailureTracker';
 import {resetReauthentication} from '@libs/Middleware/Reauthentication';
 
@@ -152,8 +152,7 @@ describe('NetworkTests', () => {
 
         // 2. Mock Setup Phase - Configure XHR mocks for the test sequence
         const mockedXhr = jest
-            .spyOn(HttpUtils, 'xhr')
-            .mockReset()
+            .fn<ReturnType<typeof HttpUtils.xhr>, Parameters<typeof HttpUtils.xhr>>()
             // First call: Return NOT_AUTHENTICATED to trigger reauthentication
             .mockImplementationOnce(() =>
                 Promise.resolve({
@@ -163,6 +162,11 @@ describe('NetworkTests', () => {
             // Second call: Return a pending promise that we'll resolve later
             .mockImplementationOnce(() => pendingAuthRequest);
 
+        // LoadPersonalDetails bypasses the queue and would otherwise consume the mocks above
+        jest.spyOn(HttpUtils, 'xhr')
+            .mockReset()
+            .mockImplementation((...args) => (args[0] === SIDE_EFFECT_REQUEST_COMMANDS.LOAD_PERSONAL_DETAILS ? Promise.resolve({jsonCode: CONST.JSON_CODE.SUCCESS}) : mockedXhr(...args)));
+
         // 3. Test Execution Phase - Start with online network
         setHasRadio(true);
         await waitForBatchedUpdates();
diff --git a/tests/unit/NoDirectPersonalDetailsListRuleTest.ts b/tests/unit/NoDirectPersonalDetailsListRuleTest.ts
index 4763d024c0ab..bd7990886e6c 100644
--- a/tests/unit/NoDirectPersonalDetailsListRuleTest.ts
+++ b/tests/unit/NoDirectPersonalDetailsListRuleTest.ts
@@ -52,6 +52,10 @@ describe('no-direct-personal-details-list', () => {
             'const key = SOME_OTHER_KEYS.PERSONAL_DETAILS_LIST;',
             // Only known at runtime, so there is nothing to resolve statically.
             'const key = ONYXKEYS[PERSONAL_DETAILS_LIST];',
+            // Building a search snapshot payload names its personal details field, it does not touch the Onyx key.
+            'snapshotData[ONYXKEYS.PERSONAL_DETAILS_LIST] = personalDetails;',
+            'Object.assign(data, {[ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails});',
+            'const update = {key: snapshotKey, value: {data: {[ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails}}};',
         ],
         invalid: [
             {
@@ -86,6 +90,18 @@ describe('no-direct-personal-details-list', () => {
                 code: 'const masks = {[ONYXKEYS.PERSONAL_DETAILS_LIST]: {allowList: []}};',
                 errors: [{messageId: 'directUsage'}],
             },
+            {
+                code: 'const personalDetails = snapshotData[ONYXKEYS.PERSONAL_DETAILS_LIST];',
+                errors: [{messageId: 'directUsage'}],
+            },
+            {
+                code: 'Onyx.multiSet({[ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails});',
+                errors: [{messageId: 'directUsage'}],
+            },
+            {
+                code: 'Object.assign({[ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails}, rest);',
+                errors: [{messageId: 'directUsage'}],
+            },
             {
                 // Reported per usage, so the seatbelt count is per usage too.
                 code: 'const [all] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST); Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {});',
diff --git a/tests/unit/OnyxDerived/oneOnOneChatReportIDsTest.ts b/tests/unit/OnyxDerived/oneOnOneChatReportIDsTest.ts
new file mode 100644
index 000000000000..7060e845cfe2
--- /dev/null
+++ b/tests/unit/OnyxDerived/oneOnOneChatReportIDsTest.ts
@@ -0,0 +1,156 @@
+import oneOnOneChatReportIDsConfig from '@libs/actions/OnyxDerived/configs/oneOnOneChatReportIDs';
+import {buildParticipantsFromAccountIDs, getParticipantsChatKey} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report, Session} from '@src/types/onyx';
+
+import type {OnyxCollection} from 'react-native-onyx';
+
+const ME = 1;
+const ALICE = 2;
+const BOB = 3;
+
+const session: Session = {accountID: ME};
+
+function chatWith(reportID: string, otherAccountID: number): Report {
+    return {
+        reportID,
+        type: CONST.REPORT.TYPE.CHAT,
+        participants: buildParticipantsFromAccountIDs([ME, otherAccountID]),
+    };
+}
+
+function collection(...reports: Report[]): OnyxCollection<Report> {
+    return Object.fromEntries(reports.map((report) => [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report]));
+}
+
+function delta(...reports: Array<[string, Report | undefined]>) {
+    return {
+        [ONYXKEYS.COLLECTION.REPORT]: Object.fromEntries(reports.map(([reportID, report]) => [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, report])),
+    };
+}
+
+function index(reportIDs: Record<string, string>, accountID = ME) {
+    return {reportIDs, accountID};
+}
+
+const aliceKey = getParticipantsChatKey([ME, ALICE]);
+const bobKey = getParticipantsChatKey([ME, BOB]);
+
+describe('oneOnOneChatReportIDs', () => {
+    it('indexes 1:1 chats by participant set on a full compute', () => {
+        const reports = collection(chatWith('10', ALICE), chatWith('20', BOB));
+
+        expect(oneOnOneChatReportIDsConfig.compute([reports, session], {})).toEqual(index({[aliceKey]: '10', [bobKey]: '20'}));
+    });
+
+    it('adds a newly created chat without rebuilding', () => {
+        const initial = collection(chatWith('10', ALICE));
+        const currentValue = oneOnOneChatReportIDsConfig.compute([initial, session], {});
+
+        const withBob = collection(chatWith('10', ALICE), chatWith('20', BOB));
+        const next = oneOnOneChatReportIDsConfig.compute([withBob, session], {currentValue, sourceValues: delta(['20', chatWith('20', BOB)])});
+
+        expect(next).toEqual(index({[aliceKey]: '10', [bobKey]: '20'}));
+    });
+
+    it('drops the entry when a chat is deleted', () => {
+        const initial = collection(chatWith('10', ALICE), chatWith('20', BOB));
+        const currentValue = oneOnOneChatReportIDsConfig.compute([initial, session], {});
+
+        const withoutBob = collection(chatWith('10', ALICE));
+        const next = oneOnOneChatReportIDsConfig.compute([withoutBob, session], {currentValue, sourceValues: delta(['20', undefined])});
+
+        expect(next).toEqual(index({[aliceKey]: '10'}));
+    });
+
+    it('moves the entry when a chat changes participants', () => {
+        const initial = collection(chatWith('10', ALICE));
+        const currentValue = oneOnOneChatReportIDsConfig.compute([initial, session], {});
+
+        const nowWithBob = collection(chatWith('10', BOB));
+        const next = oneOnOneChatReportIDsConfig.compute([nowWithBob, session], {currentValue, sourceValues: delta(['10', chatWith('10', BOB)])});
+
+        expect(next).toEqual(index({[bobKey]: '10'}));
+    });
+
+    it('keeps the first chat when two share a participant set, and leaves it alone when the other one goes', () => {
+        const duplicates = collection(chatWith('10', ALICE), chatWith('20', ALICE));
+        const currentValue = oneOnOneChatReportIDsConfig.compute([duplicates, session], {});
+        expect(currentValue).toEqual(index({[aliceKey]: '10'}));
+
+        const remaining = collection(chatWith('10', ALICE));
+        const next = oneOnOneChatReportIDsConfig.compute([remaining, session], {currentValue, sourceValues: delta(['20', undefined])});
+
+        expect(next).toEqual(index({[aliceKey]: '10'}));
+    });
+
+    it('promotes the remaining chat when the indexed one is deleted, as happens when an optimistic chat is replaced', () => {
+        // The optimistic chat is indexed first, then the server report arrives on the same participants.
+        const optimisticOnly = collection(chatWith('optimistic-1', ALICE));
+        const afterOptimistic = oneOnOneChatReportIDsConfig.compute([optimisticOnly, session], {});
+        expect(afterOptimistic).toEqual(index({[aliceKey]: 'optimistic-1'}));
+
+        const bothReports = collection(chatWith('optimistic-1', ALICE), chatWith('30', ALICE));
+        const afterServerReport = oneOnOneChatReportIDsConfig.compute([bothReports, session], {
+            currentValue: afterOptimistic,
+            sourceValues: delta(['30', chatWith('30', ALICE)]),
+        });
+        expect(afterServerReport).toEqual(index({[aliceKey]: 'optimistic-1'}));
+
+        // The optimistic report is cleaned up, so the real one has to take over rather than the key disappearing.
+        const serverOnly = collection(chatWith('30', ALICE));
+        const afterCleanup = oneOnOneChatReportIDsConfig.compute([serverOnly, session], {
+            currentValue: afterServerReport,
+            sourceValues: delta(['optimistic-1', undefined]),
+        });
+
+        expect(afterCleanup).toEqual(index({[aliceKey]: '30'}));
+    });
+
+    it('rebuilds when SESSION carries a different account ID, because that changes what counts as a 1:1 chat', () => {
+        const reports = collection(chatWith('10', ALICE), chatWith('20', BOB));
+        const currentValue = oneOnOneChatReportIDsConfig.compute([reports, session], {});
+        expect(currentValue).toEqual(index({[aliceKey]: '10', [bobKey]: '20'}));
+
+        const asOutsider = oneOnOneChatReportIDsConfig.compute([reports, {accountID: 99}], {currentValue, sourceValues: {}, triggeredKeys: new Set([ONYXKEYS.SESSION])});
+
+        expect(asOutsider).toEqual(index({}, 99));
+    });
+
+    it('keeps the index when SESSION changes without changing the account ID', () => {
+        const reports = collection(chatWith('10', ALICE));
+        const currentValue = oneOnOneChatReportIDsConfig.compute([reports, session], {});
+
+        const withBob = collection(chatWith('10', ALICE), chatWith('20', BOB));
+        const next = oneOnOneChatReportIDsConfig.compute([withBob, {accountID: ME, authToken: 'refreshed'}], {
+            currentValue,
+            sourceValues: {},
+            triggeredKeys: new Set([ONYXKEYS.SESSION]),
+        });
+
+        expect(next).toBe(currentValue);
+    });
+
+    it('rebuilds on the first compute after a reload, so a stale restored index is corrected', () => {
+        const reports = collection(chatWith('10', ALICE));
+        // Bob's chat was deleted after the index was last written, and Alice's chat arrived before the first compute.
+        const staleValue = index({[bobKey]: '99'});
+
+        // The engine's first flush has no baselines to diff against, so it passes no sourceValues, while
+        // triggeredKeys holds every dependency.
+        const next = oneOnOneChatReportIDsConfig.compute([reports, session], {
+            currentValue: staleValue,
+            triggeredKeys: new Set([ONYXKEYS.COLLECTION.REPORT, ONYXKEYS.SESSION]),
+        });
+
+        expect(next).toEqual(index({[aliceKey]: '10'}));
+    });
+
+    it('builds nothing until the current account ID is known', () => {
+        const reports = collection(chatWith('10', ALICE));
+
+        expect(oneOnOneChatReportIDsConfig.compute([reports, {}], {})).toEqual({reportIDs: {}});
+    });
+});
diff --git a/tests/unit/OnyxDerived/spendDataSignatureTest.ts b/tests/unit/OnyxDerived/spendDataSignatureTest.ts
new file mode 100644
index 000000000000..8eee7bd44827
--- /dev/null
+++ b/tests/unit/OnyxDerived/spendDataSignatureTest.ts
@@ -0,0 +1,317 @@
+import spendDataSignatureConfig from '@libs/actions/OnyxDerived/configs/spendDataSignature';
+
+import CONST from '@src/CONST';
+import type {OnyxKey} from '@src/ONYXKEYS';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {CardList, Transaction} from '@src/types/onyx';
+
+import type {OnyxCollection} from 'react-native-onyx';
+
+import createRandomCard from '../../utils/collections/card';
+import createRandomTransaction from '../../utils/collections/transaction';
+
+const CARD_ID = 11111;
+const OTHER_CARD_ID = 99999;
+
+const cardList: CardList = {[CARD_ID]: {...createRandomCard(CARD_ID), cardID: CARD_ID}};
+
+function makeTransaction(transactionID: string, cardID?: number): Transaction {
+    return {...createRandomTransaction(Number(transactionID)), transactionID, cardID};
+}
+
+function transactionKey(transactionID: string) {
+    return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}` as const;
+}
+
+/** A flush where transactions fired, like the first load or a restore from disk. */
+const TRANSACTIONS_FIRED = new Set<OnyxKey>([ONYXKEYS.COLLECTION.TRANSACTION]);
+
+/** Stores the fingerprints the way the first load does, so later changes have something to compare to. */
+function seedBaseline(transactions: OnyxCollection<Transaction>) {
+    spendDataSignatureConfig.compute([transactions, cardList], {currentValue: {expenses: 0, cardExpenses: 0}, triggeredKeys: TRANSACTIONS_FIRED});
+}
+
+describe('spendDataSignature', () => {
+    it('starts at zero when there is nothing to count', () => {
+        // Given no transactions and no previous value
+
+        // When the value is computed from scratch
+        const result = spendDataSignatureConfig.compute([undefined, undefined], {});
+
+        // Then both counters start at zero
+        expect(result).toEqual({expenses: 0, cardExpenses: 0});
+    });
+
+    it('does not move the counters on a full recompute', () => {
+        // Given a stored value and a full recompute, which carries no delta
+        const transactions: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1')};
+
+        // When it recomputes with no source values
+        const result = spendDataSignatureConfig.compute([transactions, cardList], {currentValue: {expenses: 4, cardExpenses: 2}, triggeredKeys: TRANSACTIONS_FIRED});
+
+        // Then the counters are left alone, so loading from disk does not look like a change
+        expect(result).toEqual({expenses: 4, cardExpenses: 2});
+    });
+
+    it('moves the expense counter when an expense changes', () => {
+        // Given one changed expense that is not on a card
+        const changed = {[transactionKey('1')]: makeTransaction('1')};
+
+        // When the value is computed with that delta
+        const result = spendDataSignatureConfig.compute([changed, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: changed},
+        });
+
+        // Then only the expense counter moves
+        expect(result).toEqual({expenses: 1, cardExpenses: 0});
+    });
+
+    it('moves both counters when the expense is on one of the user`s cards', () => {
+        // Given a changed expense charged to a card the user holds
+        const changed = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+
+        // When the value is computed with that delta
+        const result = spendDataSignatureConfig.compute([changed, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: changed},
+        });
+
+        // Then the card counter moves too, so the card totals know they are stale
+        expect(result).toEqual({expenses: 1, cardExpenses: 1});
+    });
+
+    it('leaves the card counter alone for a card the user does not hold', () => {
+        // Given a changed expense on someone else's card
+        const changed = {[transactionKey('1')]: makeTransaction('1', OTHER_CARD_ID)};
+
+        // When the value is computed with that delta
+        const result = spendDataSignatureConfig.compute([changed, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: changed},
+        });
+
+        // Then the card totals are not refetched for a card that is not on the page
+        expect(result).toEqual({expenses: 1, cardExpenses: 0});
+    });
+
+    it('reads the card from the stored transaction when the delta omits it', () => {
+        // Given a partial update to an expense whose card is only known from the stored collection
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        const changed = {[transactionKey('1')]: {...makeTransaction('1'), cardID: undefined, amount: 500}};
+
+        // When the value is computed with that delta
+        const result = spendDataSignatureConfig.compute([stored, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: changed},
+        });
+
+        // Then the card counter still moves, since an amount edit changes the card total
+        expect(result).toEqual({expenses: 1, cardExpenses: 1});
+    });
+
+    it('ignores an empty delta', () => {
+        // Given a flush that carries no changed transaction keys
+        const result = spendDataSignatureConfig.compute([undefined, cardList], {
+            currentValue: {expenses: 3, cardExpenses: 1},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: {}},
+        });
+
+        // Then nothing moves
+        expect(result).toEqual({expenses: 3, cardExpenses: 1});
+    });
+
+    it('does not move the counters when a write leaves the counted fields alone', () => {
+        // Given a stored expense that the derived value has already seen
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        seedBaseline(stored);
+
+        // When the same expense is written again with no change to amount, date, currency, card or report,
+        // which is what merely opening it in the RHP does
+        const result = spendDataSignatureConfig.compute([stored, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: stored},
+        });
+
+        // Then nothing moves, so viewing an expense costs no search
+        expect(result).toEqual({expenses: 0, cardExpenses: 0});
+    });
+
+    it('moves the counters when the amount of a seen expense changes', () => {
+        // Given a stored expense the derived value has already seen
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        seedBaseline(stored);
+
+        // When its amount is edited
+        const edited: OnyxCollection<Transaction> = {[transactionKey('1')]: {...makeTransaction('1', CARD_ID), amount: 9999}};
+        const result = spendDataSignatureConfig.compute([edited, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: edited},
+        });
+
+        // Then both counters move, because the card total and the chart both change
+        expect(result).toEqual({expenses: 1, cardExpenses: 1});
+    });
+
+    it('moves the counters when an expense is edited, which lands in the modified fields', () => {
+        // Given a stored expense the derived value has already seen
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        seedBaseline(stored);
+
+        // When the user edits the amount, which Onyx records as `modifiedAmount` rather than `amount`
+        const edited: OnyxCollection<Transaction> = {[transactionKey('1')]: {...makeTransaction('1', CARD_ID), modifiedAmount: 7777}};
+        const result = spendDataSignatureConfig.compute([edited, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: edited},
+        });
+
+        // Then the cards know they are stale, even though `amount` never changed
+        expect(result).toEqual({expenses: 1, cardExpenses: 1});
+    });
+
+    // Awaiting approval and Repaid filter on reimbursable; Top merchants, Top categories and Recently added show the rest.
+    it.each([
+        ['marked non-reimbursable', {reimbursable: false}],
+        ['given a new merchant', {modifiedMerchant: 'New merchant'}],
+        ['given a new category', {category: 'New category'}],
+    ])('moves only the expense counter when a card expense is %s', (_, change) => {
+        // Given a stored reimbursable card expense that the derived value has already seen
+        const expense: Transaction = {...makeTransaction('1', CARD_ID), reimbursable: true};
+        seedBaseline({[transactionKey('1')]: expense});
+
+        // When a field that the card totals do not read is edited
+        const edited: OnyxCollection<Transaction> = {[transactionKey('1')]: {...expense, ...change}};
+        const result = spendDataSignatureConfig.compute([edited, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: edited},
+        });
+
+        // Then the expense counter moves, because the other cards are stale, but the card totals do not refetch
+        expect(result).toEqual({expenses: 1, cardExpenses: 0});
+    });
+
+    it('moves only the expense counter again when the server accepts a new card expense', () => {
+        // Given a card expense created offline, which the derived value saw while it was still pending
+        const pending: Transaction = {...makeTransaction('1', CARD_ID), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD};
+        seedBaseline({[transactionKey('1')]: pending});
+
+        // When the write is replayed and the server clears `pendingAction`
+        const accepted: OnyxCollection<Transaction> = {[transactionKey('1')]: {...pending, pendingAction: null}};
+        const result = spendDataSignatureConfig.compute([accepted, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: accepted},
+        });
+
+        // Then the expense counter moves, because a chart refetch sent with the replay may have been answered before
+        // the server saw the expense, but the card totals wait for writes and do not refetch
+        expect(result).toEqual({expenses: 1, cardExpenses: 0});
+    });
+
+    it('moves only the expense counter again when the server accepts an edit', () => {
+        // Given an expense edited offline, which marks only the edited field as pending, not the whole expense
+        const pending: Transaction = {...makeTransaction('1', CARD_ID), modifiedAmount: 7777, pendingFields: {amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}};
+        seedBaseline({[transactionKey('1')]: pending});
+
+        // When the edit is replayed and the server clears the pending field, leaving every other field as it was
+        const accepted: OnyxCollection<Transaction> = {[transactionKey('1')]: {...pending, pendingFields: {amount: null}}};
+        const result = spendDataSignatureConfig.compute([accepted, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: accepted},
+        });
+
+        // Then the expense counter moves, because a chart refetch sent with the replay may show the old amount
+        expect(result).toEqual({expenses: 1, cardExpenses: 0});
+    });
+
+    it('moves both counters when a card expense is deleted', () => {
+        // Given a card expense the derived value has already seen
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        seedBaseline(stored);
+
+        // When it is deleted, so it is gone from both the collection and the update
+        const removed = {[transactionKey('1')]: undefined};
+        const result = spendDataSignatureConfig.compute([{}, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: removed},
+        });
+
+        // Then the card total also knows it is out of date, because it counted that expense
+        expect(result).toEqual({expenses: 1, cardExpenses: 1});
+    });
+
+    it('does not replay a delete on the next flush', () => {
+        // Given a deleted card expense that has already been counted
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        seedBaseline(stored);
+        const removed = {[transactionKey('1')]: undefined};
+        spendDataSignatureConfig.compute([{}, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: removed},
+        });
+
+        // When the same removal is seen again
+        const result = spendDataSignatureConfig.compute([{}, cardList], {
+            currentValue: {expenses: 1, cardExpenses: 1},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: removed},
+        });
+
+        // Then nothing moves, because the expense was already forgotten the first time
+        expect(result).toEqual({expenses: 1, cardExpenses: 1});
+    });
+
+    it('keeps the baseline when only the card list changes', () => {
+        // Given a stored expense the derived value has already seen
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        seedBaseline(stored);
+
+        // When only the card list is written, so no transaction changed
+        spendDataSignatureConfig.compute([stored, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            triggeredKeys: new Set<OnyxKey>([ONYXKEYS.CARD_LIST]),
+        });
+
+        // Then the stored fingerprints survive, so an unchanged expense still counts as no change
+        const result = spendDataSignatureConfig.compute([stored, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: stored},
+        });
+        expect(result).toEqual({expenses: 0, cardExpenses: 0});
+    });
+
+    it('builds the baseline on the first compute even when the card list is what triggered it', () => {
+        // Given a fresh session with no baseline yet
+        spendDataSignatureConfig.onReset?.();
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+
+        // When the first compute names only the card list, which is what happens whenever CARD_LIST is the
+        // dependency that connects last: the earlier recomputes returned before recording what triggered them
+        spendDataSignatureConfig.compute([stored, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            triggeredKeys: new Set<OnyxKey>([ONYXKEYS.CARD_LIST]),
+        });
+
+        // Then the baseline was built anyway, so writing the same expense back still counts as no change
+        // rather than every first write looking new for the rest of the session
+        const result = spendDataSignatureConfig.compute([stored, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: stored},
+        });
+        expect(result).toEqual({expenses: 0, cardExpenses: 0});
+    });
+
+    it('drops its baseline when Onyx is cleared', () => {
+        // Given a stored expense the derived value has already seen
+        const stored: OnyxCollection<Transaction> = {[transactionKey('1')]: makeTransaction('1', CARD_ID)};
+        seedBaseline(stored);
+
+        // When Onyx is cleared and the same expense is written again as the data comes back
+        spendDataSignatureConfig.onReset?.();
+        const result = spendDataSignatureConfig.compute([stored, cardList], {
+            currentValue: {expenses: 0, cardExpenses: 0},
+            sourceValues: {[ONYXKEYS.COLLECTION.TRANSACTION]: stored},
+        });
+
+        // Then it counts as a change, because the fingerprints from before the clear are gone
+        expect(result).toEqual({expenses: 1, cardExpenses: 1});
+    });
+});
diff --git a/tests/unit/OnyxDerivedSharedDeltaTest.ts b/tests/unit/OnyxDerivedSharedDeltaTest.ts
new file mode 100644
index 000000000000..1247ef8c8062
--- /dev/null
+++ b/tests/unit/OnyxDerivedSharedDeltaTest.ts
@@ -0,0 +1,126 @@
+import type reportTransactionsAndViolationsConfig from '@libs/actions/OnyxDerived/configs/reportTransactionsAndViolations';
+
+import initOnyxDerivedValues from '@userActions/OnyxDerived';
+
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type {OnyxMultiSetInput} from 'react-native-onyx';
+
+import Onyx from 'react-native-onyx';
+
+import createRandomTransaction from '../utils/collections/transaction';
+import getOnyxValue from '../utils/getOnyxValue';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+// Record every diff the engine runs, so the test can count how many scanned the transactions collection.
+const mockDiffedSnapshots: unknown[] = [];
+jest.mock('@libs/getCollectionDelta', () => {
+    const actual = jest.requireActual<{default: (current: unknown, previous: unknown) => unknown}>('@libs/getCollectionDelta');
+    return {
+        __esModule: true,
+        default: (current: unknown, previous: unknown) => {
+            mockDiffedSnapshots.push(current);
+            return actual.default(current, previous);
+        },
+    };
+});
+
+// Lets one test push reportTransactionsAndViolations off the shared baseline by failing a single compute.
+let mockShouldThrowCompute = false;
+jest.mock('@libs/actions/OnyxDerived/configs/reportTransactionsAndViolations', () => {
+    const actual = jest.requireActual<{default: typeof reportTransactionsAndViolationsConfig}>('@libs/actions/OnyxDerived/configs/reportTransactionsAndViolations');
+    const actualCompute = actual.default.compute;
+    return {
+        __esModule: true,
+        default: {
+            ...actual.default,
+            compute: (dependencyValues: Parameters<typeof actualCompute>[0], context: Parameters<typeof actualCompute>[1]) => {
+                if (mockShouldThrowCompute) {
+                    mockShouldThrowCompute = false;
+                    throw new Error('compute boom');
+                }
+                return actualCompute(dependencyValues, context);
+            },
+        },
+    };
+});
+
+const REPORT_ID = 'r1';
+
+function transactionKey(transactionID: string) {
+    return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}` as const;
+}
+
+function transactionDiffCount(): number {
+    return mockDiffedSnapshots.filter((snapshot) => !!snapshot && typeof snapshot === 'object' && Object.keys(snapshot).some((key) => key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)))
+        .length;
+}
+
+async function getReportTransactionAmount(transactionID: string) {
+    const derived = await getOnyxValue(ONYXKEYS.DERIVED.REPORT_TRANSACTIONS_AND_VIOLATIONS);
+    return derived?.[REPORT_ID]?.transactions?.[transactionKey(transactionID)]?.amount;
+}
+
+describe('OnyxDerived shared collection delta', () => {
+    beforeAll(async () => {
+        Onyx.init({keys: ONYXKEYS});
+        initOnyxDerivedValues();
+        // reportAttributes also depends on the locale, which only reports once translations have loaded.
+        await IntlStore.load(CONST.LOCALES.EN);
+        await Onyx.set(ONYXKEYS.RAM_ONLY_ARE_TRANSLATIONS_LOADING, false);
+        await waitForBatchedUpdates();
+    });
+
+    beforeEach(async () => {
+        mockShouldThrowCompute = false;
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+
+        // Seed some expenses and write once more, so every derived value has flushed and holds the same baseline
+        const seed: OnyxMultiSetInput = {};
+        for (let i = 1; i <= 5; i++) {
+            seed[transactionKey(String(i))] = {...createRandomTransaction(i), transactionID: String(i), reportID: REPORT_ID, amount: i};
+        }
+        await Onyx.multiSet(seed);
+        await waitForBatchedUpdates();
+        await Onyx.merge(transactionKey('1'), {amount: 10});
+        await waitForBatchedUpdates();
+        mockDiffedSnapshots.length = 0;
+    });
+
+    it('scans the transactions collection once per write, however many derived values depend on it', async () => {
+        // Given reportAttributes, reportTransactionsAndViolations and spendDataSignature all depend on transactions
+        const signatureBefore = await getOnyxValue(ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE);
+
+        // When one expense is edited
+        await Onyx.merge(transactionKey('2'), {amount: 222});
+        await waitForBatchedUpdates();
+
+        // Then the collection is diffed once, since a scan costs a loop over every expense on large accounts
+        expect(transactionDiffCount()).toBe(1);
+
+        // And every derived value still sees the change through the shared delta
+        expect(await getReportTransactionAmount('2')).toBe(222);
+        const signatureAfter = await getOnyxValue(ONYXKEYS.DERIVED.SPEND_DATA_SIGNATURE);
+        expect(signatureAfter?.expenses).toBe((signatureBefore?.expenses ?? 0) + 1);
+    });
+
+    it('diffs separately for a derived value whose baseline fell behind, so it still gets every missed change', async () => {
+        // Given reportTransactionsAndViolations failed one compute, so it kept its older baseline while the others moved on
+        mockShouldThrowCompute = true;
+        await Onyx.merge(transactionKey('3'), {amount: 333});
+        await waitForBatchedUpdates();
+        expect(await getReportTransactionAmount('3')).toBe(3);
+        mockDiffedSnapshots.length = 0;
+
+        // When another expense is edited
+        await Onyx.merge(transactionKey('4'), {amount: 444});
+        await waitForBatchedUpdates();
+
+        // Then it diffs from its own older baseline instead of reusing the others' delta, which would skip the missed edit
+        expect(await getReportTransactionAmount('3')).toBe(333);
+        expect(await getReportTransactionAmount('4')).toBe(444);
+    });
+});
diff --git a/tests/unit/OptionsListUtilsTest.tsx b/tests/unit/OptionsListUtilsTest.tsx
index 41a3423ec1cb..9f4ceb06bb5d 100644
--- a/tests/unit/OptionsListUtilsTest.tsx
+++ b/tests/unit/OptionsListUtilsTest.tsx
@@ -14,10 +14,12 @@ import DateUtils from '@libs/DateUtils';
 import type {HydratedPersonalDetailOption, OptionList, Options, PersonalDetailOptionOrShell, SearchOption, SearchOptionData} from '@libs/OptionsListUtils';
 import {
     canCreateOptimisticPersonalDetailOption,
+    clearAlternateTextCache,
     clearFilteredOptionListCache,
     createFilteredOptionList,
     createOption,
     createOptionFromReport,
+    doesReportMatchSearchTerms,
     filterAndOrderOptions,
     filterReports,
     filterSelfDMChat,
@@ -41,12 +43,12 @@ import {
     orderPersonalDetailsOptions,
     orderWorkspaceOptions,
     recentReportComparator,
-    sortAlphabetically,
 } from '@libs/OptionsListUtils';
 import {getCurrentUserSearchTerms, getPersonalDetailSearchTerms} from '@libs/OptionsListUtils/searchMatchUtils';
 import {canCreateTaskInReport, canUserPerformWriteAction, isCanceledTaskReport, isExpensifyOnlyParticipantInReport} from '@libs/ReportUtils';
 import type {OptionData} from '@libs/ReportUtils';
 import SidebarUtils from '@libs/SidebarUtils';
+import sortAlphabetically from '@libs/sortAlphabetically';
 
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
 
@@ -867,6 +869,10 @@ describe('OptionsListUtils', () => {
         // createFilteredOptionList caches results at module level; clear it so tests stay order-independent.
         clearFilteredOptionListCache();
 
+        // The chat-preview cache is also module level, and its guarded inputs can survive Onyx.clear(),
+        // so reset it the same way to keep cases order-independent.
+        clearAlternateTextCache();
+
         // Onyx.clear() models sign-out and empties PERSONAL_DETAILS_LIST. Report-holder option text
         // resolves via ReportUtils.allPersonalDetails (the live connect), so restore the list the
         // same way a signed-in session would after login.
@@ -1253,7 +1259,7 @@ describe('OptionsListUtils', () => {
             );
             let results: Pick<Options, 'personalDetails' | 'recentReports'> = validOptions;
             // When we call orderOptions()
-            results = orderOptions(results);
+            results = orderOptions(results, activePolicyID);
 
             // Then all personalDetails except the currently logged in user should be returned
             expect(results.personalDetails.length).toBe(Object.values(OPTIONS.personalDetails).length - 1);
@@ -1300,7 +1306,7 @@ describe('OptionsListUtils', () => {
             );
             let results: Pick<Options, 'personalDetails' | 'recentReports'> = validOptions;
             // When we call orderOptions()
-            results = orderOptions(results);
+            results = orderOptions(results, activePolicyID);
 
             const expected = [
                 'Black Panther',
@@ -1448,21 +1454,23 @@ describe('OptionsListUtils', () => {
             // The contact must survive getValidOptions' pre-filter so the final filter can return it.
             expect(preFilteredOptions.personalDetails).toEqual(expect.arrayContaining([expect.objectContaining({login: 'contact1003@example.com'})]));
 
-            const filteredOptions = filterAndOrderOptions(
-                preFilteredOptions,
-                searchString,
-                COUNTRY_CODE,
+            const filteredOptions = filterAndOrderOptions({
+                options: preFilteredOptions,
+                searchInputValue: searchString,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                 personalDetails,
-                {
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             expect(filteredOptions.personalDetails).toEqual([expect.objectContaining({login: 'contact1003@example.com'})]);
         });
@@ -2104,21 +2112,23 @@ describe('OptionsListUtils', () => {
                 translateLocal,
                 undefined,
             );
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then the report must survive both filtering stages
             expect(filteredOptions.recentReports).toEqual(expect.arrayContaining([expect.objectContaining({reportID: report.reportID, text: reportText})]));
@@ -3542,21 +3552,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with an empty search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                '',
-                COUNTRY_CODE,
+                searchInputValue: '',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then all options should be returned
             expect(filteredOptions.recentReports.length + filteredOptions.personalDetails.length).toBe(14);
@@ -3585,22 +3597,24 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with a search value and sortByReportTypeInSearch param
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     sortByReportTypeInSearch: true,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then we expect all options to be part of the recentReports list and reports should be first:
             expect(filteredOptions.personalDetails.length).toBe(0);
@@ -3636,21 +3650,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only one report should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -3699,21 +3715,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only one report should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -3759,22 +3777,24 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with a search value and sortByReportTypeInSearch param
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS_WITH_PERIODS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS_WITH_PERIODS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     sortByReportTypeInSearch: true,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only one report should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -3804,21 +3824,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only one report should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -3848,21 +3870,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only one report should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -3902,21 +3926,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we pass the returned options to filterAndOrderOptions with a search value
-            const filterOptions = filterAndOrderOptions(
+            const filterOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only two reports should be returned
             expect(filterOptions.recentReports.length).toBe(2);
@@ -3946,21 +3972,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only three reports should be returned
             expect(filteredOptions.recentReports.length).toBe(3);
@@ -3992,21 +4020,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then the user to invite should be returned
             expect(filteredOptions.userToInvite?.login).toBe(searchText);
@@ -4034,22 +4064,24 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value and excluded logins list
-            const filterOptions = filterAndOrderOptions(
+            const filterOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no personal details should be returned
             expect(filterOptions.recentReports.length).toBe(0);
@@ -4077,22 +4109,24 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value and excludeLogins
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     excludeLogins: CONST.EXPENSIFY_EMAILS_OBJECT,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then the user to invite should be returned
             expect(filteredOptions.userToInvite?.login).toBe(searchText);
@@ -4120,44 +4154,48 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value and maxRecentReportsToShow set to 2
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     maxRecentReportsToShow: 2,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only two reports should be returned
             expect(filteredOptions.recentReports.length).toBe(2);
 
             // Note: in the past maxRecentReportsToShow: 0 would return all recent reports, this has changed, and is expected to return none now
             // When we call filterAndOrderOptions with a search value and maxRecentReportsToShow set to 0
-            const limitToZeroOptions = filterAndOrderOptions(
+            const limitToZeroOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     maxRecentReportsToShow: 0,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no reports should be returned
             expect(limitToZeroOptions.recentReports.length).toBe(0);
@@ -4185,21 +4223,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchText,
-                COUNTRY_CODE,
+                searchInputValue: searchText,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then there should be one matching result
             expect(filteredOptions.personalDetails.length).toBe(1);
@@ -4247,21 +4287,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we pass the returned options to filterAndOrderOptions with a search value that does not match the group chat name
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'mutants',
-                COUNTRY_CODE,
+                searchInputValue: 'mutants',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -4312,21 +4354,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we pass the returned options to filterAndOrderOptions with a search value that matches the group chat name
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'Avengers Room',
-                COUNTRY_CODE,
+                searchInputValue: 'Avengers Room',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then one recent report should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -4377,21 +4421,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we pass the returned options to filterAndOrderOptions with a search value that does not match the group chat name
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'Mutants Lair',
-                COUNTRY_CODE,
+                searchInputValue: 'Mutants Lair',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -4416,21 +4462,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that matches a personal detail with no existing report
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'hulk',
-                COUNTRY_CODE,
+                searchInputValue: 'hulk',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -4758,21 +4806,23 @@ describe('OptionsListUtils', () => {
             });
 
             // When we pass the returned options to filterAndOrderOptions with any search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'Unknown',
-                COUNTRY_CODE,
+                searchInputValue: 'Unknown',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then the report should still be found by its reportName even if participantsList is empty
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -4798,21 +4848,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details or reports
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'marc@expensify',
-                COUNTRY_CODE,
+                searchInputValue: 'marc@expensify',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports or personal details should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -4840,21 +4892,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details or reports
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'marc@expensify.com',
-                COUNTRY_CODE,
+                searchInputValue: 'marc@expensify.com',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports or personal details should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -4882,21 +4936,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details or reports but matches user to invite
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'peter.parker@expensify.com',
-                COUNTRY_CODE,
+                searchInputValue: 'peter.parker@expensify.com',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -4923,21 +4979,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value without accent mark
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'Timothee',
-                COUNTRY_CODE,
+                searchInputValue: 'Timothee',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then one personalDetails with accent mark should be returned
             expect(filteredOptions.personalDetails.length).toBe(1);
@@ -4962,21 +5020,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details or reports but matches user to invite
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                '5005550006',
-                COUNTRY_CODE,
+                searchInputValue: '5005550006',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports or personal details should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -5006,21 +5066,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details or reports but matches user to invite
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                '+15005550006',
-                COUNTRY_CODE,
+                searchInputValue: '+15005550006',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports or personal details should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -5050,21 +5112,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details or reports but matches user to invite
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                '+1 (800)324-3233',
-                COUNTRY_CODE,
+                searchInputValue: '+1 (800)324-3233',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports or personal details should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -5094,21 +5158,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details or reports
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                '998243aaaa',
-                COUNTRY_CODE,
+                searchInputValue: '998243aaaa',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no recent reports or personal details should be returned
             expect(filteredOptions.recentReports.length).toBe(0);
@@ -5139,22 +5205,24 @@ describe('OptionsListUtils', () => {
             );
 
             // When we call filterAndOrderOptions with a plain text name (not email or phone) without shouldAcceptName
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'Jeff Amazon',
-                COUNTRY_CODE,
+                searchInputValue: 'Jeff Amazon',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     shouldAcceptName: false,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then userToInvite should be null since plain names are not accepted by default
             expect(filteredOptions?.userToInvite).toBe(null);
@@ -5182,22 +5250,24 @@ describe('OptionsListUtils', () => {
             );
 
             // When we call filterAndOrderOptions with a plain text name (not email or phone) with shouldAcceptName
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'Jeff',
-                COUNTRY_CODE,
+                searchInputValue: 'Jeff',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     shouldAcceptName: true,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then userToInvite should be returned for the plain name
             expect(filteredOptions?.userToInvite?.text).toBe('Jeff');
@@ -5222,21 +5292,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that does not match any personal details
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'magneto',
-                COUNTRY_CODE,
+                searchInputValue: 'magneto',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then no personal details should be returned
             expect(filteredOptions.personalDetails.length).toBe(0);
@@ -5261,22 +5333,24 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that matches an email
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'peterparker@expensify.com',
-                COUNTRY_CODE,
+                searchInputValue: 'peterparker@expensify.com',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     sortByReportTypeInSearch: true,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then one recent report should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -5305,22 +5379,24 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
             // When we call filterAndOrderOptions with a search value that matches both reports and personal details and maxRecentReportsToShow param
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                '.com',
-                COUNTRY_CODE,
+                searchInputValue: '.com',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                     maxRecentReportsToShow: 5,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then there should be 4 matching personal details
             expect(filteredOptions.personalDetails.length).toBe(5);
@@ -5353,21 +5429,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value that matches a personal detail
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'spider',
-                COUNTRY_CODE,
+                searchInputValue: 'spider',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then one personal detail should be returned
             expect(filteredOptions.recentReports.length).toBe(1);
@@ -5395,21 +5473,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value that matches multiple items
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'fantastic',
-                COUNTRY_CODE,
+                searchInputValue: 'fantastic',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then only three reports should be returned
             expect(filteredOptions.recentReports.length).toBe(3);
@@ -5455,17 +5535,19 @@ describe('OptionsListUtils', () => {
                         conciergeReportID: undefined,
                     });
                     // When we pass the returned options to filterAndOrderOptions with a search value
-                    const filteredResults = filterAndOrderOptions(
-                        results,
-                        'barry.allen@expensify.com',
-                        COUNTRY_CODE,
+                    const filteredResults = filterAndOrderOptions({
+                        options: results,
+                        searchInputValue: 'barry.allen@expensify.com',
+                        countryCode: COUNTRY_CODE,
                         loginList,
-                        CURRENT_USER_EMAIL,
-                        CURRENT_USER_ACCOUNT_ID,
-                        PERSONAL_DETAILS_WITH_PERIODS,
-                        {dateFnsLocale: undefined, convertToDisplayString, sortByReportTypeInSearch: true, currentUserAccountID: CURRENT_USER_ACCOUNT_ID},
-                        undefined,
-                    );
+                        currentUserEmail: CURRENT_USER_EMAIL,
+                        currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                        personalDetails: PERSONAL_DETAILS_WITH_PERIODS,
+                        config: {dateFnsLocale: undefined, convertToDisplayString, sortByReportTypeInSearch: true, currentUserAccountID: CURRENT_USER_ACCOUNT_ID},
+                        translate: translateLocal,
+                        rules: undefined,
+                        activePolicyID,
+                    });
 
                     // Then only one report should be returned
                     expect(filteredResults.recentReports.length).toBe(1);
@@ -5500,21 +5582,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a an empty search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                '',
-                COUNTRY_CODE,
+                searchInputValue: '',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
             const matchingEntries = filteredOptions.personalDetails.filter((detail) => detail.login === login);
 
             // Then there should be 2 unique login entries
@@ -5560,21 +5644,23 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
             // When we call filterAndOrderOptions with a search value
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                searchTerm,
-                COUNTRY_CODE,
+                searchInputValue: searchTerm,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then the self dm should be on top.
             expect(filteredOptions.recentReports.at(0)?.isSelfDM).toBe(true);
@@ -5600,36 +5686,40 @@ describe('OptionsListUtils', () => {
                 conciergeReportID: undefined,
             });
 
-            const multiSpaceQueryResults = filterAndOrderOptions(
+            const multiSpaceQueryResults = filterAndOrderOptions({
                 options,
-                'Invisible   Woman',
-                COUNTRY_CODE,
+                searchInputValue: 'Invisible   Woman',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
-            const spaceSeparatedQueryResults = filterAndOrderOptions(
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
+            const spaceSeparatedQueryResults = filterAndOrderOptions({
                 options,
-                'Invisible Woman',
-                COUNTRY_CODE,
+                searchInputValue: 'Invisible Woman',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             expect(multiSpaceQueryResults.recentReports.map((option) => option.reportID)).toEqual(spaceSeparatedQueryResults.recentReports.map((option) => option.reportID));
             expect(multiSpaceQueryResults.personalDetails.map((option) => option.accountID)).toEqual(spaceSeparatedQueryResults.personalDetails.map((option) => option.accountID));
@@ -5779,7 +5869,7 @@ describe('OptionsListUtils', () => {
         it('should put the default workspace on top of the list', () => {
             // Given a list of expense chats
             // When we call orderWorkspaceOptions
-            const result = orderWorkspaceOptions(WORKSPACE_CHATS);
+            const result = orderWorkspaceOptions(WORKSPACE_CHATS, activePolicyID);
 
             // Then the first item in the list should be the default workspace
             expect(result.at(0)?.text).toEqual('Notion Workspace for Marketing');
@@ -5789,9 +5879,10 @@ describe('OptionsListUtils', () => {
     describe('Alternative text', () => {
         it("The text should not contain the last actor's name at prefix if the report is archived.", async () => {
             renderLocaleContextProvider();
-            // When we set the preferred locale to English and create an ADD_COMMENT report action
+            // Given the English locale, report 10 in Onyx (the preview reads it from there) and an ADD_COMMENT report action
             await Onyx.multiSet({
                 [ONYXKEYS.NVP_PREFERRED_LOCALE]: CONST.LOCALES.EN,
+                [`${ONYXKEYS.COLLECTION.REPORT}10` as const]: REPORTS?.['10'],
                 [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}10` as const]: {
                     '1': getFakeAdvancedReportAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT),
                 },
@@ -5818,9 +5909,25 @@ describe('OptionsListUtils', () => {
                 undefined,
             ).reports;
             const archivedReport = reports.find((report) => report.reportID === '10');
-
-            // Then the returned report should contain default archived reason
-            expect(archivedReport?.lastMessageText).toBe('This chat room has been archived.');
+            const alternateText = archivedReport
+                ? getAlternateText(
+                      archivedReport,
+                      {showChatPreviewLine: true},
+                      {
+                          isReportArchived: true,
+                          personalDetails: PERSONAL_DETAILS,
+                          dateFnsLocale: undefined,
+                          convertToDisplayString,
+                          conciergeReportID: undefined,
+                          translate: translateLocal,
+                          currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                          rules: undefined,
+                      },
+                  )
+                : undefined;
+
+            // Then the chat preview shows the default archived reason without an actor prefix
+            expect(alternateText).toBe('This chat room has been archived.');
         });
     });
 
@@ -5861,11 +5968,30 @@ describe('OptionsListUtils', () => {
             ...overrides,
         });
 
-        const buildAction = (actionName: Parameters<typeof getFakeAdvancedReportAction>[0], actorAccountID = 3, originalMessage?: Record<string, unknown>): ReportAction =>
+        const buildAction = (
+            actionName: Parameters<typeof getFakeAdvancedReportAction>[0],
+            actorAccountID = 3,
+            originalMessage?: Record<string, unknown>,
+            messageText?: string,
+        ): ReportAction =>
             ({
                 ...getFakeAdvancedReportAction(actionName),
                 actorAccountID,
                 ...(originalMessage === undefined ? {} : {originalMessage}),
+                ...(messageText === undefined
+                    ? {}
+                    : {
+                          message: [
+                              {
+                                  type: 'COMMENT',
+                                  html: messageText,
+                                  text: messageText,
+                                  isEdited: false,
+                                  whisperedTo: [],
+                                  isDeletedParentAction: false,
+                              },
+                          ],
+                      }),
             }) as ReportAction;
 
         const setReport = async (report: Report) => {
@@ -5875,7 +6001,7 @@ describe('OptionsListUtils', () => {
 
         type AlternateTextConfig = Parameters<typeof getAlternateText>[2];
 
-        const buildConfig = (lastAction?: ReportAction, reportID: string = ROOM_REPORT_ID, overrides: Partial<AlternateTextConfig> = {}): AlternateTextConfig => ({
+        const buildConfig = (overrides: Partial<AlternateTextConfig> = {}): AlternateTextConfig => ({
             isReportArchived: false,
             personalDetails: PERSONAL_DETAILS,
             dateFnsLocale: undefined,
@@ -5884,209 +6010,386 @@ describe('OptionsListUtils', () => {
             translate: translateLocal,
             currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
             rules: undefined,
-            ...(lastAction ? {sortedActions: {[reportID]: [lastAction]}} : {}),
             ...overrides,
         });
 
+        const seedActions = async (reportID: string, ...actions: ReportAction[]) => {
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, Object.fromEntries(actions.map((action) => [action.reportActionID, action])));
+            await waitForBatchedUpdates();
+        };
+
         it('should keep the raw comment text when the last action is ADD_COMMENT', async () => {
             // Given a DM whose last action is a plain comment containing markup typed by the user
             const report = buildDMReport({lastMessageText: '<b>test</b>'});
             await setReport(report);
-            const option: OptionData = {reportID: DM_REPORT_ID, keyForList: '', lastMessageText: '<b>test</b>'};
+            const option: OptionData = {
+                reportID: DM_REPORT_ID,
+                keyForList: '',
+                lastMessageText: '<b>test</b>',
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(undefined, DM_REPORT_ID));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             // Then the markup is preserved as typed (https://github.com/Expensify/App/issues/82036)
             expect(result).toBe('<b>test</b>');
         });
 
-        it('should strip HTML from the last message when the last action is not ADD_COMMENT', async () => {
-            // Given a DM whose last action is not a comment, so the last message is server-built HTML
-            const report = buildDMReport({lastMessageText: '<b>test</b>', lastActionType: CONST.REPORT.ACTIONS.TYPE.RENAMED});
+        it('should fall back to the raw report lastMessageText when no last action is available', async () => {
+            // Given a report whose actions are not loaded, so only report.lastMessageText is available
+            const report = buildDMReport({
+                lastMessageText: '<b>test</b>',
+                lastActionType: CONST.REPORT.ACTIONS.TYPE.RENAMED,
+            });
             await setReport(report);
-            const option: OptionData = {reportID: DM_REPORT_ID, keyForList: '', lastMessageText: '<b>test</b>'};
+            const option: OptionData = {
+                reportID: DM_REPORT_ID,
+                keyForList: '',
+                lastMessageText: '<b>test</b>',
+            };
+
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
+
+            // Then the stored text is returned untouched, which is what the LHN shows for the same report
+            expect(result).toBe('<b>test</b>');
+        });
+
+        it('should strip HTML from the last message when the last action is not ADD_COMMENT', async () => {
+            // Given a report whose last action is not a comment and carries HTML in its message
+            const reportID = '9251';
+            await setReport(
+                buildDMReport({
+                    reportID,
+                    lastMessageText: '<b>test</b>',
+                    lastActionType: CONST.REPORT.ACTIONS.TYPE.HOLD,
+                }),
+            );
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.HOLD, 3, undefined, '<b>test</b>'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(undefined, DM_REPORT_ID));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
+            // Then the markup is stripped (https://github.com/Expensify/App/issues/82036)
             expect(result).toBe('test');
         });
 
         it('should prefix the room preview with the last actor display name', async () => {
-            await setReport(buildRoomReport());
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
+            const reportID = '9351';
+            await setReport(buildRoomReport({reportID}));
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3, undefined, 'hello'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(comment));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man: hello');
         });
 
         it('should use "You" as the prefix when the current user sent the last message', async () => {
-            await setReport(buildRoomReport({lastActorAccountID: CURRENT_USER_ACCOUNT_ID}));
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, CURRENT_USER_ACCOUNT_ID);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
+            const reportID = '9352';
+            await setReport(
+                buildRoomReport({
+                    reportID,
+                    lastActorAccountID: CURRENT_USER_ACCOUNT_ID,
+                }),
+            );
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, CURRENT_USER_ACCOUNT_ID, undefined, 'hello'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(comment));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('You: hello');
         });
 
-        it('should omit the actor prefix when the report is archived', async () => {
-            await setReport(buildRoomReport());
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
+        it('should show the archive reason without an actor prefix when the report is archived', async () => {
+            const reportID = '9353';
+            await setReport(buildRoomReport({reportID}));
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3, undefined, 'hello'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: '',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(comment, ROOM_REPORT_ID, {isReportArchived: true}));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig({isReportArchived: true}));
 
-            expect(result).toBe('hello');
+            expect(result).toBe('This chat room has been archived.');
         });
 
-        it('should omit the actor prefix when currentUserAccountID is undefined', async () => {
-            await setReport(buildRoomReport());
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
+        it('should keep the actor prefix when currentUserAccountID is undefined', async () => {
+            const reportID = '9354';
+            await setReport(buildRoomReport({reportID}));
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3, undefined, 'hello'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(comment, ROOM_REPORT_ID, {currentUserAccountID: undefined}));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig({currentUserAccountID: undefined}));
 
-            expect(result).toBe('hello');
+            expect(result).toBe('Spider-Man: hello');
         });
 
         it('should omit the actor prefix when the last action is a report preview', async () => {
-            await setReport(buildRoomReport({lastActionType: CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, lastMessageText: 'owes $10'}));
-            const preview = buildAction(CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, 3);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'owes $10', isChatRoom: true};
+            const reportID = '9355';
+            await setReport(
+                buildRoomReport({
+                    reportID,
+                    lastActionType: CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW,
+                    lastMessageText: 'owes $10',
+                }),
+            );
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, 3, undefined, 'owes $10'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'owes $10',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(preview));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('owes $10');
         });
 
         it('should fall back to the report action person text when the actor is missing from personal details', async () => {
-            await setReport(buildRoomReport({lastActorAccountID: 999}));
+            const reportID = '9356';
+            await setReport(buildRoomReport({reportID, lastActorAccountID: 999}));
             // The fake action carries person: [{text: 'Email One'}] and account 999 is not in PERSONAL_DETAILS
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 999);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 999, undefined, 'hello'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(comment));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Email One: hello');
         });
 
         it('should replace the preview with the rename message for a RENAMED last action', async () => {
-            await setReport(buildRoomReport({lastActionType: CONST.REPORT.ACTIONS.TYPE.RENAMED, lastMessageText: 'renamed this room'}));
-            const renamed = buildAction(CONST.REPORT.ACTIONS.TYPE.RENAMED, 3, {oldName: 'Old Room', newName: 'New Room'});
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'renamed this room', isChatRoom: true};
+            const reportID = '9357';
+            await setReport(
+                buildRoomReport({
+                    reportID,
+                    lastActionType: CONST.REPORT.ACTIONS.TYPE.RENAMED,
+                    lastMessageText: 'renamed this room',
+                }),
+            );
+            await seedActions(
+                reportID,
+                buildAction(CONST.REPORT.ACTIONS.TYPE.RENAMED, 3, {
+                    oldName: 'Old Room',
+                    newName: 'New Room',
+                }),
+            );
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'renamed this room',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(renamed));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man renamed this room to "New Room" (previously "Old Room")');
         });
 
         it('should replace the preview with the leave message for a room LEAVE_ROOM last action', async () => {
-            await setReport(buildRoomReport({lastMessageText: 'left the chat'}));
-            const leave = buildAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.LEAVE_ROOM, 3);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'left the chat', isChatRoom: true};
+            const reportID = '9358';
+            await setReport(buildRoomReport({reportID, lastMessageText: 'left the chat'}));
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.LEAVE_ROOM, 3));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'left the chat',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(leave));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man: left the chat');
         });
 
         it('should prefix the action message with the actor for a policy LEAVE_ROOM last action', async () => {
-            await setReport(buildRoomReport({lastMessageText: 'left the workspace'}));
+            const reportID = '9359';
+            await setReport(buildRoomReport({reportID, lastMessageText: 'left the workspace'}));
             // The fake action's message text is 'hey'
-            const leave = buildAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_ROOM, 3);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'left the workspace', isChatRoom: true};
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_ROOM, 3));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'left the workspace',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(leave));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man: hey');
         });
 
         it('should build the invite message with member count and room name', async () => {
-            await setReport(buildRoomReport({lastMessageText: 'invited'}));
-            const invite = buildAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, 3, {targetAccountIDs: [4, 5], roomName: '#galaxy'});
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'invited', isChatRoom: true};
+            const reportID = '9360';
+            await setReport(buildRoomReport({reportID, lastMessageText: 'invited'}));
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, 3, {targetAccountIDs: [4, 5], roomName: '#galaxy'}));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'invited',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(invite));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man: invited 2 members to #galaxy');
         });
 
         it('should build the remove message with a singular member and room name', async () => {
-            await setReport(buildRoomReport({lastMessageText: 'removed'}));
-            const remove = buildAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_FROM_ROOM, 3, {targetAccountIDs: [4], roomName: '#galaxy'});
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'removed', isChatRoom: true};
+            const reportID = '9361';
+            await setReport(buildRoomReport({reportID, lastMessageText: 'removed'}));
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_FROM_ROOM, 3, {targetAccountIDs: [4], roomName: '#galaxy'}));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'removed',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(remove));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man: removed 1 member from #galaxy');
         });
 
         it('should count invited members from lastMessageHtml mentions when targetAccountIDs is empty', async () => {
+            const reportID = '9362';
             await setReport(
                 buildRoomReport({
+                    reportID,
                     lastMessageText: 'invited',
                     lastMessageHtml: '<mention-user accountID="4"></mention-user> <mention-user accountID="5"></mention-user>',
                 }),
             );
-            const invite = buildAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, 3, {targetAccountIDs: []});
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'invited', isChatRoom: true};
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, 3, {targetAccountIDs: []}));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'invited',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(invite));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man: invited 2 members');
         });
 
-        it.each([CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, CONST.REPORT.ACTIONS.TYPE.RETRACTED])(
-            'should suppress the actor prefix for %s because its text already embeds the actor',
-            async (actionName) => {
-                await setReport(buildRoomReport({lastActionType: actionName, lastMessageText: 'issued a new card'}));
-                const action = buildAction(actionName, 3);
-                const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'issued a new card', isChatRoom: true};
+        it.each([
+            [CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, 'issued @Hidden an Expensify Card! The card will arrive in 2-3 business days.'],
+            [CONST.REPORT.ACTIONS.TYPE.RETRACTED, 'retracted'],
+        ])('should suppress the actor prefix for %s because its text already embeds the actor', async (actionName, expectedText) => {
+            const reportID = actionName === CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED ? '9363' : '9364';
+            await setReport(
+                buildRoomReport({
+                    reportID,
+                    lastActionType: actionName,
+                    lastMessageText: 'issued a new card',
+                }),
+            );
+            await seedActions(reportID, buildAction(actionName, 3));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'issued a new card',
+                isChatRoom: true,
+            };
 
-                const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(action));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
-                expect(result).toBe('issued a new card');
-            },
-        );
+            expect(result).toBe(expectedText);
+        });
 
-        it('should skip whisper actions when picking the last visible action from sortedActions', async () => {
-            await setReport(buildRoomReport());
+        it('should skip whisper actions when picking the last visible action', async () => {
+            const reportID = '9365';
+            await setReport(buildRoomReport({reportID}));
             // getWhisperedTo prefers message.whisperedTo over originalMessage, so mark the whisper there
             const whisper = {
                 ...buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 4),
-                message: [{type: 'COMMENT', html: 'psst', text: 'psst', isEdited: false, whisperedTo: [999], isDeletedParentAction: false}],
+                reportActionID: '2',
+                created: '2024-01-02 10:00:00.000',
+                message: [
+                    {
+                        type: 'COMMENT',
+                        html: 'psst',
+                        text: 'psst',
+                        isEdited: false,
+                        whisperedTo: [999],
+                        isDeletedParentAction: false,
+                    },
+                ],
+            } as ReportAction;
+            const comment = {
+                ...buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3, undefined, 'hello'),
+                reportActionID: '1',
+                created: '2024-01-01 10:00:00.000',
             } as ReportAction;
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3);
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
+            await seedActions(reportID, whisper, comment);
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+            };
 
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(undefined, ROOM_REPORT_ID, {sortedActions: {[ROOM_REPORT_ID]: [whisper, comment]}}));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(result).toBe('Spider-Man: hello');
         });
 
-        it('should resolve the same last action from Onyx when sortedActions is not provided', async () => {
-            // Dedicated reportID: module-level report-action caches survive Onyx.clear(), so writing
-            // REPORT_ACTIONS for the shared room would poison later tests that reuse its reportID.
-            const onyxRoomReportID = '9150';
-            await setReport(buildRoomReport({reportID: onyxRoomReportID}));
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3);
-            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${onyxRoomReportID}`, {[comment.reportActionID]: comment});
-            await waitForBatchedUpdates();
-            const option: OptionData = {reportID: onyxRoomReportID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
+        it('should resolve the last action from the live report-action collection', async () => {
+            const reportID = '9150';
+            await setReport(buildRoomReport({reportID}));
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3, undefined, 'hello'));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+            };
 
-            const withSortedActions = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(comment, onyxRoomReportID));
-            const fromOnyx = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(undefined, onyxRoomReportID));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
-            expect(fromOnyx).toBe('Spider-Man: hello');
-            expect(fromOnyx).toBe(withSortedActions);
+            expect(result).toBe('Spider-Man: hello');
         });
 
         it('should fall back to type subtitles when showChatPreviewLine is false', async () => {
             await setReport(buildRoomReport());
-            const roomOption: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true, subtitle: 'Custom subtitle'};
-            const threadOption: OptionData = {reportID: '', keyForList: '', isThread: true};
+            const roomOption: OptionData = {
+                reportID: ROOM_REPORT_ID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+                subtitle: 'Custom subtitle',
+            };
+            const threadOption: OptionData = {
+                reportID: '',
+                keyForList: '',
+                isThread: true,
+            };
 
             expect(getAlternateText(roomOption, {showChatPreviewLine: false}, buildConfig())).toBe('Custom subtitle');
             expect(getAlternateText(threadOption, {showChatPreviewLine: false}, buildConfig())).toBe(translateLocal('threads.thread'));
@@ -6094,13 +6397,14 @@ describe('OptionsListUtils', () => {
 
         it('should thread currentUserAccountID through getValidOptions to build the actor prefix', async () => {
             // Given a room whose last visible action is a comment from another user
-            const report = buildRoomReport();
+            const reportID = '9366';
+            const report = buildRoomReport({reportID});
             await setReport(report);
-            const comment = buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3);
+            await seedActions(reportID, buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3, undefined, 'hello'));
 
             const optionList = createFilteredOptionList(
                 PERSONAL_DETAILS,
-                {[ROOM_REPORT_ID]: report},
+                {[reportID]: report},
                 undefined,
                 EMPTY_PRIVATE_IS_ARCHIVED_MAP,
                 undefined,
@@ -6129,25 +6433,35 @@ describe('OptionsListUtils', () => {
                     showChatPreviewLine: true,
                     includeMultipleParticipantReports: true,
                     personalDetails: PERSONAL_DETAILS,
-                    sortedActions: {[ROOM_REPORT_ID]: [comment]},
                 },
                 translateLocal,
                 undefined,
             );
 
             // Then the search option preview matches the LHN format: `Name: message`
-            const roomOption = options.recentReports.find((option) => option.reportID === ROOM_REPORT_ID);
+            const roomOption = options.recentReports.find((option) => option.reportID === reportID);
             expect(roomOption?.alternateText).toBe('Spider-Man: hello');
         });
 
         it('should match the LHN alternate text from SidebarUtils.getOptionData for the same room and last action', async () => {
-            const report = buildRoomReport();
+            const reportID = '9367';
+            const report = buildRoomReport({reportID});
             await setReport(report);
             // Align the action's own message with report.lastMessageText — the LHN reads the former, search options the latter
             const comment = {
                 ...buildAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, 3),
-                message: [{type: 'COMMENT', html: 'hello', text: 'hello', isEdited: false, whisperedTo: [], isDeletedParentAction: false}],
+                message: [
+                    {
+                        type: 'COMMENT',
+                        html: 'hello',
+                        text: 'hello',
+                        isEdited: false,
+                        whisperedTo: [],
+                        isDeletedParentAction: false,
+                    },
+                ],
             } as ReportAction;
+            await seedActions(reportID, comment);
 
             const lhnOption = SidebarUtils.getOptionData({
                 rules: undefined,
@@ -6174,8 +6488,13 @@ describe('OptionsListUtils', () => {
                 formatPhoneNumber,
             });
 
-            const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'hello', isChatRoom: true};
-            const searchAlternateText = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(comment));
+            const option: OptionData = {
+                reportID,
+                keyForList: '',
+                lastMessageText: 'hello',
+                isChatRoom: true,
+            };
+            const searchAlternateText = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             expect(lhnOption?.alternateText).toBe('Spider-Man: hello');
             expect(searchAlternateText).toBe(lhnOption?.alternateText);
@@ -6186,12 +6505,26 @@ describe('OptionsListUtils', () => {
             async (actionName) => {
                 // Given a room whose last action is a policy change log action that has no custom
                 // alternate text branch in SidebarUtils.getOptionData, so the LHN shows `Name: message`
-                const report = buildRoomReport({lastMessageText: 'updated a custom unit'});
+                const reportID = actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_CUSTOM_UNIT ? '9368' : '9369';
+                const report = buildRoomReport({
+                    reportID,
+                    lastMessageText: 'updated a custom unit',
+                });
                 await setReport(report);
                 const action = {
                     ...buildAction(actionName, 3),
-                    message: [{type: 'COMMENT', html: 'updated a custom unit', text: 'updated a custom unit', isEdited: false, whisperedTo: [], isDeletedParentAction: false}],
+                    message: [
+                        {
+                            type: 'COMMENT',
+                            html: 'updated a custom unit',
+                            text: 'updated a custom unit',
+                            isEdited: false,
+                            whisperedTo: [],
+                            isDeletedParentAction: false,
+                        },
+                    ],
                 } as ReportAction;
+                await seedActions(reportID, action);
 
                 const lhnOption = SidebarUtils.getOptionData({
                     rules: undefined,
@@ -6218,8 +6551,13 @@ describe('OptionsListUtils', () => {
                     formatPhoneNumber,
                 });
 
-                const option: OptionData = {reportID: ROOM_REPORT_ID, keyForList: '', lastMessageText: 'updated a custom unit', isChatRoom: true};
-                const searchAlternateText = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(action));
+                const option: OptionData = {
+                    reportID,
+                    keyForList: '',
+                    lastMessageText: 'updated a custom unit',
+                    isChatRoom: true,
+                };
+                const searchAlternateText = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
                 expect(lhnOption?.alternateText).toBe('Spider-Man: updated a custom unit');
                 expect(searchAlternateText).toBe(lhnOption?.alternateText);
@@ -6271,22 +6609,37 @@ describe('OptionsListUtils', () => {
                 reportActionID: '9402',
                 reportID: TRANSACTION_THREAD_REPORT_ID,
                 created: '2024-01-02 10:00:00.000',
-                message: [{type: 'COMMENT', html: 'thread comment', text: 'thread comment', isEdited: false, whisperedTo: [], isDeletedParentAction: false}],
+                message: [
+                    {
+                        type: 'COMMENT',
+                        html: 'thread comment',
+                        text: 'thread comment',
+                        isEdited: false,
+                        whisperedTo: [],
+                        isDeletedParentAction: false,
+                    },
+                ],
             };
 
             // Reports must exist before the report actions merge so the one-transaction thread caches resolve the thread ID
             await setReport(expenseReport);
             await setReport(transactionThreadReport);
             await Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${EXPENSE_REPORT_ID}`]: {[iouAction.reportActionID]: iouAction},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${EXPENSE_REPORT_ID}`]: {
+                    [iouAction.reportActionID]: iouAction,
+                },
                 [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${TRANSACTION_THREAD_REPORT_ID}`]: {[threadComment.reportActionID]: threadComment},
             });
             await waitForBatchedUpdates();
 
-            const option: OptionData = {reportID: EXPENSE_REPORT_ID, keyForList: '', lastMessageText: 'thread comment', isMoneyRequestReport: true};
+            const option: OptionData = {
+                reportID: EXPENSE_REPORT_ID,
+                keyForList: '',
+                lastMessageText: 'thread comment',
+                isMoneyRequestReport: true,
+            };
 
-            // When the alternate text is built without sortedActions, forcing the fallback last-action lookup
-            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig(undefined, EXPENSE_REPORT_ID));
+            const result = getAlternateText(option, {showChatPreviewLine: true}, buildConfig());
 
             // Then the actor prefix comes from the transaction thread comment, not from the parent report's IOU action
             expect(result).toBe('Spider-Man: thread comment');
@@ -6739,6 +7092,63 @@ describe('OptionsListUtils', () => {
         });
     });
 
+    describe('doesReportMatchSearchTerms()', () => {
+        const report: SearchOption<Report> = {
+            reportID: 'email',
+            keyForList: 'email',
+            text: '123123',
+            login: 'person@gmail.com',
+            item: createRandomReport(1, undefined),
+        };
+
+        it('matches an email query against an email address', () => {
+            // Given a report with a matching email address
+            // When the query is an email search
+            const doesMatch = doesReportMatchSearchTerms(report, ['person@']);
+
+            // Then the report matches
+            expect(doesMatch).toBe(true);
+        });
+
+        it('matches an uppercase accented query against a group participant', () => {
+            // Given a group report with an accented participant name
+            // cspell:ignore José JOSÉ
+            const groupReport: SearchOption<Report> = {
+                ...report,
+                item: {...createRandomReport(1, undefined), chatType: CONST.REPORT.CHAT_TYPE.GROUP},
+                participantsList: [{accountID: 2, displayName: 'José', login: 'jose@example.com'}],
+            };
+
+            // When the query uses the same accented name in uppercase
+            const doesMatch = doesReportMatchSearchTerms(groupReport, ['JOSÉ']);
+
+            // Then the group report matches
+            expect(doesMatch).toBe(true);
+        });
+
+        // cspell:ignore 김민수 山田太郎 Ирина Смирнова Νίκος Παπαδόπουλος Nguyễn Minh
+        it.each([
+            {writingSystem: 'Korean', displayName: '김민수'},
+            {writingSystem: 'Japanese', displayName: '山田太郎'},
+            {writingSystem: 'Cyrillic', displayName: 'Ирина Смирнова'},
+            {writingSystem: 'Greek', displayName: 'Νίκος Παπαδόπουλος'},
+            {writingSystem: 'Vietnamese', displayName: 'Nguyễn Thị Minh'},
+        ])('matches a group participant using $writingSystem text', ({displayName}) => {
+            // Given a group report with a participant name in that writing system
+            const groupReport: SearchOption<Report> = {
+                ...report,
+                item: {...createRandomReport(1, undefined), chatType: CONST.REPORT.CHAT_TYPE.GROUP},
+                participantsList: [{accountID: 2, displayName, login: 'participant@example.com'}],
+            };
+
+            // When the query uses that participant name
+            const doesMatch = doesReportMatchSearchTerms(groupReport, [displayName]);
+
+            // Then the group report matches
+            expect(doesMatch).toBe(true);
+        });
+    });
+
     describe('getMostRecentOptions()', () => {
         it('returns the most recent options up to the specified limit', () => {
             const options: OptionData[] = [
@@ -7476,9 +7886,9 @@ describe('OptionsListUtils', () => {
     describe('getPersonalDetailSearchTerms', () => {
         it('should include display name', () => {
             const displayName = 'test';
-            const searchTerms = getPersonalDetailSearchTerms({displayName}, CURRENT_USER_ACCOUNT_ID);
+            const searchTerms = getPersonalDetailSearchTerms({displayName}, CURRENT_USER_ACCOUNT_ID, translateLocal);
             expect(searchTerms.includes(displayName)).toBe(true);
-            const searchTerms2 = getPersonalDetailSearchTerms({participantsList: [{displayName, accountID: 123}]}, CURRENT_USER_ACCOUNT_ID);
+            const searchTerms2 = getPersonalDetailSearchTerms({participantsList: [{displayName, accountID: 123}]}, CURRENT_USER_ACCOUNT_ID, translateLocal);
             expect(searchTerms2.includes(displayName)).toBe(true);
         });
     });
@@ -7486,9 +7896,9 @@ describe('OptionsListUtils', () => {
     describe('getCurrentUserSearchTerms', () => {
         it('should include display name', () => {
             const displayName = 'test';
-            const searchTerms = getCurrentUserSearchTerms({displayName});
+            const searchTerms = getCurrentUserSearchTerms({displayName}, translateLocal);
             expect(searchTerms.includes(displayName)).toBe(true);
-            const searchTerms2 = getCurrentUserSearchTerms({text: displayName});
+            const searchTerms2 = getCurrentUserSearchTerms({text: displayName}, translateLocal);
             expect(searchTerms2.includes(displayName)).toBe(true);
         });
     });
@@ -10067,21 +10477,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
 
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'newuser@example.com',
-                COUNTRY_CODE,
+                searchInputValue: 'newuser@example.com',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             expect(filteredOptions.userToInvite).not.toBeNull();
             expect(filteredOptions.userToInvite?.login).toBe('newuser@example.com');
@@ -10102,21 +10514,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
 
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'anotheruser@example.com',
-                COUNTRY_CODE,
+                searchInputValue: 'anotheruser@example.com',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             expect(filteredOptions.userToInvite).not.toBeNull();
             expect(filteredOptions.userToInvite?.login).toBe('anotheruser@example.com');
@@ -10136,21 +10550,23 @@ describe('OptionsListUtils', () => {
                 undefined,
             );
 
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                CURRENT_USER_EMAIL,
-                COUNTRY_CODE,
+                searchInputValue: CURRENT_USER_EMAIL,
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             expect(filteredOptions.userToInvite).toBeNull();
         });
@@ -10332,21 +10748,23 @@ describe('OptionsListUtils', () => {
             );
 
             // When we call filterAndOrderOptions with the reports parameter
-            const filteredOptions = filterAndOrderOptions(
+            const filteredOptions = filterAndOrderOptions({
                 options,
-                'spider',
-                COUNTRY_CODE,
+                searchInputValue: 'spider',
+                countryCode: COUNTRY_CODE,
                 loginList,
-                CURRENT_USER_EMAIL,
-                CURRENT_USER_ACCOUNT_ID,
-                PERSONAL_DETAILS,
-                {
+                currentUserEmail: CURRENT_USER_EMAIL,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: PERSONAL_DETAILS,
+                config: {
                     dateFnsLocale: undefined,
                     currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
                     convertToDisplayString,
                 },
-                undefined,
-            );
+                translate: translateLocal,
+                rules: undefined,
+                activePolicyID,
+            });
 
             // Then the function should complete without errors and return valid results
             expect(filteredOptions).toBeDefined();
diff --git a/tests/unit/ParserTest.ts b/tests/unit/ParserTest.ts
index acaeb0a6db61..6c2c217fcd92 100644
--- a/tests/unit/ParserTest.ts
+++ b/tests/unit/ParserTest.ts
@@ -57,6 +57,16 @@ describe('Parser', () => {
         test('returns @Hidden for mention when accountID is missing from the map', () => {
             expect(Parser.htmlToMarkdown('<mention-user accountID="123" />', {accountIDToName: {}})).toBe('@Hidden');
         });
+
+        test('resolves mention-report reportID to report name via reportIDToName map', () => {
+            const reportIDToName: Record<string, string> = {};
+            reportIDToName['42'] = 'Expense Report';
+            expect(Parser.htmlToMarkdown('<mention-report reportID="42" />', {reportIDToName})).toBe('Expense Report');
+        });
+
+        test('returns #Hidden for mention-report when reportID is missing from the map', () => {
+            expect(Parser.htmlToMarkdown('<mention-report reportID="42" />', {reportIDToName: {}})).toBe('#Hidden');
+        });
     });
 
     describe('htmlToText', () => {
@@ -69,5 +79,15 @@ describe('Parser', () => {
         test('returns @Hidden for mention when accountID is missing from the map', () => {
             expect(Parser.htmlToText('<mention-user accountID="456" />', {accountIDToName: {}})).toBe('@Hidden');
         });
+
+        test('resolves mention-report reportID to report name via reportIDToName map', () => {
+            const reportIDToName: Record<string, string> = {};
+            reportIDToName['99'] = 'Trip Report';
+            expect(Parser.htmlToText('<mention-report reportID="99" />', {reportIDToName})).toBe('Trip Report');
+        });
+
+        test('returns #Hidden for mention-report when reportID is missing from the map', () => {
+            expect(Parser.htmlToText('<mention-report reportID="99" />', {reportIDToName: {}})).toBe('#Hidden');
+        });
     });
 });
diff --git a/tests/unit/PaymentHistoryUtilsTest.ts b/tests/unit/PaymentHistoryUtilsTest.ts
new file mode 100644
index 000000000000..f3791879ebbb
--- /dev/null
+++ b/tests/unit/PaymentHistoryUtilsTest.ts
@@ -0,0 +1,121 @@
+import {getPaymentHistoryRows} from '@libs/PaymentHistoryUtils';
+
+import CONST from '@src/CONST';
+import type {Purchase} from '@src/types/onyx/PurchaseList';
+
+function createPurchase(purchaseID: number, created: string, message: Purchase['message'] = {}, amount = 1000): Purchase {
+    return {
+        purchaseID,
+        created,
+        amount,
+        currency: CONST.CURRENCY.USD,
+        message,
+    };
+}
+
+describe('getPaymentHistoryRows', () => {
+    it('lists one row per bill, newest first', () => {
+        // Given bills from three different months, listed oldest first
+        const purchaseList = [createPurchase(1, '2026-02-01'), createPurchase(2, '2026-08-01'), createPurchase(3, '2026-03-01', {billingType: CONST.BILLING.TYPE_CLEAR})];
+
+        // When the table rows are built
+        const rows = getPaymentHistoryRows(purchaseList);
+
+        // Then each bill is kept and the newest month is first
+        expect(rows.map((row) => row.purchaseID)).toEqual([2, 3, 1]);
+        expect(rows.at(0)?.state).toBe(CONST.PAYMENT_HISTORY.STATE.PAID);
+        expect(rows.at(1)?.state).toBe(CONST.PAYMENT_HISTORY.STATE.CLEARED);
+    });
+
+    it('folds a refund, dispute, or balance transfer onto the bill it changes', () => {
+        // Given a bill that was later refunded, one that was disputed, and one whose balance moved
+        const purchaseList = [
+            createPurchase(10, '2026-02-01'),
+            createPurchase(11, '2026-03-01'),
+            createPurchase(12, '2026-04-01'),
+            createPurchase(20, '2026-09-01', {billingType: CONST.BILLING.TYPE_REFUND, refundPurchaseID: 10}),
+            createPurchase(21, '2026-10-04', {billingType: CONST.BILLING.TYPE_DISPUTE, disputePurchaseID: 11}),
+            createPurchase(22, '2026-11-04', {billingType: CONST.BILLING.TYPE_TRANSFER, fromPurchaseID: 12}),
+        ];
+
+        // When the table rows are built
+        const rows = getPaymentHistoryRows(purchaseList);
+
+        // Then the modifier purchases are not their own rows, and the bill carries that state
+        expect(rows.map((row) => row.purchaseID)).toEqual([12, 11, 10]);
+        expect(rows.map((row) => row.state)).toEqual([CONST.PAYMENT_HISTORY.STATE.BALANCE_TRANSFER, CONST.PAYMENT_HISTORY.STATE.DISPUTED, CONST.PAYMENT_HISTORY.STATE.REFUNDED]);
+    });
+
+    it('folds a cleared payment onto the failed bill it pays', () => {
+        // Given a failed bill that was paid on a later clear purchase
+        const purchaseList = [
+            createPurchase(10, '2026-02-01', {billingType: CONST.BILLING.TYPE_FAILED, billableAmount: 2700}, 0),
+            createPurchase(20, '2026-03-01', {billingType: CONST.BILLING.TYPE_CLEAR, failedPurchaseID: 10}, 2700),
+        ];
+
+        // When the table rows are built
+        const rows = getPaymentHistoryRows(purchaseList);
+
+        // Then the clear is not its own row, and the original bill shows as cleared for the amount that was due
+        expect(rows).toHaveLength(1);
+        expect(rows.at(0)?.purchaseID).toBe(10);
+        expect(rows.at(0)?.state).toBe(CONST.PAYMENT_HISTORY.STATE.CLEARED);
+        expect(rows.at(0)?.amount).toBe(2700);
+    });
+
+    it('keeps the later change when a bill is both disputed and refunded', () => {
+        // Given a bill that was disputed and then refunded
+        const purchaseList = [
+            createPurchase(10, '2026-02-01'),
+            createPurchase(20, '2026-03-01', {billingType: CONST.BILLING.TYPE_DISPUTE, disputePurchaseID: 10}),
+            createPurchase(21, '2026-04-01', {billingType: CONST.BILLING.TYPE_REFUND, refundPurchaseID: 10}),
+        ];
+
+        // When the table rows are built
+        const rows = getPaymentHistoryRows(purchaseList);
+
+        // Then the refund replaces the dispute, because it happened later
+        expect(rows).toHaveLength(1);
+        expect(rows.at(0)?.state).toBe(CONST.PAYMENT_HISTORY.STATE.REFUNDED);
+    });
+
+    it('marks failed bills and shows tax only when it was charged', () => {
+        // Given a failed bill that includes tax, a taxed bill for an exempt account, and a plain paid bill
+        const purchaseList = [
+            createPurchase(1, '2026-08-01', {billingType: CONST.BILLING.TYPE_FAILED_2018, billableAmount: 2700, salesTaxCharged: true}, 0),
+            createPurchase(2, '2026-03-01', {salesTaxCharged: true, salesTaxExempt: true}),
+            createPurchase(3, '2026-02-01', {salesTaxCharged: true}),
+        ];
+
+        // When the table rows are built
+        const rows = getPaymentHistoryRows(purchaseList);
+
+        // Then the failed bill uses the amount that was due, and tax is hidden for the exempt account
+        const failed = rows.find((row) => row.purchaseID === 1);
+        const exempt = rows.find((row) => row.purchaseID === 2);
+        const taxed = rows.find((row) => row.purchaseID === 3);
+        expect(failed?.state).toBe(CONST.PAYMENT_HISTORY.STATE.FAILED);
+        expect(failed?.amount).toBe(2700);
+        expect(failed?.showsTax).toBe(true);
+        expect(exempt?.showsTax).toBe(false);
+        expect(taxed?.showsTax).toBe(true);
+    });
+
+    it('counts each billed person once when they appear on more than one workspace', () => {
+        // Given a bill whose actor lists repeat the same person across workspaces
+        const purchaseList = [
+            createPurchase(1, '2026-02-01', {
+                billablePolicies: {
+                    first: {actorList: 'ada@example.com,bob@example.com'},
+                    second: {actorList: 'bob@example.com'},
+                },
+            }),
+        ];
+
+        // When the table rows are built
+        const rows = getPaymentHistoryRows(purchaseList);
+
+        // Then the repeated person is counted once
+        expect(rows.at(0)?.activeUserCount).toBe(2);
+    });
+});
diff --git a/tests/unit/PolicyAccountingPageQBOTokenExpiryTest.tsx b/tests/unit/PolicyAccountingPageQBOTokenExpiryTest.tsx
new file mode 100644
index 000000000000..94038a342332
--- /dev/null
+++ b/tests/unit/PolicyAccountingPageQBOTokenExpiryTest.tsx
@@ -0,0 +1,223 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+import type {PopoverMenuItem} from '@components/PopoverMenu';
+import type TextComponent from '@components/Text';
+
+import DateUtils from '@libs/DateUtils';
+
+import PolicyAccountingPage from '@pages/workspace/accounting/PolicyAccountingPage';
+
+import CONST from '@src/CONST';
+import IntlStore from '@src/languages/IntlStore';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type Policy from '@src/types/onyx/Policy';
+
+import type * as ReactNavigation from '@react-navigation/native';
+
+import {addDays, getUnixTime, subDays} from 'date-fns';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../utils/collections/policies';
+import createMock from '../utils/createMock';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+const POLICY_ID = 'policy-1';
+const OVERFLOW_MENU_ITEM_PREFIX = 'overflow:';
+
+const mockStartIntegrationFlow = jest.fn();
+let mockCanWriteAccounting = true;
+
+jest.mock('@react-navigation/native', () => {
+    const actualNavigation = jest.requireActual<typeof ReactNavigation>('@react-navigation/native');
+    return {
+        ...actualNavigation,
+        useFocusEffect: () => {},
+        useRoute: () => ({params: {}}),
+        useNavigation: () => ({}),
+        useIsFocused: () => true,
+    };
+});
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {
+        setParams: jest.fn(),
+        navigate: jest.fn(),
+        goBack: jest.fn(),
+        isNavigationReady: () => Promise.resolve(),
+    },
+}));
+
+jest.mock('@pages/workspace/accounting/AccountingContext', () => ({
+    __esModule: true,
+    AccountingContextProvider: ({children}: {children: React.ReactNode}) => children,
+    useAccountingActions: () => ({startIntegrationFlow: mockStartIntegrationFlow}),
+    useAccountingState: () => ({activeIntegration: undefined, popoverAnchorRefs: {current: {}}}),
+}));
+
+jest.mock('@pages/workspace/withPolicyConnections', () => ({
+    __esModule: true,
+    default: (Component: React.ComponentType<{policy: Policy}>) => Component,
+}));
+
+jest.mock('@pages/workspace/AccessOrNotFoundWrapper', () => ({
+    __esModule: true,
+    default: ({children}: {children: React.ReactNode}) => children,
+}));
+
+jest.mock('@components/ScreenWrapper', () => ({
+    __esModule: true,
+    default: ({children}: {children: React.ReactNode}) => children,
+}));
+
+jest.mock('@components/ScrollView', () => ({
+    __esModule: true,
+    default: ({children}: {children: React.ReactNode}) => children,
+}));
+
+jest.mock('@components/HeaderWithBackButton', () => ({__esModule: true, default: () => null}));
+jest.mock('@components/MenuItemList', () => ({__esModule: true, default: () => null}));
+jest.mock('@components/Section', () => ({__esModule: true, default: ({children}: {children: React.ReactNode}) => children}));
+jest.mock('@components/CollapsibleSection', () => ({__esModule: true, default: () => null}));
+jest.mock('@components/ActivityIndicator', () => ({__esModule: true, default: () => null}));
+
+// The real menu only renders its entries inside a popover once pressed. Rendering their labels inline lets the tests
+// read which credentials entry the page offers without driving the popover.
+jest.mock('@components/ThreeDotsMenu', () => {
+    const {default: MockText} = jest.requireActual<{default: typeof TextComponent}>('@components/Text');
+    return {
+        __esModule: true,
+        default: ({menuItems}: {menuItems: PopoverMenuItem[]}) => menuItems.map((menuItem) => <MockText key={menuItem.text}>{`${OVERFLOW_MENU_ITEM_PREFIX}${menuItem.text}`}</MockText>),
+    };
+});
+
+jest.mock('@hooks/usePolicyFeatureWriteAccess', () => ({
+    __esModule: true,
+    default: () => ({canWrite: mockCanWriteAccounting, showReadOnlyModal: () => {}}),
+}));
+
+// The real `withPolicyConnections` HOC reads `policy` from Onyx and strips it from the component's public props. It is
+// mocked to an identity wrapper above, so the component under test takes `policy` directly.
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- test-only: the HOC that would inject `policy` is mocked out, so it is passed as a prop here
+const PolicyAccountingPageUnderTest = PolicyAccountingPage as unknown as React.ComponentType<{policy: Policy}>;
+
+/**
+ * A healthy QBO connection (synced, no error) whose refresh token expires at the given time. `data` is populated so the
+ * connection does not read as a first sync still in progress.
+ */
+function buildQBOPolicy(refreshTokenExpiresAt: Date, isAuthenticationError = false): Policy {
+    return {
+        ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE, 'Test workspace'),
+        id: POLICY_ID,
+        connections: createMock<Policy['connections']>({
+            [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                config: {
+                    credentials: {
+                        companyID: '12345',
+                        refreshTokenExpiresAt: getUnixTime(refreshTokenExpiresAt),
+                    },
+                },
+                data: {},
+                lastSync: {
+                    isSuccessful: !isAuthenticationError,
+                    isAuthenticationError,
+                    isConnected: true,
+                    successfulDate: subDays(new Date(), 1).toISOString(),
+                    source: 'NEWEXPENSIFY',
+                },
+            },
+        }),
+    };
+}
+
+function formatExpiryDate(expiryDate: Date): string {
+    return DateUtils.formatWithUTCTimeZone(expiryDate.toISOString(), CONST.DATE.MONTH_DAY_YEAR_FORMAT, undefined);
+}
+
+async function renderPage(policy: Policy) {
+    render(
+        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
+            <PolicyAccountingPageUnderTest policy={policy} />
+        </ComposeProviders>,
+    );
+    await waitForBatchedUpdates();
+}
+
+describe('PolicyAccountingPage QBO refresh token expiry warning', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+        IntlStore.load(CONST.LOCALES.EN);
+        return waitForBatchedUpdates();
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockCanWriteAccounting = true;
+    });
+
+    it('should warn with the expiry date and offer to reconnect when the token expires within the warning window', async () => {
+        // Given a healthy QBO connection whose refresh token expires in a few days
+        const expiryDate = addDays(new Date(), 3);
+        await renderPage(buildQBOPolicy(expiryDate));
+
+        // Then the connection row explains when the connection will expire
+        expect(screen.getByText(`Your QuickBooks Online connection expires on ${formatExpiryDate(expiryDate)}.`, {exact: false})).toBeOnTheScreen();
+
+        // And the overflow menu gains a credentials entry that reads Reconnect rather than Enter your credentials
+        expect(screen.getByText(`${OVERFLOW_MENU_ITEM_PREFIX}Reconnect`)).toBeOnTheScreen();
+        expect(screen.queryByText(`${OVERFLOW_MENU_ITEM_PREFIX}Enter your credentials`)).not.toBeOnTheScreen();
+
+        // When the user presses the Reconnect link in the warning
+        fireEvent.press(screen.getByRole('link', {name: 'Reconnect'}), {preventDefault: () => {}});
+
+        // Then the QBO connect flow starts so a fresh token is issued before the current one lapses
+        expect(mockStartIntegrationFlow).toHaveBeenCalledTimes(1);
+        expect(mockStartIntegrationFlow).toHaveBeenCalledWith({name: CONST.POLICY.CONNECTIONS.NAME.QBO, isIntuitEnterpriseSuite: false});
+    });
+
+    it('should say the connection expired when the token is past its expiry but no sync has failed yet', async () => {
+        // Given a QBO connection whose refresh token lapsed yesterday while the last sync still reads as successful
+        const expiryDate = subDays(new Date(), 1);
+        await renderPage(buildQBOPolicy(expiryDate));
+
+        // Then the row says the connection already expired and still offers to reconnect
+        expect(screen.getByText(`Your QuickBooks Online connection expired on ${formatExpiryDate(expiryDate)}.`, {exact: false})).toBeOnTheScreen();
+        expect(screen.getByRole('link', {name: 'Reconnect'})).toBeOnTheScreen();
+    });
+
+    it('should not warn while the token is still far from expiring', async () => {
+        // Given a healthy QBO connection whose refresh token is valid well past the warning window
+        await renderPage(buildQBOPolicy(addDays(new Date(), CONST.POLICY.CONNECTIONS.QBO_REFRESH_TOKEN_EXPIRY_WARNING_DAYS + 30)));
+
+        // Then no expiry warning is shown and the overflow menu offers no credentials entry, as a healthy QBO connection
+        // has nothing to re-enter
+        expect(screen.queryByText('Your QuickBooks Online connection', {exact: false})).not.toBeOnTheScreen();
+        expect(screen.queryByRole('link', {name: 'Reconnect'})).not.toBeOnTheScreen();
+        expect(screen.queryByText(`${OVERFLOW_MENU_ITEM_PREFIX}Reconnect`)).not.toBeOnTheScreen();
+        expect(screen.queryByText(`${OVERFLOW_MENU_ITEM_PREFIX}Enter your credentials`)).not.toBeOnTheScreen();
+    });
+
+    it('should leave the authentication error in charge once a sync has already failed on the expired token', async () => {
+        // Given a QBO connection whose token lapsed and whose last sync already failed to authenticate
+        await renderPage(buildQBOPolicy(subDays(new Date(), 1), true));
+
+        // Then the standard authentication error is shown instead of a second, redundant expiry warning
+        expect(screen.queryByText('Your QuickBooks Online connection', {exact: false})).not.toBeOnTheScreen();
+        expect(screen.getByText('due to an authentication error', {exact: false})).toBeOnTheScreen();
+    });
+
+    it('should not warn a member who can only read the accounting settings', async () => {
+        // Given a QBO connection whose refresh token expires in a few days, viewed by a member without write access to accounting
+        mockCanWriteAccounting = false;
+        await renderPage(buildQBOPolicy(addDays(new Date(), 3)));
+
+        // Then no expiry warning or Reconnect link is shown, since reconnecting is a write action this member cannot take
+        expect(screen.queryByText('Your QuickBooks Online connection', {exact: false})).not.toBeOnTheScreen();
+        expect(screen.queryByRole('link', {name: 'Reconnect'})).not.toBeOnTheScreen();
+        expect(screen.queryByText(`${OVERFLOW_MENU_ITEM_PREFIX}Reconnect`)).not.toBeOnTheScreen();
+    });
+});
diff --git a/tests/unit/PolicyDistanceRatesUtilsTest.ts b/tests/unit/PolicyDistanceRatesUtilsTest.ts
index ca20d1adc981..2e62cc54a0b1 100644
--- a/tests/unit/PolicyDistanceRatesUtilsTest.ts
+++ b/tests/unit/PolicyDistanceRatesUtilsTest.ts
@@ -1,5 +1,7 @@
 import {
     getDistanceExpenseTypeForPolicy,
+    getDistanceRateNameError,
+    getDistanceRateValueError,
     getExpectedUnitForCurrency,
     getGovernmentRateCountryForCurrency,
     getGovernmentRateCountryPhraseTranslationKey,
@@ -251,4 +253,55 @@ describe('PolicyDistanceRatesUtils', () => {
             expect(getDistanceExpenseTypeForPolicy(buildPolicy({requireMapOrGPS: true}), undefined)).toBeUndefined();
         });
     });
+
+    describe('getDistanceRateNameError', () => {
+        const existingRateNames = ['IRS', 'Custom rate'];
+
+        it('should return required when the name is empty or only whitespace', () => {
+            expect(getDistanceRateNameError(existingRateNames, '')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getDistanceRateNameError(existingRateNames, '   ')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getDistanceRateNameError(existingRateNames, '\u200B')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+        });
+
+        it('should return existing when the name matches another rate', () => {
+            expect(getDistanceRateNameError(existingRateNames, 'IRS')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+            expect(getDistanceRateNameError(existingRateNames, ' Custom rate ')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+        });
+
+        it('should not flag a rate as a duplicate of its own name', () => {
+            expect(getDistanceRateNameError(existingRateNames, 'IRS', 'IRS')).toBeUndefined();
+        });
+
+        it('should return tooLong when the name exceeds the character limit', () => {
+            const tooLongName = 'a'.repeat(CONST.TAX_RATES.NAME_MAX_LENGTH + 1);
+            expect(getDistanceRateNameError(existingRateNames, tooLongName)).toBe(CONST.INPUT_VALIDATION_ERRORS.TOO_LONG);
+        });
+
+        it('should accept a unique name within the character limit', () => {
+            expect(getDistanceRateNameError(existingRateNames, 'New rate')).toBeUndefined();
+        });
+    });
+
+    describe('getDistanceRateValueError', () => {
+        const toLocaleDigit = (digit: string) => digit;
+
+        it('should return invalid when the rate is empty or not a number', () => {
+            expect(getDistanceRateValueError('', toLocaleDigit)).toBe(CONST.INPUT_VALIDATION_ERRORS.INVALID);
+            expect(getDistanceRateValueError('abc', toLocaleDigit)).toBe(CONST.INPUT_VALIDATION_ERRORS.INVALID);
+        });
+
+        it('should return tooLow when the rate is zero or negative', () => {
+            expect(getDistanceRateValueError('0', toLocaleDigit)).toBe(CONST.INPUT_VALIDATION_ERRORS.TOO_LOW);
+            expect(getDistanceRateValueError('-1', toLocaleDigit)).toBe(CONST.INPUT_VALIDATION_ERRORS.TOO_LOW);
+        });
+
+        it('should return invalid when the rate has more than four decimal places', () => {
+            expect(getDistanceRateValueError('0.12345', toLocaleDigit)).toBe(CONST.INPUT_VALIDATION_ERRORS.INVALID);
+        });
+
+        it('should accept a positive rate with up to four decimal places', () => {
+            expect(getDistanceRateValueError('0.67', toLocaleDigit)).toBeUndefined();
+            expect(getDistanceRateValueError('0.6700', toLocaleDigit)).toBeUndefined();
+        });
+    });
 });
diff --git a/tests/unit/PolicyMemberRoleUtilsTest.ts b/tests/unit/PolicyMemberRoleUtilsTest.ts
new file mode 100644
index 000000000000..e5002f975be7
--- /dev/null
+++ b/tests/unit/PolicyMemberRoleUtilsTest.ts
@@ -0,0 +1,88 @@
+import {getAllowedRolesForMember, isPolicyReimburser} from '@libs/PolicyMemberRoleUtils';
+import {PAYER_ROLES} from '@libs/PolicyUtils';
+
+import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+import createMock from '../utils/createMock';
+
+describe('PolicyMemberRoleUtils', () => {
+    describe('isPolicyReimburser', () => {
+        it('should return true when the member is the Authorized Payer', () => {
+            // Given a workspace whose Authorized Payer is a specific member
+            const policy = createMock<Policy>({
+                id: '1',
+                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                reimburser: 'payer@example.com',
+            });
+
+            // When that member is checked
+            const isReimburser = isPolicyReimburser(policy, 'payer@example.com');
+
+            // Then they are the payer, so a role change must stay inside the payer roles
+            expect(isReimburser).toBe(true);
+        });
+
+        it('should return false when the member is not the Authorized Payer', () => {
+            // Given a workspace whose Authorized Payer is someone else
+            const policy = createMock<Policy>({
+                id: '1',
+                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                reimburser: 'payer@example.com',
+            });
+
+            // When a different member is checked
+            const isReimburser = isPolicyReimburser(policy, 'other@example.com');
+
+            // Then they are not the payer, so their role is not restricted to payer roles
+            expect(isReimburser).toBe(false);
+        });
+
+        it('should return false when reimbursement is disabled', () => {
+            // Given a workspace with reimbursement turned off, even if a reimburser email is stored
+            const policy = createMock<Policy>({
+                id: '1',
+                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
+                reimburser: 'payer@example.com',
+            });
+
+            // When that stored payer is checked
+            const isReimburser = isPolicyReimburser(policy, 'payer@example.com');
+
+            // Then nobody is the Authorized Payer, so the role restriction does not apply
+            expect(isReimburser).toBe(false);
+        });
+    });
+
+    describe('getAllowedRolesForMember', () => {
+        it('should restrict the Authorized Payer to payer roles', () => {
+            // Given a workspace whose Authorized Payer is a specific member
+            const policy = createMock<Policy>({
+                id: '1',
+                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                reimburser: 'payer@example.com',
+            });
+
+            // When the roles that member may be assigned are resolved
+            const allowedRoles = getAllowedRolesForMember(policy, 'payer@example.com');
+
+            // Then only roles that can pay are offered, matching the RHP role page
+            expect(allowedRoles).toEqual([...PAYER_ROLES]);
+        });
+
+        it('should not restrict roles for a member who is not the Authorized Payer', () => {
+            // Given a workspace whose Authorized Payer is someone else
+            const policy = createMock<Policy>({
+                id: '1',
+                reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                reimburser: 'payer@example.com',
+            });
+
+            // When the roles for a different member are resolved
+            const allowedRoles = getAllowedRolesForMember(policy, 'other@example.com');
+
+            // Then no restriction is returned, so the full assignable role list is used
+            expect(allowedRoles).toBeUndefined();
+        });
+    });
+});
diff --git a/tests/unit/PolicyPerDiemUtilsTest.ts b/tests/unit/PolicyPerDiemUtilsTest.ts
new file mode 100644
index 000000000000..0f44e5bcfebc
--- /dev/null
+++ b/tests/unit/PolicyPerDiemUtilsTest.ts
@@ -0,0 +1,42 @@
+import {getPerDiemAmountError, getPerDiemNameError} from '@libs/PolicyPerDiemUtils';
+
+import CONST from '@src/CONST';
+
+describe('PolicyPerDiemUtils', () => {
+    describe('getPerDiemNameError', () => {
+        it('should return required when the name is empty or only whitespace', () => {
+            expect(getPerDiemNameError('')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getPerDiemNameError('   ')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getPerDiemNameError('\u200B')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+        });
+
+        it('should return tooLong when the name exceeds the character limit', () => {
+            const tooLongName = 'a'.repeat(CONST.MAX_LENGTH_256 + 1);
+            expect(getPerDiemNameError(tooLongName)).toBe(CONST.INPUT_VALIDATION_ERRORS.TOO_LONG);
+        });
+
+        it('should accept a name within the character limit', () => {
+            expect(getPerDiemNameError('Paris')).toBeUndefined();
+        });
+    });
+
+    describe('getPerDiemAmountError', () => {
+        it('should return required when the amount is empty or a lone minus sign', () => {
+            expect(getPerDiemAmountError('')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getPerDiemAmountError('   ')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getPerDiemAmountError('-')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+        });
+
+        it('should return required when the amount is zero or not a number', () => {
+            expect(getPerDiemAmountError('0')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getPerDiemAmountError('0.00')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+            expect(getPerDiemAmountError('abc')).toBe(CONST.INPUT_VALIDATION_ERRORS.REQUIRED);
+        });
+
+        it('should accept a positive or negative non-zero amount', () => {
+            expect(getPerDiemAmountError('50')).toBeUndefined();
+            expect(getPerDiemAmountError('50.00')).toBeUndefined();
+            expect(getPerDiemAmountError('-10.50')).toBeUndefined();
+        });
+    });
+});
diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts
index b3b85782d063..68bed07e92e8 100644
--- a/tests/unit/PolicyUtilsTest.ts
+++ b/tests/unit/PolicyUtilsTest.ts
@@ -15,6 +15,7 @@ import {
     canSendInvoiceFromWorkspace,
     evaluateApprovalWorkflowRule,
     findVendorByID,
+    getVendorFeaturePolicyIDs,
     getVendorDisplayName,
     hasVendorFeatureOnAnyPolicy,
     getActivePolicies,
@@ -60,6 +61,10 @@ import {
     findPolicyTagAtLevel,
     findPolicyTagEntryByParentFilter,
     getTagGLCode,
+    getCleanedTagName,
+    getCommaSeparatedTagNameWithSanitizedColons,
+    getTagLists,
+    isMultiLevelTags,
     isTagInPolicy,
     matchesParentTagPath,
     matchesParentTagsFilter,
@@ -88,10 +93,14 @@ import {
     isInvoiceFieldsEnabled,
     isMatchingVendorListLoaded,
     isMaxExpenseAmountSet,
+    isMemberInHomeAndOfficeWorkspace,
     isMergeHRCompleteSetupNeededSelector,
+    isQBORefreshTokenExpiringSoonSelector,
     isPerDiemEligiblePolicy,
     isPerDiemEnabled,
+    isPolicyAdmin,
     isPolicyFeatureEnabled,
+    isRoomMemberProtectedByPolicyRole,
     isPolicyMemberWithoutPendingDelete,
     isSubmitterApproveBlockedOnSubmitWorkspace,
     isRilletVendorMatchingActive,
@@ -438,6 +447,247 @@ describe('PolicyUtils', () => {
         });
     });
 
+    describe('isPolicyAdmin', () => {
+        const adminLogin = 'admin@test.com';
+        const memberLogin = 'member@test.com';
+        // `role` is the role of the user currently viewing the policy, `employeeList` holds every member's own role
+        const buildPolicy = (): Policy =>
+            createMock<Policy>({
+                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                role: CONST.POLICY.ROLE.ADMIN,
+                employeeList: {
+                    [adminLogin]: {role: CONST.POLICY.ROLE.ADMIN},
+                    [memberLogin]: {role: CONST.POLICY.ROLE.USER},
+                },
+            });
+
+        it('resolves the role of the passed login when shouldCheckGlobalPolicyRole is false', () => {
+            // Given a policy viewed by an admin, holding one admin and one regular member in its employee list
+            // When the role of each login is resolved without the global policy role
+            // Then each login resolves to its own role, not the viewer's
+            expect(isPolicyAdmin(buildPolicy(), memberLogin, false)).toBe(false);
+            expect(isPolicyAdmin(buildPolicy(), adminLogin, false)).toBe(true);
+        });
+
+        it('ignores the passed login and answers for the viewing user by default', () => {
+            // Given a policy viewed by an admin, holding a regular member in its employee list
+            // When the member's role is resolved with the default shouldCheckGlobalPolicyRole
+            // Then the check short-circuits on the viewer's role and reports the member as an admin. This documents the
+            // trap that made every member of a workspace chat look like an admin to a viewing admin, which disabled the
+            // "Remove from chat" button for all of them
+            expect(isPolicyAdmin(buildPolicy(), memberLogin)).toBe(true);
+        });
+
+        it('returns false for a login that is not in the employee list when shouldCheckGlobalPolicyRole is false', () => {
+            // Given a policy that does not list the passed login as an employee
+            // When that login's role is resolved without the global policy role
+            // Then it does not resolve to an admin
+            expect(isPolicyAdmin(buildPolicy(), 'stranger@test.com', false)).toBe(false);
+        });
+
+        it('returns false for an undefined login when shouldCheckGlobalPolicyRole is false', () => {
+            // Given a member whose login could not be resolved
+            // When their role is resolved without the global policy role
+            // Then it does not resolve to an admin
+            expect(isPolicyAdmin(buildPolicy(), undefined, false)).toBe(false);
+        });
+
+        it('matches an employee whose login is not lowercase when shouldCheckGlobalPolicyRole is false', () => {
+            // Given an employee list keyed by canonical lowercase logins
+            // When a mixed-case login read off personal details is resolved without the global policy role
+            // Then it still matches the employee entry through the normalized fallback
+            expect(isPolicyAdmin(buildPolicy(), 'Admin@Test.com', false)).toBe(true);
+            expect(isPolicyAdmin(buildPolicy(), 'Member@Test.com', false)).toBe(false);
+        });
+
+        it('prefers an exact employee list key over the normalized one', () => {
+            // Given an employee list holding both a mixed-case and a lowercase key with different roles
+            const policy = createMock<Policy>({
+                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                employeeList: {
+                    'Mixed@Test.com': {role: CONST.POLICY.ROLE.ADMIN},
+                    'mixed@test.com': {role: CONST.POLICY.ROLE.USER},
+                },
+            });
+
+            // When each key is resolved without the global policy role
+            // Then the exact key wins, so the normalized fallback can never regress an existing hit
+            expect(isPolicyAdmin(policy, 'Mixed@Test.com', false)).toBe(true);
+            expect(isPolicyAdmin(policy, 'mixed@test.com', false)).toBe(false);
+        });
+
+        it('stops at the exact employee list key even when that entry carries no role', () => {
+            // Given an employee list where the exact mixed-case key exists without a role, next to an admin entry
+            // under the normalized key. `role` is optional on PolicyEmployee, so this is representable
+            const policy = createMock<Policy>({
+                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                employeeList: {
+                    'Mixed@Test.com': {},
+                    'mixed@test.com': {role: CONST.POLICY.ROLE.ADMIN},
+                },
+            });
+
+            // When the mixed-case login is resolved without the global policy role
+            // Then the exact entry still wins and resolves to no role, rather than borrowing the other entry's role.
+            // Reading one account's role off a different account's entry is the failure this check exists to prevent
+            expect(isPolicyAdmin(policy, 'Mixed@Test.com', false)).toBe(false);
+        });
+    });
+
+    describe('isRoomMemberProtectedByPolicyRole', () => {
+        const adminLogin = 'admin@test.com';
+        const memberLogin = 'member@test.com';
+        const policyOwnerAccountID = 3001;
+        const regularMemberAccountID = 3002;
+        // `role` is the role of the user currently viewing the policy, `employeeList` holds every member's own role
+        const buildPolicy = (): Policy =>
+            createMock<Policy>({
+                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                role: CONST.POLICY.ROLE.ADMIN,
+                ownerAccountID: policyOwnerAccountID,
+                employeeList: {
+                    [adminLogin]: {role: CONST.POLICY.ROLE.ADMIN},
+                    [memberLogin]: {role: CONST.POLICY.ROLE.USER},
+                },
+            });
+
+        it('protects a member who is an admin of the policy in their own right', () => {
+            // Given a policy viewed by an admin, holding another admin in its employee list
+            // When that member's protection is resolved
+            // Then they are protected, because removing a workspace admin from the chat is not allowed
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), adminLogin, undefined)).toBe(true);
+        });
+
+        it('does not protect a regular member even when the viewing user is an admin', () => {
+            // Given a policy whose global `role` marks the viewer as an admin, holding a regular member
+            // When that member's protection is resolved
+            // Then they are not protected, because the listed member's own role is what counts. This is the bug that
+            // made every member of a workspace chat un-removable to a viewing admin
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), memberLogin, undefined)).toBe(false);
+        });
+
+        it('fails closed for a member whose login is missing', () => {
+            // Given a room member with personal details but no login, which `login?: string` allows
+            // When their protection is resolved
+            // Then they are protected, because a role we cannot resolve must not be treated as "not an admin".
+            // Both the members list and the member details page depend on this branch to avoid offering removal
+            // for a member who may well be a workspace admin
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), undefined, undefined)).toBe(true);
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), '', undefined)).toBe(true);
+        });
+
+        it('does not protect a member who is absent from the employee list', () => {
+            // Given a login that the policy does not list as an employee
+            // When their protection is resolved
+            // Then they are not protected, since a resolvable login that holds no policy role is not an admin
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), 'stranger@test.com', undefined)).toBe(false);
+        });
+
+        it('protects an admin whose login is not lowercase', () => {
+            // Given an employee list keyed by canonical lowercase logins
+            // When a mixed-case login read off personal details is resolved
+            // Then the normalized fallback still matches the admin entry and protects them
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), 'Admin@Test.com', undefined)).toBe(true);
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), 'Member@Test.com', undefined)).toBe(false);
+        });
+
+        it('protects the policy owner by accountID even when the employee list does not list them', () => {
+            // Given the policy owner participating in another employee's workspace chat, absent from `employeeList`
+            // When their protection is resolved
+            // Then they are protected by `ownerAccountID`, not incidentally by carrying `role: admin` in the roster.
+            // The callers' own owner check compares against `report.ownerAccountID`, which is the employee whose
+            // expense chat it is, so without this the policy owner has no identity-based protection at all
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), 'owner@test.com', policyOwnerAccountID)).toBe(true);
+        });
+
+        it('protects the policy owner even when the employee list is blank', () => {
+            // Given a policy whose `employeeList` has not loaded, which happens when it is not the viewer's active
+            // policy, so no login can resolve to a role
+            const policyWithoutRoster = createMock<Policy>({
+                ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                role: undefined,
+                ownerAccountID: policyOwnerAccountID,
+                employeeList: {},
+            });
+
+            // When the owner's protection is resolved
+            // Then they are still protected, because `ownerAccountID` is a required top-level field that resolves
+            // without the roster
+            expect(isRoomMemberProtectedByPolicyRole(policyWithoutRoster, 'owner@test.com', policyOwnerAccountID)).toBe(true);
+        });
+
+        it('does not protect a non-owner just because an accountID is passed', () => {
+            // Given a regular member's accountID alongside their login
+            // When their protection is resolved
+            // Then they stay removable, since the owner check must not widen protection to every member with an
+            // accountID. This is the regression that would reintroduce the original bug
+            expect(isRoomMemberProtectedByPolicyRole(buildPolicy(), memberLogin, regularMemberAccountID)).toBe(false);
+        });
+
+        describe('approvers auto-added to the expense chat by the approval chain', () => {
+            const approverLogin = 'approver@test.com';
+            const forwardsToLogin = 'forwardsto@test.com';
+            const chainApproverAccountID = 3003;
+            // An approval chain that pulls two non-admin approvers into the member's expense chat: one they submit to,
+            // one their reports forward to. `policy.approver` is the workspace's default approver on top of that
+            const buildPolicyWithApprovalChain = (approverRole: ValueOf<typeof CONST.POLICY.ROLE> = CONST.POLICY.ROLE.USER): Policy =>
+                createMock<Policy>({
+                    ...createRandomPolicy(1, CONST.POLICY.TYPE.CORPORATE),
+                    role: CONST.POLICY.ROLE.ADMIN,
+                    ownerAccountID: policyOwnerAccountID,
+                    approver: approverLogin,
+                    employeeList: {
+                        [approverLogin]: {role: approverRole},
+                        [forwardsToLogin]: {role: approverRole},
+                        [memberLogin]: {role: CONST.POLICY.ROLE.USER, submitsTo: approverLogin, forwardsTo: forwardsToLogin},
+                    },
+                });
+
+            it('protects an approver who holds no admin role of their own', () => {
+                // Given a workspace chat whose participants include two approvers from the submitter's approval
+                // chain, both plain members of the workspace
+                const policy = buildPolicyWithApprovalChain();
+
+                // When each approver's protection is resolved
+                // Then they are protected on the strength of being approvers alone. Approvers are auto-added to the
+                // chat of everyone who submits to them, so their membership is governed by the workspace's approval
+                // workflow rather than by this screen: only a member who was invited to the chat can be removed from
+                // it, per the expense chat rules in contributingGuides/philosophies/SECURITY.md
+                expect(isRoomMemberProtectedByPolicyRole(policy, approverLogin, chainApproverAccountID)).toBe(true);
+                expect(isRoomMemberProtectedByPolicyRole(policy, forwardsToLogin, chainApproverAccountID)).toBe(true);
+            });
+
+            it('still allows removing an invited member of a workspace that has an approval chain', () => {
+                // Given the same approval chain, and the submitter who is neither an admin, the owner, nor an approver
+                const policy = buildPolicyWithApprovalChain();
+
+                // When their protection is resolved
+                // Then they stay removable. Protecting approvers must not widen back out to every member and
+                // reintroduce the bug this PR fixes
+                expect(isRoomMemberProtectedByPolicyRole(policy, memberLogin, regularMemberAccountID)).toBe(false);
+            });
+
+            it('protects an approver who is also an admin of the policy', () => {
+                // Given the same approval chain, with both approvers holding the admin role
+                const policy = buildPolicyWithApprovalChain(CONST.POLICY.ROLE.ADMIN);
+
+                // When each approver's protection is resolved
+                // Then they are protected, because they are admins. Most approvers are, so this is the common case
+                expect(isRoomMemberProtectedByPolicyRole(policy, approverLogin, chainApproverAccountID)).toBe(true);
+                expect(isRoomMemberProtectedByPolicyRole(policy, forwardsToLogin, chainApproverAccountID)).toBe(true);
+            });
+
+            it('protects an approver who is the policy owner', () => {
+                // Given an approval chain whose approvers are plain members, one of whom owns the workspace
+                const policy = buildPolicyWithApprovalChain();
+
+                // When the owning approver's protection is resolved by accountID
+                // Then they are protected as the policy owner, regardless of their role in the employee list
+                expect(isRoomMemberProtectedByPolicyRole(policy, approverLogin, policyOwnerAccountID)).toBe(true);
+            });
+        });
+    });
+
     describe('useDefaultFundID', () => {
         beforeEach(() => {
             wrapOnyxWithWaitForBatchedUpdates(Onyx);
@@ -1336,15 +1586,15 @@ describe('PolicyUtils', () => {
         const buildRule = (rule: ApprovalWorkflowRule): Rule => ({...rule, scope: CONST.RULES.SCOPE.POLICY, scopeID: policyID});
 
         const submitRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT},
+            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
             filters: submitFilter,
-            actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: adminEmail}},
+            actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
         };
 
         // After the admin approves, an under-limit report continues to the approver and an over-limit one is
         // escalated to the category approver instead.
         const underLimitRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE},
+            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
             filters: {
                 operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
                 left: submitFilter,
@@ -1354,10 +1604,10 @@ describe('PolicyUtils', () => {
                     right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000},
                 },
             },
-            actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: approverEmail}},
+            actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: approverEmail}},
         };
         const overLimitRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE},
+            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
             filters: {
                 operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
                 left: submitFilter,
@@ -1367,16 +1617,16 @@ describe('PolicyUtils', () => {
                     right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000},
                 },
             },
-            actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: categoryApprover1Email}},
+            actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: categoryApprover1Email}},
         };
         const terminalRule: ApprovalWorkflowRule = {
-            triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE},
+            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE},
             filters: {
                 operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
                 left: submitFilter,
                 right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: approverEmail},
             },
-            actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.APPROVE_REPORT}},
+            actions: {'1': {name: CONST.RULES.ACTIONS.APPROVE_REPORT}},
         };
 
         // A workspace whose employeeList still points somewhere else, so a rule-driven answer is distinguishable
@@ -1435,9 +1685,9 @@ describe('PolicyUtils', () => {
             });
 
             const buildAmountRule = (operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>, right: number): ApprovalWorkflowRule => ({
-                triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT},
+                triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
                 filters: {operator, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right},
-                actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: adminEmail}},
+                actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
             });
 
             it.each([
@@ -1466,22 +1716,22 @@ describe('PolicyUtils', () => {
 
             it('does not match a filter on a field this client does not understand', () => {
                 const rule: ApprovalWorkflowRule = {
-                    triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT},
+                    triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
                     filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: 'unsupportedField', right: employeeEmail},
-                    actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: adminEmail}},
+                    actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
                 };
                 expect(evaluateApprovalWorkflowRule(rule, {submitterEmail: employeeEmail, reportTotal: 0})).toBe(false);
             });
 
             it('matches an OR filter when either side matches', () => {
                 const rule: ApprovalWorkflowRule = {
-                    triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT},
+                    triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
                     filters: {
                         operator: CONST.SEARCH.SYNTAX_OPERATORS.OR,
                         left: submitFilter,
                         right: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: [adminEmail]},
                     },
-                    actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: adminEmail}},
+                    actions: {'1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver: adminEmail}},
                 };
 
                 // Only the left side matches this submitter, but OR only needs one side.
@@ -1699,92 +1949,316 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('getTagList', () => {
-        it.each([
-            ['when index is 0', 0, policyTags.TagListTest0.name],
-            ['when index is 1', 1, policyTags.TagListTest2.name],
-            ['when index is out of range', 2, ''],
-        ])('%s', (_description, index, expected) => {
-            const tagList = getTagList(policyTags, index);
-            expect(tagList.name).toEqual(expected);
+    describe('tag', () => {
+        describe('getTagList', () => {
+            it.each([
+                ['when index is 0', 0, policyTags.TagListTest0.name],
+                ['when index is 1', 1, policyTags.TagListTest2.name],
+                ['when index is out of range', 2, ''],
+            ])('%s', (_description, index, expected) => {
+                const tagList = getTagList(policyTags, index);
+                expect(tagList.name).toEqual(expected);
+            });
         });
-    });
-    describe('getTagListByOrderWeight', () => {
-        it.each([
-            ['when orderWeight is 0', 0, policyTags.TagListTest0.name],
-            ['when orderWeight is 2', 2, policyTags.TagListTest2.name],
-            ['when orderWeight is out of range', 1, ''],
-        ])('%s', (_description, orderWeight, expected) => {
-            const tagList = getTagListByOrderWeight(policyTags, orderWeight);
-            expect(tagList.name).toEqual(expected);
+        describe('getTagListByOrderWeight', () => {
+            it.each([
+                ['when orderWeight is 0', 0, policyTags.TagListTest0.name],
+                ['when orderWeight is 2', 2, policyTags.TagListTest2.name],
+                ['when orderWeight is out of range', 1, ''],
+            ])('%s', (_description, orderWeight, expected) => {
+                const tagList = getTagListByOrderWeight(policyTags, orderWeight);
+                expect(tagList.name).toEqual(expected);
+            });
         });
-    });
-    describe('getTagGLCode', () => {
-        // Tag lists are intentionally declared out of orderWeight order to verify levels resolve by orderWeight
-        const glCodePolicyTagLists: PolicyTagLists = {
-            Project: {
-                name: 'Project',
-                orderWeight: 1,
-                required: false,
-                tags: {
-                    Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '5678'},
-                    Internal: {name: 'Internal', enabled: true},
+        describe('getTagGLCode', () => {
+            // Tag lists are intentionally declared out of orderWeight order to verify levels resolve by orderWeight
+            const glCodePolicyTagLists: PolicyTagLists = {
+                Project: {
+                    name: 'Project',
+                    orderWeight: 1,
+                    required: false,
+                    tags: {
+                        Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '5678'},
+                        Internal: {name: 'Internal', enabled: true},
+                    },
                 },
-            },
-            Department: {
-                name: 'Department',
-                orderWeight: 0,
-                required: false,
-                tags: {
-                    Engineering: {name: 'Engineering', enabled: true, 'GL Code': '1234'},
-                    Marketing: {name: 'Marketing', enabled: true},
-                    'Sales\\:EMEA': {name: 'Sales\\:EMEA', enabled: true, 'GL Code': '"4321"'},
+                Department: {
+                    name: 'Department',
+                    orderWeight: 0,
+                    required: false,
+                    tags: {
+                        Engineering: {name: 'Engineering', enabled: true, 'GL Code': '1234'},
+                        Marketing: {name: 'Marketing', enabled: true},
+                        'Sales\\:EMEA': {name: 'Sales\\:EMEA', enabled: true, 'GL Code': '"4321"'},
+                    },
                 },
-            },
-        };
+            };
 
-        it('returns empty string when policy tags are undefined or empty', () => {
-            expect(getTagGLCode(undefined, 'Engineering')).toBe('');
-            expect(getTagGLCode({}, 'Engineering')).toBe('');
-        });
+            it('returns empty string when policy tags are undefined or empty', () => {
+                expect(getTagGLCode(undefined, 'Engineering')).toBe('');
+                expect(getTagGLCode({}, 'Engineering')).toBe('');
+            });
 
-        it('returns empty string when the transaction tag is undefined or empty', () => {
-            expect(getTagGLCode(glCodePolicyTagLists, undefined)).toBe('');
-            expect(getTagGLCode(glCodePolicyTagLists, '')).toBe('');
-        });
+            it('returns empty string when the transaction tag is undefined or empty', () => {
+                expect(getTagGLCode(glCodePolicyTagLists, undefined)).toBe('');
+                expect(getTagGLCode(glCodePolicyTagLists, '')).toBe('');
+            });
+
+            it('returns empty string when the tag is missing from the policy or has no GL code', () => {
+                expect(getTagGLCode(glCodePolicyTagLists, 'Nonexistent')).toBe('');
+                expect(getTagGLCode(glCodePolicyTagLists, 'Marketing')).toBe('');
+            });
+
+            it('returns the GL code of a single-level tag', () => {
+                expect(getTagGLCode(glCodePolicyTagLists, 'Engineering')).toBe('1234');
+            });
 
-        it('returns empty string when the tag is missing from the policy or has no GL code', () => {
-            expect(getTagGLCode(glCodePolicyTagLists, 'Nonexistent')).toBe('');
-            expect(getTagGLCode(glCodePolicyTagLists, 'Marketing')).toBe('');
+            it('joins the GL codes of multi-level tags in tag list order', () => {
+                expect(getTagGLCode(glCodePolicyTagLists, 'Engineering:Roadshow')).toBe('1234, 5678');
+            });
+
+            it('skips multi-level tag levels without a GL code', () => {
+                expect(getTagGLCode(glCodePolicyTagLists, 'Marketing:Roadshow')).toBe('5678');
+                expect(getTagGLCode(glCodePolicyTagLists, 'Engineering:Internal')).toBe('1234');
+            });
+
+            it('resolves tags with escaped colons against the matching tag list level and strips double quotes', () => {
+                expect(getTagGLCode(glCodePolicyTagLists, 'Sales\\:EMEA:Roadshow')).toBe('4321, 5678');
+            });
+
+            it('resolves dependent tags by name and parent filter when same-named children exist under different parents', () => {
+                // Same-named child tags of dependent lists are stored under unique record keys,
+                // so they can only be told apart by their parentTagsFilter
+                const dependentPolicyTagLists: PolicyTagLists = {
+                    Department: {
+                        name: 'Department',
+                        orderWeight: 0,
+                        required: false,
+                        tags: {
+                            Engineering: {name: 'Engineering', enabled: true, 'GL Code': '1234'},
+                            Marketing: {name: 'Marketing', enabled: true},
+                        },
+                    },
+                    Project: {
+                        name: 'Project',
+                        orderWeight: 1,
+                        required: false,
+                        tags: {
+                            Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '1111', rules: {parentTagsFilter: '^Marketing$'}},
+                            'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
+                        },
+                    },
+                };
+
+                expect(getTagGLCode(dependentPolicyTagLists, 'Engineering:Roadshow')).toBe('1234, 2222');
+                expect(getTagGLCode(dependentPolicyTagLists, 'Marketing:Roadshow')).toBe('1111');
+            });
+
+            it('matches a dependent tag deeper in the hierarchy against the accumulated parent tag path', () => {
+                const deepDependentPolicyTagLists: PolicyTagLists = {
+                    State: {
+                        name: 'State',
+                        orderWeight: 0,
+                        required: false,
+                        tags: {
+                            California: {name: 'California', enabled: true},
+                        },
+                    },
+                    City: {
+                        name: 'City',
+                        orderWeight: 1,
+                        required: false,
+                        tags: {
+                            'San Francisco': {name: 'San Francisco', enabled: true, rules: {parentTagsFilter: '^California$'}},
+                        },
+                    },
+                    District: {
+                        name: 'District',
+                        orderWeight: 2,
+                        required: false,
+                        tags: {
+                            Mission: {name: 'Mission', enabled: true, 'GL Code': '9000', rules: {parentTagsFilter: '^California:San Francisco$'}},
+                            'Mission-1': {name: 'Mission', enabled: true, 'GL Code': '9999', rules: {parentTagsFilter: '^Texas:Austin$'}},
+                        },
+                    },
+                };
+
+                expect(getTagGLCode(deepDependentPolicyTagLists, 'California:San Francisco:Mission')).toBe('9000');
+            });
+
+            it('returns the GL code as a string when malformed Onyx data stores it as a number', () => {
+                const tagListsWithNumberGLCode: PolicyTagLists = {
+                    Department: {
+                        name: 'Department',
+                        orderWeight: 0,
+                        required: false,
+                        tags: {
+                            // @ts-expect-error - Defensively handles malformed Onyx data that violates the string type.
+                            Engineering: {name: 'Engineering', enabled: true, 'GL Code': 1234},
+                        },
+                    },
+                };
+                expect(getTagGLCode(tagListsWithNumberGLCode, 'Engineering')).toBe('1234');
+            });
         });
 
-        it('returns the GL code of a single-level tag', () => {
-            expect(getTagGLCode(glCodePolicyTagLists, 'Engineering')).toBe('1234');
+        describe('matchesParentTagPath', () => {
+            it('matches any parent tag path when the tag has no parent filter', () => {
+                expect(matchesParentTagPath({name: 'Roadshow', enabled: true}, '')).toBe(true);
+                expect(matchesParentTagPath({name: 'Roadshow', enabled: true}, 'California:100:South')).toBe(true);
+            });
+
+            it('matches only the parent tag path allowed by the parent filter', () => {
+                const tag = {name: '20', enabled: true, rules: {parentTagsFilter: '^California\\:100\\:North$'}};
+                expect(matchesParentTagPath(tag, 'California:100:North')).toBe(true);
+                expect(matchesParentTagPath(tag, 'California:100:South')).toBe(false);
+            });
+
+            it('reads the parent filter off the tag root when it is not nested under rules', () => {
+                expect(matchesParentTagPath({name: 'Roadshow', enabled: true, parentTagsFilter: '^Marketing$'}, 'Marketing')).toBe(true);
+                expect(matchesParentTagPath({name: 'Roadshow', enabled: true, parentTagsFilter: '^Marketing$'}, 'Engineering')).toBe(false);
+            });
+
+            it('prefers the parent filter nested under rules over the one on the tag root', () => {
+                const tag = {name: 'Roadshow', enabled: true, parentTagsFilter: '^Marketing$', rules: {parentTagsFilter: '^Engineering$'}};
+                expect(matchesParentTagPath(tag, 'Engineering')).toBe(true);
+                expect(matchesParentTagPath(tag, 'Marketing')).toBe(false);
+            });
         });
 
-        it('joins the GL codes of multi-level tags in tag list order', () => {
-            expect(getTagGLCode(glCodePolicyTagLists, 'Engineering:Roadshow')).toBe('1234, 5678');
+        describe('matchesParentTagsFilter', () => {
+            it('matches an escaped literal filter against the exact parent tag path', () => {
+                // Given literal filters with escaped characters, as the backend writes them
+                const filter = '^TW Strategic Initiative \\- AI Workforce Design$';
+                const colonFilter = '^Sales\\\\:EMEA$';
+
+                // When matching them against parent tag paths
+                // Then only the unescaped path matches, not a prefix or a longer path
+                expect(matchesParentTagsFilter(filter, 'TW Strategic Initiative - AI Workforce Design')).toBe(true);
+                expect(matchesParentTagsFilter(filter, 'TW Strategic Initiative')).toBe(false);
+                expect(matchesParentTagsFilter(filter, 'TW Strategic Initiative - AI Workforce Design:Team')).toBe(false);
+                expect(matchesParentTagsFilter(colonFilter, 'Sales\\:EMEA')).toBe(true);
+                expect(matchesParentTagsFilter(colonFilter, 'Sales:EMEA')).toBe(false);
+            });
+
+            it('unescapes an escaped line terminator like RegExp does', () => {
+                // Given a literal filter with a backslash before a newline, which RegExp reads as a literal newline
+                const filter = '^Line\\\nBreak$';
+
+                // When matching it against a parent tag path containing that newline
+                // Then the literal fast path agrees with RegExp
+                expect(new RegExp(filter).test('Line\nBreak')).toBe(true);
+                expect(matchesParentTagsFilter(filter, 'Line\nBreak')).toBe(true);
+            });
+
+            it('evaluates filters with regex operators as regular expressions', () => {
+                // Given filters that are not plain anchored literals
+                // When matching them against parent tag paths
+                // Then they keep regex semantics - character classes, alternation and unanchored matches
+                expect(matchesParentTagsFilter('^Region\\d$', 'Region7')).toBe(true);
+                expect(matchesParentTagsFilter('^Region\\d$', 'RegionX')).toBe(false);
+                expect(matchesParentTagsFilter('^(Sales|Marketing)$', 'Marketing')).toBe(true);
+                expect(matchesParentTagsFilter('Sales', 'EMEA Sales')).toBe(true);
+            });
         });
 
-        it('skips multi-level tag levels without a GL code', () => {
-            expect(getTagGLCode(glCodePolicyTagLists, 'Marketing:Roadshow')).toBe('5678');
-            expect(getTagGLCode(glCodePolicyTagLists, 'Engineering:Internal')).toBe('1234');
+        describe('findPolicyTagAtLevel', () => {
+            // Dependent tag lists key their tags by the full tag path, so the tag name alone is never a record key
+            const dependentLevelTags: PolicyTags = {
+                'California:100:North:20': {name: '20', enabled: true, rules: {parentTagsFilter: '^California\\:100\\:North$'}},
+                'California:100:South:30': {name: '30', enabled: true, rules: {parentTagsFilter: '^California\\:100\\:South$'}},
+            };
+
+            // Independent tag lists key their tags by name and carry no parent filter
+            const independentLevelTags: PolicyTags = {
+                Engineering: {name: 'Engineering', enabled: true},
+                Marketing: {name: 'Marketing', enabled: true},
+            };
+
+            it('returns undefined when no tag of the level carries the name', () => {
+                expect(findPolicyTagAtLevel(dependentLevelTags, 'Nonexistent', 'California:100:North')).toBeUndefined();
+            });
+
+            it('returns the tag matching the record key when the level has no parent filters', () => {
+                expect(findPolicyTagAtLevel(independentLevelTags, 'Engineering', '')?.name).toBe('Engineering');
+            });
+
+            it('resolves a dependent tag by name when the record key is the full tag path', () => {
+                expect(findPolicyTagAtLevel(dependentLevelTags, '20', 'California:100:North')?.name).toBe('20');
+                expect(findPolicyTagAtLevel(dependentLevelTags, '30', 'California:100:South')?.name).toBe('30');
+            });
+
+            it('returns undefined when the name exists at the level but under a different parent', () => {
+                expect(findPolicyTagAtLevel(dependentLevelTags, '20', 'California:100:South')).toBeUndefined();
+                expect(findPolicyTagAtLevel(dependentLevelTags, '30', 'California:100:North')).toBeUndefined();
+            });
+
+            it('tells same-named children of different parents apart', () => {
+                const sameNamedChildren: PolicyTags = {
+                    Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '1111', rules: {parentTagsFilter: '^Marketing$'}},
+                    'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
+                };
+
+                expect(findPolicyTagAtLevel(sameNamedChildren, 'Roadshow', 'Marketing')?.['GL Code']).toBe('1111');
+                expect(findPolicyTagAtLevel(sameNamedChildren, 'Roadshow', 'Engineering')?.['GL Code']).toBe('2222');
+                expect(findPolicyTagAtLevel(sameNamedChildren, 'Roadshow', 'Sales')).toBeUndefined();
+            });
+
+            it('skips a record key that collides with the name but fails the parent filter', () => {
+                // The record key equals the name here, so the direct key lookup must still be parent filtered
+                const collidingKey: PolicyTags = {
+                    Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '1111', rules: {parentTagsFilter: '^Marketing$'}},
+                    'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
+                };
+
+                expect(findPolicyTagAtLevel(collidingKey, 'Roadshow', 'Engineering')?.['GL Code']).toBe('2222');
+            });
+
+            it('matches a parent tag path holding escaped colons', () => {
+                // Parent tag paths keep the escaped colons of getTagArrayFromName, so a parent filter of a tag
+                // nested under a colon holding parent has to escape the backslash to match
+                const escapedParentTags: PolicyTags = {
+                    'Sales\\:EMEA:Roadshow': {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Sales\\\\:EMEA$'}},
+                };
+
+                expect(findPolicyTagAtLevel(escapedParentTags, 'Roadshow', 'Sales\\:EMEA')?.name).toBe('Roadshow');
+                expect(findPolicyTagAtLevel(escapedParentTags, 'Roadshow', 'Sales')).toBeUndefined();
+            });
         });
 
-        it('resolves tags with escaped colons against the matching tag list level and strips double quotes', () => {
-            expect(getTagGLCode(glCodePolicyTagLists, 'Sales\\:EMEA:Roadshow')).toBe('4321, 5678');
+        describe('findPolicyTagEntryByParentFilter', () => {
+            const dependentTags: PolicyTags = {
+                Roadshow: {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Marketing$'}},
+                'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
+            };
+
+            it('returns the tag and storage key when parentTagsFilter matches', () => {
+                expect(findPolicyTagEntryByParentFilter(dependentTags, 'Roadshow', '^Engineering$')).toEqual({
+                    tag: dependentTags['Roadshow-1'],
+                    tagKey: 'Roadshow-1',
+                });
+            });
+
+            it('returns the tag by name when parentTagsFilter is not provided', () => {
+                expect(findPolicyTagEntryByParentFilter(dependentTags, 'Roadshow')).toEqual({
+                    tag: dependentTags.Roadshow,
+                    tagKey: 'Roadshow',
+                });
+            });
+
+            it('returns undefined when parentTagsFilter does not match any tag', () => {
+                expect(findPolicyTagEntryByParentFilter(dependentTags, 'Roadshow', '^Sales$')).toBeUndefined();
+            });
         });
 
-        it('resolves dependent tags by name and parent filter when same-named children exist under different parents', () => {
-            // Same-named child tags of dependent lists are stored under unique record keys,
-            // so they can only be told apart by their parentTagsFilter
+        describe('isTagInPolicy', () => {
             const dependentPolicyTagLists: PolicyTagLists = {
                 Department: {
                     name: 'Department',
                     orderWeight: 0,
                     required: false,
                     tags: {
-                        Engineering: {name: 'Engineering', enabled: true, 'GL Code': '1234'},
+                        Engineering: {name: 'Engineering', enabled: true},
                         Marketing: {name: 'Marketing', enabled: true},
                     },
                 },
@@ -1793,296 +2267,381 @@ describe('PolicyUtils', () => {
                     orderWeight: 1,
                     required: false,
                     tags: {
-                        Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '1111', rules: {parentTagsFilter: '^Marketing$'}},
-                        'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
+                        Roadshow: {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Marketing$'}},
+                        'Roadshow-1': {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Engineering$'}},
                     },
                 },
             };
 
-            expect(getTagGLCode(dependentPolicyTagLists, 'Engineering:Roadshow')).toBe('1234, 2222');
-            expect(getTagGLCode(dependentPolicyTagLists, 'Marketing:Roadshow')).toBe('1111');
-        });
+            it('returns false when policy tags are undefined', () => {
+                expect(isTagInPolicy('Engineering', undefined)).toBe(false);
+            });
 
-        it('matches a dependent tag deeper in the hierarchy against the accumulated parent tag path', () => {
-            const deepDependentPolicyTagLists: PolicyTagLists = {
-                State: {
-                    name: 'State',
-                    orderWeight: 0,
-                    required: false,
-                    tags: {
-                        California: {name: 'California', enabled: true},
-                    },
-                },
-                City: {
-                    name: 'City',
-                    orderWeight: 1,
-                    required: false,
-                    tags: {
-                        'San Francisco': {name: 'San Francisco', enabled: true, rules: {parentTagsFilter: '^California$'}},
-                    },
-                },
-                District: {
-                    name: 'District',
-                    orderWeight: 2,
-                    required: false,
-                    tags: {
-                        Mission: {name: 'Mission', enabled: true, 'GL Code': '9000', rules: {parentTagsFilter: '^California:San Francisco$'}},
-                        'Mission-1': {name: 'Mission', enabled: true, 'GL Code': '9999', rules: {parentTagsFilter: '^Texas:Austin$'}},
+            it('returns false when the tag list level is missing', () => {
+                expect(isTagInPolicy('Engineering:Roadshow:Extra', dependentPolicyTagLists)).toBe(false);
+            });
+
+            it('returns false when the tag is not in the policy', () => {
+                expect(isTagInPolicy('Nonexistent', dependentPolicyTagLists)).toBe(false);
+            });
+
+            it('returns true for every level of an existing multi-level tag', () => {
+                expect(isTagInPolicy('Engineering:Roadshow', dependentPolicyTagLists)).toBe(true);
+                expect(isTagInPolicy('Marketing:Roadshow', dependentPolicyTagLists)).toBe(true);
+            });
+
+            it('returns false when the dependent child matching the parent tag path is pending deletion', () => {
+                // Only the Engineering child is deleted, so the same-named Marketing child must not keep the tag alive
+                const tagListsWithDeletedChild: PolicyTagLists = {
+                    ...dependentPolicyTagLists,
+                    Project: {
+                        ...dependentPolicyTagLists.Project,
+                        tags: {
+                            Roadshow: {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Marketing$'}},
+                            'Roadshow-1': {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Engineering$'}, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
+                        },
                     },
-                },
-            };
+                };
 
-            expect(getTagGLCode(deepDependentPolicyTagLists, 'California:San Francisco:Mission')).toBe('9000');
-        });
+                expect(isTagInPolicy('Engineering:Roadshow', tagListsWithDeletedChild)).toBe(false);
+                expect(isTagInPolicy('Marketing:Roadshow', tagListsWithDeletedChild)).toBe(true);
+            });
 
-        it('returns the GL code as a string when malformed Onyx data stores it as a number', () => {
-            const tagListsWithNumberGLCode: PolicyTagLists = {
-                Department: {
-                    name: 'Department',
-                    orderWeight: 0,
-                    required: false,
-                    tags: {
-                        // @ts-expect-error - Defensively handles malformed Onyx data that violates the string type.
-                        Engineering: {name: 'Engineering', enabled: true, 'GL Code': 1234},
+            it('returns false when a non-dependent tag is pending deletion', () => {
+                const tagListsWithDeletedTag: PolicyTagLists = {
+                    Department: {
+                        name: 'Department',
+                        orderWeight: 0,
+                        required: false,
+                        tags: {
+                            Engineering: {name: 'Engineering', enabled: true, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
+                        },
                     },
-                },
-            };
-            expect(getTagGLCode(tagListsWithNumberGLCode, 'Engineering')).toBe('1234');
-        });
-    });
+                };
 
-    describe('matchesParentTagPath', () => {
-        it('matches any parent tag path when the tag has no parent filter', () => {
-            expect(matchesParentTagPath({name: 'Roadshow', enabled: true}, '')).toBe(true);
-            expect(matchesParentTagPath({name: 'Roadshow', enabled: true}, 'California:100:South')).toBe(true);
+                expect(isTagInPolicy('Engineering', tagListsWithDeletedTag)).toBe(false);
+            });
         });
 
-        it('matches only the parent tag path allowed by the parent filter', () => {
-            const tag = {name: '20', enabled: true, rules: {parentTagsFilter: '^California\\:100\\:North$'}};
-            expect(matchesParentTagPath(tag, 'California:100:North')).toBe(true);
-            expect(matchesParentTagPath(tag, 'California:100:South')).toBe(false);
-        });
+        describe('getGLCodeFromPolicyTag', () => {
+            it('returns empty string when tag is undefined', () => {
+                expect(getGLCodeFromPolicyTag(undefined)).toBe('');
+            });
 
-        it('reads the parent filter off the tag root when it is not nested under rules', () => {
-            expect(matchesParentTagPath({name: 'Roadshow', enabled: true, parentTagsFilter: '^Marketing$'}, 'Marketing')).toBe(true);
-            expect(matchesParentTagPath({name: 'Roadshow', enabled: true, parentTagsFilter: '^Marketing$'}, 'Engineering')).toBe(false);
-        });
+            it('returns empty string when tag has no GL code', () => {
+                expect(getGLCodeFromPolicyTag({})).toBe('');
+            });
 
-        it('prefers the parent filter nested under rules over the one on the tag root', () => {
-            const tag = {name: 'Roadshow', enabled: true, parentTagsFilter: '^Marketing$', rules: {parentTagsFilter: '^Engineering$'}};
-            expect(matchesParentTagPath(tag, 'Engineering')).toBe(true);
-            expect(matchesParentTagPath(tag, 'Marketing')).toBe(false);
+            it('returns stripped GL code from tag', () => {
+                expect(getGLCodeFromPolicyTag({'GL Code': '"1234"'})).toBe('1234');
+            });
         });
-    });
 
-    describe('matchesParentTagsFilter', () => {
-        it('matches an escaped literal filter against the exact parent tag path', () => {
-            // Given literal filters with escaped characters, as the backend writes them
-            const filter = '^TW Strategic Initiative \\- AI Workforce Design$';
-            const colonFilter = '^Sales\\\\:EMEA$';
+        describe('hasDependentTags', () => {
+            it('returns false when policy has no multiple tag lists', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: false});
+                const policyTagList: PolicyTagLists = {};
+                expect(hasDependentTags(policy, policyTagList)).toBe(false);
+            });
 
-            // When matching them against parent tag paths
-            // Then only the unescaped path matches, not a prefix or a longer path
-            expect(matchesParentTagsFilter(filter, 'TW Strategic Initiative - AI Workforce Design')).toBe(true);
-            expect(matchesParentTagsFilter(filter, 'TW Strategic Initiative')).toBe(false);
-            expect(matchesParentTagsFilter(filter, 'TW Strategic Initiative - AI Workforce Design:Team')).toBe(false);
-            expect(matchesParentTagsFilter(colonFilter, 'Sales\\:EMEA')).toBe(true);
-            expect(matchesParentTagsFilter(colonFilter, 'Sales:EMEA')).toBe(false);
-        });
+            it('returns false when policy is undefined', () => {
+                expect(hasDependentTags(undefined, {})).toBe(false);
+            });
 
-        it('unescapes an escaped line terminator like RegExp does', () => {
-            // Given a literal filter with a backslash before a newline, which RegExp reads as a literal newline
-            const filter = '^Line\\\nBreak$';
+            it('returns false when tags have no parentTagsFilter', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList = createMock<PolicyTagLists>({
+                    Department: {
+                        name: 'Department',
+                        tags: {
+                            Engineering: {name: 'Engineering', enabled: true},
+                        },
+                        required: false,
+                        orderWeight: 0,
+                    },
+                });
+                expect(hasDependentTags(policy, policyTagList)).toBe(false);
+            });
 
-            // When matching it against a parent tag path containing that newline
-            // Then the literal fast path agrees with RegExp
-            expect(new RegExp(filter).test('Line\nBreak')).toBe(true);
-            expect(matchesParentTagsFilter(filter, 'Line\nBreak')).toBe(true);
-        });
+            it('returns true when a tag has rules.parentTagsFilter', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList = createMock<PolicyTagLists>({
+                    Department: {
+                        name: 'Department',
+                        tags: {
+                            Engineering: {name: 'Engineering', enabled: true, rules: {parentTagsFilter: '^California$'}},
+                        },
+                        required: false,
+                        orderWeight: 0,
+                    },
+                });
+                expect(hasDependentTags(policy, policyTagList)).toBe(true);
+            });
 
-        it('evaluates filters with regex operators as regular expressions', () => {
-            // Given filters that are not plain anchored literals
-            // When matching them against parent tag paths
-            // Then they keep regex semantics - character classes, alternation and unanchored matches
-            expect(matchesParentTagsFilter('^Region\\d$', 'Region7')).toBe(true);
-            expect(matchesParentTagsFilter('^Region\\d$', 'RegionX')).toBe(false);
-            expect(matchesParentTagsFilter('^(Sales|Marketing)$', 'Marketing')).toBe(true);
-            expect(matchesParentTagsFilter('Sales', 'EMEA Sales')).toBe(true);
-        });
-    });
+            it('returns true when a tag has parentTagsFilter at the top level', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList = createMock<PolicyTagLists>({
+                    Department: {
+                        name: 'Department',
+                        tags: {
+                            Engineering: {name: 'Engineering', enabled: true, parentTagsFilter: '^California$'},
+                        },
+                        required: false,
+                        orderWeight: 0,
+                    },
+                });
+                expect(hasDependentTags(policy, policyTagList)).toBe(true);
+            });
 
-    describe('findPolicyTagAtLevel', () => {
-        // Dependent tag lists key their tags by the full tag path, so the tag name alone is never a record key
-        const dependentLevelTags: PolicyTags = {
-            'California:100:North:20': {name: '20', enabled: true, rules: {parentTagsFilter: '^California\\:100\\:North$'}},
-            'California:100:South:30': {name: '30', enabled: true, rules: {parentTagsFilter: '^California\\:100\\:South$'}},
-        };
+            it('returns true when a later tag list has a dependent tag', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList: PolicyTagLists = {
+                    Company: {name: 'Company', required: false, orderWeight: 0, tags: {acme: {name: 'Acme Corp', enabled: true}}},
+                    Department: {name: 'Department', required: false, orderWeight: 1, tags: {admin: {name: 'Admin', enabled: true, rules: {parentTagsFilter: '^Acme Corp$'}}}},
+                };
 
-        // Independent tag lists key their tags by name and carry no parent filter
-        const independentLevelTags: PolicyTags = {
-            Engineering: {name: 'Engineering', enabled: true},
-            Marketing: {name: 'Marketing', enabled: true},
-        };
+                expect(hasDependentTags(policy, policyTagList)).toBe(true);
+            });
 
-        it('returns undefined when no tag of the level carries the name', () => {
-            expect(findPolicyTagAtLevel(dependentLevelTags, 'Nonexistent', 'California:100:North')).toBeUndefined();
-        });
+            it('skips a tag list left as null or without tags by an Onyx merge', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                // An Onyx merge leaves a deleted tag list as null, and an empty one without the `tags` key
+                const mergedTagLists = {
+                    Company: {name: 'Company', required: false, orderWeight: 0},
+                    Department: null,
+                    GLCode: {name: 'GL code', required: false, orderWeight: 2, tags: {gl100: {name: 'GL-100', enabled: true, parentTagsFilter: '^Acme Corp:Admin$'}}},
+                };
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                const policyTagList = mergedTagLists as unknown as PolicyTagLists;
 
-        it('returns the tag matching the record key when the level has no parent filters', () => {
-            expect(findPolicyTagAtLevel(independentLevelTags, 'Engineering', '')?.name).toBe('Engineering');
-        });
+                expect(hasDependentTags(policy, policyTagList)).toBe(true);
+            });
 
-        it('resolves a dependent tag by name when the record key is the full tag path', () => {
-            expect(findPolicyTagAtLevel(dependentLevelTags, '20', 'California:100:North')?.name).toBe('20');
-            expect(findPolicyTagAtLevel(dependentLevelTags, '30', 'California:100:South')?.name).toBe('30');
-        });
+            it('returns false when every tag list is empty or missing its tags', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                // A tag list arrives without the `tags` key when it holds no tags
+                const mergedTagLists = {
+                    Company: {name: 'Company', required: false, orderWeight: 0, tags: {}},
+                    Department: {name: 'Department', required: false, orderWeight: 1},
+                };
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                const policyTagList = mergedTagLists as unknown as PolicyTagLists;
 
-        it('returns undefined when the name exists at the level but under a different parent', () => {
-            expect(findPolicyTagAtLevel(dependentLevelTags, '20', 'California:100:South')).toBeUndefined();
-            expect(findPolicyTagAtLevel(dependentLevelTags, '30', 'California:100:North')).toBeUndefined();
+                expect(hasDependentTags(policy, policyTagList)).toBe(false);
+            });
         });
 
-        it('tells same-named children of different parents apart', () => {
-            const sameNamedChildren: PolicyTags = {
-                Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '1111', rules: {parentTagsFilter: '^Marketing$'}},
-                'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
-            };
+        describe('hasIndependentTags', () => {
+            it('returns false when policy has no multiple tag lists', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: false});
+                const policyTagList: PolicyTagLists = {};
+                expect(hasIndependentTags(policy, policyTagList)).toBe(false);
+            });
 
-            expect(findPolicyTagAtLevel(sameNamedChildren, 'Roadshow', 'Marketing')?.['GL Code']).toBe('1111');
-            expect(findPolicyTagAtLevel(sameNamedChildren, 'Roadshow', 'Engineering')?.['GL Code']).toBe('2222');
-            expect(findPolicyTagAtLevel(sameNamedChildren, 'Roadshow', 'Sales')).toBeUndefined();
-        });
+            it('returns false when policy is undefined', () => {
+                expect(hasIndependentTags(undefined, {})).toBe(false);
+            });
 
-        it('skips a record key that collides with the name but fails the parent filter', () => {
-            // The record key equals the name here, so the direct key lookup must still be parent filtered
-            const collidingKey: PolicyTags = {
-                Roadshow: {name: 'Roadshow', enabled: true, 'GL Code': '1111', rules: {parentTagsFilter: '^Marketing$'}},
-                'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
-            };
+            it('returns false when tags are dependent (have parentTagsFilter)', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList = createMock<PolicyTagLists>({
+                    Department: {
+                        name: 'Department',
+                        tags: {
+                            Engineering: {name: 'Engineering', enabled: true, rules: {parentTagsFilter: '^California$'}},
+                        },
+                        required: false,
+                        orderWeight: 0,
+                    },
+                });
+                expect(hasIndependentTags(policy, policyTagList)).toBe(false);
+            });
 
-            expect(findPolicyTagAtLevel(collidingKey, 'Roadshow', 'Engineering')?.['GL Code']).toBe('2222');
-        });
+            it('returns false when all tag lists are empty', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList = createMock<PolicyTagLists>({
+                    Department: {
+                        name: 'Department',
+                        tags: {},
+                        required: false,
+                        orderWeight: 0,
+                    },
+                    Location: {
+                        name: 'Location',
+                        tags: {},
+                        required: false,
+                        orderWeight: 1,
+                    },
+                });
+                expect(hasIndependentTags(policy, policyTagList)).toBe(false);
+            });
 
-        it('matches a parent tag path holding escaped colons', () => {
-            // Parent tag paths keep the escaped colons of getTagArrayFromName, so a parent filter of a tag
-            // nested under a colon holding parent has to escape the backslash to match
-            const escapedParentTags: PolicyTags = {
-                'Sales\\:EMEA:Roadshow': {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Sales\\\\:EMEA$'}},
-            };
+            it('returns true when tags are independent and at least one tag exists', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList = createMock<PolicyTagLists>({
+                    Department: {
+                        name: 'Department',
+                        tags: {
+                            Engineering: {name: 'Engineering', enabled: true},
+                        },
+                        required: false,
+                        orderWeight: 0,
+                    },
+                });
+                expect(hasIndependentTags(policy, policyTagList)).toBe(true);
+            });
 
-            expect(findPolicyTagAtLevel(escapedParentTags, 'Roadshow', 'Sales\\:EMEA')?.name).toBe('Roadshow');
-            expect(findPolicyTagAtLevel(escapedParentTags, 'Roadshow', 'Sales')).toBeUndefined();
+            it('returns true when at least one tag list has tags and others are empty', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                const policyTagList = createMock<PolicyTagLists>({
+                    Department: {
+                        name: 'Department',
+                        tags: {},
+                        required: false,
+                        orderWeight: 0,
+                    },
+                    Location: {
+                        name: 'Location',
+                        tags: {
+                            'New York': {name: 'New York', enabled: true},
+                        },
+                        required: false,
+                        orderWeight: 1,
+                    },
+                });
+                expect(hasIndependentTags(policy, policyTagList)).toBe(true);
+            });
+
+            it('returns false when policyTagList is undefined', () => {
+                const policy = createMock<Policy>({hasMultipleTagLists: true});
+                expect(hasIndependentTags(policy, undefined)).toBe(false);
+            });
         });
-    });
 
-    describe('findPolicyTagEntryByParentFilter', () => {
-        const dependentTags: PolicyTags = {
-            Roadshow: {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Marketing$'}},
-            'Roadshow-1': {name: 'Roadshow', enabled: true, 'GL Code': '2222', rules: {parentTagsFilter: '^Engineering$'}},
-        };
+        describe('getCleanedTagName', () => {
+            it.each([
+                ['unescapes colons used to build multi-level tags', 'Parent\\: Child', 'Parent: Child'],
+                ['HTML-decodes encoded entities', 'R&amp;D', 'R&D'],
+                ['unescapes colons and decodes entities together', 'R&amp;D\\: Lab', 'R&D: Lab'],
+                ['returns a plain tag unchanged', 'Engineering', 'Engineering'],
+                ['returns an empty string for an empty tag', '', ''],
+            ])('%s', (_description, tag, expected) => {
+                // Given a raw tag name as stored on a transaction or policy
+                // When it is cleaned for display
+                const result = getCleanedTagName(tag);
 
-        it('returns the tag and storage key when parentTagsFilter matches', () => {
-            expect(findPolicyTagEntryByParentFilter(dependentTags, 'Roadshow', '^Engineering$')).toEqual({
-                tag: dependentTags['Roadshow-1'],
-                tagKey: 'Roadshow-1',
+                // Then escaped colons are restored and HTML entities are decoded so the user sees the readable name
+                expect(result).toBe(expected);
             });
         });
 
-        it('returns the tag by name when parentTagsFilter is not provided', () => {
-            expect(findPolicyTagEntryByParentFilter(dependentTags, 'Roadshow')).toEqual({
-                tag: dependentTags.Roadshow,
-                tagKey: 'Roadshow',
+        describe('getTagLists', () => {
+            it('returns an empty array when the policy tag lists are undefined', () => {
+                // Given a policy whose tag lists have not loaded
+                // When the tag lists are read
+                const result = getTagLists(undefined);
+
+                // Then no tag lists are returned
+                expect(result).toEqual([]);
             });
-        });
 
-        it('returns undefined when parentTagsFilter does not match any tag', () => {
-            expect(findPolicyTagEntryByParentFilter(dependentTags, 'Roadshow', '^Sales$')).toBeUndefined();
-        });
-    });
+            it('returns an empty array when the policy has no tag lists', () => {
+                // Given a policy with an empty tag lists object
+                // When the tag lists are read
+                const result = getTagLists({});
 
-    describe('isTagInPolicy', () => {
-        const dependentPolicyTagLists: PolicyTagLists = {
-            Department: {
-                name: 'Department',
-                orderWeight: 0,
-                required: false,
-                tags: {
-                    Engineering: {name: 'Engineering', enabled: true},
-                    Marketing: {name: 'Marketing', enabled: true},
-                },
-            },
-            Project: {
-                name: 'Project',
-                orderWeight: 1,
-                required: false,
-                tags: {
-                    Roadshow: {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Marketing$'}},
-                    'Roadshow-1': {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Engineering$'}},
-                },
-            },
-        };
+                // Then no tag lists are returned
+                expect(result).toEqual([]);
+            });
 
-        it('returns false when policy tags are undefined', () => {
-            expect(isTagInPolicy('Engineering', undefined)).toBe(false);
-        });
+            it('returns the tag lists sorted by orderWeight', () => {
+                // Given tag lists stored out of orderWeight order, as they can arrive from Onyx
+                const policyTagLists = createMock<PolicyTagLists>({
+                    Project: {name: 'Project', orderWeight: 2, required: false, tags: {}},
+                    Department: {name: 'Department', orderWeight: 0, required: false, tags: {}},
+                    Location: {name: 'Location', orderWeight: 1, required: false, tags: {}},
+                });
 
-        it('returns false when the tag list level is missing', () => {
-            expect(isTagInPolicy('Engineering:Roadshow:Extra', dependentPolicyTagLists)).toBe(false);
-        });
+                // When the tag lists are read
+                const result = getTagLists(policyTagLists);
 
-        it('returns false when the tag is not in the policy', () => {
-            expect(isTagInPolicy('Nonexistent', dependentPolicyTagLists)).toBe(false);
-        });
+                // Then they come back in level order so index N maps to the Nth tag level
+                expect(result.map((tagList) => tagList.name)).toEqual(['Department', 'Location', 'Project']);
+            });
 
-        it('returns true for every level of an existing multi-level tag', () => {
-            expect(isTagInPolicy('Engineering:Roadshow', dependentPolicyTagLists)).toBe(true);
-            expect(isTagInPolicy('Marketing:Roadshow', dependentPolicyTagLists)).toBe(true);
-        });
+            it('skips a tag list left as null by an Onyx merge', () => {
+                // Given tag lists where an Onyx merge left a deleted list as null
+                const mergedTagLists = {
+                    Location: {name: 'Location', orderWeight: 1, required: false, tags: {}},
+                    Project: null,
+                    Department: {name: 'Department', orderWeight: 0, required: false, tags: {}},
+                };
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+                const policyTagLists = mergedTagLists as unknown as PolicyTagLists;
 
-        it('returns false when the dependent child matching the parent tag path is pending deletion', () => {
-            // Only the Engineering child is deleted, so the same-named Marketing child must not keep the tag alive
-            const tagListsWithDeletedChild: PolicyTagLists = {
-                ...dependentPolicyTagLists,
-                Project: {
-                    ...dependentPolicyTagLists.Project,
-                    tags: {
-                        Roadshow: {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Marketing$'}},
-                        'Roadshow-1': {name: 'Roadshow', enabled: true, rules: {parentTagsFilter: '^Engineering$'}, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
-                    },
-                },
-            };
+                // When the tag lists are read
+                const result = getTagLists(policyTagLists);
 
-            expect(isTagInPolicy('Engineering:Roadshow', tagListsWithDeletedChild)).toBe(false);
-            expect(isTagInPolicy('Marketing:Roadshow', tagListsWithDeletedChild)).toBe(true);
+                // Then the null list is dropped instead of crashing the orderWeight sort
+                expect(result.map((tagList) => tagList.name)).toEqual(['Department', 'Location']);
+            });
         });
 
-        it('returns false when a non-dependent tag is pending deletion', () => {
-            const tagListsWithDeletedTag: PolicyTagLists = {
-                Department: {
-                    name: 'Department',
-                    orderWeight: 0,
-                    required: false,
-                    tags: {
-                        Engineering: {name: 'Engineering', enabled: true, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
-                    },
-                },
-            };
+        describe('getCommaSeparatedTagNameWithSanitizedColons', () => {
+            it.each([
+                ['joins each tag level with a comma', 'Department:Engineering:Backend', 'Department, Engineering, Backend'],
+                ['skips empty tag levels', 'Department::Backend', 'Department, Backend'],
+                ['keeps escaped colons inside a single level', 'Parent\\: Child:Engineering', 'Parent: Child, Engineering'],
+                ['HTML-decodes each level', 'R&amp;D:Engineering', 'R&D, Engineering'],
+                ['returns a single-level tag unchanged', 'Engineering', 'Engineering'],
+                ['returns an empty string for an empty tag', '', ''],
+            ])('%s', (_description, tag, expected) => {
+                // Given a colon-delimited multi-level tag
+                // When it is converted for display
+                const result = getCommaSeparatedTagNameWithSanitizedColons(tag);
 
-            expect(isTagInPolicy('Engineering', tagListsWithDeletedTag)).toBe(false);
+                // Then each non-empty level is cleaned and the levels are joined with commas
+                expect(result).toBe(expected);
+            });
         });
-    });
 
-    describe('getGLCodeFromPolicyTag', () => {
-        it('returns empty string when tag is undefined', () => {
-            expect(getGLCodeFromPolicyTag(undefined)).toBe('');
-        });
+        describe('isMultiLevelTags', () => {
+            it('returns false when the policy tag lists are undefined', () => {
+                // Given a policy whose tag lists have not loaded
+                // When checking for multi-level tags
+                // Then it is not treated as multi-level
+                expect(isMultiLevelTags(undefined)).toBe(false);
+            });
 
-        it('returns empty string when tag has no GL code', () => {
-            expect(getGLCodeFromPolicyTag({})).toBe('');
-        });
+            it('returns false when the policy has no tag lists', () => {
+                // Given a policy with no tag lists
+                // When checking for multi-level tags
+                // Then it is not treated as multi-level
+                expect(isMultiLevelTags({})).toBe(false);
+            });
+
+            it('returns false when the policy has a single tag list', () => {
+                // Given a policy with only one tag list
+                const policyTagLists = createMock<PolicyTagLists>({
+                    Department: {name: 'Department', orderWeight: 0, required: false, tags: {}},
+                });
+
+                // When checking for multi-level tags
+                // Then a single list is not multi-level
+                expect(isMultiLevelTags(policyTagLists)).toBe(false);
+            });
+
+            it('returns true when the policy has more than one tag list', () => {
+                // Given a policy with two tag lists
+                const policyTagLists = createMock<PolicyTagLists>({
+                    Department: {name: 'Department', orderWeight: 0, required: false, tags: {}},
+                    Location: {name: 'Location', orderWeight: 1, required: false, tags: {}},
+                });
 
-        it('returns stripped GL code from tag', () => {
-            expect(getGLCodeFromPolicyTag({'GL Code': '"1234"'})).toBe('1234');
+                // When checking for multi-level tags
+                // Then more than one list means the policy uses multi-level tags
+                expect(isMultiLevelTags(policyTagLists)).toBe(true);
+            });
         });
     });
 
@@ -4045,218 +4604,37 @@ describe('PolicyUtils', () => {
         });
     });
 
-    describe('hasDependentTags', () => {
-        it('returns false when policy has no multiple tag lists', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: false});
-            const policyTagList: PolicyTagLists = {};
-            expect(hasDependentTags(policy, policyTagList)).toBe(false);
-        });
-
-        it('returns false when policy is undefined', () => {
-            expect(hasDependentTags(undefined, {})).toBe(false);
-        });
-
-        it('returns false when tags have no parentTagsFilter', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList = createMock<PolicyTagLists>({
-                Department: {
-                    name: 'Department',
-                    tags: {
-                        Engineering: {name: 'Engineering', enabled: true},
-                    },
-                    required: false,
-                    orderWeight: 0,
-                },
-            });
-            expect(hasDependentTags(policy, policyTagList)).toBe(false);
-        });
-
-        it('returns true when a tag has rules.parentTagsFilter', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList = createMock<PolicyTagLists>({
-                Department: {
-                    name: 'Department',
-                    tags: {
-                        Engineering: {name: 'Engineering', enabled: true, rules: {parentTagsFilter: '^California$'}},
-                    },
-                    required: false,
-                    orderWeight: 0,
-                },
-            });
-            expect(hasDependentTags(policy, policyTagList)).toBe(true);
-        });
-
-        it('returns true when a tag has parentTagsFilter at the top level', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList = createMock<PolicyTagLists>({
-                Department: {
-                    name: 'Department',
-                    tags: {
-                        Engineering: {name: 'Engineering', enabled: true, parentTagsFilter: '^California$'},
-                    },
-                    required: false,
-                    orderWeight: 0,
-                },
-            });
-            expect(hasDependentTags(policy, policyTagList)).toBe(true);
-        });
-
-        it('returns true when a later tag list has a dependent tag', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList: PolicyTagLists = {
-                Company: {name: 'Company', required: false, orderWeight: 0, tags: {acme: {name: 'Acme Corp', enabled: true}}},
-                Department: {name: 'Department', required: false, orderWeight: 1, tags: {admin: {name: 'Admin', enabled: true, rules: {parentTagsFilter: '^Acme Corp$'}}}},
-            };
-
-            expect(hasDependentTags(policy, policyTagList)).toBe(true);
-        });
-
-        it('skips a tag list left as null or without tags by an Onyx merge', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            // An Onyx merge leaves a deleted tag list as null, and an empty one without the `tags` key
-            const mergedTagLists = {
-                Company: {name: 'Company', required: false, orderWeight: 0},
-                Department: null,
-                GLCode: {name: 'GL code', required: false, orderWeight: 2, tags: {gl100: {name: 'GL-100', enabled: true, parentTagsFilter: '^Acme Corp:Admin$'}}},
-            };
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-            const policyTagList = mergedTagLists as unknown as PolicyTagLists;
-
-            expect(hasDependentTags(policy, policyTagList)).toBe(true);
-        });
-
-        it('returns false when every tag list is empty or missing its tags', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            // A tag list arrives without the `tags` key when it holds no tags
-            const mergedTagLists = {
-                Company: {name: 'Company', required: false, orderWeight: 0, tags: {}},
-                Department: {name: 'Department', required: false, orderWeight: 1},
-            };
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-            const policyTagList = mergedTagLists as unknown as PolicyTagLists;
-
-            expect(hasDependentTags(policy, policyTagList)).toBe(false);
-        });
-    });
-
-    describe('hasIndependentTags', () => {
-        it('returns false when policy has no multiple tag lists', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: false});
-            const policyTagList: PolicyTagLists = {};
-            expect(hasIndependentTags(policy, policyTagList)).toBe(false);
-        });
-
-        it('returns false when policy is undefined', () => {
-            expect(hasIndependentTags(undefined, {})).toBe(false);
-        });
-
-        it('returns false when tags are dependent (have parentTagsFilter)', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList = createMock<PolicyTagLists>({
-                Department: {
-                    name: 'Department',
-                    tags: {
-                        Engineering: {name: 'Engineering', enabled: true, rules: {parentTagsFilter: '^California$'}},
-                    },
-                    required: false,
-                    orderWeight: 0,
-                },
-            });
-            expect(hasIndependentTags(policy, policyTagList)).toBe(false);
-        });
-
-        it('returns false when all tag lists are empty', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList = createMock<PolicyTagLists>({
-                Department: {
-                    name: 'Department',
-                    tags: {},
-                    required: false,
-                    orderWeight: 0,
-                },
-                Location: {
-                    name: 'Location',
-                    tags: {},
-                    required: false,
-                    orderWeight: 1,
-                },
-            });
-            expect(hasIndependentTags(policy, policyTagList)).toBe(false);
-        });
-
-        it('returns true when tags are independent and at least one tag exists', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList = createMock<PolicyTagLists>({
-                Department: {
-                    name: 'Department',
-                    tags: {
-                        Engineering: {name: 'Engineering', enabled: true},
-                    },
-                    required: false,
-                    orderWeight: 0,
-                },
-            });
-            expect(hasIndependentTags(policy, policyTagList)).toBe(true);
-        });
-
-        it('returns true when at least one tag list has tags and others are empty', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            const policyTagList = createMock<PolicyTagLists>({
-                Department: {
-                    name: 'Department',
-                    tags: {},
-                    required: false,
-                    orderWeight: 0,
-                },
-                Location: {
-                    name: 'Location',
-                    tags: {
-                        'New York': {name: 'New York', enabled: true},
-                    },
-                    required: false,
-                    orderWeight: 1,
-                },
-            });
-            expect(hasIndependentTags(policy, policyTagList)).toBe(true);
-        });
-
-        it('returns false when policyTagList is undefined', () => {
-            const policy = createMock<Policy>({hasMultipleTagLists: true});
-            expect(hasIndependentTags(policy, undefined)).toBe(false);
-        });
-    });
-
     describe('hasConfiguredRules', () => {
         it('returns false when policy is undefined', () => {
-            expect(hasConfiguredRules(undefined)).toBe(false);
+            expect(hasConfiguredRules(undefined, undefined, false)).toBe(false);
         });
 
         it('returns false when policy has no rules configured', () => {
-            expect(hasConfiguredRules(createMock<Policy>({}))).toBe(false);
+            expect(hasConfiguredRules(createMock<Policy>({}), undefined, false)).toBe(false);
         });
 
         describe('customRules', () => {
             it('returns true when customRules is non-empty', () => {
-                expect(hasConfiguredRules(createMock<Policy>({customRules: 'some rule'}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({customRules: 'some rule'}), undefined, false)).toBe(true);
             });
 
             it('returns false when customRules is an empty string', () => {
-                expect(hasConfiguredRules(createMock<Policy>({customRules: ''}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({customRules: ''}), undefined, false)).toBe(false);
             });
 
             it('returns false when customRules is only whitespace', () => {
-                expect(hasConfiguredRules(createMock<Policy>({customRules: '   '}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({customRules: '   '}), undefined, false)).toBe(false);
             });
         });
 
         describe('rules.approvalRules', () => {
             it('returns true when approvalRules has items', () => {
                 const policy = createMock<Policy>({rules: {approvalRules: [{id: '1', applyWhen: [], approver: 'approver@test.com'}]}});
-                expect(hasConfiguredRules(policy)).toBe(true);
+                expect(hasConfiguredRules(policy, undefined, false)).toBe(true);
             });
 
             it('returns false when approvalRules is empty', () => {
-                expect(hasConfiguredRules(createMock<Policy>({rules: {approvalRules: []}}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({rules: {approvalRules: []}}), undefined, false)).toBe(false);
             });
         });
 
@@ -4273,157 +4651,151 @@ describe('PolicyUtils', () => {
                         ],
                     },
                 });
-                expect(hasConfiguredRules(policy)).toBe(true);
+                expect(hasConfiguredRules(policy, undefined, false)).toBe(true);
             });
 
             it('returns false when expenseRules is empty', () => {
-                expect(hasConfiguredRules(createMock<Policy>({rules: {expenseRules: []}}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({rules: {expenseRules: []}}), undefined, false)).toBe(false);
             });
         });
 
-        describe('rules.codingRules', () => {
-            it('returns true when codingRules has entries', () => {
-                const policy = createMock<Policy>({
-                    rules: {
-                        codingRules: {
-                            rule1: {
-                                ruleID: 'rule1',
-                                filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'},
-                            },
-                        },
-                    },
-                });
-                expect(hasConfiguredRules(policy)).toBe(true);
+        describe('merchant rules', () => {
+            // Which rules count towards this is decided by the caller's selector and covered in
+            // ExpenseDefaultRuleUtilsTest, so only the pass-through is checked here.
+            const policy = createMock<Policy>({id: 'policy1', rules: {}});
+
+            it('returns true when the policy has a merchant rule', () => {
+                expect(hasConfiguredRules(policy, undefined, true)).toBe(true);
             });
 
-            it('returns false when codingRules is empty', () => {
-                expect(hasConfiguredRules(createMock<Policy>({rules: {codingRules: {}}}))).toBe(false);
+            it('returns false when it has none', () => {
+                expect(hasConfiguredRules(policy, undefined, false)).toBe(false);
             });
         });
 
         describe('maxExpenseAmount', () => {
             it('returns true when maxExpenseAmount is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: 500000}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: 500000}), undefined, false)).toBe(true);
             });
 
             it('returns false when maxExpenseAmount is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT}), undefined, false)).toBe(false);
             });
 
             it('returns false when maxExpenseAmount is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.DISABLED_MAX_EXPENSE_VALUE}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmount: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
             });
         });
 
         describe('maxExpenseAge', () => {
             it('returns true when maxExpenseAge is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: 30}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: 30}), undefined, false)).toBe(true);
             });
 
             it('returns false when maxExpenseAge is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.POLICY.DEFAULT_MAX_EXPENSE_AGE}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.POLICY.DEFAULT_MAX_EXPENSE_AGE}), undefined, false)).toBe(false);
             });
 
             it('returns false when maxExpenseAge is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.DISABLED_MAX_EXPENSE_VALUE}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAge: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
             });
         });
 
         describe('maxExpenseAmountNoReceipt', () => {
             it('returns true when maxExpenseAmountNoReceipt is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: 5000}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: 5000}), undefined, false)).toBe(true);
             });
 
             it('returns false when maxExpenseAmountNoReceipt is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_RECEIPT}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_RECEIPT}), undefined, false)).toBe(false);
             });
 
             it('returns false when maxExpenseAmountNoReceipt is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
             });
         });
 
         describe('maxExpenseAmountNoItemizedReceipt', () => {
             it('returns true when maxExpenseAmountNoItemizedReceipt is set to a non-default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: 10000}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: 10000}), undefined, false)).toBe(true);
             });
 
             it('returns false when maxExpenseAmountNoItemizedReceipt is the default value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_ITEMIZED_RECEIPT}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_ITEMIZED_RECEIPT}), undefined, false)).toBe(false);
             });
 
             it('returns false when maxExpenseAmountNoItemizedReceipt is the disabled value', () => {
-                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({maxExpenseAmountNoItemizedReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE}), undefined, false)).toBe(false);
             });
         });
 
         describe('defaultBillable', () => {
             it('returns true when defaultBillable is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultBillable: true}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({defaultBillable: true}), undefined, false)).toBe(true);
             });
 
             it('returns false when defaultBillable is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultBillable: false}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({defaultBillable: false}), undefined, false)).toBe(false);
             });
         });
 
         describe('defaultReimbursable', () => {
             it('returns true when defaultReimbursable is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: false}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: false}), undefined, false)).toBe(true);
             });
 
             it('returns false when defaultReimbursable is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: true}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({defaultReimbursable: true}), undefined, false)).toBe(false);
             });
         });
 
         describe('eReceipts', () => {
             it('returns true when eReceipts is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({eReceipts: true}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({eReceipts: true}), undefined, false)).toBe(true);
             });
 
             it('returns false when eReceipts is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({eReceipts: false}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({eReceipts: false}), undefined, false)).toBe(false);
             });
         });
 
         describe('requireCompanyCardsEnabled', () => {
             it('returns true when requireCompanyCardsEnabled is true', () => {
-                expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: true}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: true}), undefined, false)).toBe(true);
             });
 
             it('returns false when requireCompanyCardsEnabled is false', () => {
-                expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: false}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({requireCompanyCardsEnabled: false}), undefined, false)).toBe(false);
             });
         });
 
         describe('prohibitedExpenses', () => {
             it('returns true when a prohibitedExpenses value differs from its default', () => {
                 // alcohol defaults to false — setting it to true triggers the rule
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {alcohol: true}}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {alcohol: true}}), undefined, false)).toBe(true);
             });
 
             it('returns true when gambling is disabled (differs from default true)', () => {
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {gambling: false}}))).toBe(true);
+                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {gambling: false}}), undefined, false)).toBe(true);
             });
 
             it('returns false when prohibitedExpenses matches all defaults', () => {
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {...CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES}}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {...CONST.POLICY.DEFAULT_PROHIBITED_EXPENSES}}), undefined, false)).toBe(false);
             });
 
             it('returns false when prohibitedExpenses is an empty object', () => {
-                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {}}))).toBe(false);
+                expect(hasConfiguredRules(createMock<Policy>({prohibitedExpenses: {}}), undefined, false)).toBe(false);
             });
         });
 
         it('returns true when only Classic category rules exist', () => {
             const categories = {Travel: {name: 'Travel', enabled: true, maxAmountNoReceipt: 0}};
-            expect(hasConfiguredRules(createMock<Policy>({}), categories)).toBe(true);
+            expect(hasConfiguredRules(createMock<Policy>({}), categories, false)).toBe(true);
         });
 
         it('returns false when categories have no active rule fields', () => {
             const categories = {Advertising: {name: 'Advertising', enabled: true, 'GL Code': '1234'}};
-            expect(hasConfiguredRules(createMock<Policy>({}), categories)).toBe(false);
+            expect(hasConfiguredRules(createMock<Policy>({}), categories, false)).toBe(false);
         });
     });
 
@@ -4977,8 +5349,26 @@ describe('PolicyUtils', () => {
                 expect(hasVendorFeature(buildIntacctPolicy(undefined), false)).toBe(false);
             });
 
-            it('returns false when beta is disabled and Xero is connected because Xero (R3) is still pre-GA', () => {
-                expect(hasVendorFeature(buildXeroPolicy(), false)).toBe(false);
+            it('returns true when beta is disabled and Xero is connected because Xero (R3) is generally available', () => {
+                // Given a workspace with a configured Xero connection
+                const policy = buildXeroPolicy();
+
+                // When the vendor feature is checked without the vendorMatching beta
+                const isVendorFeatureAvailable = hasVendorFeature(policy, false);
+
+                // Then the feature is available because Xero does not depend on the beta
+                expect(isVendorFeatureAvailable).toBe(true);
+            });
+
+            it('returns false when beta is disabled and Xero is connected but isConfigured=false because GA did not widen the configuration gate', () => {
+                // Given a Xero connection in the middle of a tenant switch, which Integration Server marks as not configured
+                const policy = buildXeroPolicy(undefined, {isConfigured: false});
+
+                // When the vendor feature is checked without the vendorMatching beta
+                const isVendorFeatureAvailable = hasVendorFeature(policy, false);
+
+                // Then the feature stays off so the contacts left over from the previous tenant are not offered
+                expect(isVendorFeatureAvailable).toBe(false);
             });
 
             it('returns true when beta is disabled and Rillet is connected because Rillet is generally available', () => {
@@ -5188,12 +5578,14 @@ describe('PolicyUtils', () => {
             });
         });
 
-        describe('hasVendorFeatureOnAnyPolicy', () => {
+        describe('hasVendorFeatureOnAnyPolicy and getVendorFeaturePolicyIDs', () => {
             const qboPolicy: Policy = {...buildQBOPolicy(CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD), id: 'qbo'};
             const xeroPolicy: Policy = {...buildXeroPolicy(), id: 'xero'};
+            const businessCentralPolicy: Policy = {...buildBusinessCentralPolicy(), id: 'businessCentral'};
             const plainPolicy: Policy = {...createRandomPolicy(3), connections: undefined, id: 'plain'};
             const qboKey = `${ONYXKEYS.COLLECTION.POLICY}qbo`;
             const xeroKey = `${ONYXKEYS.COLLECTION.POLICY}xero`;
+            const businessCentralKey = `${ONYXKEYS.COLLECTION.POLICY}businessCentral`;
             const plainKey = `${ONYXKEYS.COLLECTION.POLICY}plain`;
 
             it('is false when no workspace has the vendor feature', () => {
@@ -5204,12 +5596,50 @@ describe('PolicyUtils', () => {
                 expect(hasVendorFeatureOnAnyPolicy({[qboKey]: qboPolicy, [plainKey]: plainPolicy}, false)).toBe(true);
             });
 
-            it('is true for a Xero workspace with the beta', () => {
-                expect(hasVendorFeatureOnAnyPolicy({[xeroKey]: xeroPolicy, [plainKey]: plainPolicy}, true)).toBe(true);
+            it('is true for a Xero workspace without the beta', () => {
+                // Given a configured Xero workspace next to one with no accounting connection
+                const policies = {[xeroKey]: xeroPolicy, [plainKey]: plainPolicy};
+
+                // When the vendor feature is checked across the workspaces without the vendorMatching beta
+                const isVendorFeatureAvailable = hasVendorFeatureOnAnyPolicy(policies, false);
+
+                // Then the feature is available because Xero is generally available
+                expect(isVendorFeatureAvailable).toBe(true);
+            });
+
+            it('is true for a Business Central workspace with the beta', () => {
+                // Given a configured Business Central workspace, an integration that still depends on the beta
+                const policies = {[businessCentralKey]: businessCentralPolicy, [plainKey]: plainPolicy};
+
+                // When the vendor feature is checked across the workspaces with the vendorMatching beta
+                const isVendorFeatureAvailable = hasVendorFeatureOnAnyPolicy(policies, true);
+
+                // Then the feature is available because the beta unlocks Business Central
+                expect(isVendorFeatureAvailable).toBe(true);
             });
 
             it('ignores beta-gated integrations while the beta is off', () => {
-                expect(hasVendorFeatureOnAnyPolicy({[xeroKey]: xeroPolicy}, false)).toBe(false);
+                // Given only a Business Central workspace, an integration that still depends on the beta
+                const policies = {[businessCentralKey]: businessCentralPolicy};
+
+                // When the vendor feature is checked across the workspaces without the vendorMatching beta
+                const isVendorFeatureAvailable = hasVendorFeatureOnAnyPolicy(policies, false);
+
+                // Then the feature is not available on any workspace because Business Central still depends on the beta
+                expect(isVendorFeatureAvailable).toBe(false);
+            });
+
+            it('lists the workspaces that have the vendor feature', () => {
+                // Given QBO, Xero and Business Central workspaces next to one with no accounting connection
+                const policies = {[qboKey]: qboPolicy, [xeroKey]: xeroPolicy, [businessCentralKey]: businessCentralPolicy, [plainKey]: plainPolicy};
+
+                // When the workspace IDs are listed with and without the vendorMatching beta
+                const policyIDsWithBeta = getVendorFeaturePolicyIDs(policies, true);
+                const policyIDsWithoutBeta = getVendorFeaturePolicyIDs(policies, false);
+
+                // Then every connected workspace is listed with the beta, and Business Central is dropped without it because it still depends on the beta
+                expect(policyIDsWithBeta.toSorted()).toEqual(['businessCentral', 'qbo', 'xero']);
+                expect(policyIDsWithoutBeta.toSorted()).toEqual(['qbo', 'xero']);
             });
         });
 
@@ -5731,44 +6161,42 @@ describe('PolicyUtils', () => {
     });
 
     describe('hasPolicyRulesError', () => {
+        // Whether a merchant rule failed is reduced by the caller's selector and covered in
+        // ExpenseDefaultRuleUtilsTest, so only the agent rules and the pass-through are checked here.
+        const POLICY_ID = 'policy-with-rules';
+
         it('returns false for an undefined policy', () => {
-            expect(hasPolicyRulesError(undefined)).toBe(false);
+            expect(hasPolicyRulesError(undefined, false)).toBe(false);
         });
 
-        it('returns false when no coding or agent rules exist', () => {
-            const policy: Policy = {...createRandomPolicy(0), rules: {}};
-            expect(hasPolicyRulesError(policy)).toBe(false);
+        it('returns false when no merchant or agent rules exist', () => {
+            const policy: Policy = {...createRandomPolicy(0), id: POLICY_ID, rules: {}};
+            expect(hasPolicyRulesError(policy, false)).toBe(false);
         });
 
-        it('returns false when rules exist but none have errors', () => {
+        it('returns false when agent rules exist but none have errors', () => {
             const policy: Policy = {
                 ...createRandomPolicy(0),
-                rules: {
-                    codingRules: {rule1: {ruleID: 'rule1', filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'}}},
-                    agentRules: {ai1: {ruleID: 'ai1', prompt: 'p', created: '2026-06-08'}},
-                },
+                id: POLICY_ID,
+                rules: {agentRules: {ai1: {ruleID: 'ai1', prompt: 'p', created: '2026-06-08'}}},
             };
-            expect(hasPolicyRulesError(policy)).toBe(false);
+            expect(hasPolicyRulesError(policy, false)).toBe(false);
         });
 
-        it('returns true when a coding rule has errors', () => {
-            const policy: Policy = {
-                ...createRandomPolicy(0),
-                rules: {
-                    codingRules: {rule1: {ruleID: 'rule1', filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Starbucks'}, errors: {123: 'boom'}}},
-                },
-            };
-            expect(hasPolicyRulesError(policy)).toBe(true);
+        it('returns true when a merchant rule has errors', () => {
+            const policy: Policy = {...createRandomPolicy(0), id: POLICY_ID, rules: {}};
+            expect(hasPolicyRulesError(policy, true)).toBe(true);
         });
 
         it('returns true when an agent rule has errors', () => {
             const policy: Policy = {
                 ...createRandomPolicy(0),
+                id: POLICY_ID,
                 rules: {
                     agentRules: {ai1: {ruleID: 'ai1', prompt: 'p', created: '2026-06-08', errors: {123: 'boom'}}},
                 },
             };
-            expect(hasPolicyRulesError(policy)).toBe(true);
+            expect(hasPolicyRulesError(policy, false)).toBe(true);
         });
     });
 
@@ -5809,6 +6237,28 @@ describe('PolicyUtils', () => {
         });
     });
 
+    describe('isQBORefreshTokenExpiringSoonSelector', () => {
+        const buildQBOPolicy = (role: string, refreshTokenExpiresAt: number): Policy =>
+            Object.assign(createRandomPolicy(1), {
+                role,
+                connections: {quickbooksOnline: {config: {credentials: {companyID: '12345', refreshTokenExpiresAt}}, lastSync: {isAuthenticationError: false}}},
+            });
+        const expiringSoon = Math.floor(Date.now() / 1000) + 3 * 86400;
+
+        it('returns true for an admin whose QBO refresh token expires within the warning window', () => {
+            expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.ADMIN, expiringSoon))).toBe(true);
+        });
+
+        it('returns false for a member, since only admins can reconnect', () => {
+            expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.USER, expiringSoon))).toBe(false);
+        });
+
+        it('returns false when the token is still far from expiring or the policy is undefined', () => {
+            expect(isQBORefreshTokenExpiringSoonSelector(buildQBOPolicy(CONST.POLICY.ROLE.ADMIN, Math.floor(Date.now() / 1000) + 60 * 86400))).toBe(false);
+            expect(isQBORefreshTokenExpiringSoonSelector(undefined)).toBe(false);
+        });
+    });
+
     describe('isMergeHRCompleteSetupNeededSelector', () => {
         // Only the fields read by the selector are modeled here; `Object.assign` attaches the connection
         // to a real policy without an unsafe cast.
@@ -6121,6 +6571,28 @@ describe('getConnectedIntegration', () => {
     });
 });
 
+describe('isMemberInHomeAndOfficeWorkspace', () => {
+    it('only allows members of home and office workspaces', () => {
+        // Given a workspace whose employee list contains one member
+        const memberLogin = 'member@example.com';
+        const policy = createMock<Policy>({
+            commuterExclusions: {method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.HOME_AND_OFFICE},
+            employeeList: {[memberLogin]: {email: memberLogin}},
+        });
+        const otherWorkspace = {...policy, commuterExclusions: {method: CONST.POLICY.COMMUTER_EXCLUSION_METHOD.FIXED_DISTANCE}};
+
+        // When workspace mode and membership are checked
+        const isEligibleMember = isMemberInHomeAndOfficeWorkspace(policy, memberLogin);
+        const isEligibleForOtherWorkspaceMode = isMemberInHomeAndOfficeWorkspace(otherWorkspace, memberLogin);
+        const isEligibleForUnknownMember = isMemberInHomeAndOfficeWorkspace(policy, 'unknown@example.com');
+
+        // Then only the known member in a home and office workspace is eligible
+        expect(isEligibleMember).toBe(true);
+        expect(isEligibleForOtherWorkspaceMode).toBe(false);
+        expect(isEligibleForUnknownMember).toBe(false);
+    });
+});
+
 describe('shouldHideDynamicExternalWorkflowPeople', () => {
     it('returns false when the policy is undefined', () => {
         expect(shouldHideDynamicExternalWorkflowPeople(undefined)).toBe(false);
diff --git a/tests/unit/PusherHttpSocketTest.ts b/tests/unit/PusherHttpSocketTest.ts
new file mode 100644
index 000000000000..977d50bf8e7d
--- /dev/null
+++ b/tests/unit/PusherHttpSocketTest.ts
@@ -0,0 +1,126 @@
+import Pusher from 'pusher-js/with-encryption';
+
+const STREAM_URL = 'https://sockjs-mt1.pusher.com/pusher/app/key';
+
+class FakeXHR {
+    static instances: FakeXHR[] = [];
+
+    // pusher-js picks the XHR transport only when `withCredentials` is defined
+    withCredentials = false;
+
+    readyState = 0;
+
+    status = 0;
+
+    responseText = '';
+
+    onprogress = () => {};
+
+    onreadystatechange = () => {};
+
+    onload = () => {};
+
+    onerror = () => {};
+
+    ontimeout = () => {};
+
+    constructor() {
+        FakeXHR.instances.push(this);
+    }
+
+    open() {}
+
+    setRequestHeader() {}
+
+    send() {}
+
+    abort() {}
+
+    receive(text: string) {
+        this.readyState = 3;
+        this.status = 200;
+        this.responseText += text;
+        this.onprogress();
+    }
+
+    finish() {
+        this.readyState = 4;
+        this.onreadystatechange();
+    }
+}
+
+function openStream() {
+    const socket = Pusher.Runtime.HTTPFactory.createStreamingSocket(STREAM_URL);
+    const onopen = jest.fn();
+    const onmessage = jest.fn();
+    const onclose = jest.fn();
+    socket.onopen = onopen;
+    socket.onmessage = onmessage;
+    socket.onclose = onclose;
+
+    // The last XHR is the stream. pusher-js creates an earlier one only to check XHR support.
+    const xhr = FakeXHR.instances.at(-1);
+    return {xhr, onopen, onmessage, onclose};
+}
+
+describe('pusher-js HTTP streaming socket', () => {
+    beforeEach(() => {
+        FakeXHR.instances = [];
+        jest.spyOn(Pusher.Runtime, 'getXHRAPI').mockReturnValue(FakeXHR);
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should skip a line that is not valid JSON and still handle the frames after it', () => {
+        // Given an open HTTP stream, because pusher-js falls back to it when WebSockets fail
+        const {xhr, onopen, onmessage, onclose} = openStream();
+
+        // When one progress event carries a script line that Forcepoint DLP injected before the open and array frames,
+        // because the line starts with "c" and pusher-js parsed it as a close frame and threw
+        expect(() => xhr?.receive('class FPClassifier {\no\na["hello"]\n')).not.toThrow();
+
+        // Then the socket opens and delivers the message from that same progress event
+        expect(onopen).toHaveBeenCalledTimes(1);
+        expect(onmessage).toHaveBeenCalledTimes(1);
+        expect(onmessage).toHaveBeenCalledWith({data: 'hello'});
+        expect(onclose).not.toHaveBeenCalled();
+
+        // When the response ends
+        xhr?.finish();
+
+        // Then the socket closes, because the skipped line did not break the stream's end handling
+        expect(onclose).toHaveBeenCalledTimes(1);
+    });
+
+    it('should skip a close frame whose payload is not an array', () => {
+        // Given an open HTTP stream
+        const {xhr, onopen, onclose} = openStream();
+        xhr?.receive('o\n');
+        expect(onopen).toHaveBeenCalledTimes(1);
+
+        // When a line starts with "c" and holds valid JSON that is not an array, because a real close frame
+        // always carries [code, reason]
+        xhr?.receive('c{"code":1}\n');
+
+        // Then the socket stays open
+        expect(onclose).not.toHaveBeenCalled();
+    });
+
+    it('should skip an array frame whose payload is not an array', () => {
+        // Given an open HTTP stream
+        const {xhr, onopen, onmessage, onclose} = openStream();
+        xhr?.receive('o\n');
+        expect(onopen).toHaveBeenCalledTimes(1);
+
+        // When a line starts with "a" and holds valid JSON that is not an array, because pusher-js reads
+        // payload.length on it and would throw out of the XHR progress handler
+        // cspell:disable-next-line
+        expect(() => xhr?.receive('anull\n')).not.toThrow();
+
+        // Then no message is emitted and the socket stays open
+        expect(onmessage).not.toHaveBeenCalled();
+        expect(onclose).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 9c09557266ca..8a4633313234 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -69,6 +69,7 @@ import {
     getUpdateACHAccountMessage,
     getUpdatedAutoHarvestingMessage,
     getUpdatedCommuterExclusionsMessage,
+    getUpdatedMemberWorkArrangementMessage,
     getUpdatedCardFeedLiabilityMessage,
     getUpdatedCardFeedStatementPeriodMessage,
     hasNextActionMadeBySameActor,
@@ -1443,6 +1444,23 @@ describe('ReportActionsUtils', () => {
             ]);
         });
 
+        it('does not link Business Central export record IDs', () => {
+            // Given an export with one out-of-pocket record and multiple company card records stored as IDs
+            const action = buildExportedToIntegrationAction(CONST.EXPORT_LABELS.BUSINESS_CENTRAL, ['card-record-1', 'card-record-2'], ['reimbursable-record-1']);
+
+            // When the export confirmation is formatted
+            const fragments = ReportActionsUtils.getExportIntegrationActionFragments(translateLocal, action);
+
+            // Then both expense types remain visible without links to an unrelated accounting system
+            expect(fragments).toEqual([
+                {text: `exported to ${CONST.EXPORT_LABELS.BUSINESS_CENTRAL}`, url: ''},
+                {text: 'and successfully created a record for', url: ''},
+                {text: 'out-of-pocket expenses', url: ''},
+                {text: 'and', url: ''},
+                {text: 'company card expenses', url: ''},
+            ]);
+        });
+
         it('ends a single out-of-pocket expense link with a period by default', () => {
             // Given an export action whose only link is a single reimbursable expense URL
             const action = buildExportedToIntegrationAction(CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.netsuite, [], ['https://system.netsuite.com/1']);
@@ -2921,7 +2939,46 @@ describe('ReportActionsUtils', () => {
             expect(actual).toBe(expected);
         });
     });
+
+    describe('getAgentPromptUpdatedMessageHTML', () => {
+        it('renders the modifier as a mention and escapes the prompts', () => {
+            const action = createMock<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED>>({
+                actionName: CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED,
+                reportActionID: '1',
+                originalMessage: {
+                    previousPrompt: '<strong>Review every expense</strong>',
+                    newPrompt: 'Review expenses over $100',
+                    updatedByAccountID: 1,
+                    updatedBy: 'owner@expensify.com',
+                },
+            });
+
+            const message = ReportActionsUtils.getAgentPromptUpdatedMessageHTML(translateLocal, action);
+
+            expect(message).toContain('<mention-user accountID="1"/>');
+            expect(message).toContain('&lt;strong&gt;Review every expense&lt;/strong&gt;');
+            expect(message).not.toContain('<strong>');
+        });
+    });
+
     describe('isDeletedAction', () => {
+        it('should keep an agent prompt update with an empty message visible', () => {
+            const action = createMock<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED>>({
+                actionName: CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED,
+                reportActionID: '1',
+                message: [],
+                originalMessage: {
+                    previousPrompt: 'Review every expense',
+                    newPrompt: 'Review expenses over $100',
+                    updatedByAccountID: 1,
+                    updatedBy: 'owner@expensify.com',
+                },
+            });
+
+            expect(ReportActionsUtils.isDeletedAction(action)).toBe(false);
+            expect(ReportActionsUtils.shouldReportActionBeVisible(action, action.reportActionID, true)).toBe(true);
+        });
+
         it('should return false if the action is a hold or unhold action', () => {
             const action: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.HOLD | typeof CONST.REPORT.ACTIONS.TYPE.UNHOLD> = {
                 ...createRandomReportAction(0),
@@ -4498,6 +4555,65 @@ describe('ReportActionsUtils', () => {
         });
     });
 
+    describe('getUpdatedMemberWorkArrangementMessage', () => {
+        const buildAction = (originalMessage: Record<string, unknown>, actionName: ReportAction['actionName'] = CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_MEMBER_WORK_ARRANGEMENT) =>
+            ({
+                actionName,
+                reportActionID: '1',
+                created: '',
+                originalMessage,
+                message: [{type: CONST.REPORT.MESSAGE.TYPE.COMMENT, text: 'fallback message', html: 'fallback message'}],
+            }) as ReportAction;
+
+        it('falls back to the report action text for another action type', () => {
+            const action = buildAction({newValue: true, oldValue: false}, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_HARVESTING);
+
+            expect(getUpdatedMemberWorkArrangementMessage(translateLocal, action)).toBe(ReportActionsUtils.getReportActionText(action));
+        });
+
+        it('falls back to the report action text when arrangement values are not booleans', () => {
+            const action = buildAction({newValue: 'office', oldValue: false});
+
+            expect(getUpdatedMemberWorkArrangementMessage(translateLocal, action)).toBe(ReportActionsUtils.getReportActionText(action));
+        });
+
+        it('uses the member name when available', () => {
+            const action = buildAction({name: 'Member One', newValue: true, oldValue: false});
+
+            expect(getUpdatedMemberWorkArrangementMessage(translateLocal, action)).toBe(
+                translateLocal('workspaceActions.updatedMemberWorkArrangement', {
+                    displayName: 'Member One',
+                    newArrangement: translateLocal('workspace.people.officeBased'),
+                    oldArrangement: translateLocal('workspace.people.noRegularWorkspace'),
+                }),
+            );
+        });
+
+        it('formats the email when a member name is missing', () => {
+            const email = '+919383833920@expensify.sms';
+            const action = buildAction({email, newValue: true, oldValue: false});
+
+            expect(getUpdatedMemberWorkArrangementMessage(translateLocal, action)).toBe(
+                translateLocal('workspaceActions.updatedMemberWorkArrangement', {
+                    displayName: formatPhoneNumber(email),
+                    newArrangement: translateLocal('workspace.people.officeBased'),
+                    oldArrangement: translateLocal('workspace.people.noRegularWorkspace'),
+                }),
+            );
+        });
+
+        it('uses the default arrangement message when no member name or email is present', () => {
+            const action = buildAction({name: '', newValue: true, oldValue: false});
+
+            expect(getUpdatedMemberWorkArrangementMessage(translateLocal, action)).toBe(
+                translateLocal('workspaceActions.updatedDefaultWorkArrangement', {
+                    newArrangement: translateLocal('workspace.people.officeBased'),
+                    oldArrangement: translateLocal('workspace.people.noRegularWorkspace'),
+                }),
+            );
+        });
+    });
+
     describe('getUpdatedCardFeedLiabilityMessage', () => {
         it('should return enabled message when liabilityType is ALLOW', () => {
             const action = {
@@ -7356,6 +7472,23 @@ describe('ReportActionsUtils', () => {
             expect(ReportActionsUtils.getLatestConciergeFeedbackActionID(sorted, persisted(sorted))).toBe('200');
         });
 
+        it('picks the newest Concierge comment out of a report actions collection', () => {
+            const older = conciergeComment('100', '2026-09-01 00:00:00.000');
+            const newer = conciergeComment('200', '2026-09-02 00:00:00.000');
+            const userComment = conciergeComment('300', '2026-09-03 00:00:00.000', {actorAccountID: 12345});
+            const collection = {[older.reportActionID]: older, [newer.reportActionID]: newer, [userComment.reportActionID]: userComment};
+
+            expect(ReportActionsUtils.getLatestConciergeFeedbackActionIDFromReportActions(collection)).toBe('200');
+        });
+
+        it('returns undefined when the collection holds no Concierge comment to rate', () => {
+            const whisper = conciergeComment('400', '2026-09-05 00:00:00.000', {originalMessage: {html: 'w', whisperedTo: [1]}} as Partial<ReportAction>);
+            const failed = conciergeComment('500', '2026-09-06 00:00:00.000', {errors: {someError: 'error'}});
+
+            expect(ReportActionsUtils.getLatestConciergeFeedbackActionIDFromReportActions({[whisper.reportActionID]: whisper, [failed.reportActionID]: failed})).toBeUndefined();
+            expect(ReportActionsUtils.getLatestConciergeFeedbackActionIDFromReportActions(undefined)).toBeUndefined();
+        });
+
         it('returns undefined for an empty report', () => {
             expect(ReportActionsUtils.getLatestConciergeFeedbackActionID([], persisted([]))).toBeUndefined();
         });
diff --git a/tests/unit/ReportAlternateTextParityTest.ts b/tests/unit/ReportAlternateTextParityTest.ts
index e083c2fa8746..f57cc07add94 100644
--- a/tests/unit/ReportAlternateTextParityTest.ts
+++ b/tests/unit/ReportAlternateTextParityTest.ts
@@ -237,6 +237,7 @@ const SIMPLE_CHAIN_ACTIONS: Array<ReportAction['actionName']> = [
     CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED,
     CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL,
     CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT,
+    CONST.REPORT.ACTIONS.TYPE.UNDELETED_TRANSACTION,
 ];
 
 describe('getOptionData alternateText parity snapshots', () => {
diff --git a/tests/unit/ReportAlternateTextUtilsTest.ts b/tests/unit/ReportAlternateTextUtilsTest.ts
index b0903686d9da..cec6ab75c027 100644
--- a/tests/unit/ReportAlternateTextUtilsTest.ts
+++ b/tests/unit/ReportAlternateTextUtilsTest.ts
@@ -469,6 +469,39 @@ describe('ReportAlternateTextUtils', () => {
     });
 
     describe('getLastMessageTextForReport', () => {
+        it('formats an agent prompt update from its original message', () => {
+            const report: Report = createRandomReport(0, undefined);
+            const agentPromptUpdatedAction: ReportAction = {
+                ...createRandomReportAction(1),
+                actionName: CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED,
+                originalMessage: {
+                    previousPrompt: 'Summarize expenses.',
+                    newPrompt: 'Summarize expenses and flag policy exceptions.',
+                    updatedByAccountID: CURRENT_USER_ACCOUNT_ID,
+                    updatedBy: CURRENT_USER_LOGIN,
+                },
+            };
+
+            const lastMessage = getLastMessageTextForReport({
+                dateFnsLocale: undefined,
+                conciergeReportID: undefined,
+                currentUserAccountID: CURRENT_USER_ACCOUNT_ID,
+                personalDetails: undefined,
+                translate: translateLocal,
+                convertToDisplayString,
+                report,
+                lastActorDetails: null,
+                isReportArchived: false,
+                lastAction: agentPromptUpdatedAction,
+                currentUserLogin: CURRENT_USER_LOGIN,
+                rules: undefined,
+            });
+
+            expect(lastMessage).toBe(
+                `${CURRENT_USER_LOGIN} updated this agent's instructions.\nPrevious instructions:\nSummarize expenses.\nNew instructions:\nSummarize expenses and flag policy exceptions.`,
+            );
+        });
+
         describe('getReportPreviewMessage', () => {
             it('should format report preview message correctly for non-policy expense chat with IOU action', async () => {
                 const report: Report = {
diff --git a/tests/unit/ReportFetchHandlerTest.tsx b/tests/unit/ReportFetchHandlerTest.tsx
index aeb84b000043..b52ab7a11435 100644
--- a/tests/unit/ReportFetchHandlerTest.tsx
+++ b/tests/unit/ReportFetchHandlerTest.tsx
@@ -21,17 +21,29 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 const REPORT_ID = '1';
 const PUBLIC_ROOM_ID = '2';
 
-let mockRouteParams: Record<string, unknown> = {reportID: REPORT_ID};
+// The real useRoute returns a stable object until the route actually changes, and the fetch effect keys off that
+// identity. Mirror it here, or every re-render would look like a navigation and fire its own openReport.
+let mockRoute: {key: string; name: string; params: Record<string, unknown>} = {key: 'report', name: 'Report', params: {reportID: REPORT_ID}};
 const mockSetParams = jest.fn();
 
+function setRouteParams(params: Record<string, unknown>) {
+    mockRoute = {key: 'report', name: 'Report', params};
+}
+
 jest.mock('@react-navigation/native', () => ({
     ...jest.requireActual<typeof ReactNavigationNative>('@react-navigation/native'),
-    useRoute: () => ({key: 'report', name: 'Report', params: mockRouteParams}),
+    useRoute: () => mockRoute,
     useNavigation: () => ({setParams: mockSetParams, addListener: jest.fn(() => jest.fn())}),
     useIsFocused: () => true,
 }));
 
-const mockOpenReport = jest.fn();
+let mockIsOffline = false;
+jest.mock('@hooks/useNetwork', () => ({
+    __esModule: true,
+    default: () => ({isOffline: mockIsOffline}),
+}));
+
+const mockOpenReport = jest.fn<void, Parameters<typeof UserActionsReport.openReport>>();
 jest.mock('@userActions/Report', () => ({
     ...jest.requireActual<typeof UserActionsReport>('@userActions/Report'),
     openReport: (...args: Parameters<typeof UserActionsReport.openReport>) => {
@@ -58,7 +70,8 @@ describe('ReportFetchHandler', () => {
     beforeEach(async () => {
         mockOpenReport.mockClear();
         mockSetParams.mockClear();
-        mockRouteParams = {reportID: REPORT_ID};
+        mockIsOffline = false;
+        setRouteParams({reportID: REPORT_ID});
         await Onyx.clear();
         await Onyx.multiSet({
             [ONYXKEYS.IS_LOADING_APP]: false,
@@ -69,7 +82,7 @@ describe('ReportFetchHandler', () => {
 
     it('does NOT call openReport when isPendingCreation is set and the report does not exist locally yet', async () => {
         // Given an optimistic destination that has not been created locally yet
-        mockRouteParams = {reportID: REPORT_ID, isPendingCreation: 'true'};
+        setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
 
         // When the pre-mounted destination starts handling report fetches
         renderHandler();
@@ -81,7 +94,7 @@ describe('ReportFetchHandler', () => {
 
     it('expires a stale isPendingCreation flag when the focused screen never receives a report row', async () => {
         // Given a restored route that still carries isPendingCreation but has no submit writing the report
-        mockRouteParams = {reportID: REPORT_ID, isPendingCreation: 'true'};
+        setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
         jest.useFakeTimers();
 
         // When the focused screen waits without a report row
@@ -101,7 +114,7 @@ describe('ReportFetchHandler', () => {
 
     it('calls openReport again once the pre-mounted report exists locally and isPendingCreation clears', async () => {
         // Given a pre-mounted report that has become locally available
-        mockRouteParams = {reportID: REPORT_ID};
+        setRouteParams({reportID: REPORT_ID});
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
         await waitForBatchedUpdates();
 
@@ -115,7 +128,7 @@ describe('ReportFetchHandler', () => {
 
     it('clears isPendingCreation once the report exists locally', async () => {
         // Given an optimistic route whose report has just become locally available
-        mockRouteParams = {reportID: REPORT_ID, isPendingCreation: 'true'};
+        setRouteParams({reportID: REPORT_ID, isPendingCreation: 'true'});
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
         await waitForBatchedUpdates();
 
@@ -155,6 +168,101 @@ describe('ReportFetchHandler', () => {
         expect(mockOpenReport).toHaveBeenCalledWith(expect.objectContaining({reportID: REPORT_ID}));
     });
 
+    it('calls openReport again when the memory-only loaded stamp is wiped underneath a mounted screen', async () => {
+        // Given a mounted report whose actions have already loaded once
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {hasOnceLoadedReportActions: true, isLoadingInitialReportActions: false});
+        await waitForBatchedUpdates();
+        renderHandler();
+        await waitForBatchedUpdates();
+        mockOpenReport.mockClear();
+
+        // When "Clear cache and restart" drops the memory-only loading state without remounting the screen
+        await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, null);
+        await waitForBatchedUpdates();
+
+        // Then the report is fetched again so the loading state can settle instead of staying armed forever
+        expect(mockOpenReport).toHaveBeenCalledWith(expect.objectContaining({reportID: REPORT_ID}));
+    });
+
+    it('does NOT re-fetch when the loaded stamp is wiped while offline', async () => {
+        // Given a mounted report whose actions have already loaded once, on a device that has since gone offline
+        mockIsOffline = true;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {hasOnceLoadedReportActions: true, isLoadingInitialReportActions: false});
+        await waitForBatchedUpdates();
+        renderHandler();
+        await waitForBatchedUpdates();
+        mockOpenReport.mockClear();
+
+        // When the memory-only loading state is dropped
+        await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, null);
+        await waitForBatchedUpdates();
+
+        // Then nothing is requested, because the fetch would only sit in the queue until connectivity returns
+        expect(mockOpenReport).not.toHaveBeenCalled();
+    });
+
+    it('does NOT re-fetch for a report whose actions simply never loaded', async () => {
+        // Given a report that has been opened but has never recorded a loaded stamp
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
+        await waitForBatchedUpdates();
+        renderHandler();
+        await waitForBatchedUpdates();
+        mockOpenReport.mockClear();
+
+        // When its initial load resolves without ever succeeding, the way a failed fetch leaves it
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {isLoadingInitialReportActions: false});
+        await waitForBatchedUpdates();
+
+        // Then nothing re-fetches, because a stamp that was never there is not a stamp that was wiped
+        expect(mockOpenReport).not.toHaveBeenCalled();
+    });
+
+    it('does NOT treat switching from a loaded report to an unloaded one as a wiped stamp', async () => {
+        // Given a mounted report whose actions have already loaded once, and another report that has never loaded
+        const OTHER_REPORT_ID = '3';
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${OTHER_REPORT_ID}`, {reportID: OTHER_REPORT_ID});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {hasOnceLoadedReportActions: true, isLoadingInitialReportActions: false});
+        await waitForBatchedUpdates();
+        const {rerender} = renderHandler();
+        await waitForBatchedUpdates();
+        mockOpenReport.mockClear();
+
+        // When the same screen is re-parameterized to the other report without unmounting
+        setRouteParams({reportID: OTHER_REPORT_ID});
+        rerender(<HandlerTree isInPreloadedTab={false} />);
+        await waitForBatchedUpdates();
+
+        // Then the other report is fetched exactly once, by the normal fetch effect, not again by the cache-clear re-fetch
+        expect(mockOpenReport.mock.calls.filter(([params]) => params.reportID === OTHER_REPORT_ID)).toHaveLength(1);
+    });
+
+    it('holds the re-fetch of a wiped loaded stamp while the Inbox tab is preloaded and resumes it once it opens', async () => {
+        // Given a report mounted inside a warmed tab the user has not opened yet
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, {hasOnceLoadedReportActions: true, isLoadingInitialReportActions: false});
+        await waitForBatchedUpdates();
+        const {rerender} = renderHandler(true);
+        await waitForBatchedUpdates();
+        mockOpenReport.mockClear();
+
+        // When the memory-only loading state is dropped underneath the preloaded tab
+        await Onyx.set(`${ONYXKEYS.COLLECTION.RAM_ONLY_REPORT_LOADING_STATE}${REPORT_ID}`, null);
+        await waitForBatchedUpdates();
+
+        // Then nothing is fetched, because OpenReport would mark a report the user never opened as read
+        expect(mockOpenReport).not.toHaveBeenCalled();
+
+        // When the user opens the tab, which drops the preloaded flag
+        rerender(<HandlerTree isInPreloadedTab={false} />);
+        await waitForBatchedUpdates();
+
+        // Then the held re-fetch runs, so the loading state still settles instead of staying armed forever
+        expect(mockOpenReport).toHaveBeenCalledWith(expect.objectContaining({reportID: REPORT_ID}));
+    });
+
     it('holds every openReport while the Inbox tab is preloaded and resumes them once it opens', async () => {
         // Given a report that is normally fetched on mount
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID});
diff --git a/tests/unit/ReportNameUtilsTest.ts b/tests/unit/ReportNameUtilsTest.ts
index 0dc6e4090f56..ba675255a6c7 100644
--- a/tests/unit/ReportNameUtilsTest.ts
+++ b/tests/unit/ReportNameUtilsTest.ts
@@ -560,6 +560,52 @@ describe('ReportNameUtils', () => {
             );
             expect(name).toBe(expected);
         });
+
+        test('Agent prompt update parent action', () => {
+            const thread: Report = createWorkspaceThread(52);
+            const originalMessage = {
+                previousPrompt: 'Review every expense',
+                newPrompt: 'Review expenses over $100',
+                updatedByAccountID: 1,
+                updatedBy: 'owner@expensify.com',
+            };
+            const parentAction = createMock<ReportAction>({
+                actionName: CONST.REPORT.ACTIONS.TYPE.AGENT_PROMPT_UPDATED,
+                reportActionID: String(thread.parentReportActionID),
+                message: [
+                    {
+                        type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                        style: 'normal',
+                        text: "owner@expensify.com updated this agent's instructions.",
+                    },
+                ],
+                created: '',
+                lastModified: '',
+                actorAccountID: 1,
+                person: [],
+                originalMessage,
+            });
+
+            const reportActionsCollection: Record<string, ReportActions> = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.parentReportID}`]: {
+                    [String(thread.parentReportActionID)]: parentAction,
+                },
+            };
+
+            const name = computeReportName(
+                thread,
+                emptyCollections.reports,
+                emptyCollections.policies,
+                undefined,
+                undefined,
+                participantsPersonalDetails,
+                reportActionsCollection,
+                currentUserAccountID,
+            );
+
+            expect(name).toBe(translate(CONST.LOCALES.EN, 'agentPromptUpdated', originalMessage));
+        });
+
         test('VBBA pay parent action uses action accountNumber before current policy account', () => {
             const policyID = '123';
             const thread: Report = {
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index e15da76f3606..db7591600ff9 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -162,6 +162,7 @@ describe('getSecondaryAction', () => {
                 bankAccountList: {},
                 policy,
                 rules: undefined,
+                cardList: undefined,
             }),
         ).toEqual(result);
     });
@@ -186,6 +187,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_RECEIPTS)).toBe(true);
@@ -207,6 +209,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_RECEIPTS)).toBe(false);
@@ -228,6 +231,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_RECEIPTS)).toBe(false);
@@ -279,6 +283,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.PAY)).toBe(true);
@@ -336,6 +341,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
@@ -396,6 +402,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
@@ -449,6 +456,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
@@ -503,6 +511,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
@@ -566,6 +575,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
@@ -593,6 +603,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.PRINT)).toBe(false);
@@ -626,6 +637,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_PDF)).toBe(false);
@@ -653,6 +665,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_PDF)).toBe(true);
@@ -680,6 +693,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.PRINT)).toBe(true);
@@ -719,6 +733,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.ADD_EXPENSE)).toBe(true);
     });
@@ -753,6 +768,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -788,6 +804,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -827,6 +844,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -870,6 +888,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -915,6 +934,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -958,6 +978,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1011,6 +1032,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1051,6 +1073,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1088,6 +1111,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -1125,6 +1149,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -1159,6 +1184,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -1200,6 +1226,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -1248,6 +1275,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -1281,6 +1309,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1330,6 +1359,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
@@ -1366,6 +1396,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1407,6 +1438,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1454,6 +1486,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1496,6 +1529,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(false);
     });
@@ -1537,6 +1571,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
@@ -1577,6 +1612,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(false);
     });
@@ -1621,6 +1657,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         // Then APPROVE should be included because DEW approval is not in progress
@@ -1668,6 +1705,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportMetadata: {pendingExpenseAction: CONST.EXPENSE_PENDING_ACTION.APPROVE},
             rules: undefined,
+            cardList: undefined,
         });
 
         // Then APPROVE should not be included because DEW is already processing an approval
@@ -1713,6 +1751,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(false);
@@ -1757,6 +1796,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
@@ -1800,6 +1840,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
@@ -1842,6 +1883,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(false);
     });
@@ -1881,6 +1923,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
@@ -1920,6 +1963,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(false);
     });
@@ -1956,6 +2000,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(false);
     });
@@ -1983,6 +2028,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(true);
     });
@@ -2013,6 +2059,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(true);
     });
@@ -2042,6 +2089,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(true);
     });
@@ -2071,6 +2119,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(false);
     });
@@ -2101,6 +2150,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(false);
     });
@@ -2131,6 +2181,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(false);
     });
@@ -2162,6 +2213,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(false);
     });
@@ -2194,6 +2246,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         // Then UNAPPROVE should not be included because DEW policies restrict unapprove to admins only
@@ -2229,6 +2282,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         // Then UNAPPROVE should be included because admins can unapprove on DEW policies
@@ -2262,6 +2316,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -2335,6 +2390,7 @@ describe('getSecondaryAction', () => {
             ...baseArgs,
             policy: createMock<Policy>(policyData),
             rules: undefined,
+            cardList: undefined,
         });
         expect(resultWithoutArchive.includes(action)).toBe(true);
 
@@ -2342,6 +2398,7 @@ describe('getSecondaryAction', () => {
             ...baseArgs,
             policy: createMock<Policy>({...policyData, archivedDate: '2026-08-01 00:00:00'}),
             rules: undefined,
+            cardList: undefined,
         });
         expect(resultWithArchive.includes(action)).toBe(false);
     });
@@ -2387,6 +2444,7 @@ describe('getSecondaryAction', () => {
             },
             isChatReportArchived: true,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(action)).toBe(true);
     });
@@ -2441,6 +2499,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -2495,6 +2554,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -2548,6 +2608,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
     });
@@ -2601,6 +2662,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
     });
@@ -2643,6 +2705,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
     });
@@ -2696,6 +2759,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -2749,6 +2813,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -2800,6 +2865,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
     });
@@ -2839,6 +2905,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy: undefined,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -2878,6 +2945,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy: undefined,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
     });
@@ -2917,6 +2985,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy: undefined,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
     });
@@ -2956,6 +3025,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy: undefined,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(false);
     });
@@ -2987,6 +3057,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(true);
     });
@@ -3018,6 +3089,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(true);
     });
@@ -3049,6 +3121,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(false);
     });
@@ -3081,6 +3154,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(true);
     });
@@ -3119,6 +3193,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [reportAction],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(false);
     });
@@ -3155,6 +3230,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(false);
     });
@@ -3193,6 +3269,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [reportAction],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(true);
     });
@@ -3225,6 +3302,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(true);
     });
@@ -3257,6 +3335,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(false);
     });
@@ -3290,6 +3369,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(false);
     });
@@ -3326,6 +3406,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(false);
     });
@@ -3358,6 +3439,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.RECEIVED_PAYMENT)).toBe(false);
     });
@@ -3393,6 +3475,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [actionR14932],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(true);
     });
@@ -3427,6 +3510,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [actionR14932],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(false);
     });
@@ -3464,6 +3548,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions: [actionR14932],
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(false);
     });
@@ -3509,6 +3594,7 @@ describe('getSecondaryAction', () => {
             policy,
             policies,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(false);
     });
@@ -3555,6 +3641,7 @@ describe('getSecondaryAction', () => {
             policy,
             policies,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
@@ -3616,6 +3703,7 @@ describe('getSecondaryAction', () => {
             policy: oldPolicy,
             policies,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
@@ -3677,6 +3765,7 @@ describe('getSecondaryAction', () => {
             policy,
             policies,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
@@ -3738,6 +3827,7 @@ describe('getSecondaryAction', () => {
             policy,
             policies,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
@@ -3765,6 +3855,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
@@ -3827,6 +3918,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(false);
@@ -3893,6 +3985,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(true);
@@ -3925,6 +4018,7 @@ describe('getSecondaryAction', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
@@ -3972,6 +4066,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
@@ -4019,6 +4114,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
@@ -4081,6 +4177,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
     });
@@ -4127,6 +4224,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
@@ -4179,6 +4277,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
@@ -4222,6 +4321,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
     });
@@ -4261,6 +4361,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
     });
@@ -4316,6 +4417,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(false);
     });
@@ -4360,6 +4462,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
@@ -4392,6 +4495,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
     });
@@ -4428,6 +4532,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).not.toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
     });
@@ -4475,6 +4580,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE_EXPENSE)).toBe(true);
     });
@@ -4507,6 +4613,7 @@ describe('getSecondaryAction', () => {
             originalTransaction: createMock<Transaction>({}),
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE_EXPENSE)).toBe(false);
     });
@@ -4569,6 +4676,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE_EXPENSE)).toBe(false);
     });
@@ -4611,6 +4719,7 @@ describe('getSecondaryAction', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE_EXPENSE)).toBe(false);
     });
@@ -4658,6 +4767,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE_EXPENSE)).toBe(false);
     });
@@ -4697,6 +4807,7 @@ describe('getSecondaryAction', () => {
             reportActions,
             moveExpenseReportNameValuePairs,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).toContain(CONST.REPORT.SECONDARY_ACTIONS.MOVE_EXPENSE);
         expect(ReportUtils.canEditFieldOfMoneyRequest).toHaveBeenCalledWith(
@@ -4736,6 +4847,7 @@ describe('getSecondaryAction', () => {
             policy,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).not.toContain(CONST.REPORT.SECONDARY_ACTIONS.MOVE_EXPENSE);
     });
@@ -5163,6 +5275,7 @@ describe('getReportAccountingExportActions', () => {
             bankAccountList: {},
             policy,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
     });
@@ -5199,6 +5312,7 @@ describe('getSecondaryTransactionThreadActions', () => {
                 policy,
                 isChatReportArchived: false,
                 rules: undefined,
+                cardList: undefined,
             }),
         ).toEqual(result);
     });
@@ -5230,6 +5344,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(true);
     });
@@ -5258,6 +5373,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             transactionThreadReport,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
 
@@ -5274,6 +5390,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             transactionThreadReport,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result2).not.toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
     });
@@ -5301,6 +5418,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
@@ -5361,6 +5479,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
 
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(false);
@@ -5415,6 +5534,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policies,
             reportActions,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(false);
     });
@@ -5461,6 +5581,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(true);
     });
@@ -5523,6 +5644,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
 
         // Then the SPLIT option is available
@@ -5570,6 +5692,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(false);
     });
@@ -5617,6 +5740,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(false);
     });
@@ -5667,6 +5791,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(false);
     });
@@ -5697,6 +5822,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(true);
     });
@@ -5729,6 +5855,7 @@ describe('getSecondaryTransactionThreadActions', () => {
                 isChatReportArchived,
                 hasWorkspaceToSubmitTo,
                 rules: undefined,
+                cardList: undefined,
             });
         }
 
@@ -5798,6 +5925,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             grandParentReport: selfDMReport,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(true);
     });
@@ -5828,6 +5956,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SPLIT)).toBe(false);
     });
@@ -5861,6 +5990,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             reportNameValuePairs,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).toContain(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.MOVE_EXPENSE);
         expect(ReportUtils.canEditFieldOfMoneyRequest).toHaveBeenCalledWith(
@@ -5897,6 +6027,7 @@ describe('getSecondaryTransactionThreadActions', () => {
             policy,
             isChatReportArchived: false,
             rules: undefined,
+            cardList: undefined,
         });
         expect(result).not.toContain(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.MOVE_EXPENSE);
     });
@@ -5957,6 +6088,7 @@ describe('getSecondaryTransactionThreadActions', () => {
                 bankAccountList: {},
                 policy,
                 rules: undefined,
+                cardList: undefined,
             });
 
             expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MERGE)).toBe(true);
@@ -6013,6 +6145,7 @@ describe('getSecondaryTransactionThreadActions', () => {
                 bankAccountList: {},
                 policy,
                 rules: undefined,
+                cardList: undefined,
             });
 
             expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MERGE)).toBe(true);
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index 99787c75e876..bed01f6422d4 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -47,6 +47,7 @@ import {
     buildOptimisticHoldReportActionComment,
     buildOptimisticInvoiceReport,
     buildOptimisticIOUReportAction,
+    buildOptimisticModifiedExpenseReportAction,
     buildOptimisticMoneyRequestEntities,
     buildOptimisticRejectReportAction,
     buildOptimisticRejectReportActionComment,
@@ -120,6 +121,7 @@ import {
     getOneOnOneChatParticipants,
     getOriginalReportID,
     getOutstandingChildRequest,
+    getOutstandingReportsForUser,
     getParentNavigationSubtitle,
     getParentReport,
     getParsedComment,
@@ -141,6 +143,7 @@ import {
     getReportForHeader,
     getReportIDFromLink,
     getReportNotificationPreference,
+    getReportNotificationPreferenceForSettings,
     getReportOrDraftReport,
     getReportPreviewMessage,
     getReportPreviewMessageForCopy,
@@ -5745,6 +5748,63 @@ describe('ReportUtils', () => {
         });
     });
 
+    describe('canRejectReportAction', () => {
+        const submittedExpenseReport = (id: number, managerID: number) => ({
+            ...createExpenseReport(id),
+            policyID: `reject-policy-${id}`,
+            ownerAccountID: 99999,
+            managerID,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+        });
+
+        it('should return true for the current manager', () => {
+            const report = submittedExpenseReport(2001, currentUserAccountID);
+            const rejectPolicy = createMock<Policy>({id: report.policyID, role: CONST.POLICY.ROLE.USER});
+
+            expect(canRejectReportAction(report, currentUserAccountID, rejectPolicy)).toBe(true);
+        });
+
+        it('should return true for a policy admin who is not the manager', () => {
+            const report = submittedExpenseReport(2002, 99998);
+            const rejectPolicy = createMock<Policy>({id: report.policyID, role: CONST.POLICY.ROLE.ADMIN});
+
+            expect(canRejectReportAction(report, currentUserAccountID, rejectPolicy)).toBe(true);
+        });
+
+        it('should return false for an admin who is the submitter of the report', () => {
+            const report = {...submittedExpenseReport(2006, 99998), ownerAccountID: currentUserAccountID};
+            const rejectPolicy = createMock<Policy>({id: report.policyID, role: CONST.POLICY.ROLE.ADMIN});
+
+            expect(canRejectReportAction(report, currentUserAccountID, rejectPolicy)).toBe(false);
+        });
+
+        it('should return false for a non-manager, non-admin member', () => {
+            const report = submittedExpenseReport(2003, 99998);
+            const rejectPolicy = createMock<Policy>({id: report.policyID, role: CONST.POLICY.ROLE.USER});
+
+            expect(canRejectReportAction(report, currentUserAccountID, rejectPolicy)).toBe(false);
+        });
+
+        it('should return false for an admin on an archived or pending-delete policy', () => {
+            const report = submittedExpenseReport(2004, 99998);
+            const rejectPolicy = createMock<Policy>({id: report.policyID, role: CONST.POLICY.ROLE.ADMIN, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE});
+
+            expect(canRejectReportAction(report, currentUserAccountID, rejectPolicy)).toBe(false);
+        });
+
+        it('should return false for an admin on a report that is not being processed', () => {
+            const report = {
+                ...submittedExpenseReport(2005, 99998),
+                stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            };
+            const rejectPolicy = createMock<Policy>({id: report.policyID, role: CONST.POLICY.ROLE.ADMIN});
+
+            expect(canRejectReportAction(report, currentUserAccountID, rejectPolicy)).toBe(false);
+        });
+    });
+
     describe('canHoldUnholdReportAction', () => {
         it('should return canUnholdRequest as true for a held duplicate transaction', async () => {
             const chatReport: Report = {reportID: '1'};
@@ -5819,7 +5879,17 @@ describe('ReportUtils', () => {
                 canUnholdRequest: false,
             });
 
-            putOnHold(expenseTransaction.transactionID, 'hold', transactionThreadReport.reportID, false, currentUserEmail, currentUserAccountID, undefined, false, undefined, {
+            putOnHold({
+                transactionID: expenseTransaction.transactionID,
+                transaction: expenseTransaction,
+                comment: 'hold',
+                initialReportID: transactionThreadReport.reportID,
+                isOffline: false,
+                currentUserLogin: currentUserEmail,
+                currentUserAccountID,
+                transactionViolations: undefined,
+                isTrackIntentUser: false,
+                delegateAccountID: undefined,
                 rules: undefined,
                 ancestors: [],
             });
@@ -6218,7 +6288,7 @@ describe('ReportUtils', () => {
                     },
                 });
             });
-            expect(canDeleteMoneyRequestReport(invoiceReport, [transaction], [iouAction], currentUserAccountID, undefined)).toBe(true);
+            expect(canDeleteMoneyRequestReport(invoiceReport, [transaction], [iouAction], currentUserAccountID, undefined, undefined, undefined)).toBe(true);
         });
 
         describe('draft reports', () => {
@@ -6237,14 +6307,14 @@ describe('ReportUtils', () => {
                 const transaction = {...createRandomTransaction(901), reportID: draftReport.reportID, managedCard: false};
                 const iouAction = buildIOUActionForTransaction(draftReport.reportID, transaction.transactionID, 777);
 
-                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, adminPolicy, true)).toBe(true);
+                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, adminPolicy, undefined, true)).toBe(true);
             });
 
             it('should not allow an admin to delete a single expense on a draft report they do not own', () => {
                 const transaction = {...createRandomTransaction(901), reportID: draftReport.reportID, managedCard: false};
                 const iouAction = buildIOUActionForTransaction(draftReport.reportID, transaction.transactionID, 777);
 
-                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, adminPolicy)).toBe(false);
+                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, adminPolicy, undefined)).toBe(false);
             });
 
             it('should allow the submitter to delete their own draft report', () => {
@@ -6252,14 +6322,14 @@ describe('ReportUtils', () => {
                 const transaction = {...createRandomTransaction(902), reportID: ownDraftReport.reportID, managedCard: false};
                 const iouAction = buildIOUActionForTransaction(ownDraftReport.reportID, transaction.transactionID, currentUserAccountID);
 
-                expect(canDeleteMoneyRequestReport(ownDraftReport, [transaction], [iouAction], currentUserAccountID, undefined, memberPolicy)).toBe(true);
+                expect(canDeleteMoneyRequestReport(ownDraftReport, [transaction], [iouAction], currentUserAccountID, undefined, memberPolicy, undefined)).toBe(true);
             });
 
             it('should not allow a non-admin who does not own the transaction to delete a draft report', () => {
                 const transaction = {...createRandomTransaction(903), reportID: draftReport.reportID, managedCard: false};
                 const iouAction = buildIOUActionForTransaction(draftReport.reportID, transaction.transactionID, 777);
 
-                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, memberPolicy)).toBe(false);
+                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, memberPolicy, undefined)).toBe(false);
             });
 
             it('should allow an admin to delete a draft report holding a card transaction with restricted liability, since the expenses become unreported rather than deleted', () => {
@@ -6271,7 +6341,7 @@ describe('ReportUtils', () => {
                 };
                 const iouAction = buildIOUActionForTransaction(draftReport.reportID, transaction.transactionID, currentUserAccountID);
 
-                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, adminPolicy, true)).toBe(true);
+                expect(canDeleteMoneyRequestReport(draftReport, [transaction], [iouAction], currentUserAccountID, undefined, adminPolicy, undefined, true)).toBe(true);
             });
         });
 
@@ -6311,7 +6381,54 @@ describe('ReportUtils', () => {
                 });
             });
 
-            expect(canDeleteMoneyRequestReport(expenseReport, [], [], currentUserAccountID, undefined)).toBe(true);
+            expect(canDeleteMoneyRequestReport(expenseReport, [], [], currentUserAccountID, undefined, undefined, undefined)).toBe(true);
+        });
+
+        it('should allow card expense deletion as the policy admin', async () => {
+            const adminPolicy = createMock<Policy>({
+                id: 'report-id-123',
+                role: CONST.POLICY.ROLE.ADMIN,
+                type: CONST.POLICY.TYPE.TEAM,
+                employeeList: {
+                    [currentUserEmail]: {
+                        email: currentUserEmail,
+                        submitsTo: currentUserEmail,
+                    },
+                },
+            });
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${adminPolicy.id}`, adminPolicy);
+
+            const expenseReport: Report = {
+                reportID: 'policy-id-123',
+                type: CONST.REPORT.TYPE.EXPENSE,
+                ownerAccountID: 777,
+                managerID: 888,
+                stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                participants: {
+                    [currentUserAccountID]: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                },
+                policyID: adminPolicy.id,
+            };
+
+            const cardTransaction: Transaction = {
+                ...mockTransaction,
+                managedCard: true,
+            };
+
+            // Wait for Onyx to load session data before calling canDeleteMoneyRequestReport, since it relies on the
+            // session subscription for currentUserAccountID.
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connectWithoutView({
+                    key: `${ONYXKEYS.SESSION}`,
+                    callback: () => {
+                        Onyx.disconnect(connection);
+                        resolve();
+                    },
+                });
+            });
+
+            expect(canDeleteMoneyRequestReport(expenseReport, [cardTransaction], [], currentUserAccountID, undefined, adminPolicy, undefined, false)).toBe(true);
         });
     });
 
@@ -7552,6 +7669,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: policyWithWorkflow,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(false);
         });
@@ -7622,6 +7740,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: policyWithWorkflow,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(true);
             expect(
@@ -7632,6 +7751,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: policyWithWorkflow,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(true);
         });
@@ -7693,6 +7813,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: policyWithWorkflow,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(true);
 
@@ -7705,6 +7826,7 @@ describe('ReportUtils', () => {
                     report: workspaceChat,
                     policy: policyWithWorkflow,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(false);
         });
@@ -7801,6 +7923,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: policyWithWorkflow,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(true);
         });
@@ -7864,6 +7987,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: submitAndClosePolicy,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(false);
         });
@@ -7943,6 +8067,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: ruleOnlyPolicy,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(false);
         });
@@ -8001,6 +8126,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: policyWithWorkflow,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(false);
         });
@@ -8073,6 +8199,7 @@ describe('ReportUtils', () => {
                     transaction,
                     report: openExpenseReport,
                     policy: failClosedPolicy,
+                    reportNameValuePairs: undefined,
                 }),
             ).toBe(false);
         });
@@ -10130,7 +10257,7 @@ describe('ReportUtils', () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`, expenseReport);
 
             // Then the owner cannot delete it because the card transaction's liability type restricts deletion
-            expect(canDeleteReportAction(moneyRequestAction, expenseReport.reportID, transaction, undefined, undefined, currentUserAccountID, undefined)).toBe(false);
+            expect(canDeleteReportAction(moneyRequestAction, expenseReport.reportID, transaction, undefined, undefined, currentUserAccountID, undefined, undefined)).toBe(false);
         });
 
         it('should let an admin delete a draft report they did not submit from its report preview', async () => {
@@ -10154,7 +10281,7 @@ describe('ReportUtils', () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}9002-policy`, {...createRandomPolicy(1), id: '9002-policy', role: CONST.POLICY.ROLE.ADMIN});
 
             // Then the admin can delete it, because deleting a preview deletes the whole report
-            expect(canDeleteReportAction(reportPreviewAction, draftReport.reportID, undefined, undefined, undefined, currentUserAccountID, undefined)).toBe(true);
+            expect(canDeleteReportAction(reportPreviewAction, draftReport.reportID, undefined, undefined, undefined, currentUserAccountID, undefined, undefined)).toBe(true);
         });
 
         it('should return true for demo transaction', () => {
@@ -10198,7 +10325,7 @@ describe('ReportUtils', () => {
                 },
             };
 
-            expect(canDeleteReportAction(moneyRequestAction, '1', transaction, undefined, undefined, currentUserAccountID, undefined)).toBe(true);
+            expect(canDeleteReportAction(moneyRequestAction, '1', transaction, undefined, undefined, currentUserAccountID, undefined, undefined)).toBe(true);
         });
 
         it('should return false for unreported card expense imported with deleting disabled', async () => {
@@ -10244,7 +10371,7 @@ describe('ReportUtils', () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${selfDMReport.reportID}`, selfDMReport);
 
             // Then it should return false since the unreported card expense is imported with deleting disabled
-            expect(canDeleteReportAction(trackExpenseAction, selfDMReport.reportID, transaction, undefined, undefined, currentUserAccountID, undefined)).toBe(false);
+            expect(canDeleteReportAction(trackExpenseAction, selfDMReport.reportID, transaction, undefined, undefined, currentUserAccountID, undefined, undefined)).toBe(false);
         });
 
         it("should return false for ADD_COMMENT report action the current user (admin of the personal policy) didn't comment", async () => {
@@ -10271,7 +10398,7 @@ describe('ReportUtils', () => {
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
             await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${adminPolicy.id}`, adminPolicy);
 
-            expect(canDeleteReportAction(reportAction, report.reportID, undefined, undefined, undefined, currentUserAccountID, undefined)).toBe(false);
+            expect(canDeleteReportAction(reportAction, report.reportID, undefined, undefined, undefined, currentUserAccountID, undefined, undefined)).toBe(false);
         });
     });
 
@@ -11509,7 +11636,7 @@ describe('ReportUtils', () => {
                     login: currentUserEmail,
                 },
             });
-            expect(isReportOutstanding(report, policy.id, undefined)).toBe(true);
+            expect(isReportOutstanding(report, policy.id, undefined, {})).toBe(true);
         });
         it('should return false for submitted reports if we specify it', () => {
             const report: Report = {
@@ -11519,7 +11646,7 @@ describe('ReportUtils', () => {
                 stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                 statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
             };
-            expect(isReportOutstanding(report, policy.id, undefined, undefined, false)).toBe(false);
+            expect(isReportOutstanding(report, policy.id, undefined, {}, false)).toBe(false);
         });
         it('should return true for submitted reports if top most report ID is processing', async () => {
             const report: Report = {
@@ -11548,7 +11675,7 @@ describe('ReportUtils', () => {
                 },
             });
             await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${activeReport.reportID}`, activeReport);
-            expect(isReportOutstanding(report, policy.id, undefined)).toBe(true);
+            expect(isReportOutstanding(report, policy.id, undefined, {})).toBe(true);
         });
         it('should return false for archived report', async () => {
             const report: Report = {
@@ -11564,6 +11691,38 @@ describe('ReportUtils', () => {
         });
     });
 
+    describe('getOutstandingReportsForUser', () => {
+        it('should return outstanding reports and exclude archived reports', () => {
+            const activeReport: Report = {
+                ...createRandomReport(1, undefined),
+                policyID: policy.id,
+                ownerAccountID: currentUserAccountID,
+                type: CONST.REPORT.TYPE.EXPENSE,
+                stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            };
+            const archivedReport: Report = {
+                ...createRandomReport(2, undefined),
+                policyID: policy.id,
+                ownerAccountID: currentUserAccountID,
+                type: CONST.REPORT.TYPE.EXPENSE,
+                stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            };
+            const reports = {
+                [`${ONYXKEYS.COLLECTION.REPORT}${activeReport.reportID}`]: activeReport,
+                [`${ONYXKEYS.COLLECTION.REPORT}${archivedReport.reportID}`]: archivedReport,
+            };
+            const reportNameValuePairs = {
+                [`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${activeReport.reportID}`]: {},
+                [`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${archivedReport.reportID}`]: {private_isArchived: '2024-01-01 00:00:00.000'},
+            };
+
+            const result = getOutstandingReportsForUser(policy.id, currentUserAccountID, undefined, reportNameValuePairs, reports);
+            expect(result).toEqual([activeReport]);
+        });
+    });
+
     describe('isApproverOfOutstandingPolicyReports', () => {
         const approverAccountID = 123;
         const noArchivedReports: Record<string, boolean> = {};
@@ -12680,6 +12839,305 @@ describe('ReportUtils', () => {
             expect(result?.actionBadge).toBe(CONST.REPORT.ACTION_BADGE.TASK);
         });
 
+        describe('unread mention priority', () => {
+            const otherUserAccountID = 99;
+
+            /** Builds a comment from another user that mentions the current user. */
+            const buildMentionAction = (reportActionID: string, created: string): ReportAction => ({
+                ...createRandomReportAction(42100),
+                reportActionID,
+                actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                actorAccountID: otherUserAccountID,
+                created,
+                pendingAction: null,
+                message: [{html: `<mention-user>@${currentUserEmail}</mention-user>`, text: `@${currentUserEmail}`, type: 'COMMENT'}],
+                originalMessage: {
+                    html: `<mention-user>@${currentUserEmail}</mention-user>`,
+                    whisperedTo: [],
+                    mentionedAccountIDs: [currentUserAccountID],
+                },
+            });
+
+            it('should return the Task badge instead of an older unread mention', async () => {
+                // Given a chat with an outstanding task and an unread mention that is older than the task
+                const mentionAction = buildMentionAction('mention-older-than-task', '2024-01-01 00:00:00.000');
+                const taskAction: ReportAction = {
+                    reportActionID: 'task-newer-than-mention',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS,
+                    childType: CONST.REPORT.TYPE.TASK,
+                    childReportID: 'task-report-mention-priority',
+                    childManagerAccountID: currentUserAccountID,
+                    created: '2024-01-02 00:00:00.000',
+                    originalMessage: {
+                        assigneeAccountID: currentUserAccountID,
+                        cardID: 99003,
+                    },
+                };
+                const workspaceChat = {
+                    ...createPolicyExpenseChat(42101),
+                    hasOutstandingChildTask: true,
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: mentionAction.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${workspaceChat.reportID}`, workspaceChat);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChat.reportID}`, {
+                    [mentionAction.reportActionID]: mentionAction,
+                    [taskAction.reportActionID]: taskAction,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(workspaceChat, currentUserEmail, currentUserAccountID);
+
+                // Then the action badge wins over the mention, even though the mention came first
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.IS_WAITING_FOR_ASSIGNEE_TO_COMPLETE_ACTION);
+                expect(result?.actionBadge).toBe(CONST.REPORT.ACTION_BADGE.TASK);
+                expect(result?.reportAction?.reportActionID).toBe('task-newer-than-mention');
+            });
+
+            it('should return the IOU badge instead of an unread mention', async () => {
+                // Given a chat with an IOU preview the current user has to pay and an unread mention
+                const iouReportID = 'iou-report-mention-priority';
+                const mentionAction = buildMentionAction('mention-with-iou', '2024-01-01 00:00:00.000');
+                const iouAction: ReportAction = {
+                    reportActionID: 'iou-action-with-mention',
+                    actionName: CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW,
+                    childType: CONST.REPORT.TYPE.IOU,
+                    childReportID: iouReportID,
+                    childManagerAccountID: currentUserAccountID,
+                    created: '2024-01-02 00:00:00.000',
+                    message: [{html: 'iou preview', text: 'iou preview', type: 'COMMENT'}],
+                };
+                const workspaceChat = {
+                    ...createPolicyExpenseChat(42102),
+                    hasOutstandingChildRequest: true,
+                    iouReportID,
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: mentionAction.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${workspaceChat.reportID}`, workspaceChat);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChat.reportID}`, {
+                    [mentionAction.reportActionID]: mentionAction,
+                    [iouAction.reportActionID]: iouAction,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(workspaceChat, currentUserEmail, currentUserAccountID);
+
+                // Then the Pay badge is shown and links to the IOU preview
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.HAS_CHILD_REPORT_AWAITING_ACTION);
+                expect(result?.actionBadge).toBe(CONST.REPORT.ACTION_BADGE.PAY);
+                expect(result?.reportAction?.reportActionID).toBe('iou-action-with-mention');
+            });
+
+            it('should link the green dot to the oldest unread mention when there is no action badge', async () => {
+                // Given a chat with a read mention, two unread mentions and an unread comment without a mention
+                const readMention = buildMentionAction('read-mention', '2024-01-01 00:00:00.000');
+                const oldestUnreadMention = buildMentionAction('oldest-unread-mention', '2024-01-03 00:00:00.000');
+                const newestUnreadMention = buildMentionAction('newest-unread-mention', '2024-01-04 00:00:00.000');
+                const unreadComment: ReportAction = {
+                    ...buildMentionAction('unread-comment-without-mention', '2024-01-02 12:00:00.000'),
+                    message: [{html: 'no mention here', text: 'no mention here', type: 'COMMENT'}],
+                    originalMessage: {html: 'no mention here', whisperedTo: [], mentionedAccountIDs: []},
+                };
+                const report: Report = {
+                    ...createRandomReport(42103, CONST.REPORT.CHAT_TYPE.GROUP),
+                    lastReadTime: '2024-01-02 00:00:00.000',
+                    lastMentionedTime: newestUnreadMention.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`, {
+                    [readMention.reportActionID]: readMention,
+                    [oldestUnreadMention.reportActionID]: oldestUnreadMention,
+                    [newestUnreadMention.reportActionID]: newestUnreadMention,
+                    [unreadComment.reportActionID]: unreadComment,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(report, currentUserEmail, currentUserAccountID);
+
+                // Then the mention reason is returned with the oldest unread mention, so the LHN can deep link to it
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.IS_UNREAD_WITH_MENTION);
+                expect(result?.actionBadge).toBeUndefined();
+                expect(result?.reportAction?.reportActionID).toBe('oldest-unread-mention');
+            });
+
+            it('should return the IOU action instead of an unread mention when the outstanding child request has no badge', async () => {
+                // Given a chat flagged with an outstanding child request but no IOU preview to badge, plus an unread mention
+                const mentionAction = buildMentionAction('mention-without-badge', '2024-01-01 00:00:00.000');
+                const workspaceChat = {
+                    ...createPolicyExpenseChat(42104),
+                    hasOutstandingChildRequest: true,
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: mentionAction.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${workspaceChat.reportID}`, workspaceChat);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChat.reportID}`, {
+                    [mentionAction.reportActionID]: mentionAction,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(workspaceChat, currentUserEmail, currentUserAccountID);
+
+                // Then the IOU action still wins over the mention, even though no badge could be computed for it
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.HAS_CHILD_REPORT_AWAITING_ACTION);
+                expect(result?.actionBadge).toBeUndefined();
+            });
+
+            it('should still require attention for an invoice room with an unread mention', async () => {
+                // Given an invoice room with no missing bank account and an unread mention
+                const mentionAction = buildMentionAction('mention-in-invoice-room', '2024-01-01 00:00:00.000');
+                const invoiceRoom: Report = {
+                    ...createRandomReport(42105, CONST.REPORT.CHAT_TYPE.INVOICE),
+                    type: CONST.REPORT.TYPE.CHAT,
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: mentionAction.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${invoiceRoom.reportID}`, invoiceRoom);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${invoiceRoom.reportID}`, {
+                    [mentionAction.reportActionID]: mentionAction,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(invoiceRoom, currentUserEmail, currentUserAccountID);
+
+                // Then the mention still returns a reason instead of the invoice room branch returning null
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.IS_UNREAD_WITH_MENTION);
+                expect(result?.reportAction?.reportActionID).toBe('mention-in-invoice-room');
+            });
+
+            it('should skip mentions the current user wrote, deleted mentions and mentions hidden from the current user', async () => {
+                // Given older unread mentions the LHN can't link to, and one newer unread mention it can
+                const ownMention: ReportAction = {...buildMentionAction('own-mention', '2024-01-01 00:00:00.000'), actorAccountID: currentUserAccountID};
+                const deletedMention: ReportAction = {
+                    ...buildMentionAction('deleted-mention', '2024-01-02 00:00:00.000'),
+                    message: [{html: '', text: '', type: 'COMMENT', deleted: '2024-01-02 00:00:01.000'}],
+                };
+                const pendingDeleteMention: ReportAction = {
+                    ...buildMentionAction('pending-delete-mention', '2024-01-03 00:00:00.000'),
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                };
+                const whisperToOthersMention: ReportAction = {
+                    ...buildMentionAction('whisper-to-others-mention', '2024-01-04 00:00:00.000'),
+                    originalMessage: {
+                        html: `<mention-user>@${currentUserEmail}</mention-user>`,
+                        whisperedTo: [otherUserAccountID],
+                        mentionedAccountIDs: [currentUserAccountID],
+                    },
+                };
+                const visibleMention = buildMentionAction('visible-mention', '2024-01-05 00:00:00.000');
+                const report: Report = {
+                    ...createRandomReport(42106, CONST.REPORT.CHAT_TYPE.GROUP),
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: visibleMention.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`, {
+                    [ownMention.reportActionID]: ownMention,
+                    [deletedMention.reportActionID]: deletedMention,
+                    [pendingDeleteMention.reportActionID]: pendingDeleteMention,
+                    [whisperToOthersMention.reportActionID]: whisperToOthersMention,
+                    [visibleMention.reportActionID]: visibleMention,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(report, currentUserEmail, currentUserAccountID);
+
+                // Then the green dot links to the only mention the user can see and act on
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.IS_UNREAD_WITH_MENTION);
+                expect(result?.reportAction?.reportActionID).toBe('visible-mention');
+            });
+
+            it('should link the green dot to an unread @here mention', async () => {
+                // Given a chat whose only unread mention is an @here mention
+                const hereMention: ReportAction = {
+                    ...buildMentionAction('here-mention', '2024-01-01 00:00:00.000'),
+                    message: [{html: '<mention-here>@here</mention-here>', text: '@here', type: 'COMMENT'}],
+                    originalMessage: {html: '<mention-here>@here</mention-here>', whisperedTo: [], mentionedAccountIDs: []},
+                };
+                const report: Report = {
+                    ...createRandomReport(42107, CONST.REPORT.CHAT_TYPE.GROUP),
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: hereMention.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`, {
+                    [hereMention.reportActionID]: hereMention,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(report, currentUserEmail, currentUserAccountID);
+
+                // Then @here counts as a mention of the current user, so the green dot links to it
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.IS_UNREAD_WITH_MENTION);
+                expect(result?.reportAction?.reportActionID).toBe('here-mention');
+            });
+
+            it('should match a mention by the passed account ID instead of the session account ID', async () => {
+                // Given a mention that only carries an account ID that differs from the session's account ID, so it can
+                // only match if the passed currentUserAccountID is used
+                const passedAccountID = 4242;
+                const accountIDOnlyMention: ReportAction = {
+                    ...buildMentionAction('account-id-only-mention', '2024-01-01 00:00:00.000'),
+                    message: [{html: 'hi', text: 'hi', type: 'COMMENT'}],
+                    originalMessage: {html: 'hi', whisperedTo: [], mentionedAccountIDs: [passedAccountID]},
+                };
+                const report: Report = {
+                    ...createRandomReport(42108, CONST.REPORT.CHAT_TYPE.GROUP),
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: accountIDOnlyMention.created,
+                };
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`, {
+                    [accountIDOnlyMention.reportActionID]: accountIDOnlyMention,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved with that account ID
+                const result = getReasonAndReportActionThatRequiresAttention(report, 'someone-else@example.com', passedAccountID);
+
+                // Then the mention is found through the passed account ID
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.IS_UNREAD_WITH_MENTION);
+                expect(result?.reportAction?.reportActionID).toBe('account-id-only-mention');
+            });
+
+            it('should return the assignee expense action instead of an unread mention when it has no badge', async () => {
+                // Given a processing expense report the current user manages without parent access, with no policy loaded
+                // so no badge can be computed, plus an unread mention
+                const mentionAction = buildMentionAction('mention-on-assignee-expense', '2024-01-01 00:00:00.000');
+                const expenseReport: Report = {
+                    ...createExpenseReport(42109),
+                    policyID: 'policy-not-loaded-mention-priority',
+                    hasParentAccess: false,
+                    managerID: currentUserAccountID,
+                    stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+                    statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                    lastReadTime: '2023-12-31 00:00:00.000',
+                    lastMentionedTime: mentionAction.created,
+                };
+                await Onyx.merge(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`, expenseReport);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`, {
+                    [mentionAction.reportActionID]: mentionAction,
+                });
+                await waitForBatchedUpdates();
+
+                // When the reason is retrieved
+                const result = getReasonAndReportActionThatRequiresAttention(expenseReport, currentUserEmail, currentUserAccountID);
+
+                // Then the assignee expense action still wins over the mention, even without a badge
+                expect(result?.reason).toBe(CONST.REQUIRES_ATTENTION_REASONS.IS_WAITING_FOR_ASSIGNEE_TO_COMPLETE_ACTION);
+                expect(result?.actionBadge).toBeUndefined();
+            });
+        });
+
         it('should return the IOU badge when task action has no childManagerAccountID (backend bug before opening report)', async () => {
             const iouReportID = 'iou-report-for-missing-manager';
 
@@ -13033,6 +13491,51 @@ describe('ReportUtils', () => {
         });
     });
 
+    describe('getReportNotificationPreferenceForSettings', () => {
+        it.each([CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, CONST.REPORT.CHAT_TYPE.POLICY_ROOM, undefined])(
+            'should only use the report default for an empty preference in an admins room (chatType: %s)',
+            (chatType) => {
+                // Given a known participant whose legacy notification preference is empty
+                const participant = {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS};
+                Object.defineProperty(participant, 'notificationPreference', {value: '', configurable: true});
+                const report: Report = {
+                    ...createRandomReport(0, chatType),
+                    participants: {321: participant},
+                };
+
+                // When resolving the preference displayed in settings
+                const preference = getReportNotificationPreferenceForSettings(report, 321);
+
+                // Then only admins rooms receive the default; other chats retain the hidden fallback
+                expect(preference).toBe(chatType === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS ? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS : CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+            },
+        );
+
+        it.each(Object.values(CONST.REPORT.NOTIFICATION_PREFERENCE))('should preserve an explicit %s preference in an admins room', (notificationPreference) => {
+            // Given an admins room participant with an explicit preference
+            const report: Report = {
+                ...createRandomReport(0, CONST.REPORT.CHAT_TYPE.POLICY_ADMINS),
+                participants: {321: {notificationPreference}},
+            };
+
+            // When resolving the preference displayed in settings
+            const preference = getReportNotificationPreferenceForSettings(report, 321);
+
+            // Then the saved preference, including hidden, is preserved
+            expect(preference).toBe(notificationPreference);
+        });
+
+        it('should default to hidden for a non-participant', () => {
+            const report: Report = {
+                ...createRandomReport(0, CONST.REPORT.CHAT_TYPE.POLICY_ADMINS),
+                participants: {
+                    321: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+                },
+            };
+            expect(getReportNotificationPreferenceForSettings(report, 999)).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+        });
+    });
+
     describe('canUserPerformWriteAction', () => {
         it('should return false for announce room when the role of the employee is auditor ', async () => {
             // Given a policy announce room of a policy that the user has an auditor role
@@ -15658,7 +16161,9 @@ describe('ReportUtils', () => {
             2: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN},
             3: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.DAILY},
             4: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
+            5: {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS},
         });
+        Object.defineProperty(mockParticipants[5], 'notificationPreference', {value: '', configurable: true});
 
         const mockReportMetadata = createMock<OnyxEntry<ReportMetadata>>({
             pendingChatMembers: [
@@ -15697,6 +16202,13 @@ describe('ReportUtils', () => {
             expect(result).not.toContain(2); // participant 2 has 'hidden' notification preference
         });
 
+        it('should include participants with no notification preference when shouldExcludeHidden is true', () => {
+            const filteredParticipantIDs = excludeParticipantsForDisplay([5], mockParticipants, mockReportMetadata, {
+                shouldExcludeHidden: true,
+            });
+            expect(filteredParticipantIDs).toEqual([5]);
+        });
+
         it('should exclude deleted participants when shouldExcludeDeleted is true', () => {
             const participantsIDs = [1, 2, 3, 4];
             const result = excludeParticipantsForDisplay(participantsIDs, mockParticipants, mockReportMetadata, {
@@ -20608,6 +21120,7 @@ describe('ReportUtils', () => {
         it('should return false if list report field has some options enabled', () => {
             const reportField = createMock<PolicyReportField>({
                 type: CONST.REPORT_FIELD_TYPES.LIST,
+                values: ['A', 'B', 'C'],
                 disabledOptions: [false, true, false],
             });
             expect(shouldHideSingleReportField(reportField)).toBe(false);
@@ -20615,10 +21128,47 @@ describe('ReportUtils', () => {
         it('should return false if all items in list report field are disabled', () => {
             const reportField = createMock<PolicyReportField>({
                 type: CONST.REPORT_FIELD_TYPES.LIST,
+                values: ['A', 'B', 'C'],
                 disabledOptions: [true, true, true],
             });
             expect(shouldHideSingleReportField(reportField)).toBe(true);
         });
+        it('should return false if list report field has values but an empty disabledOptions array', () => {
+            // Given a list field not created in NewDot, where the backend sends an empty disabledOptions array
+            const reportField = createMock<PolicyReportField>({
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                values: ['A', 'B'],
+                disabledOptions: [],
+            });
+
+            // When checking whether the field should be hidden
+            // Then it is visible, because values without a disabledOptions entry are treated as enabled
+            expect(shouldHideSingleReportField(reportField)).toBe(false);
+        });
+        it('should return false if disabledOptions is shorter than values and the missing entries are enabled', () => {
+            // Given a list field where only the first value has a disabledOptions entry
+            const reportField = createMock<PolicyReportField>({
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                values: ['A', 'B', 'C'],
+                disabledOptions: [true],
+            });
+
+            // When checking whether the field should be hidden
+            // Then it is visible, because the values without an entry are treated as enabled
+            expect(shouldHideSingleReportField(reportField)).toBe(false);
+        });
+        it('should return true if every value of a list report field is explicitly disabled', () => {
+            // Given a list field where every value is disabled
+            const reportField = createMock<PolicyReportField>({
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                values: ['A', 'B'],
+                disabledOptions: [true, true],
+            });
+
+            // When checking whether the field should be hidden
+            // Then it is hidden, because no value can be selected
+            expect(shouldHideSingleReportField(reportField)).toBe(true);
+        });
     });
     describe('shouldDisplayReportFields', () => {
         it('returns true for an invoice when the receiver policy does not include the invoice fields feature flag', () => {
@@ -26080,6 +26630,38 @@ describe('hold/unhold/reject optimistic builders set delegateAccountID', () => {
     });
 });
 
+describe('buildOptimisticModifiedExpenseReportAction sets delegateAccountID', () => {
+    const DELEGATE_ACCOUNT_ID = 424242;
+    const DELEGATE_LOGIN = 'copilot@example.com';
+
+    afterAll(async () => {
+        await Onyx.merge(ONYXKEYS.ACCOUNT, {delegatedAccess: {delegate: undefined}});
+        await waitForBatchedUpdates();
+    });
+
+    it('sets the passed delegateAccountID', () => {
+        // Given a copilot accountID supplied by the caller
+        // When the modified expense action is built
+        const reportAction = buildOptimisticModifiedExpenseReportAction(undefined, undefined, {}, false, undefined, DELEGATE_ACCOUNT_ID);
+
+        // Then the action is attributed to that copilot
+        expect(reportAction.delegateAccountID).toBe(DELEGATE_ACCOUNT_ID);
+    });
+
+    it('does not fall back to the signed-in delegate when no delegateAccountID is passed', async () => {
+        // Given a signed-in copilot stored in Onyx
+        await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {[DELEGATE_ACCOUNT_ID]: {accountID: DELEGATE_ACCOUNT_ID, login: DELEGATE_LOGIN}});
+        await Onyx.merge(ONYXKEYS.ACCOUNT, {delegatedAccess: {delegate: DELEGATE_LOGIN}});
+        await waitForBatchedUpdates();
+
+        // When the caller passes no delegate
+        const reportAction = buildOptimisticModifiedExpenseReportAction(undefined, undefined, {}, false, undefined, undefined);
+
+        // Then the builder leaves the action unattributed instead of reading the signed-in copilot
+        expect(reportAction.delegateAccountID).toBeUndefined();
+    });
+});
+
 describe('getInvoiceReceiverPersonalDetail', () => {
     it('returns the personal detail of the receiver account when the receiver is an individual', () => {
         const report = {reportID: '1', invoiceReceiver: {type: CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL, accountID: 1}} as Report;
diff --git a/tests/unit/ScaledDistanceEReceiptTest.tsx b/tests/unit/ScaledDistanceEReceiptTest.tsx
new file mode 100644
index 000000000000..548613ce8456
--- /dev/null
+++ b/tests/unit/ScaledDistanceEReceiptTest.tsx
@@ -0,0 +1,99 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import ScaledDistanceEReceipt from '@components/ScaledDistanceEReceipt';
+
+import variables from '@styles/variables';
+
+import type ReactNative from 'react-native';
+
+import React from 'react';
+
+import createRandomTransaction from '../utils/collections/transaction';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+// Jest runs no layout engine, so the blank receipt on native (#99376) can only be seen on a device. What can be tested
+// here is the part that caused it and the arithmetic built on it: the scaler has to render the card itself rather than
+// the scrolling DistanceEReceipt, which fills its parent, and the scale has to follow from the space offered and the
+// height the card measures.
+jest.mock('@components/DistanceEReceiptPanel', () => {
+    const MockReact = jest.requireActual<typeof React>('react');
+    const {View} = jest.requireActual<typeof ReactNative>('react-native');
+    function MockDistanceEReceiptPanel() {
+        return MockReact.createElement(View, {testID: 'distance-e-receipt-panel'});
+    }
+    return {
+        __esModule: true,
+        default: MockDistanceEReceiptPanel,
+    };
+});
+
+jest.mock('@components/DistanceEReceipt', () => {
+    const MockReact = jest.requireActual<typeof React>('react');
+    const {View} = jest.requireActual<typeof ReactNative>('react-native');
+    function MockDistanceEReceipt() {
+        return MockReact.createElement(View, {testID: 'distance-e-receipt'});
+    }
+    return {
+        __esModule: true,
+        default: MockDistanceEReceipt,
+    };
+});
+
+function layOut(testID: string, width: number, height: number) {
+    fireEvent(screen.getByTestId(testID), 'onLayout', {
+        nativeEvent: {layout: {x: 0, y: 0, width, height}},
+    });
+}
+
+// Math.min returns one of its arguments unchanged, so the expected ratios below are the exact values the component computes
+function expectScale(scale: number) {
+    expect(screen.getByTestId('scaled-distance-e-receipt-card')).toHaveStyle({transform: [{scale}]});
+}
+
+async function renderScaled({box, cardHeight}: {box?: {width: number; height: number}; cardHeight?: number} = {}) {
+    render(<ScaledDistanceEReceipt transaction={createRandomTransaction(0)} />);
+    if (box) {
+        layOut('scaled-distance-e-receipt', box.width, box.height);
+    }
+    if (cardHeight !== undefined) {
+        layOut('scaled-distance-e-receipt-card', variables.eReceiptHoverCardWidth, cardHeight);
+    }
+    await waitForBatchedUpdatesWithAct();
+}
+
+describe('ScaledDistanceEReceipt', () => {
+    it('renders the card itself, at its natural height, rather than the scrolling layout that fills its parent', async () => {
+        await renderScaled();
+        expect(screen.getByTestId('distance-e-receipt-panel')).toBeTruthy();
+        expect(screen.queryByTestId('distance-e-receipt')).toBeNull();
+    });
+
+    it('draws the card at its own size until both the box and the card have been measured', async () => {
+        await renderScaled();
+        expectScale(1);
+
+        layOut('scaled-distance-e-receipt', 900, 740);
+        await waitForBatchedUpdatesWithAct();
+        expectScale(1);
+    });
+
+    it('scales a short card up to fill a large box, bounded by the height', async () => {
+        await renderScaled({box: {width: 900, height: 740}, cardHeight: 392});
+        expectScale(740 / 392);
+    });
+
+    it('scales a card taller than the box down so the whole receipt fits', async () => {
+        await renderScaled({box: {width: 386, height: 700}, cardHeight: 972});
+        expectScale(700 / 972);
+    });
+
+    it('is bounded by the width when the box is narrow', async () => {
+        await renderScaled({box: {width: 400, height: 2000}, cardHeight: 300});
+        expectScale(400 / variables.eReceiptHoverCardWidth);
+    });
+
+    it('never scales past three times the card size', async () => {
+        await renderScaled({box: {width: 3000, height: 3000}, cardHeight: 300});
+        expectScale(3);
+    });
+});
diff --git a/tests/unit/Search/ExpenseGroupedSearchViewSplitTest.tsx b/tests/unit/Search/ExpenseGroupedSearchViewSplitTest.tsx
index 6ff9fc36e120..760b73d92e2e 100644
--- a/tests/unit/Search/ExpenseGroupedSearchViewSplitTest.tsx
+++ b/tests/unit/Search/ExpenseGroupedSearchViewSplitTest.tsx
@@ -104,9 +104,13 @@ jest.mock('@src/components/ConfirmedRoute.tsx');
 
 jest.mock('@components/Search/primitives/SelectionTopBar', () => ({__esModule: true, default: () => null}));
 
+/** Stable by construction, as the registry's own are: a subscriber lists these in its effect dependencies. */
+const mockShiftRangeGroups = {addGroupToRange: jest.fn(), removeGroupFromRange: jest.fn(), registryGeneration: 0};
+
 jest.mock('@components/Search/SearchContext', () => ({
     useSearchRowSelectionActions: () => ({toggle: jest.fn(), toggleAll: jest.fn()}),
     useSearchSelectionContext: () => ({selectedTransactions: {}}),
+    useSearchShiftRangeGroups: () => mockShiftRangeGroups,
 }));
 
 const STABLE_QUERY_JSON: SearchQueryJSON = {
diff --git a/tests/unit/Search/ExpenseGroupedSearchViewTest.tsx b/tests/unit/Search/ExpenseGroupedSearchViewTest.tsx
index ea8745a28413..3f634a8f6476 100644
--- a/tests/unit/Search/ExpenseGroupedSearchViewTest.tsx
+++ b/tests/unit/Search/ExpenseGroupedSearchViewTest.tsx
@@ -112,9 +112,12 @@ jest.mock('@components/Search/primitives/SelectionTopBar', () => ({
 const mockToggle = jest.fn();
 const mockToggleAll = jest.fn();
 const mockSelectedTransactions: {current: Record<string, {isSelected: boolean}>} = {current: {}};
+/** Stable by construction, as the registry's own are: a subscriber lists these in its effect dependencies. */
+const mockShiftRangeGroups = {addGroupToRange: jest.fn(), removeGroupFromRange: jest.fn(), registryGeneration: 0};
 jest.mock('@components/Search/SearchContext', () => ({
     useSearchRowSelectionActions: () => ({toggle: mockToggle, toggleAll: mockToggleAll}),
-    useSearchSelectionContext: () => ({selectedTransactions: mockSelectedTransactions.current}),
+    useSearchSelectionContext: () => ({selectedTransactions: mockSelectedTransactions.current, excludedTransactions: {}, areAllMatchingItemsSelected: false}),
+    useSearchShiftRangeGroups: () => mockShiftRangeGroups,
 }));
 
 function selectKeys(...keys: string[]): Record<string, {isSelected: boolean}> {
diff --git a/tests/unit/Search/LazyGroupSelectionTest.tsx b/tests/unit/Search/LazyGroupSelectionTest.tsx
index e364befd0321..5d8fc441e036 100644
--- a/tests/unit/Search/LazyGroupSelectionTest.tsx
+++ b/tests/unit/Search/LazyGroupSelectionTest.tsx
@@ -1,9 +1,15 @@
 import {act, renderHook} from '@testing-library/react-native';
 
-import {useSearchRowSelectionActions, useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
+import {useSearchRowSelectionActions, useSearchSelectionActions, useSearchSelectionContext, useSearchShiftRangeGroups} from '@components/Search/SearchContext';
 import {SearchContextProvider} from '@components/Search/SearchContextProvider';
-import type {TransactionCategoryGroupListItemType, TransactionListItemType, TransactionReportGroupListItemType} from '@components/Search/SearchList/ListItem/types';
+import type {
+    TransactionCategoryGroupListItemType,
+    TransactionGroupListItemType,
+    TransactionListItemType,
+    TransactionReportGroupListItemType,
+} from '@components/Search/SearchList/ListItem/types';
 import SearchWriteActionsProvider from '@components/Search/SearchWriteActionsProvider';
+import {isRowChecked, mapEmptyReportToSelectedEntry} from '@components/Search/selectionBuilders';
 
 import {buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 
@@ -16,6 +22,7 @@ import type * as ReactNavigation from '@react-navigation/native';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 
+import {buildCategoryGroup, buildReportGroup, buildTransactionRow} from '../../utils/collections/searchListItems';
 import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithAct';
 
 let mockIsFocused = true;
@@ -34,29 +41,112 @@ jest.mock('@react-navigation/native', () => ({
 
 const GROUP_KEY = 'Advertising';
 
+/** The query the rows belong to. Everything scoped to one search is keyed on it. */
+const SEARCH_HASH = 1;
+
+/** A child as it looks once its group has been expanded and the snapshot has loaded, carrying the group the list stamps on it. */
+const buildChild = (index: number, key: string, selectionGroupKey: string) => buildTransactionRow(index, key, {currency: 'USD', amount: -642, report: {reportID: '11'}, selectionGroupKey});
+
 /**
  * A `group-by:category` group. Its children are fetched into a separate snapshot only once the row is expanded,
  * so `transactions` stays empty on the group itself for the whole lifetime of the list.
  */
-// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- minimal fixture: only the fields the selection logic reads are needed
-const categoryGroup = {
-    groupedBy: CONST.SEARCH.GROUP_BY.CATEGORY,
-    category: 'Advertising',
-    formattedCategory: 'Advertising',
-    count: 2,
-    total: -1284,
-    currency: 'USD',
-    transactions: [],
-    transactionsQueryJSON: buildSearchQueryJSON('type:expense category:Advertising'),
-    keyForList: GROUP_KEY,
-} as unknown as TransactionCategoryGroupListItemType;
-
-/** The children as they look once the group has been expanded and its snapshot has loaded. */
-// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- minimal fixture: only the fields the selection logic reads are needed
-const loadedChildren = [
-    {transactionID: '1', keyForList: '1', currency: 'USD', amount: -642, report: {reportID: '11'}, selectionGroupKey: GROUP_KEY},
-    {transactionID: '2', keyForList: '2', currency: 'USD', amount: -642, report: {reportID: '11'}, selectionGroupKey: GROUP_KEY},
-] as unknown as TransactionListItemType[];
+const categoryGroup = buildCategoryGroup(GROUP_KEY, [], buildSearchQueryJSON('type:expense category:Advertising'));
+
+const loadedChildren = [buildChild(1, '1', GROUP_KEY), buildChild(2, '2', GROUP_KEY)];
+
+/** The same group with a third child, for ranges that leave a row untouched on either side. */
+const threeLoadedChildren = [...loadedChildren, buildChild(5, '5', GROUP_KEY)];
+
+/** The same group as the server sees it: five rows in total, of which only the first page has loaded. */
+const partiallyLoadedGroup = {...categoryGroup, count: 5};
+
+/** The same group with its sub-snapshot cached, so it carries its first page while the rest are unloaded. */
+const cachedPartialGroup = {...categoryGroup, count: 5, transactions: loadedChildren};
+
+/** A search with every page in, which is what lets select-all-matching be turned off. */
+const settledGroupedResults: SearchResults = {
+    ...makeFlatSearchResults(undefined),
+    search: {...makeFlatSearchResults(undefined).search, hasMoreResults: false},
+};
+
+/** The same group, in a search with every page in. */
+function SettledGroupWrapper({children}: {children: React.ReactNode}) {
+    return (
+        <SearchContextProvider>
+            <SearchWriteActionsProvider
+                filteredData={[cachedPartialGroup]}
+                renderedData={[cachedPartialGroup]}
+                totalSelectableItemsCount={loadedChildren.length}
+                searchResults={settledGroupedResults}
+                searchHash={SEARCH_HASH}
+                transactions={undefined}
+                isMobileSelectionModeEnabled={false}
+                type={CONST.SEARCH.DATA_TYPES.EXPENSE}
+                areItemsGrouped
+                isExpenseReportType={false}
+                isSearchResultsEmpty={false}
+            >
+                {children}
+            </SearchWriteActionsProvider>
+        </SearchContextProvider>
+    );
+}
+
+const EARLIER_GROUP_KEY = 'Office';
+
+/** A group rendered above `categoryGroup`. */
+const earlierGroup = buildCategoryGroup(EARLIER_GROUP_KEY, [], buildSearchQueryJSON('type:expense category:Office'));
+
+/** The earlier group's children, expanded and loaded. */
+const earlierChildren = [buildChild(3, '3', EARLIER_GROUP_KEY), buildChild(4, '4', EARLIER_GROUP_KEY)];
+
+/** The same group as the list sees it: empty at first, carrying the loaded rows afterwards. */
+let pagingGroup: TransactionCategoryGroupListItemType = partiallyLoadedGroup;
+
+function PagingWrapper({children}: {children: React.ReactNode}) {
+    return (
+        <SearchContextProvider>
+            <SearchWriteActionsProvider
+                filteredData={[pagingGroup]}
+                renderedData={[pagingGroup]}
+                totalSelectableItemsCount={5}
+                searchResults={undefined}
+                searchHash={SEARCH_HASH}
+                transactions={undefined}
+                isMobileSelectionModeEnabled={false}
+                type={CONST.SEARCH.DATA_TYPES.EXPENSE}
+                areItemsGrouped
+                isExpenseReportType={false}
+                isSearchResultsEmpty={false}
+            >
+                {children}
+            </SearchWriteActionsProvider>
+        </SearchContextProvider>
+    );
+}
+
+function TwoGroupWrapper({children}: {children: React.ReactNode}) {
+    return (
+        <SearchContextProvider>
+            <SearchWriteActionsProvider
+                filteredData={[earlierGroup, categoryGroup]}
+                renderedData={[earlierGroup, categoryGroup]}
+                totalSelectableItemsCount={4}
+                searchResults={undefined}
+                searchHash={SEARCH_HASH}
+                transactions={undefined}
+                isMobileSelectionModeEnabled={false}
+                type={CONST.SEARCH.DATA_TYPES.EXPENSE}
+                areItemsGrouped
+                isExpenseReportType={false}
+                isSearchResultsEmpty={false}
+            >
+                {children}
+            </SearchWriteActionsProvider>
+        </SearchContextProvider>
+    );
+}
 
 const makeReportTransaction = (transactionID: string, reportID: string, amount = -500) =>
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- minimal fixture: only fields read by selection builders are required
@@ -141,33 +231,52 @@ function makeFlatSearchResults(expense: TransactionListItemType | undefined): Se
     } as unknown as SearchResults;
 }
 
+/** The rows after the first on a flat search, where every row is its own selectable unit and a range spans them directly. */
+const flatRangeRows = [
+    buildTransactionRow(11, 'flat-2', {currency: 'USD', amount: -642, report: {reportID: '11'}}),
+    buildTransactionRow(12, 'flat-3', {currency: 'USD', amount: -642, report: {reportID: '11'}}),
+    buildTransactionRow(13, 'flat-4', {currency: 'USD', amount: -642, report: {reportID: '11'}}),
+];
+
 let flatExpense = makeFlatExpense(-3000);
-let flatFilteredData: TransactionListItemType[] = [flatExpense];
+let flatFilteredData: TransactionListItemType[] = [flatExpense, ...flatRangeRows];
 let flatSearchResults = makeFlatSearchResults(flatExpense);
 
-const makeLoadedChild = (id: string) =>
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- minimal fixture: only the fields the selection logic reads are needed
-    ({
-        transactionID: id,
-        keyForList: id,
-        currency: 'USD',
-        amount: -642,
-        report: {reportID: '11'},
-        selectionGroupKey: GROUP_KEY,
-    }) as unknown as TransactionListItemType;
+let groupedSearchResults: SearchResults | undefined;
+let groupedSearchHash = SEARCH_HASH;
 
-let expandedGroup: TransactionCategoryGroupListItemType = {
-    ...categoryGroup,
-    transactions: loadedChildren,
-};
+/** The same group under a search that can change identity, for the rows a registry must not carry across searches. */
+function SearchChangeWrapper({children}: {children: React.ReactNode}) {
+    return (
+        <SearchContextProvider>
+            <SearchWriteActionsProvider
+                filteredData={[categoryGroup]}
+                renderedData={[categoryGroup]}
+                totalSelectableItemsCount={2}
+                searchResults={groupedSearchResults}
+                searchHash={groupedSearchHash}
+                transactions={undefined}
+                isMobileSelectionModeEnabled={false}
+                type={CONST.SEARCH.DATA_TYPES.EXPENSE}
+                areItemsGrouped
+                isExpenseReportType={false}
+                isSearchResultsEmpty={false}
+            >
+                {children}
+            </SearchWriteActionsProvider>
+        </SearchContextProvider>
+    );
+}
 
 function Wrapper({children}: {children: React.ReactNode}) {
     return (
         <SearchContextProvider>
             <SearchWriteActionsProvider
                 filteredData={[categoryGroup]}
+                renderedData={[categoryGroup]}
                 totalSelectableItemsCount={2}
                 searchResults={undefined}
+                searchHash={groupedSearchHash}
                 transactions={undefined}
                 isMobileSelectionModeEnabled={false}
                 type={CONST.SEARCH.DATA_TYPES.EXPENSE}
@@ -186,8 +295,10 @@ function FlatWrapper({children}: {children: React.ReactNode}) {
         <SearchContextProvider>
             <SearchWriteActionsProvider
                 filteredData={flatFilteredData}
+                renderedData={flatFilteredData}
                 totalSelectableItemsCount={flatFilteredData.length}
                 searchResults={flatSearchResults}
+                searchHash={SEARCH_HASH}
                 transactions={undefined}
                 isMobileSelectionModeEnabled={false}
                 type={CONST.SEARCH.DATA_TYPES.EXPENSE}
@@ -207,8 +318,10 @@ function ReportsWrapper({children}: {children: React.ReactNode}) {
         <SearchContextProvider>
             <SearchWriteActionsProvider
                 filteredData={reportFilteredData}
+                renderedData={reportFilteredData}
                 totalSelectableItemsCount={totalSelectableItemsCount}
                 searchResults={reportSearchResults}
+                searchHash={SEARCH_HASH}
                 transactions={undefined}
                 isMobileSelectionModeEnabled={false}
                 type={CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT}
@@ -222,18 +335,34 @@ function ReportsWrapper({children}: {children: React.ReactNode}) {
     );
 }
 
-function ExpandedGroupWrapper({children}: {children: React.ReactNode}) {
+/** Expense-report views make the report row the selectable unit, so a range spans reports. */
+const reportGroups = [
+    buildReportGroup(6, 'report-1', [buildChild(6, '6', 'report-1')]),
+    buildReportGroup(7, 'report-2', [buildChild(7, '7', 'report-2')]),
+    buildReportGroup(8, 'report-3', []),
+];
+
+/** Three reports that each carry a row, for a range that has to leave one of them alone. */
+const loadedReportGroups = [
+    buildReportGroup(6, 'report-1', [buildChild(6, '6', 'report-1')]),
+    buildReportGroup(7, 'report-2', [buildChild(7, '7', 'report-2')]),
+    buildReportGroup(8, 'report-3', [buildChild(8, '8', 'report-3')]),
+];
+
+function LoadedReportWrapper({children}: {children: React.ReactNode}) {
     return (
         <SearchContextProvider>
             <SearchWriteActionsProvider
-                filteredData={[expandedGroup]}
-                totalSelectableItemsCount={expandedGroup.count ?? expandedGroup.transactions.length}
+                filteredData={loadedReportGroups}
+                renderedData={loadedReportGroups}
+                totalSelectableItemsCount={3}
                 searchResults={undefined}
+                searchHash={SEARCH_HASH}
                 transactions={undefined}
                 isMobileSelectionModeEnabled={false}
-                type={CONST.SEARCH.DATA_TYPES.EXPENSE}
+                type={CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT}
                 areItemsGrouped
-                isExpenseReportType={false}
+                isExpenseReportType
                 isSearchResultsEmpty={false}
             >
                 {children}
@@ -242,24 +371,66 @@ function ExpandedGroupWrapper({children}: {children: React.ReactNode}) {
     );
 }
 
-const renderExpandedGroupSelection = () =>
-    renderHook(
-        () => ({
-            ...useSearchSelectionContext(),
-            ...useSearchSelectionActions(),
-            ...useSearchRowSelectionActions(),
-        }),
-        {wrapper: ExpandedGroupWrapper},
+/** The same shape, with the middle report holding a single row on its way out. */
+const reportGroupsWithDeletedRow = [
+    buildReportGroup(6, 'report-1', [buildChild(6, '6', 'report-1')]),
+    buildReportGroup(7, 'report-2', [{...buildChild(7, '7', 'report-2'), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}]),
+    buildReportGroup(8, 'report-3', [buildChild(8, '8', 'report-3')]),
+];
+
+function DeletedRowReportWrapper({children}: {children: React.ReactNode}) {
+    return (
+        <SearchContextProvider>
+            <SearchWriteActionsProvider
+                filteredData={reportGroupsWithDeletedRow}
+                renderedData={reportGroupsWithDeletedRow}
+                totalSelectableItemsCount={2}
+                searchResults={undefined}
+                searchHash={SEARCH_HASH}
+                transactions={undefined}
+                isMobileSelectionModeEnabled={false}
+                type={CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT}
+                areItemsGrouped
+                isExpenseReportType
+                isSearchResultsEmpty={false}
+            >
+                {children}
+            </SearchWriteActionsProvider>
+        </SearchContextProvider>
+    );
+}
+
+function ExpenseReportWrapper({children}: {children: React.ReactNode}) {
+    return (
+        <SearchContextProvider>
+            <SearchWriteActionsProvider
+                filteredData={reportGroups}
+                renderedData={reportGroups}
+                totalSelectableItemsCount={3}
+                searchResults={undefined}
+                searchHash={SEARCH_HASH}
+                transactions={undefined}
+                isMobileSelectionModeEnabled={false}
+                type={CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT}
+                areItemsGrouped
+                isExpenseReportType
+                isSearchResultsEmpty={false}
+            >
+                {children}
+            </SearchWriteActionsProvider>
+        </SearchContextProvider>
     );
+}
 
-const renderSelection = () =>
+const renderSelection = (wrapper: React.ComponentType<{children: React.ReactNode}> = Wrapper) =>
     renderHook(
         () => ({
             ...useSearchSelectionContext(),
             ...useSearchSelectionActions(),
             ...useSearchRowSelectionActions(),
+            ...useSearchShiftRangeGroups(),
         }),
-        {wrapper: Wrapper},
+        {wrapper},
     );
 
 const renderFlatSelection = () =>
@@ -272,6 +443,27 @@ const renderFlatSelection = () =>
         {wrapper: FlatWrapper},
     );
 
+/**
+ * Every fixture that stands for the same group. A group's rows reach a range through the list itself, so making them
+ * arrive means putting them on the group the wrapper under test renders.
+ */
+const groupFixturesByKey: Record<string, TransactionGroupListItemType[]> = {
+    [GROUP_KEY]: [categoryGroup, partiallyLoadedGroup, cachedPartialGroup],
+    [EARLIER_GROUP_KEY]: [earlierGroup],
+};
+
+/** The rows a group carries once its page has arrived. Mutated in place: the provider holds the fixture, not a copy of it. */
+function carryRows(groupKey: string, children: TransactionListItemType[]) {
+    for (const fixture of groupFixturesByKey[groupKey] ?? []) {
+        fixture.transactions = children;
+    }
+}
+
+function expandGroup(result: ReturnType<typeof renderSelection>['result'], groupKey: string, children: TransactionListItemType[]) {
+    carryRows(groupKey, children);
+    result.current.addGroupToRange(groupKey);
+}
+
 const renderReportSelection = () =>
     renderHook(
         () => ({
@@ -299,23 +491,45 @@ describe('Lazily loaded group selection', () => {
 
     beforeEach(async () => {
         mockIsFocused = true;
+        groupedSearchResults = undefined;
+        groupedSearchHash = SEARCH_HASH;
+        // The fixtures are mutated as their pages arrive, so each test starts from the state its name describes.
+        categoryGroup.transactions = [];
+        categoryGroup.count = loadedChildren.length;
+        earlierGroup.transactions = [];
+        partiallyLoadedGroup.transactions = [];
+        cachedPartialGroup.transactions = loadedChildren;
+        pagingGroup = partiallyLoadedGroup;
         flatExpense = makeFlatExpense(-3000);
-        flatFilteredData = [flatExpense];
+        flatFilteredData = [flatExpense, ...flatRangeRows];
         flatSearchResults = makeFlatSearchResults(flatExpense);
         reportFilteredData = [firstReport, secondReport];
         reportSearchResults = makeReportSearchResults();
-        expandedGroup = {
-            ...categoryGroup,
-            count: 2,
-            transactions: loadedChildren,
-        };
         await act(async () => {
             await Onyx.clear();
             await waitForBatchedUpdatesWithAct();
         });
     });
 
+    it('keeps the row actions stable when a group opens, so expanding one does not re-render every row', async () => {
+        // Given the actions every row is handed while the list stands collapsed
+        const {result} = renderSelection();
+        const toggleBefore = result.current.toggle;
+        const toggleAllBefore = result.current.toggleAll;
+
+        // When a group opens, which changes the rows a range spans and the parent each belongs to
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the actions every row holds are the same functions, since the write path reads that index at the gesture
+        expect(result.current.toggle).toBe(toggleBefore);
+        expect(result.current.toggleAll).toBe(toggleAllBefore);
+    });
+
     it('stores the selection under the group key while the children are still unknown', async () => {
+        // Given a group that has never been expanded, so the list holds no rows for it
         const {result} = renderSelection();
 
         // When the checkbox is pressed before the group has been expanded, so no children are loaded yet
@@ -349,151 +563,1534 @@ describe('Lazily loaded group selection', () => {
         expect(Object.keys(result.current.selectedTransactions)).toHaveLength(0);
     });
 
-    it('selects every child of a group that was not already selected once its children loaded', async () => {
+    it('narrows a selection held under the group key when shift+click collapses the range onto one child', async () => {
         const {result} = renderSelection();
+        const [firstChild] = loadedChildren;
 
-        // When the checkbox is pressed on an expanded, unselected group whose children have loaded
+        // Given Select All while the group still carries no rows, so the selection lands under its key
         await act(async () => {
-            result.current.toggle(categoryGroup, loadedChildren);
+            result.current.toggleAll();
             await waitForBatchedUpdatesWithAct();
         });
+        expect(result.current.selectedTransactions[GROUP_KEY]?.isSelected).toBe(true);
 
-        // Then each child is selected individually, and the group key is not used
+        // When its rows arrive and a shift+click collapses the seeded range onto the first child
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the group entry is spelled out into its children, so the rest can be dropped
         expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
         expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
-        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isSelectedViaGroup).toBe(true);
-        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']).toBeUndefined();
     });
 
-    it('marks isEntireGroupSelected when every child is selected individually', async () => {
+    it('narrows a Select All onto one child of a group whose rows arrived afterwards, even once they are stored individually', async () => {
+        const {result, rerender} = renderSelection(PagingWrapper);
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given Select All while the group carries no rows, so no row is on screen for the block to cover yet
+        await act(async () => {
+            result.current.toggleAll();
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When its first page arrives, which writes the selection out into an entry per row
+        pagingGroup = cachedPartialGroup;
+        rerender({});
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[secondChild.keyForList]?.isSelected).toBe(true);
+
+        // And a shift+click lands on the first child
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the Select All narrows onto it, rather than those entries reading as hand-picked and resisting the collapse
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions[secondChild.keyForList]).toBeUndefined();
+    });
+
+    it('deselects a single child of a group that was selected before its children loaded', async () => {
         const {result} = renderSelection();
-        const firstChild = loadedChildren.at(0);
-        const secondChild = loadedChildren.at(1);
-        if (!firstChild || !secondChild) {
-            throw new Error('Expected two loaded children');
-        }
+        const [firstChild] = loadedChildren;
 
+        // Given a group selected while it was still collapsed, whose children have since loaded and been registered
         await act(async () => {
-            result.current.toggle(firstChild);
+            result.current.toggle(categoryGroup, []);
+            expandGroup(result, GROUP_KEY, loadedChildren);
             await waitForBatchedUpdatesWithAct();
         });
-        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBeFalsy();
-        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(false);
+        expect(result.current.selectedTransactions[GROUP_KEY]?.isSelected).toBe(true);
 
+        // When one of those children, which renders as selected through the group, is clicked
         await act(async () => {
-            result.current.toggle(secondChild);
+            result.current.toggle(firstChild);
             await waitForBatchedUpdatesWithAct();
         });
 
-        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBeFalsy();
-        expect(result.current.selectedTransactions['2']?.isSelectedViaGroup).toBeFalsy();
-        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(true);
+        // Then only that child is dropped and the rest of the group stays selected
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
+        expect(result.current.selectedTransactions['1']).toBeUndefined();
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
     });
 
-    it('does not mark isEntireGroupSelected when the group checkbox selects fewer children than the group count', async () => {
+    it('narrows a group selected before its children loaded once shift+click shrinks the range', async () => {
         const {result} = renderSelection();
-        const truncatedGroup = {...categoryGroup, count: 5};
+        const [firstChild, secondChild] = loadedChildren;
 
+        // Given a group selected while it was still collapsed, whose children have since loaded and been registered
         await act(async () => {
-            result.current.toggle(truncatedGroup, loadedChildren);
+            result.current.toggle(categoryGroup, []);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a shift+click covers both children and a second one shrinks the range back to the first
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
             await waitForBatchedUpdatesWithAct();
         });
 
+        // Then the second child drops out, rather than staying selected through the group
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
         expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
-        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isSelectedViaGroup).toBe(true);
-        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(false);
-        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(false);
+        expect(result.current.selectedTransactions['2']).toBeUndefined();
     });
 
-    it('clears isEntireGroupSelected when a new child lands in a fully selected group', async () => {
-        const {result, rerender} = renderExpandedGroupSelection();
-        const firstChild = loadedChildren.at(0);
-        const secondChild = loadedChildren.at(1);
-        if (!firstChild || !secondChild) {
-            throw new Error('Expected two loaded children');
-        }
+    it('anchors inside the selected group rather than at the top of the list, with an expanded group above it', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [, secondChild] = loadedChildren;
 
+        // Given an expanded, unselected group above a group that was selected while it was still collapsed
         await act(async () => {
-            result.current.toggle(firstChild);
-            result.current.toggle(secondChild);
+            expandGroup(result, EARLIER_GROUP_KEY, earlierChildren);
+            result.current.toggle(categoryGroup, []);
+            expandGroup(result, GROUP_KEY, loadedChildren);
             await waitForBatchedUpdatesWithAct();
         });
-        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(true);
 
-        expandedGroup = {
-            ...categoryGroup,
-            count: 3,
-            transactions: [...loadedChildren, makeLoadedChild('3')],
-        };
-        rerender({});
-        await act(async () => waitForBatchedUpdatesWithAct());
+        // When shift+click lands on the second child of the selected group
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
 
+        // Then the range stays inside that group and never reaches the group above
         expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
         expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
         expect(result.current.selectedTransactions['3']).toBeUndefined();
-        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(false);
-        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(false);
+        expect(result.current.selectedTransactions['4']).toBeUndefined();
     });
 
-    it('clears the parent exclusion when an expanded group is reselected', async () => {
+    it('leaves no untouched child behind when a range narrows a group of three', async () => {
         const {result} = renderSelection();
+        const [firstChild, secondChild] = threeLoadedChildren;
 
+        // Given a group selected while it was still collapsed, whose three children have since loaded and been registered
         await act(async () => {
-            result.current.toggleAll();
-            result.current.selectAllMatchingItems(true);
+            result.current.toggle(categoryGroup, []);
+            expandGroup(result, GROUP_KEY, threeLoadedChildren);
             await waitForBatchedUpdatesWithAct();
         });
+
+        // When a shift+click covers the first two children and a second one shrinks the range back to the first
         await act(async () => {
-            result.current.toggle(categoryGroup, []);
+            result.current.toggle(secondChild, undefined, true);
             await waitForBatchedUpdatesWithAct();
         });
-        expect(result.current.excludedTransactions[GROUP_KEY]).toBeDefined();
-
         await act(async () => {
-            result.current.toggle(categoryGroup, loadedChildren);
+            result.current.toggle(firstChild, undefined, true);
             await waitForBatchedUpdatesWithAct();
         });
 
-        expect(result.current.excludedTransactions).toEqual({});
+        // Then only the clicked child survives, rather than the third child hanging on because no range ever covered it
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
         expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
-        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
-        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']).toBeUndefined();
+        expect(result.current.selectedTransactions['5']).toBeUndefined();
     });
 
-    it('refreshes an excluded expense when its live row changes', async () => {
-        const {result, rerender} = renderFlatSelection();
-        await excludeFlatExpense(result);
-        expect(result.current.excludedTransactions[FLAT_TRANSACTION_ID]?.groupAmount).toBe(-3000);
+    it('drops the group entry when a range covers every child, rather than holding both', async () => {
+        const {result} = renderSelection();
+        const [, secondChild] = loadedChildren;
 
-        flatExpense = makeFlatExpense(-5000);
-        flatFilteredData = [flatExpense];
-        flatSearchResults = makeFlatSearchResults(flatExpense);
+        // Given a group selected while it was still collapsed, whose children have since loaded and been registered
+        await act(async () => {
+            result.current.toggle(categoryGroup, []);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When one shift+click covers the whole group, so nothing is deselected
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the selection is the children alone, not the children plus the group they were already selected through
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
+        expect(Object.keys(result.current.selectedTransactions)).toEqual(['1', '2']);
+    });
+
+    it('keeps a group marked as covering its rows when a range reaches past it without giving any of them back', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [earlierFirstChild] = earlierChildren;
+        const [, secondChild] = loadedChildren;
+
+        // Given the lower group selected from its header, so both of its rows are marked as covered by the group
+        await act(async () => {
+            expandGroup(result, EARLIER_GROUP_KEY, earlierChildren);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(categoryGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[secondChild.keyForList]?.isSelectedViaGroup).toBe(true);
+
+        // When a shift+click reaches up into the group above, re-covering the block's first row and leaving its second on the far side of the anchor
+        await act(async () => {
+            result.current.toggle(earlierFirstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[secondChild.keyForList]?.isSelected).toBe(true);
+
+        // Then both rows still claim the group, since the range took none of them back and the group is as selected as the header left it
+        for (const child of loadedChildren) {
+            expect(result.current.selectedTransactions[child.keyForList]?.isSelectedViaGroup).toBe(true);
+        }
+    });
+
+    it('marks a group wholly selected when a range covers every row it holds, as picking them one by one does', async () => {
+        const {result} = renderSelection();
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given an open group of two with its first row picked
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isEntireGroupSelected).toBe(false);
+
+        // When a shift+click extends the range over the second
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then both rows say the group is wholly selected, which is what delete reads
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isEntireGroupSelected).toBe(true);
+        expect(result.current.selectedTransactions[secondChild.keyForList]?.isEntireGroupSelected).toBe(true);
+    });
+
+    it('recounts whether a group is wholly selected when a range drops one of its rows, so delete cannot take the rest', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [firstChild, secondChild, thirdChild] = threeLoadedChildren;
+        categoryGroup.count = threeLoadedChildren.length;
+
+        // Given both groups selected from their headers, the upper one last, so the next shift+click starts from its first row
+        await act(async () => {
+            expandGroup(result, EARLIER_GROUP_KEY, earlierChildren);
+            expandGroup(result, GROUP_KEY, threeLoadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(categoryGroup, threeLoadedChildren);
+            result.current.toggle(earlierGroup, earlierChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a range reaches the lower group's second row, which leaves its third untouched and still wholly selected
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[thirdChild.keyForList]?.isEntireGroupSelected).toBe(true);
+
+        // And the range is pulled back to the first row, dropping the second
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then no row still claims the whole group, including the one the range never touched, or delete would take the dropped row too
+        expect(result.current.selectedTransactions[secondChild.keyForList]).toBeUndefined();
+        expect(result.current.selectedTransactions[thirdChild.keyForList]?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions[thirdChild.keyForList]?.isEntireGroupSelected).toBe(false);
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isEntireGroupSelected).toBe(false);
+    });
+
+    it('writes a group out into the rows that arrived when one of them is clicked, rather than refusing the click', async () => {
+        const {result, rerender} = renderSelection(PagingWrapper);
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given a group of five selected while collapsed, so the selection is held under its key
+        await act(async () => {
+            result.current.toggle(pagingGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[GROUP_KEY]?.isSelected).toBe(true);
+
+        // When its first page arrives and one of those rows is clicked
+        pagingGroup = cachedPartialGroup;
+        rerender({});
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the click lands: the rows that arrived carry the selection and the clicked one is out of it
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
+        expect(result.current.selectedTransactions[firstChild.keyForList]).toBeUndefined();
+        expect(result.current.selectedTransactions[secondChild.keyForList]?.isSelected).toBe(true);
+    });
+
+    it('unchecks a child of a group selected while collapsed, once that group’s first page reaches the list', async () => {
+        pagingGroup = partiallyLoadedGroup;
+        const {result, rerender} = renderSelection(PagingWrapper);
+        const [firstChild] = loadedChildren;
+
+        // Given a group of five selected while collapsed, so the selection is held under its own key
+        await act(async () => {
+            result.current.toggle(pagingGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[GROUP_KEY]?.isSelected).toBe(true);
+
+        // When its first page arrives, which is the same commit that makes those rows clickable
+        pagingGroup = cachedPartialGroup;
+        rerender({});
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the group has been written out into the rows that arrived, rather than staying an unnameable block
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isSelected).toBe(true);
+
+        // And clicking one of them unchecks it, rather than the paging refusal making the checkbox dead
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[firstChild.keyForList]).toBeUndefined();
+    });
+
+    it('narrows a group that is still paging in down to the rows a range keeps', async () => {
+        const {result, rerender} = renderSelection(PagingWrapper);
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given a group of five selected while collapsed, whose first page has since arrived
+        await act(async () => {
+            result.current.toggle(pagingGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        pagingGroup = cachedPartialGroup;
+        rerender({});
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a range is drawn across the loaded rows and then pulled back onto the first
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the range gives back the row it no longer covers, the same as it would in a group with nothing left to page in
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions[secondChild.keyForList]).toBeUndefined();
+    });
+
+    it('keeps a header selection whole when a range only covers rows it already holds, so an export still reaches the rows not loaded yet', async () => {
+        const {result, rerender} = renderSelection(PagingWrapper);
+        const [, secondChild] = loadedChildren;
+
+        // Given a group of five selected from its header once its first page of two had loaded
+        pagingGroup = cachedPartialGroup;
+        rerender({});
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(cachedPartialGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[secondChild.keyForList]?.isSelectedViaGroup).toBe(true);
+
+        // When a shift+click lands on the last loaded row, which covers the block without giving any row back
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then both rows still claim the group, which is what makes an export send a group filter rather than two IDs
+        for (const child of loadedChildren) {
+            expect(result.current.selectedTransactions[child.keyForList]?.isSelectedViaGroup).toBe(true);
+        }
+    });
+
+    it('anchors in the group just selected, not at a row selected earlier in another group', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [earlierFirstChild] = earlierChildren;
+        const [, secondChild] = loadedChildren;
+
+        // Given a child selected in the group above, then the lower group selected while it was still collapsed
+        await act(async () => {
+            expandGroup(result, EARLIER_GROUP_KEY, earlierChildren);
+            result.current.toggle(earlierFirstChild);
+            result.current.toggle(categoryGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When that group's children load and a shift+click lands on its second child
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the range stays inside the group the user just selected, leaving the other group's second child alone
+        expect(result.current.selectedTransactions['4']).toBeUndefined();
+    });
+
+    it('leaves another group’s rows alone when the block seeded for the next shift+click never loaded', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [earlierFirstChild] = earlierChildren;
+
+        // Given the group above selected as a block, then the group below selected while it was still collapsed
+        await act(async () => {
+            expandGroup(result, EARLIER_GROUP_KEY, earlierChildren);
+            result.current.toggle(earlierGroup, earlierChildren);
+            result.current.toggle(categoryGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['4']?.isSelected).toBe(true);
+
+        // When a shift+click lands in the group above, with nothing of the seeded block on screen for it to narrow
+        await act(async () => {
+            result.current.toggle(earlierFirstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then it starts a range at the row it landed on, rather than collapsing a block it was never pointed at
+        expect(result.current.selectedTransactions['4']?.isSelected).toBe(true);
+    });
+
+    it('narrows a group selected while collapsed with a cached snapshot, whose children were stored individually', async () => {
+        const {result} = renderSelection();
+        const [firstChild] = loadedChildren;
+
+        // Given the group selected while collapsed but already cached, so the header passes its children and they are stored one by one
+        await act(async () => {
+            result.current.toggle(categoryGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+
+        // When the group is re-expanded and a shift+click collapses the range onto the first child
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the range narrows it, rather than the header's own rows counting as hand-picked and resisting the collapse
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']).toBeUndefined();
+    });
+
+    it('never records a whole group as excluded when a range narrows under select-all-matching', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [firstChild, secondChild] = loadedChildren;
+
+        const [earlierFirstChild] = earlierChildren;
+
+        // Given a range that covers every row, and every matching item selected
+        await act(async () => {
+            expandGroup(result, EARLIER_GROUP_KEY, earlierChildren);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            result.current.toggle(earlierFirstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            result.current.selectAllMatchingItems(true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+
+        // When a shift+click shrinks that range so the last rows fall out of it
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then no group is written off as excluded, which would drop every one of its rows from a bulk action
+        expect(Object.keys(result.current.excludedTransactions)).not.toContain(GROUP_KEY);
+        expect(Object.keys(result.current.excludedTransactions)).not.toContain(EARLIER_GROUP_KEY);
+    });
+
+    it('selects every child of a group that was not already selected once its children loaded', async () => {
+        // Given an expanded group, none of whose rows are selected
+        const {result} = renderSelection();
+
+        // When the checkbox is pressed on an expanded, unselected group whose children have loaded
+        await act(async () => {
+            result.current.toggle(categoryGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then each child is selected individually, and the group key is not used
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelectedViaGroup).toBe(true);
+        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(true);
+    });
+
+    it('marks isEntireGroupSelected when every child is selected individually', async () => {
+        const {result} = renderSelection();
+        const firstChild = loadedChildren.at(0);
+        const secondChild = loadedChildren.at(1);
+        if (!firstChild || !secondChild) {
+            throw new Error('Expected two loaded children');
+        }
+
+        // Given only the first of the group's two rows clicked, which covers part of the group
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBeFalsy();
+        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(false);
+
+        // When the second one is clicked too
+        await act(async () => {
+            result.current.toggle(secondChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then both rows record the group as wholly covered, so a delete can act on the group rather than the rows
+        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBeFalsy();
+        expect(result.current.selectedTransactions['2']?.isSelectedViaGroup).toBeFalsy();
+        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(true);
+    });
+
+    it('does not mark isEntireGroupSelected when the group checkbox selects fewer children than the group count', async () => {
+        // Given a group that counts five rows but has only two of them loaded
+        const {result} = renderSelection();
+        const truncatedGroup = {...categoryGroup, count: 5};
+
+        // When its header checkbox is pressed
+        await act(async () => {
+            result.current.toggle(truncatedGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the two are selected without claiming the group is covered, since the three that never loaded are not
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['1']?.isSelectedViaGroup).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelectedViaGroup).toBe(true);
+        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(false);
+        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(false);
+    });
+
+    it('clears isEntireGroupSelected when a new child lands in a fully selected group', async () => {
+        pagingGroup = {...categoryGroup, transactions: loadedChildren};
+        const {result, rerender} = renderSelection(PagingWrapper);
+        const firstChild = loadedChildren.at(0);
+        const secondChild = loadedChildren.at(1);
+        if (!firstChild || !secondChild) {
+            throw new Error('Expected two loaded children');
+        }
+
+        // Given both of the group's rows selected, so it reads as wholly covered
+        await act(async () => {
+            result.current.toggle(firstChild);
+            result.current.toggle(secondChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(true);
+
+        // When a third row pages in under it
+        pagingGroup = {...categoryGroup, count: 3, transactions: [...loadedChildren, buildChild(3, '3', GROUP_KEY)]};
+        rerender({});
+        await act(async () => waitForBatchedUpdatesWithAct());
+
+        // Then the claim is withdrawn, or a delete would take the row that arrived unselected
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['3']).toBeUndefined();
+        expect(result.current.selectedTransactions['1']?.isEntireGroupSelected).toBe(false);
+        expect(result.current.selectedTransactions['2']?.isEntireGroupSelected).toBe(false);
+    });
+
+    it('clears the parent exclusion when an expanded group is reselected', async () => {
+        const {result} = renderSelection();
+
+        // Given a group unchecked while collapsed under select-all-matching, which records it as excluded
+        await act(async () => {
+            result.current.toggleAll();
+            result.current.selectAllMatchingItems(true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(categoryGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.excludedTransactions[GROUP_KEY]).toBeDefined();
+
+        // When its rows have loaded and the header is pressed again
+        await act(async () => {
+            result.current.toggle(categoryGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the exclusion goes with it, rather than the rows reading as checked while the group is still excluded
+        expect(result.current.excludedTransactions).toEqual({});
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+    });
+
+    it('keeps a child checked on its own inside an excluded group, rather than the refresh dropping it with its parent', async () => {
+        const {result, rerender} = renderSelection(PagingWrapper);
+        const [firstChild] = loadedChildren;
+
+        // Given a group unchecked while collapsed under select-all-matching, whose rows then arrive
+        await act(async () => {
+            result.current.selectAllMatchingItems(true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(pagingGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.excludedTransactions[GROUP_KEY]).toBeDefined();
+        pagingGroup = {...categoryGroup, count: 2, transactions: loadedChildren};
+        rerender({});
+        await act(async () => waitForBatchedUpdatesWithAct());
+
+        // Given one of those rows checked on its own, which its checkbox reads from its own entry rather than the group
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isSelected).toBe(true);
+
+        // When the data refreshes, which re-derives the selection from the rows on screen
+        pagingGroup = {...categoryGroup, count: 2, transactions: [...loadedChildren]};
+        rerender({});
+        await act(async () => waitForBatchedUpdatesWithAct());
+
+        // Then it is still checked: an entry of its own outranks the exclusion covering the group it sits in
+        expect(result.current.selectedTransactions[firstChild.keyForList]?.isSelected).toBe(true);
+    });
+
+    it('refreshes an excluded expense when its live row changes', async () => {
+        // Given an expense taken back out of a select-all-matching selection at its current amount
+        const {result, rerender} = renderFlatSelection();
+        await excludeFlatExpense(result);
+        expect(result.current.excludedTransactions[FLAT_TRANSACTION_ID]?.groupAmount).toBe(-3000);
+
+        // When the row itself changes
+        flatExpense = makeFlatExpense(-5000);
+        flatFilteredData = [flatExpense];
+        flatSearchResults = makeFlatSearchResults(flatExpense);
+        rerender({});
+        await act(async () => waitForBatchedUpdatesWithAct());
+
+        // Then the exclusion carries the new amount, since the footer total is what it is subtracted from
+        expect(result.current.excludedTransactions[FLAT_TRANSACTION_ID]?.groupAmount).toBe(-5000);
+        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+    });
+
+    it('prunes an excluded expense after it leaves the settled search results', async () => {
+        // Given an expense taken back out of a select-all-matching selection
+        const {result, rerender} = renderFlatSelection();
+        await excludeFlatExpense(result);
+        expect(result.current.excludedTransactions[FLAT_TRANSACTION_ID]).toBeDefined();
+
+        // When it stops matching the search
+        flatFilteredData = [];
+        flatSearchResults = makeFlatSearchResults(undefined);
+        rerender({});
+        await act(async () => waitForBatchedUpdatesWithAct());
+
+        // Then its exclusion is dropped, rather than a row that is no longer in the results subtracting from the total
+        expect(result.current.excludedTransactions).toEqual({});
+        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+    });
+
+    it('spans the flat list from the last row clicked, where every row is its own selectable unit', async () => {
+        const {result} = renderFlatSelection();
+        const [firstRow, secondRow, thirdRow] = flatFilteredData;
+
+        // Given the first row clicked plainly, which anchors the range
+        await act(async () => {
+            result.current.toggle(firstRow);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a shift+click lands two rows down
+        await act(async () => {
+            result.current.toggle(thirdRow, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the rows between the two are selected as well
+        expect(Object.keys(result.current.selectedTransactions).sort()).toEqual([firstRow.keyForList, secondRow.keyForList, thirdRow.keyForList].sort());
+    });
+
+    it('gives back the flat rows a shrinking range no longer covers', async () => {
+        const {result} = renderFlatSelection();
+        const [firstRow, secondRow, , fourthRow] = flatFilteredData;
+
+        // Given a range drawn across the whole flat list
+        await act(async () => {
+            result.current.toggle(firstRow);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(fourthRow, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the endpoint is pulled back to the second row
+        await act(async () => {
+            result.current.toggle(secondRow, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then only the span it still covers is left selected
+        expect(Object.keys(result.current.selectedTransactions).sort()).toEqual([firstRow.keyForList, secondRow.keyForList].sort());
+    });
+
+    it('keeps the far side when a flat range crosses its anchor', async () => {
+        const {result} = renderFlatSelection();
+        const [firstRow, secondRow, thirdRow, fourthRow] = flatFilteredData;
+
+        // Given a range painted downwards from the second row
+        await act(async () => {
+            result.current.toggle(secondRow);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(fourthRow, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the next shift+click lands above the anchor
+        await act(async () => {
+            result.current.toggle(firstRow, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the rows below it stay selected, which is what production Table and Gmail do
+        expect(Object.keys(result.current.selectedTransactions).sort()).toEqual([firstRow.keyForList, secondRow.keyForList, thirdRow.keyForList, fourthRow.keyForList].sort());
+    });
+
+    it('collapses a flat Select All onto the span the next shift+click lands in', async () => {
+        const {result} = renderFlatSelection();
+        const [firstRow, secondRow] = flatFilteredData;
+
+        // Given every row selected from the header checkbox
+        await act(async () => {
+            result.current.toggleAll();
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(Object.keys(result.current.selectedTransactions)).toHaveLength(flatFilteredData.length);
+
+        // When a shift+click lands on the second row
+        await act(async () => {
+            result.current.toggle(secondRow, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the selection narrows onto it, which is what makes an overshoot recoverable in one click
+        expect(Object.keys(result.current.selectedTransactions).sort()).toEqual([firstRow.keyForList, secondRow.keyForList].sort());
+    });
+
+    it('forgets a block held for the next shift+click once an ordinary click starts a session of its own', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [earlierFirstChild] = earlierChildren;
+        const [, secondChild] = loadedChildren;
+
+        // Given a group clicked while its children were still unknown, which holds the block for the next shift+click
+        await act(async () => {
+            result.current.toggle(categoryGroup, []);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            expandGroup(result, EARLIER_GROUP_KEY, earlierChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When an ordinary click lands elsewhere first, and only then a shift+click
+        await act(async () => {
+            result.current.toggle(earlierFirstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the range runs from the row just clicked, rather than the stale block resurrecting and collapsing onto it
+        expect(result.current.selectedTransactions['3']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['4']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+    });
+
+    it('selects every report a range covers in an expense-report view', async () => {
+        const {result} = renderSelection(ExpenseReportWrapper);
+        const [firstRangeReport, secondRangeReport] = reportGroups;
+
+        // Given the first report clicked, which is the anchor the next click ranges from
+        await act(async () => {
+            result.current.toggle(firstRangeReport, firstRangeReport.transactions);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a shift+click lands on the second report
+        await act(async () => {
+            result.current.toggle(secondRangeReport, secondRangeReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then both reports are selected through their child transactions, which is where a report row keeps its selection
+        expect(result.current.selectedTransactions['6']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['7']?.isSelected).toBe(true);
+        // And each row records the report it came in with, the same way clicking the report row records it
+        expect(result.current.selectedTransactions['7']?.groupKey).toBe(secondRangeReport.keyForList);
+        expect(result.current.selectedTransactions['7']?.isSelectedViaGroup).toBe(true);
+    });
+
+    it('drops a report’s own entry when a range covers the rows that arrived under it', async () => {
+        const {result} = renderSelection(ExpenseReportWrapper);
+        const [firstRangeReport] = reportGroups;
+
+        // Given a report selected while it had no expenses of its own, whose expenses have since arrived
+        await act(async () => {
+            const [reportKey, reportEntry] = mapEmptyReportToSelectedEntry(firstRangeReport);
+            result.current.setSelectedTransactions({[reportKey]: reportEntry});
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a range covers that report row
+        await act(async () => {
+            result.current.toggle(firstRangeReport, firstRangeReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then its rows carry the selection and the report's own entry goes, rather than the two being counted separately
+        expect(result.current.selectedTransactions['6']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions[firstRangeReport.keyForList]).toBeUndefined();
+    });
+
+    it('gives back the reports a range no longer covers in an expense-report view', async () => {
+        const {result} = renderSelection(ExpenseReportWrapper);
+        const [firstRangeReport, secondRangeReport, emptyReport] = reportGroups;
+
+        // Given a range stretched across all three reports
+        await act(async () => {
+            result.current.toggle(firstRangeReport, firstRangeReport.transactions);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(emptyReport, emptyReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['7']?.isSelected).toBe(true);
+
+        // When a second shift+click pulls the range back to the second report
+        await act(async () => {
+            result.current.toggle(secondRangeReport, secondRangeReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the report that fell out of the range is given back, rather than staying selected behind the range
+        expect(result.current.selectedTransactions['6']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['7']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['report-3']).toBeUndefined();
+    });
+
+    it('keeps the remaining children selected when the data refreshes after a group is written out', async () => {
+        const {result, rerender} = renderSelection();
+        const [firstChild] = loadedChildren;
+
+        // Given a group selected while collapsed, its children since published, and one of them unchecked
+        await act(async () => {
+            result.current.toggle(categoryGroup, []);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+
+        // When a data push re-runs the reconcile
+        rerender({});
+        await act(async () => waitForBatchedUpdatesWithAct());
+
+        // Then the child that is still selected survives it
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+    });
+
+    it('commits nothing when a shift+click re-covers the rows it already holds', async () => {
+        const {result} = renderSelection();
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given a range already covering both of a group's rows
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        const selectionAfterRange = result.current.selectedTransactions;
+
+        // When the same endpoint is shift+clicked again, so every row it covers is already selected the same way
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the selection is the same object, so the commit bails and no row re-renders
+        expect(result.current.selectedTransactions).toBe(selectionAfterRange);
+    });
+
+    it('never anchors a cold shift+click on a row the user unchecked', async () => {
+        const {result, rerender} = renderSelection();
+        const [firstChild, , thirdChild] = threeLoadedChildren;
+
+        // Given a group covered by select-all-matching with its first child taken back out
+        await act(async () => {
+            result.current.selectAllMatchingItems(true);
+            expandGroup(result, GROUP_KEY, threeLoadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.excludedTransactions[firstChild.keyForList]).toBeDefined();
+
+        // And no session left to continue, since the query changed after that click
+        groupedSearchHash = SEARCH_HASH + 1;
+        rerender({});
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, threeLoadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the next gesture is a shift+click, so the anchor has to be resolved from the rows themselves
+        await act(async () => {
+            result.current.toggle(thirdChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the range starts at the first row that reads as checked, rather than sweeping the unchecked row back in
+        expect(result.current.excludedTransactions[firstChild.keyForList]).toBeDefined();
+        expect(result.current.selectedTransactions[firstChild.keyForList]).toBeUndefined();
+    });
+
+    it('unchecks a group in one click when select-all-matching is what checked it', async () => {
+        const {result} = renderSelection();
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given every matching item selected from the menu, so the group reads checked without a single entry behind it
+        await act(async () => {
+            result.current.selectAllMatchingItems(true);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the group's header checkbox is pressed once
+        await act(async () => {
+            result.current.toggle(categoryGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then its rows stop reading as checked, rather than the click reading the group as unselected and selecting it again
+        const isChecked = (rowKey: string) =>
+            isRowChecked({
+                rowKey,
+                parentGroupKey: GROUP_KEY,
+                selectedTransactions: result.current.selectedTransactions,
+                excludedTransactions: result.current.excludedTransactions,
+                areAllMatchingItemsSelected: result.current.areAllMatchingItemsSelected,
+            });
+        expect(isChecked(firstChild.keyForList)).toBe(false);
+        expect(isChecked(secondChild.keyForList)).toBe(false);
+        // And each row is named, since the group carries all of them and nothing is left for its own key to stand for
+        expect(result.current.excludedTransactions[firstChild.keyForList]).toBeDefined();
+        expect(result.current.excludedTransactions[secondChild.keyForList]).toBeDefined();
+    });
+
+    it('checks a group again when its header is pressed after being unchecked under select-all-matching', async () => {
+        const {result} = renderSelection();
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given every matching item selected, and a loaded group unchecked from its header
+        await act(async () => {
+            result.current.selectAllMatchingItems(true);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(categoryGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the header is pressed again
+        await act(async () => {
+            result.current.toggle(categoryGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then its rows read as checked again, rather than select-all-matching covering the group's own key and turning the click into another uncheck
+        const isChecked = (rowKey: string) =>
+            isRowChecked({
+                rowKey,
+                parentGroupKey: GROUP_KEY,
+                selectedTransactions: result.current.selectedTransactions,
+                excludedTransactions: result.current.excludedTransactions,
+                areAllMatchingItemsSelected: result.current.areAllMatchingItemsSelected,
+            });
+        expect(isChecked(firstChild.keyForList)).toBe(true);
+        expect(isChecked(secondChild.keyForList)).toBe(true);
+    });
+
+    it('unchecks a group holding none of its rows, when select-all-matching is what checked it', async () => {
+        const {result} = renderSelection();
+
+        // Given every matching item selected, and a group whose children have never loaded
+        await act(async () => {
+            result.current.selectAllMatchingItems(true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When its header checkbox is pressed once
+        await act(async () => {
+            result.current.toggle(categoryGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the group is recorded as excluded, rather than the click reading it as unselected and selecting it outright
+        expect(result.current.excludedTransactions[GROUP_KEY]).toBeDefined();
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
+    });
+
+    it('leaves the selection untouched when a group has no row it can select', async () => {
+        const {result} = renderSelection();
+        const [firstLoadedChild] = loadedChildren;
+        const deletedChild = {...firstLoadedChild, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+
+        // Given a group whose only row is being deleted, so its checkbox reads unchecked with nothing to check
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, [deletedChild]);
+            await waitForBatchedUpdatesWithAct();
+        });
+        const before = result.current.selectedTransactions;
+
+        // When its header is pressed
+        await act(async () => {
+            result.current.toggle(categoryGroup, [deletedChild]);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the commit is skipped entirely, rather than replacing the map with an equal one and re-rendering every row
+        expect(result.current.selectedTransactions).toBe(before);
+    });
+
+    it('drops a group’s own key once its rows arrive and none of them can be selected, so the footer stops counting it', async () => {
+        const {result} = renderSelection();
+        const [firstLoadedChild] = loadedChildren;
+        const deletedChild = {...firstLoadedChild, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+
+        // Given a group selected while collapsed, whose only row then arrives being deleted
+        await act(async () => {
+            result.current.toggle(categoryGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[GROUP_KEY]?.isSelected).toBe(true);
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, [deletedChild]);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When its header is pressed, on a checkbox that reads unchecked because nothing under it can be selected
+        await act(async () => {
+            result.current.toggle(categoryGroup, [deletedChild]);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the key it was held under goes, rather than the press doing nothing while the footer still counts it
+        expect(result.current.selectedTransactions[GROUP_KEY]).toBeUndefined();
+    });
+
+    it('keeps the session when a group being deleted writes nothing, so a press that changes nothing cannot cost the anchor', async () => {
+        const {result} = renderSelection(TwoGroupWrapper);
+        const [firstChild, , thirdChild] = threeLoadedChildren;
+
+        // Given the first row of an expanded group clicked plainly, which is the anchor the next shift+click ranges from
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, threeLoadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the header of another group is pressed while that group is being deleted, which its own branch refuses to write
+        await act(async () => {
+            result.current.toggle({...earlierGroup, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a shift+click lands two rows further down
+        await act(async () => {
+            result.current.toggle(thirdChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the row between them comes with it: the press wrote nothing, so it had no block to seed and no session to end
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['5']?.isSelected).toBe(true);
+    });
+
+    it('clears the rows a group still holds once none of them can be selected, since no checkbox is left to uncheck them', async () => {
+        const {result} = renderSelection();
+        const [firstLoadedChild] = loadedChildren;
+
+        // Given a row selected while it could be, which is then on its way out
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstLoadedChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[firstLoadedChild.keyForList]?.isSelected).toBe(true);
+        const deletedChild = {...firstLoadedChild, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+
+        // When its group's header is pressed, on a checkbox that reads unchecked because nothing under it can be selected
+        await act(async () => {
+            result.current.toggle(categoryGroup, [deletedChild]);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the entry goes with the press, rather than the footer counting a row the user can no longer reach
+        expect(result.current.selectedTransactions[firstLoadedChild.keyForList]).toBeUndefined();
+    });
+
+    it('turns select-all-matching off once every group has been unchecked', async () => {
+        const {result} = renderSelection(SettledGroupWrapper);
+
+        // Given every matching item selected in a grouped search of one group
+        await act(async () => {
+            result.current.selectAllMatchingItems(true);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+
+        // When that group is unchecked, so nothing the search can select is left
+        await act(async () => {
+            result.current.toggle(cachedPartialGroup, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the flag goes off, rather than a footer advertising every match over a selection the user emptied
+        expect(result.current.areAllMatchingItemsSelected).toBe(false);
+    });
+
+    it('records what a narrowing dropped, so keeping select-all-matching on cannot silently re-include it', async () => {
+        const {result} = renderSelection();
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given a range across both children, with every matching item selected
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            result.current.selectAllMatchingItems(true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a shift+click narrows that range back to the first child
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the flag stays on, which is correct only because the dropped row is recorded as excluded
+        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+        expect(result.current.excludedTransactions['2']).toBeDefined();
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+    });
+
+    it('treats a shift+click on a group header as an ordinary header click, reaching no group between it and the last one', async () => {
+        const {result} = renderSelection();
+
+        // Given two collapsed groups, where the headers are the only rows carrying a checkbox
+        await act(async () => {
+            result.current.toggle(earlierGroup, []);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions[EARLIER_GROUP_KEY]?.isSelected).toBe(true);
+
+        // When the second header is shift+clicked
+        await act(async () => {
+            result.current.toggle(categoryGroup, [], true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then it selects itself and nothing spans between the two, which is what design settled on
+        expect(result.current.selectedTransactions[GROUP_KEY]?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions[EARLIER_GROUP_KEY]?.isSelected).toBe(true);
+        expect(Object.keys(result.current.selectedTransactions).sort()).toEqual([EARLIER_GROUP_KEY, GROUP_KEY].sort());
+    });
+
+    it('leaves a select-all-matching selection alone when a shift+click lands in it, since narrowing it would need exclusions for rows never on screen', async () => {
+        const {result} = renderSelection();
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given every matching item selected from the menu, which the reconcile pass writes out as an entry per visible row
+        await act(async () => {
+            result.current.selectAllMatchingItems(true);
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a shift+click lands on the first row
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then both rows stay checked: those entries carry no group, so they read as hand-picked and a range may not take them back
+        const isChecked = (rowKey: string) =>
+            isRowChecked({
+                rowKey,
+                parentGroupKey: GROUP_KEY,
+                selectedTransactions: result.current.selectedTransactions,
+                excludedTransactions: result.current.excludedTransactions,
+                areAllMatchingItemsSelected: result.current.areAllMatchingItemsSelected,
+            });
+        expect(isChecked(firstChild.keyForList)).toBe(true);
+        expect(isChecked(secondChild.keyForList)).toBe(true);
+    });
+
+    it('turns select-all-matching off when the header checkbox clears the selection', async () => {
+        const {result} = renderFlatSelection();
+
+        // Given every matching item selected
+        await act(async () => {
+            result.current.toggleAll();
+            result.current.selectAllMatchingItems(true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+
+        // When the header checkbox is pressed again to clear everything
+        await act(async () => {
+            result.current.toggleAll();
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then nothing is selected any more, rather than every unloaded match staying selected behind an empty page
+        expect(result.current.areAllMatchingItemsSelected).toBe(false);
+        expect(result.current.excludedTransactions).toEqual({});
+    });
+
+    it('collapses a Select All onto the span the next shift+click lands in', async () => {
+        const {result} = renderSelection(ExpenseReportWrapper);
+        const [firstRangeReport] = reportGroups;
+
+        // Given Select All, which seeds a block covering the whole list
+        await act(async () => {
+            result.current.toggleAll();
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(Object.keys(result.current.selectedTransactions).length).toBeGreaterThan(1);
+
+        // When a shift+click lands on the first report
+        await act(async () => {
+            result.current.toggle(firstRangeReport, firstRangeReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the selection narrows onto it, which is what makes an overshoot recoverable in one click
+        expect(Object.keys(result.current.selectedTransactions)).toEqual(['6']);
+    });
+
+    it('drops a group’s published rows when the search changes, so a range cannot reach the previous results', async () => {
+        groupedSearchResults = makeFlatSearchResults(undefined);
+        const {result, rerender} = renderSelection(SearchChangeWrapper);
+        const [, secondChild] = loadedChildren;
+
+        // Given a group open with its rows published under one search
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the search changes and the group has not published anything yet under the new one
+        groupedSearchHash = SEARCH_HASH + 1;
         rerender({});
         await act(async () => waitForBatchedUpdatesWithAct());
 
-        expect(result.current.excludedTransactions[FLAT_TRANSACTION_ID]?.groupAmount).toBe(-5000);
-        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+        // Then a shift+click reaches only the row it landed on, rather than sweeping in rows that belonged to the previous search
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['1']).toBeUndefined();
     });
 
-    it('prunes an excluded expense after it leaves the settled search results', async () => {
-        const {result, rerender} = renderFlatSelection();
-        await excludeFlatExpense(result);
-        expect(result.current.excludedTransactions[FLAT_TRANSACTION_ID]).toBeDefined();
+    it('starts a cold session when the search changes, so an old span cannot collapse rows in the new results', async () => {
+        groupedSearchResults = makeFlatSearchResults(undefined);
+        const {result, rerender} = renderSelection(SearchChangeWrapper);
+        const [firstChild, secondChild] = loadedChildren;
 
-        flatFilteredData = [];
-        flatSearchResults = makeFlatSearchResults(undefined);
+        // Given a range painted across both children under one search
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+
+        // When the query changes and the same rows come back, since a transaction can match both searches
+        groupedSearchHash = SEARCH_HASH + 1;
+        rerender({});
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then a shift+click starts fresh rather than continuing the previous search's span and collapsing the row that fell out of it
+        await act(async () => {
+            result.current.toggle(firstChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+    });
+
+    it('drops a group’s rows from ranges once they are gone, rather than ranging over transactions that no longer exist', async () => {
+        const {result, rerender} = renderSelection();
+        const [firstChild, , thirdChild] = threeLoadedChildren;
+
+        // Given a group carrying its rows, and open
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, threeLoadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When every one of its transactions goes away, so the group carries none
+        carryRows(GROUP_KEY, []);
         rerender({});
         await act(async () => waitForBatchedUpdatesWithAct());
 
-        expect(result.current.excludedTransactions).toEqual({});
-        expect(result.current.areAllMatchingItemsSelected).toBe(true);
+        // Then a range reaches none of them, rather than writing selections for rows that are no longer there
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(thirdChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(result.current.selectedTransactions['2']).toBeUndefined();
+    });
+
+    it('still ranges a group reopened before its rows were published again', async () => {
+        const {result} = renderSelection();
+        const [firstChild, secondChild] = loadedChildren;
+
+        // Given a group whose children loaded, then collapsed and reopened without the row republishing them
+        await act(async () => {
+            expandGroup(result, GROUP_KEY, loadedChildren);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.removeGroupFromRange(GROUP_KEY);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.addGroupToRange(GROUP_KEY);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a range runs across its rows
+        await act(async () => {
+            result.current.toggle(firstChild);
+            await waitForBatchedUpdatesWithAct();
+        });
+        await act(async () => {
+            result.current.toggle(secondChild, undefined, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then they are still reachable, because closing a group drops only its openness and not the rows it had published
+        expect(result.current.selectedTransactions['1']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['2']?.isSelected).toBe(true);
+    });
+
+    it('starts cold after something outside the list clears the selection, rather than ranging from the last row clicked', async () => {
+        const {result} = renderSelection(ExpenseReportWrapper);
+        const [firstRangeReport, , emptyReport] = reportGroups;
+
+        // Given the last report clicked plainly, which becomes the anchor
+        await act(async () => {
+            result.current.toggle(emptyReport, emptyReport.transactions);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the selection is cleared from outside the list, as a bulk action does once it finishes
+        await act(async () => {
+            result.current.clearSelectedTransactions();
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then a shift+click runs from the top of the list, rather than from the report clicked before the clear
+        await act(async () => {
+            result.current.toggle(firstRangeReport, firstRangeReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+        expect(Object.keys(result.current.selectedTransactions)).toEqual(['6']);
+    });
+
+    it('never takes back a report the user picked while it was empty, once its rows have arrived', async () => {
+        const {result} = renderSelection(LoadedReportWrapper);
+        const [firstRangeReport, secondRangeReport, thirdRangeReport] = loadedReportGroups;
+
+        // Given the first and last reports picked while they carried no rows, so each is held under its own key
+        await act(async () => {
+            result.current.applySelection(
+                (selectedTransactions) => ({
+                    ...selectedTransactions,
+                    ...Object.fromEntries([mapEmptyReportToSelectedEntry(firstRangeReport), mapEmptyReportToSelectedEntry(thirdRangeReport)]),
+                }),
+                {},
+            );
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When their rows have arrived and a shift+click ranges over the middle report only
+        await act(async () => {
+            result.current.toggle(secondRangeReport, secondRangeReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then the last report is still selected: a row the user picked is protected whether its entry sits on the row or on its group
+        expect(result.current.selectedTransactions['report-3']?.isSelected).toBe(true);
+    });
+
+    it('never anchors on a report whose only selected row is on its way out, since its checkbox reads unchecked', async () => {
+        const {result} = renderSelection(DeletedRowReportWrapper);
+        const [, secondRangeReport, thirdRangeReport] = reportGroupsWithDeletedRow;
+        const [deletedRow] = secondRangeReport.transactions;
+
+        // Given the middle report's only row still in the selection after it started being deleted, which its checkbox stops counting
+        await act(async () => {
+            result.current.applySelection((selectedTransactions) => ({...selectedTransactions, [deletedRow.keyForList]: mapEmptyReportToSelectedEntry(secondRangeReport)[1]}), {});
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When the first shift+click of the session lands on the last report
+        await act(async () => {
+            result.current.toggle(thirdRangeReport, thirdRangeReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then it ranges from the top of the list rather than from that report, since the engine and the checkbox read the same rows
+        expect(result.current.selectedTransactions['6']?.isSelected).toBe(true);
+        expect(result.current.selectedTransactions['8']?.isSelected).toBe(true);
+    });
+
+    it('selects a report with no expenses of its own when a range reaches it', async () => {
+        const {result} = renderSelection(ExpenseReportWrapper);
+        const [firstRangeReport, , emptyReport] = reportGroups;
+
+        // Given the first report clicked
+        await act(async () => {
+            result.current.toggle(firstRangeReport, firstRangeReport.transactions);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // When a range stretches from it onto a report that carries no expenses
+        await act(async () => {
+            result.current.toggle(emptyReport, emptyReport.transactions, true);
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        // Then it is selected under its own key, which is the only key an empty report has
+        expect(result.current.selectedTransactions['report-3']?.isSelected).toBe(true);
     });
 
     it('clears a multi-page all-matching report selection from the header', async () => {
diff --git a/tests/unit/Search/SearchColumnsPageTest.tsx b/tests/unit/Search/SearchColumnsPageTest.tsx
new file mode 100644
index 000000000000..324d4f2286b0
--- /dev/null
+++ b/tests/unit/Search/SearchColumnsPageTest.tsx
@@ -0,0 +1,220 @@
+import {render} from '@testing-library/react-native';
+
+import type {SearchCustomColumnIds, SearchQueryJSON} from '@components/Search/types';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SearchColumnsPage from '@src/pages/Search/SearchColumnsPage';
+import type {SearchResults} from '@src/types/onyx';
+
+import React from 'react';
+
+// Capture what the picker hands the list instead of asserting on rendered rows: `currentColumns` IS the
+// seed under test, and the real list adds drag handles and Onyx-backed labels that are irrelevant here.
+const capturedProps: {currentColumns?: SearchCustomColumnIds[]; allColumns?: SearchCustomColumnIds[]; isLoadingIndicatorShown?: boolean} = {};
+jest.mock('@components/ColumnsSettingsList', () => ({
+    __esModule: true,
+    default: (props: {currentColumns: SearchCustomColumnIds[]; allColumns: SearchCustomColumnIds[]}) => {
+        capturedProps.currentColumns = props.currentColumns;
+        capturedProps.allColumns = props.allColumns;
+        return null;
+    },
+}));
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {navigate: jest.fn()},
+}));
+
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({
+    __esModule: true,
+    default: () => ({accountID: 1, email: 'submitter@test.com'}),
+}));
+
+jest.mock('@hooks/usePolicyForMovingExpenses', () => ({
+    __esModule: true,
+    default: () => ({policyForMovingExpensesID: undefined, policyForMovingExpenses: undefined}),
+}));
+
+jest.mock('@components/FullscreenLoadingIndicator', () => ({
+    __esModule: true,
+    default: () => {
+        capturedProps.isLoadingIndicatorShown = true;
+        return null;
+    },
+}));
+
+let mockIsOffline = false;
+jest.mock('@hooks/useNetwork', () => ({
+    __esModule: true,
+    default: () => ({isOffline: mockIsOffline}),
+}));
+
+const onyxData: Record<string, unknown> = {};
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: (key: string, options?: {selector?: (value: unknown) => unknown}) => [options?.selector ? options.selector(onyxData[key]) : onyxData[key]],
+}));
+
+let mockResultsContext: {currentSearchResults: SearchResults | undefined; shouldUseLiveData: boolean} = {
+    currentSearchResults: undefined,
+    shouldUseLiveData: false,
+};
+let mockQueryContext: {currentSearchKey: string | undefined; currentSearchQueryJSON: SearchQueryJSON | undefined} = {
+    currentSearchKey: undefined,
+    currentSearchQueryJSON: undefined,
+};
+jest.mock('@components/Search/SearchContext', () => ({
+    useSearchResultsContext: () => mockResultsContext,
+    useSearchQueryContext: () => mockQueryContext,
+}));
+
+const POLICY_ID = 'policy1';
+const ACCOUNT_ID = 1;
+
+/** A resolved expense snapshot with exactly one transaction that has a description. */
+function buildSnapshot(withDescription: boolean): SearchResults {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- fixture only carries the fields getColumnsToShow reads
+    return {
+        search: {
+            offset: 0,
+            hash: 123,
+            type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+            sortBy: CONST.SEARCH.TABLE_COLUMNS.DATE,
+            sortOrder: CONST.SEARCH.SORT_ORDER.DESC,
+            hasMoreResults: false,
+            hasResults: true,
+            isLoading: false,
+            count: 1,
+            total: 2500,
+            currency: 'USD',
+        },
+        data: {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}1`]: {
+                transactionID: '1',
+                reportID: 'report1',
+                policyID: POLICY_ID,
+                accountID: ACCOUNT_ID,
+                amount: -2500,
+                currency: 'USD',
+                merchant: 'Test Merchant',
+                created: '2026-09-18',
+                comment: withDescription ? {comment: 'Lunch with client'} : {},
+            },
+        },
+    } as unknown as SearchResults;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- fixture only carries the fields the picker reads
+const EXPENSE_QUERY_JSON = {
+    type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+    sortBy: CONST.SEARCH.TABLE_COLUMNS.DATE,
+    sortOrder: CONST.SEARCH.SORT_ORDER.DESC,
+    groupBy: undefined,
+    filters: {},
+    flatFilters: [],
+    hash: 123,
+    recentSearchHash: 123,
+    inputQuery: 'type:expense',
+} as unknown as SearchQueryJSON;
+
+/** The same expense query with a groupBy applied. */
+function buildGroupedQueryJSON(groupBy: string): SearchQueryJSON {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- fixture only carries the fields the picker reads
+    return {...EXPENSE_QUERY_JSON, groupBy} as unknown as SearchQueryJSON;
+}
+
+describe('SearchColumnsPage seeding (Part A)', () => {
+    beforeEach(() => {
+        capturedProps.currentColumns = undefined;
+        capturedProps.allColumns = undefined;
+        capturedProps.isLoadingIndicatorShown = undefined;
+        mockIsOffline = false;
+        for (const key of Object.keys(onyxData)) {
+            delete onyxData[key];
+        }
+        mockResultsContext = {currentSearchResults: undefined, shouldUseLiveData: false};
+        mockQueryContext = {currentSearchKey: undefined, currentSearchQueryJSON: EXPENSE_QUERY_JSON};
+    });
+
+    test('seeds the picker from the snapshot so a data-driven Description renders as checked', () => {
+        // Given an expense snapshot whose only transaction has a description, and no saved column selection
+        const snapshot = buildSnapshot(true);
+        mockResultsContext = {currentSearchResults: snapshot, shouldUseLiveData: false};
+
+        // When the picker renders
+        render(<SearchColumnsPage />);
+
+        // Then Description is seeded as selected, because the table derives it from the same data. Seeding from
+        // the static default list instead would show it unchecked while the table renders it.
+        expect(capturedProps.currentColumns).toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
+    });
+
+    test('does not seed Description when no transaction has one', () => {
+        // Given the same snapshot with the description removed
+        const snapshot = buildSnapshot(false);
+        mockResultsContext = {currentSearchResults: snapshot, shouldUseLiveData: false};
+
+        // When the picker renders
+        render(<SearchColumnsPage />);
+
+        // Then Description stays unchecked, matching a table that does not render the column
+        expect(capturedProps.currentColumns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
+    });
+
+    test('an explicit saved selection wins over the snapshot seed', () => {
+        // Given a saved selection equal to the built-in default set, which omits Description. This is the exact
+        // fixed point that used to make unchecking Description a no-op.
+        const savedColumns = Object.values(CONST.SEARCH.TYPE_DEFAULT_COLUMNS.EXPENSE);
+        onyxData[ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM] = {type: CONST.SEARCH.DATA_TYPES.EXPENSE, columns: savedColumns};
+        const snapshot = buildSnapshot(true);
+        mockResultsContext = {currentSearchResults: snapshot, shouldUseLiveData: false};
+
+        // When the picker renders
+        render(<SearchColumnsPage />);
+
+        // Then the saved selection is authoritative and the data-driven seed is ignored, so unchecking sticks
+        expect(capturedProps.currentColumns).toEqual(savedColumns);
+        expect(capturedProps.currentColumns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
+    });
+
+    test('skips the seed for a grouped search, where it could only ever be empty', () => {
+        // Given a grouped search: getColumnsToShow returns only GROUP_* columns, none of which are selectable here
+        mockQueryContext = {currentSearchKey: undefined, currentSearchQueryJSON: buildGroupedQueryJSON(CONST.SEARCH.GROUP_BY.MERCHANT)};
+        onyxData[ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM] = {type: CONST.SEARCH.DATA_TYPES.EXPENSE, groupBy: CONST.SEARCH.GROUP_BY.MERCHANT};
+        const snapshot = buildSnapshot(true);
+        mockResultsContext = {currentSearchResults: snapshot, shouldUseLiveData: false};
+
+        // When the picker renders
+        render(<SearchColumnsPage />);
+
+        // Then nothing is seeded, leaving ColumnsSettingsList on its own group-defaults fallback
+        expect(capturedProps.currentColumns).toEqual([]);
+    });
+
+    test('waits for the snapshot while a sort is in flight instead of seeding the static defaults', () => {
+        // Given a sort that swapped in a new snapshot the server has not filled yet, while the table still shows
+        // the previous rows
+        mockResultsContext = {currentSearchResults: undefined, shouldUseLiveData: false};
+
+        // When the picker renders
+        render(<SearchColumnsPage />);
+
+        // Then it shows a loading indicator and does not mount the list, which reads its seed only once on mount
+        expect(capturedProps.isLoadingIndicatorShown).toBe(true);
+        expect(capturedProps.currentColumns).toBeUndefined();
+    });
+
+    test('does not wait for the snapshot while offline', () => {
+        // Given the same unfilled snapshot, but offline, where the server will not respond until reconnecting
+        mockIsOffline = true;
+        mockResultsContext = {currentSearchResults: undefined, shouldUseLiveData: false};
+
+        // When the picker renders
+        render(<SearchColumnsPage />);
+
+        // Then the list mounts on its static-defaults fallback rather than spinning indefinitely
+        expect(capturedProps.isLoadingIndicatorShown).toBeUndefined();
+        expect(capturedProps.currentColumns).toEqual([]);
+    });
+});
diff --git a/tests/unit/Search/SearchQueryUtilsTest.ts b/tests/unit/Search/SearchQueryUtilsTest.ts
index cfe2fd320291..afba24aabebf 100644
--- a/tests/unit/Search/SearchQueryUtilsTest.ts
+++ b/tests/unit/Search/SearchQueryUtilsTest.ts
@@ -554,6 +554,31 @@ describe('SearchQueryUtils', () => {
             expect(result).toEqual('type:expense policyID:12345 amount<100');
         });
 
+        test('vendor filter value', () => {
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                vendor: ['Acme', 'none'],
+            };
+
+            const result = buildQueryStringFromFilterFormValues(filterValues);
+
+            expect(result).toEqual('type:expense vendor:Acme,none');
+        });
+
+        test('negated vendor filter value', () => {
+            // Given a filter form that excludes a vendor
+            const filterValues: Partial<SearchAdvancedFiltersForm> = {
+                type: 'expense',
+                vendorNot: ['Acme'],
+            };
+
+            // When the query string is built from the form
+            const result = buildQueryStringFromFilterFormValues(filterValues);
+
+            // Then the vendor filter keeps its negation so the exclusion is not turned into a match
+            expect(result).toEqual('type:expense -vendor:Acme');
+        });
+
         test('receipt type filter value', () => {
             const filterValues: Partial<SearchAdvancedFiltersForm> = {
                 type: 'expense',
@@ -1484,6 +1509,40 @@ describe('SearchQueryUtils', () => {
             });
         });
 
+        test('vendor filter keeps the typed names and the empty value', () => {
+            const queryString = 'sortBy:date sortOrder:desc type:expense vendor:"Acme Tools",none';
+            const queryJSON = buildSearchQueryJSON(queryString);
+
+            if (!queryJSON) {
+                throw new Error('Failed to parse query string');
+            }
+
+            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
+
+            expect(result).toEqual({
+                type: 'expense',
+                vendor: ['Acme Tools', 'none'],
+            });
+        });
+
+        test('negated vendor filter is kept in the negated form key', () => {
+            // Given a typed query that excludes a vendor
+            const queryJSON = buildSearchQueryJSON('sortBy:date sortOrder:desc type:expense -vendor:"Acme Tools"');
+
+            if (!queryJSON) {
+                throw new Error('Failed to parse query string');
+            }
+
+            // When the filter form is built from the query
+            const result = buildFilterFormValuesFromQuery(queryJSON, {}, {}, {}, {}, {}, {});
+
+            // Then the exclusion lands in vendorNot so applying the form keeps it an exclusion
+            expect(result).toEqual({
+                type: 'expense',
+                vendorNot: ['Acme Tools'],
+            });
+        });
+
         test('action filter should be set to undefined if the input value is invalid', () => {
             const policyCategories = {};
             const currencyList = {};
diff --git a/tests/unit/Search/SearchSelectionProviderTest.tsx b/tests/unit/Search/SearchSelectionProviderTest.tsx
index 37d5b8f382c0..465a4982f985 100644
--- a/tests/unit/Search/SearchSelectionProviderTest.tsx
+++ b/tests/unit/Search/SearchSelectionProviderTest.tsx
@@ -1,6 +1,6 @@
 import {act, renderHook} from '@testing-library/react-native';
 
-import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
+import {useSearchSelectionActions, useSearchSelectionContext, useSelectionClearGeneration} from '@components/Search/SearchContext';
 import {SearchQueryContext} from '@components/Search/SearchContextDefinitions';
 import {SearchSelectionProvider, useRowSelection} from '@components/Search/SearchSelectionProvider';
 import type {SearchQueryContextValue, SelectedTransactions} from '@components/Search/types';
@@ -94,9 +94,11 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
     });
 
     it('keeps all-matching active and records a row exclusion', () => {
+        // Given every matching item selected, with two rows loaded
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
 
+        // When one of them is unchecked
         act(() => {
             result.current.actions.applySelection((selectedTransactions) => removeTransaction(selectedTransactions, 'tx_1'), {
                 totalSelectableItemsCount: 2,
@@ -104,6 +106,7 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             });
         });
 
+        // Then the flag stays on and the dropped row is named, which is the only way to say "everything but this"
         expect(result.current.state.areAllMatchingItemsSelected).toBe(true);
         expect(result.current.state.hasSelectedTransactions).toBe(true);
         expect(Object.keys(result.current.state.selectedTransactions)).toEqual(['tx_2']);
@@ -111,9 +114,11 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
     });
 
     it('keeps a semantic selection when every loaded row is excluded and more results exist', () => {
+        // Given every matching item selected, with more results still to page in
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
 
+        // When every row on screen is unchecked
         act(() => {
             result.current.actions.applySelection(() => ({}), {
                 totalSelectableItemsCount: 2,
@@ -121,6 +126,7 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             });
         });
 
+        // Then the selection still means something: an empty map plus exclusions is "every match except these"
         expect(result.current.state.selectedTransactions).toEqual({});
         expect(Object.keys(result.current.state.excludedTransactions)).toEqual(['tx_1', 'tx_2']);
         expect(result.current.state.areAllMatchingItemsSelected).toBe(true);
@@ -128,11 +134,14 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
     });
 
     it('does not visually reselect a lazy child whose parent group is excluded', () => {
+        // Given a group selected under its own key while every matching item is selected
         const {result} = renderSelection();
         act(() => {
             result.current.actions.selectAllMatchingItems(true);
             result.current.actions.setSelectedTransactions(buildSelected('group_1'));
         });
+
+        // When the group is taken back out of the selection
         act(() => {
             result.current.actions.applySelection(() => ({}), {
                 totalSelectableItemsCount: 1,
@@ -140,15 +149,41 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             });
         });
 
+        // Then its children read unchecked, since the group's exclusion covers the rows it stands for
         expect(result.current.state.areAllMatchingItemsSelected).toBe(true);
         expect(Object.keys(result.current.state.excludedTransactions)).toEqual(['group_1']);
         expect(result.current.groupedChildState.isSelected).toBe(false);
     });
 
+    it('shows a child picked back out of an excluded group as selected, since its own entry outranks the group', () => {
+        const {result} = renderSelection();
+
+        // Given every matching item selected, then the group taken back out of it
+        act(() => {
+            result.current.actions.selectAllMatchingItems(true);
+            result.current.actions.setSelectedTransactions(buildSelected('group_1'));
+        });
+        act(() => {
+            result.current.actions.applySelection(() => ({}), {totalSelectableItemsCount: 1, shouldPreserveAllMatchingSelection: true});
+        });
+        expect(result.current.groupedChildState.isSelected).toBe(false);
+
+        // When one of its children is picked on its own
+        act(() => {
+            result.current.actions.applySelection(() => buildSelected('tx_1'), {shouldPreserveAllMatchingSelection: true});
+        });
+
+        // Then it reads selected, and the exclusion that covered it through the group is gone
+        expect(result.current.groupedChildState.isSelected).toBe(true);
+        expect(result.current.state.excludedTransactions.tx_1).toBeUndefined();
+    });
+
     it('clears all-matching selection when every result is excluded', () => {
+        // Given every matching item selected, in a search with nothing left to page in
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
 
+        // When the last row is unchecked
         act(() => {
             result.current.actions.applySelection(() => ({}), {
                 totalSelectableItemsCount: 2,
@@ -157,6 +192,7 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             });
         });
 
+        // Then the flag goes off, rather than a footer advertising every match over a selection the user emptied
         expect(result.current.state.selectedTransactions).toEqual({});
         expect(result.current.state.excludedTransactions).toEqual({});
         expect(result.current.state.areAllMatchingItemsSelected).toBe(false);
@@ -164,6 +200,7 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
     });
 
     it('removes an exclusion when the row is rechecked', () => {
+        // Given a row unchecked out of an all-matching selection, and then checked again
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
         const tx1 = result.current.state.selectedTransactions.tx_1;
@@ -177,6 +214,7 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
                 shouldPreserveAllMatchingSelection: true,
             });
         });
+        // When it is put back
         act(() => {
             result.current.actions.applySelection(
                 (selectedTransactions) => {
@@ -191,12 +229,14 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             );
         });
 
+        // Then nothing is left excluded, or a bulk action would skip the row the user just re-checked
         expect(result.current.state.areAllMatchingItemsSelected).toBe(true);
         expect(Object.keys(result.current.state.excludedTransactions)).toEqual([]);
         expect(Object.keys(result.current.state.selectedTransactions)).toEqual(['tx_2', 'tx_1']);
     });
 
     it('atomically refreshes and prunes exclusions during data reconciliation', () => {
+        // Given a row excluded from an all-matching selection
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
 
@@ -207,6 +247,7 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             });
         });
 
+        // When a data push rebuilds that exclusion with a new amount, and later prunes it
         const refreshedExclusion = buildSelected('tx_1');
         if (!refreshedExclusion.tx_1) {
             throw new Error('Expected tx_1 exclusion fixture');
@@ -216,6 +257,7 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             result.current.actions.applySelection((selectedTransactions) => selectedTransactions, {reconciledExcludedTransactions: refreshedExclusion});
         });
 
+        // Then the exclusion follows the live row, and the flag survives both commits
         expect(result.current.state.excludedTransactions.tx_1?.amount).toBe(500);
         expect(result.current.state.areAllMatchingItemsSelected).toBe(true);
 
@@ -228,9 +270,11 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
     });
 
     it('exits all-matching and clears exclusions when the header deselects all', () => {
+        // Given an all-matching selection carrying one exclusion
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
 
+        // When the header checkbox clears everything, which commits without asking to preserve the flag
         act(() => {
             result.current.actions.applySelection((selectedTransactions) => removeTransaction(selectedTransactions, 'tx_1'), {
                 totalSelectableItemsCount: 2,
@@ -241,12 +285,14 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             result.current.actions.applySelection(() => ({}), {totalSelectableItemsCount: 2});
         });
 
+        // Then the flag and its exclusions go together, rather than leaving exclusions nothing is selected against
         expect(result.current.state.areAllMatchingItemsSelected).toBe(false);
         expect(result.current.state.selectedTransactions).toEqual({});
         expect(result.current.state.excludedTransactions).toEqual({});
     });
 
     it('clears exclusions when selection is cleared or a new all-matching session starts', () => {
+        // Given an all-matching selection carrying one exclusion
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
 
@@ -256,18 +302,22 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
                 shouldPreserveAllMatchingSelection: true,
             });
         });
+        // When a fresh all-matching session starts, the exclusions it overrode are gone
         act(() => result.current.actions.selectAllMatchingItems(true));
         expect(result.current.state.excludedTransactions).toEqual({});
 
+        // Then a clear takes the flag with it, so nothing survives to be subtracted from the next selection
         act(() => result.current.actions.clearSelectedTransactions());
         expect(result.current.state.areAllMatchingItemsSelected).toBe(false);
         expect(result.current.state.excludedTransactions).toEqual({});
     });
 
     it('retains ordinary page-selection behavior', () => {
+        // Given two rows picked on the page, with no all-matching selection behind them
         const {result} = renderSelection();
         act(() => result.current.actions.setSelectedTransactions(buildSelected('tx_1', 'tx_2')));
 
+        // When one is unchecked
         act(() => {
             result.current.actions.applySelection((selectedTransactions) => removeTransaction(selectedTransactions, 'tx_1'), {
                 totalSelectableItemsCount: 2,
@@ -275,16 +325,19 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             });
         });
 
+        // Then it simply leaves the map: exclusions are for all-matching, the one state that can carry them
         expect(result.current.state.areAllMatchingItemsSelected).toBe(false);
         expect(Object.keys(result.current.state.selectedTransactions)).toEqual(['tx_2']);
         expect(result.current.state.excludedTransactions).toEqual({});
     });
 
     it('preserves an all-matching expense-report selection when a report is deselected', () => {
+        // Given an all-matching selection in a Reports search, where a row is a whole report
         mockCurrentSearchQueryJSON = expenseReportQueryJSON;
         const {result} = renderSelection();
         seedAllMatchingSelection(result);
 
+        // When a report is deselected, which commits without asking to preserve the flag
         act(() => {
             result.current.actions.applySelection((selectedTransactions) => removeTransaction(selectedTransactions, 'tx_1'), {
                 totalSelectableItemsCount: 2,
@@ -292,18 +345,66 @@ describe('SearchSelectionProvider all-matching exclusions', () => {
             });
         });
 
+        // Then the flag stands and the report is recorded as an exclusion, which is what a Reports search can express now
         expect(result.current.state.areAllMatchingItemsSelected).toBe(true);
         expect(Object.keys(result.current.state.selectedTransactions)).toEqual(['tx_2']);
         expect(Object.keys(result.current.state.excludedTransactions)).toEqual(['tx_1']);
     });
 
     it('keeps an empty loaded expense-report selection active while all matching reports are selected', () => {
+        // Given a Reports search with nothing loaded
         mockCurrentSearchQueryJSON = expenseReportQueryJSON;
         const {result} = renderSelection();
 
+        // When every matching item is selected from the menu
         act(() => result.current.actions.selectAllMatchingItems(true));
 
+        // Then the flag is on while nothing is loaded to act on, which is what the bulk bar reads
         expect(result.current.state.areAllMatchingItemsSelected).toBe(true);
         expect(result.current.state.hasSelectedTransactions).toBe(true);
     });
 });
+
+describe('SearchSelectionProvider clear generation', () => {
+    function renderClearGeneration() {
+        return renderHook(() => ({state: useSearchSelectionContext(), actions: useSearchSelectionActions(), clearGeneration: useSelectionClearGeneration()}), {wrapper});
+    }
+
+    it('moves only when a clear empties the search selection, so a no-op clear cannot end a range session', () => {
+        // Given nothing selected
+        const {result} = renderClearGeneration();
+
+        // When a clear finds nothing to clear, on either surface
+        act(() => result.current.actions.clearSelectedTransactions(true));
+        act(() => result.current.actions.clearSelectedTransactions());
+
+        // Then the counter stays where it was
+        expect(result.current.clearGeneration).toBe(0);
+    });
+
+    it('stays put when the ID list is cleared, since that is the report list’s selection and not the one it speaks for', () => {
+        // Given rows selected by ID, which only the report list reads
+        const {result} = renderClearGeneration();
+        act(() => result.current.actions.setSelectedTransactions(['tx_1']));
+
+        // When that list is cleared
+        act(() => result.current.actions.clearSelectedTransactions(true));
+
+        // Then the IDs go, and no range over the search rows is told to end
+        expect(result.current.state.selectedTransactionIDs).toEqual([]);
+        expect(result.current.clearGeneration).toBe(0);
+    });
+
+    it('moves when the search selection is emptied, which is what a range over those rows can no longer narrow', () => {
+        // Given rows selected in the search
+        const {result} = renderClearGeneration();
+        act(() => result.current.actions.setSelectedTransactions(buildSelected('tx_1')));
+
+        // When the selection is cleared
+        act(() => result.current.actions.clearSelectedTransactions());
+
+        // Then the counter moves once
+        expect(result.current.state.selectedTransactions).toEqual({});
+        expect(result.current.clearGeneration).toBe(1);
+    });
+});
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index 4f74dc81ab82..37522537bcc0 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -12052,6 +12052,33 @@ describe('SearchUIUtils', () => {
             expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
         });
 
+        test('Should honor an explicit column selection that matches the default set', () => {
+            // Given a transaction that has a description, which the data-driven fallback would turn the Description column on for
+            const baseTransaction = searchResults.data[`transactions_${transactionID}`];
+            const descriptionTransaction = {
+                ...baseTransaction,
+                transactionID: 'description',
+                merchant: '',
+                modifiedMerchant: '',
+                comment: {comment: 'Business meeting lunch'},
+                category: '',
+                tag: '',
+                managerID: submitterAccountID,
+            };
+
+            // When the user has explicitly saved a selection that happens to be element-for-element the default set,
+            // which is what unchecking Description leaves behind
+            const columns = SearchUIUtils.getColumnsToShow({
+                currentAccountID: submitterAccountID,
+                data: [descriptionTransaction],
+                visibleColumns: Object.values(CONST.SEARCH.TYPE_DEFAULT_COLUMNS.EXPENSE),
+            });
+
+            // Then the selection wins and Description stays hidden instead of being re-added from the data
+            expect(columns).not.toContain(CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION);
+            expect(columns).toContain(CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT);
+        });
+
         test('Should respect isExpenseReportView flag and not show From/To columns', () => {
             // Create transaction with different users using existing transaction as base
             const baseTransaction = searchResults.data[`transactions_${transactionID}`];
@@ -12785,6 +12812,7 @@ describe('SearchUIUtils', () => {
             personalDetails,
             isSelfTourViewed: false,
             hasCompletedGuidedSetupFlow: true,
+            delegateAccountID: undefined,
             IOUTransactionID: threadReportID,
         };
 
@@ -12936,7 +12964,7 @@ describe('SearchUIUtils', () => {
 
         it('Should create an optimistic parent report if the hasParentReport is false', async () => {
             const transactionListItem = getTransactionListItem(0);
-            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasParentReport: false}, getCurrencyDecimalsLocal);
+            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasParentReport: false}, getCurrencyDecimalsLocal, undefined);
 
             await waitForBatchedUpdates();
 
@@ -12948,7 +12976,7 @@ describe('SearchUIUtils', () => {
 
         it('Should create an optimistic parent report action if the hasParentReportAction is false', async () => {
             const transactionListItem = getTransactionListItem(0);
-            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasParentReportAction: false}, getCurrencyDecimalsLocal);
+            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasParentReportAction: false}, getCurrencyDecimalsLocal, undefined);
 
             await waitForBatchedUpdates();
 
@@ -12958,9 +12986,26 @@ describe('SearchUIUtils', () => {
             expect(parentReportAction).toBeTruthy();
         });
 
+        it('Should set delegateAccountID on the optimistic parent report action', async () => {
+            // Given a transaction opened from Search by a copilot
+            const transactionListItem = getTransactionListItem(0);
+            const delegateAccountID = 99;
+
+            // When the optimistic parent report action is built
+            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasParentReportAction: false}, getCurrencyDecimalsLocal, delegateAccountID);
+
+            await waitForBatchedUpdates();
+
+            // Then it carries the copilot so the "on behalf of" label renders before the API responds
+            const parentReport = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionListItem.reportID}`);
+            const parentReportAction = transactionListItem?.reportAction?.reportActionID && parentReport?.[transactionListItem?.reportAction?.reportActionID];
+
+            expect(parentReportAction).toMatchObject({delegateAccountID});
+        });
+
         it('Should create an optimistic transaction if the hasTransaction is false', async () => {
             const transactionListItem = getTransactionListItem(0);
-            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasTransaction: false}, getCurrencyDecimalsLocal);
+            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasTransaction: false}, getCurrencyDecimalsLocal, undefined);
 
             await waitForBatchedUpdates();
 
@@ -12971,7 +13016,7 @@ describe('SearchUIUtils', () => {
 
         it('Should create an optimistic transaction thread if the hasTransactionThreadReport is false', async () => {
             const transactionListItem = getTransactionListItem(0);
-            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasTransactionThreadReport: false}, getCurrencyDecimalsLocal, '456');
+            setOptimisticDataForTransactionThreadPreview(transactionListItem, {...transactionPreviewData, hasTransactionThreadReport: false}, getCurrencyDecimalsLocal, undefined, '456');
 
             await waitForBatchedUpdates();
 
@@ -13179,7 +13224,7 @@ describe('SearchUIUtils', () => {
 
             await Onyx.merge(ONYXKEYS.SESSION, {accountID: TEST_ACCOUNT_ID});
 
-            expect(SearchUIUtils.shouldShowDeleteOption(selectedTransactions, currentSearchResults, TEST_ACCOUNT_ID, undefined)).toBe(true);
+            expect(SearchUIUtils.shouldShowDeleteOption(selectedTransactions, currentSearchResults, TEST_ACCOUNT_ID, undefined, undefined)).toBe(true);
         });
 
         it('should show delete option for unreported expense which can be deleted', async () => {
@@ -13365,7 +13410,7 @@ describe('SearchUIUtils', () => {
 
             await Onyx.merge(ONYXKEYS.SESSION, {accountID: TEST_ACCOUNT_ID});
 
-            expect(SearchUIUtils.shouldShowDeleteOption(selectedTransactions, currentSearchResults, TEST_ACCOUNT_ID, undefined)).toBe(true);
+            expect(SearchUIUtils.shouldShowDeleteOption(selectedTransactions, currentSearchResults, TEST_ACCOUNT_ID, undefined, undefined)).toBe(true);
         });
     });
     describe('getToFieldValueForTransaction', () => {
diff --git a/tests/unit/Search/applyShiftRangeBatchToSelectionTest.ts b/tests/unit/Search/applyShiftRangeBatchToSelectionTest.ts
new file mode 100644
index 000000000000..44a6313911b8
--- /dev/null
+++ b/tests/unit/Search/applyShiftRangeBatchToSelectionTest.ts
@@ -0,0 +1,267 @@
+import type {SearchListItem, TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
+import {applyShiftRangeBatchToSelection, mapEmptyReportToSelectedEntry, mapTransactionItemToSelectedEntry} from '@components/Search/selectionBuilders';
+import type {SelectedTransactionInfo, SelectedTransactions} from '@components/Search/types';
+
+import type {ShiftRangeBatch} from '@libs/shiftRangeSelection';
+
+import CONST from '@src/CONST';
+
+import {buildCategoryGroup as makeGroup, buildReportGroup, buildTransactionRow as makeChild} from '../../utils/collections/searchListItems';
+
+/**
+ * The engine keeps rows being deleted out of a batch, so several of these hand the writer one anyway. That is the
+ * point of testing it directly: the guards exist so the two halves cannot drift, not because a caller reaches them.
+ */
+const buildEntry = (item: TransactionListItemType): [string, SelectedTransactionInfo] =>
+    mapTransactionItemToSelectedEntry({
+        item,
+        itemTransaction: undefined,
+        originalItemTransaction: undefined,
+        currentUserLogin: 'a@b.com',
+        currentUserAccountID: 1,
+        reportNameValuePairs: undefined,
+        outstandingReportsByPolicyID: undefined,
+        selfDMReport: undefined,
+        allowNegativeAmount: true,
+        parentReport: undefined,
+        rules: undefined,
+    });
+
+const lookupsFor = (groupKeyByChildKey: Map<string, string> = new Map(), childrenByGroupKey: Map<string, TransactionListItemType[]> = new Map()) => ({
+    groupKeyByChildKey,
+    childrenByGroupKey,
+    buildSelectedEntry: buildEntry,
+    getGroupCount: () => undefined,
+});
+
+const batchOf = (toSelect: SearchListItem[] = [], toDeselect: SearchListItem[] = []): ShiftRangeBatch<SearchListItem> => ({toSelect, toDeselect});
+
+const selectionOf = (...items: TransactionListItemType[]): SelectedTransactions => Object.fromEntries(items.map(buildEntry));
+
+describe('applyShiftRangeBatchToSelection', () => {
+    it('commits a group written out into its rows even when the row it was asked to drop has none to drop', () => {
+        // Given a group selected under its own key, whose loaded rows are one ordinary row and one being deleted
+        const kept = makeChild(1, 'c1');
+        const deleted = {...makeChild(2, 'c2'), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        const group = makeGroup('groupA', [kept, deleted]);
+        const [groupKey, groupEntry] = mapEmptyReportToSelectedEntry(group);
+        const lookups = lookupsFor(new Map([['c2', 'groupA']]), new Map([['groupA', [kept, deleted]]]));
+
+        // When a range gives back the row being deleted, which the group never held an entry for
+        const updated = applyShiftRangeBatchToSelection(batchOf([], [deleted]), {[groupKey]: groupEntry}, false, lookups);
+
+        // Then the write survives: the group is spelled out into the row it does hold, rather than the batch bailing on identity
+        expect(updated.groupA).toBeUndefined();
+        expect(updated.c1?.groupKey).toBe('groupA');
+    });
+
+    it('selects the rows a range covers', () => {
+        // Given an empty selection and two rows a range spans
+        const first = makeChild(1, 't1');
+        const second = makeChild(2, 't2');
+
+        // When the batch is applied
+        const updated = applyShiftRangeBatchToSelection(batchOf([first, second]), {}, false, lookupsFor());
+
+        // Then both are selected, which is the half of a range that never changes
+        expect(Object.keys(updated).sort()).toEqual(['t1', 't2']);
+    });
+
+    it('gives back the rows a range no longer covers', () => {
+        // Given both rows selected by an earlier span
+        const first = makeChild(1, 't1');
+        const second = makeChild(2, 't2');
+
+        // When the range shrinks onto the first, handing the second back
+        const updated = applyShiftRangeBatchToSelection(batchOf([first], [second]), selectionOf(first, second), false, lookupsFor());
+
+        // Then only the row still covered stays, which is what makes an overshoot recoverable in one click
+        expect(Object.keys(updated)).toEqual(['t1']);
+    });
+
+    it('returns the map it was given when the batch writes nothing, so the commit bails on identity', () => {
+        // Given a row already selected exactly as the range would write it
+        const first = makeChild(1, 't1');
+        const selection = selectionOf(first);
+
+        // When a range re-covers it
+        // Then the same map comes back: an equal map would re-render every row in the list
+        expect(applyShiftRangeBatchToSelection(batchOf([first]), selection, false, lookupsFor())).toBe(selection);
+    });
+
+    it('counts no write when it is asked to give back rows the selection never held', () => {
+        // Given a selection that does not hold the row the batch gives back
+        const absent = makeChild(9, 'gone');
+        const selection = selectionOf(makeChild(1, 't1'));
+
+        // When the batch is applied
+        // Then nothing is committed, since dropping a key that was never there changes nothing
+        expect(applyShiftRangeBatchToSelection(batchOf([], [absent]), selection, false, lookupsFor())).toBe(selection);
+    });
+
+    it('refuses a row being deleted, even handed one directly', () => {
+        // Given a row on its way out, which the engine would never put in a batch
+        const deleted = {...makeChild(1, 't1'), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+
+        // When the writer is handed it anyway
+        // Then it selects nothing, so the two halves cannot drift on what a selectable row is
+        expect(applyShiftRangeBatchToSelection(batchOf([deleted]), {}, false, lookupsFor())).toEqual({});
+    });
+
+    it('refuses an empty report being deleted, which is the one row kind the transaction check cannot cover', () => {
+        // Given a report row with no expenses of its own, being deleted
+        const deletedReport = {...buildReportGroup(1, 'report-1'), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+
+        // When a range covers it
+        // Then it stays out of the selection, since the row-level check reads transactions it does not have
+        expect(applyShiftRangeBatchToSelection(batchOf([deletedReport]), {}, false, lookupsFor())).toEqual({});
+    });
+
+    it('selects an empty report under its own key, which is the only key it has', () => {
+        // Given a report row carrying no expenses
+        const report = buildReportGroup(1, 'report-1');
+
+        // When a range covers it
+        const updated = applyShiftRangeBatchToSelection(batchOf([report]), {}, false, lookupsFor());
+
+        // Then it is stored under the report's key, the same way clicking that row stores it
+        expect(Object.keys(updated)).toEqual(['report-1']);
+    });
+
+    it('marks a whole group row it covers as selected through the group, so a later range may narrow it', () => {
+        // Given a group row with one child
+        const child = makeChild(1, 'c1');
+        const group = makeGroup('groupA', [child]);
+
+        // When a range covers the group row itself
+        const updated = applyShiftRangeBatchToSelection(batchOf([group]), {}, false, lookupsFor());
+
+        // Then its children carry the selection and the group's own key does not, exactly as a header click writes it
+        expect(updated.c1?.isSelectedViaGroup).toBe(true);
+        expect(updated.c1?.groupKey).toBe('groupA');
+        expect(updated.groupA).toBeUndefined();
+    });
+
+    it('leaves a group carrying only rows it cannot select exactly as it was', () => {
+        // Given a group whose only row is being deleted
+        const deleted = {...makeChild(1, 'c1'), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        const group = makeGroup('groupA', [deleted]);
+        const selection = selectionOf(makeChild(2, 't2'));
+
+        // When a range covers that group
+        // Then the same map comes back, rather than an equal one that re-renders every row for nothing
+        expect(applyShiftRangeBatchToSelection(batchOf([group]), selection, false, lookupsFor())).toBe(selection);
+    });
+
+    it('stops a row claiming its group covers it once the range takes only part of that group', () => {
+        // Given two rows checked through their group
+        const kept = makeChild(1, 'c1');
+        const dropped = makeChild(2, 'c2');
+        const selection: SelectedTransactions = {
+            ...selectionOf(kept, dropped),
+        };
+        selection.c1 = {...selection.c1, groupKey: 'groupA', isSelectedViaGroup: true};
+        selection.c2 = {...selection.c2, groupKey: 'groupA', isSelectedViaGroup: true};
+
+        // When a range gives back one of the two rows the group covered
+        const updated = applyShiftRangeBatchToSelection(batchOf([], [dropped]), selection, false, lookupsFor(new Map([['c2', 'groupA']])));
+
+        // Then the row left behind stops claiming the group covers it, or an export would send a whole-group filter
+        expect(updated.c2).toBeUndefined();
+        expect(updated.c1?.isSelectedViaGroup).toBe(false);
+        expect(updated.c1?.groupKey).toBe('groupA');
+    });
+
+    it('keeps the claim on rows a range only re-covers, since it took none of them back', () => {
+        // Given two rows selected through their group's header
+        const first = makeChild(1, 'c1');
+        const second = makeChild(2, 'c2');
+        const selection: SelectedTransactions = {...selectionOf(first, second)};
+        selection.c1 = {...selection.c1, groupKey: 'groupA', isSelectedViaGroup: true};
+        selection.c2 = {...selection.c2, groupKey: 'groupA', isSelectedViaGroup: true};
+
+        // When a range covers both of them again and gives nothing back
+        const updated = applyShiftRangeBatchToSelection(
+            batchOf([first, second]),
+            selection,
+            false,
+            lookupsFor(
+                new Map([
+                    ['c1', 'groupA'],
+                    ['c2', 'groupA'],
+                ]),
+            ),
+        );
+
+        // Then both still claim the group, so an export keeps sending the group filter that reaches its unloaded rows
+        expect(updated.c1?.isSelectedViaGroup).toBe(true);
+        expect(updated.c2?.isSelectedViaGroup).toBe(true);
+    });
+
+    it('drops the claim when the same batch re-covers one row of a group and gives another back', () => {
+        // Given two rows selected through their group's header
+        const kept = makeChild(1, 'c1');
+        const dropped = makeChild(2, 'c2');
+        const selection: SelectedTransactions = {...selectionOf(kept, dropped)};
+        selection.c1 = {...selection.c1, groupKey: 'groupA', isSelectedViaGroup: true};
+        selection.c2 = {...selection.c2, groupKey: 'groupA', isSelectedViaGroup: true};
+
+        // When a range narrows onto the first, re-covering it and giving the second back
+        const updated = applyShiftRangeBatchToSelection(
+            batchOf([kept], [dropped]),
+            selection,
+            false,
+            lookupsFor(
+                new Map([
+                    ['c1', 'groupA'],
+                    ['c2', 'groupA'],
+                ]),
+            ),
+        );
+
+        // Then the re-covered row stops claiming the group, because the group is no longer whole
+        expect(updated.c2).toBeUndefined();
+        expect(updated.c1?.isSelectedViaGroup).toBe(false);
+    });
+
+    it('keeps the claim when the range takes the whole group, since nothing was left behind', () => {
+        // Given a group whose every row the range covers
+        const child = makeChild(1, 'c1');
+        const group = makeGroup('groupA', [child]);
+
+        // When the batch is applied
+        const updated = applyShiftRangeBatchToSelection(batchOf([group]), {}, false, lookupsFor(new Map([['c1', 'groupA']])));
+
+        // Then the whole-group claim stands, since it is a whole-group gesture and an export may send one filter
+        expect(updated.c1?.isSelectedViaGroup).toBe(true);
+    });
+
+    it('writes a group held under its own key out into its rows before dropping one of them', () => {
+        // Given a group selected while collapsed, whose rows have since arrived
+        const kept = makeChild(1, 'c1');
+        const dropped = makeChild(2, 'c2');
+        const [groupKey, groupEntry] = mapEmptyReportToSelectedEntry(makeGroup('groupA', []));
+        const selection: SelectedTransactions = {[groupKey]: groupEntry};
+
+        // When a range gives back one of the rows that have since arrived under it
+        const updated = applyShiftRangeBatchToSelection(batchOf([], [dropped]), selection, false, lookupsFor(new Map([['c2', 'groupA']]), new Map([['groupA', [kept, dropped]]])));
+
+        // Then the row it kept is named, rather than the group's entry standing for rows it no longer covers
+        expect(updated.groupA).toBeUndefined();
+        expect(updated.c1?.groupKey).toBe('groupA');
+        expect(updated.c2).toBeUndefined();
+    });
+
+    it('leaves a group held under its own key alone under select-all-matching, where its rows are not known', () => {
+        // Given a group selected under its own key while every matching item is selected
+        const dropped = makeChild(2, 'c2');
+        const [groupKey, groupEntry] = mapEmptyReportToSelectedEntry(makeGroup('groupA', []));
+        const selection: SelectedTransactions = {[groupKey]: groupEntry};
+
+        // When a range gives back one of its rows
+        const updated = applyShiftRangeBatchToSelection(batchOf([], [dropped]), selection, true, lookupsFor(new Map([['c2', 'groupA']]), new Map([['groupA', [dropped]]])));
+
+        // Then the group stays whole: writing it out here would record the rows that never loaded as deselected
+        expect(updated.groupA).toBeDefined();
+    });
+});
diff --git a/tests/unit/Search/buildShiftRangeSourceTest.ts b/tests/unit/Search/buildShiftRangeSourceTest.ts
new file mode 100644
index 000000000000..ebfb8804ab77
--- /dev/null
+++ b/tests/unit/Search/buildShiftRangeSourceTest.ts
@@ -0,0 +1,208 @@
+import {buildShiftRangeSource, getGroupCheckboxState, isGroupSelected, mapEmptyReportToSelectedEntry} from '@components/Search/selectionBuilders';
+import type {SearchData, SelectedTransactions} from '@components/Search/types';
+
+import CONST from '@src/CONST';
+
+import {buildCategoryGroup as makeGroup, buildTransactionRow as makeChild} from '../../utils/collections/searchListItems';
+
+const openGroups = (...keys: string[]): ReadonlySet<string> => new Set(keys);
+
+const NO_OPEN_GROUPS = openGroups();
+
+describe('buildShiftRangeSource: the rows a range spans', () => {
+    it('passes flat (non-grouped) data through unchanged', () => {
+        // Given a flat search, where every row is already its own selectable unit
+        const filteredData: SearchData = [makeChild(1, 't1'), makeChild(2, 't2')];
+
+        // When the range source is built with no flattening asked for
+        // Then the same array comes back, so a flat list costs no copy per render
+        expect(buildShiftRangeSource(filteredData, NO_OPEN_GROUPS, false).items).toBe(filteredData);
+    });
+
+    it('follows each open group with the rows it carries, in the order the list renders them', () => {
+        // Given two expanded groups
+        const childA1 = makeChild(1, 'a1');
+        const childA2 = makeChild(2, 'a2');
+        const childB1 = makeChild(3, 'b1');
+        const groupA = makeGroup('groupA', [childA1, childA2]);
+        const groupB = makeGroup('groupB', [childB1]);
+        const filteredData: SearchData = [groupA, groupB];
+
+        // When the range source is built
+        // Then it is the list as the screen shows it, since a range spans what the user sees between two clicks
+        expect(buildShiftRangeSource(filteredData, openGroups('groupA', 'groupB'), true).items).toEqual([groupA, childA1, childA2, groupB, childB1]);
+    });
+
+    it('skips the rows a closed group still carries, since a range must not reach what is off screen', () => {
+        // Given a collapsed group that still holds the rows it loaded earlier
+        const group = makeGroup('groupA', [makeChild(1, 'x'), makeChild(2, 'y')]);
+        const filteredData: SearchData = [group];
+
+        // When the range source is built
+        // Then only the header is in it: openness is the gate, not whether the rows are known
+        expect(buildShiftRangeSource(filteredData, NO_OPEN_GROUPS, true).items).toEqual([group]);
+    });
+
+    it('resolves each group independently, so an open group contributes its rows and a closed one contributes none', () => {
+        // Given one expanded group and one collapsed group
+        const openChild = makeChild(1, 'open1');
+        const openGroup = makeGroup('groupA', [openChild]);
+        const closedGroup = makeGroup('groupB', [makeChild(2, 'closed1')]);
+        const filteredData: SearchData = [openGroup, closedGroup];
+
+        // When the range source is built
+        // Then each answers for itself, rather than one group's state deciding for the list
+        expect(buildShiftRangeSource(filteredData, openGroups('groupA'), true).items).toEqual([openGroup, openChild, closedGroup]);
+    });
+
+    it('contributes nothing for an open group whose rows have not arrived, rather than guessing at them', () => {
+        // Given an expanded group whose children are still being fetched
+        const group = makeGroup('groupA');
+        const filteredData: SearchData = [group];
+
+        // When the range source is built
+        // Then it holds the header alone, since a range can only span rows the list actually has
+        expect(buildShiftRangeSource(filteredData, openGroups('groupA'), true).items).toEqual([group]);
+    });
+
+    it('does not flatten when groups are the selectable unit (groupsAreHeaders=false, e.g. expense-report views): rows pass through unchanged', () => {
+        // Given an expense-report view, where the report row is what a click selects
+        const filteredData: SearchData = [makeGroup('groupA', [makeChild(1, 'a1')])];
+
+        // When the range source is built without treating groups as headers
+        // Then the rows pass through, so a range spans reports rather than the expenses inside them
+        expect(buildShiftRangeSource(filteredData, openGroups('groupA'), false).items).toBe(filteredData);
+    });
+});
+
+describe('isGroupSelected', () => {
+    const child = makeChild(1, 'c1');
+
+    /** Entries are only ever read for `isSelected`, so the empty-report builder supplies a fully typed one. */
+    function selectionOf(...keys: string[]): SelectedTransactions {
+        const [, entry] = mapEmptyReportToSelectedEntry(makeGroup('anyGroup'));
+        return Object.fromEntries(keys.map((key) => [key, entry]));
+    }
+
+    const groupOf = (selectedTransactions: SelectedTransactions, overrides: Partial<Parameters<typeof isGroupSelected>[0]> = {}) => ({
+        groupKey: 'groupA',
+        children: [child],
+        selectedTransactions,
+        excludedTransactions: {},
+        areAllMatchingItemsSelected: false,
+        ...overrides,
+    });
+
+    it('counts a group selected under its own key, which is how it is stored before its children load', () => {
+        // Given a group selected while collapsed, so the selection sits under the group's own key
+        // When the header is asked what a click means
+        // Then it means deselect, since its rows read as checked through that entry
+        expect(isGroupSelected(groupOf(selectionOf('groupA')))).toBe(true);
+    });
+
+    it('counts a group with any child selected', () => {
+        // Given one child of the group checked
+        // When the header is asked what a click means
+        // Then it means deselect, which is what a partially checked header does
+        expect(isGroupSelected(groupOf(selectionOf('c1')))).toBe(true);
+    });
+
+    it('does not count a group whose key and children are both unselected', () => {
+        // Given a selection holding some other row
+        // When the header is asked
+        // Then a click means select, since nothing under it reads as checked
+        expect(isGroupSelected(groupOf(selectionOf('other')))).toBe(false);
+    });
+
+    it('counts a group whose rows are checked by select-all-matching alone, which is what the user is looking at', () => {
+        // Given every matching item selected, so the rows are checked with no entry of their own
+        // When the header is asked
+        // Then it means deselect, because the click has to answer to what the checkbox shows
+        expect(isGroupSelected(groupOf({}, {areAllMatchingItemsSelected: true}))).toBe(true);
+    });
+
+    it('counts a group with no loaded rows that select-all-matching covers, the same as its checkbox does', () => {
+        // Given a group carrying no rows yet, under select-all-matching
+        // When the header is asked
+        // Then it answers from its own key, which is all there is to ask
+        expect(isGroupSelected(groupOf({}, {children: [], areAllMatchingItemsSelected: true}))).toBe(true);
+    });
+
+    it('does not count a loaded group whose rows are all excluded, even though select-all-matching still covers its own key', () => {
+        // Given a group whose every loaded row has been taken back out of an all-matching selection
+        const params = groupOf({}, {areAllMatchingItemsSelected: true, excludedTransactions: selectionOf('c1')});
+
+        // When the header is asked, and the checkbox is drawn
+        // Then both read unchecked, so the click can check the group again rather than deselecting it twice
+        expect(isGroupSelected(params)).toBe(false);
+        expect(getGroupCheckboxState(params).isSelectAllChecked).toBe(false);
+    });
+
+    it('ignores a row being deleted, so clicking the header cannot mean deselect while the checkbox reads unchecked', () => {
+        // Given a group whose only checked row is on its way out
+        const deletedChild = {...child, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        const params = groupOf(selectionOf('c1'), {children: [deletedChild]});
+
+        // When the header is asked, and the checkbox is drawn
+        // Then neither counts that row, since the user cannot act on it
+        expect(isGroupSelected(params)).toBe(false);
+        expect(getGroupCheckboxState(params).isSelectAllChecked).toBe(false);
+    });
+
+    it('stops answering from its own key once it carries rows, so a group holding only deleted ones reads the same to both', () => {
+        // Given a group selected while collapsed whose rows have since arrived, all being deleted
+        const deletedChild = {...child, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        const params = groupOf(selectionOf('groupA'), {children: [deletedChild]});
+
+        // When the header is asked, and the checkbox is drawn
+        // Then the rows decide and both read unchecked, rather than the stale key making the click a no-op
+        expect(isGroupSelected(params)).toBe(false);
+        expect(getGroupCheckboxState(params).isSelectAllChecked).toBe(false);
+    });
+});
+
+describe('buildShiftRangeSource: who owns each row', () => {
+    it('indexes each child against the group it is rendered under, and indexes nothing for a closed group', () => {
+        // Given one expanded group and one collapsed group
+        const openChild1 = makeChild(1, 'open1');
+        const openChild2 = makeChild(2, 'open2');
+        const openGroup = makeGroup('groupA', [openChild1, openChild2]);
+        const closedGroup = makeGroup('groupB', [makeChild(3, 'closed1')]);
+        const filteredData: SearchData = [openGroup, closedGroup];
+
+        // When the range source is built
+        const {childrenByGroupKey, groupKeyByChildKey} = buildShiftRangeSource(filteredData, openGroups('groupA'), true);
+
+        // Then a write knows the parent of every row a range can reach, and nothing about the rows it cannot
+        expect(childrenByGroupKey.get('groupA')).toEqual([openChild1, openChild2]);
+        expect(childrenByGroupKey.get('groupB')).toEqual([]);
+        expect(groupKeyByChildKey.get('open1')).toBe('groupA');
+        expect(groupKeyByChildKey.get('open2')).toBe('groupA');
+        expect(groupKeyByChildKey.has('closed1')).toBe(false);
+    });
+
+    it('indexes the same children the range spans, so the two cannot disagree about who owns a row', () => {
+        // Given an expanded group with one child
+        const child = makeChild(1, 'c1');
+        const filteredData: SearchData = [makeGroup('groupA', [child])];
+
+        // When the range source is built
+        const {groupKeyByChildKey} = buildShiftRangeSource(filteredData, openGroups('groupA'), true);
+
+        // Then the row a range spans is the row the index owns: one pass, so a row cannot be stored under another parent
+        expect(buildShiftRangeSource(filteredData, openGroups('groupA'), true).items.at(-1)).toBe(child);
+        expect(groupKeyByChildKey.get('c1')).toBe('groupA');
+    });
+
+    it('is empty where groups are the selectable unit, since those rows own no children in the list', () => {
+        // Given an expense-report view
+        const filteredData: SearchData = [makeGroup('groupA', [makeChild(1, 'a1')])];
+
+        // When the range source is built without treating groups as headers
+        const {childrenByGroupKey, groupKeyByChildKey} = buildShiftRangeSource(filteredData, openGroups('groupA'), false);
+
+        // Then there is nothing to own: the report row is itself what a click selects
+        expect(childrenByGroupKey.size).toBe(0);
+        expect(groupKeyByChildKey.size).toBe(0);
+    });
+});
diff --git a/tests/unit/Search/clearSelectionOnQueryChangeTest.tsx b/tests/unit/Search/clearSelectionOnQueryChangeTest.tsx
new file mode 100644
index 000000000000..bae1e7b43f41
--- /dev/null
+++ b/tests/unit/Search/clearSelectionOnQueryChangeTest.tsx
@@ -0,0 +1,94 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import {useSearchSelectionActions, useSearchSelectionContext} from '@components/Search/SearchContext';
+import {SearchQueryContext} from '@components/Search/SearchContextDefinitions';
+import {SearchSelectionProvider} from '@components/Search/SearchSelectionProvider';
+import type {SearchQueryContextValue} from '@components/Search/types';
+import Text from '@components/Text';
+
+import {buildSearchQueryJSON} from '@libs/SearchQueryUtils';
+
+import CONST from '@src/CONST';
+import {getEmptyObject} from '@src/types/utils/EmptyObject';
+
+import React, {useEffect} from 'react';
+
+const queryJSON = buildSearchQueryJSON('type:expense');
+if (!queryJSON) {
+    throw new Error('Expected the search query to be valid');
+}
+
+const buildQueryContext = (currentSearchHash: number): SearchQueryContextValue => ({
+    currentSearchHash,
+    currentSimilarSearchHash: currentSearchHash,
+    currentSearchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES,
+    currentSearchQueryJSON: queryJSON,
+    currentDefaultSearchQueryJSON: undefined,
+    currentDefaultSearchQueryFilterKeys: new Set(),
+    suggestedSearches: getEmptyObject<SearchQueryContextValue['suggestedSearches']>(),
+    shouldResetSearchQuery: false,
+});
+
+/** Mirrors useSearchPageSetup: a descendant of the provider clearing from a passive effect, keyed on the hash. */
+function SearchPageStandIn({hash}: {hash: number}) {
+    const {clearSelectedTransactions} = useSearchSelectionActions();
+
+    useEffect(() => {
+        clearSelectedTransactions(hash);
+    }, [hash, clearSelectedTransactions]);
+
+    return null;
+}
+
+function SelectionProbe() {
+    const {areAllMatchingItemsSelected} = useSearchSelectionContext();
+    const {selectAllMatchingItems} = useSearchSelectionActions();
+
+    return (
+        <Text
+            testID="probe"
+            onPress={() => selectAllMatchingItems(true)}
+        >
+            {areAllMatchingItemsSelected ? 'all-matching' : 'nothing'}
+        </Text>
+    );
+}
+
+function Harness({hash}: {hash: number}) {
+    return (
+        <SearchQueryContext value={buildQueryContext(hash)}>
+            <SearchSelectionProvider>
+                <SearchPageStandIn hash={hash} />
+                <SelectionProbe />
+            </SearchSelectionProvider>
+        </SearchQueryContext>
+    );
+}
+
+describe('clearing the selection when the search query changes', () => {
+    it('clears a select-all-matching selection, which no later pass restores', () => {
+        const {rerender} = render(<Harness hash={111} />);
+
+        // Given every matching item selected under the first query
+        fireEvent.press(screen.getByTestId('probe'));
+        expect(screen.getByTestId('probe')).toHaveTextContent('all-matching');
+
+        // When the query changes in place, which is what a filter chip or a sort does
+        rerender(<Harness hash={222} />);
+
+        // Then it is cleared, rather than carrying into a query whose rows it was never chosen against
+        expect(screen.getByTestId('probe')).toHaveTextContent('nothing');
+    });
+
+    it('leaves the selection alone while the query is unchanged', () => {
+        // Given every matching item selected
+        const {rerender} = render(<Harness hash={111} />);
+        fireEvent.press(screen.getByTestId('probe'));
+
+        // When the page renders again on the same query
+        rerender(<Harness hash={111} />);
+
+        // Then the selection stands, so an ordinary re-render cannot cost the user what they picked
+        expect(screen.getByTestId('probe')).toHaveTextContent('all-matching');
+    });
+});
diff --git a/tests/unit/Search/searchSaveRecentSearchFlagTest.ts b/tests/unit/Search/searchSaveRecentSearchFlagTest.ts
index c7cdf37b2f31..f3a1f9fbb7c9 100644
--- a/tests/unit/Search/searchSaveRecentSearchFlagTest.ts
+++ b/tests/unit/Search/searchSaveRecentSearchFlagTest.ts
@@ -165,6 +165,39 @@ describe('search shouldSaveRecentSearch flag', () => {
         expect(getLastRequestJsonQuery()).toEqual(expect.objectContaining({shouldSaveRecentSearch: true}));
     });
 
+    it('does not re-fire when a flagged request collides with a flagged in-flight request', async () => {
+        // Given the Search component's flagged first-page fetch still waiting for its response, as on a cached revisit
+        const queryJSON = getQueryJSON('merchant:tram');
+        let resolveFirstRequest: () => void = () => {};
+        const firstRequestPromise = new Promise<void>((resolve) => {
+            resolveFirstRequest = resolve;
+        });
+        mockedMakeRequestWithSideEffects.mockImplementationOnce(() => firstRequestPromise);
+
+        const firstSearch = search({
+            queryJSON,
+            searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES,
+            offset: 0,
+            isLoading: false,
+            shouldSaveRecentSearch: true,
+        });
+
+        // When the page setup hook requests the same query with the flag
+        search({
+            queryJSON,
+            searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES,
+            offset: 0,
+            isLoading: false,
+            shouldSaveRecentSearch: true,
+        });
+        resolveFirstRequest();
+        await firstSearch;
+        await Promise.resolve();
+
+        // Then only one request reaches the backend, because the in-flight one already saves the query
+        expect(mockedMakeRequestWithSideEffects.mock.calls).toHaveLength(1);
+    });
+
     it('unions totals and save upgrades when both collide with the same in-flight request', async () => {
         // Given a search without totals or the flag that is still waiting for its response
         const queryJSON = getQueryJSON('type:expense merchant:ferry');
@@ -299,18 +332,29 @@ describe('search shouldSaveRecentSearch flag', () => {
             return collected;
         }
 
-        it('only useSearchPageSetup passes shouldSaveRecentSearch: true', () => {
+        it('only the Search page call sites pass shouldSaveRecentSearch', () => {
             // Given every source file in the app
             const sourceRoot = path.resolve(__dirname, '../../../src');
             // The action file serializes the flag into the payload, so it legitimately contains the literal.
             const definitionSite = path.join(sourceRoot, 'libs/actions/Search.ts');
             // When collecting every file that passes the flag
             const flaggedCallSites = collectSourceFiles(sourceRoot).filter(
-                (filePath) => filePath !== definitionSite && /shouldSaveRecentSearch:\s*true/.test(fs.readFileSync(filePath, 'utf8')),
+                (filePath) => filePath !== definitionSite && /shouldSaveRecentSearch:\s*(?!false\b)/.test(fs.readFileSync(filePath, 'utf8')),
             );
 
-            // Then the Search page setup hook is the only one
-            expect(flaggedCallSites).toEqual([path.join(sourceRoot, 'hooks/useSearchPageSetup.ts')]);
+            // Then only the Search page setup hook and the Search component's first-page fetch pass it
+            expect(flaggedCallSites.sort()).toEqual([path.join(sourceRoot, 'components/Search/index.tsx'), path.join(sourceRoot, 'hooks/useSearchPageSetup.ts')]);
+        });
+
+        it('keeps to-do searches out of the Search component flag', () => {
+            // Given the Search component source, since the page setup hook never fires for to-do (live data) queries
+            const searchComponentSource = fs.readFileSync(path.resolve(__dirname, '../../../src/components/Search/index.tsx'), 'utf8');
+
+            // When reading the flag the first-page fetch passes
+            const flagExpression = /shouldSaveRecentSearch:\s*([^,\n]+)/.exec(searchComponentSource)?.[1];
+
+            // Then it excludes live data, so to-do searches keep sending false and are not saved
+            expect(flagExpression).toContain('!shouldUseLiveData');
         });
     });
 });
diff --git a/tests/unit/Search/searchSnapshotStateTest.ts b/tests/unit/Search/searchSnapshotStateTest.ts
index 405c4ffcb9ef..01795600dee7 100644
--- a/tests/unit/Search/searchSnapshotStateTest.ts
+++ b/tests/unit/Search/searchSnapshotStateTest.ts
@@ -197,24 +197,40 @@ describe('search snapshot terminal state', () => {
         expect(snapshot?.search?.responseJsonCode).toBe(CONST.JSON_CODE.INVALID_SEARCH_QUERY);
     });
 
-    it('persists a non-401 server failure code over the NO_RESPONSE placeholder written by failureData', async () => {
+    it('does not write a response code in failureData', async () => {
+        // Given a request whose failureData has been applied
+        const queryJSON = getQueryJSON();
+        await search({queryJSON, searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES, offset: 0, isLoading: false});
+        const {optimisticData, failureData} = getCapturedSearchOnyxData();
+        await Onyx.update(optimisticData ?? []);
+        await Onyx.update(failureData ?? []);
+        await waitForBatchedUpdates();
+
+        // Then the errors carry no code yet. failureData cannot know the code, and a guessed NO_RESPONSE rendered the
+        // "Refresh needed" copy for a frame before the real code replaced it (#101615)
+        const snapshot = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}` as const);
+        expect(snapshot?.errors).toBeDefined();
+        expect(snapshot?.search?.responseJsonCode).toBeUndefined();
+    });
+
+    it('records NO_RESPONSE when the failed response carries no numeric jsonCode', async () => {
+        // Given a response the API layer treats as a failure (not 200) but that has no numeric code to classify it with
         const queryJSON = getQueryJSON();
-        // failureData lands first and writes NO_RESPONSE. The real code must overwrite it, otherwise the error view
-        // would show the "stale results" copy for a request the server actually rejected.
         jest.mocked(makeRequestWithSideEffects).mockImplementationOnce(async (_command, _parameters, onyxData) => {
             await Onyx.update(onyxData?.optimisticData ?? []);
             await Onyx.update(onyxData?.failureData ?? []);
             await Onyx.update(onyxData?.finallyData ?? []);
-            return {jsonCode: CONST.JSON_CODE.EXP_ERROR};
+            return {};
         });
 
+        // When the request resolves
         await search({queryJSON, searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES, offset: 0, isLoading: false});
         await waitForBatchedUpdates();
 
+        // Then the errors still get a code, otherwise the error view would hold its skeleton waiting for one that never comes
         const snapshot = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}` as const);
         expect(snapshot?.errors).toBeDefined();
-        expect(snapshot?.search?.responseJsonCode).toBe(CONST.JSON_CODE.EXP_ERROR);
-        expect(snapshot?.search?.responseJsonCode).not.toBe(CONST.JSON_CODE.NO_RESPONSE);
+        expect(snapshot?.search?.responseJsonCode).toBe(CONST.JSON_CODE.NO_RESPONSE);
     });
 
     it('does not persist a jsonCode for a successful response', async () => {
@@ -280,4 +296,39 @@ describe('search snapshot terminal state', () => {
         // classify them after a reload. NO_RESPONSE records "failed without a usable code" rather than leaving a gap.
         expect(snapshot?.search?.responseJsonCode).toBe(CONST.JSON_CODE.NO_RESPONSE);
     });
+
+    it('records the query string on the snapshot even when the response replaces the search info', async () => {
+        // Given a search with a non-empty query. IOU optimistic updates read `search.inputQuery` to decide
+        // which loaded snapshots a new expense belongs in, so every searched snapshot must carry it.
+        const queryJSON = buildSearchQueryJSON('type:expense from:3');
+        if (!queryJSON) {
+            throw new Error('Query JSON should be defined for test setup');
+        }
+        await search({queryJSON, searchKey: CONST.SEARCH.SEARCH_KEYS.EXPENSES, offset: 0, isLoading: false});
+
+        // When only the optimistic data has been applied, as when the request is still queued offline
+        const {optimisticData} = getCapturedSearchOnyxData();
+        await Onyx.update(optimisticData ?? []);
+        await waitForBatchedUpdates();
+
+        // Then the query is already on the snapshot
+        const optimisticSnapshot = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}` as const);
+        expect(optimisticSnapshot?.search?.inputQuery).toBe(queryJSON.inputQuery);
+
+        // When the server response replaces the whole snapshot, dropping the client-only query
+        await simulateResolvedRequest({
+            jsonCode: CONST.JSON_CODE.SUCCESS,
+            serverOnyxData: [
+                {
+                    onyxMethod: Onyx.METHOD.SET,
+                    key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}`,
+                    value: {search: {hasResults: true}},
+                },
+            ],
+        });
+
+        // Then finallyData writes the query back
+        const snapshot = await getOnyxValue(`${ONYXKEYS.COLLECTION.SNAPSHOT}${queryJSON.hash}` as const);
+        expect(snapshot?.search?.inputQuery).toBe(queryJSON.inputQuery);
+    });
 });
diff --git a/tests/unit/Search/useGroupOpenForShiftRangeTest.tsx b/tests/unit/Search/useGroupOpenForShiftRangeTest.tsx
new file mode 100644
index 000000000000..c72210ebcf04
--- /dev/null
+++ b/tests/unit/Search/useGroupOpenForShiftRangeTest.tsx
@@ -0,0 +1,79 @@
+import {renderHook} from '@testing-library/react-native';
+
+import {SearchShiftRangeGroupsContext} from '@components/Search/SearchContextDefinitions';
+import useGroupOpenForShiftRange from '@components/Search/SearchList/ListItem/useGroupOpenForShiftRange';
+
+import React from 'react';
+
+function setup() {
+    const addGroupToRange = jest.fn();
+    const removeGroupFromRange = jest.fn();
+    const wrapper = ({children}: {children: React.ReactNode}) => (
+        <SearchShiftRangeGroupsContext value={{addGroupToRange, removeGroupFromRange, registryGeneration: 1}}>{children}</SearchShiftRangeGroupsContext>
+    );
+    return {addGroupToRange, removeGroupFromRange, wrapper};
+}
+
+describe('useGroupOpenForShiftRange', () => {
+    it('opens the group while it is expanded', () => {
+        // Given a row that owns whether its own group is expanded
+        const {addGroupToRange, removeGroupFromRange, wrapper} = setup();
+
+        // When it renders expanded
+        renderHook(() => useGroupOpenForShiftRange('group-1', true), {wrapper});
+
+        // Then a range may reach that group's children, and nothing was closed on the way in
+        expect(addGroupToRange).toHaveBeenCalledWith('group-1');
+        expect(removeGroupFromRange).not.toHaveBeenCalled();
+    });
+
+    it('opens nothing while it is collapsed', () => {
+        // Given the same row with its children hidden
+        const {addGroupToRange, removeGroupFromRange, wrapper} = setup();
+
+        // When it renders collapsed
+        renderHook(() => useGroupOpenForShiftRange('group-1', false), {wrapper});
+
+        // Then the registry is untouched, since a range must reach only rows the user can see
+        expect(addGroupToRange).not.toHaveBeenCalled();
+        expect(removeGroupFromRange).not.toHaveBeenCalled();
+    });
+
+    it('closes the group when it collapses', () => {
+        // Given a group a range can reach into
+        const {removeGroupFromRange, wrapper} = setup();
+        const {rerender} = renderHook(({isOpen}) => useGroupOpenForShiftRange('group-1', isOpen), {wrapper, initialProps: {isOpen: true}});
+
+        // When the user collapses it
+        rerender({isOpen: false});
+
+        // Then the registry closes it, so the next range stops at the header rather than spanning rows off screen
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-1');
+    });
+
+    it('closes the group when the row goes away, since its expanded state goes with it', () => {
+        // Given a group this row opened
+        const {removeGroupFromRange, wrapper} = setup();
+        const {unmount} = renderHook(() => useGroupOpenForShiftRange('group-1', true), {wrapper});
+        expect(removeGroupFromRange).not.toHaveBeenCalled();
+
+        // When the row leaves the list
+        unmount();
+
+        // Then it closes what it opened, since the registry outlives the row that registered it
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-1');
+    });
+
+    it('closes the group it had open when the row is recycled to render another', () => {
+        // Given a virtualized row holding one group open
+        const {addGroupToRange, removeGroupFromRange, wrapper} = setup();
+        const {rerender} = renderHook(({groupKey}) => useGroupOpenForShiftRange(groupKey, true), {wrapper, initialProps: {groupKey: 'group-1'}});
+
+        // When the list recycles it onto a different group
+        rerender({groupKey: 'group-2'});
+
+        // Then the group it left closes and the one it took opens, rather than both reading as open
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-1');
+        expect(addGroupToRange).toHaveBeenLastCalledWith('group-2');
+    });
+});
diff --git a/tests/unit/Search/useInsightDataTest.ts b/tests/unit/Search/useInsightDataTest.ts
deleted file mode 100644
index 88bc92406eef..000000000000
--- a/tests/unit/Search/useInsightDataTest.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import type {GroupedItem, SearchQueryJSON} from '@components/Search/types';
-
-import {getInsightState, INSIGHT_STATE} from '@pages/home/InsightsSection/useInsightData';
-
-import CONST from '@src/CONST';
-import type SearchResults from '@src/types/onyx/SearchResults';
-
-const queryJSON: SearchQueryJSON = {
-    inputQuery: '',
-    hash: 1261888645,
-    recentSearchHash: 1239358332,
-    similarSearchHash: 1141398512,
-    type: CONST.SEARCH.DATA_TYPES.EXPENSE,
-    groupBy: CONST.SEARCH.GROUP_BY.MONTH,
-    view: CONST.SEARCH.VIEW.LINE,
-    sortBy: CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH,
-    sortOrder: CONST.SEARCH.SORT_ORDER.ASC,
-    flatFilters: [],
-    filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TYPE, right: CONST.SEARCH.DATA_TYPES.EXPENSE},
-};
-
-const defaultSearchResults: SearchResults = {
-    search: {
-        offset: 0,
-        hash: 1261888645,
-        sortBy: CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH,
-        sortOrder: CONST.SEARCH.SORT_ORDER.ASC,
-        type: queryJSON.type,
-        hasMoreResults: false,
-        hasResults: true,
-        isLoading: false,
-    },
-    data: {},
-};
-
-const makeSearchResults = (overrides: Partial<SearchResults> = {}): SearchResults => ({
-    ...defaultSearchResults,
-    ...overrides,
-    search: overrides.search ?? defaultSearchResults.search,
-    data: overrides.data ?? defaultSearchResults.data,
-});
-
-const makeData = (count: number): GroupedItem[] =>
-    Array.from({length: count}, (_, i) => ({
-        keyForList: String(i),
-        transactions: [],
-        groupedBy: CONST.SEARCH.GROUP_BY.MONTH,
-        year: 2026,
-        month: i + 1,
-        count: 1,
-        total: 0,
-        currency: CONST.CURRENCY.USD,
-        formattedMonth: `Month ${i + 1}`,
-        shortFormattedMonth: `M${i + 1}`,
-        sortKey: i,
-    }));
-
-describe('getInsightState', () => {
-    it('returns OFFLINE when offline with no data', () => {
-        expect(getInsightState(true, undefined, queryJSON, undefined)).toBe(INSIGHT_STATE.OFFLINE);
-    });
-
-    it('returns READY when offline but cached data exists', () => {
-        const results = makeSearchResults();
-        expect(getInsightState(true, results, queryJSON, makeData(3))).toBe(INSIGHT_STATE.READY);
-    });
-
-    it('returns ERROR when online and searchResults has errors', () => {
-        const results = makeSearchResults({errors: {someError: 'Something went wrong'}});
-        expect(getInsightState(false, results, queryJSON, makeData(5))).toBe(INSIGHT_STATE.ERROR);
-    });
-
-    it('returns LOADING when data has not loaded yet', () => {
-        expect(getInsightState(false, undefined, queryJSON, undefined)).toBe(INSIGHT_STATE.LOADING);
-    });
-
-    it('returns EMPTY when loaded but no data points', () => {
-        const results = makeSearchResults();
-        expect(getInsightState(false, results, queryJSON, [])).toBe(INSIGHT_STATE.EMPTY);
-        expect(getInsightState(false, results, queryJSON, undefined)).toBe(INSIGHT_STATE.EMPTY);
-    });
-
-    it('returns READY when loaded with 1+ data points', () => {
-        const results = makeSearchResults();
-        expect(getInsightState(false, results, queryJSON, makeData(1))).toBe(INSIGHT_STATE.READY);
-        expect(getInsightState(false, results, queryJSON, makeData(2))).toBe(INSIGHT_STATE.READY);
-        expect(getInsightState(false, results, queryJSON, makeData(10))).toBe(INSIGHT_STATE.READY);
-    });
-});
diff --git a/tests/unit/Search/useOpenGroupsForShiftRangeTest.tsx b/tests/unit/Search/useOpenGroupsForShiftRangeTest.tsx
new file mode 100644
index 000000000000..30e3ab7564d6
--- /dev/null
+++ b/tests/unit/Search/useOpenGroupsForShiftRangeTest.tsx
@@ -0,0 +1,125 @@
+import {renderHook} from '@testing-library/react-native';
+
+import {SearchShiftRangeGroupsContext} from '@components/Search/SearchContextDefinitions';
+import useOpenGroupsForShiftRange from '@components/Search/SearchList/ListItem/useOpenGroupsForShiftRange';
+
+import React from 'react';
+
+function setup() {
+    const addGroupToRange = jest.fn();
+    const removeGroupFromRange = jest.fn();
+    let registryGeneration: number | undefined = 1;
+    const dropRegistry = () => {
+        registryGeneration = (registryGeneration ?? 0) + 1;
+    };
+    const wrapper = ({children}: {children: React.ReactNode}) => (
+        <SearchShiftRangeGroupsContext value={{addGroupToRange, removeGroupFromRange, registryGeneration}}>{children}</SearchShiftRangeGroupsContext>
+    );
+    return {addGroupToRange, removeGroupFromRange, dropRegistry, wrapper};
+}
+
+describe('useOpenGroupsForShiftRange', () => {
+    it('opens every group in the set', () => {
+        // Given the view that owns the expanded state for the rows it recycles
+        const {addGroupToRange, wrapper} = setup();
+
+        // When it renders with two groups expanded
+        renderHook(() => useOpenGroupsForShiftRange(new Set(['group-1', 'group-2'])), {wrapper});
+
+        // Then both reach the registry, since the rows themselves never registered them
+        expect(addGroupToRange).toHaveBeenCalledWith('group-1');
+        expect(addGroupToRange).toHaveBeenCalledWith('group-2');
+    });
+
+    it('closes only the group that collapsed, leaving the ones that stayed open alone', () => {
+        // Given two groups open
+        const {addGroupToRange, removeGroupFromRange, wrapper} = setup();
+        const {rerender} = renderHook(({openGroupKeys}) => useOpenGroupsForShiftRange(openGroupKeys), {
+            wrapper,
+            initialProps: {openGroupKeys: new Set(['group-1', 'group-2'])},
+        });
+        addGroupToRange.mockClear();
+
+        // When one of them collapses
+        rerender({openGroupKeys: new Set(['group-2'])});
+
+        // Then only that one is closed: closing and reopening the set would drop a group another owner still holds
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-1');
+        expect(removeGroupFromRange).not.toHaveBeenCalledWith('group-2');
+        expect(addGroupToRange).not.toHaveBeenCalled();
+    });
+
+    it('opens only the group that expanded, rather than churning the whole set', () => {
+        // Given two groups open
+        const {addGroupToRange, removeGroupFromRange, wrapper} = setup();
+        const {rerender} = renderHook(({openGroupKeys}) => useOpenGroupsForShiftRange(openGroupKeys), {
+            wrapper,
+            initialProps: {openGroupKeys: new Set(['group-1', 'group-2'])},
+        });
+        addGroupToRange.mockClear();
+
+        // When a third expands
+        rerender({openGroupKeys: new Set(['group-1', 'group-2', 'group-3'])});
+
+        // Then one registration happens, so an expand costs the group it opened and nothing else
+        expect(addGroupToRange).toHaveBeenCalledTimes(1);
+        expect(addGroupToRange).toHaveBeenCalledWith('group-3');
+        expect(removeGroupFromRange).not.toHaveBeenCalled();
+    });
+
+    it('opens its groups again when the registry is dropped for a new search', () => {
+        // Given a group registered under the search that has just ended
+        const {addGroupToRange, dropRegistry, wrapper} = setup();
+        const openGroupKeys = new Set(['group-1']);
+        const {rerender} = renderHook(({groupKeys}) => useOpenGroupsForShiftRange(groupKeys), {wrapper, initialProps: {groupKeys: openGroupKeys}});
+        addGroupToRange.mockClear();
+
+        // When the registry is dropped and says so through its generation
+        dropRegistry();
+        rerender({groupKeys: openGroupKeys});
+
+        // Then the view registers again, since its own expanded state never changed and would otherwise stay inert
+        expect(addGroupToRange).toHaveBeenCalledWith('group-1');
+    });
+
+    it('closes every open group when the view goes away, since the provider outlives it', () => {
+        // Given two groups this view opened
+        const {removeGroupFromRange, wrapper} = setup();
+        const {unmount} = renderHook(() => useOpenGroupsForShiftRange(new Set(['group-1', 'group-2'])), {wrapper});
+        expect(removeGroupFromRange).not.toHaveBeenCalled();
+
+        // When the view unmounts
+        unmount();
+
+        // Then both close, rather than leaving the registry holding rows nothing renders
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-1');
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-2');
+    });
+
+    it('closes everything when the layout stops rendering children as rows', () => {
+        // Given open groups in the layout that splits each group into a header and its children
+        const {removeGroupFromRange, wrapper} = setup();
+        const openGroupKeys = new Set(['group-1', 'group-2']);
+        const {rerender} = renderHook(({groupKeys}) => useOpenGroupsForShiftRange(groupKeys), {wrapper, initialProps: {groupKeys: openGroupKeys}});
+
+        // When the layout changes and the rows carry their own children again
+        rerender({groupKeys: new Set<string>()});
+
+        // Then this owner releases all of them, so the two owners cannot both claim the same groups
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-1');
+        expect(removeGroupFromRange).toHaveBeenCalledWith('group-2');
+    });
+
+    it('leaves the open groups alone while the set holds still', () => {
+        // Given a set of open groups that has not changed
+        const {removeGroupFromRange, wrapper} = setup();
+        const openGroupKeys = new Set(['group-1']);
+        const {rerender} = renderHook(({groupKeys}) => useOpenGroupsForShiftRange(groupKeys), {wrapper, initialProps: {groupKeys: openGroupKeys}});
+
+        // When the view re-renders for an unrelated reason
+        rerender({groupKeys: openGroupKeys});
+
+        // Then nothing closes, or a render elsewhere would shrink what a live range can reach
+        expect(removeGroupFromRange).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/Search/useOpenGroupsRegistryTest.tsx b/tests/unit/Search/useOpenGroupsRegistryTest.tsx
new file mode 100644
index 000000000000..f4dc0a02ecfa
--- /dev/null
+++ b/tests/unit/Search/useOpenGroupsRegistryTest.tsx
@@ -0,0 +1,106 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useOpenGroupsRegistry from '@components/Search/hooks/useOpenGroupsRegistry';
+
+const SEARCH_HASH = 111;
+
+const renderRegistry = () => renderHook(({searchHash}) => useOpenGroupsRegistry(searchHash), {initialProps: {searchHash: SEARCH_HASH}});
+
+describe('useOpenGroupsRegistry', () => {
+    it('opens a group and closes it again', () => {
+        // Given a registry for one search
+        const {result} = renderRegistry();
+
+        // When a group is opened
+        act(() => result.current.shiftRangeGroupsActions.addGroupToRange('group-1'));
+
+        // Then a range may reach its children
+        expect(result.current.openGroupKeys.has('group-1')).toBe(true);
+
+        // And when it closes again, the range stops at the header
+        act(() => result.current.shiftRangeGroupsActions.removeGroupFromRange('group-1'));
+        expect(result.current.openGroupKeys.has('group-1')).toBe(false);
+    });
+
+    it('keeps a group open until every owner that opened it has closed it', () => {
+        const {result} = renderRegistry();
+
+        // Given two owners of the same group's expanded state, as the split and row layouts would be
+        act(() => result.current.shiftRangeGroupsActions.addGroupToRange('group-1'));
+        act(() => result.current.shiftRangeGroupsActions.addGroupToRange('group-1'));
+
+        // When the first one cleans up
+        act(() => result.current.shiftRangeGroupsActions.removeGroupFromRange('group-1'));
+
+        // Then the group is still reachable, rather than the first cleanup closing it for the other one
+        expect(result.current.openGroupKeys.has('group-1')).toBe(true);
+
+        // And it closes once the second owner lets go
+        act(() => result.current.shiftRangeGroupsActions.removeGroupFromRange('group-1'));
+        expect(result.current.openGroupKeys.has('group-1')).toBe(false);
+    });
+
+    it('ignores a close for a group it never opened', () => {
+        // Given a registry holding nothing open
+        const {result} = renderRegistry();
+        const before = result.current.openGroupKeys;
+
+        // When a cleanup arrives for a group that was never registered
+        act(() => result.current.shiftRangeGroupsActions.removeGroupFromRange('group-1'));
+
+        // Then the same set comes back, so a stray cleanup cannot re-render the list
+        expect(result.current.openGroupKeys).toBe(before);
+    });
+
+    it('drops every open group when the search changes, so a range cannot reach the previous results', () => {
+        // Given a group opened under one query
+        const {result, rerender} = renderRegistry();
+        act(() => result.current.shiftRangeGroupsActions.addGroupToRange('group-1'));
+        expect(result.current.openGroupKeys.has('group-1')).toBe(true);
+
+        // When the query changes
+        rerender({searchHash: 222});
+
+        // Then it is closed: the same row can match both queries, so openness is no proof it is still on screen
+        expect(result.current.openGroupKeys.has('group-1')).toBe(false);
+    });
+
+    it('drops the counts with them, so a group left open twice does not survive the change', () => {
+        // Given a group two owners hold open
+        const {result, rerender} = renderRegistry();
+        act(() => result.current.shiftRangeGroupsActions.addGroupToRange('group-1'));
+        act(() => result.current.shiftRangeGroupsActions.addGroupToRange('group-1'));
+
+        // When the query changes
+        rerender({searchHash: 222});
+
+        // Then the count goes with the keys, rather than leaving the group open for the rest of the new search
+        expect(result.current.openGroupKeys.has('group-1')).toBe(false);
+    });
+
+    it('changes the generation with the search, which is how a subscriber knows to open its group again', () => {
+        // Given the generation a subscriber re-registers on
+        const {result, rerender} = renderRegistry();
+        const generationBefore = result.current.shiftRangeGroupsActions.registryGeneration;
+
+        // When the query changes
+        rerender({searchHash: 222});
+
+        // Then it moves, since a subscriber whose own expanded state did not change would otherwise stay inert
+        expect(result.current.shiftRangeGroupsActions.registryGeneration).not.toBe(generationBefore);
+    });
+
+    it('keeps the methods across a search change, since a subscriber depending on them would otherwise loop', () => {
+        // Given the handles a subscriber lists in its effect dependencies
+        const {result, rerender} = renderRegistry();
+        const {addGroupToRange, removeGroupFromRange} = result.current.shiftRangeGroupsActions;
+
+        // When the registry is dropped for a new query
+        act(() => result.current.shiftRangeGroupsActions.addGroupToRange('group-1'));
+        rerender({searchHash: 222});
+
+        // Then they are the same functions, so only the generation tells those effects to run again
+        expect(result.current.shiftRangeGroupsActions.addGroupToRange).toBe(addGroupToRange);
+        expect(result.current.shiftRangeGroupsActions.removeGroupFromRange).toBe(removeGroupFromRange);
+    });
+});
diff --git a/tests/unit/Search/useOptimisticSearchTrackingTest.ts b/tests/unit/Search/useOptimisticSearchTrackingTest.ts
new file mode 100644
index 000000000000..4813d68861f4
--- /dev/null
+++ b/tests/unit/Search/useOptimisticSearchTrackingTest.ts
@@ -0,0 +1,101 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useOptimisticSearchTracking from '@components/Search/hooks/useOptimisticSearchTracking';
+import type {SearchQueryJSON} from '@components/Search/types';
+
+import {acquireSearchWriteBarrier, flushPendingSearchWrite, markPendingSearchWrite, resetForTesting, setSearchWriteWatchKey} from '@libs/pendingSearchWrite';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Transaction} from '@src/types/onyx';
+import type SearchResults from '@src/types/onyx/SearchResults';
+
+import type {OnyxCollection} from 'react-native-onyx';
+
+jest.mock('@libs/SearchUIUtils', () => ({
+    isSearchDataLoaded: () => true,
+    isTransactionSearchType: () => true,
+}));
+jest.mock('@libs/ReportActionsUtils', () => ({
+    getOriginalMessage: () => undefined,
+    isMoneyRequestAction: () => false,
+}));
+
+const TRANSACTION_ID = '9876543210';
+const TRANSACTION_KEY = `${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}` as const;
+
+const transactions: OnyxCollection<Transaction> = {
+    [TRANSACTION_KEY]: {
+        transactionID: TRANSACTION_ID,
+        reportID: '1',
+        merchant: 'Unique merchant',
+        amount: 4200,
+        currency: 'USD',
+        created: '2026-09-29',
+    },
+};
+
+function makeQueryJSON(hash: number): SearchQueryJSON {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- test-only: the hook reads only these four fields off the query
+    return {
+        hash,
+        type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+        sortBy: CONST.SEARCH.TABLE_COLUMNS.DATE,
+        sortOrder: CONST.SEARCH.SORT_ORDER.DESC,
+    } as SearchQueryJSON;
+}
+
+function makeSearchResults(): SearchResults {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- test-only: an empty snapshot is all the augmentation needs to start from
+    return {
+        data: {personalDetailsList: {}},
+        search: {isLoading: false, hasMoreResults: false, type: CONST.SEARCH.DATA_TYPES.EXPENSE},
+    } as unknown as SearchResults;
+}
+
+function renderTracking(hash: number) {
+    return renderHook(() =>
+        useOptimisticSearchTracking({
+            searchResults: makeSearchResults(),
+            queryJSON: makeQueryJSON(hash),
+            transactions,
+            reportActions: undefined,
+        }),
+    );
+}
+
+beforeEach(() => {
+    resetForTesting();
+});
+
+afterEach(() => {
+    resetForTesting();
+});
+
+describe('useOptimisticSearchTracking', () => {
+    it('adds the optimistic transaction while its write is still pending', () => {
+        // Given a submission that marked the signal and published its watch key
+        markPendingSearchWrite();
+        setSearchWriteWatchKey(TRANSACTION_KEY);
+
+        // When Search mounts while that write is still pending
+        const {result} = renderTracking(111);
+
+        // Then the transaction is added to the snapshot, so its row shows before the server indexes it
+        expect(result.current.searchDataWithOptimisticTransaction).toHaveProperty(TRANSACTION_KEY);
+    });
+
+    it('does not add the transaction of a released write to a search mounted afterwards', () => {
+        // Given a submission whose write was already released, leaving its watch key readable
+        markPendingSearchWrite();
+        setSearchWriteWatchKey(TRANSACTION_KEY);
+        acquireSearchWriteBarrier();
+        flushPendingSearchWrite();
+
+        // When a different query mounts Search with no write of its own pending
+        const {result} = renderTracking(222);
+
+        // Then the earlier expense is left out, since it has no relation to this query's filters
+        expect(result.current.searchDataWithOptimisticTransaction).not.toHaveProperty(TRANSACTION_KEY);
+    });
+});
diff --git a/tests/unit/Search/useRowSelectionTest.tsx b/tests/unit/Search/useRowSelectionTest.tsx
index 9cf8ec54f2e0..dc7e72e3369b 100644
--- a/tests/unit/Search/useRowSelectionTest.tsx
+++ b/tests/unit/Search/useRowSelectionTest.tsx
@@ -21,6 +21,9 @@ const baseSelectionContext = {
 const noopSelectionActions: SearchSelectionActionsValue = {
     setCurrentSelectedTransactionReportID: () => {},
     setSelectedTransactions: () => {},
+    getSelectedTransactions: () => ({}),
+    getExcludedTransactions: () => ({}),
+    getAreAllMatchingItemsSelected: () => false,
     applySelection: () => {},
     setSelectedReports: () => {},
     removeTransaction: () => {},
diff --git a/tests/unit/Search/useSearchLoadingStateTest.ts b/tests/unit/Search/useSearchLoadingStateTest.ts
new file mode 100644
index 000000000000..fdba05872b20
--- /dev/null
+++ b/tests/unit/Search/useSearchLoadingStateTest.ts
@@ -0,0 +1,55 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useSearchLoadingState from '@hooks/useSearchLoadingState';
+
+import {buildSearchQueryJSON} from '@libs/SearchQueryUtils';
+
+import CONST from '@src/CONST';
+import type SearchResults from '@src/types/onyx/SearchResults';
+
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: () => [undefined, {status: 'loaded'}],
+}));
+
+jest.mock('@hooks/useNetwork', () => ({
+    __esModule: true,
+    default: () => ({isOffline: false}),
+}));
+
+jest.mock('@components/Search/SearchContext', () => ({
+    useSearchResultsContext: () => ({shouldUseLiveData: false}),
+}));
+
+const queryJSON = buildSearchQueryJSON(`type:${CONST.SEARCH.DATA_TYPES.EXPENSE}`);
+
+const buildErroredSnapshot = (responseJsonCode: number | null) =>
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- the hook only reads errors and the response code, so the fixture is intentionally partial
+    ({
+        errors: {error: 'Something went wrong'},
+        search: {responseJsonCode},
+    }) as unknown as SearchResults;
+
+describe('useSearchLoadingState', () => {
+    it('keeps the page skeleton while the errors are waiting for their response code', () => {
+        // Given a failed search whose errors landed before search() stored the response code
+        const searchResults = buildErroredSnapshot(null);
+
+        // When the page decides whether to show its skeleton
+        const {result} = renderHook(() => useSearchLoadingState(queryJSON, searchResults));
+
+        // Then it keeps the skeleton, because handing off to Search's own skeleton would move the rows and restart the shimmer
+        expect(result.current).toBe(true);
+    });
+
+    it('lets Search render the error view once the response code is stored', () => {
+        // Given a failed search whose response code is known
+        const searchResults = buildErroredSnapshot(CONST.JSON_CODE.NO_RESPONSE);
+
+        // When the page decides whether to show its skeleton
+        const {result} = renderHook(() => useSearchLoadingState(queryJSON, searchResults));
+
+        // Then it drops the skeleton so Search can pick the right error copy
+        expect(result.current).toBe(false);
+    });
+});
diff --git a/tests/unit/Search/useSearchSnapshotTest.ts b/tests/unit/Search/useSearchSnapshotTest.ts
index 4aa25273d333..f3d2088da7d3 100644
--- a/tests/unit/Search/useSearchSnapshotTest.ts
+++ b/tests/unit/Search/useSearchSnapshotTest.ts
@@ -185,7 +185,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -211,7 +210,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults: undefined,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -230,7 +228,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -250,7 +247,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -273,7 +269,6 @@ describe('useSearchSnapshot', () => {
                     groupBy: CONST.SEARCH.GROUP_BY.FROM,
                 }),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -294,7 +289,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -319,7 +313,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -347,7 +340,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
             }),
@@ -357,24 +349,6 @@ describe('useSearchSnapshot', () => {
         expect(result.current.hasCachedOptimisticItem).toBe(true);
     });
 
-    it('stamps the post-create highlight on matching rows (newSearchResultKeys)', () => {
-        const searchResults = makeSearchResults();
-        mockUseOptimisticSearchTracking.mockReturnValue(trackingReturn(searchResults.data));
-        mockGetSortedSections.mockReturnValue([{transactionID: '7', keyForList: '7'}]);
-
-        const {result} = renderHook(() =>
-            useSearchSnapshot({
-                queryJSON: makeQueryJSON(),
-                searchResults,
-                newSearchResultKeys: new Set([`${ONYXKEYS.COLLECTION.TRANSACTION}7`]),
-                transactions: undefined,
-                reportActions: undefined,
-            }),
-        );
-
-        expect(result.current.chartData.at(0)).toEqual(expect.objectContaining({shouldAnimateInHighlight: true}));
-    });
-
     it('passes the query type through to getSortedSections for each variant shape', () => {
         const variants = [
             CONST.SEARCH.DATA_TYPES.CHAT,
@@ -392,7 +366,6 @@ describe('useSearchSnapshot', () => {
                 useSearchSnapshot({
                     queryJSON: makeQueryJSON({type}),
                     searchResults,
-                    newSearchResultKeys: undefined,
                     transactions: undefined,
                     reportActions: undefined,
                 }),
@@ -420,7 +393,6 @@ describe('useSearchSnapshot', () => {
         const props = {
             queryJSON: makeQueryJSON(),
             searchResults,
-            newSearchResultKeys: undefined,
             transactions: undefined,
             reportActions: undefined,
         };
@@ -447,7 +419,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit,
@@ -481,7 +452,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit: 2,
@@ -505,7 +475,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit: 3,
@@ -528,7 +497,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit: 2,
@@ -558,7 +526,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON({groupBy: CONST.SEARCH.GROUP_BY.FROM}),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit: 2,
@@ -570,34 +537,6 @@ describe('useSearchSnapshot', () => {
         expect(result.current.filteredData).toEqual(groups.slice(0, 2).map((group) => expect.objectContaining({keyForList: group.keyForList, transactions: group.transactions})));
     });
 
-    it('keeps a highlighted row past visibleRowLimit on screen', () => {
-        // Given a live list capped at two groups, where a new expense just landed in the last group
-        const searchResults = makeSearchResults();
-        mockUseOptimisticSearchTracking.mockReturnValue(trackingReturn(searchResults.data));
-        const groups = Array.from({length: 5}, (_value, index) => ({
-            groupID: `group${index}`,
-            keyForList: `group${index}`,
-            transactions: [{transactionID: `${index}`}],
-        }));
-        mockGetSections.mockReturnValue([groups, groups.length, false]);
-        mockGetSortedSections.mockReturnValue(groups);
-
-        // When the snapshot is projected with that expense queued for highlight
-        const {result} = renderHook(() =>
-            useSearchSnapshot({
-                queryJSON: makeQueryJSON({groupBy: CONST.SEARCH.GROUP_BY.FROM}),
-                searchResults,
-                newSearchResultKeys: new Set([`${ONYXKEYS.COLLECTION.TRANSACTION}4`]),
-                transactions: undefined,
-                reportActions: undefined,
-                visibleRowLimit: 2,
-            }),
-        );
-
-        // Then the highlighted group still renders, or the scroll-to-new-expense has no row to land on
-        expect(result.current.data.map((item) => item.keyForList)).toContain('group4');
-    });
-
     it('does not spend visibleRowLimit on rows being deleted online', () => {
         // Given a live list capped at two rows, whose first two rows are being deleted while online
         const searchResults = makeSearchResults();
@@ -615,7 +554,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit: 2,
@@ -644,7 +582,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON({groupBy: CONST.SEARCH.GROUP_BY.FROM}),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit: 2,
@@ -674,7 +611,6 @@ describe('useSearchSnapshot', () => {
             useSearchSnapshot({
                 queryJSON: makeQueryJSON(),
                 searchResults,
-                newSearchResultKeys: undefined,
                 transactions: undefined,
                 reportActions: undefined,
                 visibleRowLimit: 2,
diff --git a/tests/unit/Search/useSyncSelectedReportsTest.tsx b/tests/unit/Search/useSyncSelectedReportsTest.tsx
index 275c23aacd67..5ef7d5ab38ba 100644
--- a/tests/unit/Search/useSyncSelectedReportsTest.tsx
+++ b/tests/unit/Search/useSyncSelectedReportsTest.tsx
@@ -103,6 +103,9 @@ function renderHarness({
             () => ({
                 setCurrentSelectedTransactionReportID: () => {},
                 setSelectedTransactions: () => {},
+                getSelectedTransactions: () => ({}),
+                getExcludedTransactions: () => ({}),
+                getAreAllMatchingItemsSelected: () => false,
                 applySelection: () => {},
                 setSelectedReports,
                 removeTransaction: () => {},
diff --git a/tests/unit/SearchAutocompleteListTest.tsx b/tests/unit/SearchAutocompleteListTest.tsx
index 84a9b4e430e6..58a70cb2b2b7 100644
--- a/tests/unit/SearchAutocompleteListTest.tsx
+++ b/tests/unit/SearchAutocompleteListTest.tsx
@@ -115,7 +115,6 @@ jest.mock('@hooks/useExportedToFilterOptions', () => ({
     __esModule: true,
     default: () => ({
         exportedToFilterOptions: [],
-        combinedUniqueExportTemplates: [],
         connectedIntegrationNames: new Set<string>(),
     }),
 }));
@@ -604,9 +603,9 @@ describe('SearchAutocompleteList', () => {
         expect(screen.queryByText(rawServerMessage)).toBeNull();
     });
 
-    describe('two-section chat switcher', () => {
-        // These tests use a controlled getSearchOptions mock to verify the section splitting logic
-        // introduced for stable two-section chat switcher results (local + server).
+    describe('chat switcher results', () => {
+        // These tests use a controlled getSearchOptions mock to verify the section rendering and ordering
+        // of the chat switcher results.
         let getSearchOptionsSpy: jest.SpyInstance;
 
         beforeEach(() => {
@@ -645,6 +644,7 @@ describe('SearchAutocompleteList', () => {
         });
 
         it('should display "Recent chats" section when query is empty', async () => {
+            // Given recent searches and chats are available
             const recentSearches: Record<string, {query: string; timestamp: string}> = {};
             recentSearches['2024-01-01T00:00:00'] = {query: 'type:expense', timestamp: '2024-01-01T00:00:00'};
 
@@ -656,18 +656,45 @@ describe('SearchAutocompleteList', () => {
                 [ONYXKEYS.RECENT_SEARCHES]: recentSearches,
             });
 
+            // When the search router opens without a query
             render(<SearchRouterWrapper />);
             await flushAllUpdates();
 
+            // Then only the Recent chats section is shown
             await waitFor(() => {
                 expect(screen.getByText('Recent chats')).toBeTruthy();
             });
-
-            // "Search results" section should NOT be visible when query is empty
             expect(screen.queryByText('Search results')).toBeNull();
         });
 
+        it('should cap Recent chats after a completed search is cleared', async () => {
+            // Given more recent chats than the suggestion limit and a completed search
+            const recentReports = Array.from({length: CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS + 1}, (_, index) => {
+                const reportID = String(index + 1);
+                return {reportID, keyForList: reportID, text: `Recent ${reportID}`, alternateText: '', lastMessageText: ''};
+            });
+            getSearchOptionsSpy.mockReturnValue({
+                options: {
+                    recentReports,
+                    personalDetails: [],
+                    currentUserOption: null,
+                    userToInvite: null,
+                },
+            });
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['1']);
+            });
+
+            // When the search router opens with an empty query after a completed search
+            render(<SearchRouterWrapper />);
+            await flushAllUpdates();
+
+            // Then Recent chats remains capped at the suggestion limit
+            expect(screen.queryAllByText(/^Recent \d+$/)).toHaveLength(CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS);
+        });
+
         it('should keep "Recent chats" header when an active search query is entered', async () => {
+            // Given recent searches and chats are available
             const recentSearches: Record<string, {query: string; timestamp: string}> = {};
             recentSearches['2024-01-01T00:00:00'] = {query: 'type:expense', timestamp: '2024-01-01T00:00:00'};
 
@@ -679,27 +706,34 @@ describe('SearchAutocompleteList', () => {
                 [ONYXKEYS.RECENT_SEARCHES]: recentSearches,
             });
 
+            // And the search router is open
             render(<SearchRouterWrapper />);
             await flushAllUpdates();
 
-            // Verify initial state shows "Recent chats" section
             await waitFor(() => {
                 expect(screen.getByText('Recent chats')).toBeTruthy();
             });
 
-            // Type a search query to trigger the two-section split
+            // When the user enters a search query
             const textInput = screen.getByTestId('search-autocomplete-text-input');
             fireEvent.changeText(textInput, 'test');
             await flushAllUpdates();
 
-            // "Recent chats" header should still be visible with an active query
-            // (local section keeps the title, server section uses "Search results")
+            // And Auth returns search results
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['101', '102', '103']);
+                await Onyx.set(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS, false);
+            });
+            await flushAllUpdates();
+
+            // Then Recent chats remains visible
             await waitFor(() => {
                 expect(screen.getByText('Recent chats')).toBeTruthy();
             });
         });
 
         it('should return to "Recent chats" section when search query is cleared', async () => {
+            // Given recent searches and chats are available
             const recentSearches: Record<string, {query: string; timestamp: string}> = {};
             recentSearches['2024-01-01T00:00:00'] = {query: 'type:expense', timestamp: '2024-01-01T00:00:00'};
 
@@ -711,94 +745,140 @@ describe('SearchAutocompleteList', () => {
                 [ONYXKEYS.RECENT_SEARCHES]: recentSearches,
             });
 
+            // And the search router is open
             render(<SearchRouterWrapper />);
             await flushAllUpdates();
 
-            // Type a search query
+            // When the user enters a search query
             const textInput = screen.getByTestId('search-autocomplete-text-input');
             fireEvent.changeText(textInput, 'some query');
             await flushAllUpdates();
 
-            // "Recent chats" should still be visible with an active query
+            // And Auth returns search results
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['101', '102', '103']);
+                await Onyx.set(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS, false);
+            });
+            await flushAllUpdates();
+
+            // Then Recent chats remains visible
             await waitFor(() => {
                 expect(screen.getByText('Recent chats')).toBeTruthy();
             });
 
-            // Clear the query
+            // When the user clears the query
             fireEvent.changeText(textInput, '');
             await flushAllUpdates();
 
-            // Should return to "Recent chats" section
+            // Then Recent chats remains visible without Search results
             await waitFor(() => {
                 expect(screen.getByText('Recent chats')).toBeTruthy();
             });
-
-            // "Search results" section should not be visible
             expect(screen.queryByText('Search results')).toBeNull();
         });
 
-        it('should preserve frozen local result order when server results arrive', async () => {
-            const recentSearches: Record<string, {query: string; timestamp: string}> = {};
-            recentSearches['2024-01-01T00:00:00'] = {query: 'type:expense', timestamp: '2024-01-01T00:00:00'};
-
+        it('should keep locally available matches while ordering server-only results', async () => {
+            // Given locally available reports
             await waitForBatchedUpdates();
             await Onyx.multiSet({
                 ...mockedReports,
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
                 [ONYXKEYS.BETAS]: mockedBetas,
-                [ONYXKEYS.RECENT_SEARCHES]: recentSearches,
             });
 
+            // And the search router is open
             render(<SearchRouterWrapper />);
             await flushAllUpdates();
 
-            // Verify initial state shows "Recent chats" section with Alice, Bob, Charlie
-            await waitFor(() => {
-                expect(screen.getByText('Recent chats')).toBeTruthy();
-            });
-
-            // Type a search query to freeze the local rank (Alice=0, Bob=1, Charlie=2)
+            // When the user enters a query
             const textInput = screen.getByTestId('search-autocomplete-text-input');
             fireEvent.changeText(textInput, 'test');
             await flushAllUpdates();
 
-            // "Recent chats" header should still be visible (local section keeps its title)
+            // And Auth returns 20 server-only results ahead of the local reports
+            const serverReports = Array.from({length: CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS}, (_, index) => {
+                const reportID = String(201 + index);
+                return {reportID, keyForList: reportID, text: `Server${index + 1} Report`, alternateText: '', lastMessageText: ''};
+            });
+            getSearchOptionsSpy.mockReturnValue({
+                options: {
+                    recentReports: [...serverReports, ...fakeRecentReports],
+                    personalDetails: [],
+                    currentUserOption: null,
+                    userToInvite: null,
+                },
+            });
+            mockUseFilteredOptions.mockReturnValue({
+                options: {...mockedOptions},
+                isLoading: false,
+                loadMore: jest.fn(),
+                hasMore: false,
+                isLoadingMore: false,
+            });
+
+            const serverOrder = serverReports.map(({reportID}) => reportID).reverse();
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, serverOrder);
+                await Onyx.set(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS, false);
+            });
+            await flushAllUpdates();
+
+            // Then local matches are preserved and the remaining slots follow Auth's order.
             await waitFor(() => {
-                expect(screen.getByText('Recent chats')).toBeTruthy();
+                expect(screen.getByText('Search results')).toBeTruthy();
             });
 
-            const uncachedUserOption = mockedOptions.personalDetails.at(0);
-            if (!uncachedUserOption) {
-                throw new Error('Expected a personal detail option fixture');
-            }
+            const names = screen
+                .queryAllByText(/Report$/)
+                .map((el) => (typeof el.props.children === 'string' ? el.props.children : ''))
+                .filter((name) => [...fakeRecentReports.map(({text}) => text), ...serverReports.map(({text}) => text)].includes(name));
+
+            expect(names).toEqual([
+                ...fakeRecentReports.map(({text}) => text),
+                ...serverReports
+                    .map(({text}) => text)
+                    .reverse()
+                    .slice(0, CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS - fakeRecentReports.length),
+            ]);
+        });
 
-            // Now simulate server results arriving by updating the mock to return results
-            // in a DIFFERENT order, plus new server-only report and user results.
+        it('still renders a locally matched chat that Auth leaves out of its order', async () => {
+            // Given a single locally available match when the query settles, so only that row is captured as local
+            const [aliceReport, bobReport] = fakeRecentReports;
             getSearchOptionsSpy.mockReturnValue({
                 options: {
-                    recentReports: [
-                        {reportID: '103', keyForList: '103', text: 'Charlie Report', alternateText: 'charlie alt', lastMessageText: 'hey'},
-                        {reportID: '101', keyForList: '101', text: 'Alice Report', alternateText: 'alice alt', lastMessageText: 'hello'},
-                        {reportID: '102', keyForList: '102', text: 'Bob Report', alternateText: 'bob alt', lastMessageText: 'hi'},
-                        {reportID: '201', keyForList: '201', text: 'NewServer Report', alternateText: 'server alt', lastMessageText: 'new'},
-                    ],
-                    personalDetails: [
-                        {
-                            ...uncachedUserOption,
-                            accountID: 999,
-                            keyForList: '999',
-                            login: 'uncached.test@example.com',
-                            text: 'Uncached Test User',
-                            alternateText: 'uncached.test@example.com',
-                        },
-                    ],
+                    recentReports: [aliceReport],
+                    personalDetails: [],
                     currentUserOption: null,
                     userToInvite: null,
                 },
             });
 
-            // Trigger a re-render by returning a new options reference from useFilteredOptions
-            // (simulates server data arriving and updating Onyx-backed options).
+            await waitForBatchedUpdates();
+            await Onyx.multiSet({
+                ...mockedReports,
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
+                [ONYXKEYS.BETAS]: mockedBetas,
+            });
+
+            render(<SearchRouterWrapper />);
+            await flushAllUpdates();
+
+            const textInput = screen.getByTestId('search-autocomplete-text-input');
+            fireEvent.changeText(textInput, 'report');
+            await flushAllUpdates();
+
+            // When a second local match hydrates and Auth's order covers only the first one
+            getSearchOptionsSpy.mockReturnValue({
+                options: {
+                    recentReports: [aliceReport, bobReport],
+                    personalDetails: [],
+                    currentUserOption: null,
+                    userToInvite: null,
+                },
+            });
+            // Hand back a new options reference so the memo over getSearchOptions recomputes. Swapping the mock's
+            // return value alone leaves the cached client matches in place, so the hydrated report never arrives.
             mockUseFilteredOptions.mockReturnValue({
                 options: {...mockedOptions},
                 isLoading: false,
@@ -808,37 +888,95 @@ describe('SearchAutocompleteList', () => {
                 getReportByID: createGetReportByID(mockedReports),
             });
             await act(async () => {
+                await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, [aliceReport.reportID]);
                 await Onyx.set(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS, false);
             });
             await flushAllUpdates();
 
-            // Verify "Search results" section appears (the server result goes there)
-            await waitFor(() => {
-                expect(screen.getByText('Search results')).toBeTruthy();
+            // Then the omitted chat is still shown. Auth's list orders the results, it does not decide which of the
+            // user's own chats are visible, so a local match absent from that list must not be filtered out.
+            const names = screen
+                .queryAllByText(/Report$/)
+                .map((el) => (typeof el.props.children === 'string' ? el.props.children : ''))
+                .filter((name) => fakeRecentReports.map(({text}) => text).includes(name));
+
+            expect(names).toEqual([aliceReport.text, bobReport.text]);
+        });
+
+        it('keeps the local candidate pool capped once the server returns an order', async () => {
+            // Given locally available reports
+            await waitForBatchedUpdates();
+            await Onyx.multiSet({
+                ...mockedReports,
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
+                [ONYXKEYS.BETAS]: mockedBetas,
             });
 
-            // Verify the new server-only result appears
-            expect(screen.getByText('NewServer Report')).toBeTruthy();
-            expect(screen.getByText('Uncached Test User')).toBeTruthy();
+            // And the search router is open
+            render(<SearchRouterWrapper />);
+            await flushAllUpdates();
 
-            // Verify that local results maintain their FROZEN order (Alice < Bob < Charlie)
-            // even though the mock now returns them as Charlie, Alice, Bob.
-            // Check ordering by examining the sequence of rendered text nodes.
-            const allTexts = screen.queryAllByText(/Report$/);
-            const names = allTexts.map((el) => {
-                // React Native Testing Library text elements expose their content via children
-                const textContent = typeof el.props.children === 'string' ? el.props.children : '';
-                return textContent;
+            // When the user searches before Auth responds
+            const textInput = screen.getByTestId('search-autocomplete-text-input');
+            fireEvent.changeText(textInput, 'test');
+            await flushAllUpdates();
+
+            // Then the local result candidate pool uses the suggestion limit
+            expect(getSearchOptionsSpy).toHaveBeenLastCalledWith(expect.objectContaining({maxResults: CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS}));
+
+            // When Auth returns the server result order
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['101']);
+                await Onyx.set(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS, false);
             });
+            await flushAllUpdates();
+
+            // Then the local result candidate pool remains capped; the server-only validation pass only receives its one ID.
+            expect(getSearchOptionsSpy).toHaveBeenCalledWith(expect.objectContaining({maxResults: CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS}));
+            expect(getSearchOptionsSpy).toHaveBeenLastCalledWith(expect.objectContaining({maxResults: 1}));
+        });
+
+        it('keeps a matched self-DM first in Recent chats when Auth returns it', async () => {
+            // Given a matched self-DM, a local report, and a server report
+            const selfDM = {reportID: 'self', keyForList: 'self', text: 'My space', alternateText: '', lastMessageText: '', isSelfDM: true};
+            const localReport = {reportID: 'local', keyForList: 'local', text: 'My space local', alternateText: '', lastMessageText: ''};
+            const serverReport = {reportID: 'server', keyForList: 'server', text: 'My space server', alternateText: '', lastMessageText: ''};
+            getSearchOptionsSpy.mockImplementation((params: {includeCurrentUser?: boolean}) => ({
+                options: {
+                    recentReports: params.includeCurrentUser ? [localReport, selfDM] : [selfDM, serverReport],
+                    personalDetails: [],
+                    currentUserOption: null,
+                    userToInvite: null,
+                },
+            }));
+
+            await waitForBatchedUpdates();
+            await Onyx.multiSet({
+                ...mockedReports,
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
+                [ONYXKEYS.BETAS]: mockedBetas,
+            });
+
+            // And the search router is open
+            render(<SearchRouterWrapper />);
+            await flushAllUpdates();
+
+            // When the user enters a query matching all three reports
+            const textInput = screen.getByTestId('search-autocomplete-text-input');
+            fireEvent.changeText(textInput, 'space');
+            await flushAllUpdates();
+
+            // And Auth returns the server report before the self-DM
+            await act(async () => {
+                await Onyx.set(ONYXKEYS.RAM_ONLY_SEARCH_RESULT_REPORT_IDS, ['server', 'self']);
+                await Onyx.set(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS, false);
+            });
+            await flushAllUpdates();
 
-            // Filter to only the names we care about
-            const relevantOrder = names.filter((n: string) => ['Alice Report', 'Bob Report', 'Charlie Report', 'NewServer Report'].includes(n));
+            const names = screen.queryAllByText(/My space/).map((element) => (typeof element.props.children === 'string' ? element.props.children : ''));
 
-            // Alice, Bob, Charlie should appear in that order (frozen rank), with NewServer after them
-            expect(relevantOrder.indexOf('Alice Report')).toBeLessThan(relevantOrder.indexOf('Bob Report'));
-            expect(relevantOrder.indexOf('Bob Report')).toBeLessThan(relevantOrder.indexOf('Charlie Report'));
-            // NewServer should appear after the local results (in the server section)
-            expect(relevantOrder.indexOf('Charlie Report')).toBeLessThan(relevantOrder.indexOf('NewServer Report'));
+            // Then the self-DM remains first, followed by the other local and server matches
+            expect(names).toEqual(['My space', 'My space local', 'My space server']);
         });
 
         // Regression test for https://github.com/Expensify/App/issues/93009: after the two-section switcher was
diff --git a/tests/unit/SearchAutocompleteUtilsTest.ts b/tests/unit/SearchAutocompleteUtilsTest.ts
index c22a11bc2d87..f69afc8f54ab 100644
--- a/tests/unit/SearchAutocompleteUtilsTest.ts
+++ b/tests/unit/SearchAutocompleteUtilsTest.ts
@@ -137,6 +137,19 @@ describe('SearchAutocompleteUtils', () => {
             expect(result).toEqual([]);
         });
 
+        it('should highlight VENDOR filter with a typed vendor name', () => {
+            // Given a typed vendor filter, whose names are matched by text on the server
+            const input = 'vendor:"Acme Tools"';
+
+            // When the input is parsed for highlighting
+            const result = parseForLiveMarkdown(input, currentUserName, mockSubstitutionMap, mockUserLogins, mockCurrencyList, mockCategoryList, mockTagList, mockExportedToList);
+
+            // Then the vendor value is highlighted like other free-text filters
+            expect(result).toEqual([
+                {start: 7, type: 'mention-user', length: 12}, // vendor:"Acme Tools"
+            ]);
+        });
+
         it('should highlight EXPORTED_TO filter when value is in predefined integrations or custom template list', () => {
             const input = 'exported-to:Xero';
 
diff --git a/tests/unit/SearchEditMultipleTagPageTest.tsx b/tests/unit/SearchEditMultipleTagPageTest.tsx
new file mode 100644
index 000000000000..75145d17d75f
--- /dev/null
+++ b/tests/unit/SearchEditMultipleTagPageTest.tsx
@@ -0,0 +1,214 @@
+import {act, render} from '@testing-library/react-native';
+
+import type {SelectionListWithSectionsProps} from '@components/SelectionList/SelectionListWithSections/types';
+import type {ListItem} from '@components/SelectionList/types';
+
+import type * as BulkEditActions from '@libs/actions/IOU/BulkEdit';
+
+import SearchEditMultipleTagPage from '@pages/Search/SearchEditMultiple/SearchEditMultipleTagPage';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, PolicyTagLists, Transaction} from '@src/types/onyx';
+
+import type * as ReactNavigation from '@react-navigation/native';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../utils/collections/policies';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+const POLICY_ID = 'A1B2C3';
+
+type SavedTagPayload = {tag: string | null; bulkEditTagChanges: Record<string, string | null>};
+
+// Capture the props TagPicker passes to SelectionList so we can fire its onSelectRow (that is saveTag).
+const mockSelectionList = jest.fn<null, [SelectionListWithSectionsProps<ListItem>]>(() => null);
+jest.mock('@components/SelectionList/SelectionListWithSections', () => ({
+    __esModule: true,
+    default: (props: SelectionListWithSectionsProps<ListItem>) => mockSelectionList(props),
+}));
+
+// Strip the chrome so the page renders in jsdom without navigation/safe-area plumbing.
+jest.mock('@components/ScreenWrapper', () => (props: {children: React.ReactNode}) => props.children);
+jest.mock('@components/HeaderWithBackButton', () => () => null);
+
+// The page resolves its policyID from the search selection; pin it so we only exercise saveTag.
+jest.mock('@hooks/useSearchBulkEditPolicyID', () => ({__esModule: true, default: () => POLICY_ID}));
+
+// Capture the payload saveTag records, instead of merging it into Onyx, so the assertion is exact.
+const mockUpdateBulkEditDraftTransaction = jest.fn<void, [SavedTagPayload]>();
+jest.mock('@libs/actions/IOU/BulkEdit', () => {
+    const actual = jest.requireActual<typeof BulkEditActions>('@libs/actions/IOU/BulkEdit');
+    return {...actual, updateBulkEditDraftTransaction: (payload: SavedTagPayload) => mockUpdateBulkEditDraftTransaction(payload)};
+});
+
+jest.mock('@libs/Navigation/Navigation', () => ({__esModule: true, default: {goBack: jest.fn()}}));
+
+let mockTagListIndex = '0';
+jest.mock('@react-navigation/native', () => {
+    const actual = jest.requireActual<typeof ReactNavigation>('@react-navigation/native');
+    return {
+        ...actual,
+        useRoute: () => ({params: {tagListIndex: mockTagListIndex}}),
+        useIsFocused: () => true,
+        useFocusEffect: jest.fn(),
+        useNavigation: () => ({isFocused: () => true, addListener: () => () => {}}),
+    };
+});
+
+function makePolicy(hasMultipleTagLists: boolean): Policy {
+    return {...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM), id: POLICY_ID, areTagsEnabled: true, hasMultipleTagLists};
+}
+
+// Build numeric-string keys programmatically since a `{0: ...}` literal trips the naming-convention lint rule.
+function seedChanges(entries: Array<[number, string]>): Record<string, string> {
+    return Object.fromEntries(entries.map(([index, value]) => [String(index), value]));
+}
+function expectChanges(entries: Array<[number, string | null]>): Record<string, string | null> {
+    return Object.fromEntries(entries.map(([index, value]) => [String(index), value]));
+}
+
+const SINGLE_TAGS: PolicyTagLists = {
+    Tag: {name: 'Tag', orderWeight: 0, required: false, tags: {TagA: {name: 'TagA', enabled: true}}},
+};
+
+const INDEPENDENT_TAGS: PolicyTagLists = {
+    Region: {name: 'Region', orderWeight: 0, required: false, tags: {R1: {name: 'R1', enabled: true}}},
+    Project: {name: 'Project', orderWeight: 1, required: false, tags: {P7: {name: 'P7', enabled: true}}},
+};
+
+const DEPENDENT_TAGS: PolicyTagLists = {
+    CostCenter: {name: 'CostCenter', orderWeight: 0, required: false, tags: {CostCenterA: {name: 'CostCenterA', enabled: true}}},
+    Indication: {name: 'Indication', orderWeight: 1, required: false, tags: {IndicationX: {name: 'IndicationX', enabled: true, parentTagsFilter: 'CostCenterA'}}},
+};
+
+async function renderAndTap({
+    policy,
+    policyTags,
+    draft,
+    selectedTransactions,
+    tagListIndex,
+    tappedTag,
+}: {
+    policy: Policy;
+    policyTags: PolicyTagLists;
+    draft: Partial<Transaction>;
+    // Real transactions behind the selected IDs, only needed for the first-open auto-selection tests.
+    selectedTransactions?: Record<string, Partial<Transaction>>;
+    tagListIndex: number;
+    tappedTag: string;
+}): Promise<SavedTagPayload | undefined> {
+    mockTagListIndex = String(tagListIndex);
+    await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
+    await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${POLICY_ID}`, policyTags);
+    for (const [transactionID, transaction] of Object.entries(selectedTransactions ?? {})) {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, transaction);
+    }
+    await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_BULK_EDIT_TRANSACTION_ID}`, draft);
+
+    render(<SearchEditMultipleTagPage />);
+    await waitForBatchedUpdatesWithAct();
+
+    const onSelectRow = mockSelectionList.mock.calls.at(-1)?.[0].onSelectRow;
+    const tappedOption: ListItem = {keyForList: tappedTag, searchText: tappedTag};
+    await act(async () => {
+        onSelectRow?.(tappedOption);
+    });
+
+    return mockUpdateBulkEditDraftTransaction.mock.calls.at(-1)?.[0];
+}
+
+describe('SearchEditMultipleTagPage saveTag (bulk-edit tag deselect, #100538)', () => {
+    beforeEach(async () => {
+        mockSelectionList.mockClear();
+        mockUpdateBulkEditDraftTransaction.mockClear();
+        await Onyx.clear();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('single tag list: select then deselect the same tag records no edit (the reported repro)', async () => {
+        const payload = await renderAndTap({
+            policy: makePolicy(false),
+            policyTags: SINGLE_TAGS,
+            // State right after the first tap selected TagA.
+            draft: {selectedTransactionIDs: ['t1', 't2'], tag: 'TagA', bulkEditTagChanges: seedChanges([[0, 'TagA']])},
+            tagListIndex: 0,
+            tappedTag: 'TagA',
+        });
+
+        // Intent deleted (null): apply time writes nothing, so no flicker and no MODIFIED_EXPENSE message.
+        expect(payload?.bulkEditTagChanges).toEqual(expectChanges([[0, null]]));
+    });
+
+    it('independent multi-level: deselecting the child leaves the shared parent intact', async () => {
+        const payload = await renderAndTap({
+            policy: makePolicy(true),
+            policyTags: INDEPENDENT_TAGS,
+            draft: {selectedTransactionIDs: ['t1'], tag: 'R1:P7', bulkEditTagChanges: seedChanges([[1, 'P7']])},
+            tagListIndex: 1,
+            tappedTag: 'P7',
+        });
+
+        // Child intent deleted, so apply time keeps each expense's own R1:P7 instead of collapsing to R1.
+        expect(payload?.bulkEditTagChanges).toEqual(expectChanges([[1, null]]));
+    });
+
+    it('independent multi-level: picking one list on first open does not auto-fill a sibling list', async () => {
+        // Pick R1 in the first list on first open, with a clean draft and both expenses carrying R1:P7.
+        const payload = await renderAndTap({
+            policy: makePolicy(true),
+            policyTags: INDEPENDENT_TAGS,
+            selectedTransactions: {t1: {tag: 'R1:P7'}, t2: {tag: 'R1:P7'}},
+            draft: {selectedTransactionIDs: ['t1', 't2']},
+            tagListIndex: 0,
+            tappedTag: 'R1',
+        });
+
+        // Only the Region intent is recorded; the sibling Project level is never pulled into the draft.
+        expect(payload?.bulkEditTagChanges).toEqual(expectChanges([[0, 'R1']]));
+        expect(payload?.tag).toBe('R1');
+    });
+
+    it('dependent multi-level: deselecting the child does not strip it (null-alone regression)', async () => {
+        const payload = await renderAndTap({
+            policy: makePolicy(true),
+            policyTags: DEPENDENT_TAGS,
+            draft: {selectedTransactionIDs: ['t1'], tag: 'CostCenterA:IndicationX', bulkEditTagChanges: seedChanges([[1, 'IndicationX']])},
+            tagListIndex: 1,
+            tappedTag: 'IndicationX',
+        });
+
+        // Child intent deleted, so apply time keeps CostCenterA:IndicationX untouched (null-alone regression).
+        expect(payload?.bulkEditTagChanges).toEqual(expectChanges([[1, null]]));
+    });
+
+    it('dependent multi-level: deselecting an auto-selected child still records a real clear', async () => {
+        const payload = await renderAndTap({
+            policy: makePolicy(true),
+            policyTags: DEPENDENT_TAGS,
+            // Parent auto-selected the child (no child intent recorded), so deselecting the child is a real clear, not an undo.
+            draft: {selectedTransactionIDs: ['t1'], tag: 'CostCenterA:IndicationX', bulkEditTagChanges: seedChanges([[0, 'CostCenterA']])},
+            tagListIndex: 1,
+            tappedTag: 'IndicationX',
+        });
+
+        // Keeps '' so apply time trims the child, preserving the behavior PR #97951 added.
+        expect(payload?.bulkEditTagChanges).toEqual(expectChanges([[1, '']]));
+    });
+
+    it('dependent multi-level: undoing the parent pick drops the intent even though it auto-selected a child', async () => {
+        const payload = await renderAndTap({
+            policy: makePolicy(true),
+            policyTags: DEPENDENT_TAGS,
+            // Only the parent intent is recorded, so tapping the parent again undoes that own pick.
+            draft: {selectedTransactionIDs: ['t1'], tag: 'CostCenterA:IndicationX', bulkEditTagChanges: seedChanges([[0, 'CostCenterA']])},
+            tagListIndex: 0,
+            tappedTag: 'CostCenterA',
+        });
+
+        // Undoing the parent deletes the intent and nets the whole subtree back to nothing.
+        expect(payload?.bulkEditTagChanges).toEqual(expectChanges([[0, null]]));
+    });
+});
diff --git a/tests/unit/SelectFeaturesEmptyTagGroupTest.tsx b/tests/unit/SelectFeaturesEmptyTagGroupTest.tsx
index 15facd5544db..03baebe0d0f4 100644
--- a/tests/unit/SelectFeaturesEmptyTagGroupTest.tsx
+++ b/tests/unit/SelectFeaturesEmptyTagGroupTest.tsx
@@ -16,6 +16,7 @@ import Onyx from 'react-native-onyx';
 import createRandomPolicy from '../utils/collections/policies';
 import createMock from '../utils/createMock';
 import getOnyxValue from '../utils/getOnyxValue';
+import {getGlobalFetchMock} from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 const POLICY_ID = '1';
@@ -114,6 +115,8 @@ describe('Select features pages with an empty tag group', () => {
     });
 
     beforeEach(async () => {
+        // Both pages send GetRules when they mount, so mock fetch to keep that request off the real network.
+        global.fetch = getGlobalFetchMock();
         mockSelectionListData.length = 0;
         mockSelectionListProps = undefined;
         await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, createRandomPolicy(Number(POLICY_ID)));
diff --git a/tests/unit/SelectableListItemTest.tsx b/tests/unit/SelectableListItemTest.tsx
index 890baecc47f8..1fa7ab0cdece 100644
--- a/tests/unit/SelectableListItemTest.tsx
+++ b/tests/unit/SelectableListItemTest.tsx
@@ -187,20 +187,12 @@ describe('SelectableListItem', () => {
         ['the defaults for an enabled, interactive row', {}, 'row-state-false-true-false'],
         ['the disabled state', {isDisabled: true}, 'row-state-true-true-false'],
         ['the non-interactive state from the item', {item: buildItem({isInteractive: false})}, 'row-state-false-false-false'],
-        ['the disabled accessible grouping when the row is not accessible as one unit', {accessible: false}, 'row-state-false-true-true'],
     ])('provides %s to children through ListItemContext', (_label, props, expectedTestID) => {
         renderItem({children: <RowStateProbe />, ...props});
 
         expect(screen.getByTestId(expectedTestID)).toBeVisible();
     });
 
-    it('reports hover as false to children when shouldDisableHoverStyle is set', () => {
-        renderItem({children: <HoverProbe />, shouldDisableHoverStyle: true});
-
-        fireEvent(screen.getByTestId(ROW_TEST_ID), 'mouseEnter');
-        expect(screen.getByTestId('hovered-false')).toBeVisible();
-    });
-
     it('renders the action element the item carries', () => {
         renderItem({item: buildItem({actionElement: <View testID="action" />})});
 
diff --git a/tests/unit/SelectionListOrderUtilsTest.ts b/tests/unit/SelectionListOrderUtilsTest.ts
index 6f013ac12b4b..8b8f9d585fa9 100644
--- a/tests/unit/SelectionListOrderUtilsTest.ts
+++ b/tests/unit/SelectionListOrderUtilsTest.ts
@@ -1,4 +1,4 @@
-import moveInitialSelectionToTop from '@libs/SelectionListOrderUtils';
+import moveInitialSelectionToTop, {shouldMoveInitialSelectionToTop} from '@libs/SelectionListOrderUtils';
 
 import CONST from '@src/CONST';
 
@@ -86,4 +86,15 @@ describe('SelectionListOrderUtils', () => {
             expect(valuesOf(moveInitialSelectionToTop(items, valuesOf(items)))).toEqual(valuesOf(items));
         });
     });
+
+    describe('shouldMoveInitialSelectionToTop', () => {
+        it('applies the pin only once the list reaches the global threshold (boundary is inclusive)', () => {
+            // Given item counts just below, at, and above the threshold
+            // When checking whether the pin applies to each
+            // Then only the counts at or above the threshold pin, matching moveInitialSelectionToTop's early return
+            expect(shouldMoveInitialSelectionToTop(CONST.STANDARD_LIST_ITEM_LIMIT - 1)).toBe(false);
+            expect(shouldMoveInitialSelectionToTop(CONST.STANDARD_LIST_ITEM_LIMIT)).toBe(true);
+            expect(shouldMoveInitialSelectionToTop(CONST.STANDARD_LIST_ITEM_LIMIT + 1)).toBe(true);
+        });
+    });
 });
diff --git a/tests/unit/SidePanelOnboardingVariantReportTest.tsx b/tests/unit/SidePanelOnboardingVariantReportTest.tsx
new file mode 100644
index 000000000000..c7240a1c5278
--- /dev/null
+++ b/tests/unit/SidePanelOnboardingVariantReportTest.tsx
@@ -0,0 +1,93 @@
+import {renderHook, waitFor} from '@testing-library/react-native';
+
+import SidePanelContextProvider from '@components/SidePanel/SidePanelContextProvider';
+
+import useSidePanelDisplayStatus from '@hooks/useSidePanelDisplayStatus';
+import useSidePanelReportID from '@hooks/useSidePanelReportID';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnboardingRHPVariant} from '@src/types/onyx';
+
+import type {PropsWithChildren} from 'react';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../utils/collections/policies';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@hooks/useSidePanelDisplayStatus');
+
+const mockUseSidePanelDisplayStatus = jest.mocked(useSidePanelDisplayStatus);
+
+const POLICY_ID = 'POLICY_1';
+const ADMINS_ROOM_REPORT_ID = '200';
+const CONCIERGE_REPORT_ID = '100';
+const ADMIN_EMAIL = 'admin@example.com';
+
+function wrapper({children}: PropsWithChildren) {
+    return <SidePanelContextProvider>{children}</SidePanelContextProvider>;
+}
+
+/**
+ * Sets up an admin of an active workspace whose #admins room exists. That is the account shape where the older RHP arms
+ * point the side panel at #admins, so it is the shape that proves which report a variant opens.
+ */
+async function setUpWorkspaceAdmin(variant: OnboardingRHPVariant) {
+    await Onyx.multiSet({
+        [ONYXKEYS.SESSION]: {email: ADMIN_EMAIL, accountID: 1},
+        [ONYXKEYS.CONCIERGE_REPORT_ID]: CONCIERGE_REPORT_ID,
+        [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: POLICY_ID,
+        [ONYXKEYS.NVP_ONBOARDING_RHP_VARIANT]: variant,
+    });
+    await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {
+        ...createRandomPolicy(1, CONST.POLICY.TYPE.TEAM),
+        id: POLICY_ID,
+        role: CONST.POLICY.ROLE.ADMIN,
+        chatReportIDAdmins: Number(ADMINS_ROOM_REPORT_ID),
+        pendingAction: null,
+    });
+    await waitForBatchedUpdates();
+}
+
+describe('SidePanelContextProvider report for the onboarding RHP variants', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+        // The user opens the side panel without asking for a specific report, the way the Concierge button on Home does
+        mockUseSidePanelDisplayStatus.mockReturnValue({
+            sidePanelNVP: {open: true, openNarrowScreen: false, forceConcierge: false},
+            shouldHideSidePanel: false,
+            isSidePanelHiddenOrLargeScreen: false,
+            shouldHideHelpButton: true,
+            shouldHideSidePanelBackdrop: true,
+        });
+    });
+
+    it('opens the Concierge DM, not #admins, for the homePageNoRHP variant', async () => {
+        // Given a workspace admin in the homePageNoRHP arm, whose #admins room exists
+        await setUpWorkspaceAdmin(CONST.ONBOARDING_RHP_VARIANT.HOME_PAGE_NO_RHP);
+
+        // When the side panel is opened from Home
+        const {result} = renderHook(() => useSidePanelReportID(), {wrapper});
+
+        // Then it shows the Concierge DM, because this arm keeps onboarding on Home and does not use #admins
+        await waitFor(() => expect(result.current).toBe(CONCIERGE_REPORT_ID));
+    });
+
+    it('still opens #admins for the rhpAdminsRoom variant', async () => {
+        // Given the same admin in the rhpAdminsRoom arm, which the running experiment still relies on
+        await setUpWorkspaceAdmin(CONST.ONBOARDING_RHP_VARIANT.RHP_ADMINS_ROOM);
+
+        // When the side panel is opened
+        const {result} = renderHook(() => useSidePanelReportID(), {wrapper});
+
+        // Then it still shows #admins, so the new arm leaves the existing arms unchanged
+        await waitFor(() => expect(result.current).toBe(ADMINS_ROOM_REPORT_ID));
+    });
+});
diff --git a/tests/unit/SpendCategorySelectorListItemTest.tsx b/tests/unit/SpendCategorySelectorListItemTest.tsx
deleted file mode 100644
index 3e9f74b60345..000000000000
--- a/tests/unit/SpendCategorySelectorListItemTest.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import {fireEvent, render, screen, waitFor} from '@testing-library/react-native';
-
-import SpendCategorySelectorListItem from '@components/SelectionList/ListItem/SpendCategorySelectorListItem';
-import type {ListItem} from '@components/SelectionList/ListItem/types';
-
-import CONST from '@src/CONST';
-
-import React from 'react';
-
-const buildItem = (extra: Partial<ListItem> = {}): ListItem => ({
-    keyForList: 'meals',
-    groupID: 'meals',
-    categoryID: 'Food &amp; Drink',
-    ...extra,
-});
-
-describe('SpendCategorySelectorListItem', () => {
-    it('renders nothing without a groupID', () => {
-        render(
-            <SpendCategorySelectorListItem
-                item={buildItem({groupID: undefined})}
-                showTooltip={false}
-                onSelectRow={jest.fn()}
-            />,
-        );
-
-        expect(screen.queryByTestId(`${CONST.BASE_LIST_ITEM_TEST_ID}meals`)).toBeNull();
-    });
-
-    it('renders the decoded category name under the capitalized group label', () => {
-        render(
-            <SpendCategorySelectorListItem
-                item={buildItem()}
-                showTooltip={false}
-                onSelectRow={jest.fn()}
-            />,
-        );
-
-        expect(screen.getByText('Food & Drink')).toBeOnTheScreen();
-        expect(screen.getByText('Meals')).toBeOnTheScreen();
-    });
-
-    it('selects the row when it is pressed', async () => {
-        const onSelectRow = jest.fn();
-        const item = buildItem();
-        render(
-            <SpendCategorySelectorListItem
-                item={item}
-                showTooltip={false}
-                onSelectRow={onSelectRow}
-            />,
-        );
-
-        fireEvent.press(screen.getByTestId(`${CONST.BASE_LIST_ITEM_TEST_ID}meals`));
-
-        await waitFor(() => expect(onSelectRow).toHaveBeenCalledWith(item, undefined, undefined));
-    });
-});
diff --git a/tests/unit/StringUtilsTest.ts b/tests/unit/StringUtilsTest.ts
index ecea2bcd113d..ee035d321656 100644
--- a/tests/unit/StringUtilsTest.ts
+++ b/tests/unit/StringUtilsTest.ts
@@ -196,4 +196,11 @@ second
             expect(result.charCodeAt(5)).toBe(0xa0);
         });
     });
+
+    describe('sanitizeName', () => {
+        it('converts non-breaking spaces and trims surrounding whitespace', () => {
+            expect(StringUtils.sanitizeName(`\u00A0Paris\u00A0`)).toBe('Paris');
+            expect(StringUtils.sanitizeName(`  Custom rate  `)).toBe('Custom rate');
+        });
+    });
 });
diff --git a/tests/unit/SymbolDisposePolyfillTest.ts b/tests/unit/SymbolDisposePolyfillTest.ts
new file mode 100644
index 000000000000..055c0b357568
--- /dev/null
+++ b/tests/unit/SymbolDisposePolyfillTest.ts
@@ -0,0 +1,125 @@
+import installDisposeSymbols from '@src/polyfills/SymbolDispose.web';
+import type {DisposeSymbolHost} from '@src/polyfills/SymbolDispose.web';
+
+/** Without a native symbol, `[Symbol.dispose]` coerces to the key "undefined" */
+function toPropertyKey(disposeSymbol: symbol | undefined): PropertyKey {
+    return disposeSymbol ?? 'undefined';
+}
+
+/** Mirrors Skia's web BaseHostObject: method key read once, `dispose()` rereads `Symbol.dispose` on every call */
+function createSkiaStyleHostObject(symbolHost: DisposeSymbolHost, cleanup: () => void) {
+    const hostObject = {
+        dispose() {
+            const method: unknown = Reflect.get(hostObject, toPropertyKey(symbolHost.dispose));
+            if (typeof method !== 'function') {
+                throw new TypeError('this[Symbol.dispose] is not a function');
+            }
+            cleanup();
+        },
+    };
+    Reflect.set(hostObject, toPropertyKey(symbolHost.dispose), cleanup);
+    return hostObject;
+}
+
+describe('SymbolDispose polyfill', () => {
+    it('installs the registered symbols when the engine lacks them', () => {
+        // Given an engine without Symbol.dispose. Node has it natively, so use a fake constructor
+        const fakeSymbol: DisposeSymbolHost = {};
+
+        // When the polyfill runs
+        installDisposeSymbols(fakeSymbol);
+
+        // Then both are the registered symbols Babel, SWC and core-js use
+        expect(fakeSymbol.dispose).toBe(Symbol.for('Symbol.dispose'));
+        expect(fakeSymbol.asyncDispose).toBe(Symbol.for('Symbol.asyncDispose'));
+    });
+
+    it('ignores a later script reassigning the symbol', () => {
+        // Given the polyfill has installed Symbol.dispose
+        const fakeSymbol: DisposeSymbolHost = {};
+        installDisposeSymbols(fakeSymbol);
+
+        // When a later script tries to replace it
+        const wasReassigned = Reflect.set(fakeSymbol, 'dispose', Symbol('late'));
+        const wasRedefined = Reflect.defineProperty(fakeSymbol, 'dispose', {value: Symbol('late')});
+
+        // Then both attempts are rejected
+        expect(wasReassigned).toBe(false);
+        expect(wasRedefined).toBe(false);
+        expect(fakeSymbol.dispose).toBe(Symbol.for('Symbol.dispose'));
+    });
+
+    it('leaves an existing native symbol untouched', () => {
+        // Given native symbols, which are non-writable and non-configurable
+        const nativeDispose = Symbol('native dispose');
+        const nativeAsyncDispose = Symbol('native asyncDispose');
+        const fakeSymbol: DisposeSymbolHost = {};
+        Object.defineProperty(fakeSymbol, 'dispose', {value: nativeDispose, writable: false, configurable: false});
+        Object.defineProperty(fakeSymbol, 'asyncDispose', {value: nativeAsyncDispose, writable: false, configurable: false});
+        const nativeDescriptor = Object.getOwnPropertyDescriptor(fakeSymbol, 'dispose');
+
+        // When the polyfill runs
+        installDisposeSymbols(fakeSymbol);
+
+        // Then symbols and descriptors are unchanged
+        expect(fakeSymbol.dispose).toBe(nativeDispose);
+        expect(fakeSymbol.asyncDispose).toBe(nativeAsyncDispose);
+        expect(Object.getOwnPropertyDescriptor(fakeSymbol, 'dispose')).toEqual(nativeDescriptor);
+    });
+
+    it('keeps and locks a writable symbol installed by an earlier script', () => {
+        // Given an earlier script (e.g. an extension) defined a writable Symbol.dispose
+        const earlyDispose = Symbol('early');
+        const fakeSymbol: DisposeSymbolHost = {dispose: earlyDispose};
+
+        // When the polyfill runs and a later script tries to replace it
+        installDisposeSymbols(fakeSymbol);
+        const wasReassigned = Reflect.set(fakeSymbol, 'dispose', Symbol('late'));
+
+        // Then the early symbol is kept and the replacement is rejected
+        expect(wasReassigned).toBe(false);
+        expect(fakeSymbol.dispose).toBe(earlyDispose);
+    });
+
+    it('reproduces the Skia key mismatch when the polyfill did not run', () => {
+        // Given no Symbol.dispose, so a Skia-style object keys its method as "undefined"
+        const fakeSymbol: DisposeSymbolHost = {};
+        const hostObject = createSkiaStyleHostObject(fakeSymbol, jest.fn());
+
+        // When a later script defines the symbol
+        fakeSymbol.dispose = Symbol('late');
+
+        // Then dispose() throws the Sentry error
+        expect(() => hostObject.dispose()).toThrow('this[Symbol.dispose] is not a function');
+    });
+
+    it('keeps a Skia-style dispose() delegation working after an attempted reassignment', () => {
+        // Given the polyfill ran before a Skia-style object was created
+        const fakeSymbol: DisposeSymbolHost = {};
+        installDisposeSymbols(fakeSymbol);
+        const cleanup = jest.fn();
+        const hostObject = createSkiaStyleHostObject(fakeSymbol, cleanup);
+
+        // When a later script tries to replace the symbol and the object is disposed
+        Reflect.set(fakeSymbol, 'dispose', Symbol('late'));
+        hostObject.dispose();
+
+        // Then the method is still found
+        expect(cleanup).toHaveBeenCalledTimes(1);
+    });
+
+    it('keeps a Skia-style dispose() working when an early symbol is later overwritten', () => {
+        // Given an early writable symbol, then the polyfill, then a Skia-style object
+        const fakeSymbol: DisposeSymbolHost = {dispose: Symbol('early')};
+        installDisposeSymbols(fakeSymbol);
+        const cleanup = jest.fn();
+        const hostObject = createSkiaStyleHostObject(fakeSymbol, cleanup);
+
+        // When a later script tries to replace the symbol and the object is disposed
+        Reflect.set(fakeSymbol, 'dispose', Symbol('late'));
+        hostObject.dispose();
+
+        // Then the method is still found
+        expect(cleanup).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/tests/unit/TagUtilsTest.ts b/tests/unit/TagUtilsTest.ts
index 77742dc4f3ed..5da29a651968 100644
--- a/tests/unit/TagUtilsTest.ts
+++ b/tests/unit/TagUtilsTest.ts
@@ -1,4 +1,4 @@
-import {getDecodedTagName, isTagMissing, trimTag} from '@libs/TagUtils';
+import {getDecodedTagName, getTagNameError, isTagMissing, trimTag} from '@libs/TagUtils';
 
 import CONST from '@src/CONST';
 
@@ -88,4 +88,54 @@ describe('TagUtils', () => {
             expect(getDecodedTagName('&quot;hello&quot;')).toBe('"hello"');
         });
     });
+
+    describe('getTagNameError', () => {
+        const encodedResearchAndDevelopment = 'R&amp;D';
+        const tags = {
+            Engineering: {name: 'Engineering', enabled: true},
+            [encodedResearchAndDevelopment]: {name: encodedResearchAndDevelopment, enabled: true},
+        };
+
+        it('does not flag an HTML-encoded tag as a duplicate of its decoded name', () => {
+            expect(getTagNameError(tags, 'R&D', 'R&D')).toBeUndefined();
+        });
+
+        it('flags a decoded name that already exists as an encoded tag', () => {
+            expect(getTagNameError(tags, 'R&D')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+            expect(getTagNameError(tags, 'R&D', 'Engineering')).toBe(CONST.INPUT_VALIDATION_ERRORS.EXISTING);
+        });
+
+        it('returns tooLong when a colon pushes the escaped stored name over the limit', () => {
+            // Given a 255-character name with one colon. Persistence turns `:` into `\:`, so the stored name is 256 characters.
+            const nameWithColon = `${'a'.repeat(CONST.API_TRANSACTION_TAG_MAX_LENGTH - 1)}:`;
+
+            // When we validate the name for create, edit, or inline
+            const error = getTagNameError(undefined, nameWithColon);
+
+            // Then it is too long because expense submit rejects stored tags over the API max
+            expect(error).toBe(CONST.INPUT_VALIDATION_ERRORS.TOO_LONG);
+        });
+
+        it('accepts a name at the limit when escaping does not add characters', () => {
+            // Given a 255-character name with no colons, so the stored name stays 255 characters
+            const name = 'a'.repeat(CONST.API_TRANSACTION_TAG_MAX_LENGTH);
+
+            // When we validate it
+            const error = getTagNameError(undefined, name);
+
+            // Then it is accepted
+            expect(error).toBeUndefined();
+        });
+
+        it('accepts a name with a colon when the escaped length is still within the limit', () => {
+            // Given 254 characters including one colon, which stores as 255 characters
+            const nameWithColon = `${'a'.repeat(CONST.API_TRANSACTION_TAG_MAX_LENGTH - 2)}:`;
+
+            // When we validate it
+            const error = getTagNameError(undefined, nameWithColon);
+
+            // Then it is accepted because the persisted name is not over the API max
+            expect(error).toBeUndefined();
+        });
+    });
 });
diff --git a/tests/unit/TelemetrySynchronizerTest.ts b/tests/unit/TelemetrySynchronizerTest.ts
index 80be57b0114c..a27ec1240645 100644
--- a/tests/unit/TelemetrySynchronizerTest.ts
+++ b/tests/unit/TelemetrySynchronizerTest.ts
@@ -223,6 +223,8 @@ describe('TelemetrySynchronizer', () => {
             await waitForBatchedUpdatesWithAct();
 
             expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_REPORTS_COUNT_RAW]).toBe(3);
+            // Then the tier tag rides along with the raw count, so dashboards can group by one and drill into the other
+            expect(Sentry.setTag).toHaveBeenCalledWith(CONST.TELEMETRY.TAGS.REPORTS_COUNT, CONST.TELEMETRY.SIZE_TIER.SMALL);
         });
 
         it('should register personal_details_count_raw when the personal details list changes', async () => {
@@ -232,6 +234,7 @@ describe('TelemetrySynchronizer', () => {
             await waitForBatchedUpdatesWithAct();
 
             expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_PERSONAL_DETAILS_COUNT_RAW]).toBe(2);
+            expect(Sentry.setTag).toHaveBeenCalledWith(CONST.TELEMETRY.TAGS.PERSONAL_DETAILS_COUNT, CONST.TELEMETRY.SIZE_TIER.SMALL);
         });
 
         it('should register transactions_count_raw when the transaction collection changes', async () => {
@@ -242,6 +245,7 @@ describe('TelemetrySynchronizer', () => {
             await waitForBatchedUpdatesWithAct();
 
             expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_TRANSACTIONS_COUNT_RAW]).toBe(2);
+            expect(Sentry.setTag).toHaveBeenCalledWith(CONST.TELEMETRY.TAGS.TRANSACTIONS_COUNT, CONST.TELEMETRY.SIZE_TIER.SMALL);
         });
 
         it('should register policies_count_raw with the active policies count', async () => {
@@ -263,6 +267,7 @@ describe('TelemetrySynchronizer', () => {
             await waitForBatchedUpdatesWithAct();
 
             expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_POLICIES_COUNT_RAW]).toBe(2);
+            expect(Sentry.setTag).toHaveBeenCalledWith(CONST.TELEMETRY.TAGS.POLICIES_COUNT, CONST.TELEMETRY.SIZE_TIER.MEDIUM);
         });
 
         it('clears the span attributes on sign-out without touching the Sentry tags', async () => {
diff --git a/tests/unit/TransactionGroupListItemTest.tsx b/tests/unit/TransactionGroupListItemTest.tsx
index 4ec4f093beba..a97710435c41 100644
--- a/tests/unit/TransactionGroupListItemTest.tsx
+++ b/tests/unit/TransactionGroupListItemTest.tsx
@@ -536,9 +536,9 @@ describe('Empty Report Selection', () => {
         fireEvent.press(checkbox);
         await waitForBatchedUpdatesWithAct();
 
-        // Then onCheckboxPress should be called with the empty report and undefined (for groupBy reports)
+        // Then onCheckboxPress should be called with the empty report, undefined transactions, and no shiftKey
         expect(mockOnCheckboxPress).toHaveBeenCalledTimes(1);
-        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockEmptyReport, undefined);
+        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockEmptyReport, undefined, undefined);
     });
 
     it('should call onCheckboxPress multiple times when checkbox is clicked multiple times', async () => {
@@ -584,7 +584,7 @@ describe('Empty Report Selection', () => {
         await waitForBatchedUpdatesWithAct();
 
         expect(mockOnCheckboxPress).toHaveBeenCalledTimes(1);
-        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockEmptyReport, undefined);
+        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockEmptyReport, undefined, undefined);
 
         unmountEmpty();
         mockOnCheckboxPress.mockClear();
@@ -605,7 +605,7 @@ describe('Empty Report Selection', () => {
         await waitForBatchedUpdatesWithAct();
 
         expect(mockOnCheckboxPress).toHaveBeenCalledTimes(1);
-        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockNonEmptyReport, undefined);
+        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockNonEmptyReport, undefined, undefined);
 
         unmountNonEmpty();
     });
@@ -622,9 +622,9 @@ describe('Empty Report Selection', () => {
             expect(mockOnCheckboxPress).toHaveBeenCalledTimes(i);
         }
 
-        expect(mockOnCheckboxPress).toHaveBeenNthCalledWith(1, mockEmptyReport, undefined);
-        expect(mockOnCheckboxPress).toHaveBeenNthCalledWith(2, mockEmptyReport, undefined);
-        expect(mockOnCheckboxPress).toHaveBeenNthCalledWith(3, mockEmptyReport, undefined);
+        expect(mockOnCheckboxPress).toHaveBeenNthCalledWith(1, mockEmptyReport, undefined, undefined);
+        expect(mockOnCheckboxPress).toHaveBeenNthCalledWith(2, mockEmptyReport, undefined, undefined);
+        expect(mockOnCheckboxPress).toHaveBeenNthCalledWith(3, mockEmptyReport, undefined, undefined);
     });
 
     it('should show expandable content for non-empty reports', async () => {
@@ -749,7 +749,7 @@ describe('Lazily loaded group selection', () => {
 
         // Then the group should be selected
         expect(mockOnCheckboxPress).toHaveBeenCalledTimes(1);
-        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockCategoryGroup, []);
+        expect(mockOnCheckboxPress).toHaveBeenCalledWith(mockCategoryGroup, [], undefined);
     });
 
     it('should expand the group instead of selecting it when tapping the expand arrow', async () => {
diff --git a/tests/unit/TransactionPreviewUtils.test.ts b/tests/unit/TransactionPreviewUtils.test.ts
index 3190da8c721f..e62090f09de2 100644
--- a/tests/unit/TransactionPreviewUtils.test.ts
+++ b/tests/unit/TransactionPreviewUtils.test.ts
@@ -259,6 +259,35 @@ describe('TransactionPreviewUtils', () => {
             expect(result.displayAmountText.translationPath).toEqual('iou.receiptStatusTitle');
         });
 
+        it('blanks the displayed amount for a failed-scan amount placeholder', () => {
+            const functionArgs = {
+                ...basicProps,
+                transaction: {
+                    ...basicProps.transaction,
+                    amount: 0,
+                    iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                    receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+                },
+                originalTransaction: undefined,
+            };
+            const result = getTransactionPreviewTextAndTranslationPaths(functionArgs);
+            expect(result.displayAmountText.text).toEqual('');
+        });
+
+        it('does not blank a legitimate manual $0.00 amount', () => {
+            const functionArgs = {
+                ...basicProps,
+                transaction: {
+                    ...basicProps.transaction,
+                    amount: 0,
+                    iouRequestType: CONST.IOU.REQUEST_TYPE.MANUAL,
+                },
+                originalTransaction: undefined,
+            };
+            const result = getTransactionPreviewTextAndTranslationPaths(functionArgs);
+            expect(result.displayAmountText.text).toEqual('$0.00');
+        });
+
         it('handles currency and amount display correctly for scan split bill manually completed', () => {
             const modifiedAmount = 300;
             const currency = 'EUR';
diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts
index 39f78ff34619..62d066a421a5 100644
--- a/tests/unit/TransactionTest.ts
+++ b/tests/unit/TransactionTest.ts
@@ -22,7 +22,7 @@ import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {TransactionViolation} from '@src/types/onyx';
+import type {CardList, TransactionViolation} from '@src/types/onyx';
 import type {Attendee} from '@src/types/onyx/IOU';
 import type {Unit} from '@src/types/onyx/Policy';
 import type {ReportCollectionDataSet, ReportNextStep} from '@src/types/onyx/Report';
@@ -33,6 +33,7 @@ import type {ValueOf} from 'type-fest';
 
 import Onyx from 'react-native-onyx';
 import OnyxUtils from 'react-native-onyx/dist/OnyxUtils';
+import {createCashCard} from 'tests/utils/collections/card';
 
 import type {UpdateMoneyRequestDataKeys} from '../../src/libs/actions/IOU/UpdateMoneyRequest';
 import type {PersonalDetails, Policy, PolicyTagLists, RecentWaypoint, Report, ReportAction, ReportActions, Transaction} from '../../src/types/onyx';
@@ -115,6 +116,7 @@ function generateTransaction(values: Partial<Transaction> = {}): Transaction {
 }
 
 const CURRENT_USER_ID = 1;
+const CURRENT_USER_CASH_CARD_ID = 777;
 const FAKE_NEW_REPORT_ID = '2';
 const FAKE_OLD_REPORT_ID = '3';
 const FAKE_SELF_DM_REPORT_ID = '4';
@@ -187,6 +189,10 @@ describe('Transaction', () => {
     describe('changeTransactionsReport', () => {
         let reports: OnyxCollection<Report>;
 
+        afterEach(() => {
+            jest.restoreAllMocks();
+        });
+
         async function loadReports() {
             await TestHelper.getOnyxData({
                 key: ONYXKEYS.COLLECTION.REPORT,
@@ -240,6 +246,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
             const reportActions = await new Promise<OnyxEntry<ReportActions>>((resolve) => {
@@ -281,6 +288,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
             const reportActions = await new Promise<OnyxEntry<ReportActions>>((resolve) => {
@@ -332,6 +340,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -351,8 +360,14 @@ describe('Transaction', () => {
         it('correctly handles reportNextStep parameter when moving transactions to unreported report', async () => {
             const mockAPIWrite = jest.spyOn(API, 'write').mockResolvedValue(undefined);
 
+            // Given a cash transaction for the current user
+            const cardList: CardList = {
+                [CURRENT_USER_CASH_CARD_ID]: createCashCard(CURRENT_USER_ID, CURRENT_USER_CASH_CARD_ID),
+            };
+
             const transaction = generateTransaction({
                 reportID: FAKE_OLD_REPORT_ID,
+                cardID: CURRENT_USER_CASH_CARD_ID,
             });
             const oldIOUAction = createIOUAction(transaction);
 
@@ -384,6 +399,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList,
             });
             await waitForBatchedUpdates();
 
@@ -449,6 +465,7 @@ describe('Transaction', () => {
                 },
                 reports: undefined,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -529,6 +546,7 @@ describe('Transaction', () => {
                 },
                 reports: undefined,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -574,6 +592,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -632,6 +651,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -687,6 +707,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -733,6 +754,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -748,6 +770,40 @@ describe('Transaction', () => {
             mockAPIWrite.mockRestore();
         });
 
+        it('does not create an IOU action in the selfDM when undeleting a managed card transaction that belongs to another user', async () => {
+            // Given a deleted managed card transaction whose card is not in the current user's card list, so it belongs to another user
+            const transaction = generateTransaction({
+                reportID: FAKE_OLD_REPORT_ID,
+                managedCard: true,
+                cardID: 12345,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+            });
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction);
+            await Onyx.merge(ONYXKEYS.SELF_DM_REPORT_ID, FAKE_SELF_DM_REPORT_ID);
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${FAKE_SELF_DM_REPORT_ID}`, selfDM);
+            await loadReports();
+
+            // When the transaction is undeleted by moving it to the unreported report
+            changeTransactionsReport({
+                isVendorMatchingBetaEnabled: false,
+                transactionIDs: [transaction.transactionID],
+                isASAPSubmitBetaEnabled: false,
+                accountID: CURRENT_USER_ID,
+                email: 'test@example.com',
+                policy: undefined,
+                allTransactions: {[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: transaction},
+                policyTagList: undefined,
+                reports,
+                isTrackIntentUser: false,
+                cardList: undefined,
+            });
+            await waitForBatchedUpdates();
+
+            // Then no IOU action is written to the selfDM, since the current user has no access to the other user's selfDM
+            const selfDMActions = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${FAKE_SELF_DM_REPORT_ID}`);
+            expect(selfDMActions).toBeUndefined();
+        });
+
         it('should update the target report total when the currency is the same', async () => {
             const transaction = {
                 ...generateTransaction({
@@ -785,6 +841,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
             const report = await new Promise<OnyxEntry<Report>>((resolve) => {
@@ -837,6 +894,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
             const report = await new Promise<OnyxEntry<Report>>((resolve) => {
@@ -896,6 +954,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
             const report = await new Promise<OnyxEntry<Report>>((resolve) => {
@@ -955,6 +1014,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
             const report = await new Promise<OnyxEntry<Report>>((resolve) => {
@@ -1009,6 +1069,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1065,6 +1126,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1134,6 +1196,7 @@ describe('Transaction', () => {
                 policyTagList: undefined,
                 reports,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1232,6 +1295,7 @@ describe('Transaction', () => {
                     reports,
                     transactionViolations: {},
                     isTrackIntentUser: false,
+                    cardList: undefined,
                 });
 
                 await waitForBatchedUpdates();
@@ -1300,6 +1364,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
 
             await waitForBatchedUpdates();
@@ -1355,6 +1420,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
 
             await waitForBatchedUpdates();
@@ -1414,6 +1480,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1457,6 +1524,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1495,6 +1563,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1514,8 +1583,14 @@ describe('Transaction', () => {
             });
             await Onyx.merge(ONYXKEYS.SELF_DM_REPORT_ID, FAKE_SELF_DM_REPORT_ID);
 
+            // Given a cash transaction for the current user
+            const cardList: CardList = {
+                [CURRENT_USER_CASH_CARD_ID]: createCashCard(CURRENT_USER_ID, CURRENT_USER_CASH_CARD_ID),
+            };
+
             const transaction = generateTransaction({
                 reportID: FAKE_OLD_REPORT_ID,
+                cardID: CURRENT_USER_CASH_CARD_ID,
             });
             const oldIOUAction = createIOUAction(transaction);
             await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, transaction);
@@ -1536,6 +1611,7 @@ describe('Transaction', () => {
                 transactionViolations: {},
                 isTrackIntentUser: false,
                 isVendorMatchingBetaEnabled: false,
+                cardList,
             });
             await waitForBatchedUpdates();
 
@@ -1625,6 +1701,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1688,6 +1765,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1737,6 +1815,7 @@ describe('Transaction', () => {
                 transactionViolations: {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]: [receiptNoticeViolation]},
                 reports,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1802,6 +1881,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1852,6 +1932,7 @@ describe('Transaction', () => {
                 policyTagList: {},
                 reports,
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -1931,6 +2012,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -2019,6 +2101,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -2098,6 +2181,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -2178,6 +2262,7 @@ describe('Transaction', () => {
                 reports,
                 transactionViolations: {},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -2215,6 +2300,7 @@ describe('Transaction', () => {
                     isTrackIntentUser: false,
                     jsonQuery: FAKE_JSON_QUERY,
                     hash: FAKE_HASH,
+                    cardList: undefined,
                 });
                 await waitForBatchedUpdates();
 
@@ -2263,6 +2349,7 @@ describe('Transaction', () => {
                     isTrackIntentUser: false,
                     jsonQuery: FAKE_JSON_QUERY,
                     hash: FAKE_HASH,
+                    cardList: undefined,
                 });
                 await waitForBatchedUpdates();
 
@@ -2309,6 +2396,7 @@ describe('Transaction', () => {
                         isTrackIntentUser: false,
                         jsonQuery: FAKE_JSON_QUERY,
                         hash: FAKE_HASH,
+                        cardList: undefined,
                     });
                     await waitForBatchedUpdates();
 
@@ -2350,6 +2438,7 @@ describe('Transaction', () => {
                         isTrackIntentUser: false,
                         jsonQuery: FAKE_JSON_QUERY,
                         hash: FAKE_HASH,
+                        cardList: undefined,
                     });
                     await waitForBatchedUpdates();
 
@@ -2386,6 +2475,7 @@ describe('Transaction', () => {
                     isTrackIntentUser: false,
                     jsonQuery: undefined,
                     hash: FAKE_HASH,
+                    cardList: undefined,
                 });
                 await waitForBatchedUpdates();
 
@@ -2441,6 +2531,7 @@ describe('Transaction', () => {
                 transactionViolations: {},
                 reports: {[`${ONYXKEYS.COLLECTION.REPORT}${submittedReport.reportID}`]: submittedReport},
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
@@ -2498,6 +2589,7 @@ describe('Transaction', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT}${submittedDestinationReport.reportID}`]: submittedDestinationReport,
                 },
                 isTrackIntentUser: false,
+                cardList: undefined,
             });
             await waitForBatchedUpdates();
 
diff --git a/tests/unit/TransactionUtilsTest.ts b/tests/unit/TransactionUtilsTest.ts
index cc30ed973781..9c953820b8dc 100644
--- a/tests/unit/TransactionUtilsTest.ts
+++ b/tests/unit/TransactionUtilsTest.ts
@@ -3,6 +3,7 @@ import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import DateUtils from '@libs/DateUtils';
 import {translate as translateWithLocale} from '@libs/Localize';
 import {doesMoneyRequestDraftHaveUserInput, shouldShowBrokenConnectionViolation, shouldShowBrokenConnectionViolationForMultipleTransactions} from '@libs/TransactionUtils';
+import hasDistanceRouteErrors from '@libs/TransactionUtils/hasDistanceRouteErrors';
 
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
@@ -433,6 +434,58 @@ describe('TransactionUtils', () => {
     });
 
     describe('getUpdatedTransaction', () => {
+        it('should preserve a confirmed zero Scan amount while another field edit is pending', () => {
+            // Given a submitted Scan whose explicit zero survived a cache reset without its draft flag
+            const transaction = generateTransaction({
+                amount: 0,
+                modifiedAmount: '',
+                iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                merchant: 'Zero Scan',
+                receipt: {source: 'https://example.com/receipt.jpg', state: CONST.IOU.RECEIPT_STATE.OPEN},
+            });
+
+            // When the merchant is edited and marked pending while offline
+            const updatedTransaction = TransactionUtils.getUpdatedTransaction({
+                transaction,
+                isFromExpenseReport: true,
+                transactionChanges: {merchant: 'Zero Scan edited'},
+                personalPolicyOutputCurrency: undefined,
+                getCurrencyDecimals: getCurrencyDecimalsLocal,
+                getCurrencySymbol: getCurrencySymbolLocal,
+            });
+            updatedTransaction.pendingFields = {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+
+            // Then the optimistic edit retains proof that zero is valid instead of showing a missing-amount error
+            expect(updatedTransaction.isAmountSet).toBe(true);
+            expect(TransactionUtils.isFailedScanAmountPlaceholder(updatedTransaction)).toBe(false);
+        });
+
+        it('should keep a genuinely missing failed Scan amount missing while another field edit is pending', () => {
+            // Given a failed Scan whose zero is still an unconfirmed placeholder
+            const transaction = generateTransaction({
+                amount: 0,
+                modifiedAmount: '',
+                iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                merchant: 'Failed Scan',
+                receipt: {source: 'https://example.com/receipt.jpg', state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+            });
+
+            // When the merchant is edited and marked pending while offline
+            const updatedTransaction = TransactionUtils.getUpdatedTransaction({
+                transaction,
+                isFromExpenseReport: true,
+                transactionChanges: {merchant: 'Failed Scan edited'},
+                personalPolicyOutputCurrency: undefined,
+                getCurrencyDecimals: getCurrencyDecimalsLocal,
+                getCurrencySymbol: getCurrencySymbolLocal,
+            });
+            updatedTransaction.pendingFields = {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+
+            // Then the edit does not incorrectly confirm the missing amount
+            expect(updatedTransaction.isAmountSet).not.toBe(true);
+            expect(TransactionUtils.isFailedScanAmountPlaceholder(updatedTransaction)).toBe(true);
+        });
+
         it('should return updated category and tax when updating category with a category tax rules', () => {
             // Given a policy with tax expense rules associated with a category
             const category = 'Advertising';
@@ -1892,6 +1945,47 @@ describe('TransactionUtils', () => {
         });
     });
 
+    describe('hasDistanceRouteErrors', () => {
+        it('returns false when the route is clean', () => {
+            expect(hasDistanceRouteErrors(generateTransaction())).toBe(false);
+            expect(hasDistanceRouteErrors(generateTransaction({errors: {}, errorFields: {}}))).toBe(false);
+        });
+
+        it('returns true for a route or waypoint error', () => {
+            expect(hasDistanceRouteErrors(generateTransaction({errorFields: {route: {someError: 'No route found'}}}))).toBe(true);
+            expect(hasDistanceRouteErrors(generateTransaction({errorFields: {waypoints: {someError: 'Bad waypoint'}}}))).toBe(true);
+        });
+
+        it('ignores errors that say nothing about the route, such as a failed payment', () => {
+            expect(hasDistanceRouteErrors(generateTransaction({errors: {someError: 'Something went wrong'}}))).toBe(false);
+        });
+    });
+
+    describe('isMapBasedDistanceRequest', () => {
+        const UPDATE = CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
+        const PDF_RECEIPT = {source: 'https://www.expensify.com/receipts/w_abc123.pdf', filename: 'w_abc123.pdf'};
+
+        function generateMapDistanceTransaction(values: Partial<Transaction> = {}): Transaction {
+            return generateTransaction({iouRequestType: CONST.IOU.REQUEST_TYPE.DISTANCE_MAP, receipt: PDF_RECEIPT, ...values});
+        }
+
+        // New Expensify draws its own distance e-receipt for these, so the generated PDF beside them is never shown.
+        it('is true for a map distance expense whichever receipt it stores', () => {
+            expect(TransactionUtils.isMapBasedDistanceRequest(generateMapDistanceTransaction())).toBe(true);
+            expect(TransactionUtils.isMapBasedDistanceRequest(generateMapDistanceTransaction({receipt: undefined}))).toBe(true);
+            expect(TransactionUtils.isMapBasedDistanceRequest(generateMapDistanceTransaction({pendingFields: {merchant: UPDATE}}))).toBe(true);
+        });
+
+        it('is true for a GPS distance expense, which also has a route to draw', () => {
+            expect(TransactionUtils.isMapBasedDistanceRequest(generateMapDistanceTransaction({iouRequestType: CONST.IOU.REQUEST_TYPE.DISTANCE_GPS}))).toBe(true);
+        });
+
+        it('is false for odometer and non-distance expenses, which keep their own receipt', () => {
+            expect(TransactionUtils.isMapBasedDistanceRequest(generateMapDistanceTransaction({iouRequestType: CONST.IOU.REQUEST_TYPE.DISTANCE_ODOMETER}))).toBe(false);
+            expect(TransactionUtils.isMapBasedDistanceRequest(generateTransaction({receipt: undefined}))).toBe(false);
+        });
+    });
+
     describe('calculateTaxAmount', () => {
         it('returns 0 for undefined percentage', () => {
             const result = TransactionUtils.calculateTaxAmount(undefined, 10000, 2);
@@ -2190,19 +2284,38 @@ describe('TransactionUtils', () => {
             expect(result).toBe(false);
         });
 
-        it('does not flag a zero amount on an unreported expense whose receipt scan failed', () => {
-            // Given a $0 unreported expense whose receipt scan failed
+        it('flags an unresolved failed-scan zero amount on an unreported expense', () => {
+            // Given an unreported failed Scan whose zero amount is still the scanning placeholder
+            const transaction = generateTransaction({
+                reportID: CONST.REPORT.UNREPORTED_REPORT_ID,
+                amount: 0,
+                merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
+                iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+            });
+
+            // When we check whether its required fields are empty
+            const result = TransactionUtils.areRequiredFieldsEmpty(transaction, undefined);
+
+            // Then the amount is treated as missing until the user explicitly confirms it
+            expect(result).toBe(true);
+        });
+
+        it('does not flag a confirmed failed-scan zero amount on an unreported expense', () => {
+            // Given an unreported failed Scan whose zero amount has been explicitly confirmed
             const transaction = generateTransaction({
                 reportID: CONST.REPORT.UNREPORTED_REPORT_ID,
                 amount: 0,
+                modifiedAmount: 0,
                 merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
+                iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
                 receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
             });
 
             // When we check whether its required fields are empty
             const result = TransactionUtils.areRequiredFieldsEmpty(transaction, undefined);
 
-            // Then the amount is still not treated as missing, because being unreported is the only condition for allowing $0
+            // Then the confirmed zero remains valid in the Self DM
             expect(result).toBe(false);
         });
 
@@ -3352,6 +3465,30 @@ describe('TransactionUtils', () => {
             expect(TransactionUtils.isCategoryBeingAnalyzed(transaction, undefined)).toBe(true);
         });
 
+        it('should return false when auto-categorize new expenses is disabled on the policy', () => {
+            const transaction = generateTransaction({
+                category: '',
+                merchant: 'Some Merchant',
+                amount: 100,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            });
+            const policy = {...createRandomPolicy(0), autoCategorizeNewExpenses: false};
+
+            expect(TransactionUtils.isCategoryBeingAnalyzed(transaction, undefined, policy)).toBe(false);
+        });
+
+        it('should return true when auto-categorize new expenses is enabled on the policy', () => {
+            const transaction = generateTransaction({
+                category: '',
+                merchant: 'Some Merchant',
+                amount: 100,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            });
+            const policy = {...createRandomPolicy(0), autoCategorizeNewExpenses: true};
+
+            expect(TransactionUtils.isCategoryBeingAnalyzed(transaction, undefined, policy)).toBe(true);
+        });
+
         it('should return true when within auto-categorization grace period', () => {
             // Set pendingAutoCategorizationTime to 30 seconds ago (within 1 minute grace period)
             const thirtySecondsAgo = new Date(Date.now() - 30 * 1000);
@@ -3369,6 +3506,22 @@ describe('TransactionUtils', () => {
             expect(TransactionUtils.isCategoryBeingAnalyzed(transaction, undefined)).toBe(true);
         });
 
+        it('should return false during the grace period when auto-categorize new expenses is disabled', () => {
+            const thirtySecondsAgo = new Date(Date.now() - 30 * 1000);
+            const pendingAutoCategorizationTime = thirtySecondsAgo.toISOString().replace('T', ' ').replace('Z', '');
+            const transaction = generateTransaction({
+                category: '',
+                merchant: 'Some Merchant',
+                amount: 100,
+                comment: {
+                    pendingAutoCategorizationTime,
+                },
+            });
+            const policy = {...createRandomPolicy(0), autoCategorizeNewExpenses: false};
+
+            expect(TransactionUtils.isCategoryBeingAnalyzed(transaction, undefined, policy)).toBe(false);
+        });
+
         it('should return false when auto-categorization grace period has passed', () => {
             // Set pendingAutoCategorizationTime to 2 minutes ago (outside 1 minute grace period)
             const twoMinutesAgo = new Date(Date.now() - 2 * 60 * 1000);
@@ -5840,6 +5993,67 @@ describe('hasAllManuallyEnteredScanFields', () => {
     });
 });
 
+describe('isFailedScanAmountPlaceholder for zero-amount Scans', () => {
+    const openScan = {
+        amount: 0,
+        iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+        modifiedAmount: '',
+        receipt: {source: 'https://example.com/receipt.jpg', state: CONST.IOU.RECEIPT_STATE.OPEN},
+    } as const;
+
+    it('shows an explicitly entered zero after the submitted transaction is reloaded without draft flags', () => {
+        const transaction = generateTransaction({...openScan, merchant: 'Test Merchant', created: '2026-09-17'});
+
+        expect(TransactionUtils.isFailedScanAmountPlaceholder(transaction)).toBe(false);
+        expect(TransactionUtils.isAmountMissing(transaction)).toBe(false);
+    });
+
+    it('still treats a failed Scan with no entered amount as missing', () => {
+        const transaction = generateTransaction({...openScan, receipt: {...openScan.receipt, state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED}});
+
+        expect(TransactionUtils.isFailedScanAmountPlaceholder(transaction)).toBe(true);
+    });
+
+    it('shows the zero amount after the report is settled', () => {
+        // Given a failed Scan whose zero amount is still represented as a placeholder on the transaction
+        const transaction = generateTransaction({...openScan, receipt: {...openScan.receipt, state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED}});
+
+        // When the transaction is rendered from a settled report
+        const result = TransactionUtils.isFailedScanAmountPlaceholder(transaction, true);
+
+        // Then the zero accepted by the backend is no longer hidden as a missing amount
+        expect(result).toBe(false);
+    });
+
+    it.each([
+        ['merchant', {modifiedMerchant: 'Updated Merchant'}],
+        ['created', {modifiedCreated: '2026-09-18'}],
+        ['currency', {modifiedCurrency: 'EUR'}],
+    ])('keeps an existing failed Scan missing while its %s edit makes the receipt OPEN', (field, changes) => {
+        const transaction = generateTransaction({...openScan, ...changes, pendingFields: {[field]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}});
+
+        expect(TransactionUtils.isFailedScanAmountPlaceholder(transaction)).toBe(true);
+    });
+
+    it('keeps an entered zero visible after a later merchant edit is confirmed', () => {
+        const transaction = generateTransaction({...openScan, modifiedMerchant: 'Updated Merchant'});
+
+        expect(TransactionUtils.isFailedScanAmountPlaceholder(transaction)).toBe(false);
+    });
+
+    it('keeps a partially filled Scan draft missing when the merchant is entered before the amount', () => {
+        const transaction = generateTransaction({...openScan, isMerchantSet: true});
+
+        expect(TransactionUtils.isFailedScanAmountPlaceholder(transaction)).toBe(true);
+    });
+
+    it('keeps a cleared Scan amount missing while its receipt is OPEN', () => {
+        const transaction = generateTransaction({...openScan, isAmountSet: false});
+
+        expect(TransactionUtils.isFailedScanAmountPlaceholder(transaction)).toBe(true);
+    });
+});
+
 describe('hasAnyManuallyEnteredScanField / isPartiallyEnteredScanExpense', () => {
     function generateScanDraft(values: Partial<Transaction> = {}): Transaction {
         return generateTransaction({iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN, ...values});
diff --git a/tests/unit/TripReservationUtilsTest.ts b/tests/unit/TripReservationUtilsTest.ts
index 08f8852404ff..a99f909fce79 100644
--- a/tests/unit/TripReservationUtilsTest.ts
+++ b/tests/unit/TripReservationUtilsTest.ts
@@ -3,7 +3,7 @@ import {formatTransitLocationLabel, getAirReservations, getPNRReservationDataFro
 
 import CONST from '@src/CONST';
 import type {ReportNameValuePairs} from '@src/types/onyx';
-import type {Pnr, TripData} from '@src/types/onyx/TripData';
+import type {Pnr, RailPnr, TripData} from '@src/types/onyx/TripData';
 
 import {airReservationPnrData, airReservationTravelers} from '../data/TripAirReservationData';
 import {createRandomReport} from '../utils/collections/reports';
@@ -2705,6 +2705,67 @@ describe('TripReservationUtils', () => {
         });
     });
 
+    describe('rail traveler information', () => {
+        it.each<{description: string; passengerInfos: RailPnr['passengerInfos']}>([
+            {description: 'passenger entry', passengerInfos: []},
+            {description: 'userOrgId', passengerInfos: [{passengerType: ''}]},
+            {description: 'userId', passengerInfos: [{passengerType: '', userOrgId: {organizationId: {id: ''}}}]},
+        ])('should preserve reservations when the rail $description is missing', ({passengerInfos}) => {
+            // Given a mixed trip with incomplete rail passenger data that must not prevent access to other bookings
+            const report = createRandomReport(1, undefined);
+            const reportNameValuePairs: ReportNameValuePairs = {
+                tripData: {
+                    tripID: 'trip123',
+                    payload: {
+                        ...tripWithAllReservations,
+                        pnrs: [
+                            airPnrDirect,
+                            airPnrConnecting,
+                            {
+                                ...railPnr,
+                                data: {
+                                    ...railPnr.data,
+                                    railPnr: {...railPnrData, passengerInfos},
+                                },
+                            },
+                            carPnr,
+                            hotelPnr,
+                        ],
+                    },
+                },
+            };
+
+            // When the trip reservations are extracted for the Home page
+            const result = getReservationsFromTripReport(report, reportNameValuePairs);
+
+            // Then all bookings remain available and only the rail traveler details are omitted
+            const expectedReservations = getReservationsFromTripReport(report, {tripData: {tripID: 'trip123', payload: tripWithAllReservations}});
+            expect(result).toHaveLength(7);
+            expect(result).toEqual(
+                expectedReservations.map((reservationData) =>
+                    reservationData.reservation.type === CONST.RESERVATION_TYPE.TRAIN
+                        ? {...reservationData, reservation: {...reservationData.reservation, travelerPersonalInfo: {name: '', email: ''}}}
+                        : reservationData,
+                ),
+            );
+        });
+
+        it('should preserve traveler details when the rail passenger has a matching user ID', () => {
+            // Given a rail booking with complete passenger data linked to a known traveler
+            const report = createRandomReport(1, undefined);
+            const reportNameValuePairs: ReportNameValuePairs = {
+                tripData: {tripID: 'trip123', payload: {...basicTripData, pnrs: [railPnr]}},
+            };
+
+            // When the trip reservations are extracted for the Home page
+            const result = getReservationsFromTripReport(report, reportNameValuePairs);
+
+            // Then valid traveler details remain visible alongside the rail reservation
+            expect(result).toHaveLength(1);
+            expect(result.at(0)?.reservation.travelerPersonalInfo).toEqual({name: 'Smith Alice', email: 'alice.smith@example.com'});
+        });
+    });
+
     describe('rail shortName sanitization', () => {
         it('should drop a URN-formatted code from rail shortName', () => {
             const firstLeg = asDefined(railPnrData.legInfos.at(0));
diff --git a/tests/unit/UpdateRequiredTest.ts b/tests/unit/UpdateRequiredTest.ts
new file mode 100644
index 000000000000..fe3184f3b6c4
--- /dev/null
+++ b/tests/unit/UpdateRequiredTest.ts
@@ -0,0 +1,153 @@
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type * as UpdateRequired from '../../src/libs/actions/UpdateRequired/index';
+
+import pkg from '../../package.json';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+// Factory mocks share these functions across the isolated module registries each test loads.
+const mockClearWorkboxRecoveryCaches = jest.fn(() => Promise.resolve());
+jest.mock('@libs/clearWorkboxRecoveryCaches', () => ({
+    __esModule: true,
+    default: () => mockClearWorkboxRecoveryCaches(),
+}));
+
+const mockLogAlert = jest.fn<void, unknown[]>();
+jest.mock('@libs/Log', () => ({
+    __esModule: true,
+    default: {alert: (...args: unknown[]) => mockLogAlert(...args)},
+}));
+
+const mockOnyxSet = jest.fn<void, unknown[]>();
+jest.mock('react-native-onyx', () => ({
+    __esModule: true,
+    default: {set: (...args: unknown[]) => mockOnyxSet(...args)},
+}));
+
+type UpdateRequiredModule = typeof UpdateRequired;
+
+function loadWebUpdateRequired(): UpdateRequiredModule {
+    let updateRequired: UpdateRequiredModule | undefined;
+    jest.isolateModules(() => {
+        updateRequired = jest.requireActual<UpdateRequiredModule>('../../src/libs/actions/UpdateRequired/index.ts');
+    });
+    if (!updateRequired) {
+        throw new Error('Failed to load UpdateRequired');
+    }
+    return updateRequired;
+}
+
+describe('UpdateRequired (web)', () => {
+    const reloadMock = jest.fn();
+    const originalLocation = window.location;
+
+    beforeAll(() => {
+        Object.defineProperty(window, 'location', {
+            configurable: true,
+            value: {reload: reloadMock},
+        });
+    });
+
+    afterAll(() => {
+        Object.defineProperty(window, 'location', {
+            configurable: true,
+            value: originalLocation,
+        });
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        jest.restoreAllMocks();
+        sessionStorage.clear();
+    });
+
+    it('clears the cache and reloads on the first 426 instead of showing the Update Required screen', async () => {
+        // Given a web app that has not tried reloading for a 426 yet
+        const {alertUser} = loadWebUpdateRequired();
+
+        // When a request gets a 426
+        alertUser();
+        await waitForBatchedUpdates();
+
+        // Then the cache is cleared and the page reloads, because the stale bundle can only be replaced by a reload
+        expect(mockClearWorkboxRecoveryCaches).toHaveBeenCalledTimes(1);
+        expect(reloadMock).toHaveBeenCalledTimes(1);
+        expect(mockOnyxSet).not.toHaveBeenCalled();
+    });
+
+    it('reloads only once when several requests get a 426 at the same time', async () => {
+        // Given a web app that has not tried reloading for a 426 yet
+        const {alertUser} = loadWebUpdateRequired();
+
+        // When several requests get a 426 before the page reloads
+        alertUser();
+        alertUser();
+        await waitForBatchedUpdates();
+
+        // Then only one reload is triggered and the Update Required screen is not shown
+        expect(reloadMock).toHaveBeenCalledTimes(1);
+        expect(mockLogAlert).not.toHaveBeenCalled();
+    });
+
+    it('shows the Update Required screen and logs an alert when the reloaded app still gets a 426', async () => {
+        // Given the app already reloaded for a 426 and still runs the same bundle version
+        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.UPDATE_REQUIRED_RELOADED_VERSION, pkg.version);
+        const {alertUser} = loadWebUpdateRequired();
+
+        // When the reloaded app gets another 426
+        alertUser();
+        await waitForBatchedUpdates();
+
+        // Then it stops reloading to avoid a loop, shows the Update Required screen, and alerts because the reload didn't get a new bundle
+        expect(reloadMock).not.toHaveBeenCalled();
+        expect(mockLogAlert).toHaveBeenCalledTimes(1);
+        expect(mockOnyxSet).toHaveBeenCalledWith(ONYXKEYS.RAM_ONLY_UPDATE_REQUIRED, true);
+    });
+
+    it('alerts only once when several requests get a 426 after the reload', async () => {
+        // Given the app already reloaded for a 426 and still runs the same bundle version
+        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.UPDATE_REQUIRED_RELOADED_VERSION, pkg.version);
+        const {alertUser} = loadWebUpdateRequired();
+
+        // When several requests, including the Log command itself, get a 426
+        alertUser();
+        alertUser();
+        await waitForBatchedUpdates();
+
+        // Then only one alert is sent, so a stuck user can't flood the logs or trigger alerts in a loop
+        expect(mockLogAlert).toHaveBeenCalledTimes(1);
+        expect(mockOnyxSet).toHaveBeenCalledTimes(1);
+    });
+
+    it('reloads again when a newer bundle gets a 426 after an earlier recovery', async () => {
+        // Given the tab recovered from a 426 on an older bundle version
+        sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.UPDATE_REQUIRED_RELOADED_VERSION, '0.0.0-0');
+        const {alertUser} = loadWebUpdateRequired();
+
+        // When a later minimum version bump makes the current bundle get a 426
+        alertUser();
+        await waitForBatchedUpdates();
+
+        // Then it gets its own cache clear and reload instead of going straight to the Update Required screen
+        expect(reloadMock).toHaveBeenCalledTimes(1);
+        expect(mockLogAlert).not.toHaveBeenCalled();
+        expect(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.UPDATE_REQUIRED_RELOADED_VERSION)).toBe(pkg.version);
+    });
+
+    it('shows the Update Required screen without reloading when sessionStorage is unusable', async () => {
+        // Given sessionStorage throws, so the reload attempt can't be recorded
+        jest.spyOn(Storage.prototype, 'getItem').mockImplementation(() => {
+            throw new Error('SecurityError');
+        });
+        const {alertUser} = loadWebUpdateRequired();
+
+        // When a request gets a 426
+        alertUser();
+        await waitForBatchedUpdates();
+
+        // Then it does not reload, since without a record every reload would get a 426 and reload again forever
+        expect(reloadMock).not.toHaveBeenCalled();
+        expect(mockOnyxSet).toHaveBeenCalledWith(ONYXKEYS.RAM_ONLY_UPDATE_REQUIRED, true);
+    });
+});
diff --git a/tests/unit/VendorMatchingMerchantRulesTest.ts b/tests/unit/VendorMatchingMerchantRulesTest.ts
index e79aa6fc837e..21f5338dd9dd 100644
--- a/tests/unit/VendorMatchingMerchantRulesTest.ts
+++ b/tests/unit/VendorMatchingMerchantRulesTest.ts
@@ -1,12 +1,14 @@
-import {mapFormFieldsToRuleForAPI, mapFormFieldsToRuleForOnyx} from '@libs/actions/Policy/Rules';
-import {getMerchantCodingRulesTableData} from '@libs/MerchantTypeRulesUtils';
+import {buildMerchantRule} from '@libs/ExpenseDefaultRuleUtils';
+import {getMerchantRulesTableData} from '@libs/MerchantTypeRulesUtils';
 import {hasVendorFeature} from '@libs/PolicyUtils';
+import {toIndexMap} from '@libs/RuleUtils';
 
 import CONST from '@src/CONST';
 import IntlStore from '@src/languages/IntlStore';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {MerchantRuleForm} from '@src/types/form/MerchantRuleForm';
-import type {Policy} from '@src/types/onyx';
-import type {CodingRule, Connections} from '@src/types/onyx/Policy';
+import type {Policy, Rule} from '@src/types/onyx';
+import type {Connections} from '@src/types/onyx/Policy';
 
 import createRandomPolicy from '../utils/collections/policies';
 import createMock from '../utils/createMock';
@@ -104,68 +106,61 @@ const buildQBOWithStaleXeroPolicy = (qboVendors: Array<{id: string; name: string
         }),
     });
 
-const withCodingRules = (policy: Policy, codingRules: Record<string, CodingRule>): Policy => ({...policy, rules: {...policy.rules, codingRules}});
-
-const buildVendorRule = (vendorID: string): CodingRule => ({
-    filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Coffee Shop'},
-    vendorID,
+const buildVendorRule = (policy: Policy, vendorID: string): Rule => ({
+    ...buildMerchantRule({merchantToMatch: 'Coffee Shop', matchType: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, vendorID}, policy),
+    scope: CONST.RULES.SCOPE.POLICY,
+    scopeID: policy.id,
+    triggers: toIndexMap([CONST.RULES.TRIGGERS.CREATE_TRANSACTION]),
+    filters: {left: CONST.RULES.EXPENSE_DEFAULT.FIELD.MERCHANT, operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Coffee Shop'},
+    actions: toIndexMap([{name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.VENDOR_ID, value: vendorID}]),
 });
 
-describe('Vendor matching on merchant rules', () => {
-    describe('mapFormFieldsToRuleForOnyx', () => {
-        it('serializes a set vendorID', () => {
-            expect(mapFormFieldsToRuleForOnyx(buildForm({vendorID: 'v-1'}), undefined).vendorID).toBe('v-1');
-        });
-
-        it('serializes an unset vendorID to null so Onyx merge clears it', () => {
-            expect(mapFormFieldsToRuleForOnyx(buildForm({vendorID: ''}), undefined).vendorID).toBeNull();
-        });
-    });
+const withVendorRule = (policy: Policy, vendorID: string) => ({[`${ONYXKEYS.COLLECTION.RULE}rule1`]: buildVendorRule(policy, vendorID)});
 
-    describe('mapFormFieldsToRuleForAPI', () => {
-        it('includes vendorID when set', () => {
-            expect(mapFormFieldsToRuleForAPI(buildForm({vendorID: 'v-1'}), undefined).vendorID).toBe('v-1');
+describe('Vendor matching on merchant rules', () => {
+    describe('buildMerchantRule vendor action', () => {
+        it('writes a Set action for a vendorID', () => {
+            const actions = Object.values(buildMerchantRule(buildForm({vendorID: 'v-1'}), undefined)?.actions ?? {});
+            expect(actions).toContainEqual({name: CONST.RULES.ACTIONS.SET, field: CONST.RULES.EXPENSE_DEFAULT.FIELD.VENDOR_ID, value: 'v-1'});
         });
 
-        it('omits vendorID entirely when unset (never sends null)', () => {
-            const rule = mapFormFieldsToRuleForAPI(buildForm({vendorID: ''}), undefined);
-            expect('vendorID' in rule).toBe(false);
+        it('writes no vendor action when the vendorID is unset, so the rule stops setting it', () => {
+            const actions = Object.values(buildMerchantRule(buildForm({vendorID: '', category: 'Coffee'}), undefined)?.actions ?? {});
+            expect(actions.some((action) => action.field === CONST.RULES.EXPENSE_DEFAULT.FIELD.VENDOR_ID)).toBe(false);
         });
     });
 
-    describe('getMerchantCodingRulesTableData vendor summary', () => {
+    describe('getMerchantRulesTableData vendor summary', () => {
         beforeEach(() => {
             IntlStore.load(CONST.LOCALES.EN);
             return waitForBatchedUpdates();
         });
 
-        const buildTableData = (policy: Policy) =>
-            getMerchantCodingRulesTableData({
+        const buildTableData = (policy: Policy, vendorID: string) =>
+            getMerchantRulesTableData({
                 policy,
                 policyID: policy.id,
+                rules: withVendorRule(policy, vendorID),
                 translate: translateLocal,
                 isOffline: false,
                 onNavigate: () => {},
             });
 
         it('resolves the vendor name when the vendor is in the loaded list', () => {
-            const policy = withCodingRules(buildQBOPolicy([{id: 'v-1', name: 'Acme Co', currency: 'USD'}]), {rule1: buildVendorRule('v-1')});
-            expect(buildTableData(policy).at(0)?.ruleDescription).toContain('Update vendor to "Acme Co"');
+            const policy = buildQBOPolicy([{id: 'v-1', name: 'Acme Co', currency: 'USD'}]);
+            expect(buildTableData(policy, 'v-1').at(0)?.ruleDescription).toContain('Update vendor to "Acme Co"');
         });
 
         it('shows "Vendor unavailable" when the list is loaded but the vendor is missing', () => {
-            const policy = withCodingRules(buildQBOPolicy([]), {rule1: buildVendorRule('v-1')});
-            expect(buildTableData(policy).at(0)?.ruleDescription).toContain('Update vendor to "Vendor unavailable"');
+            expect(buildTableData(buildQBOPolicy([]), 'v-1').at(0)?.ruleDescription).toContain('Update vendor to "Vendor unavailable"');
         });
 
         it('preserves the raw external ID while the active vendor list is not hydrated', () => {
-            const policy = withCodingRules(buildQBOPolicy(undefined), {rule1: buildVendorRule('v-1')});
-            expect(buildTableData(policy).at(0)?.ruleDescription).toContain('Update vendor to "v-1"');
+            expect(buildTableData(buildQBOPolicy(undefined), 'v-1').at(0)?.ruleDescription).toContain('Update vendor to "v-1"');
         });
 
         it('renders "Vendor unavailable" when no matching integration remains', () => {
-            const policy = withCodingRules(createRandomPolicy(0), {rule1: buildVendorRule('v-1')});
-            const description = buildTableData(policy).at(0)?.ruleDescription;
+            const description = buildTableData(createRandomPolicy(0), 'v-1').at(0)?.ruleDescription;
             expect(description).toContain('Update vendor to "Vendor unavailable"');
             expect(description).not.toContain('"v-1"');
         });
@@ -174,10 +169,8 @@ describe('Vendor matching on merchant rules', () => {
             // Active source is QBO (empty vendor list, so loaded). The rule's vendorID matches only the stale Xero
             // connection, which the active picker and violation logic ignore. The summary must not render the Xero
             // name as if the vendor were valid — it should surface the active-scoped "unavailable" copy instead.
-            const policy = withCodingRules(buildQBOWithStaleXeroPolicy([], {xeroVendor: {id: 'xeroVendor', name: 'Stale Xero Vendor', email: 'stale@example.com'}}), {
-                rule1: buildVendorRule('xeroVendor'),
-            });
-            const description = buildTableData(policy).at(0)?.ruleDescription;
+            const policy = buildQBOWithStaleXeroPolicy([], {xeroVendor: {id: 'xeroVendor', name: 'Stale Xero Vendor', email: 'stale@example.com'}});
+            const description = buildTableData(policy, 'xeroVendor').at(0)?.ruleDescription;
             expect(description).toContain('Update vendor to "Vendor unavailable"');
             expect(description).not.toContain('Stale Xero Vendor');
         });
@@ -187,19 +180,17 @@ describe('Vendor matching on merchant rules', () => {
             // (vendor-matching active). Admin later switches to Vendor Bill, so QBO is no longer the active vendor-matching
             // source. The rule summary must still render the vendor's name — not the raw external ID — because the vendor
             // list is still known via the connection data.
-            const policy = withCodingRules(buildQBOWithVendorBillExportPolicy([{id: 'v-1', name: 'Acme Co', currency: 'USD'}]), {rule1: buildVendorRule('v-1')});
-            expect(buildTableData(policy).at(0)?.ruleDescription).toContain('Update vendor to "Acme Co"');
+            const policy = buildQBOWithVendorBillExportPolicy([{id: 'v-1', name: 'Acme Co', currency: 'USD'}]);
+            expect(buildTableData(policy, 'v-1').at(0)?.ruleDescription).toContain('Update vendor to "Acme Co"');
         });
 
         it('uses "supplier" wording and "Supplier unavailable" on Xero workspaces', () => {
-            const resolved = withCodingRules(buildXeroPolicy({xc1: {id: 'xc1', name: 'Acme Xero', email: 'acme@example.com'}}), {rule1: buildVendorRule('xc1')});
-            expect(buildTableData(resolved).at(0)?.ruleDescription).toContain('Update supplier to "Acme Xero"');
+            const resolved = buildXeroPolicy({xc1: {id: 'xc1', name: 'Acme Xero', email: 'acme@example.com'}});
+            expect(buildTableData(resolved, 'xc1').at(0)?.ruleDescription).toContain('Update supplier to "Acme Xero"');
 
-            const missing = withCodingRules(buildXeroPolicy({}), {rule1: buildVendorRule('xc1')});
-            expect(buildTableData(missing).at(0)?.ruleDescription).toContain('Update supplier to "Supplier unavailable"');
+            expect(buildTableData(buildXeroPolicy({}), 'xc1').at(0)?.ruleDescription).toContain('Update supplier to "Supplier unavailable"');
 
-            const pendingHydration = withCodingRules(buildXeroPolicy(undefined), {rule1: buildVendorRule('xc1')});
-            expect(buildTableData(pendingHydration).at(0)?.ruleDescription).toContain('Update supplier to "xc1"');
+            expect(buildTableData(buildXeroPolicy(undefined), 'xc1').at(0)?.ruleDescription).toContain('Update supplier to "xc1"');
         });
     });
 
@@ -216,8 +207,15 @@ describe('Vendor matching on merchant rules', () => {
             expect(hasVendorFeature(buildIntacctPolicy([{id: 'iv-1', name: 'V001', value: 'Acme Intacct'}]), false)).toBe(true);
         });
 
-        it('is hidden on Xero when the beta is off because Xero (R3) is still pre-GA', () => {
-            expect(hasVendorFeature(buildXeroPolicy({xc1: {id: 'xc1', name: 'Acme Xero', email: 'acme@example.com'}}), false)).toBe(false);
+        it('is visible on Xero when the beta is off because Xero (R3) is generally available', () => {
+            // Given a configured Xero workspace with synced contacts
+            const policy = buildXeroPolicy({xc1: {id: 'xc1', name: 'Acme Xero', email: 'acme@example.com'}});
+
+            // When the vendor feature is checked without the vendorMatching beta
+            const isVendorFeatureAvailable = hasVendorFeature(policy, false);
+
+            // Then the row is visible because Xero does not depend on the beta
+            expect(isVendorFeatureAvailable).toBe(true);
         });
 
         it('is hidden when no vendor integration is connected', () => {
diff --git a/tests/unit/ViolationUtilsTest.ts b/tests/unit/ViolationUtilsTest.ts
index 8bb490872efa..0d02d3d4f37f 100644
--- a/tests/unit/ViolationUtilsTest.ts
+++ b/tests/unit/ViolationUtilsTest.ts
@@ -3595,7 +3595,7 @@ describe('getViolationsOnyxData', () => {
                 // Integration-Server hasn't populated suppliers for the workspace yet. We don't
                 // know the supplier list, so we must not flag the existing transaction vendor as
                 // missing. Otherwise every matched transaction would falsely flag inactive between
-                // the beta flip and the first supplier sync.
+                // the Xero connection and the first supplier sync.
                 policy = policyWithXeroVendorFeature(XERO_CONTACTS_UNSYNCED);
                 transaction.comment = {...transaction.comment, vendor: {externalID: 'xcAnything', wasManuallySet: true}};
                 const result = ViolationsUtils.getViolationsOnyxData({
@@ -3632,10 +3632,13 @@ describe('getViolationsOnyxData', () => {
                 expect(result.value).toEqual(expect.arrayContaining([inactiveVendorViolation]));
             });
 
-            it('does not add the violation when the vendorMatching beta is disabled, even with Xero connected', () => {
+            it('adds the violation when the vendorMatching beta is disabled but Xero is configured, because Xero (R3) is generally available', () => {
+                // Given a configured Xero workspace and a transaction whose supplier is missing from the synced contacts
                 isBetaEnabledSpy.mockImplementation(() => false);
                 policy = policyWithXeroVendorFeature();
                 transaction.comment = {...transaction.comment, vendor: {externalID: 'xcMissing', wasManuallySet: true}};
+
+                // When violations are recomputed without the vendorMatching beta
                 const result = ViolationsUtils.getViolationsOnyxData({
                     isVendorMatchingBetaEnabled: false,
                     ownerLogin: undefined,
@@ -3647,7 +3650,41 @@ describe('getViolationsOnyxData', () => {
                     hasDependentTags: false,
                     isInvoiceTransaction: false,
                 });
-                expect(result.value).not.toContainEqual(inactiveVendorViolation);
+
+                // Then the violation is added with the supplier wording because Xero does not depend on the beta
+                expect(result.value).toEqual(expect.arrayContaining([inactiveSupplierViolation]));
+            });
+
+            it('removes an existing violation when the Xero connection is not configured with the beta disabled', () => {
+                // Given a Xero connection in the middle of a tenant switch and a transaction that already carries the violation
+                isBetaEnabledSpy.mockImplementation(() => false);
+                policy = createMock<Policy>({
+                    requiresTag: false,
+                    requiresCategory: false,
+                    connections: {
+                        [CONST.POLICY.CONNECTIONS.NAME.XERO]: {
+                            config: {isConfigured: false},
+                            data: {contacts: {xcActive: {id: 'xcActive', name: 'Acme Xero', email: 'acme@example.com'}}},
+                        },
+                    },
+                });
+                transaction.comment = {...transaction.comment, vendor: {externalID: 'xcMissing', wasManuallySet: true}};
+
+                // When violations are recomputed without the vendorMatching beta
+                const result = ViolationsUtils.getViolationsOnyxData({
+                    isVendorMatchingBetaEnabled: false,
+                    ownerLogin: undefined,
+                    updatedTransaction: transaction,
+                    transactionViolations: [inactiveSupplierViolation],
+                    policy,
+                    policyTagList: policyTags,
+                    policyCategories,
+                    hasDependentTags: false,
+                    isInvoiceTransaction: false,
+                });
+
+                // Then the violation is cleared because general availability did not widen the configuration gate
+                expect(result.value).not.toEqual(expect.arrayContaining([expect.objectContaining({name: CONST.VIOLATIONS.INACTIVE_VENDOR})]));
             });
 
             it('still fires for a missing QBO vendor when both QBO and Xero are connected but Xero contacts are unsynced (regression — dual-connection state)', () => {
@@ -3687,32 +3724,32 @@ describe('getViolationsOnyxData', () => {
         });
     });
 
-    // ViolationsUtils no longer resolves betas itself — the caller passes the resolved boolean in.
-    // These still go through the real Permissions.isBetaEnabled so the override precedence that
-    // produces that boolean stays covered. Xero is used because it is still gated behind the beta,
-    // unlike QBO which is generally available.
+    // ViolationsUtils takes the resolved beta as a boolean from its caller. These tests go through
+    // the real Permissions.isBetaEnabled so the override precedence that produces that boolean stays
+    // covered. Business Central is used because it is still gated behind the beta, unlike QBO which
+    // is generally available.
     describe('vendorMatching beta overrides', () => {
-        const policyWithXeroVendorFeature = () =>
+        const policyWithBusinessCentralVendorFeature = () =>
             createMock<Policy>({
                 requiresTag: false,
                 requiresCategory: false,
                 connections: {
-                    [CONST.POLICY.CONNECTIONS.NAME.XERO]: {
+                    [CONST.POLICY.CONNECTIONS.NAME.BUSINESS_CENTRAL]: {
                         config: {isConfigured: true},
-                        data: {contacts: {xcActive: {id: 'xcActive', name: 'Acme Xero', email: 'acme@example.com'}}},
+                        data: {vendors: [{id: 'bcActive', name: 'Contoso Supplies'}]},
                     },
                 },
             });
 
         const resolveVendorMatchingBeta = (betas: Beta[], betaOverrides: BetaOverrides) => Permissions.isBetaEnabled(CONST.BETAS.VENDOR_MATCHING, betas, undefined, betaOverrides);
 
-        const getViolationsForMissingSupplier = (isVendorMatchingBetaEnabled: boolean | undefined) =>
+        const getViolationsForMissingVendor = (isVendorMatchingBetaEnabled: boolean | undefined) =>
             ViolationsUtils.getViolationsOnyxData({
                 isVendorMatchingBetaEnabled,
                 ownerLogin: undefined,
-                updatedTransaction: {...transaction, comment: {...transaction.comment, vendor: {externalID: 'xcMissing', wasManuallySet: true}}},
+                updatedTransaction: {...transaction, comment: {...transaction.comment, vendor: {externalID: 'bcMissing', wasManuallySet: true}}},
                 transactionViolations,
-                policy: policyWithXeroVendorFeature(),
+                policy: policyWithBusinessCentralVendorFeature(),
                 policyTagList: policyTags,
                 policyCategories,
                 hasDependentTags: false,
@@ -3723,9 +3760,9 @@ describe('getViolationsOnyxData', () => {
             ViolationsUtils.getViolationsOnyxData({
                 isVendorMatchingBetaEnabled,
                 ownerLogin: undefined,
-                updatedTransaction: {...transaction, comment: {...transaction.comment, vendor: {externalID: 'xcMissing', wasManuallySet: true}}},
+                updatedTransaction: {...transaction, comment: {...transaction.comment, vendor: {externalID: 'bcMissing', wasManuallySet: true}}},
                 transactionViolations: [inactiveVendorViolation],
-                policy: policyWithXeroVendorFeature(),
+                policy: policyWithBusinessCentralVendorFeature(),
                 policyTagList: policyTags,
                 policyCategories,
                 hasDependentTags: false,
@@ -3743,11 +3780,11 @@ describe('getViolationsOnyxData', () => {
             await Onyx.set(ONYXKEYS.BETA_OVERRIDES, {[CONST.BETAS.VENDOR_MATCHING]: true});
             await waitForBatchedUpdates();
 
-            // When violations are recomputed for a transaction whose supplier is missing
-            const result = getViolationsForMissingSupplier(resolveVendorMatchingBeta([], {[CONST.BETAS.VENDOR_MATCHING]: true}));
+            // When violations are recomputed for a transaction whose vendor is missing
+            const result = getViolationsForMissingVendor(resolveVendorMatchingBeta([], {[CONST.BETAS.VENDOR_MATCHING]: true}));
 
             // Then the override wins and the violation is added
-            expect(result.value).toEqual(expect.arrayContaining([inactiveSupplierViolation]));
+            expect(result.value).toEqual(expect.arrayContaining([inactiveVendorViolation]));
         });
 
         it('skips the violation when the beta is on for the account but pinned off locally', async () => {
@@ -3756,11 +3793,11 @@ describe('getViolationsOnyxData', () => {
             await Onyx.set(ONYXKEYS.BETA_OVERRIDES, {[CONST.BETAS.VENDOR_MATCHING]: false});
             await waitForBatchedUpdates();
 
-            // When violations are recomputed for a transaction whose supplier is missing
-            const result = getViolationsForMissingSupplier(resolveVendorMatchingBeta([CONST.BETAS.VENDOR_MATCHING], {[CONST.BETAS.VENDOR_MATCHING]: false}));
+            // When violations are recomputed for a transaction whose vendor is missing
+            const result = getViolationsForMissingVendor(resolveVendorMatchingBeta([CONST.BETAS.VENDOR_MATCHING], {[CONST.BETAS.VENDOR_MATCHING]: false}));
 
             // Then the override wins and the violation is left out
-            expect(result.value).not.toEqual(expect.arrayContaining([inactiveSupplierViolation]));
+            expect(result.value).not.toEqual(expect.arrayContaining([expect.objectContaining({name: CONST.VIOLATIONS.INACTIVE_VENDOR})]));
         });
 
         it('leaves an existing violation alone while the account betas have not loaded yet, and clears it once they load with the beta off', () => {
@@ -4384,7 +4421,7 @@ describe('hasVisibleViolationsForUser', () => {
         };
 
         // Mock shouldShowViolation to return true for missing category
-        jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockReturnValue(true);
+        jest.spyOn(require('@src/libs/TransactionUtils/violations'), 'shouldShowViolation').mockReturnValue(true);
 
         const result = ViolationsUtils.hasVisibleViolationsForUser(mockReport, violations, '', CONST.DEFAULT_NUMBER_ID, mockPolicy, [mockTransaction]);
         expect(result).toBe(true);
@@ -4401,7 +4438,7 @@ describe('hasVisibleViolationsForUser', () => {
         };
 
         // Mock shouldShowViolation to return false for RECEIPT_NOT_SMART_SCANNED (hidden from submitter)
-        jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => {
+        jest.spyOn(require('@src/libs/TransactionUtils/violations'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => {
             if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) {
                 return false; // Hidden from submitter
             }
@@ -4423,7 +4460,7 @@ describe('hasVisibleViolationsForUser', () => {
             ],
         };
 
-        jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => {
+        jest.spyOn(require('@src/libs/TransactionUtils/violations'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => {
             if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) {
                 return false;
             }
@@ -4458,7 +4495,7 @@ describe('hasVisibleViolationsForUser', () => {
             [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${secondTransactionID}`]: [missingCategoryViolation],
         };
 
-        jest.spyOn(require('@src/libs/TransactionUtils'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => {
+        jest.spyOn(require('@src/libs/TransactionUtils/violations'), 'shouldShowViolation').mockImplementation((report, policy, violationName) => {
             if (violationName === CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED) {
                 return false;
             }
diff --git a/tests/unit/WorkArrangementUtilsTest.ts b/tests/unit/WorkArrangementUtilsTest.ts
new file mode 100644
index 000000000000..13d453cae41b
--- /dev/null
+++ b/tests/unit/WorkArrangementUtilsTest.ts
@@ -0,0 +1,31 @@
+import {getEffectiveWorkArrangement, getWorkArrangementLabel} from '@libs/WorkArrangementUtils';
+
+import {translateLocal} from '../utils/TestHelper';
+
+describe('WorkArrangementUtils', () => {
+    describe('getEffectiveWorkArrangement', () => {
+        it.each([
+            {memberArrangement: true, workspaceArrangement: false, expected: true},
+            {memberArrangement: false, workspaceArrangement: true, expected: false},
+            {memberArrangement: undefined, workspaceArrangement: true, expected: true},
+            {memberArrangement: undefined, workspaceArrangement: undefined, expected: false},
+        ] as const)('uses member arrangement when set and otherwise falls back to the workspace default (%#)', ({memberArrangement, workspaceArrangement, expected}) => {
+            // Given a member arrangement and an optional workspace default,
+            // When resolving the member's effective work arrangement,
+            // Then the member value takes precedence and missing values default to false.
+            expect(getEffectiveWorkArrangement(memberArrangement, workspaceArrangement)).toBe(expected);
+        });
+    });
+
+    describe('getWorkArrangementLabel', () => {
+        it.each([
+            {isOfficeBased: true, expectedTranslationKey: 'workspace.people.officeBased'},
+            {isOfficeBased: false, expectedTranslationKey: 'workspace.people.noRegularWorkspace'},
+        ] as const)('translates the work arrangement for the current locale (%#)', ({isOfficeBased, expectedTranslationKey}) => {
+            // Given an office-based flag,
+            // When requesting its label in the current locale,
+            // Then the corresponding workspace people translation is used.
+            expect(getWorkArrangementLabel(translateLocal, isOfficeBased)).toBe(translateLocal(expectedTranslationKey));
+        });
+    });
+});
diff --git a/tests/unit/WorkflowUtilsTest.ts b/tests/unit/WorkflowUtilsTest.ts
index 185c797df3fe..0aa6f965a6b3 100644
--- a/tests/unit/WorkflowUtilsTest.ts
+++ b/tests/unit/WorkflowUtilsTest.ts
@@ -17,6 +17,7 @@ import {
     getOverLimitForwardsToDisplayName,
     getRulesSubmitterToFirstApprover,
     getRulesSubmitterToWorkflowKey,
+    includesEveryWorkspaceMember,
     isApprovalWorkflowLockedByIntegration,
     mergeWorkflowMembersWithAvailableMembers,
     reconcileApprovalWorkflowRulesForCreate,
@@ -29,12 +30,13 @@ import ROUTES from '@src/ROUTES';
 import type {Policy} from '@src/types/onyx';
 import type {Approver, Member} from '@src/types/onyx/ApprovalWorkflow';
 import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
-import type {ApprovalWorkflowFilter, ApprovalWorkflowFilterComparison, ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
+import type {ApprovalWorkflowRule} from '@src/types/onyx/ApprovalWorkflowRules';
 import type {BankAccountList} from '@src/types/onyx/BankAccount';
 import type {PersonalDetailsList} from '@src/types/onyx/PersonalDetails';
 import type {PolicyEmployeeList} from '@src/types/onyx/PolicyEmployee';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
 import type Rule from '@src/types/onyx/Rule';
+import type {RuleFilter, RuleFilterComparison} from '@src/types/onyx/RuleFilters';
 
 import type {ValueOf} from 'type-fest';
 
@@ -95,7 +97,11 @@ describe('WorkflowUtils', () => {
         it('Should return no approvers for empty employees object', () => {
             const employees: PolicyEmployeeList = {};
             const firstEmail = '1@example.com';
-            const approvers = calculateApprovers({employees, firstEmail, personalDetailsByEmail});
+            const approvers = calculateApprovers({
+                employees,
+                firstEmail,
+                personalDetailsByEmail,
+            });
 
             expect(approvers).toEqual([]);
         });
@@ -112,7 +118,11 @@ describe('WorkflowUtils', () => {
                 },
             };
             const firstEmail = '1@example.com';
-            const approvers = calculateApprovers({employees, firstEmail, personalDetailsByEmail});
+            const approvers = calculateApprovers({
+                employees,
+                firstEmail,
+                personalDetailsByEmail,
+            });
 
             expect(approvers).toEqual([buildApprover(1)]);
         });
@@ -129,7 +139,11 @@ describe('WorkflowUtils', () => {
                 },
             };
             const firstEmail = '1@example.com';
-            const approvers = calculateApprovers({employees, firstEmail, personalDetailsByEmail});
+            const approvers = calculateApprovers({
+                employees,
+                firstEmail,
+                personalDetailsByEmail,
+            });
 
             expect(approvers).toEqual([buildApprover(1)]);
         });
@@ -158,18 +172,27 @@ describe('WorkflowUtils', () => {
                 },
             };
 
-            expect(calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail})).toEqual([
-                buildApprover(1, {forwardsTo: '2@example.com'}),
-                buildApprover(2, {forwardsTo: '3@example.com'}),
-                buildApprover(3, {forwardsTo: '4@example.com'}),
-                buildApprover(4),
-            ]);
-            expect(calculateApprovers({employees, firstEmail: '2@example.com', personalDetailsByEmail})).toEqual([
-                buildApprover(2, {forwardsTo: '3@example.com'}),
-                buildApprover(3, {forwardsTo: '4@example.com'}),
-                buildApprover(4),
-            ]);
-            expect(calculateApprovers({employees, firstEmail: '3@example.com', personalDetailsByEmail})).toEqual([buildApprover(3, {forwardsTo: '4@example.com'}), buildApprover(4)]);
+            expect(
+                calculateApprovers({
+                    employees,
+                    firstEmail: '1@example.com',
+                    personalDetailsByEmail,
+                }),
+            ).toEqual([buildApprover(1, {forwardsTo: '2@example.com'}), buildApprover(2, {forwardsTo: '3@example.com'}), buildApprover(3, {forwardsTo: '4@example.com'}), buildApprover(4)]);
+            expect(
+                calculateApprovers({
+                    employees,
+                    firstEmail: '2@example.com',
+                    personalDetailsByEmail,
+                }),
+            ).toEqual([buildApprover(2, {forwardsTo: '3@example.com'}), buildApprover(3, {forwardsTo: '4@example.com'}), buildApprover(4)]);
+            expect(
+                calculateApprovers({
+                    employees,
+                    firstEmail: '3@example.com',
+                    personalDetailsByEmail,
+                }),
+            ).toEqual([buildApprover(3, {forwardsTo: '4@example.com'}), buildApprover(4)]);
         });
 
         it('Should return a list of approvers with circular references', () => {
@@ -196,21 +219,39 @@ describe('WorkflowUtils', () => {
                 },
             };
 
-            expect(calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail})).toEqual([
+            expect(
+                calculateApprovers({
+                    employees,
+                    firstEmail: '1@example.com',
+                    personalDetailsByEmail,
+                }),
+            ).toEqual([
                 buildApprover(1, {forwardsTo: '2@example.com'}),
                 buildApprover(2, {forwardsTo: '3@example.com'}),
                 buildApprover(3, {forwardsTo: '4@example.com'}),
                 buildApprover(4, {forwardsTo: '5@example.com'}),
                 buildApprover(5, {forwardsTo: '1@example.com'}),
-                buildApprover(1, {forwardsTo: '2@example.com', isCircularReference: true}),
+                buildApprover(1, {
+                    forwardsTo: '2@example.com',
+                    isCircularReference: true,
+                }),
             ]);
-            expect(calculateApprovers({employees, firstEmail: '2@example.com', personalDetailsByEmail})).toEqual([
+            expect(
+                calculateApprovers({
+                    employees,
+                    firstEmail: '2@example.com',
+                    personalDetailsByEmail,
+                }),
+            ).toEqual([
                 buildApprover(2, {forwardsTo: '3@example.com'}),
                 buildApprover(3, {forwardsTo: '4@example.com'}),
                 buildApprover(4, {forwardsTo: '5@example.com'}),
                 buildApprover(5, {forwardsTo: '1@example.com'}),
                 buildApprover(1, {forwardsTo: '2@example.com'}),
-                buildApprover(2, {forwardsTo: '3@example.com', isCircularReference: true}),
+                buildApprover(2, {
+                    forwardsTo: '3@example.com',
+                    isCircularReference: true,
+                }),
             ]);
         });
 
@@ -222,9 +263,18 @@ describe('WorkflowUtils', () => {
                 },
             };
 
-            expect(calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail})).toEqual([
+            expect(
+                calculateApprovers({
+                    employees,
+                    firstEmail: '1@example.com',
+                    personalDetailsByEmail,
+                }),
+            ).toEqual([
                 buildApprover(1, {forwardsTo: '1@example.com'}),
-                buildApprover(1, {forwardsTo: '1@example.com', isCircularReference: true}),
+                buildApprover(1, {
+                    forwardsTo: '1@example.com',
+                    isCircularReference: true,
+                }),
             ]);
         });
 
@@ -241,9 +291,19 @@ describe('WorkflowUtils', () => {
                 },
             };
 
-            const approvers = calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail});
+            const approvers = calculateApprovers({
+                employees,
+                firstEmail: '1@example.com',
+                personalDetailsByEmail,
+            });
 
-            expect(approvers).toEqual([buildApprover(1, {forwardsTo: '2@example.com', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}), buildApprover(2)]);
+            expect(approvers).toEqual([
+                buildApprover(1, {
+                    forwardsTo: '2@example.com',
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                }),
+                buildApprover(2),
+            ]);
         });
 
         it('Should include approvalLimit and overLimitForwardsTo in approver objects', () => {
@@ -266,11 +326,24 @@ describe('WorkflowUtils', () => {
                 },
             };
 
-            const approvers = calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail});
+            const approvers = calculateApprovers({
+                employees,
+                firstEmail: '1@example.com',
+                personalDetailsByEmail,
+            });
 
             expect(approvers).toEqual([
-                buildApprover(1, {forwardsTo: '2@example.com', approvalLimit: 50000, overLimitForwardsTo: '3@example.com', overLimitForwardsToDisplayName: '3@example.com User'}),
-                buildApprover(2, {approvalLimit: 100000, overLimitForwardsTo: '3@example.com', overLimitForwardsToDisplayName: '3@example.com User'}),
+                buildApprover(1, {
+                    forwardsTo: '2@example.com',
+                    approvalLimit: 50000,
+                    overLimitForwardsTo: '3@example.com',
+                    overLimitForwardsToDisplayName: '3@example.com User',
+                }),
+                buildApprover(2, {
+                    approvalLimit: 100000,
+                    overLimitForwardsTo: '3@example.com',
+                    overLimitForwardsToDisplayName: '3@example.com User',
+                }),
             ]);
         });
 
@@ -284,7 +357,11 @@ describe('WorkflowUtils', () => {
                 },
             };
 
-            const approvers = calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail});
+            const approvers = calculateApprovers({
+                employees,
+                firstEmail: '1@example.com',
+                personalDetailsByEmail,
+            });
 
             expect(approvers).toEqual([buildApprover(1, {approvalLimit: null, overLimitForwardsTo: ''})]);
         });
@@ -334,7 +411,11 @@ describe('WorkflowUtils', () => {
             const defaultApprover = '1@example.com';
             const policy = createMockPolicy(employees, defaultApprover);
 
-            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, localeCompare});
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
+                policy,
+                personalDetails,
+                localeCompare,
+            });
 
             expect(approvalWorkflows).toEqual([]);
         });
@@ -350,7 +431,11 @@ describe('WorkflowUtils', () => {
             const defaultApprover = '1@example.com';
             const policy = createMockPolicy(employees, defaultApprover);
 
-            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, localeCompare});
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
+                policy,
+                personalDetails,
+                localeCompare,
+            });
 
             expect(approvalWorkflows).toEqual([]);
         });
@@ -371,7 +456,11 @@ describe('WorkflowUtils', () => {
             const defaultApprover = '1@example.com';
             const policy = createMockPolicy(employees, defaultApprover);
 
-            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, localeCompare});
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
+                policy,
+                personalDetails,
+                localeCompare,
+            });
 
             expect(approvalWorkflows).toEqual([buildWorkflow([1, 2], [1], {isDefault: true})]);
         });
@@ -402,7 +491,11 @@ describe('WorkflowUtils', () => {
             const defaultApprover = '1@example.com';
             const policy = createMockPolicy(employees, defaultApprover);
 
-            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, localeCompare});
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
+                policy,
+                personalDetails,
+                localeCompare,
+            });
 
             expect(approvalWorkflows).toEqual([buildWorkflow([2, 3], [1], {isDefault: true}), buildWorkflow([1, 4], [4])]);
         });
@@ -438,7 +531,11 @@ describe('WorkflowUtils', () => {
             const defaultApprover = '1@example.com';
             const policy = createMockPolicy(employees, defaultApprover);
 
-            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, localeCompare});
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
+                policy,
+                personalDetails,
+                localeCompare,
+            });
 
             expect(approvalWorkflows).toEqual([buildWorkflow([3, 2], [1], {isDefault: true}), buildWorkflow([5], [3]), buildWorkflow([4, 1], [4])]);
         });
@@ -469,9 +566,15 @@ describe('WorkflowUtils', () => {
             const defaultApprover = '1@example.com';
             const policy = createMockPolicy(employees, defaultApprover);
 
-            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, localeCompare});
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
+                policy,
+                personalDetails,
+                localeCompare,
+            });
 
-            const defaultWorkflow = buildWorkflow([2, 3, 4], [1, 3, 4], {isDefault: true});
+            const defaultWorkflow = buildWorkflow([2, 3, 4], [1, 3, 4], {
+                isDefault: true,
+            });
             let firstApprover = defaultWorkflow.approvers.at(0);
             let secondApprover = defaultWorkflow.approvers.at(1);
             if (firstApprover && secondApprover) {
@@ -525,9 +628,15 @@ describe('WorkflowUtils', () => {
             const defaultApprover = '1@example.com';
             const policy = createMockPolicy(employees, defaultApprover);
 
-            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({policy, personalDetails, localeCompare});
+            const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
+                policy,
+                personalDetails,
+                localeCompare,
+            });
 
-            const defaultWorkflow = buildWorkflow([1, 4, 5, 6], [1], {isDefault: true});
+            const defaultWorkflow = buildWorkflow([1, 4, 5, 6], [1], {
+                isDefault: true,
+            });
             const secondWorkflow = buildWorkflow([2, 3], [4, 5, 6]);
             const firstApprover = secondWorkflow.approvers.at(0);
             const secondApprover = secondWorkflow.approvers.at(1);
@@ -564,9 +673,21 @@ describe('WorkflowUtils', () => {
             const policy = createMockPolicy(employees, 'hannahw@htc.us');
             (policy as Policy).approvalMode = CONST.POLICY.APPROVAL_MODE.ADVANCED;
             const personalDetailsForTest: PersonalDetailsList = {
-                'alex@htc.us': {accountID: 1, login: 'alex@htc.us', displayName: 'Alex Walker'},
-                'hannahw@htc.us': {accountID: 2, login: 'hannahw@htc.us', displayName: 'Hannah Walker'},
-                'carolyn@htc.us': {accountID: 3, login: 'carolyn@htc.us', displayName: 'Carolyn Smith'},
+                'alex@htc.us': {
+                    accountID: 1,
+                    login: 'alex@htc.us',
+                    displayName: 'Alex Walker',
+                },
+                'hannahw@htc.us': {
+                    accountID: 2,
+                    login: 'hannahw@htc.us',
+                    displayName: 'Hannah Walker',
+                },
+                'carolyn@htc.us': {
+                    accountID: 3,
+                    login: 'carolyn@htc.us',
+                    displayName: 'Carolyn Smith',
+                },
                 'gio@htc.us': {accountID: 4, login: 'gio@htc.us', displayName: 'Gio'},
             };
 
@@ -595,8 +716,16 @@ describe('WorkflowUtils', () => {
             };
             const policy = createMockPolicy(employees, 'bob@example.com');
             const personalDetailsForTest: PersonalDetailsList = {
-                'alice@example.com': {accountID: 1, login: 'alice@example.com', displayName: 'Alice'},
-                'bob@example.com': {accountID: 2, login: 'bob@example.com', displayName: 'Bob'},
+                'alice@example.com': {
+                    accountID: 1,
+                    login: 'alice@example.com',
+                    displayName: 'Alice',
+                },
+                'bob@example.com': {
+                    accountID: 2,
+                    login: 'bob@example.com',
+                    displayName: 'Bob',
+                },
             };
 
             const {approvalWorkflows, availableMembers} = convertPolicyEmployeesToApprovalWorkflows({
@@ -631,9 +760,21 @@ describe('WorkflowUtils', () => {
                 owner: 'alice@example.com',
             });
             const personalDetailsForTest: PersonalDetailsList = {
-                'alice@example.com': {accountID: 1, login: 'alice@example.com', displayName: 'Alice'},
-                'guide@expensify.com': {accountID: 2, login: 'guide@expensify.com', displayName: 'Guide'},
-                'concierge@team.expensify.com': {accountID: 3, login: 'concierge@team.expensify.com', displayName: 'Concierge'},
+                'alice@example.com': {
+                    accountID: 1,
+                    login: 'alice@example.com',
+                    displayName: 'Alice',
+                },
+                'guide@expensify.com': {
+                    accountID: 2,
+                    login: 'guide@expensify.com',
+                    displayName: 'Guide',
+                },
+                'concierge@team.expensify.com': {
+                    accountID: 3,
+                    login: 'concierge@team.expensify.com',
+                    displayName: 'Concierge',
+                },
             };
 
             const {approvalWorkflows, availableMembers} = convertPolicyEmployeesToApprovalWorkflows({
@@ -669,8 +810,16 @@ describe('WorkflowUtils', () => {
                 owner: 'admin@expensify.com',
             });
             const personalDetailsForTest: PersonalDetailsList = {
-                'admin@expensify.com': {accountID: 1, login: 'admin@expensify.com', displayName: 'Admin'},
-                'guide@expensify.com': {accountID: 2, login: 'guide@expensify.com', displayName: 'Guide'},
+                'admin@expensify.com': {
+                    accountID: 1,
+                    login: 'admin@expensify.com',
+                    displayName: 'Admin',
+                },
+                'guide@expensify.com': {
+                    accountID: 2,
+                    login: 'guide@expensify.com',
+                    displayName: 'Guide',
+                },
             };
 
             const {availableMembers} = convertPolicyEmployeesToApprovalWorkflows({
@@ -701,8 +850,16 @@ describe('WorkflowUtils', () => {
                 owner: 'alice@example.com',
             });
             const personalDetailsForTest: PersonalDetailsList = {
-                'alice@example.com': {accountID: 1, login: 'alice@example.com', displayName: 'Alice'},
-                'guide@expensify.com': {accountID: 2, login: 'guide@expensify.com', displayName: 'Guide'},
+                'alice@example.com': {
+                    accountID: 1,
+                    login: 'alice@example.com',
+                    displayName: 'Alice',
+                },
+                'guide@expensify.com': {
+                    accountID: 2,
+                    login: 'guide@expensify.com',
+                    displayName: 'Guide',
+                },
             };
 
             const {availableMembers} = convertPolicyEmployeesToApprovalWorkflows({
@@ -736,9 +893,21 @@ describe('WorkflowUtils', () => {
                 owner: 'alice@example.com',
             });
             const personalDetailsForTest: PersonalDetailsList = {
-                'alice@example.com': {accountID: 1, login: 'alice@example.com', displayName: 'Alice'},
-                'guide@expensify.com': {accountID: 2, login: 'guide@expensify.com', displayName: 'Guide'},
-                'bob@example.com': {accountID: 3, login: 'bob@example.com', displayName: 'Bob'},
+                'alice@example.com': {
+                    accountID: 1,
+                    login: 'alice@example.com',
+                    displayName: 'Alice',
+                },
+                'guide@expensify.com': {
+                    accountID: 2,
+                    login: 'guide@expensify.com',
+                    displayName: 'Guide',
+                },
+                'bob@example.com': {
+                    accountID: 3,
+                    login: 'bob@example.com',
+                    displayName: 'Bob',
+                },
             };
 
             const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
@@ -779,10 +948,26 @@ describe('WorkflowUtils', () => {
                 owner: 'alice@example.com',
             });
             const personalDetailsForTest: PersonalDetailsList = {
-                'alice@example.com': {accountID: 1, login: 'alice@example.com', displayName: 'Alice'},
-                'bob@example.com': {accountID: 2, login: 'bob@example.com', displayName: 'Bob'},
-                'guide@expensify.com': {accountID: 3, login: 'guide@expensify.com', displayName: 'Guide'},
-                'carol@example.com': {accountID: 4, login: 'carol@example.com', displayName: 'Carol'},
+                'alice@example.com': {
+                    accountID: 1,
+                    login: 'alice@example.com',
+                    displayName: 'Alice',
+                },
+                'bob@example.com': {
+                    accountID: 2,
+                    login: 'bob@example.com',
+                    displayName: 'Bob',
+                },
+                'guide@expensify.com': {
+                    accountID: 3,
+                    login: 'guide@expensify.com',
+                    displayName: 'Guide',
+                },
+                'carol@example.com': {
+                    accountID: 4,
+                    login: 'carol@example.com',
+                    displayName: 'Carol',
+                },
             };
 
             const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
@@ -827,10 +1012,26 @@ describe('WorkflowUtils', () => {
                 },
             });
             const personalDetailsForTest: PersonalDetailsList = {
-                'unassigned@example.com': {accountID: 1, login: 'unassigned@example.com', displayName: 'Unassigned'},
-                'assigned@example.com': {accountID: 2, login: 'assigned@example.com', displayName: 'Assigned'},
-                'finalapprover@example.com': {accountID: 3, login: 'finalapprover@example.com', displayName: 'Final Approver'},
-                'manager@external.com': {accountID: 4, login: 'manager@external.com', displayName: 'Manager'},
+                'unassigned@example.com': {
+                    accountID: 1,
+                    login: 'unassigned@example.com',
+                    displayName: 'Unassigned',
+                },
+                'assigned@example.com': {
+                    accountID: 2,
+                    login: 'assigned@example.com',
+                    displayName: 'Assigned',
+                },
+                'finalapprover@example.com': {
+                    accountID: 3,
+                    login: 'finalapprover@example.com',
+                    displayName: 'Final Approver',
+                },
+                'manager@external.com': {
+                    accountID: 4,
+                    login: 'manager@external.com',
+                    displayName: 'Manager',
+                },
             };
 
             const {approvalWorkflows} = convertPolicyEmployeesToApprovalWorkflows({
@@ -888,6 +1089,37 @@ describe('WorkflowUtils', () => {
         });
     });
 
+    describe('includesEveryWorkspaceMember', () => {
+        const employeeList: PolicyEmployeeList = {
+            '1@example.com': buildPolicyEmployee(1),
+            '2@example.com': buildPolicyEmployee(2),
+            '3@example.com': buildPolicyEmployee(3, {
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+            }),
+        };
+
+        it('is true when every member is included, leaving out members being removed from the workspace', () => {
+            // Given a workspace where member 3 is being removed
+            // When checking a workflow with every other member
+            // Then it has everyone, because member 3 won't be in any workflow once removed
+            expect(includesEveryWorkspaceMember(['1@example.com', '2@example.com'], employeeList)).toBe(true);
+        });
+
+        it('is false while a workspace member is missing', () => {
+            // Given a workspace with members 1 and 2
+            // When checking a workflow with only member 1
+            // Then it doesn't have everyone, because member 2 stays in their current workflow
+            expect(includesEveryWorkspaceMember(['1@example.com'], employeeList)).toBe(false);
+        });
+
+        it('is false when the workspace has no members', () => {
+            // Given a workspace whose member list hasn't loaded
+            // When checking any workflow
+            // Then it doesn't have everyone, so no workflow is made the default by mistake
+            expect(includesEveryWorkspaceMember(['1@example.com'], {})).toBe(false);
+        });
+    });
+
     describe('convertApprovalWorkflowToPolicyEmployees', () => {
         it('Should return an updated employee list for a simple default workflow', () => {
             const approvalWorkflow: ApprovalWorkflow = {
@@ -896,11 +1128,23 @@ describe('WorkflowUtils', () => {
                 isDefault: true,
             };
 
-            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList: {}, approvalWorkflow, type: 'create'});
+            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({
+                previousEmployeeList: {},
+                approvalWorkflow,
+                type: 'create',
+            });
 
             expect(convertedEmployees).toEqual({
-                '1@example.com': buildPolicyEmployee(1, {forwardsTo: '', overLimitForwardsTo: '', submitsTo: '1@example.com', pendingFields: {submitsTo: 'add'}}),
-                '2@example.com': buildPolicyEmployee(2, {submitsTo: '1@example.com', pendingFields: {submitsTo: 'add'}}),
+                '1@example.com': buildPolicyEmployee(1, {
+                    forwardsTo: '',
+                    overLimitForwardsTo: '',
+                    submitsTo: '1@example.com',
+                    pendingFields: {submitsTo: 'add'},
+                }),
+                '2@example.com': buildPolicyEmployee(2, {
+                    submitsTo: '1@example.com',
+                    pendingFields: {submitsTo: 'add'},
+                }),
             });
         });
 
@@ -911,15 +1155,40 @@ describe('WorkflowUtils', () => {
                 isDefault: false,
             };
 
-            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList: {}, approvalWorkflow, type: 'create'});
+            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({
+                previousEmployeeList: {},
+                approvalWorkflow,
+                type: 'create',
+            });
 
             expect(convertedEmployees).toEqual({
-                '1@example.com': buildPolicyEmployee(1, {forwardsTo: '2@example.com', overLimitForwardsTo: '', pendingFields: {forwardsTo: 'add', overLimitForwardsTo: 'add'}}),
-                '2@example.com': buildPolicyEmployee(2, {forwardsTo: '3@example.com', overLimitForwardsTo: '', pendingFields: {forwardsTo: 'add', overLimitForwardsTo: 'add'}}),
-                '3@example.com': buildPolicyEmployee(3, {forwardsTo: '', overLimitForwardsTo: '', pendingFields: {forwardsTo: 'add', overLimitForwardsTo: 'add'}}),
-                '4@example.com': buildPolicyEmployee(4, {submitsTo: '1@example.com', pendingFields: {submitsTo: 'add'}}),
-                '5@example.com': buildPolicyEmployee(5, {submitsTo: '1@example.com', pendingFields: {submitsTo: 'add'}}),
-                '6@example.com': buildPolicyEmployee(6, {submitsTo: '1@example.com', pendingFields: {submitsTo: 'add'}}),
+                '1@example.com': buildPolicyEmployee(1, {
+                    forwardsTo: '2@example.com',
+                    overLimitForwardsTo: '',
+                    pendingFields: {forwardsTo: 'add', overLimitForwardsTo: 'add'},
+                }),
+                '2@example.com': buildPolicyEmployee(2, {
+                    forwardsTo: '3@example.com',
+                    overLimitForwardsTo: '',
+                    pendingFields: {forwardsTo: 'add', overLimitForwardsTo: 'add'},
+                }),
+                '3@example.com': buildPolicyEmployee(3, {
+                    forwardsTo: '',
+                    overLimitForwardsTo: '',
+                    pendingFields: {forwardsTo: 'add', overLimitForwardsTo: 'add'},
+                }),
+                '4@example.com': buildPolicyEmployee(4, {
+                    submitsTo: '1@example.com',
+                    pendingFields: {submitsTo: 'add'},
+                }),
+                '5@example.com': buildPolicyEmployee(5, {
+                    submitsTo: '1@example.com',
+                    pendingFields: {submitsTo: 'add'},
+                }),
+                '6@example.com': buildPolicyEmployee(6, {
+                    submitsTo: '1@example.com',
+                    pendingFields: {submitsTo: 'add'},
+                }),
             });
         });
 
@@ -930,7 +1199,11 @@ describe('WorkflowUtils', () => {
                 isDefault: false,
             };
 
-            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList: {}, approvalWorkflow, type: 'remove'});
+            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({
+                previousEmployeeList: {},
+                approvalWorkflow,
+                type: 'remove',
+            });
 
             expect(convertedEmployees).toEqual({
                 '1@example.com': buildPolicyEmployee(1, {
@@ -938,45 +1211,85 @@ describe('WorkflowUtils', () => {
                     approvalLimit: null,
                     overLimitForwardsTo: '',
                     pendingAction: 'update',
-                    pendingFields: {forwardsTo: 'update', approvalLimit: 'update', overLimitForwardsTo: 'update'},
+                    pendingFields: {
+                        forwardsTo: 'update',
+                        approvalLimit: 'update',
+                        overLimitForwardsTo: 'update',
+                    },
                 }),
                 '2@example.com': buildPolicyEmployee(2, {
                     forwardsTo: '',
                     approvalLimit: null,
                     overLimitForwardsTo: '',
                     pendingAction: 'update',
-                    pendingFields: {forwardsTo: 'update', approvalLimit: 'update', overLimitForwardsTo: 'update'},
+                    pendingFields: {
+                        forwardsTo: 'update',
+                        approvalLimit: 'update',
+                        overLimitForwardsTo: 'update',
+                    },
                 }),
                 '3@example.com': buildPolicyEmployee(3, {
                     forwardsTo: '',
                     approvalLimit: null,
                     overLimitForwardsTo: '',
                     pendingAction: 'update',
-                    pendingFields: {forwardsTo: 'update', approvalLimit: 'update', overLimitForwardsTo: 'update'},
+                    pendingFields: {
+                        forwardsTo: 'update',
+                        approvalLimit: 'update',
+                        overLimitForwardsTo: 'update',
+                    },
+                }),
+                '4@example.com': buildPolicyEmployee(4, {
+                    submitsTo: '',
+                    pendingAction: 'update',
+                    pendingFields: {submitsTo: 'update'},
+                }),
+                '5@example.com': buildPolicyEmployee(5, {
+                    submitsTo: '',
+                    pendingAction: 'update',
+                    pendingFields: {submitsTo: 'update'},
+                }),
+                '6@example.com': buildPolicyEmployee(6, {
+                    submitsTo: '',
+                    pendingAction: 'update',
+                    pendingFields: {submitsTo: 'update'},
                 }),
-                '4@example.com': buildPolicyEmployee(4, {submitsTo: '', pendingAction: 'update', pendingFields: {submitsTo: 'update'}}),
-                '5@example.com': buildPolicyEmployee(5, {submitsTo: '', pendingAction: 'update', pendingFields: {submitsTo: 'update'}}),
-                '6@example.com': buildPolicyEmployee(6, {submitsTo: '', pendingAction: 'update', pendingFields: {submitsTo: 'update'}}),
             });
         });
 
         it('Should include approvalLimit and overLimitForwardsTo when creating workflow with limits', () => {
             const approvalWorkflow: ApprovalWorkflow = {
                 members: [buildMember(2)],
-                approvers: [buildApprover(1, {approvalLimit: 50000, overLimitForwardsTo: '3@example.com'})],
+                approvers: [
+                    buildApprover(1, {
+                        approvalLimit: 50000,
+                        overLimitForwardsTo: '3@example.com',
+                    }),
+                ],
                 isDefault: false,
             };
 
-            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList: {}, approvalWorkflow, type: 'create'});
+            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({
+                previousEmployeeList: {},
+                approvalWorkflow,
+                type: 'create',
+            });
 
             expect(convertedEmployees).toEqual({
                 '1@example.com': buildPolicyEmployee(1, {
                     forwardsTo: '',
                     approvalLimit: 50000,
                     overLimitForwardsTo: '3@example.com',
-                    pendingFields: {forwardsTo: 'add', approvalLimit: 'add', overLimitForwardsTo: 'add'},
+                    pendingFields: {
+                        forwardsTo: 'add',
+                        approvalLimit: 'add',
+                        overLimitForwardsTo: 'add',
+                    },
+                }),
+                '2@example.com': buildPolicyEmployee(2, {
+                    submitsTo: '1@example.com',
+                    pendingFields: {submitsTo: 'add'},
                 }),
-                '2@example.com': buildPolicyEmployee(2, {submitsTo: '1@example.com', pendingFields: {submitsTo: 'add'}}),
             });
         });
 
@@ -991,11 +1304,21 @@ describe('WorkflowUtils', () => {
             };
             const approvalWorkflow: ApprovalWorkflow = {
                 members: [],
-                approvers: [buildApprover(1, {forwardsTo: '2@example.com', approvalLimit: 50000, overLimitForwardsTo: '3@example.com'})],
+                approvers: [
+                    buildApprover(1, {
+                        forwardsTo: '2@example.com',
+                        approvalLimit: 50000,
+                        overLimitForwardsTo: '3@example.com',
+                    }),
+                ],
                 isDefault: false,
             };
 
-            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList, approvalWorkflow, type: 'remove'});
+            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({
+                previousEmployeeList,
+                approvalWorkflow,
+                type: 'remove',
+            });
 
             // approvalLimit should be null (not undefined) so it gets sent to the API and clears the field
             expect(convertedEmployees['1@example.com']?.approvalLimit).toBeNull();
@@ -1013,11 +1336,20 @@ describe('WorkflowUtils', () => {
             };
             const approvalWorkflow: ApprovalWorkflow = {
                 members: [],
-                approvers: [buildApprover(1, {approvalLimit: 100000, overLimitForwardsTo: '4@example.com'})],
+                approvers: [
+                    buildApprover(1, {
+                        approvalLimit: 100000,
+                        overLimitForwardsTo: '4@example.com',
+                    }),
+                ],
                 isDefault: false,
             };
 
-            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList, approvalWorkflow, type: 'update'});
+            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({
+                previousEmployeeList,
+                approvalWorkflow,
+                type: 'update',
+            });
 
             // pendingFields should include the fields that changed (forwardsTo didn't change since it's '' -> '')
             expect(convertedEmployees['1@example.com']?.pendingFields).toEqual({
@@ -1039,11 +1371,20 @@ describe('WorkflowUtils', () => {
             };
             const approvalWorkflow: ApprovalWorkflow = {
                 members: [],
-                approvers: [buildApprover(1, {approvalLimit: 50000, overLimitForwardsTo: '4@example.com'})],
+                approvers: [
+                    buildApprover(1, {
+                        approvalLimit: 50000,
+                        overLimitForwardsTo: '4@example.com',
+                    }),
+                ],
                 isDefault: false,
             };
 
-            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({previousEmployeeList, approvalWorkflow, type: 'update'});
+            const convertedEmployees = convertApprovalWorkflowToPolicyEmployees({
+                previousEmployeeList,
+                approvalWorkflow,
+                type: 'update',
+            });
 
             // Only overLimitForwardsTo changed, so only that should be in pendingFields
             expect(convertedEmployees['1@example.com']?.pendingFields).toEqual({
@@ -1162,7 +1503,13 @@ describe('WorkflowUtils', () => {
                 ownerDetails,
             });
 
-            expect(updateWorkflowDataOnApproverRemovalResult).toEqual([approvalWorkflow1, {...approvalWorkflow2, approvers: [buildApprover(2), buildApprover(3), buildApprover(1)]}]);
+            expect(updateWorkflowDataOnApproverRemovalResult).toEqual([
+                approvalWorkflow1,
+                {
+                    ...approvalWorkflow2,
+                    approvers: [buildApprover(2), buildApprover(3), buildApprover(1)],
+                },
+            ]);
         });
         it('Should remove the approvers that have submitsTo set to the removed approver, update the removed approver to the Workspace Owner, and ensure there was a previous approver before this one', () => {
             const approvalWorkflow1: ApprovalWorkflow = {
@@ -1189,7 +1536,13 @@ describe('WorkflowUtils', () => {
                 ownerDetails,
             });
 
-            expect(updateWorkflowDataOnApproverRemovalResult).toEqual([approvalWorkflow1, {...approvalWorkflow2, approvers: [buildApprover(2), buildApprover(1)]}]);
+            expect(updateWorkflowDataOnApproverRemovalResult).toEqual([
+                approvalWorkflow1,
+                {
+                    ...approvalWorkflow2,
+                    approvers: [buildApprover(2), buildApprover(1)],
+                },
+            ]);
         });
         it('Should remove Workflow 2 if it has no approvers and the default Workspace approver is the approve', () => {
             const approvalWorkflow1: ApprovalWorkflow = {
@@ -1240,14 +1593,26 @@ describe('WorkflowUtils', () => {
                 ownerDetails,
             });
 
-            expect(result).toEqual([{...approvalWorkflow1, approvers: [buildApprover(4), buildApprover(5)]}]);
+            expect(result).toEqual([
+                {
+                    ...approvalWorkflow1,
+                    approvers: [buildApprover(4), buildApprover(5)],
+                },
+            ]);
         });
 
         it('Should clear overLimitForwardsTo when a later approver had overLimitForwardsTo pointing to the first approver (which is also the removed approver)', () => {
             // The multi-approver block handles this: removed approver (3) is spliced out and overLimitForwardsTo is cleared.
             const approvalWorkflow1: ApprovalWorkflow = {
                 members: [buildMember(1), buildMember(2)],
-                approvers: [buildApprover(3), buildApprover(4, {overLimitForwardsTo: '3@example.com', approvalLimit: 100}), buildApprover(5)],
+                approvers: [
+                    buildApprover(3),
+                    buildApprover(4, {
+                        overLimitForwardsTo: '3@example.com',
+                        approvalLimit: 100,
+                    }),
+                    buildApprover(5),
+                ],
                 isDefault: true,
             };
 
@@ -1292,14 +1657,26 @@ describe('WorkflowUtils', () => {
                 ownerDetails,
             });
 
-            expect(result).toEqual([{...approvalWorkflow1, approvers: [buildApprover(1), buildApprover(2)]}]);
+            expect(result).toEqual([
+                {
+                    ...approvalWorkflow1,
+                    approvers: [buildApprover(1), buildApprover(2)],
+                },
+            ]);
         });
 
         it('Should clear overLimitForwardsTo pointing to removed approver when a prior approver references them via overLimitForwardsTo (removed approver also in chain)', () => {
             // The multi-approver block handles this: removed approver (3) is spliced out and overLimitForwardsTo is cleared.
             const approvalWorkflow1: ApprovalWorkflow = {
                 members: [buildMember(1), buildMember(2)],
-                approvers: [buildApprover(1), buildApprover(2, {overLimitForwardsTo: '3@example.com', approvalLimit: 100}), buildApprover(3)],
+                approvers: [
+                    buildApprover(1),
+                    buildApprover(2, {
+                        overLimitForwardsTo: '3@example.com',
+                        approvalLimit: 100,
+                    }),
+                    buildApprover(3),
+                ],
                 isDefault: true,
             };
 
@@ -1402,7 +1779,13 @@ describe('WorkflowUtils', () => {
             // The multi-approver block handles this: removed approver (3) is replaced by owner and overLimitForwardsTo is cleared.
             const approvalWorkflow1: ApprovalWorkflow = {
                 members: [buildMember(1), buildMember(2)],
-                approvers: [buildApprover(2, {overLimitForwardsTo: '3@example.com', approvalLimit: 50}), buildApprover(3)],
+                approvers: [
+                    buildApprover(2, {
+                        overLimitForwardsTo: '3@example.com',
+                        approvalLimit: 50,
+                    }),
+                    buildApprover(3),
+                ],
                 isDefault: true,
             };
 
@@ -1476,7 +1859,10 @@ describe('WorkflowUtils', () => {
         });
 
         it('Should return undefined when approvalLimit is null', () => {
-            const approver = buildApprover(1, {approvalLimit: null, overLimitForwardsTo: '2@example.com'});
+            const approver = buildApprover(1, {
+                approvalLimit: null,
+                overLimitForwardsTo: '2@example.com',
+            });
 
             const result = getApprovalLimitDescription({
                 approver,
@@ -1490,7 +1876,10 @@ describe('WorkflowUtils', () => {
         });
 
         it('Should return undefined when approvalLimit is undefined', () => {
-            const approver = buildApprover(1, {approvalLimit: undefined, overLimitForwardsTo: '2@example.com'});
+            const approver = buildApprover(1, {
+                approvalLimit: undefined,
+                overLimitForwardsTo: '2@example.com',
+            });
 
             const result = getApprovalLimitDescription({
                 approver,
@@ -1504,7 +1893,10 @@ describe('WorkflowUtils', () => {
         });
 
         it('Should return undefined when overLimitForwardsTo is missing', () => {
-            const approver = buildApprover(1, {approvalLimit: 50000, overLimitForwardsTo: undefined});
+            const approver = buildApprover(1, {
+                approvalLimit: 50000,
+                overLimitForwardsTo: undefined,
+            });
 
             const result = getApprovalLimitDescription({
                 approver,
@@ -1518,7 +1910,10 @@ describe('WorkflowUtils', () => {
         });
 
         it('Should return description when approvalLimit and overLimitForwardsTo are set', () => {
-            const approver = buildApprover(1, {approvalLimit: 50000, overLimitForwardsTo: '2@example.com'});
+            const approver = buildApprover(1, {
+                approvalLimit: 50000,
+                overLimitForwardsTo: '2@example.com',
+            });
 
             const result = getApprovalLimitDescription({
                 approver,
@@ -1683,13 +2078,25 @@ describe('WorkflowUtils', () => {
     });
 
     describe('rule-based approval workflows', () => {
-        const submitTriggers = {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT};
-        const approveTriggers = {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_APPROVE};
-        const forwardActions = (approver: string) => ({'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver}});
-        const approveActions = {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.APPROVE_REPORT}};
-        const buildFromFilter = (emails: string[]) => ({operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: emails});
-        const buildToFilter = (email: string) => ({operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO, right: email});
-        const and = (left: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison, right: ApprovalWorkflowFilter | ApprovalWorkflowFilterComparison): ApprovalWorkflowFilter => ({
+        const submitTriggers = {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT};
+        const approveTriggers = {'1': CONST.RULES.TRIGGERS.REPORT_APPROVE};
+        const forwardActions = (approver: string) => ({
+            '1': {name: CONST.RULES.ACTIONS.FORWARD_TO, approver},
+        });
+        const approveActions = {
+            '1': {name: CONST.RULES.ACTIONS.APPROVE_REPORT},
+        };
+        const buildFromFilter = (emails: string[]) => ({
+            operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM,
+            right: emails,
+        });
+        const buildToFilter = (email: string) => ({
+            operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+            left: CONST.SEARCH.SYNTAX_FILTER_KEYS.TO,
+            right: email,
+        });
+        const and = (left: RuleFilter | RuleFilterComparison, right: RuleFilter | RuleFilterComparison): RuleFilter => ({
             operator: CONST.SEARCH.SYNTAX_OPERATORS.AND,
             left,
             right,
@@ -1706,35 +2113,84 @@ describe('WorkflowUtils', () => {
 
             it('Should build a submit rule and a terminal approve rule for a one-approver workflow', () => {
                 expect(buildApprovalWorkflowRules(buildWorkflow([2], [1]))).toEqual([
-                    {triggers: submitTriggers, filters: buildFromFilter(['2@example.com']), actions: forwardActions('1@example.com')},
-                    {triggers: approveTriggers, filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')), actions: approveActions},
+                    {
+                        triggers: submitTriggers,
+                        filters: buildFromFilter(['2@example.com']),
+                        actions: forwardActions('1@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')),
+                        actions: approveActions,
+                    },
                 ]);
             });
 
             it('Should chain approvers with `to` gates and approve at the end', () => {
                 expect(buildApprovalWorkflowRules(buildWorkflow([3], [1, 2]))).toEqual([
-                    {triggers: submitTriggers, filters: buildFromFilter(['3@example.com']), actions: forwardActions('1@example.com')},
-                    {triggers: approveTriggers, filters: and(buildFromFilter(['3@example.com']), buildToFilter('1@example.com')), actions: forwardActions('2@example.com')},
-                    {triggers: approveTriggers, filters: and(buildFromFilter(['3@example.com']), buildToFilter('2@example.com')), actions: approveActions},
+                    {
+                        triggers: submitTriggers,
+                        filters: buildFromFilter(['3@example.com']),
+                        actions: forwardActions('1@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['3@example.com']), buildToFilter('1@example.com')),
+                        actions: forwardActions('2@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['3@example.com']), buildToFilter('2@example.com')),
+                        actions: approveActions,
+                    },
                 ]);
             });
 
             it('Should split an approver into under/over amount rules when it has a limit split', () => {
                 const workflow: ApprovalWorkflow = {
                     members: [buildMember(2)],
-                    approvers: [buildApprover(1, {approvalLimit: 50000, overLimitForwardsTo: '3@example.com'})],
+                    approvers: [
+                        buildApprover(1, {
+                            approvalLimit: 50000,
+                            overLimitForwardsTo: '3@example.com',
+                        }),
+                    ],
                     isDefault: false,
                 };
-                const underAmount = {operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 50000};
-                const overAmount = {operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 50000};
+                const underAmount = {
+                    operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN,
+                    left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT,
+                    right: 50000,
+                };
+                const overAmount = {
+                    operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO,
+                    left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT,
+                    right: 50000,
+                };
 
                 // The limit decides who *receives* the report, so the amount split is on the way in. Both possible
                 // holders then finalize it, because this is the last position.
                 expect(buildApprovalWorkflowRules(workflow)).toEqual([
-                    {triggers: submitTriggers, filters: and(buildFromFilter(['2@example.com']), underAmount), actions: forwardActions('1@example.com')},
-                    {triggers: submitTriggers, filters: and(buildFromFilter(['2@example.com']), overAmount), actions: forwardActions('3@example.com')},
-                    {triggers: approveTriggers, filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')), actions: approveActions},
-                    {triggers: approveTriggers, filters: and(buildFromFilter(['2@example.com']), buildToFilter('3@example.com')), actions: approveActions},
+                    {
+                        triggers: submitTriggers,
+                        filters: and(buildFromFilter(['2@example.com']), underAmount),
+                        actions: forwardActions('1@example.com'),
+                    },
+                    {
+                        triggers: submitTriggers,
+                        filters: and(buildFromFilter(['2@example.com']), overAmount),
+                        actions: forwardActions('3@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')),
+                        actions: approveActions,
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['2@example.com']), buildToFilter('3@example.com')),
+                        actions: approveActions,
+                    },
                 ]);
             });
 
@@ -1743,32 +2199,79 @@ describe('WorkflowUtils', () => {
                 // it carries on to 4@example.com afterwards.
                 const workflow: ApprovalWorkflow = {
                     members: [buildMember(2)],
-                    approvers: [buildApprover(1, {approvalLimit: 10000, overLimitForwardsTo: '3@example.com'}), buildApprover(4)],
+                    approvers: [
+                        buildApprover(1, {
+                            approvalLimit: 10000,
+                            overLimitForwardsTo: '3@example.com',
+                        }),
+                        buildApprover(4),
+                    ],
                     isDefault: false,
                 };
-                const underAmount = {operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000};
-                const overAmount = {operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, right: 10000};
+                const underAmount = {
+                    operator: CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN,
+                    left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT,
+                    right: 10000,
+                };
+                const overAmount = {
+                    operator: CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO,
+                    left: CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT,
+                    right: 10000,
+                };
                 const from = buildFromFilter(['2@example.com']);
 
                 expect(buildApprovalWorkflowRules(workflow)).toEqual([
-                    {triggers: submitTriggers, filters: and(from, underAmount), actions: forwardActions('1@example.com')},
-                    {triggers: submitTriggers, filters: and(from, overAmount), actions: forwardActions('3@example.com')},
-                    {triggers: approveTriggers, filters: and(from, buildToFilter('1@example.com')), actions: forwardActions('4@example.com')},
-                    {triggers: approveTriggers, filters: and(from, buildToFilter('3@example.com')), actions: forwardActions('4@example.com')},
-                    {triggers: approveTriggers, filters: and(from, buildToFilter('4@example.com')), actions: approveActions},
+                    {
+                        triggers: submitTriggers,
+                        filters: and(from, underAmount),
+                        actions: forwardActions('1@example.com'),
+                    },
+                    {
+                        triggers: submitTriggers,
+                        filters: and(from, overAmount),
+                        actions: forwardActions('3@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(from, buildToFilter('1@example.com')),
+                        actions: forwardActions('4@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(from, buildToFilter('3@example.com')),
+                        actions: forwardActions('4@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(from, buildToFilter('4@example.com')),
+                        actions: approveActions,
+                    },
                 ]);
             });
 
             it('Should ignore a limit split when the limit is not positive', () => {
                 const workflow: ApprovalWorkflow = {
                     members: [buildMember(2)],
-                    approvers: [buildApprover(1, {approvalLimit: 0, overLimitForwardsTo: '3@example.com'})],
+                    approvers: [
+                        buildApprover(1, {
+                            approvalLimit: 0,
+                            overLimitForwardsTo: '3@example.com',
+                        }),
+                    ],
                     isDefault: false,
                 };
 
                 expect(buildApprovalWorkflowRules(workflow)).toEqual([
-                    {triggers: submitTriggers, filters: buildFromFilter(['2@example.com']), actions: forwardActions('1@example.com')},
-                    {triggers: approveTriggers, filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')), actions: approveActions},
+                    {
+                        triggers: submitTriggers,
+                        filters: buildFromFilter(['2@example.com']),
+                        actions: forwardActions('1@example.com'),
+                    },
+                    {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')),
+                        actions: approveActions,
+                    },
                 ]);
             });
         });
@@ -1873,7 +2376,11 @@ describe('WorkflowUtils', () => {
             it('Should ignore rules that do not contain the members', () => {
                 const existingRules = keyRules(buildApprovalWorkflowRules(buildWorkflow([30], [1])));
 
-                expect(reconcileApprovalWorkflowRulesForRemove(['10@example.com'], {existingRules})).toEqual({});
+                expect(
+                    reconcileApprovalWorkflowRulesForRemove(['10@example.com'], {
+                        existingRules,
+                    }),
+                ).toEqual({});
             });
         });
 
@@ -1903,7 +2410,9 @@ describe('WorkflowUtils', () => {
             it('Should map each submitter to the first approver in their chain', () => {
                 const rules = keyRules(buildApprovalWorkflowRules(buildWorkflow([5], [1, 2])));
 
-                expect(getRulesSubmitterToFirstApprover(rules)).toEqual({'5@example.com': '1@example.com'});
+                expect(getRulesSubmitterToFirstApprover(rules)).toEqual({
+                    '5@example.com': '1@example.com',
+                });
             });
         });
 
@@ -1942,15 +2451,51 @@ describe('WorkflowUtils', () => {
             // then diverges to 9. The workflow key must group 2 and 3 together and set 4 apart, so callers can
             // tell a real cross-workflow move from a same-first-approver re-add.
             const rules: Record<string, ApprovalWorkflowRule> = {
-                sub2: {triggers: submitTriggers, filters: buildFromFilter(['2@example.com']), actions: forwardActions('1@example.com')},
-                app2at1: {triggers: approveTriggers, filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')), actions: forwardActions('8@example.com')},
-                app2at8: {triggers: approveTriggers, filters: and(buildFromFilter(['2@example.com']), buildToFilter('8@example.com')), actions: approveActions},
-                sub3: {triggers: submitTriggers, filters: buildFromFilter(['3@example.com']), actions: forwardActions('1@example.com')},
-                app3at1: {triggers: approveTriggers, filters: and(buildFromFilter(['3@example.com']), buildToFilter('1@example.com')), actions: forwardActions('8@example.com')},
-                app3at8: {triggers: approveTriggers, filters: and(buildFromFilter(['3@example.com']), buildToFilter('8@example.com')), actions: approveActions},
-                sub4: {triggers: submitTriggers, filters: buildFromFilter(['4@example.com']), actions: forwardActions('1@example.com')},
-                app4at1: {triggers: approveTriggers, filters: and(buildFromFilter(['4@example.com']), buildToFilter('1@example.com')), actions: forwardActions('9@example.com')},
-                app4at9: {triggers: approveTriggers, filters: and(buildFromFilter(['4@example.com']), buildToFilter('9@example.com')), actions: approveActions},
+                sub2: {
+                    triggers: submitTriggers,
+                    filters: buildFromFilter(['2@example.com']),
+                    actions: forwardActions('1@example.com'),
+                },
+                app2at1: {
+                    triggers: approveTriggers,
+                    filters: and(buildFromFilter(['2@example.com']), buildToFilter('1@example.com')),
+                    actions: forwardActions('8@example.com'),
+                },
+                app2at8: {
+                    triggers: approveTriggers,
+                    filters: and(buildFromFilter(['2@example.com']), buildToFilter('8@example.com')),
+                    actions: approveActions,
+                },
+                sub3: {
+                    triggers: submitTriggers,
+                    filters: buildFromFilter(['3@example.com']),
+                    actions: forwardActions('1@example.com'),
+                },
+                app3at1: {
+                    triggers: approveTriggers,
+                    filters: and(buildFromFilter(['3@example.com']), buildToFilter('1@example.com')),
+                    actions: forwardActions('8@example.com'),
+                },
+                app3at8: {
+                    triggers: approveTriggers,
+                    filters: and(buildFromFilter(['3@example.com']), buildToFilter('8@example.com')),
+                    actions: approveActions,
+                },
+                sub4: {
+                    triggers: submitTriggers,
+                    filters: buildFromFilter(['4@example.com']),
+                    actions: forwardActions('1@example.com'),
+                },
+                app4at1: {
+                    triggers: approveTriggers,
+                    filters: and(buildFromFilter(['4@example.com']), buildToFilter('1@example.com')),
+                    actions: forwardActions('9@example.com'),
+                },
+                app4at9: {
+                    triggers: approveTriggers,
+                    filters: and(buildFromFilter(['4@example.com']), buildToFilter('9@example.com')),
+                    actions: approveActions,
+                },
             };
 
             it('Should give submitters with identical chains the same key', () => {
@@ -1982,10 +2527,20 @@ describe('WorkflowUtils', () => {
 
             it('Should reconstruct a multi-approver chain from rules', () => {
                 const rules = keyRules(buildApprovalWorkflowRules(buildWorkflow([5], [1, 2])));
-                const employees: PolicyEmployeeList = {'5@example.com': {email: '5@example.com', submitsTo: '1@example.com'}};
+                const employees: PolicyEmployeeList = {
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                };
                 const policy = createPolicy(employees, '1@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 expect(approvalWorkflows).toHaveLength(1);
                 const workflow = approvalWorkflows.at(0);
@@ -1999,14 +2554,29 @@ describe('WorkflowUtils', () => {
             it('Should reconstruct an approver limit split from rules', () => {
                 const workflow: ApprovalWorkflow = {
                     members: [buildMember(5)],
-                    approvers: [buildApprover(1, {approvalLimit: 50000, overLimitForwardsTo: '3@example.com'})],
+                    approvers: [
+                        buildApprover(1, {
+                            approvalLimit: 50000,
+                            overLimitForwardsTo: '3@example.com',
+                        }),
+                    ],
                     isDefault: false,
                 };
                 const rules = keyRules(buildApprovalWorkflowRules(workflow));
-                const employees: PolicyEmployeeList = {'5@example.com': {email: '5@example.com', submitsTo: '1@example.com'}};
+                const employees: PolicyEmployeeList = {
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                };
                 const policy = createPolicy(employees, '1@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 const firstApprover = approvalWorkflows.at(0)?.approvers.at(0);
                 expect(firstApprover?.email).toBe('1@example.com');
@@ -2017,14 +2587,30 @@ describe('WorkflowUtils', () => {
             it('Should round-trip a limited first approver back into the same workflow', () => {
                 const workflow: ApprovalWorkflow = {
                     members: [buildMember(2)],
-                    approvers: [buildApprover(1, {approvalLimit: 10000, overLimitForwardsTo: '3@example.com'}), buildApprover(4)],
+                    approvers: [
+                        buildApprover(1, {
+                            approvalLimit: 10000,
+                            overLimitForwardsTo: '3@example.com',
+                        }),
+                        buildApprover(4),
+                    ],
                     isDefault: false,
                 };
                 const rules = keyRules(buildApprovalWorkflowRules(workflow));
-                const employees: PolicyEmployeeList = {'2@example.com': {email: '2@example.com', submitsTo: '1@example.com'}};
+                const employees: PolicyEmployeeList = {
+                    '2@example.com': {
+                        email: '2@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                };
                 const policy = createPolicy(employees, '1@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 const approvers = approvalWorkflows.at(0)?.approvers ?? [];
                 expect(approvers.map((approver) => approver.email)).toEqual(['1@example.com', '4@example.com']);
@@ -2038,12 +2624,23 @@ describe('WorkflowUtils', () => {
                 // chain whose rules declare it is the default. The other must render as its own workflow.
                 const rules = keyRules([...buildApprovalWorkflowRules(buildWorkflow([5], [1], {isDefault: true})), ...buildApprovalWorkflowRules(buildWorkflow([6], [1, 2]))]);
                 const employees: PolicyEmployeeList = {
-                    '5@example.com': {email: '5@example.com', submitsTo: '1@example.com'},
-                    '6@example.com': {email: '6@example.com', submitsTo: '1@example.com'},
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '6@example.com': {
+                        email: '6@example.com',
+                        submitsTo: '1@example.com',
+                    },
                 };
                 const policy = createPolicy(employees, '1@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 expect(approvalWorkflows).toHaveLength(2);
                 expect(approvalWorkflows.filter((workflow) => workflow.isDefault)).toHaveLength(1);
@@ -2060,16 +2657,39 @@ describe('WorkflowUtils', () => {
             it('Should not treat an unmarked rule-based chain as the default just because it starts at the default approver', () => {
                 // The default workflow still lives in `employeeList`, and 6 has a rule-based chain that starts at
                 // the same approver but splits on an approval limit. Only the employeeList chain is the default.
-                const limitedApprover = buildApprover(1, {approvalLimit: 100, overLimitForwardsTo: '2@example.com'});
-                const rules = keyRules(buildApprovalWorkflowRules({members: [buildMember(6)], approvers: [limitedApprover], isDefault: false}));
+                const limitedApprover = buildApprover(1, {
+                    approvalLimit: 100,
+                    overLimitForwardsTo: '2@example.com',
+                });
+                const rules = keyRules(
+                    buildApprovalWorkflowRules({
+                        members: [buildMember(6)],
+                        approvers: [limitedApprover],
+                        isDefault: false,
+                    }),
+                );
                 const employees: PolicyEmployeeList = {
-                    '5@example.com': {email: '5@example.com', submitsTo: '1@example.com'},
-                    '6@example.com': {email: '6@example.com', submitsTo: '1@example.com'},
-                    '1@example.com': {email: '1@example.com', submitsTo: '1@example.com'},
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '6@example.com': {
+                        email: '6@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '1@example.com': {
+                        email: '1@example.com',
+                        submitsTo: '1@example.com',
+                    },
                 };
                 const policy = createPolicy(employees, '1@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 expect(approvalWorkflows.filter((workflow) => workflow.isDefault)).toHaveLength(1);
 
@@ -2085,10 +2705,20 @@ describe('WorkflowUtils', () => {
             it('Should fall back to the default approver when no rule declares itself the default workflow', () => {
                 // Policies whose default workflow has never been saved through the rules backend have no such rule.
                 const rules = keyRules(buildApprovalWorkflowRules(buildWorkflow([5], [1])));
-                const employees: PolicyEmployeeList = {'5@example.com': {email: '5@example.com', submitsTo: '1@example.com'}};
+                const employees: PolicyEmployeeList = {
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                };
                 const policy = createPolicy(employees, '1@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 expect(approvalWorkflows).toHaveLength(1);
                 expect(approvalWorkflows.at(0)?.isDefault).toBe(true);
@@ -2098,10 +2728,20 @@ describe('WorkflowUtils', () => {
                 // Built as the default workflow so its rules declare themselves default, which the rebuilt rules
                 // must reproduce for the round-trip to be lossless.
                 const rules = keyRules(buildApprovalWorkflowRules(buildWorkflow([5], [1, 2], {isDefault: true})));
-                const employees: PolicyEmployeeList = {'5@example.com': {email: '5@example.com', submitsTo: '1@example.com'}};
+                const employees: PolicyEmployeeList = {
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                };
                 const policy = createPolicy(employees, '1@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 // Rebuilding rules from the reconstructed workflow should reproduce the original rule set.
                 const workflow = approvalWorkflows.at(0);
@@ -2115,21 +2755,57 @@ describe('WorkflowUtils', () => {
                 // Two workflows that both route to approver 1, but stored under distinct ruleIDs (e.g. created
                 // before the other one's rules were cached). They must still render as a single workflow card.
                 const rules: Record<string, ApprovalWorkflowRule> = {
-                    subAB: {triggers: submitTriggers, filters: buildFromFilter(['2@example.com', '3@example.com']), actions: forwardActions('1@example.com')},
-                    appAB: {triggers: approveTriggers, filters: and(buildFromFilter(['2@example.com', '3@example.com']), buildToFilter('1@example.com')), actions: approveActions},
-                    subD: {triggers: submitTriggers, filters: buildFromFilter(['4@example.com']), actions: forwardActions('1@example.com')},
-                    appD: {triggers: approveTriggers, filters: and(buildFromFilter(['4@example.com']), buildToFilter('1@example.com')), actions: approveActions},
+                    subAB: {
+                        triggers: submitTriggers,
+                        filters: buildFromFilter(['2@example.com', '3@example.com']),
+                        actions: forwardActions('1@example.com'),
+                    },
+                    appAB: {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['2@example.com', '3@example.com']), buildToFilter('1@example.com')),
+                        actions: approveActions,
+                    },
+                    subD: {
+                        triggers: submitTriggers,
+                        filters: buildFromFilter(['4@example.com']),
+                        actions: forwardActions('1@example.com'),
+                    },
+                    appD: {
+                        triggers: approveTriggers,
+                        filters: and(buildFromFilter(['4@example.com']), buildToFilter('1@example.com')),
+                        actions: approveActions,
+                    },
                 };
                 const employees: PolicyEmployeeList = {
-                    '1@example.com': {email: '1@example.com', submitsTo: '9@example.com'},
-                    '2@example.com': {email: '2@example.com', submitsTo: '1@example.com'},
-                    '3@example.com': {email: '3@example.com', submitsTo: '1@example.com'},
-                    '4@example.com': {email: '4@example.com', submitsTo: '1@example.com'},
-                    '9@example.com': {email: '9@example.com', submitsTo: '9@example.com'},
+                    '1@example.com': {
+                        email: '1@example.com',
+                        submitsTo: '9@example.com',
+                    },
+                    '2@example.com': {
+                        email: '2@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '3@example.com': {
+                        email: '3@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '4@example.com': {
+                        email: '4@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '9@example.com': {
+                        email: '9@example.com',
+                        submitsTo: '9@example.com',
+                    },
                 };
                 const policy = createPolicy(employees, '9@example.com');
 
-                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({policy, personalDetails, localeCompare, rules});
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
 
                 const workflowsToApprover1 = approvalWorkflows.filter((workflow) => workflow.approvers.at(0)?.email === '1@example.com');
                 expect(workflowsToApprover1).toHaveLength(1);
@@ -2140,16 +2816,135 @@ describe('WorkflowUtils', () => {
                         .sort(),
                 ).toEqual(['2@example.com', '3@example.com', '4@example.com']);
             });
+
+            it('Should keep members that employeeList routes down another chain out of the rule-based default workflow', () => {
+                // Given a default workflow whose rules route 5 to approver 1, while employeeList still names approver 2, who
+                // forwards to 3, as the default approver. No rule covers 2 or 6, so employeeList routes them to 2, then 3.
+                const rules = keyRules(buildApprovalWorkflowRules(buildWorkflow([5], [1], {isDefault: true})));
+                const employees: PolicyEmployeeList = {
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '2@example.com',
+                    },
+                    '2@example.com': {
+                        email: '2@example.com',
+                        submitsTo: '2@example.com',
+                        forwardsTo: '3@example.com',
+                    },
+                    '6@example.com': {
+                        email: '6@example.com',
+                        submitsTo: '2@example.com',
+                    },
+                };
+                const policy = createPolicy(employees, '2@example.com');
+
+                // When the rules are turned into the workflows the Workflows page shows
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
+
+                // Then only the rule-based chain is the default workflow. Deleting a workflow writes its members into the
+                // default workflow's chain, so a second default would let that write the employeeList chain as another default.
+                const defaultWorkflows = approvalWorkflows.filter((workflow) => workflow.isDefault);
+                expect(defaultWorkflows).toHaveLength(1);
+                expect(defaultWorkflows.at(0)?.approvers.map((approver) => approver.email)).toEqual(['1@example.com']);
+                expect(defaultWorkflows.at(0)?.members.map((member) => member.email)).toEqual(['5@example.com']);
+
+                const employeeListWorkflow = approvalWorkflows.find((workflow) => !workflow.isDefault);
+                expect(employeeListWorkflow?.approvers.map((approver) => approver.email)).toEqual(['2@example.com', '3@example.com']);
+                expect(employeeListWorkflow?.members.map((member) => member.email)).toEqual(['2@example.com', '6@example.com']);
+            });
+
+            it('Should show members that employeeList routes down the default chain in the rule-based default workflow', () => {
+                // Given a default workflow whose rules route 5 to approver 1, and 1 and 6, whom no rule covers, submitting to
+                // that same approver through employeeList. Their reports take the same route.
+                const rules = keyRules(buildApprovalWorkflowRules(buildWorkflow([5], [1], {isDefault: true})));
+                const employees: PolicyEmployeeList = {
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '6@example.com': {
+                        email: '6@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                    '1@example.com': {
+                        email: '1@example.com',
+                        submitsTo: '1@example.com',
+                    },
+                };
+                const policy = createPolicy(employees, '1@example.com');
+
+                // When the rules are turned into the workflows the Workflows page shows
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
+
+                // Then 1 and 6 are listed in the default workflow rather than in a second default workflow with the same approver
+                expect(approvalWorkflows).toHaveLength(1);
+                expect(approvalWorkflows.at(0)?.isDefault).toBe(true);
+                expect(approvalWorkflows.at(0)?.members.map((member) => member.email)).toEqual(['5@example.com', '6@example.com', '1@example.com']);
+            });
+
+            it('Should keep a single default workflow when the rules declare two', () => {
+                // Given rules that declare two different default chains, the way a policy looks once a second set of default
+                // rules was written next to the first. The policy's default approver is 2.
+                const rules = keyRules([
+                    ...buildApprovalWorkflowRules(buildWorkflow([5], [1], {isDefault: true})),
+                    ...buildApprovalWorkflowRules(buildWorkflow([6], [2, 3], {isDefault: true})),
+                ]);
+                const employees: PolicyEmployeeList = {
+                    '5@example.com': {
+                        email: '5@example.com',
+                        submitsTo: '2@example.com',
+                    },
+                    '6@example.com': {
+                        email: '6@example.com',
+                        submitsTo: '2@example.com',
+                    },
+                };
+                const policy = createPolicy(employees, '2@example.com');
+
+                // When the rules are turned into the workflows the Workflows page shows
+                const {approvalWorkflows} = convertApprovalWorkflowRulesToWorkflows({
+                    policy,
+                    personalDetails,
+                    localeCompare,
+                    rules,
+                });
+
+                // Then the chain starting at the default approver stays the default, and the other one is shown as a workflow
+                // of its own, so deleting it sends its members to the default workflow
+                const defaultWorkflows = approvalWorkflows.filter((workflow) => workflow.isDefault);
+                expect(defaultWorkflows).toHaveLength(1);
+                expect(defaultWorkflows.at(0)?.approvers.map((approver) => approver.email)).toEqual(['2@example.com', '3@example.com']);
+                expect(approvalWorkflows.find((workflow) => !workflow.isDefault)?.members.map((member) => member.email)).toEqual(['5@example.com']);
+            });
         });
     });
 
     describe('filterRulesForPolicy', () => {
-        const ruleForPolicy = (scopeID: string, extra: Partial<Rule> = {}): Rule => ({
+        const ruleForPolicy = (scopeID: string, extra: Partial<Omit<Rule, 'actions' | 'filters' | 'triggers'>> = {}): Rule => ({
             scope: CONST.RULES.SCOPE.POLICY,
             scopeID,
-            triggers: {'1': CONST.RULES.APPROVAL_WORKFLOW.TRIGGER.REPORT_SUBMIT},
-            filters: {operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, right: 'a@example.com'},
-            actions: {'1': {name: CONST.RULES.APPROVAL_WORKFLOW.ACTION.FORWARD_TO, approver: 'b@example.com'}},
+            triggers: {'1': CONST.RULES.TRIGGERS.REPORT_SUBMIT},
+            filters: {
+                operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO,
+                left: CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM,
+                right: 'a@example.com',
+            },
+            actions: {
+                '1': {
+                    name: CONST.RULES.ACTIONS.FORWARD_TO,
+                    approver: 'b@example.com',
+                },
+            },
             ...extra,
         });
 
@@ -2158,11 +2953,15 @@ describe('WorkflowUtils', () => {
             const collection = {rules_1: mine, rules_2: ruleForPolicy('policy2')};
 
             // The value is passed through by reference so callers still see the full rule.
-            expect(filterRulesForPolicy(collection, 'policy1')).toEqual({rules_1: mine});
+            expect(filterRulesForPolicy(collection, 'policy1')).toEqual({
+                rules_1: mine,
+            });
         });
 
         it('keeps rules pending deletion, leaving that decision to the caller', () => {
-            const pendingDelete = ruleForPolicy('policy1', {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE});
+            const pendingDelete = ruleForPolicy('policy1', {
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+            });
 
             expect(filterRulesForPolicy({rules_1: pendingDelete}, 'policy1')).toEqual({rules_1: pendingDelete});
         });
@@ -2215,8 +3014,20 @@ describe('WorkflowUtils', () => {
                 const policy = createMock<Policy>({
                     id: POLICY_ID,
                     connections: {
-                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_HR]: {config: {integration: 'workday', approvalMode: CONST.MERGE.APPROVAL_MODE.CUSTOM, groups: []}},
-                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_ATS]: {config: {integration: 'greenhouse', approvalMode: CONST.MERGE.APPROVAL_MODE.BASIC, filters: null}},
+                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_HR]: {
+                            config: {
+                                integration: 'workday',
+                                approvalMode: CONST.MERGE.APPROVAL_MODE.CUSTOM,
+                                groups: [],
+                            },
+                        },
+                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_ATS]: {
+                            config: {
+                                integration: 'greenhouse',
+                                approvalMode: CONST.MERGE.APPROVAL_MODE.BASIC,
+                                filters: null,
+                            },
+                        },
                     },
                 });
 
@@ -2247,8 +3058,20 @@ describe('WorkflowUtils', () => {
                 const policy = createMock<Policy>({
                     id: POLICY_ID,
                     connections: {
-                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_HR]: {config: {integration: 'workday', approvalMode: CONST.MERGE.APPROVAL_MODE.CUSTOM, groups: []}},
-                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_ATS]: {config: {integration: 'greenhouse', approvalMode: CONST.MERGE.APPROVAL_MODE.BASIC, filters: null}},
+                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_HR]: {
+                            config: {
+                                integration: 'workday',
+                                approvalMode: CONST.MERGE.APPROVAL_MODE.CUSTOM,
+                                groups: [],
+                            },
+                        },
+                        [CONST.POLICY.CONNECTIONS.NAME.MERGE_ATS]: {
+                            config: {
+                                integration: 'greenhouse',
+                                approvalMode: CONST.MERGE.APPROVAL_MODE.BASIC,
+                                filters: null,
+                            },
+                        },
                     },
                 });
 
diff --git a/tests/unit/__snapshots__/ReportAlternateTextParityTest.ts.snap b/tests/unit/__snapshots__/ReportAlternateTextParityTest.ts.snap
index 9f9a4f2009d2..3f82d7559cfd 100644
--- a/tests/unit/__snapshots__/ReportAlternateTextParityTest.ts.snap
+++ b/tests/unit/__snapshots__/ReportAlternateTextParityTest.ts.snap
@@ -288,6 +288,8 @@ exports[`getOptionData alternateText parity snapshots special-action chain branc
 
 exports[`getOptionData alternateText parity snapshots special-action chain branches (policy room) TASKCOMPLETED 1`] = `"marked as complete"`;
 
+exports[`getOptionData alternateText parity snapshots special-action chain branches (policy room) UNDELETEDTRANSACTION 1`] = `"undeleted this expense"`;
+
 exports[`getOptionData alternateText parity snapshots special-action chain branches (policy room) UNREPORTEDTRANSACTION 1`] = `"moved this expense from another report"`;
 
 exports[`getOptionData alternateText parity snapshots special-action chain branches (policy room) UPDATEROOMAVATAR 1`] = `"removed the room avatar"`;
diff --git a/tests/unit/accountSizeTierTest.ts b/tests/unit/accountSizeTierTest.ts
new file mode 100644
index 000000000000..64535ced1992
--- /dev/null
+++ b/tests/unit/accountSizeTierTest.ts
@@ -0,0 +1,43 @@
+import getAccountSizeTier from '@libs/telemetry/accountSizeTier';
+
+import CONST from '@src/CONST';
+
+type AccountSizeTag = Parameters<typeof getAccountSizeTier>[0];
+
+const {SMALL, MEDIUM, LARGE, XLARGE} = CONST.TELEMETRY.SIZE_TIER;
+const TIERS = [SMALL, MEDIUM, LARGE, XLARGE];
+
+// Kept in sync with the border table by hand on purpose, so an accidental edit to a literal fails a test
+const BORDERS: Array<[AccountSizeTag, number[]]> = [
+    [CONST.TELEMETRY.TAGS.REPORTS_COUNT, [25, 250, 1000]],
+    [CONST.TELEMETRY.TAGS.TRANSACTIONS_COUNT, [25, 250, 1000]],
+    [CONST.TELEMETRY.TAGS.PERSONAL_DETAILS_COUNT, [100, 1000]],
+    [CONST.TELEMETRY.TAGS.POLICIES_COUNT, [1, 2, 10]],
+    [CONST.TELEMETRY.TAGS.DB_SIZE, [5_000_000, 20_000_000, 50_000_000]],
+];
+
+describe('getAccountSizeTier', () => {
+    describe.each(BORDERS)('%s', (tag, borders) => {
+        it('puts 0 in the small tier', () => {
+            expect(getAccountSizeTier(tag, 0)).toBe(SMALL);
+        });
+
+        it.each(borders.map((border, index) => [border, TIERS.at(index)]))('keeps %d in its own tier because borders are inclusive upper bounds', (border, tier) => {
+            expect(getAccountSizeTier(tag, border)).toBe(tier);
+        });
+
+        it.each(borders.map((border, index) => [border + 1, TIERS.at(index + 1)]))('moves %d into the next tier', (value, tier) => {
+            expect(getAccountSizeTier(tag, value)).toBe(tier);
+        });
+    });
+
+    it('stops at large for a tag with two borders', () => {
+        // Personal details has two borders, so even the biggest account stays in large and the tag never emits a tier that has no border behind it
+        expect(getAccountSizeTier(CONST.TELEMETRY.TAGS.PERSONAL_DETAILS_COUNT, 48_000)).toBe(LARGE);
+    });
+
+    it('sorts alphabetically in size order', () => {
+        // Sentry sorts tag values alphabetically in group-by tables and filters, which is what the numeric prefix is for
+        expect([XLARGE, SMALL, LARGE, MEDIUM].sort()).toEqual([SMALL, MEDIUM, LARGE, XLARGE]);
+    });
+});
diff --git a/tests/unit/actionLayerNavigationGuardTest.ts b/tests/unit/actionLayerNavigationGuardTest.ts
index f7b99adfbf93..55f34565dff7 100644
--- a/tests/unit/actionLayerNavigationGuardTest.ts
+++ b/tests/unit/actionLayerNavigationGuardTest.ts
@@ -4,8 +4,6 @@ import path from 'path';
 /**
  * Architecture guard for issue #84631: navigation belongs in the view layer, not in `src/libs/actions/`.
  * `submitWithDismissFirst` is the view-layer dismiss-first orchestrator; no action file may import it.
- * (PR 9 will additionally enforce this via an ESLint `no-restricted-imports` rule once the legacy
- * `NavigationHelpers.ts` value-imports of the other view helpers are removed.)
  */
 const ACTIONS_DIR = path.join(__dirname, '..', '..', 'src', 'libs', 'actions');
 const FORBIDDEN_IMPORT = '@libs/Navigation/helpers/submitWithDismissFirst';
diff --git a/tests/unit/calculateSuperWideRHPWidthTest.ts b/tests/unit/calculateSuperWideRHPWidthTest.ts
index 12c8badcd521..90d27ad9ae9b 100644
--- a/tests/unit/calculateSuperWideRHPWidthTest.ts
+++ b/tests/unit/calculateSuperWideRHPWidthTest.ts
@@ -1,9 +1,9 @@
+import calculateMaxSidePanelRHPShrink from '@libs/Navigation/helpers/calculateMaxSidePanelRHPShrink';
 import calculateSuperWideRHPWidth from '@libs/Navigation/helpers/calculateSuperWideRHPWidth';
+import calculateWideRHPWidth from '@libs/Navigation/helpers/calculateWideRHPWidth';
 
-// jest-expo resolves `.native` files by default (defaultPlatform 'ios'), but the super wide RHP is a
-// web/desktop-only layout whose native stubs are intentional no-ops. Force the web `index.ts` (and the
-// receipt pane width it depends on) so these tests exercise the real width math (same pattern as
-// resetOnboardingStackToRootTest).
+// jest-expo resolves bare specifiers to index.native.ts (defaultPlatform 'ios'), so the web index.ts is loaded explicitly, same pattern as resetOnboardingStackToRootTest.
+// requireActual hands back an untyped module, which is what each no-unsafe-return below is silencing.
 jest.mock('@libs/Navigation/helpers/calculateSuperWideRHPWidth', () =>
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     jest.requireActual('@libs/Navigation/helpers/calculateSuperWideRHPWidth/index.ts'),
@@ -12,43 +12,100 @@ jest.mock('@libs/Navigation/helpers/calculateReceiptPaneRHPWidth', () =>
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     jest.requireActual('@libs/Navigation/helpers/calculateReceiptPaneRHPWidth/index.ts'),
 );
+jest.mock('@libs/Navigation/helpers/calculateMaxSidePanelRHPShrink', () =>
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    jest.requireActual('@libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.ts'),
+);
 
-// The expected widths below are pinned to concrete pixels rather than recomputed from variables, so any
-// change to superWideRHPLeftMargin (147), sideBarWidth (375), receiptPaneRHPMaxWidth (465) or
-// sidePanelWidth (375) forces a deliberate, visible update here instead of silently tracking the value.
+// Widths are pinned to concrete pixels so a change to any of the underlying variables forces a visible update here.
 describe('calculateSuperWideRHPWidth', () => {
-    it('leaves the configured 147px left margin on a wide window', () => {
-        // 1440 - 147 (superWideRHPLeftMargin) = 1293.
-        expect(calculateSuperWideRHPWidth(1440)).toBe(1293);
-        // The sheet is anchored to the right edge, so its left edge sits at windowWidth - width = 147.
-        expect(1440 - calculateSuperWideRHPWidth(1440)).toBe(147);
+    it('leaves the configured 360px left margin on a wide window', () => {
+        // Given a 1440px desktop window, wide enough for the LHN and the widest sheet side by side
+        const windowWidth = 1440;
+
+        // When the super wide RHP width is calculated
+        const superWideRHPWidth = calculateSuperWideRHPWidth(windowWidth);
+
+        // Then the sheet takes everything right of the 360px left margin, which is what keeps the LHN readable beside it.
+        expect(superWideRHPWidth).toBe(1080);
+        expect(windowWidth - superWideRHPWidth).toBe(360);
     });
 
     it('never shrinks below the wide RHP width', () => {
-        // At 900px the raw super wide width (900 - 147 = 753) would fall under the wide RHP floor
-        // (sideBarWidth 375 + receiptPaneRHPMaxWidth 465 = 840), so the floor wins.
-        expect(calculateSuperWideRHPWidth(900)).toBe(840);
+        // Given a 900px window, too narrow for windowWidth - 360 to hold a report and its receipt pane side by side
+        const windowWidth = 900;
+
+        // When the super wide RHP width is calculated
+        const superWideRHPWidth = calculateSuperWideRHPWidth(windowWidth);
+
+        // Then the wide RHP floor wins over the raw 900 - 360 = 540, so the sheet is never narrower than the layout it shows.
+        // The floor is the window less the floating card's 12px margin and 2px of border, which is what keeps the card's left edge on-screen.
+        expect(superWideRHPWidth).toBe(886);
+    });
+
+    it('keeps the floating card fully on-screen on every wide layout width', () => {
+        // Given every window width between the narrow layout breakpoint and where the Side Panel starts docking
+        const windowWidths = Array.from({length: 500}, (_, index) => 801 + index);
+
+        // When the left edge of the wide and super wide cards is measured as the window less the right margin, the border and the card width
+        const cardLeftEdges = windowWidths.flatMap((windowWidth) =>
+            [calculateWideRHPWidth(windowWidth), calculateSuperWideRHPWidth(windowWidth)].map((cardWidth) => windowWidth - 12 - 2 - cardWidth),
+        );
+
+        // Then no width pushes it off the left of the window, which is what regressed at 801-811 when only part of the inset was charged.
+        expect(cardLeftEdges.filter((cardLeftEdge) => cardLeftEdge < 0)).toEqual([]);
+        expect(cardLeftEdges.at(0)).toBe(0);
     });
 
     it('pins the exact window width where the wide RHP floor takes over', () => {
-        // The floor (840) equals the raw super wide width when windowWidth - 147 = 840, i.e. at 987.
-        expect(calculateSuperWideRHPWidth(986)).toBe(840); // 986 - 147 = 839, floored to 840
-        expect(calculateSuperWideRHPWidth(987)).toBe(840); // 987 - 147 = 840, boundary
-        expect(calculateSuperWideRHPWidth(988)).toBe(841); // 988 - 147 = 841, super wide wins
+        // Given windows around the point where windowWidth - 360 equals the 925px wide RHP floor, at 1285
+        const windowWidths = [1284, 1285, 1286];
+
+        // When the super wide RHP width is calculated for each of them
+        const superWideRHPWidths = windowWidths.map((windowWidth) => calculateSuperWideRHPWidth(windowWidth));
+
+        // Then the floor holds the two narrower windows and the raw width takes over at 1286, so a change to either side of the comparison shows up here.
+        expect(superWideRHPWidths).toEqual([925, 925, 926]);
     });
 
     describe('regression: Concierge/Help Side Panel open (https://github.com/Expensify/App/issues/99035)', () => {
-        it('shrinks by the Side Panel width so the sheet left edge stays at 147px', () => {
-            // The Side Panel (375px) shifts the whole RHP left by its width, so the super wide sheet is
-            // shrunk by the same amount to keep its right-anchored left edge on-screen.
+        it('shrinks by the Side Panel width down to the spare room above the wide RHP width', () => {
+            // Given a 1440px window with the 375px Concierge Side Panel open, which shifts the whole RHP left by its width
             const windowWidth = 1440;
             const sidePanelWidth = 375;
-            const shrunkWidth = calculateSuperWideRHPWidth(windowWidth) - sidePanelWidth;
 
-            // 1293 - 375 = 918, still wider than the 840 wide RHP floor.
-            expect(shrunkWidth).toBe(918);
-            // Right-anchored inside (windowWidth - sidePanelWidth): left edge = 1440 - 375 - 918 = 147.
-            expect(windowWidth - sidePanelWidth - shrunkWidth).toBe(147);
+            // When the sheet gives up room to the panel, capped at the spare room above the wide RHP width
+            const shrink = Math.min(sidePanelWidth, calculateMaxSidePanelRHPShrink(windowWidth));
+
+            // Then it keeps 925 rather than 1080 - 375 = 705, because a tighter box cuts the receipt pane off.
+            expect(calculateSuperWideRHPWidth(windowWidth) - shrink).toBe(925);
+        });
+
+        it('leaves no spare room once the wide RHP floor takes over', () => {
+            // Given a 1285px window, where the sheet is already sitting exactly on the wide RHP floor
+            const windowWidth = 1285;
+
+            // When the Side Panel asks how much of the sheet it may take
+            const shrink = calculateMaxSidePanelRHPShrink(windowWidth);
+
+            // Then nothing is left to give, and the capped shrink at 1440 lands on the wide RHP width, so the panel can never make the card too narrow for its panes.
+            expect(shrink).toBe(0);
+            expect(calculateSuperWideRHPWidth(1440) - calculateMaxSidePanelRHPShrink(1440)).toBe(calculateWideRHPWidth(1440));
+        });
+    });
+
+    describe('regression: native platforms (https://github.com/Expensify/App/issues/99035)', () => {
+        it('reports no spare room so the Side Panel shrink stays a number', () => {
+            // Given native, where the super wide RHP does not exist and the web width helpers it builds on are no-ops
+            const calculateMaxSidePanelRHPShrinkNative = jest.requireActual<{default: (windowWidth: number) => number}>(
+                '@libs/Navigation/helpers/calculateMaxSidePanelRHPShrink/index.native.ts',
+            ).default;
+
+            // When the Side Panel asks how much of the sheet it may take
+            const shrink = calculateMaxSidePanelRHPShrinkNative(1440);
+
+            // Then it is 0 rather than NaN, because the shrink feeds an animated inputRange and NaN there takes the whole RHP down on iOS.
+            expect(shrink).toBe(0);
         });
     });
 });
diff --git a/tests/unit/canEditFieldOfMoneyRequestTest.ts b/tests/unit/canEditFieldOfMoneyRequestTest.ts
index f01c9f8dc747..f0ac18b0bf68 100644
--- a/tests/unit/canEditFieldOfMoneyRequestTest.ts
+++ b/tests/unit/canEditFieldOfMoneyRequestTest.ts
@@ -115,6 +115,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     outstandingReportsByPolicyID,
                     transaction: moneyRequestTransaction,
+                    reportNameValuePairs: undefined,
                 });
                 expect(canEditReportField).toBe(false);
             });
@@ -130,6 +131,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     outstandingReportsByPolicyID,
                     transaction: moneyRequestTransaction,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReportField).toBe(true);
@@ -142,12 +144,24 @@ describe('canEditFieldOfMoneyRequest', () => {
                 });
                 await waitForBatchedUpdates();
 
-                const canEditBillable = canEditFieldOfMoneyRequest({reportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.BILLABLE, transaction: moneyRequestTransaction, rules: undefined});
+                const canEditBillable = canEditFieldOfMoneyRequest({
+                    reportAction,
+                    fieldToEdit: CONST.EDIT_REQUEST_FIELD.BILLABLE,
+                    transaction: moneyRequestTransaction,
+                    rules: undefined,
+                    reportNameValuePairs: undefined,
+                });
                 expect(canEditBillable).toBe(false);
             });
 
             it('should return true for invoice report action when billable field is edited on an unapproved invoice report', () => {
-                const canEditBillable = canEditFieldOfMoneyRequest({reportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.BILLABLE, transaction: moneyRequestTransaction, rules: undefined});
+                const canEditBillable = canEditFieldOfMoneyRequest({
+                    reportAction,
+                    fieldToEdit: CONST.EDIT_REQUEST_FIELD.BILLABLE,
+                    transaction: moneyRequestTransaction,
+                    rules: undefined,
+                    reportNameValuePairs: undefined,
+                });
                 expect(canEditBillable).toBe(true);
             });
         });
@@ -246,12 +260,19 @@ describe('canEditFieldOfMoneyRequest', () => {
 
                 // If it is the submitter of a distance request
                 const distanceTransaction = {...moneyRequestTransaction, iouRequestType: CONST.IOU.REQUEST_TYPE.DISTANCE};
-                const canEditReportFieldAmount = canEditFieldOfMoneyRequest({reportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.AMOUNT, transaction: distanceTransaction, rules: undefined});
+                const canEditReportFieldAmount = canEditFieldOfMoneyRequest({
+                    reportAction,
+                    fieldToEdit: CONST.EDIT_REQUEST_FIELD.AMOUNT,
+                    transaction: distanceTransaction,
+                    rules: undefined,
+                    reportNameValuePairs: undefined,
+                });
                 const canEditReportFieldCurrency = canEditFieldOfMoneyRequest({
                     reportAction,
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.CURRENCY,
                     transaction: distanceTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 // Then we should allow editing amount and currency fields.
@@ -281,12 +302,43 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     outstandingReportsByPolicyID,
                     transaction: moneyRequestTransaction,
+                    reportNameValuePairs: undefined,
                 });
 
                 // Then they should be able to move the expense since there are multiple outstanding expense reports
                 expect(canEditReportField).toBe(true);
             });
 
+            it('should return false when the expense report is archived', async () => {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${IOUReportID}`, expenseReport);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${EXPENSE_OUTSTANDING_REPORT_1_ID}`, outstandingExpenseReport1);
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${EXPENSE_OUTSTANDING_REPORT_2_ID}`, outstandingExpenseReport2);
+                await Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, expensePolicy);
+                await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+                    [currentUserAccountID]: {
+                        accountID: currentUserAccountID,
+                        login: currentUserEmail,
+                    },
+                });
+                await waitForBatchedUpdates();
+                const outstandingReportsByPolicyID = await OnyxUtils.get(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID);
+
+                const canEditReportField = canEditFieldOfMoneyRequest({
+                    rules: undefined,
+                    reportAction,
+                    fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
+                    outstandingReportsByPolicyID,
+                    transaction: moneyRequestTransaction,
+                    reportNameValuePairs: {
+                        [`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${IOUReportID}`]: {
+                            private_isArchived: 'true',
+                        },
+                    },
+                });
+
+                expect(canEditReportField).toBe(false);
+            });
+
             it('should return false when the current user is not the submitter or admin and the report is open', async () => {
                 // Given that there are outstanding expense reports but the current user is not the submitter
                 const nonSubmitterExpenseReport = {
@@ -309,6 +361,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     outstandingReportsByPolicyID,
                     transaction: moneyRequestTransaction,
+                    reportNameValuePairs: undefined,
                 });
 
                 // Then they should not be able to move the expense since only the submitter or admin can edit the report when the report is open
@@ -343,6 +396,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     outstandingReportsByPolicyID,
                     transaction: moneyRequestTransaction,
+                    reportNameValuePairs: undefined,
                 });
 
                 // Then they should not be able to move the expense since there's only one outstanding report
@@ -364,6 +418,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     outstandingReportsByPolicyID,
                     transaction: moneyRequestTransaction,
+                    reportNameValuePairs: undefined,
                 });
 
                 // Then they should be able to move the expense since there are multiple outstanding expense reports
@@ -432,6 +487,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     transaction: dewTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReceipt).toBe(false);
@@ -460,6 +516,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     transaction: dewTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReceipt).toBe(true);
@@ -492,6 +549,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     transaction: dewTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReceipt).toBe(true);
@@ -521,6 +579,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     isDeleteAction: true,
                     transaction: dewTransaction,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canDeleteReceipt).toBe(true);
@@ -561,6 +620,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     isDeleteAction: true,
                     transaction: dewTransaction,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canDeleteReceipt).toBe(false);
@@ -634,6 +694,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     transaction: approvedTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReceipt).toBe(true);
@@ -647,6 +708,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     transaction: approvedTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReceipt).toBe(false);
@@ -664,6 +726,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     transaction: approvedTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReceipt).toBe(false);
@@ -678,6 +741,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     isDeleteAction: true,
                     transaction: approvedTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canDeleteReceipt).toBe(false);
@@ -694,6 +758,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
                     transaction: approvedTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReceipt).toBe(false);
@@ -712,7 +777,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                 ];
 
                 for (const fieldToEdit of restrictedFields) {
-                    expect(canEditFieldOfMoneyRequest({reportAction, fieldToEdit, transaction: approvedTransaction, rules: undefined})).toBe(false);
+                    expect(canEditFieldOfMoneyRequest({reportAction, fieldToEdit, transaction: approvedTransaction, rules: undefined, reportNameValuePairs: undefined})).toBe(false);
                 }
             });
         });
@@ -779,6 +844,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     reportAction: undefined,
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     transaction: legacyTransaction,
+                    reportNameValuePairs: undefined,
                 });
                 expect(canEditReportField).toBe(true);
             });
@@ -793,6 +859,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     reportAction: undefined,
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     transaction: legacyPerDiemTransaction,
+                    reportNameValuePairs: undefined,
                 });
                 expect(canEditReportField).toBe(true);
             });
@@ -807,6 +874,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     reportAction: undefined,
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     transaction: legacyPerDiemTransaction,
+                    reportNameValuePairs: undefined,
                 });
                 expect(canEditReportField).toBe(false);
             });
@@ -817,6 +885,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     reportAction: undefined,
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.DESCRIPTION,
                     transaction: legacyTransaction,
+                    reportNameValuePairs: undefined,
                 });
                 expect(canEditDescription).toBe(false);
             });
@@ -908,6 +977,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     transaction: perDiemTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReportField).toBe(true);
@@ -926,6 +996,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                     fieldToEdit: CONST.EDIT_REQUEST_FIELD.REPORT,
                     transaction: perDiemTransaction,
                     rules: undefined,
+                    reportNameValuePairs: undefined,
                 });
 
                 expect(canEditReportField).toBe(false);
@@ -1007,7 +1078,13 @@ describe('canEditFieldOfMoneyRequest', () => {
             await waitForBatchedUpdates();
 
             // When the admin tries to edit the receipt field
-            const canEditReceipt = canEditFieldOfMoneyRequest({reportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT, transaction: moneyRequestTransaction, rules: undefined});
+            const canEditReceipt = canEditFieldOfMoneyRequest({
+                reportAction,
+                fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
+                transaction: moneyRequestTransaction,
+                rules: undefined,
+                reportNameValuePairs: undefined,
+            });
 
             // Then they should not be able to edit the receipt on a closed report
             expect(canEditReceipt).toBe(false);
@@ -1028,7 +1105,13 @@ describe('canEditFieldOfMoneyRequest', () => {
             await waitForBatchedUpdates();
 
             // When the admin tries to edit the receipt field
-            const canEditReceipt = canEditFieldOfMoneyRequest({reportAction, fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT, transaction: moneyRequestTransaction, rules: undefined});
+            const canEditReceipt = canEditFieldOfMoneyRequest({
+                reportAction,
+                fieldToEdit: CONST.EDIT_REQUEST_FIELD.RECEIPT,
+                transaction: moneyRequestTransaction,
+                rules: undefined,
+                reportNameValuePairs: undefined,
+            });
 
             // Then they should be able to edit the receipt on an open report
             expect(canEditReceipt).toBe(true);
@@ -1124,6 +1207,7 @@ describe('canEditFieldOfMoneyRequest', () => {
                 policy: corporatePolicy,
                 reportActions,
                 rules: undefined,
+                reportNameValuePairs: undefined,
             });
 
         it('should let the submitter edit a restricted field when the passed reportActions show no forward since the last submit', () => {
diff --git a/tests/unit/components/Avatar/connected/ChatThreadAvatarTest.tsx b/tests/unit/components/Avatar/connected/ChatThreadAvatarTest.tsx
new file mode 100644
index 000000000000..3552766df4ff
--- /dev/null
+++ b/tests/unit/components/Avatar/connected/ChatThreadAvatarTest.tsx
@@ -0,0 +1,568 @@
+import {render, screen} from '@testing-library/react-native';
+
+import ChatThreadAvatar from '@components/Avatar/connected/ChatThreadAvatar';
+
+import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {PersonalDetailsList, Report, ReportAction} from '@src/types/onyx';
+
+import type {ValueOf} from 'type-fest';
+
+import React from 'react';
+
+const THREAD_ID = 'thread123';
+const PARENT_REPORT_ID = 'parentReport456';
+const PARENT_ACTION_ID = 'parentAction789';
+const FALLBACK_NAME = 'Fallback Name';
+const CONTAINER_STYLE = [{marginRight: 12}];
+const SUBSCRIPT_CONTAINER_STYLE = {marginRight: 0};
+const HORIZONTAL_STACKING = {maxRows: 2, overlapDivider: 4};
+const HUMAN_SUPPORT_AGENT_KEY = 'reportAction.humanSupportAgent';
+// A transaction thread points `chatReportID` at its parent, a comment thread leaves it unset.
+const LINKED_TO_PARENT = {chatReportID: PARENT_REPORT_ID};
+
+const ACTOR_ACCOUNT_ID = 42;
+const ACTOR_LOGIN = 'john@example.com';
+const ACTOR_AVATAR_URL = 'https://example.com/actor-avatar.png';
+const DELEGATE_ACCOUNT_ID = 7;
+const DELEGATE_AVATAR_URL = 'https://example.com/delegate-avatar.png';
+const AGENT_ACCOUNT_ID = 9;
+const AGENT_AVATAR_URL = 'https://example.com/agent-avatar.png';
+
+// Stands in for the bundled fallback SVG so a resolved account icon can be asserted by identity.
+function MockFallbackAvatar() {
+    return null;
+}
+
+// Capture the props handed to each layout primitive: the routing and the icons are this component's whole contract.
+let mockCapturedWorkspaceSubscriptAvatarProps: Record<string, unknown> = {};
+let mockCapturedWorkspaceHorizontalAvatarsProps: Record<string, unknown> = {};
+let mockCapturedSubscriptAvatarProps: Record<string, unknown> = {};
+let mockCapturedSingleAvatarProps: Record<string, unknown> = {};
+
+const mockGetContainerStyles = jest.fn((size: string) => [{marginRight: 12, size}]);
+
+// The component reads three Onyx rows. Serving them from a map keeps the test free of Onyx setup, seeding and clearing.
+let mockOnyxData: Record<string, unknown> = {};
+
+// Same shape as InboxTabButtonTest: the mocked module is the hook itself, reading the map lazily on every call.
+jest.mock('@hooks/useOnyx', () => (key: string, options?: {selector?: (value: unknown) => unknown}) => {
+    const value = mockOnyxData[key];
+    return [options?.selector ? options.selector(value) : value, {status: 'loaded'}];
+});
+
+jest.mock('@hooks/useStyleUtils', () => jest.fn(() => ({getContainerStyles: mockGetContainerStyles})));
+
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: () => ({
+        ConciergeAvatar: MockFallbackAvatar,
+        NotificationsAvatar: MockFallbackAvatar,
+        FallbackAvatar: MockFallbackAvatar,
+    }),
+}));
+
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        formatPhoneNumber: (phoneNumber: string) => phoneNumber,
+        translate: (key: string) => key,
+    })),
+);
+
+let mockPersonalDetails: PersonalDetailsList = {};
+
+jest.mock('@components/OnyxListItemProvider', () => ({
+    usePersonalDetails: () => mockPersonalDetails,
+}));
+
+jest.mock('@components/Avatar/connected/WorkspaceSubscriptAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedWorkspaceSubscriptAvatarProps = props;
+        return <View testID="MockedWorkspaceSubscriptAvatar" />;
+    };
+});
+
+jest.mock('@components/Avatar/connected/WorkspaceHorizontalAvatars', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedWorkspaceHorizontalAvatarsProps = props;
+        return <View testID="MockedWorkspaceHorizontalAvatars" />;
+    };
+});
+
+jest.mock('@components/Avatar/layouts/SubscriptAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedSubscriptAvatarProps = props;
+        return <View testID="MockedSubscriptAvatar" />;
+    };
+});
+
+jest.mock('@components/Avatar/layouts/SingleAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedSingleAvatarProps = props;
+        return <View testID="MockedSingleAvatar" />;
+    };
+});
+
+const thread: Report = {
+    reportID: THREAD_ID,
+    type: CONST.REPORT.TYPE.CHAT,
+    parentReportID: PARENT_REPORT_ID,
+    parentReportActionID: PARENT_ACTION_ID,
+};
+
+const createIOUAction = (type: ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>, hasIOUDetails = false): ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ({
+    reportActionID: PARENT_ACTION_ID,
+    actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+    actorAccountID: ACTOR_ACCOUNT_ID,
+    created: '2024-01-01 00:00:00',
+    originalMessage: {
+        type,
+        IOUTransactionID: 'transaction123',
+        amount: 100,
+        currency: CONST.CURRENCY.USD,
+        ...(hasIOUDetails ? {IOUDetails: {amount: 100, currency: CONST.CURRENCY.USD, comment: ''}} : {}),
+    },
+});
+
+const createCommentAction = (overrides: Partial<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT>> = {}): ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT> => ({
+    reportActionID: PARENT_ACTION_ID,
+    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+    actorAccountID: ACTOR_ACCOUNT_ID,
+    created: '2024-01-01 00:00:00',
+    message: [{type: 'COMMENT', html: 'Hello', text: 'Hello'}],
+    ...overrides,
+});
+
+const tripPreviewAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.TRIP_PREVIEW> = {
+    reportActionID: PARENT_ACTION_ID,
+    actionName: CONST.REPORT.ACTIONS.TYPE.TRIP_PREVIEW,
+    actorAccountID: ACTOR_ACCOUNT_ID,
+    created: '2024-01-01 00:00:00',
+    originalMessage: {linkedReportID: THREAD_ID},
+};
+
+const harvestedSubmitAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.SUBMITTED> = {
+    reportActionID: PARENT_ACTION_ID,
+    actionName: CONST.REPORT.ACTIONS.TYPE.SUBMITTED,
+    actorAccountID: ACTOR_ACCOUNT_ID,
+    created: '2024-01-01 00:00:00',
+    originalMessage: {amount: 100, currency: CONST.CURRENCY.USD, harvesting: true},
+};
+
+/** Serves the thread row, its parent row and the parent's actions from the map, so a test only declares what exists. */
+const seedThread = (parentType: ValueOf<typeof CONST.REPORT.TYPE> | undefined, parentAction: ReportAction | undefined, threadOverrides: Partial<Report> = {}) => {
+    mockOnyxData = {
+        [`${ONYXKEYS.COLLECTION.REPORT}${THREAD_ID}`]: {...thread, ...threadOverrides},
+        ...(parentType ? {[`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`]: {reportID: PARENT_REPORT_ID, type: parentType}} : {}),
+        ...(parentAction ? {[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${PARENT_REPORT_ID}`]: {[PARENT_ACTION_ID]: parentAction}} : {}),
+    };
+};
+
+describe('ChatThreadAvatar (connected)', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockCapturedWorkspaceSubscriptAvatarProps = {};
+        mockCapturedWorkspaceHorizontalAvatarsProps = {};
+        mockCapturedSubscriptAvatarProps = {};
+        mockCapturedSingleAvatarProps = {};
+        mockOnyxData = {};
+        mockPersonalDetails = {
+            [ACTOR_ACCOUNT_ID]: {accountID: ACTOR_ACCOUNT_ID, login: ACTOR_LOGIN, avatar: ACTOR_AVATAR_URL},
+            [DELEGATE_ACCOUNT_ID]: {accountID: DELEGATE_ACCOUNT_ID, login: 'copilot@example.com', avatar: DELEGATE_AVATAR_URL},
+            [AGENT_ACCOUNT_ID]: {accountID: AGENT_ACCOUNT_ID, login: 'agent@expensify.com', avatar: AGENT_AVATAR_URL, firstName: 'Agnes'},
+        };
+    });
+
+    it.each([
+        ['an expense report and a created expense', CONST.REPORT.TYPE.EXPENSE, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), 'MockedWorkspaceSubscriptAvatar', LINKED_TO_PARENT],
+        // Without the chatReportID link only the actor shows.
+        ['an expense report and a created expense, without the chatReportID link', CONST.REPORT.TYPE.EXPENSE, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), 'MockedSingleAvatar', {}],
+        // A send-money PAY action carries IOUDetails, which `isTransactionThread` counts as a transaction, but only a created expense takes the subscript.
+        ['an expense report and a paid send-money action', CONST.REPORT.TYPE.EXPENSE, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.PAY, true), 'MockedSingleAvatar', LINKED_TO_PARENT],
+        ['an expense report and a tracked expense', CONST.REPORT.TYPE.EXPENSE, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.TRACK), 'MockedSingleAvatar', LINKED_TO_PARENT],
+        ['an IOU report and a created expense', CONST.REPORT.TYPE.IOU, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), 'MockedSingleAvatar', LINKED_TO_PARENT],
+        ['an expense report and a comment', CONST.REPORT.TYPE.EXPENSE, createCommentAction(), 'MockedSingleAvatar', {}],
+        ['an expense report and a plain pay action', CONST.REPORT.TYPE.EXPENSE, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.PAY), 'MockedSingleAvatar', {}],
+        ['a chat and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedSingleAvatar', {}],
+        // A thread inherits its room's chat type, but only a trip room takes the workspace subscript.
+        ['a policy room and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedSingleAvatar', {chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM}],
+        ['an admins room and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedSingleAvatar', {chatType: CONST.REPORT.CHAT_TYPE.POLICY_ADMINS}],
+        ['a policy expense chat and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedSingleAvatar', {chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT}],
+        ['a workspace chat and a trip preview', CONST.REPORT.TYPE.CHAT, tripPreviewAction, 'MockedWorkspaceSubscriptAvatar', {chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM}],
+        ['an expense report whose parent action has not loaded', CONST.REPORT.TYPE.EXPENSE, undefined, 'MockedSingleAvatar', {}],
+        ['a parent that has not loaded', undefined, undefined, 'MockedSingleAvatar', {}],
+    ])('should route a thread under %s', (_case, parentType, parentAction, expectedTestID, threadOverrides: Partial<Report>) => {
+        seedThread(parentType, parentAction, threadOverrides);
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(screen.getByTestId(expectedTestID)).toBeOnTheScreen();
+    });
+
+    it.each([
+        ['an expense report and a created expense', CONST.REPORT.TYPE.EXPENSE, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), 'MockedWorkspaceHorizontalAvatars', {}],
+        ['a workspace chat and a trip preview', CONST.REPORT.TYPE.CHAT, tripPreviewAction, 'MockedWorkspaceHorizontalAvatars', {chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM}],
+        // Inside a horizontal stack every workspace thread pairs its actor with the workspace icon.
+        ['a policy room and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedWorkspaceHorizontalAvatars', {chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM}],
+        ['a policy expense chat and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedWorkspaceHorizontalAvatars', {chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT}],
+        ['an invoice room and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedWorkspaceHorizontalAvatars', {chatType: CONST.REPORT.CHAT_TYPE.INVOICE}],
+        ['a chat and a comment', CONST.REPORT.TYPE.CHAT, createCommentAction(), 'MockedSingleAvatar', {}],
+        ['an expense report and a comment', CONST.REPORT.TYPE.EXPENSE, createCommentAction(), 'MockedSingleAvatar', {}],
+    ])('should route a thread under %s inside a horizontal stack', (_case, parentType, parentAction, expectedTestID, threadOverrides: Partial<Report>) => {
+        seedThread(parentType, parentAction, threadOverrides);
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.XXXX_LARGE}
+                horizontalStacking
+            />,
+        );
+
+        expect(screen.getByTestId(expectedTestID)).toBeOnTheScreen();
+    });
+
+    it.each([
+        ['without the chatReportID link', {}, false, 'MockedSingleAvatar'],
+        ['without the chatReportID link, inside a horizontal stack', {}, true, 'MockedSingleAvatar'],
+        ['linked to its trip preview', LINKED_TO_PARENT, false, 'MockedWorkspaceSubscriptAvatar'],
+        ['linked to its trip preview, inside a horizontal stack', LINKED_TO_PARENT, true, 'MockedSingleAvatar'],
+    ])('should route an archived trip room %s', (_case, linkOverrides: Partial<Report>, horizontalStacking, expectedTestID) => {
+        // Given an archived trip room under its trip preview
+        seedThread(CONST.REPORT.TYPE.CHAT, tripPreviewAction, {chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM, ...linkOverrides});
+        mockOnyxData[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${THREAD_ID}`] = {private_isArchived: '2024-01-01 00:00:00'};
+
+        // When the avatar renders
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+                horizontalStacking={horizontalStacking}
+            />,
+        );
+
+        // Then the workspace icon only survives as the subscript of a loaded trip preview, never in a stack
+        expect(screen.getByTestId(expectedTestID)).toBeOnTheScreen();
+    });
+
+    it('should hand a horizontal stack the thread row, the resolved actor, the stacking options and the sort order', () => {
+        seedThread(CONST.REPORT.TYPE.CHAT, createCommentAction(), {chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM});
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.XXXX_LARGE}
+                horizontalStacking={HORIZONTAL_STACKING}
+                sort={CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        expect(mockCapturedWorkspaceHorizontalAvatarsProps).toEqual({
+            report: expect.objectContaining({parentReportID: PARENT_REPORT_ID, chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM}),
+            primaryAvatar: expect.objectContaining({id: ACTOR_ACCOUNT_ID, source: ACTOR_AVATAR_URL}),
+            size: CONST.AVATAR_SIZE.XXXX_LARGE,
+            horizontalStacking: HORIZONTAL_STACKING,
+            sort: CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it('should hand an expense request the subscript props, its row and the resolved actor', () => {
+        seedThread(CONST.REPORT.TYPE.EXPENSE, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), LINKED_TO_PARENT);
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.SMALL}
+                backdropColor="#ff0000"
+                containerStyle={CONTAINER_STYLE}
+                subscriptContainerStyle={SUBSCRIPT_CONTAINER_STYLE}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        expect(mockCapturedWorkspaceSubscriptAvatarProps).toEqual({
+            // The rows read here are handed over rather than subscribed to again
+            report: expect.objectContaining({parentReportID: PARENT_REPORT_ID, parentReportActionID: PARENT_ACTION_ID}),
+            primaryAvatar: expect.objectContaining({id: ACTOR_ACCOUNT_ID, source: ACTOR_AVATAR_URL}),
+            size: CONST.AVATAR_SIZE.SMALL,
+            backdropColor: '#ff0000',
+            containerStyle: SUBSCRIPT_CONTAINER_STYLE,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it('should hand an expense request the copilot as the primary avatar when one created the expense', () => {
+        seedThread(CONST.REPORT.TYPE.EXPENSE, {...createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), delegateAccountID: DELEGATE_ACCOUNT_ID}, LINKED_TO_PARENT);
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.primaryAvatar).toEqual(expect.objectContaining({id: DELEGATE_ACCOUNT_ID, source: DELEGATE_AVATAR_URL}));
+    });
+
+    it("should hand a trip room the trip preview's actor as the primary avatar", () => {
+        seedThread(CONST.REPORT.TYPE.CHAT, tripPreviewAction, {chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM});
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.primaryAvatar).toEqual(expect.objectContaining({id: ACTOR_ACCOUNT_ID, source: ACTOR_AVATAR_URL}));
+    });
+
+    it('should render the parent action actor as a single avatar', () => {
+        seedThread(CONST.REPORT.TYPE.CHAT, createCommentAction());
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.SMALL}
+                containerStyle={CONTAINER_STYLE}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual({id: ACTOR_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: ACTOR_AVATAR_URL, name: ACTOR_LOGIN, displayName: ACTOR_LOGIN});
+        expect(mockCapturedSingleAvatarProps.size).toBe(CONST.AVATAR_SIZE.SMALL);
+        expect(mockCapturedSingleAvatarProps.containerStyles).toBe(CONTAINER_STYLE);
+        expect(mockCapturedSingleAvatarProps.fallbackDisplayName).toBe(FALLBACK_NAME);
+    });
+
+    it('should fall back to the size-derived container styles for a single avatar', () => {
+        seedThread(CONST.REPORT.TYPE.CHAT, createCommentAction());
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockGetContainerStyles).toHaveBeenCalledWith(CONST.AVATAR_SIZE.DEFAULT);
+        expect(mockCapturedSingleAvatarProps.containerStyles).toEqual(mockGetContainerStyles.mock.results.at(0)?.value);
+    });
+
+    it('should render the copilot of a linked parent action as the primary avatar, badged as acting for the actor', () => {
+        // Given a transaction thread under an IOU report whose expense a copilot created, linked to its parent through chatReportID
+        seedThread(CONST.REPORT.TYPE.IOU, {...createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), delegateAccountID: DELEGATE_ACCOUNT_ID}, LINKED_TO_PARENT);
+
+        // When the avatar renders
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then the copilot is the primary avatar with the copilot badge
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(
+            expect.objectContaining({id: DELEGATE_ACCOUNT_ID, source: DELEGATE_AVATAR_URL, copilot: {accountID: DELEGATE_ACCOUNT_ID, actedForAccountID: ACTOR_ACCOUNT_ID}}),
+        );
+    });
+
+    it('should keep the actor as the primary avatar, still badged, while the copilot has no personal details', () => {
+        // Given a linked transaction thread whose expense a copilot created, before the copilot's personal details load
+        delete mockPersonalDetails[DELEGATE_ACCOUNT_ID];
+        seedThread(CONST.REPORT.TYPE.IOU, {...createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), delegateAccountID: DELEGATE_ACCOUNT_ID}, LINKED_TO_PARENT);
+
+        // When the avatar renders
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then the actor fills the primary slot until the copilot can be drawn, and the badge already names the copilot
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(
+            expect.objectContaining({id: ACTOR_ACCOUNT_ID, source: ACTOR_AVATAR_URL, copilot: {accountID: DELEGATE_ACCOUNT_ID, actedForAccountID: ACTOR_ACCOUNT_ID}}),
+        );
+    });
+
+    it('should render the actor without a copilot badge for a comment thread a copilot started', () => {
+        // Given a comment thread, which leaves chatReportID unset, under a comment a copilot posted
+        seedThread(CONST.REPORT.TYPE.CHAT, createCommentAction({delegateAccountID: DELEGATE_ACCOUNT_ID}));
+
+        // When the avatar renders
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then it shows the account the copilot acted for, without a badge, because the thread doesn't link its parent action
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: ACTOR_ACCOUNT_ID, source: ACTOR_AVATAR_URL}));
+        expect(mockCapturedSingleAvatarProps.avatar).not.toHaveProperty('copilot');
+    });
+
+    it('should render Concierge for a thread under the Concierge chat, without a copilot badge', () => {
+        seedThread(CONST.REPORT.TYPE.CHAT, createCommentAction({delegateAccountID: DELEGATE_ACCOUNT_ID}), LINKED_TO_PARENT);
+        mockOnyxData[ONYXKEYS.CONCIERGE_REPORT_ID] = PARENT_REPORT_ID;
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: CONST.ACCOUNT_ID.CONCIERGE}));
+        expect(mockCapturedSingleAvatarProps.avatar).not.toHaveProperty('copilot');
+    });
+
+    it('should render Concierge alone while the revealed human agent has no personal details yet', () => {
+        delete mockPersonalDetails[AGENT_ACCOUNT_ID];
+        seedThread(
+            CONST.REPORT.TYPE.CHAT,
+            createCommentAction({
+                actorAccountID: CONST.ACCOUNT_ID.CONCIERGE,
+                originalMessage: {html: 'Hello', whisperedTo: [], humanAgentAccountID: AGENT_ACCOUNT_ID},
+            }),
+            LINKED_TO_PARENT,
+        );
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(screen.getByTestId('MockedSingleAvatar')).toBeOnTheScreen();
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: CONST.ACCOUNT_ID.CONCIERGE}));
+    });
+
+    it('should render Concierge for a harvested submit', () => {
+        seedThread(CONST.REPORT.TYPE.CHAT, harvestedSubmitAction);
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: CONST.ACCOUNT_ID.CONCIERGE}));
+    });
+
+    it('should render Concierge alone for a comment thread under a revealed human agent', () => {
+        // Given a comment thread, which leaves chatReportID unset, under a comment a revealed human agent posted
+        seedThread(
+            CONST.REPORT.TYPE.CHAT,
+            createCommentAction({
+                actorAccountID: CONST.ACCOUNT_ID.CONCIERGE,
+                originalMessage: {html: 'Hello', whisperedTo: [], humanAgentAccountID: AGENT_ACCOUNT_ID},
+            }),
+        );
+
+        // When the avatar renders
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then Concierge stands alone, because the thread doesn't link its parent action
+        expect(screen.getByTestId('MockedSingleAvatar')).toBeOnTheScreen();
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: CONST.ACCOUNT_ID.CONCIERGE}));
+    });
+
+    it.each([
+        ['the first name when personal details carry one', 'Agnes', 'Agnes'],
+        ['the generic support-agent label otherwise', undefined, HUMAN_SUPPORT_AGENT_KEY],
+    ])('should render Concierge with the revealed human agent of a linked parent action as the subscript, named by %s', (_case, firstName, expectedName) => {
+        mockPersonalDetails[AGENT_ACCOUNT_ID] = {accountID: AGENT_ACCOUNT_ID, avatar: AGENT_AVATAR_URL, firstName};
+        seedThread(
+            CONST.REPORT.TYPE.CHAT,
+            createCommentAction({
+                actorAccountID: CONST.ACCOUNT_ID.CONCIERGE,
+                originalMessage: {html: 'Hello', whisperedTo: [], humanAgentAccountID: AGENT_ACCOUNT_ID},
+            }),
+            LINKED_TO_PARENT,
+        );
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+                backdropColor="#ff0000"
+                subscriptContainerStyle={SUBSCRIPT_CONTAINER_STYLE}
+            />,
+        );
+
+        expect(screen.getByTestId('MockedSubscriptAvatar')).toBeOnTheScreen();
+        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toEqual(expect.objectContaining({id: CONST.ACCOUNT_ID.CONCIERGE}));
+        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({id: AGENT_ACCOUNT_ID, source: AGENT_AVATAR_URL, name: expectedName}));
+        expect(mockCapturedSubscriptAvatarProps.backdropColor).toBe('#ff0000');
+        expect(mockCapturedSubscriptAvatarProps.containerStyle).toBe(SUBSCRIPT_CONTAINER_STYLE);
+    });
+
+    it('should render the fallback avatar when the parent action is missing', () => {
+        seedThread(CONST.REPORT.TYPE.CHAT, undefined);
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: CONST.DEFAULT_NUMBER_ID, source: MockFallbackAvatar}));
+    });
+
+    it('should seed the default avatar from the account ID for a comment thread when the actor is missing from personal details', () => {
+        mockPersonalDetails = {};
+        seedThread(CONST.REPORT.TYPE.CHAT, createCommentAction());
+
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: ACTOR_ACCOUNT_ID, source: getDefaultAvatarURL({accountID: ACTOR_ACCOUNT_ID})}));
+    });
+
+    it('should keep the generic fallback for a linked thread when the actor is missing from personal details', () => {
+        // Given a linked transaction thread whose actor's personal details haven't loaded
+        mockPersonalDetails = {};
+        seedThread(CONST.REPORT.TYPE.IOU, createIOUAction(CONST.IOU.REPORT_ACTION_TYPE.CREATE), LINKED_TO_PARENT);
+
+        // When the avatar renders
+        render(
+            <ChatThreadAvatar
+                reportID={THREAD_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then the actor gets the generic fallback rather than a default avatar seeded from the account ID
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(expect.objectContaining({id: ACTOR_ACCOUNT_ID, source: MockFallbackAvatar}));
+    });
+});
diff --git a/tests/unit/components/Avatar/connected/ExpenseReportAvatarTest.tsx b/tests/unit/components/Avatar/connected/ExpenseReportAvatarTest.tsx
index eae4d31431ee..105dae2fd944 100644
--- a/tests/unit/components/Avatar/connected/ExpenseReportAvatarTest.tsx
+++ b/tests/unit/components/Avatar/connected/ExpenseReportAvatarTest.tsx
@@ -2,7 +2,6 @@ import {cleanup, render, screen} from '@testing-library/react-native';
 
 import ExpenseReportAvatar from '@components/Avatar/connected/ExpenseReportAvatar';
 
-import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
 import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
 
 import CONST from '@src/CONST';
@@ -15,31 +14,27 @@ import Onyx from 'react-native-onyx';
 import waitForBatchedUpdatesWithAct from '../../../../utils/waitForBatchedUpdatesWithAct';
 
 const REPORT_ID = 'report123';
-const PARENT_REPORT_ID = 'parentChat456';
 const POLICY_ID = 'policy123';
-const POLICY_NAME = 'Acme Workspace';
-const POLICY_AVATAR_URL = 'https://example.com/workspace-avatar.png';
-const REPORT_POLICY_AVATAR_URL = 'https://example.com/report-policy-avatar.png';
-const PARENT_POLICY_AVATAR_URL = 'https://example.com/parent-policy-avatar.png';
 const FALLBACK_NAME = 'Fallback Name';
-const UNAVAILABLE_WORKSPACE_NAME_KEY = 'workspace.common.unavailable';
+const CONTAINER_STYLE = {marginRight: 0};
 
 const OWNER_ACCOUNT_ID = 42;
 const OWNER_LOGIN = 'john@example.com';
 const OWNER_AVATAR_URL = 'https://example.com/owner-avatar.png';
 
+const PARENT_REPORT_ID = 'parentChat456';
+const PARENT_REPORT_ACTION_ID = 'action789';
 const DELEGATE_ACCOUNT_ID = 77;
 const DELEGATE_LOGIN = 'copilot@example.com';
 const DELEGATE_AVATAR_URL = 'https://example.com/delegate-avatar.png';
-const PARENT_REPORT_ACTION_ID = 'action789';
 
 // Stands in for the bundled fallback SVG so a resolved account icon can be asserted by identity.
 function MockFallbackAvatar() {
     return null;
 }
 
-// Capture the props handed to the layout primitive, which is the whole contract of this component.
-let mockCapturedSubscriptAvatarProps: Record<string, unknown> = {};
+// Capture the props handed to the workspace subscript: the owner plus the report row.
+let mockCapturedWorkspaceSubscriptAvatarProps: Record<string, unknown> = {};
 
 jest.mock('@hooks/useLazyAsset', () => ({
     useMemoizedLazyExpensifyIcons: () => ({
@@ -49,25 +44,18 @@ jest.mock('@hooks/useLazyAsset', () => ({
     }),
 }));
 
-jest.mock('@hooks/useLocalize', () =>
-    jest.fn(() => ({
-        formatPhoneNumber: (phoneNumber: string) => phoneNumber,
-        translate: (key: string) => key,
-    })),
-);
-
 let mockPersonalDetails: PersonalDetailsList = {};
 
 jest.mock('@components/OnyxListItemProvider', () => ({
     usePersonalDetails: () => mockPersonalDetails,
 }));
 
-jest.mock('@components/Avatar/layouts/SubscriptAvatar', () => {
+jest.mock('@components/Avatar/connected/WorkspaceSubscriptAvatar', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {View} = require('react-native');
     return (props: Record<string, unknown>) => {
-        mockCapturedSubscriptAvatarProps = props;
-        return <View testID="MockedSubscriptAvatar" />;
+        mockCapturedWorkspaceSubscriptAvatarProps = props;
+        return <View testID="MockedWorkspaceSubscriptAvatar" />;
     };
 });
 
@@ -87,7 +75,7 @@ describe('ExpenseReportAvatar (connected)', () => {
 
     beforeEach(() => {
         jest.clearAllMocks();
-        mockCapturedSubscriptAvatarProps = {};
+        mockCapturedWorkspaceSubscriptAvatarProps = {};
         mockPersonalDetails = {
             [OWNER_ACCOUNT_ID]: {accountID: OWNER_ACCOUNT_ID, login: OWNER_LOGIN, avatar: OWNER_AVATAR_URL},
         };
@@ -100,6 +88,34 @@ describe('ExpenseReportAvatar (connected)', () => {
         await waitForBatchedUpdatesWithAct();
     });
 
+    it('should hand the owner and the report row to the workspace subscript with the props forwarded', async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport());
+        await waitForBatchedUpdatesWithAct();
+
+        render(
+            <ExpenseReportAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.SMALL}
+                backdropColor="#ff0000"
+                containerStyle={CONTAINER_STYLE}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+        // useOnyx delivers its initial value asynchronously, so flush it inside act() before asserting.
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByTestId('MockedWorkspaceSubscriptAvatar')).toBeOnTheScreen();
+        expect(mockCapturedWorkspaceSubscriptAvatarProps).toEqual({
+            report: expect.objectContaining({ownerAccountID: OWNER_ACCOUNT_ID, policyID: POLICY_ID}),
+            primaryAvatar: expect.objectContaining({id: OWNER_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: OWNER_AVATAR_URL, name: OWNER_LOGIN}),
+            size: CONST.AVATAR_SIZE.SMALL,
+            backdropColor: '#ff0000',
+            containerStyle: CONTAINER_STYLE,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.primaryAvatar).not.toHaveProperty('copilot');
+    });
+
     it.each([
         ['parentReportID', {parentReportActionID: PARENT_REPORT_ACTION_ID}],
         // An optimistic expense report links its workspace chat only through chatReportID.
@@ -126,7 +142,7 @@ describe('ExpenseReportAvatar (connected)', () => {
         );
         await waitForBatchedUpdatesWithAct();
 
-        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toEqual(
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.primaryAvatar).toEqual(
             expect.objectContaining({
                 id: DELEGATE_ACCOUNT_ID,
                 source: DELEGATE_AVATAR_URL,
@@ -135,192 +151,8 @@ describe('ExpenseReportAvatar (connected)', () => {
         );
     });
 
-    it('should render the owner as the primary avatar with the workspace icon as the subscript', async () => {
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport());
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, avatarURL: POLICY_AVATAR_URL});
-        await waitForBatchedUpdatesWithAct();
-
-        render(
-            <ExpenseReportAvatar
-                reportID={REPORT_ID}
-                size={CONST.AVATAR_SIZE.SMALL}
-                backdropColor="#ff0000"
-                fallbackDisplayName={FALLBACK_NAME}
-            />,
-        );
-        // useOnyx delivers its initial value asynchronously, so flush it inside act() before asserting.
-        await waitForBatchedUpdatesWithAct();
-
-        expect(screen.getByTestId('MockedSubscriptAvatar')).toBeOnTheScreen();
-        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toEqual(
-            expect.objectContaining({id: OWNER_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: OWNER_AVATAR_URL, name: OWNER_LOGIN}),
-        );
-        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).not.toHaveProperty('copilot');
-        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(
-            expect.objectContaining({id: POLICY_ID, type: CONST.ICON_TYPE_WORKSPACE, source: POLICY_AVATAR_URL, name: POLICY_NAME}),
-        );
-        expect(mockCapturedSubscriptAvatarProps.size).toBe(CONST.AVATAR_SIZE.SMALL);
-        expect(mockCapturedSubscriptAvatarProps.backdropColor).toBe('#ff0000');
-        expect(mockCapturedSubscriptAvatarProps.fallbackDisplayName).toBe(FALLBACK_NAME);
-    });
-
-    it.each([
-        ['the uploaded workspace avatar when the policy has one', {policy: {avatarURL: POLICY_AVATAR_URL}}, POLICY_AVATAR_URL],
-        // A workspace with no uploaded avatar stores an empty string, which has to fall through to the default avatar.
-        ['the default workspace avatar when avatarURL is an empty string', {policy: {avatarURL: ''}}, getDefaultWorkspaceAvatar(POLICY_NAME)],
-        // Carried avatars only apply while the policy row is entirely absent, and the parent chat's comes first since the report's can be stale mid-move.
-        [
-            "the parent chat's policyAvatar when the policy row is missing",
-            {reportPolicyAvatar: REPORT_POLICY_AVATAR_URL, parentChatPolicyAvatar: PARENT_POLICY_AVATAR_URL},
-            PARENT_POLICY_AVATAR_URL,
-        ],
-        ["the report's policyAvatar when the parent chat carries none", {reportPolicyAvatar: REPORT_POLICY_AVATAR_URL}, REPORT_POLICY_AVATAR_URL],
-        // A chat-carried '' means "no uploaded avatar" and must fall through to the report's avatar, not shadow it.
-        [
-            "the report's policyAvatar when the parent chat's policyAvatar is an empty string",
-            {reportPolicyAvatar: REPORT_POLICY_AVATAR_URL, parentChatPolicyAvatar: ''},
-            REPORT_POLICY_AVATAR_URL,
-        ],
-    ])(
-        'should resolve %s as the subscript source',
-        async (
-            _case,
-            {
-                policy,
-                reportPolicyAvatar,
-                parentChatPolicyAvatar,
-            }: {
-                policy?: {avatarURL: string};
-                reportPolicyAvatar?: string;
-                parentChatPolicyAvatar?: string;
-            },
-            expectedSource,
-        ) => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport({policyName: POLICY_NAME, policyAvatar: reportPolicyAvatar}));
-            if (policy) {
-                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, ...policy});
-            }
-            if (parentChatPolicyAvatar) {
-                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`, {reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, policyAvatar: parentChatPolicyAvatar});
-            }
-            await waitForBatchedUpdatesWithAct();
-
-            render(
-                <ExpenseReportAvatar
-                    reportID={REPORT_ID}
-                    size={CONST.AVATAR_SIZE.DEFAULT}
-                />,
-            );
-            await waitForBatchedUpdatesWithAct();
-
-            expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({source: expectedSource}));
-        },
-    );
-
-    it.each([
-        ['the policy name', {policy: {name: POLICY_NAME}, report: {policyName: 'Report Policy Name'}, parentChat: {policyName: 'Parent Policy Name'}}, POLICY_NAME],
-        [
-            "the parent chat's policyName when the policy row is missing",
-            {report: {policyName: 'Report Policy Name'}, parentChat: {policyName: 'Parent Policy Name', oldPolicyName: 'Parent Old Name'}},
-            'Parent Policy Name',
-        ],
-        ["the parent chat's oldPolicyName when it has no policyName", {report: {policyName: 'Report Policy Name'}, parentChat: {oldPolicyName: 'Parent Old Name'}}, 'Parent Old Name'],
-        ["the report's policyName when the parent chat carries neither", {report: {policyName: 'Report Policy Name', oldPolicyName: 'Old Policy Name'}}, 'Report Policy Name'],
-        ["the report's oldPolicyName as the next fallback", {report: {oldPolicyName: 'Old Policy Name'}}, 'Old Policy Name'],
-        ['the unavailable-workspace translation when nothing resolves', {}, UNAVAILABLE_WORKSPACE_NAME_KEY],
-    ])(
-        'should name the workspace icon after %s',
-        async (
-            _case,
-            {
-                policy,
-                report,
-                parentChat,
-            }: {
-                policy?: {name: string};
-                report?: Partial<Report>;
-                parentChat?: Partial<Report>;
-            },
-            expectedName,
-        ) => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport(report));
-            if (policy) {
-                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, ...policy});
-            }
-            if (parentChat) {
-                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`, {reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, ...parentChat});
-            }
-            await waitForBatchedUpdatesWithAct();
-
-            render(
-                <ExpenseReportAvatar
-                    reportID={REPORT_ID}
-                    size={CONST.AVATAR_SIZE.DEFAULT}
-                />,
-            );
-            await waitForBatchedUpdatesWithAct();
-
-            expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({name: expectedName}));
-        },
-    );
-
-    it('should reach the policy row through the workspace chat when the report has no policyID', async () => {
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport({policyID: undefined}));
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`, {reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, policyID: POLICY_ID});
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, avatarURL: POLICY_AVATAR_URL});
-        await waitForBatchedUpdatesWithAct();
-
-        render(
-            <ExpenseReportAvatar
-                reportID={REPORT_ID}
-                size={CONST.AVATAR_SIZE.DEFAULT}
-            />,
-        );
-        await waitForBatchedUpdatesWithAct();
-
-        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({id: POLICY_ID, name: POLICY_NAME, source: POLICY_AVATAR_URL}));
-    });
-
-    it.each([
-        ['a stale real policyID', 'stalePolicy999'],
-        ['a fake policyID', CONST.POLICY.ID_FAKE],
-    ])("should prefer the workspace chat's policy when the report carries %s", async (_case, reportPolicyID) => {
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport({policyID: reportPolicyID, policyName: 'Stale Policy Name'}));
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`, {reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, policyID: POLICY_ID});
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, avatarURL: POLICY_AVATAR_URL});
-        await waitForBatchedUpdatesWithAct();
-
-        render(
-            <ExpenseReportAvatar
-                reportID={REPORT_ID}
-                size={CONST.AVATAR_SIZE.DEFAULT}
-            />,
-        );
-        await waitForBatchedUpdatesWithAct();
-
-        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({id: POLICY_ID, name: POLICY_NAME, source: POLICY_AVATAR_URL}));
-    });
-
-    it('should resolve the workspace chat through chatReportID when parentReportID is absent', async () => {
-        const chatReportID = 'workspaceChat789';
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport({parentReportID: undefined, chatReportID}));
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, {reportID: chatReportID, type: CONST.REPORT.TYPE.CHAT, policyName: 'Chat Policy Name'});
-        await waitForBatchedUpdatesWithAct();
-
-        render(
-            <ExpenseReportAvatar
-                reportID={REPORT_ID}
-                size={CONST.AVATAR_SIZE.DEFAULT}
-            />,
-        );
-        await waitForBatchedUpdatesWithAct();
-
-        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({name: 'Chat Policy Name'}));
-    });
-
     it('should render the fallback avatar as the primary when the report has no owner', async () => {
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport({ownerAccountID: undefined}));
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME});
         await waitForBatchedUpdatesWithAct();
 
         render(
@@ -331,13 +163,14 @@ describe('ExpenseReportAvatar (connected)', () => {
         );
         await waitForBatchedUpdatesWithAct();
 
-        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toEqual(expect.objectContaining({id: CONST.DEFAULT_NUMBER_ID, type: CONST.ICON_TYPE_AVATAR, source: MockFallbackAvatar}));
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.primaryAvatar).toEqual(
+            expect.objectContaining({id: CONST.DEFAULT_NUMBER_ID, type: CONST.ICON_TYPE_AVATAR, source: MockFallbackAvatar}),
+        );
     });
 
     it('should seed the default avatar from the account ID when the owner is missing from personal details', async () => {
         mockPersonalDetails = {};
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport());
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME});
         await waitForBatchedUpdatesWithAct();
 
         render(
@@ -348,30 +181,21 @@ describe('ExpenseReportAvatar (connected)', () => {
         );
         await waitForBatchedUpdatesWithAct();
 
-        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toEqual(
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.primaryAvatar).toEqual(
             expect.objectContaining({id: OWNER_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: getDefaultAvatarURL({accountID: OWNER_ACCOUNT_ID})}),
         );
     });
 
-    const CONTAINER_STYLE = {marginRight: 0};
-
-    it.each([
-        ['forward the container style to the subscript stack', CONTAINER_STYLE, CONTAINER_STYLE],
-        ['leave the subscript stack on its default container styles when no container style is passed', undefined, undefined],
-    ])('should %s', async (_case, containerStyle, expectedContainerStyle) => {
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createExpenseReport());
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME});
-        await waitForBatchedUpdatesWithAct();
-
+    it('should hand over an undefined report row while it has not loaded', async () => {
         render(
             <ExpenseReportAvatar
                 reportID={REPORT_ID}
                 size={CONST.AVATAR_SIZE.DEFAULT}
-                containerStyle={containerStyle}
             />,
         );
         await waitForBatchedUpdatesWithAct();
 
-        expect(mockCapturedSubscriptAvatarProps.containerStyle).toBe(expectedContainerStyle);
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.report).toBeUndefined();
+        expect(mockCapturedWorkspaceSubscriptAvatarProps.primaryAvatar).toEqual(expect.objectContaining({id: CONST.DEFAULT_NUMBER_ID}));
     });
 });
diff --git a/tests/unit/components/Avatar/connected/PolicyExpenseChatAvatarTest.tsx b/tests/unit/components/Avatar/connected/PolicyExpenseChatAvatarTest.tsx
new file mode 100644
index 000000000000..40bc5f532b0e
--- /dev/null
+++ b/tests/unit/components/Avatar/connected/PolicyExpenseChatAvatarTest.tsx
@@ -0,0 +1,351 @@
+import {render, screen} from '@testing-library/react-native';
+
+import PolicyExpenseChatAvatar from '@components/Avatar/connected/PolicyExpenseChatAvatar';
+import {PersonalDetailsContext} from '@components/OnyxListItemProvider';
+
+import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {PersonalDetailsList, Policy, Report} from '@src/types/onyx';
+
+import React from 'react';
+
+const REPORT_ID = 'report123';
+const POLICY_ID = 'policy123';
+const POLICY_NAME = 'Acme Workspace';
+const POLICY_AVATAR_URL = 'https://example.com/workspace-avatar.png';
+const REPORT_POLICY_NAME = 'Carried Workspace';
+const REPORT_POLICY_AVATAR_URL = 'https://example.com/report-policy-avatar.png';
+const FALLBACK_NAME = 'Fallback Name';
+const CONTAINER_STYLE = [{marginRight: 12}];
+const SUBSCRIPT_CONTAINER_STYLE = {marginRight: 0};
+const HORIZONTAL_STACKING = {maxRows: 2, overlapDivider: 4};
+const HIDDEN_NAME_KEY = 'common.hidden';
+
+const OWNER_ACCOUNT_ID = 42;
+const OWNER_LOGIN = 'john@example.com';
+const OWNER_DISPLAY_NAME = 'John Doe';
+const OWNER_AVATAR_URL = 'https://example.com/owner-avatar.png';
+
+// Stands in for the bundled fallback SVG so a resolved account icon can be asserted by identity.
+function MockFallbackAvatar() {
+    return null;
+}
+
+const WORKSPACE_ICON = {id: POLICY_ID, type: CONST.ICON_TYPE_WORKSPACE, source: POLICY_AVATAR_URL, name: POLICY_NAME};
+const OWNER_ICON = {id: OWNER_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: OWNER_AVATAR_URL, name: OWNER_DISPLAY_NAME, fallbackIcon: undefined};
+// The unknown account, standing in for a missing workspace or member
+const PLACEHOLDER_ICON = {id: CONST.DEFAULT_NUMBER_ID, type: CONST.ICON_TYPE_AVATAR, source: MockFallbackAvatar, name: ''};
+
+// Capture the props handed to each layout primitive: the routing and the icons are this component's whole contract.
+let mockCapturedHorizontalAvatarsProps: Record<string, unknown> = {};
+let mockCapturedSubscriptAvatarProps: Record<string, unknown> = {};
+let mockCapturedSingleAvatarProps: Record<string, unknown> = {};
+
+const mockGetContainerStyles = jest.fn((size: string) => [{marginRight: 12, size}]);
+
+// The component reads two Onyx rows. Serving them from a map keeps the test free of Onyx setup, seeding and clearing.
+let mockOnyxData: Record<string, unknown> = {};
+
+jest.mock('@hooks/useOnyx', () => (key: string, options?: {selector?: (value: unknown) => unknown}) => {
+    const value = mockOnyxData[key];
+    return [options?.selector ? options.selector(value) : value, {status: 'loaded'}];
+});
+
+jest.mock('@hooks/useStyleUtils', () => jest.fn(() => ({getContainerStyles: mockGetContainerStyles})));
+
+jest.mock('@hooks/useLazyAsset', () => ({
+    useMemoizedLazyExpensifyIcons: () => ({
+        ConciergeAvatar: MockFallbackAvatar,
+        NotificationsAvatar: MockFallbackAvatar,
+        FallbackAvatar: MockFallbackAvatar,
+    }),
+}));
+
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        formatPhoneNumber: (phoneNumber: string) => phoneNumber,
+        translate: (key: string) => key,
+        localeCompare: (first: string, second: string) => first.localeCompare(second),
+    })),
+);
+
+let mockPersonalDetails: PersonalDetailsList = {};
+
+/** Renders inside the live personal details context, which the component reads while there is no Search snapshot. */
+const renderWithPersonalDetails = (ui: React.ReactElement) => render(<PersonalDetailsContext.Provider value={mockPersonalDetails}>{ui}</PersonalDetailsContext.Provider>);
+
+jest.mock('@components/Avatar/layouts/HorizontalAvatars', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedHorizontalAvatarsProps = props;
+        return <View testID="MockedHorizontalAvatars" />;
+    };
+});
+
+jest.mock('@components/Avatar/layouts/SubscriptAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedSubscriptAvatarProps = props;
+        return <View testID="MockedSubscriptAvatar" />;
+    };
+});
+
+jest.mock('@components/Avatar/layouts/SingleAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedSingleAvatarProps = props;
+        return <View testID="MockedSingleAvatar" />;
+    };
+});
+
+const policy: Partial<Policy> = {id: POLICY_ID, name: POLICY_NAME, avatarURL: POLICY_AVATAR_URL};
+
+/** Serves the chat row and its policy row from the map, so a test only declares what exists. `null` leaves the policy row out. */
+const seedChat = (reportOverrides: Partial<Report> = {}, policyRow: Partial<Policy> | null = policy) => {
+    mockOnyxData = {
+        [`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`]: {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.CHAT,
+            chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
+            ownerAccountID: OWNER_ACCOUNT_ID,
+            policyID: POLICY_ID,
+            ...reportOverrides,
+        },
+        ...(policyRow ? {[`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`]: policyRow} : {}),
+    };
+};
+
+describe('PolicyExpenseChatAvatar (connected)', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockCapturedHorizontalAvatarsProps = {};
+        mockCapturedSubscriptAvatarProps = {};
+        mockCapturedSingleAvatarProps = {};
+        mockOnyxData = {};
+        mockPersonalDetails = {
+            [OWNER_ACCOUNT_ID]: {accountID: OWNER_ACCOUNT_ID, login: OWNER_LOGIN, displayName: OWNER_DISPLAY_NAME, avatar: OWNER_AVATAR_URL},
+        };
+    });
+
+    it('should render the workspace icon with the member as the subscript', () => {
+        // Given a policy expense chat whose member has personal details
+        seedChat();
+
+        // When it renders with every prop
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.SMALL}
+                backdropColor="#ff0000"
+                containerStyle={CONTAINER_STYLE}
+                subscriptContainerStyle={SUBSCRIPT_CONTAINER_STYLE}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        // Then the subscript layout gets the workspace as the primary avatar, the member named by display name as the subscript, and the subscript container style
+        expect(screen.getByTestId('MockedSubscriptAvatar')).toBeOnTheScreen();
+        expect(screen.queryByTestId('MockedSingleAvatar')).not.toBeOnTheScreen();
+        expect(screen.queryByTestId('MockedHorizontalAvatars')).not.toBeOnTheScreen();
+        expect(mockCapturedSubscriptAvatarProps).toEqual({
+            primaryAvatar: WORKSPACE_ICON,
+            secondaryAvatar: OWNER_ICON,
+            size: CONST.AVATAR_SIZE.SMALL,
+            backdropColor: '#ff0000',
+            containerStyle: SUBSCRIPT_CONTAINER_STYLE,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it.each([
+        ['without a display name', {accountID: OWNER_ACCOUNT_ID, login: OWNER_LOGIN, avatar: OWNER_AVATAR_URL}, {source: OWNER_AVATAR_URL, name: OWNER_LOGIN}],
+        ['without personal details', undefined, {source: getDefaultAvatarURL({accountID: OWNER_ACCOUNT_ID}), name: HIDDEN_NAME_KEY}],
+    ])('should name and picture the member like the legacy component %s', (_case, ownerDetails, expectedIcon) => {
+        // Given a policy expense chat whose member is missing part of their personal details
+        seedChat();
+        mockPersonalDetails = ownerDetails ? {[OWNER_ACCOUNT_ID]: ownerDetails} : {};
+
+        // When it renders
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then the member keeps the subscript, named by login and then "Hidden", with a default avatar seeded from the account ID rather than the generic fallback
+        expect(screen.getByTestId('MockedSubscriptAvatar')).toBeOnTheScreen();
+        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual({id: OWNER_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, fallbackIcon: undefined, ...expectedIcon});
+    });
+
+    it('should prefer the Search snapshot personal details over the live list', () => {
+        // Given a policy expense chat whose member is only known to the Search snapshot, as on a Search surface
+        seedChat();
+        mockPersonalDetails = {};
+        mockOnyxData[ONYXKEYS.PERSONAL_DETAILS_LIST] = {
+            [OWNER_ACCOUNT_ID]: {accountID: OWNER_ACCOUNT_ID, login: OWNER_LOGIN, displayName: OWNER_DISPLAY_NAME, avatar: OWNER_AVATAR_URL},
+        };
+
+        // When it renders
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then the member is named and pictured from the snapshot, like the legacy component, instead of falling back to "Hidden"
+        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(OWNER_ICON);
+    });
+
+    it('should fall back to the unknown account as the primary avatar for a chat without a policyID', () => {
+        // Given a policy expense chat that carries no policyID, so there is no workspace to show
+        seedChat({policyID: undefined});
+
+        // When it renders
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then the member is still the subscript, under the generic fallback avatar rather than an unavailable workspace icon, as in the legacy component
+        expect(screen.getByTestId('MockedSubscriptAvatar')).toBeOnTheScreen();
+        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toEqual(PLACEHOLDER_ICON);
+        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(OWNER_ICON);
+    });
+
+    it.each([
+        ['no member and the given container style', undefined, CONTAINER_STYLE, CONTAINER_STYLE],
+        ['no member and the size-derived container styles', undefined, undefined, [{marginRight: 12, size: CONST.AVATAR_SIZE.DEFAULT}]],
+        ['the unknown member and the given container style', CONST.DEFAULT_NUMBER_ID, CONTAINER_STYLE, CONTAINER_STYLE],
+        ['the unknown member and the size-derived container styles', CONST.DEFAULT_NUMBER_ID, undefined, [{marginRight: 12, size: CONST.AVATAR_SIZE.DEFAULT}]],
+    ])('should render the workspace icon alone with %s', (_case, ownerAccountID, containerStyle, expectedContainerStyles) => {
+        // Given a policy expense chat without a member to nest as the subscript
+        seedChat({ownerAccountID});
+
+        // When it renders
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+                containerStyle={containerStyle}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        // Then the single layout gets the workspace icon, with the given container style replacing the size-derived one
+        expect(screen.getByTestId('MockedSingleAvatar')).toBeOnTheScreen();
+        expect(screen.queryByTestId('MockedSubscriptAvatar')).not.toBeOnTheScreen();
+        expect(mockCapturedSingleAvatarProps).toEqual({
+            avatar: WORKSPACE_ICON,
+            size: CONST.AVATAR_SIZE.DEFAULT,
+            containerStyles: expectedContainerStyles,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it.each([
+        ["the stack's defaults", true, {}],
+        ['the given stacking options', HORIZONTAL_STACKING, HORIZONTAL_STACKING],
+    ])('should stack the workspace icon and then the member horizontally with %s', (_case, horizontalStacking, expectedStackingOptions) => {
+        // Given a policy expense chat
+        seedChat();
+
+        // When it renders inside a horizontal stack without a sort
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.XXXX_LARGE}
+                horizontalStacking={horizontalStacking}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        // Then the horizontal layout gets the stacking options and the workspace icon leads the row
+        expect(screen.getByTestId('MockedHorizontalAvatars')).toBeOnTheScreen();
+        expect(screen.queryByTestId('MockedSubscriptAvatar')).not.toBeOnTheScreen();
+        expect(mockCapturedHorizontalAvatarsProps).toEqual({
+            ...expectedStackingOptions,
+            size: CONST.AVATAR_SIZE.XXXX_LARGE,
+            icons: [WORKSPACE_ICON, OWNER_ICON],
+            isInReportAction: false,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it('should apply the sort to a horizontal stack', () => {
+        // Given a policy expense chat
+        seedChat();
+
+        // When it renders inside a horizontal stack, reversed
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+                horizontalStacking
+                sort={CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE}
+            />,
+        );
+
+        // Then the member leads the row instead
+        expect(mockCapturedHorizontalAvatarsProps.icons).toEqual([OWNER_ICON, WORKSPACE_ICON]);
+    });
+
+    it('should still stack both avatars horizontally without a member', () => {
+        // Given a policy expense chat without a member
+        seedChat({ownerAccountID: undefined});
+
+        // When it renders inside a horizontal stack
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+                horizontalStacking
+            />,
+        );
+
+        // Then the stack keeps both slots, with the unknown account in the member's
+        expect(screen.getByTestId('MockedHorizontalAvatars')).toBeOnTheScreen();
+        expect(mockCapturedHorizontalAvatarsProps.icons).toEqual([WORKSPACE_ICON, PLACEHOLDER_ICON]);
+    });
+
+    it('should resolve the workspace icon from the fields carried on the chat while its policy row is missing', () => {
+        // Given a policy expense chat whose policy row has not loaded, but which carries the policy name and avatar itself
+        seedChat({policyName: REPORT_POLICY_NAME, policyAvatar: REPORT_POLICY_AVATAR_URL}, null);
+
+        // When it renders
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then the primary avatar is built from the carried fields
+        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toEqual({id: POLICY_ID, type: CONST.ICON_TYPE_WORKSPACE, source: REPORT_POLICY_AVATAR_URL, name: REPORT_POLICY_NAME});
+    });
+
+    it('should render the unknown account alone while the chat row has not loaded', () => {
+        // Given no chat row in Onyx
+        mockOnyxData = {};
+
+        // When it renders
+        renderWithPersonalDetails(
+            <PolicyExpenseChatAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        // Then there is neither a workspace nor a member, so the single layout gets the generic fallback avatar, as in the legacy component
+        expect(screen.getByTestId('MockedSingleAvatar')).toBeOnTheScreen();
+        expect(mockCapturedSingleAvatarProps.avatar).toEqual(PLACEHOLDER_ICON);
+    });
+});
diff --git a/tests/unit/components/Avatar/connected/ReportAvatarTest.tsx b/tests/unit/components/Avatar/connected/ReportAvatarTest.tsx
index e570545f8506..b59ed43a4fb0 100644
--- a/tests/unit/components/Avatar/connected/ReportAvatarTest.tsx
+++ b/tests/unit/components/Avatar/connected/ReportAvatarTest.tsx
@@ -30,8 +30,30 @@ let mockCapturedGroupChatAvatarProps: Record<string, unknown> = {};
 
 let mockCapturedExpenseReportAvatarProps: Record<string, unknown> = {};
 
+let mockCapturedChatThreadAvatarProps: Record<string, unknown> = {};
+
 let mockCapturedAccountAvatarProps: Record<string, unknown> = {};
 
+let mockCapturedPolicyExpenseChatAvatarProps: Record<string, unknown> = {};
+
+jest.mock('@components/Avatar/connected/PolicyExpenseChatAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedPolicyExpenseChatAvatarProps = props;
+        return <View testID="MockedPolicyExpenseChatAvatar" />;
+    };
+});
+
+jest.mock('@components/Avatar/connected/ChatThreadAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedChatThreadAvatarProps = props;
+        return <View testID="MockedChatThreadAvatar" />;
+    };
+});
+
 jest.mock('@components/Avatar/connected/AccountAvatar', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {View} = require('react-native');
@@ -69,7 +91,9 @@ describe('ReportAvatar (connected)', () => {
         mockCapturedFallbackProps = {};
         mockCapturedGroupChatAvatarProps = {};
         mockCapturedExpenseReportAvatarProps = {};
+        mockCapturedChatThreadAvatarProps = {};
         mockCapturedAccountAvatarProps = {};
+        mockCapturedPolicyExpenseChatAvatarProps = {};
     });
 
     afterEach(async () => {
@@ -83,9 +107,8 @@ describe('ReportAvatar (connected)', () => {
         ['an IOU report', {type: CONST.REPORT.TYPE.IOU}],
         ['a task report', {type: CONST.REPORT.TYPE.TASK}],
         ['an invoice report', {type: CONST.REPORT.TYPE.INVOICE}],
-        ['a chat thread', {type: CONST.REPORT.TYPE.CHAT, parentReportID: 'parent1', parentReportActionID: 'parentAction1'}],
-        ['a policy expense chat', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT}],
         ['a room', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM}],
+        ['a trip room without its parent fields', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM}],
         ['a DM', {type: CONST.REPORT.TYPE.CHAT}],
     ] as const)('should render the legacy component for %s until its wrapper exists', async (_case, reportOverrides) => {
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, ...reportOverrides});
@@ -152,6 +175,121 @@ describe('ReportAvatar (connected)', () => {
         expect(mockCapturedExpenseReportAvatarProps.containerStyle).toBeUndefined();
     });
 
+    it('should render ChatThreadAvatar for a chat thread with the layout container styles resolved', async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.CHAT, parentReportID: 'parent1', parentReportActionID: 'parentAction1'});
+        await waitForBatchedUpdatesWithAct();
+
+        const singleAvatarContainerStyle = [{marginRight: 12}];
+        const subscriptAvatarContainerStyle = [{marginRight: 0}];
+
+        render(
+            <ReportAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.SMALL}
+                singleAvatarContainerStyle={singleAvatarContainerStyle}
+                backdropColor="#ff0000"
+                subscriptAvatarContainerStyle={subscriptAvatarContainerStyle}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        expect(screen.getByTestId('MockedChatThreadAvatar')).toBeOnTheScreen();
+        expect(mockCapturedChatThreadAvatarProps).toEqual({
+            reportID: REPORT_ID,
+            size: CONST.AVATAR_SIZE.SMALL,
+            backdropColor: '#ff0000',
+            containerStyle: singleAvatarContainerStyle,
+            subscriptContainerStyle: subscriptAvatarContainerStyle,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it('should hand a chat thread the stacking props and drop its single container styles inside a horizontal stack', async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.CHAT, parentReportID: 'parent1', parentReportActionID: 'parentAction1'});
+        await waitForBatchedUpdatesWithAct();
+
+        render(
+            <ReportAvatar
+                reportID={REPORT_ID}
+                singleAvatarContainerStyle={[{marginRight: 12}]}
+                horizontalStacking={{maxRows: 2}}
+                sort={CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE}
+            />,
+        );
+
+        expect(mockCapturedChatThreadAvatarProps.containerStyle).toEqual([]);
+        expect(mockCapturedChatThreadAvatarProps.subscriptContainerStyle).toBeUndefined();
+        expect(mockCapturedChatThreadAvatarProps.horizontalStacking).toEqual({maxRows: 2});
+        expect(mockCapturedChatThreadAvatarProps.sort).toBe(CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE);
+    });
+
+    it('should render PolicyExpenseChatAvatar for a policy expense chat with the layout container styles resolved', async () => {
+        // Given a policy expense chat in Onyx
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT});
+        await waitForBatchedUpdatesWithAct();
+
+        const singleAvatarContainerStyle = [{marginRight: 12}];
+        const subscriptAvatarContainerStyle = [{marginRight: 0}];
+
+        // When the dispatcher renders it with every prop
+        render(
+            <ReportAvatar
+                reportID={REPORT_ID}
+                size={CONST.AVATAR_SIZE.SMALL}
+                singleAvatarContainerStyle={singleAvatarContainerStyle}
+                backdropColor="#ff0000"
+                subscriptAvatarContainerStyle={subscriptAvatarContainerStyle}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        // Then the wrapper gets each container style under its layout-specific name
+        expect(screen.getByTestId('MockedPolicyExpenseChatAvatar')).toBeOnTheScreen();
+        expect(mockCapturedPolicyExpenseChatAvatarProps).toEqual({
+            reportID: REPORT_ID,
+            size: CONST.AVATAR_SIZE.SMALL,
+            backdropColor: '#ff0000',
+            containerStyle: singleAvatarContainerStyle,
+            subscriptContainerStyle: subscriptAvatarContainerStyle,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it('should hand a policy expense chat the stacking props', async () => {
+        // Given a policy expense chat in Onyx
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT});
+        await waitForBatchedUpdatesWithAct();
+
+        // When the dispatcher renders it inside a horizontal stack
+        render(
+            <ReportAvatar
+                reportID={REPORT_ID}
+                horizontalStacking={{maxRows: 2}}
+                sort={CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE}
+            />,
+        );
+
+        // Then the wrapper gets the stacking options and the sort to apply to them
+        expect(mockCapturedPolicyExpenseChatAvatarProps.horizontalStacking).toEqual({maxRows: 2});
+        expect(mockCapturedPolicyExpenseChatAvatarProps.sort).toBe(CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE);
+    });
+
+    it('should render ChatThreadAvatar for a trip room, which is a thread of its trip preview', async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.CHAT,
+            chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM,
+            parentReportID: 'parent1',
+            parentReportActionID: 'parentAction1',
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        render(<ReportAvatar reportID={REPORT_ID} />);
+
+        expect(screen.getByTestId('MockedChatThreadAvatar')).toBeOnTheScreen();
+        expect(mockCapturedChatThreadAvatarProps.reportID).toBe(REPORT_ID);
+    });
+
     it('should render GroupChatAvatar for a group chat', async () => {
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportID: REPORT_ID, type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.GROUP});
         await waitForBatchedUpdatesWithAct();
diff --git a/tests/unit/components/Avatar/connected/WorkspaceHorizontalAvatarsTest.tsx b/tests/unit/components/Avatar/connected/WorkspaceHorizontalAvatarsTest.tsx
new file mode 100644
index 000000000000..7ee35a09a2a2
--- /dev/null
+++ b/tests/unit/components/Avatar/connected/WorkspaceHorizontalAvatarsTest.tsx
@@ -0,0 +1,139 @@
+import {cleanup, render, screen} from '@testing-library/react-native';
+
+import WorkspaceHorizontalAvatars from '@components/Avatar/connected/WorkspaceHorizontalAvatars';
+import {PersonalDetailsContext} from '@components/OnyxListItemProvider';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+
+import type {ReportAvatarFields} from '@selectors/Report';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdatesWithAct from '../../../../utils/waitForBatchedUpdatesWithAct';
+
+const PARENT_REPORT_ID = 'parentChat456';
+const POLICY_ID = 'policy123';
+const POLICY_NAME = 'Acme Workspace';
+const POLICY_AVATAR_URL = 'https://example.com/workspace-avatar.png';
+const FALLBACK_NAME = 'Fallback Name';
+const STACKING_OPTIONS = {isHovered: true, maxRows: 2, maxAvatarsPerRow: 8, overlapDivider: 4};
+
+const ACTOR_ACCOUNT_ID = 42;
+const PRIMARY_AVATAR: Icon = {id: ACTOR_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: 'https://example.com/actor-avatar.png', name: 'zoe@example.com'};
+const WORKSPACE_ICON = {id: POLICY_ID, type: CONST.ICON_TYPE_WORKSPACE, source: POLICY_AVATAR_URL, name: POLICY_NAME};
+
+const report: ReportAvatarFields = {parentReportID: PARENT_REPORT_ID, policyID: POLICY_ID};
+
+// Capture the props handed to the layout primitive, which is the whole contract of this component.
+let mockCapturedHorizontalAvatarsProps: Record<string, unknown> = {};
+
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        formatPhoneNumber: (phoneNumber: string) => phoneNumber,
+        translate: (key: string) => key,
+        localeCompare: (first: string, second: string) => first.localeCompare(second),
+    })),
+);
+
+const PERSONAL_DETAILS = {[ACTOR_ACCOUNT_ID]: {accountID: ACTOR_ACCOUNT_ID, login: 'zoe@example.com', displayName: 'Zoe'}};
+
+/** Renders inside the live personal details context, which a name sort reads. */
+const renderWithPersonalDetails = (ui: React.ReactElement) => render(<PersonalDetailsContext.Provider value={PERSONAL_DETAILS}>{ui}</PersonalDetailsContext.Provider>);
+
+jest.mock('@components/Avatar/layouts/HorizontalAvatars', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedHorizontalAvatarsProps = props;
+        return <View testID="MockedHorizontalAvatars" />;
+    };
+});
+
+describe('WorkspaceHorizontalAvatars (connected)', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        mockCapturedHorizontalAvatarsProps = {};
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, avatarURL: POLICY_AVATAR_URL});
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    afterEach(async () => {
+        // Unmount before clearing so the store updates from the clear don't reach a mounted component outside act().
+        cleanup();
+        await Onyx.clear();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should render the primary avatar and the workspace icon side by side with the stacking options spread', async () => {
+        renderWithPersonalDetails(
+            <WorkspaceHorizontalAvatars
+                report={report}
+                primaryAvatar={PRIMARY_AVATAR}
+                size={CONST.AVATAR_SIZE.XXXX_LARGE}
+                horizontalStacking={STACKING_OPTIONS}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+        // useOnyx delivers its initial value asynchronously, so flush it inside act() before asserting.
+        await waitForBatchedUpdatesWithAct();
+
+        expect(screen.getByTestId('MockedHorizontalAvatars')).toBeOnTheScreen();
+        expect(mockCapturedHorizontalAvatarsProps).toEqual({
+            ...STACKING_OPTIONS,
+            size: CONST.AVATAR_SIZE.XXXX_LARGE,
+            icons: [PRIMARY_AVATAR, WORKSPACE_ICON],
+            isInReportAction: false,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it("should take the stack's defaults when stacking is requested with `true`", async () => {
+        renderWithPersonalDetails(
+            <WorkspaceHorizontalAvatars
+                report={report}
+                primaryAvatar={PRIMARY_AVATAR}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+                horizontalStacking
+            />,
+        );
+        // useOnyx delivers its initial value asynchronously, so flush it inside act() before asserting.
+        await waitForBatchedUpdatesWithAct();
+
+        expect(mockCapturedHorizontalAvatarsProps).toEqual({
+            isHovered: false,
+            size: CONST.AVATAR_SIZE.DEFAULT,
+            icons: [PRIMARY_AVATAR, WORKSPACE_ICON],
+            isInReportAction: false,
+            fallbackDisplayName: undefined,
+        });
+    });
+
+    it.each([
+        ['the given order without a sort', undefined, [PRIMARY_AVATAR, WORKSPACE_ICON]],
+        ['reversed', CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE, [WORKSPACE_ICON, PRIMARY_AVATAR]],
+        // The workspace icon has no personal details to name it, so its empty name sorts first.
+        ['by name', CONST.REPORT_ACTION_AVATARS.SORT_BY.NAME, [WORKSPACE_ICON, PRIMARY_AVATAR]],
+        ['by name and then reversed', [CONST.REPORT_ACTION_AVATARS.SORT_BY.NAME, CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE], [PRIMARY_AVATAR, WORKSPACE_ICON]],
+    ])('should order the avatars %s', async (_case, sort, expectedIcons) => {
+        renderWithPersonalDetails(
+            <WorkspaceHorizontalAvatars
+                report={report}
+                primaryAvatar={PRIMARY_AVATAR}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+                horizontalStacking
+                sort={sort}
+            />,
+        );
+        // useOnyx delivers its initial value asynchronously, so flush it inside act() before asserting.
+        await waitForBatchedUpdatesWithAct();
+
+        expect(mockCapturedHorizontalAvatarsProps.icons).toEqual(expectedIcons);
+    });
+});
diff --git a/tests/unit/components/Avatar/connected/WorkspaceSubscriptAvatarTest.tsx b/tests/unit/components/Avatar/connected/WorkspaceSubscriptAvatarTest.tsx
new file mode 100644
index 000000000000..b4f05e7e98fb
--- /dev/null
+++ b/tests/unit/components/Avatar/connected/WorkspaceSubscriptAvatarTest.tsx
@@ -0,0 +1,231 @@
+import {render, screen} from '@testing-library/react-native';
+
+import WorkspaceSubscriptAvatar from '@components/Avatar/connected/WorkspaceSubscriptAvatar';
+
+import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+
+import type {ReportAvatarFields} from '@selectors/Report';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdatesWithAct from '../../../../utils/waitForBatchedUpdatesWithAct';
+
+const PARENT_REPORT_ID = 'parentChat456';
+const POLICY_ID = 'policy123';
+const POLICY_NAME = 'Acme Workspace';
+const POLICY_AVATAR_URL = 'https://example.com/workspace-avatar.png';
+const REPORT_POLICY_AVATAR_URL = 'https://example.com/report-policy-avatar.png';
+const PARENT_POLICY_AVATAR_URL = 'https://example.com/parent-policy-avatar.png';
+const FALLBACK_NAME = 'Fallback Name';
+const CONTAINER_STYLE = {marginRight: 0};
+const UNAVAILABLE_WORKSPACE_NAME_KEY = 'workspace.common.unavailable';
+
+const PRIMARY_AVATAR: Icon = {id: 42, type: CONST.ICON_TYPE_AVATAR, source: 'https://example.com/actor-avatar.png', name: 'john@example.com'};
+
+const createReportFields = (overrides: Partial<ReportAvatarFields> = {}): ReportAvatarFields => ({
+    parentReportID: PARENT_REPORT_ID,
+    policyID: POLICY_ID,
+    ...overrides,
+});
+
+// Capture the props handed to the layout primitive, which is the whole contract of this component.
+let mockCapturedSubscriptAvatarProps: Record<string, unknown> = {};
+
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        formatPhoneNumber: (phoneNumber: string) => phoneNumber,
+        translate: (key: string) => key,
+    })),
+);
+
+jest.mock('@components/Avatar/layouts/SubscriptAvatar', () => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const {View} = require('react-native');
+    return (props: Record<string, unknown>) => {
+        mockCapturedSubscriptAvatarProps = props;
+        return <View testID="MockedSubscriptAvatar" />;
+    };
+});
+
+describe('WorkspaceSubscriptAvatar (connected)', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockCapturedSubscriptAvatarProps = {};
+    });
+
+    afterEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('should render the given primary avatar with the workspace icon as the subscript', async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, avatarURL: POLICY_AVATAR_URL});
+        await waitForBatchedUpdatesWithAct();
+
+        render(
+            <WorkspaceSubscriptAvatar
+                report={createReportFields()}
+                primaryAvatar={PRIMARY_AVATAR}
+                size={CONST.AVATAR_SIZE.SMALL}
+                backdropColor="#ff0000"
+                containerStyle={CONTAINER_STYLE}
+                fallbackDisplayName={FALLBACK_NAME}
+            />,
+        );
+
+        expect(screen.getByTestId('MockedSubscriptAvatar')).toBeOnTheScreen();
+        expect(mockCapturedSubscriptAvatarProps).toEqual({
+            primaryAvatar: PRIMARY_AVATAR,
+            secondaryAvatar: {id: POLICY_ID, type: CONST.ICON_TYPE_WORKSPACE, source: POLICY_AVATAR_URL, name: POLICY_NAME},
+            size: CONST.AVATAR_SIZE.SMALL,
+            backdropColor: '#ff0000',
+            containerStyle: CONTAINER_STYLE,
+            fallbackDisplayName: FALLBACK_NAME,
+        });
+    });
+
+    it.each([
+        ['the uploaded workspace avatar when the policy has one', {policy: {avatarURL: POLICY_AVATAR_URL}}, POLICY_AVATAR_URL],
+        // A workspace with no uploaded avatar stores an empty string, which has to fall through to the default avatar.
+        ['the default workspace avatar when avatarURL is an empty string', {policy: {avatarURL: ''}}, getDefaultWorkspaceAvatar(POLICY_NAME)],
+        // The report-carried `policyAvatar` only applies while the policy row is entirely absent.
+        ["the report's policyAvatar when the policy row is missing", {reportPolicyAvatar: REPORT_POLICY_AVATAR_URL}, REPORT_POLICY_AVATAR_URL],
+        ["the parent chat's policyAvatar when the report carries none either", {parentChatPolicyAvatar: PARENT_POLICY_AVATAR_URL}, PARENT_POLICY_AVATAR_URL],
+        // A report-carried '' means "no uploaded avatar" and must fall through to the parent chat's avatar, not shadow it.
+        [
+            "the parent chat's policyAvatar when the report's policyAvatar is an empty string",
+            {reportPolicyAvatar: '', parentChatPolicyAvatar: PARENT_POLICY_AVATAR_URL},
+            PARENT_POLICY_AVATAR_URL,
+        ],
+    ])(
+        'should resolve %s as the subscript source',
+        async (
+            _case,
+            {
+                policy,
+                reportPolicyAvatar,
+                parentChatPolicyAvatar,
+            }: {
+                policy?: {avatarURL: string};
+                reportPolicyAvatar?: string;
+                parentChatPolicyAvatar?: string;
+            },
+            expectedSource,
+        ) => {
+            if (policy) {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, ...policy});
+            }
+            if (parentChatPolicyAvatar) {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`, {reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, policyAvatar: parentChatPolicyAvatar});
+            }
+            await waitForBatchedUpdatesWithAct();
+
+            render(
+                <WorkspaceSubscriptAvatar
+                    report={createReportFields({policyName: POLICY_NAME, policyAvatar: reportPolicyAvatar})}
+                    primaryAvatar={PRIMARY_AVATAR}
+                    size={CONST.AVATAR_SIZE.DEFAULT}
+                />,
+            );
+
+            expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({source: expectedSource}));
+        },
+    );
+
+    it.each([
+        ['the policy name', {policy: {name: POLICY_NAME}, report: {policyName: 'Report Policy Name'}}, POLICY_NAME],
+        ["the report's policyName when the policy row is missing", {report: {policyName: 'Report Policy Name', oldPolicyName: 'Old Policy Name'}}, 'Report Policy Name'],
+        ["the report's oldPolicyName when there is no policyName", {report: {oldPolicyName: 'Old Policy Name'}}, 'Old Policy Name'],
+        ["the parent chat's policyName when the report has neither", {parentChat: {policyName: 'Parent Policy Name', oldPolicyName: 'Parent Old Name'}}, 'Parent Policy Name'],
+        ["the parent chat's oldPolicyName as the next fallback", {parentChat: {oldPolicyName: 'Parent Old Name'}}, 'Parent Old Name'],
+        ['the unavailable-workspace translation when nothing resolves', {}, UNAVAILABLE_WORKSPACE_NAME_KEY],
+    ])(
+        'should name the workspace icon after %s',
+        async (
+            _case,
+            {
+                policy,
+                report,
+                parentChat,
+            }: {
+                policy?: {name: string};
+                report?: Partial<ReportAvatarFields>;
+                parentChat?: Partial<Report>;
+            },
+            expectedName,
+        ) => {
+            if (policy) {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, ...policy});
+            }
+            if (parentChat) {
+                await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`, {reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, ...parentChat});
+            }
+            await waitForBatchedUpdatesWithAct();
+
+            render(
+                <WorkspaceSubscriptAvatar
+                    report={createReportFields(report)}
+                    primaryAvatar={PRIMARY_AVATAR}
+                    size={CONST.AVATAR_SIZE.DEFAULT}
+                />,
+            );
+
+            expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({name: expectedName}));
+        },
+    );
+
+    it('should reach the policy row through the workspace chat when the report has no policyID', async () => {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${PARENT_REPORT_ID}`, {reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.CHAT, policyID: POLICY_ID});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {id: POLICY_ID, name: POLICY_NAME, avatarURL: POLICY_AVATAR_URL});
+        await waitForBatchedUpdatesWithAct();
+
+        render(
+            <WorkspaceSubscriptAvatar
+                report={createReportFields({policyID: undefined})}
+                primaryAvatar={PRIMARY_AVATAR}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({id: POLICY_ID, name: POLICY_NAME, source: POLICY_AVATAR_URL}));
+    });
+
+    it('should resolve the workspace chat through chatReportID when parentReportID is absent', async () => {
+        const chatReportID = 'workspaceChat789';
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, {reportID: chatReportID, type: CONST.REPORT.TYPE.CHAT, policyName: 'Chat Policy Name'});
+        await waitForBatchedUpdatesWithAct();
+
+        render(
+            <WorkspaceSubscriptAvatar
+                report={createReportFields({parentReportID: undefined, chatReportID})}
+                primaryAvatar={PRIMARY_AVATAR}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({name: 'Chat Policy Name'}));
+    });
+
+    it('should still render the subscript while the report row has not loaded', () => {
+        render(
+            <WorkspaceSubscriptAvatar
+                report={undefined}
+                primaryAvatar={PRIMARY_AVATAR}
+                size={CONST.AVATAR_SIZE.DEFAULT}
+            />,
+        );
+
+        expect(mockCapturedSubscriptAvatarProps.primaryAvatar).toBe(PRIMARY_AVATAR);
+        expect(mockCapturedSubscriptAvatarProps.secondaryAvatar).toEqual(expect.objectContaining({type: CONST.ICON_TYPE_WORKSPACE, name: UNAVAILABLE_WORKSPACE_NAME_KEY}));
+    });
+});
diff --git a/tests/unit/components/Avatar/connected/useAccountIconsTest.ts b/tests/unit/components/Avatar/connected/useAccountIconsTest.ts
index 41984067f844..23d8d2ac8f8a 100644
--- a/tests/unit/components/Avatar/connected/useAccountIconsTest.ts
+++ b/tests/unit/components/Avatar/connected/useAccountIconsTest.ts
@@ -1,6 +1,8 @@
 import {renderHook} from '@testing-library/react-native';
 
-import useAccountIcons from '@components/Avatar/connected/useAccountIcons';
+import useAccountIcons, {useSeededAccountIcons} from '@components/Avatar/connected/useAccountIcons';
+
+import {getDefaultAvatarURL} from '@libs/UserAvatarUtils';
 
 import CONST from '@src/CONST';
 import type {PersonalDetailsList} from '@src/types/onyx';
@@ -92,3 +94,21 @@ describe('useAccountIcons', () => {
         expect(result.current).toEqual([]);
     });
 });
+
+describe('useSeededAccountIcons', () => {
+    beforeEach(() => {
+        mockPersonalDetails = {
+            [ACCOUNT_ID]: {accountID: ACCOUNT_ID, login: LOGIN, avatar: AVATAR_URL},
+        };
+    });
+
+    it.each([
+        ['keep the uploaded avatar for an account with personal details', ACCOUNT_ID, AVATAR_URL],
+        ['seed the default avatar from the account ID for an account with no personal details', OTHER_ACCOUNT_ID, getDefaultAvatarURL({accountID: OTHER_ACCOUNT_ID})],
+        ['keep the generic fallback for the unknown account', CONST.DEFAULT_NUMBER_ID, MockFallbackAvatar],
+    ])('should %s', (_case, accountID, expectedSource) => {
+        const {result} = renderHook(() => useSeededAccountIcons([accountID]));
+
+        expect(result.current).toEqual([expect.objectContaining({id: accountID, source: expectedSource})]);
+    });
+});
diff --git a/tests/unit/components/Avatar/connected/useSortedIconsTest.ts b/tests/unit/components/Avatar/connected/useSortedIconsTest.ts
new file mode 100644
index 000000000000..a1e382182406
--- /dev/null
+++ b/tests/unit/components/Avatar/connected/useSortedIconsTest.ts
@@ -0,0 +1,81 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useSortedIcons from '@components/Avatar/connected/useSortedIcons';
+import {PersonalDetailsContext} from '@components/OnyxListItemProvider';
+
+import CONST from '@src/CONST';
+import type {PersonalDetailsList} from '@src/types/onyx';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+
+import type {PropsWithChildren} from 'react';
+
+import React from 'react';
+
+const ZOE_ACCOUNT_ID = 42;
+const ADAM_ACCOUNT_ID = 7;
+const POLICY_ID = 'policy123';
+
+// Icons carry their own displayName, as the ones built by useAccountIcons do
+const ZOE_ICON: Icon = {id: ZOE_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: 'https://example.com/zoe.png', name: 'zoe@example.com', displayName: 'Zoe'};
+const ADAM_ICON: Icon = {id: ADAM_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: 'https://example.com/adam.png', name: 'adam@example.com', displayName: 'Adam'};
+// A workspace icon has no displayName and no personal details, so its empty name sorts first
+const WORKSPACE_ICON: Icon = {id: POLICY_ID, type: CONST.ICON_TYPE_WORKSPACE, source: 'https://example.com/workspace.png', name: 'Acme Workspace'};
+// An account icon without a displayName is named through personal details
+const UNNAMED_ZOE_ICON: Icon = {id: ZOE_ACCOUNT_ID, type: CONST.ICON_TYPE_AVATAR, source: 'https://example.com/zoe.png', name: ''};
+
+const ICONS = [ZOE_ICON, ADAM_ICON, WORKSPACE_ICON];
+
+let mockPersonalDetails: PersonalDetailsList = {};
+
+jest.mock('@hooks/useLocalize', () =>
+    jest.fn(() => ({
+        localeCompare: (first: string, second: string) => first.localeCompare(second),
+    })),
+);
+
+/** Provides the live personal details context, which the hook reads for a name sort. */
+function PersonalDetailsWrapper({children}: PropsWithChildren) {
+    return React.createElement(PersonalDetailsContext.Provider, {value: mockPersonalDetails}, children);
+}
+
+describe('useSortedIcons', () => {
+    beforeEach(() => {
+        mockPersonalDetails = {};
+    });
+
+    it('should keep the given order without a sort', () => {
+        // Given icons in an arbitrary order and no sort
+        // When the hook resolves the order
+        const {result} = renderHook(() => useSortedIcons(ICONS, undefined), {wrapper: PersonalDetailsWrapper});
+
+        // Then the icons are returned untouched, so a caller can rely on its own order
+        expect(result.current).toBe(ICONS);
+    });
+
+    it.each([
+        ['by name', CONST.REPORT_ACTION_AVATARS.SORT_BY.NAME, [WORKSPACE_ICON, ADAM_ICON, ZOE_ICON]],
+        ['by ID', CONST.REPORT_ACTION_AVATARS.SORT_BY.ID, [ADAM_ICON, ZOE_ICON, WORKSPACE_ICON]],
+        ['reversed', CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE, [WORKSPACE_ICON, ADAM_ICON, ZOE_ICON]],
+        ['by name and then reversed', [CONST.REPORT_ACTION_AVATARS.SORT_BY.NAME, CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE], [ZOE_ICON, ADAM_ICON, WORKSPACE_ICON]],
+        ['by ID and then reversed', [CONST.REPORT_ACTION_AVATARS.SORT_BY.ID, CONST.REPORT_ACTION_AVATARS.SORT_BY.REVERSE], [WORKSPACE_ICON, ZOE_ICON, ADAM_ICON]],
+    ])('should order the icons %s', (_case, sort, expectedIcons) => {
+        // Given icons in an arbitrary order and a sort
+        // When the hook resolves the order
+        const {result} = renderHook(() => useSortedIcons(ICONS, sort), {wrapper: PersonalDetailsWrapper});
+
+        // Then the icons come back in the requested order, and the given array is left as it was
+        expect(result.current).toEqual(expectedIcons);
+        expect(ICONS).toEqual([ZOE_ICON, ADAM_ICON, WORKSPACE_ICON]);
+    });
+
+    it('should name an icon without a displayName through personal details when sorting by name', () => {
+        // Given an account icon that carries no displayName, whose personal details are loaded
+        mockPersonalDetails = {[ZOE_ACCOUNT_ID]: {accountID: ZOE_ACCOUNT_ID, displayName: 'Zoe'}};
+
+        // When the icons are sorted by name
+        const {result} = renderHook(() => useSortedIcons([UNNAMED_ZOE_ICON, ADAM_ICON], CONST.REPORT_ACTION_AVATARS.SORT_BY.NAME), {wrapper: PersonalDetailsWrapper});
+
+        // Then the icon sorts by the personal-details name rather than its empty name
+        expect(result.current).toEqual([ADAM_ICON, UNNAMED_ZOE_ICON]);
+    });
+});
diff --git a/tests/unit/components/Charts/LoadSkiaWeb.test.ts b/tests/unit/components/Charts/LoadSkiaWeb.test.ts
new file mode 100644
index 000000000000..3d61ea3f5775
--- /dev/null
+++ b/tests/unit/components/Charts/LoadSkiaWeb.test.ts
@@ -0,0 +1,99 @@
+/**
+ * Covers patches/@shopify/react-native-skia/@shopify+react-native-skia+2.11.2+005+load-skia-web-fail-closed.patch.
+ * `LoadSkiaWeb` must refuse a CanvasKit that initialized without its bindings (glue and wasm from different releases,
+ * https://github.com/Expensify/App/issues/102042) and must not cache a failed init for the rest of the session.
+ */
+import type {LoadSkiaWeb as LoadSkiaWebFn} from '@shopify/react-native-skia/lib/module/web/LoadSkiaWeb';
+
+// Stands in for canvaskit-wasm's default export (`CanvasKitInit`). Typed loosely on purpose: the tests hand back
+// deliberately malformed modules that the real `CanvasKit` type would reject.
+const mockCanvasKitInit = jest.fn<Promise<unknown>, [unknown]>();
+
+// Each test needs a fresh module so the module-level `ckSharedPromise` starts out empty.
+async function importLoadSkiaWeb(): Promise<typeof LoadSkiaWebFn> {
+    jest.resetModules();
+    jest.doMock('canvaskit-wasm/bin/full/canvaskit', () => mockCanvasKitInit);
+    const {LoadSkiaWeb} = await import('@shopify/react-native-skia/lib/module/web/LoadSkiaWeb');
+    return LoadSkiaWeb;
+}
+
+// A CanvasKit that finished initializing registers its classes (PictureRecorder, Paint, ...) as constructors;
+// the patched loader only checks `typeof`, so plain functions are enough here.
+const usableCanvasKit = {PictureRecorder: () => {}, Paint: () => {}};
+
+// Old glue linked against a newer binary resolves an object carrying only the glue's own JS helpers.
+const canvasKitWithoutBindings = {Color: () => 0, Malloc: () => 0};
+
+describe('LoadSkiaWeb', () => {
+    afterEach(() => {
+        delete (globalThis as {CanvasKit?: unknown}).CanvasKit;
+        jest.clearAllMocks();
+    });
+
+    it('should publish CanvasKit globally once it initializes with its bindings', async () => {
+        // Given CanvasKit initializes normally
+        mockCanvasKitInit.mockResolvedValue(usableCanvasKit);
+        const LoadSkiaWeb = await importLoadSkiaWeb();
+
+        // When Skia is loaded
+        await LoadSkiaWeb({});
+
+        // Then the module is stored where Skia.web.ts picks it up
+        expect(globalThis.CanvasKit).toBe(usableCanvasKit);
+    });
+
+    it('should reject and keep the global unset when CanvasKit initializes without its bindings', async () => {
+        // Given the glue linked against a mismatched binary, so init resolves but no classes were registered
+        mockCanvasKitInit.mockResolvedValue(canvasKitWithoutBindings);
+        const LoadSkiaWeb = await importLoadSkiaWeb();
+
+        // When Skia is loaded
+        const result = LoadSkiaWeb({});
+
+        // Then the load fails at this point, where WithSkiaWeb's lazy() surfaces it to the chart's error boundary,
+        // rather than publishing a module whose first `new CanvasKit.PictureRecorder()` would throw from a worklet
+        await expect(result).rejects.toThrow('CanvasKit initialized without its bindings');
+        expect(globalThis.CanvasKit).toBeUndefined();
+    });
+
+    it('should retry initialization on the next load after a failed check instead of caching the failure', async () => {
+        // Given the first init produced a CanvasKit without bindings
+        mockCanvasKitInit.mockResolvedValueOnce(canvasKitWithoutBindings).mockResolvedValueOnce(usableCanvasKit);
+        const LoadSkiaWeb = await importLoadSkiaWeb();
+        await expect(LoadSkiaWeb({})).rejects.toThrow();
+
+        // When another chart mounts and loads Skia again
+        await LoadSkiaWeb({});
+
+        // Then CanvasKit is initialized afresh (e.g. after the stale binary was evicted) and published
+        expect(mockCanvasKitInit).toHaveBeenCalledTimes(2);
+        expect(globalThis.CanvasKit).toBe(usableCanvasKit);
+    });
+
+    it('should retry initialization on the next load after the init itself rejected', async () => {
+        // Given the first init rejected, as it does on a LinkError or a failed wasm download
+        const linkError = new Error('Aborted(LinkError: WebAssembly.instantiate(): Import #238 "a" "wd": function import requires a callable)');
+        mockCanvasKitInit.mockRejectedValueOnce(linkError).mockResolvedValueOnce(usableCanvasKit);
+        const LoadSkiaWeb = await importLoadSkiaWeb();
+        await expect(LoadSkiaWeb({})).rejects.toBe(linkError);
+
+        // When another chart mounts and loads Skia again
+        await LoadSkiaWeb({});
+
+        // Then the rejection was not cached and the second attempt succeeds
+        expect(mockCanvasKitInit).toHaveBeenCalledTimes(2);
+        expect(globalThis.CanvasKit).toBe(usableCanvasKit);
+    });
+
+    it('should not initialize again once CanvasKit is already available', async () => {
+        // Given CanvasKit was already published by an earlier load
+        (globalThis as {CanvasKit?: unknown}).CanvasKit = usableCanvasKit;
+        const LoadSkiaWeb = await importLoadSkiaWeb();
+
+        // When Skia is loaded again
+        await LoadSkiaWeb({});
+
+        // Then the existing module is reused
+        expect(mockCanvasKitInit).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/components/Charts/SkiaWebChart.test.tsx b/tests/unit/components/Charts/SkiaWebChart.test.tsx
index 4b93cbb946c0..6cfc76811445 100644
--- a/tests/unit/components/Charts/SkiaWebChart.test.tsx
+++ b/tests/unit/components/Charts/SkiaWebChart.test.tsx
@@ -3,6 +3,7 @@ import {render, screen} from '@testing-library/react-native';
 import SkiaWebChart from '@components/Charts/SkiaWebChart';
 import isSkiaWebSupported from '@components/Charts/SkiaWebChart/isSkiaWebSupported';
 
+import * as Sentry from '@sentry/react-native';
 import {WithSkiaWeb} from '@shopify/react-native-skia/lib/module/web';
 import React from 'react';
 
@@ -10,6 +11,10 @@ jest.mock('@components/Charts/SkiaWebChart/isSkiaWebSupported', () => jest.fn())
 
 jest.mock('@shopify/react-native-skia/lib/module/web', () => ({WithSkiaWeb: jest.fn(() => null)}));
 
+jest.mock('@sentry/react-native', () => ({captureException: jest.fn()}));
+
+jest.mock('@libs/Log', () => ({warn: jest.fn()}));
+
 // Every style lookup returns an empty object so the real Text/View render without a ThemeProvider.
 jest.mock('@hooks/useThemeStyles', () => jest.fn(() => new Proxy({}, {get: () => ({})})));
 
@@ -24,6 +29,7 @@ jest.mock('@components/Icon', () => ({
 
 const mockIsSkiaWebSupported = jest.mocked(isSkiaWebSupported);
 const mockWithSkiaWeb = jest.mocked(WithSkiaWeb);
+const mockCaptureException = jest.mocked(Sentry.captureException);
 
 describe('SkiaWebChart', () => {
     const getComponent = () => Promise.resolve({default: () => null});
@@ -59,4 +65,55 @@ describe('SkiaWebChart', () => {
 
         expect(mockWithSkiaWeb).toHaveBeenCalled();
     });
+
+    it('should point CanvasKit at the versioned wasm URL emitted by the build', () => {
+        // Given a browser that supports WebGL
+        mockIsSkiaWebSupported.mockReturnValue(true);
+
+        // When the chart mounts Skia
+        render(
+            <SkiaWebChart
+                getComponent={getComponent}
+                componentProps={{}}
+            />,
+        );
+
+        // Then the glue is told to fetch `canvaskit.wasm` from the build-time `__CANVASKIT_WASM_URL__` define rather
+        // than the unversioned `/canvaskit.wasm`, so this bundle's glue can never be paired with another release's
+        // binary (https://github.com/Expensify/App/issues/102042). Any other file keeps its root-relative default.
+        const opts = mockWithSkiaWeb.mock.calls.at(0)?.[0].opts;
+        expect(opts?.locateFile?.('canvaskit.wasm')).toBe(__CANVASKIT_WASM_URL__);
+        expect(opts?.locateFile?.('canvaskit.wasm')).not.toBe('/canvaskit.wasm');
+        expect(opts?.locateFile?.('other.bin')).toBe('/other.bin');
+    });
+
+    it('should degrade to the failed-to-load empty state and report a warning when CanvasKit fails to load', () => {
+        // Given a browser that supports WebGL but where CanvasKit throws while loading, as it does when the
+        // glue and wasm binary are from different releases or the 8 MB download fails
+        mockIsSkiaWebSupported.mockReturnValue(true);
+        const loadError = new Error('CanvasKit initialized without its bindings');
+        mockWithSkiaWeb.mockImplementation(() => {
+            throw loadError;
+        });
+        // React logs caught render errors to console.error. Mock it to keep the test output clean.
+        const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+        // When the chart mounts
+        render(
+            <SkiaWebChart
+                getComponent={getComponent}
+                componentProps={{}}
+            />,
+        );
+
+        // Then the error boundary shows the "unable to display chart" state with the load-failure explanation
+        // instead of the WebGL one, and the failure is reported to Sentry as a handled warning under a single
+        // fingerprint so it stays visible without becoming a crash
+        expect(screen.getByText('common.unableToDisplayChart')).toBeTruthy();
+        expect(screen.getByText('common.chartFailedToLoad')).toBeTruthy();
+        expect(screen.queryByText('common.webGLNotSupported')).toBeNull();
+        expect(mockCaptureException).toHaveBeenCalledWith(loadError, expect.objectContaining({level: 'warning', fingerprint: ['skia-web-chart-load-failure']}));
+
+        consoleErrorSpy.mockRestore();
+    });
 });
diff --git a/tests/unit/components/Charts/useChartLabelFormats.test.ts b/tests/unit/components/Charts/useChartLabelFormats.test.ts
index 65d4af89b36e..781fb0b6ccc9 100644
--- a/tests/unit/components/Charts/useChartLabelFormats.test.ts
+++ b/tests/unit/components/Charts/useChartLabelFormats.test.ts
@@ -3,7 +3,7 @@ import {renderHook} from '@testing-library/react-native';
 import useChartLabelFormats from '@components/Charts/hooks/useChartLabelFormats';
 import type {ChartDataPoint, UnitPosition, UnitWithFallback} from '@components/Charts/types';
 
-let mockNumberFormat = (n: number) => n.toLocaleString('en-US');
+let mockNumberFormat = (n: number, options?: Intl.NumberFormatOptions) => n.toLocaleString('en-US', options);
 
 jest.mock('@hooks/useLocalize', () =>
     jest.fn(() => ({
@@ -17,7 +17,7 @@ const SAMPLE_DATA: ChartDataPoint[] = [
 ];
 
 beforeEach(() => {
-    mockNumberFormat = (n: number) => n.toLocaleString('en-US');
+    mockNumberFormat = (n: number, options?: Intl.NumberFormatOptions) => n.toLocaleString('en-US', options);
 });
 
 describe('useChartLabelFormats', () => {
@@ -38,6 +38,17 @@ describe('useChartLabelFormats', () => {
         rerender({unit: {value: '€', fallback: 'EUR'}, position: 'right'});
         expect(result.current.formatValue(1000)).toBe('1.000€');
     });
+
+    it('abbreviates axis values while keeping the unit', () => {
+        // Given a currency unit on the left
+        const {result} = renderHook(() => useChartLabelFormats({data: SAMPLE_DATA, unit: {value: 'zł', fallback: 'PLN'}, unitPosition: 'left'}));
+
+        // When formatting axis ticks compactly
+        const formatted = [100000, 1500000].map(result.current.formatCompactValue);
+
+        // Then the numbers are abbreviated with a lowercase k so axis labels stay short, and the multi-char unit keeps its separator
+        expect(formatted).toEqual(['zł 100k', 'zł 1.5M']);
+    });
 });
 
 describe('formatLabel', () => {
diff --git a/tests/unit/components/Charts/useChartLabelLayout.test.ts b/tests/unit/components/Charts/useChartLabelLayout.test.ts
index 45621dfa7f10..440d603db82f 100644
--- a/tests/unit/components/Charts/useChartLabelLayout.test.ts
+++ b/tests/unit/components/Charts/useChartLabelLayout.test.ts
@@ -116,6 +116,35 @@ describe('useChartLabelLayout', () => {
         });
     });
 
+    describe('horizontal bar fallback signal', () => {
+        // The hook no longer owns the fallback decision. It exposes only the rotation, and bar-chart callers
+        // treat a 90° result as the signal to switch to horizontal bars. These assert the rotation contract callers rely on.
+
+        it('reports 90° when labels overflow at every rotation, the signal to fall back to horizontal bars', () => {
+            // Given labels that overflow at 0° (46>20) and 45° (33.7>20)
+            // When laying out the labels
+            // Then the rotation stays 90°, which bar-chart callers read as "switch to horizontal bars"
+            const {result} = renderLayout({data: makeData('AAAAAA', 'BBBBBB'), fontManager: mockFontMgr, fontSize: FONT_SIZE, tickSpacing: 20, labelAreaWidth: 400});
+            expect(result.current.labelRotation).toBe(90);
+        });
+
+        it('reports 0° when labels fit horizontally, so callers keep vertical bars', () => {
+            // Given labels that fit at 0°
+            // When laying out the labels
+            // Then the rotation is 0° and no fallback is signaled
+            const {result} = renderLayout({data: makeData('AAA', 'BBB', 'CCC'), fontManager: mockFontMgr, fontSize: FONT_SIZE, tickSpacing: 30, labelAreaWidth: 90});
+            expect(result.current.labelRotation).toBe(0);
+        });
+
+        it('reports 45° when labels fit diagonally, so callers keep vertical bars', () => {
+            // Given labels that overflow at 0° but fit at 45°
+            // When laying out the labels
+            // Then the rotation is 45° and no fallback is signaled
+            const {result} = renderLayout({data: makeData('AAAAAA', 'BBBBBB'), fontManager: mockFontMgr, fontSize: FONT_SIZE, tickSpacing: 40, labelAreaWidth: 400});
+            expect(result.current.labelRotation).toBe(45);
+        });
+    });
+
     describe('backward compatibility', () => {
         it('produces identical result whether edge params are omitted or set to Infinity', () => {
             const config = {data: makeData('AAAAAA', 'BBBBBB'), fontManager: mockFontMgr, fontSize: FONT_SIZE, tickSpacing: 40, labelAreaWidth: 400};
diff --git a/tests/unit/components/Charts/utils.test.ts b/tests/unit/components/Charts/utils.test.ts
index c49b3a045dd4..5f13f735064a 100644
--- a/tests/unit/components/Charts/utils.test.ts
+++ b/tests/unit/components/Charts/utils.test.ts
@@ -7,7 +7,10 @@ import {
     effectiveWidth,
     findSliceAtPosition,
     getAdditionalOffset,
+    getHorizontalChartHeight,
     getNiceYAxisTicks,
+    getVerticalBarLabelLayoutInputs,
+    getVerticalBarPlotBounds,
     isAngleInSlice,
     isCursorInSkewedLabel,
     isCursorOverChartLabel,
@@ -711,3 +714,107 @@ describe('getNiceYAxisTicks', () => {
         expect(getNiceYAxisTicks(0, -1.11, 5)).toEqual([-1.2, -1, -0.8, -0.6, -0.4, -0.2, 0]);
     });
 });
+
+describe('getHorizontalChartHeight', () => {
+    const MIN_ROW_HEIGHT = 36;
+    const PADDING = 40;
+    const MIN_HEIGHT = 220;
+
+    it('keeps the shared minimum height when few rows do not need the extra space', () => {
+        // Given 3 rows, 3 * 36 + 40 = 148 is below the 220 minimum
+        // When computing the height
+        // Then it stays at the minimum so small charts are not shrunk
+        expect(getHorizontalChartHeight(3, MIN_ROW_HEIGHT, PADDING, MIN_HEIGHT)).toBe(MIN_HEIGHT);
+    });
+
+    it('grows past the minimum once the rows need more than the minimum height', () => {
+        // Given 10 rows, 10 * 36 + 40 = 400 exceeds the 220 minimum
+        // When computing the height
+        // Then it grows so every row keeps its full MIN_ROW_HEIGHT and no label is thinned out
+        expect(getHorizontalChartHeight(10, MIN_ROW_HEIGHT, PADDING, MIN_HEIGHT)).toBe(400);
+    });
+
+    it('reserves at least one row of space per row as the count increases', () => {
+        // Given the row count grows by one
+        // When comparing consecutive grown heights
+        // Then each extra row adds exactly MIN_ROW_HEIGHT of space
+        const ten = getHorizontalChartHeight(10, MIN_ROW_HEIGHT, PADDING, MIN_HEIGHT);
+        const eleven = getHorizontalChartHeight(11, MIN_ROW_HEIGHT, PADDING, MIN_HEIGHT);
+        expect(eleven - ten).toBe(MIN_ROW_HEIGHT);
+    });
+
+    it('returns the minimum height when there are no rows', () => {
+        // Given an empty dataset
+        // When computing the height
+        // Then it falls back to the minimum rather than collapsing to just the padding
+        expect(getHorizontalChartHeight(0, MIN_ROW_HEIGHT, PADDING, MIN_HEIGHT)).toBe(MIN_HEIGHT);
+    });
+});
+
+describe('getVerticalBarPlotBounds', () => {
+    // labelGap = 12, padding.right = 5 (from VictoryTheme.axis)
+    const LABEL_GAP = VictoryTheme.axis.labelGap;
+    const PADDING_RIGHT = VictoryTheme.axis.padding.right;
+
+    it('reserves the left gutter for labels and the right base padding', () => {
+        // Given a 300px container with a 30px left gutter
+        // When computing the plot bounds
+        // Then the plot starts past the gutter+labelGap and ends before the right padding
+        expect(getVerticalBarPlotBounds(300, 30)).toEqual({left: 30 + LABEL_GAP, right: 300 - PADDING_RIGHT, width: 300 - PADDING_RIGHT - (30 + LABEL_GAP)});
+    });
+
+    it('grows the plot width one-for-one with the container width', () => {
+        // Given the same left gutter but a wider container
+        // When comparing plot widths
+        // Then every extra container pixel becomes plot width (lets a horizontal chart switch back to vertical as it grows)
+        const narrow = getVerticalBarPlotBounds(300, 30).width;
+        const wide = getVerticalBarPlotBounds(360, 30).width;
+        expect(wide - narrow).toBe(60);
+    });
+
+    it('clamps to a zero-width plot when the container is too small for the gutters', () => {
+        // Given a container narrower than the left gutter itself
+        // When computing the plot bounds
+        // Then the right edge clamps to the left edge instead of going negative
+        const bounds = getVerticalBarPlotBounds(10, 30);
+        expect(bounds.left).toBe(30 + LABEL_GAP);
+        expect(bounds.right).toBe(30 + LABEL_GAP);
+        expect(bounds.width).toBe(0);
+    });
+});
+
+describe('getVerticalBarLabelLayoutInputs', () => {
+    it('derives the label layout geometry from the plot bounds', () => {
+        // Given a 400px container with 2 points and the resolved plot bounds
+        // When computing the label layout inputs
+        // Then tick spacing, label area, and edge spaces follow from the bounds and the domain padding
+        // (domainPadding = calculateMinDomainPadding(400, 2, 0) = 200, paddingScale = 200 / (200 + 2*200) = 1/3)
+        const inputs = getVerticalBarLabelLayoutInputs({containerWidth: 400, plotLeft: 40, plotRight: 380, plotWidth: 200, dataLength: 2, innerPadding: 0});
+        expect(inputs.tickSpacing).toBe(100);
+        expect(inputs.labelAreaWidth).toBe(200);
+        expect(inputs.firstTickLeftSpace).toBeCloseTo(40 + 200 / 3, 5);
+        expect(inputs.lastTickRightSpace).toBeCloseTo(20 + 200 / 3, 5);
+    });
+
+    it('returns zeros before the container is measured', () => {
+        // Given a container width of 0 (chart not yet laid out)
+        // When computing the label layout inputs
+        // Then every geometry input is 0 so the layout hook takes its empty-layout early return
+        expect(getVerticalBarLabelLayoutInputs({containerWidth: 0, plotLeft: 0, plotRight: 0, plotWidth: 0, dataLength: 2, innerPadding: 0})).toEqual({
+            tickSpacing: 0,
+            labelAreaWidth: 0,
+            firstTickLeftSpace: 0,
+            lastTickRightSpace: 0,
+        });
+    });
+
+    it('drops the domain padding for a single data point', () => {
+        // Given a single-point chart where there are no adjacent bars to pad against
+        // When computing the label layout inputs
+        // Then domain padding is 0, so the edge spaces equal the raw distances to the container edges
+        const inputs = getVerticalBarLabelLayoutInputs({containerWidth: 300, plotLeft: 50, plotRight: 280, plotWidth: 230, dataLength: 1, innerPadding: 0.3});
+        expect(inputs.tickSpacing).toBe(230);
+        expect(inputs.firstTickLeftSpace).toBe(50);
+        expect(inputs.lastTickRightSpace).toBe(20);
+    });
+});
diff --git a/tests/unit/components/ExpenseFieldDropdown.test.tsx b/tests/unit/components/ExpenseFieldDropdown.test.tsx
new file mode 100644
index 000000000000..edc22989b19e
--- /dev/null
+++ b/tests/unit/components/ExpenseFieldDropdown.test.tsx
@@ -0,0 +1,244 @@
+import {act, fireEvent, render, screen} from '@testing-library/react-native';
+
+import type {ExpenseFieldDropdownRenderProps} from '@components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown';
+import ExpenseFieldDropdown from '@components/MoneyRequestConfirmationList/sections/ExpenseFieldDropdown';
+import Text from '@components/Text';
+
+import variables from '@styles/variables';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type {ReactNode} from 'react';
+
+import React from 'react';
+import {View} from 'react-native';
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
+
+// Below this width the container is a bottom sheet, so these tests default to a wide layout.
+let mockIsSmallScreenWidth = false;
+jest.mock('@hooks/useResponsiveLayout', () => jest.fn(() => ({isSmallScreenWidth: mockIsSmallScreenWidth, shouldUseNarrowLayout: mockIsSmallScreenWidth})));
+// Read lazily so a test can shrink the viewport, leaving the row short of room on both sides at once.
+let mockWindowHeight = 800;
+jest.mock('@hooks/useWindowDimensions', () => jest.fn(() => ({windowWidth: 1280, windowHeight: mockWindowHeight})));
+
+const WINDOW_HEIGHT = 800;
+
+const FIELD_NAME = 'Category';
+const ROW_TEST_ID = 'category-row';
+const DROPDOWN_TEXT = 'The category list';
+
+const ROW_X = 16;
+const ROW_TOP = 100;
+const ROW_WIDTH = 300;
+const ROW_HEIGHT = 60;
+
+// `MenuItem.Root` drops a press it was handed no event for, so every press here carries one.
+const pressRow = () => fireEvent.press(screen.getByTestId(ROW_TEST_ID), {nativeEvent: {}});
+
+/**
+ * Stands in for the measurement the row does when it opens: the container is positioned off the row's real
+ * geometry, which the test renderer never lays out, so each test says where the row sits instead.
+ */
+const mockRowAt = (rowTop: number) => {
+    jest.spyOn(View.prototype, 'measureInWindow').mockImplementation((callback) => {
+        callback(ROW_X, rowTop, ROW_WIDTH, ROW_HEIGHT);
+    });
+};
+
+describe('ExpenseFieldDropdown', () => {
+    let renderedProps: ExpenseFieldDropdownRenderProps | undefined;
+    let renderCount = 0;
+
+    const renderDropdown = (props: ExpenseFieldDropdownRenderProps): ReactNode => {
+        renderedProps = props;
+        renderCount += 1;
+        return props.isVisible ? <Text>{DROPDOWN_TEXT}</Text> : null;
+    };
+
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        renderedProps = undefined;
+        renderCount = 0;
+        mockWindowHeight = WINDOW_HEIGHT;
+        mockIsSmallScreenWidth = false;
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    const renderField = (shouldOpenInDropdown = true, onPress: () => void = jest.fn()) =>
+        render(
+            <ExpenseFieldDropdown
+                name={FIELD_NAME}
+                testID={ROW_TEST_ID}
+                shouldOpenInDropdown={shouldOpenInDropdown}
+                onPress={onPress}
+                renderDropdown={renderDropdown}
+            />,
+        );
+
+    it('does not mount the list until the row is pressed', () => {
+        // Given a field whose list opens in the container anchored to the row
+        mockRowAt(ROW_TOP);
+        renderField();
+
+        // When the row has not been pressed
+        // Then the list was never mounted, so an untouched field costs the form nothing
+        expect(renderCount).toBe(0);
+    });
+
+    it('opens the list in the container rather than navigating', () => {
+        // Given a field whose list opens in place
+        const onPress = jest.fn();
+        mockRowAt(ROW_TOP);
+        renderField(true, onPress);
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then the list opens in the container and the full-page selector is never reached
+        expect(screen.getByText(DROPDOWN_TEXT)).toBeOnTheScreen();
+        expect(onPress).not.toHaveBeenCalled();
+    });
+
+    it('matches the row width and opens directly below the row', () => {
+        // Given a row sitting near the top of a tall form, with room below it
+        mockRowAt(ROW_TOP);
+        renderField();
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then the container is as wide as the row, shares its left edge, and hangs off its bottom edge
+        expect(renderedProps?.popoverWidth).toBe(ROW_WIDTH);
+        expect(renderedProps?.anchorPosition.horizontal).toBe(ROW_X);
+        expect(renderedProps?.anchorPosition.vertical).toBeGreaterThan(ROW_TOP + ROW_HEIGHT);
+        expect(renderedProps?.shouldMeasureAnchorPositionFromTop).toBe(true);
+    });
+
+    it('opens above the row when there is not enough room below it', () => {
+        // Given a row pinned to the bottom of the viewport
+        const rowTop = WINDOW_HEIGHT - ROW_HEIGHT;
+        mockRowAt(rowTop);
+        renderField();
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then the container is positioned from its bottom edge, just above the row, so it is never clipped
+        expect(renderedProps?.shouldMeasureAnchorPositionFromTop).toBe(false);
+        expect(renderedProps?.anchorPosition.vertical).toBeLessThan(rowTop);
+    });
+
+    it('stops short of the header when it opens above the row', () => {
+        // Given a row with too little room below, and just enough above to reach the top of the window
+        mockWindowHeight = 500;
+        mockRowAt(304);
+        renderField();
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then its top edge clears the header, so it never covers the back button. Opening above is positioned
+        // from the bottom edge, so the top is that minus the height.
+        expect(renderedProps?.shouldMeasureAnchorPositionFromTop).toBe(false);
+        const containerTop = (renderedProps?.anchorPosition.vertical ?? 0) - (renderedProps?.popoverHeight ?? 0);
+        expect(containerTop).toBeGreaterThanOrEqual(variables.contentHeaderHeight);
+    });
+
+    it('prefers the side of the row with more room', () => {
+        // Given a row with enough room below it for a usable list, but more room above it than below
+        mockWindowHeight = 900;
+        mockRowAt(500);
+        renderField();
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then it opens above, into the room it has, rather than below into the smaller gap
+        expect(renderedProps?.shouldMeasureAnchorPositionFromTop).toBe(false);
+    });
+
+    it('never asks for more height than the row leaves it', () => {
+        // Given a viewport short enough that the row has a usable but limited gap under it
+        mockWindowHeight = 500;
+        mockRowAt(120);
+        renderField();
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then it asks for at most the space that is there. Flooring this at a minimum ran it past the panel.
+        const openedBelow = renderedProps?.shouldMeasureAnchorPositionFromTop ?? true;
+        const spaceUsed = openedBelow ? mockWindowHeight - (renderedProps?.anchorPosition.vertical ?? 0) : (renderedProps?.anchorPosition.vertical ?? 0);
+        expect(renderedProps?.popoverHeight).toBeLessThanOrEqual(spaceUsed);
+    });
+
+    it('falls back to the full page when neither side has room for a list', () => {
+        // Given a viewport too short for a usable list on either side of the row
+        const onPress = jest.fn();
+        mockWindowHeight = 300;
+        mockRowAt(120);
+        renderField(true, onPress);
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then it opens the page. A container with no height sizes itself to its content and is dragged back
+        // over the row to fit the window.
+        expect(onPress).toHaveBeenCalledTimes(1);
+        expect(renderCount).toBe(0);
+    });
+
+    it('opens the bottom sheet on a narrow layout however little room the row has', () => {
+        // Given a narrow layout and a row with too little room either side for a pop-over
+        const onPress = jest.fn();
+        mockIsSmallScreenWidth = true;
+        mockWindowHeight = 300;
+        mockRowAt(120);
+        renderField(true, onPress);
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then the sheet opens anyway: it is placed and sized by the screen, not by the row
+        expect(screen.getByText(DROPDOWN_TEXT)).toBeOnTheScreen();
+        expect(onPress).not.toHaveBeenCalled();
+    });
+
+    it('closes the list when the row is pressed again', () => {
+        // Given a field whose list is already open
+        mockRowAt(ROW_TOP);
+        renderField();
+        act(() => pressRow());
+        expect(screen.getByText(DROPDOWN_TEXT)).toBeOnTheScreen();
+
+        // When the row is pressed a second time
+        act(() => pressRow());
+
+        // Then the container is dismissed, the same way clicking outside it dismisses it
+        expect(screen.queryByText(DROPDOWN_TEXT)).toBeNull();
+    });
+
+    it('opens the full-page selector for a field the container cannot answer', () => {
+        // Given a field that has to send the user somewhere else first, e.g. to upgrade or to pick a workspace
+        const onPress = jest.fn();
+        mockRowAt(ROW_TOP);
+        renderField(false, onPress);
+
+        // When the row is pressed
+        act(() => pressRow());
+
+        // Then it opens the page it opened before, and no container is mounted
+        expect(onPress).toHaveBeenCalledTimes(1);
+        expect(renderCount).toBe(0);
+    });
+});
diff --git a/tests/unit/components/ExpenseFieldRow.test.tsx b/tests/unit/components/ExpenseFieldRow.test.tsx
index bc01b6242803..3ad7af29842c 100644
--- a/tests/unit/components/ExpenseFieldRow.test.tsx
+++ b/tests/unit/components/ExpenseFieldRow.test.tsx
@@ -145,6 +145,63 @@ describe('ExpenseFieldRow', () => {
         });
     });
 
+    describe('dropdown state', () => {
+        it('reports expanded on the element a screen reader focuses', () => {
+            // Given a row whose list is open
+            render(
+                <ExpenseFieldRow
+                    name={FIELD_NAME}
+                    value={FIELD_VALUE}
+                    onPress={jest.fn()}
+                    testID="category-row"
+                    isExpanded
+                />,
+            );
+
+            // When the row is read out
+            const row = screen.getByTestId('category-row');
+
+            // Then the state sits on the pressable, which carries the button role and takes screen reader focus.
+            // On a wrapper around it the state is never announced.
+            expect(row).toBeExpanded();
+        });
+
+        it('reports collapsed while the list is closed', () => {
+            // Given a dropdown row whose list is not open
+            render(
+                <ExpenseFieldRow
+                    name={FIELD_NAME}
+                    value={FIELD_VALUE}
+                    onPress={jest.fn()}
+                    testID="category-row"
+                    isExpanded={false}
+                />,
+            );
+
+            // When the row is read out
+            // Then it reads as a dropdown that is closed, rather than as a plain link
+            expect(screen.getByTestId('category-row')).toBeCollapsed();
+        });
+
+        it('says nothing about expansion for a row with no list to open', () => {
+            // Given a row that opens a page rather than a list in place
+            render(
+                <ExpenseFieldRow
+                    name={FIELD_NAME}
+                    value={FIELD_VALUE}
+                    onPress={jest.fn()}
+                    testID="category-row"
+                />,
+            );
+
+            // When the row is read out
+            // Then it is neither expanded nor collapsed: it does not read as a dropdown at all
+            const row = screen.getByTestId('category-row');
+            expect(row).not.toBeExpanded();
+            expect(row).not.toBeCollapsed();
+        });
+    });
+
     describe('read-only presentation', () => {
         it('renders a field the user cannot change as a disabled input', () => {
             const {result} = renderHook(() => useThemeStyles());
diff --git a/tests/unit/components/GPSTripStateCheckerTest.tsx b/tests/unit/components/GPSTripStateCheckerTest.tsx
deleted file mode 100644
index 74672ed6c765..000000000000
--- a/tests/unit/components/GPSTripStateCheckerTest.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import {render} from '@testing-library/react-native';
-
-import ComposeProviders from '@components/ComposeProviders';
-import GPSTripStateChecker from '@components/GPSTripStateChecker/index.native';
-import {LocaleContextProvider} from '@components/LocaleContextProvider';
-import OnyxListItemProvider from '@components/OnyxListItemProvider';
-
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import {SplashScreenStateContextProvider} from '@src/SplashScreenStateContext';
-import type {GpsDraftDetails} from '@src/types/onyx';
-
-import React from 'react';
-import Onyx from 'react-native-onyx';
-
-import getOnyxValue from '../../utils/getOnyxValue';
-import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithAct';
-
-jest.mock('@libs/Navigation/Navigation', () => ({
-    __esModule: true,
-    default: {navigate: jest.fn()},
-}));
-
-jest.mock('@pages/iou/request/step/IOURequestStepDistanceGPS/GPSNotifications', () => ({
-    startGpsTripNotification: jest.fn(),
-    stopGpsTripNotification: jest.fn(),
-    updateGpsTripNotificationDistance: jest.fn(),
-    updateGpsTripNotificationUnit: jest.fn(),
-    updateGpsTripNotificationLanguage: jest.fn(),
-    checkAndCleanGpsNotification: jest.fn(() => Promise.resolve()),
-    shouldUpdateGpsNotificationUnit: jest.fn(() => false),
-}));
-
-const CURRENT_ACCOUNT_ID = 1;
-const OTHER_ACCOUNT_ID = 2;
-
-const trip: GpsDraftDetails = {
-    gpsPoints: [[{lat: 1, long: 2}]],
-    distanceInMeters: 100,
-    isTracking: true,
-    reportID: '1',
-    unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
-};
-
-function renderChecker() {
-    return render(
-        <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, SplashScreenStateContextProvider]}>
-            <GPSTripStateChecker />
-        </ComposeProviders>,
-    );
-}
-
-describe('GPSTripStateChecker', () => {
-    beforeAll(() => {
-        Onyx.init({keys: ONYXKEYS});
-    });
-
-    beforeEach(async () => {
-        await Onyx.clear();
-        await Onyx.merge(ONYXKEYS.SESSION, {accountID: CURRENT_ACCOUNT_ID});
-        await waitForBatchedUpdatesWithAct();
-    });
-
-    it('keeps a trip that records no accountID, because it predates the trip owner being stored', async () => {
-        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, trip);
-        await waitForBatchedUpdatesWithAct();
-
-        renderChecker();
-        await waitForBatchedUpdatesWithAct();
-
-        expect((await getOnyxValue(ONYXKEYS.GPS_DRAFT_DETAILS))?.isTracking).toBe(true);
-    });
-
-    it('keeps a trip started by the signed in user', async () => {
-        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, {...trip, accountID: CURRENT_ACCOUNT_ID});
-        await waitForBatchedUpdatesWithAct();
-
-        renderChecker();
-        await waitForBatchedUpdatesWithAct();
-
-        expect((await getOnyxValue(ONYXKEYS.GPS_DRAFT_DETAILS))?.isTracking).toBe(true);
-    });
-
-    it('discards a trip started by a different user', async () => {
-        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, {...trip, accountID: OTHER_ACCOUNT_ID});
-        await waitForBatchedUpdatesWithAct();
-
-        renderChecker();
-        await waitForBatchedUpdatesWithAct();
-
-        expect(await getOnyxValue(ONYXKEYS.GPS_DRAFT_DETAILS)).toBeUndefined();
-    });
-});
diff --git a/tests/unit/components/MoneyRequestConfirmationList/AmountField.test.tsx b/tests/unit/components/MoneyRequestConfirmationList/AmountField.test.tsx
new file mode 100644
index 000000000000..9999c5c41acf
--- /dev/null
+++ b/tests/unit/components/MoneyRequestConfirmationList/AmountField.test.tsx
@@ -0,0 +1,165 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import ConfirmationFieldsProvider from '@components/MoneyRequestConfirmationFields/Provider';
+import AmountField from '@components/MoneyRequestConfirmationList/sections/AmountField';
+
+import CONST from '@src/CONST';
+
+import React from 'react';
+
+jest.mock('@components/NumberWithSymbolForm', () => {
+    const {Pressable, Text} =
+        jest.requireActual<Record<'Pressable' | 'Text', React.ComponentType<{children?: React.ReactNode; onPress?: () => void; accessibilityRole?: 'button'}>>>('react-native');
+    return ({onInputChange, errorText}: {onInputChange: (amount: string) => void; errorText?: string}) => (
+        <>
+            {!!errorText && <Text>{errorText}</Text>}
+            <Pressable
+                accessibilityRole="button"
+                onPress={() => onInputChange('0')}
+            >
+                <Text>Enter zero</Text>
+            </Pressable>
+            <Pressable
+                accessibilityRole="button"
+                onPress={() => onInputChange('1')}
+            >
+                <Text>Enter one</Text>
+            </Pressable>
+        </>
+    );
+});
+let mockTransactionSlice = {transactionID: '1', amount: 0, currency: 'USD', isAmountMissing: false};
+jest.mock('@components/MoneyRequestConfirmationList/sections/useTransactionSelector', () => () => mockTransactionSlice);
+jest.mock('@hooks/useOnyx', () => () => [undefined]);
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => () => ({accountID: 1}));
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key, preferredLocale: 'en'}));
+jest.mock('@hooks/useThemeStyles', () => () => ({}));
+jest.mock('@hooks/useCurrencyList', () => ({useCurrencyListActions: () => ({getCurrencyDecimals: () => 2, getCurrencySymbol: () => '$'})}));
+jest.mock('@libs/DeviceCapabilities', () => ({canUseTouchScreen: () => true}));
+jest.mock('@libs/actions/IOU/MoneyRequest', () => ({getMoneyRequestParticipantsFromReport: () => [], setMoneyRequestAmount: jest.fn(), clearMoneyRequestAmount: jest.fn()}));
+jest.mock('@userActions/IOU/Split', () => ({setDraftSplitTransaction: jest.fn()}));
+
+const amountFieldProps: React.ComponentProps<typeof AmountField> = {
+    amount: 0,
+    formattedAmount: '',
+    iouCurrencyCode: CONST.CURRENCY.USD,
+    isDistanceRequest: false,
+    shouldShowTimeRequestFields: false,
+    shouldDisplayFieldError: false,
+    formError: 'iou.error.invalidAmount',
+    policy: undefined,
+    clearFormErrors: jest.fn(),
+    setFormError: jest.fn(),
+};
+
+describe('AmountField split-bill error clearing', () => {
+    beforeEach(() => {
+        mockTransactionSlice = {transactionID: '1', amount: 0, currency: 'USD', isAmountMissing: false};
+    });
+
+    it('shows the missing amount error for a failed split scan', () => {
+        mockTransactionSlice = {transactionID: '1', amount: 0, currency: 'USD', isAmountMissing: true};
+
+        render(
+            <ConfirmationFieldsProvider
+                transactionID="1"
+                reportID="2"
+                action={CONST.IOU.ACTION.EDIT}
+                iouType={CONST.IOU.TYPE.SPLIT}
+                isEditingSplitBill
+            >
+                <AmountField
+                    {...amountFieldProps}
+                    shouldDisplayFieldError
+                    formError="iou.receiptScanningFailed"
+                />
+            </ConfirmationFieldsProvider>,
+        );
+
+        expect(screen.getByText('common.error.enterAmount')).toBeOnTheScreen();
+    });
+
+    it('does not show a missing amount error when the split amount is valid', () => {
+        render(
+            <ConfirmationFieldsProvider
+                transactionID="1"
+                reportID="2"
+                action={CONST.IOU.ACTION.EDIT}
+                iouType={CONST.IOU.TYPE.SPLIT}
+                isEditingSplitBill
+            >
+                <AmountField
+                    {...amountFieldProps}
+                    shouldDisplayFieldError
+                    formError="iou.receiptScanningFailed"
+                />
+            </ConfirmationFieldsProvider>,
+        );
+
+        expect(screen.queryByText('common.error.enterAmount')).not.toBeOnTheScreen();
+    });
+
+    it('does not show the split missing amount error outside the field-error state', () => {
+        mockTransactionSlice = {transactionID: '1', amount: 0, currency: 'USD', isAmountMissing: true};
+
+        render(
+            <ConfirmationFieldsProvider
+                transactionID="1"
+                reportID="2"
+                action={CONST.IOU.ACTION.CREATE}
+                iouType={CONST.IOU.TYPE.SUBMIT}
+            >
+                <AmountField
+                    {...amountFieldProps}
+                    formError="iou.receiptScanningFailed"
+                />
+            </ConfirmationFieldsProvider>,
+        );
+
+        expect(screen.queryByText('common.error.enterAmount')).not.toBeOnTheScreen();
+    });
+
+    it('keeps the split amount error at zero and clears it when the amount becomes nonzero', () => {
+        const clearFormErrors = jest.fn();
+        render(
+            <ConfirmationFieldsProvider
+                transactionID="1"
+                reportID="2"
+                action={CONST.IOU.ACTION.EDIT}
+                iouType={CONST.IOU.TYPE.SPLIT}
+                isEditingSplitBill
+            >
+                <AmountField
+                    {...amountFieldProps}
+                    clearFormErrors={clearFormErrors}
+                />
+            </ConfirmationFieldsProvider>,
+        );
+
+        fireEvent.press(screen.getByText('Enter zero'));
+        expect(clearFormErrors).not.toHaveBeenCalledWith(expect.arrayContaining(['iou.error.invalidAmount']));
+
+        fireEvent.press(screen.getByText('Enter one'));
+        expect(clearFormErrors).toHaveBeenCalledWith(expect.arrayContaining(['iou.error.invalidAmount']));
+    });
+
+    it('does not clear a split-specific error outside split-bill editing', () => {
+        const clearFormErrors = jest.fn();
+        render(
+            <ConfirmationFieldsProvider
+                transactionID="1"
+                reportID="2"
+                action={CONST.IOU.ACTION.CREATE}
+                iouType={CONST.IOU.TYPE.SUBMIT}
+            >
+                <AmountField
+                    {...amountFieldProps}
+                    clearFormErrors={clearFormErrors}
+                />
+            </ConfirmationFieldsProvider>,
+        );
+
+        fireEvent.press(screen.getByText('Enter one'));
+        expect(clearFormErrors).toHaveBeenCalledWith(['common.error.invalidAmount']);
+    });
+});
diff --git a/tests/unit/components/MoneyRequestConfirmationList/CategoryField.test.tsx b/tests/unit/components/MoneyRequestConfirmationList/CategoryField.test.tsx
new file mode 100644
index 000000000000..d250bfcb37de
--- /dev/null
+++ b/tests/unit/components/MoneyRequestConfirmationList/CategoryField.test.tsx
@@ -0,0 +1,163 @@
+import {render, screen, waitFor} from '@testing-library/react-native';
+
+import ConfirmationFieldsProvider from '@components/MoneyRequestConfirmationFields/Provider';
+import CategoryField from '@components/MoneyRequestConfirmationList/sections/CategoryField';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import createRandomPolicy from '../../../utils/collections/policies';
+import waitForBatchedUpdates from '../../../utils/waitForBatchedUpdates';
+
+jest.mock('@components/MenuItemWithTopDescription', () => {
+    const {Text} = jest.requireActual<Record<'Text', React.ComponentType<{children?: React.ReactNode}>>>('react-native');
+    return ({title, description, rightLabel}: {title?: string; description?: string; rightLabel?: string}) => (
+        <>
+            <Text>{description}</Text>
+            <Text>{title}</Text>
+            {rightLabel ? <Text>{rightLabel}</Text> : null}
+        </>
+    );
+});
+
+jest.mock('@hooks/useLocalize', () => () => ({translate: (key: string) => key}));
+jest.mock('@hooks/useThemeStyles', () => () => ({}));
+
+const TRANSACTION_ID = '1';
+const REPORT_ID = 'reportID';
+
+const disabledPolicy: Policy = {...createRandomPolicy(1), autoCategorizeNewExpenses: false};
+const enabledPolicy: Policy = {...createRandomPolicy(1), autoCategorizeNewExpenses: true};
+
+const renderCategoryField = (isCategoryRequired: boolean, policy: Policy | undefined) =>
+    render(
+        <ConfirmationFieldsProvider
+            transactionID={TRANSACTION_ID}
+            reportID={REPORT_ID}
+            action={CONST.IOU.ACTION.CREATE}
+            iouType={CONST.IOU.TYPE.SUBMIT}
+        >
+            <CategoryField
+                isCategoryRequired={isCategoryRequired}
+                didConfirm={false}
+                isReadOnly={false}
+                transactionID={TRANSACTION_ID}
+                action={CONST.IOU.ACTION.CREATE}
+                iouType={CONST.IOU.TYPE.SUBMIT}
+                reportID={REPORT_ID}
+                reportActionID={undefined}
+                policy={policy}
+                formError=""
+                shouldNavigateToUpgradePath={false}
+                shouldSelectPolicy={false}
+            />
+        </ConfirmationFieldsProvider>,
+    );
+
+describe('CategoryField', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    async function givenManualExpense() {
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${TRANSACTION_ID}`, {
+            transactionID: TRANSACTION_ID,
+            reportID: REPORT_ID,
+            amount: 1000,
+            currency: 'USD',
+            merchant: 'Cafe',
+            created: '2026-01-15',
+            category: 'Meals',
+            iouRequestType: CONST.IOU.REQUEST_TYPE.MANUAL,
+        });
+        await waitForBatchedUpdates();
+    }
+
+    it('does not promise an automatic category when the workspace turned auto-categorization off', async () => {
+        // Given a manual expense on a workspace that will not categorize it
+        await givenManualExpense();
+
+        // When the confirmation form renders the category row and category is optional
+        renderCategoryField(false, disabledPolicy);
+
+        // Then the row must not say Automatic, because nothing will fill the category
+        await waitFor(() => {
+            expect(screen.getByText('Meals')).toBeOnTheScreen();
+        });
+        expect(screen.queryByText('common.automatic')).toBeNull();
+    });
+
+    it('promises an automatic category on a manual expense when auto-categorization is on', async () => {
+        // Given a manual expense on a workspace that categorizes new expenses
+        await givenManualExpense();
+
+        // When the confirmation form renders an optional category row
+        renderCategoryField(false, enabledPolicy);
+
+        // Then the row promises the category the workspace will pick once the expense is created
+        await waitFor(() => {
+            expect(screen.getByText('common.automatic')).toBeOnTheScreen();
+        });
+    });
+
+    it('still promises an automatic category when the workspace has never stored the setting', async () => {
+        // Given a manual expense on a workspace that has not touched the setting, which defaults to on
+        await givenManualExpense();
+
+        // When the confirmation form renders an optional category row
+        renderCategoryField(false, createRandomPolicy(1));
+
+        // Then the row keeps the Automatic promise the setting's default implies
+        await waitFor(() => {
+            expect(screen.getByText('common.automatic')).toBeOnTheScreen();
+        });
+    });
+
+    it('does not promise an automatic category on a scan when auto-categorization is off', async () => {
+        // Given a scan whose workspace will not categorize the receipt
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${TRANSACTION_ID}`, {
+            transactionID: TRANSACTION_ID,
+            reportID: REPORT_ID,
+            amount: 0,
+            currency: 'USD',
+            merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
+            created: '2026-01-15',
+            category: 'Travel',
+            iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+            receipt: {receiptID: 1, source: 'source', state: CONST.IOU.RECEIPT_STATE.SCAN_READY},
+        });
+        await waitForBatchedUpdates();
+
+        // When the confirmation form renders the category row
+        renderCategoryField(false, disabledPolicy);
+
+        // Then the row must not say Automatic, because a turned-off workspace never categorizes the receipt
+        await waitFor(() => {
+            expect(screen.getByText('Travel')).toBeOnTheScreen();
+        });
+        expect(screen.queryByText('common.automatic')).toBeNull();
+    });
+
+    it('shows Required instead of Automatic when the category is required and auto-categorization is off', async () => {
+        // Given a manual expense whose workspace both requires a category and will not pick one
+        await givenManualExpense();
+
+        // When the confirmation form renders the category row
+        renderCategoryField(true, disabledPolicy);
+
+        // Then the row asks the user for a category rather than promising one
+        await waitFor(() => {
+            expect(screen.getByText('common.required')).toBeOnTheScreen();
+        });
+        expect(screen.queryByText('common.automatic')).toBeNull();
+    });
+});
diff --git a/tests/unit/components/MoneyRequestReportNavigation.test.tsx b/tests/unit/components/MoneyRequestReportNavigation.test.tsx
index 91001e8f7070..3e112b433414 100644
--- a/tests/unit/components/MoneyRequestReportNavigation.test.tsx
+++ b/tests/unit/components/MoneyRequestReportNavigation.test.tsx
@@ -1,5 +1,6 @@
 import {renderHook} from '@testing-library/react-native';
 
+import {isNavigableReportID} from '@components/MoneyRequestReportView/MoneyRequestReportNavigation';
 import {useSearchResultsContext} from '@components/Search/SearchContext';
 
 import useFilterPendingDeleteReports from '@hooks/useFilterPendingDeleteReports';
@@ -64,7 +65,7 @@ const isSameReportList = (a: Array<string | undefined>, b: Array<string | undefi
  */
 function useNavigationSource(reportID: string | undefined) {
     const {sortedReportIDs} = useSearchResultsContext();
-    const contextReports = useFilterPendingDeleteReports(sortedReportIDs);
+    const contextReports = useFilterPendingDeleteReports(sortedReportIDs).filter(isNavigableReportID);
     const {allReports: standaloneReports, isSearchLoading} = mockUseSearchSections();
 
     const allReports = contextReports.length > 0 && !isSearchLoading ? contextReports : standaloneReports;
@@ -79,6 +80,28 @@ function useNavigationSource(reportID: string | undefined) {
     return {source: contextReports.length > 0 && !isSearchLoading ? 'fast' : 'full', allReports, effectiveAllReports};
 }
 
+/**
+ * Regression guard for https://github.com/Expensify/App/issues/99627: an unreported (self-DM) expense is grouped
+ * under the "0" placeholder rather than a real report, so it inflated the "x of y" counter with an entry the Reports
+ * list never showed, and paging onto it landed the user on an empty report.
+ */
+describe('isNavigableReportID', () => {
+    it('accepts a real report', () => {
+        expect(isNavigableReportID('12345')).toBe(true);
+    });
+
+    it('rejects the unreported placeholder', () => {
+        expect(isNavigableReportID(CONST.REPORT.UNREPORTED_REPORT_ID)).toBe(false);
+    });
+
+    it.each([
+        ['undefined', undefined],
+        ['an empty string', ''],
+    ])('rejects %s', (_label, reportID) => {
+        expect(isNavigableReportID(reportID)).toBe(false);
+    });
+});
+
 describe('MoneyRequestReportNavigation', () => {
     beforeEach(() => {
         mockSortedReportIDs = CONST.EMPTY_ARRAY;
diff --git a/tests/unit/components/MoneyRequestReportTransactionsNavigation.test.tsx b/tests/unit/components/MoneyRequestReportTransactionsNavigation.test.tsx
new file mode 100644
index 000000000000..1259a7c7bdd1
--- /dev/null
+++ b/tests/unit/components/MoneyRequestReportTransactionsNavigation.test.tsx
@@ -0,0 +1,732 @@
+import {fireEvent, render, screen} from '@testing-library/react-native';
+
+import MoneyRequestReportTransactionsNavigation from '@components/MoneyRequestReportView/MoneyRequestReportTransactionsNavigation';
+
+import {createTransactionThreadReport} from '@libs/actions/Report';
+import {clearActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import {getReportIDToOpenForExpense} from '@libs/TransactionThreadNavigationUtils';
+
+import Navigation from '@navigation/Navigation';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+
+import React from 'react';
+
+/**
+ * These tests verify the navigation resolution of MoneyRequestReportTransactionsNavigation:
+ * given a transaction list (and optionally a search snapshot), pressing prev/next should resolve
+ * and navigate to the correct target reportID for each direction. The heavy hooks are mocked so
+ * the real selectors and the onNext/onPrevious branching logic are exercised in isolation.
+ */
+
+type MockOnyxState = {
+    transactionIDsList: string[] | undefined;
+    snapshotHash: string | undefined;
+    snapshot: {data: Record<string, unknown>} | undefined;
+    siblingDescriptors: Record<string, unknown> | undefined;
+    transactionsCollection: Record<string, unknown>;
+    /** Fetch status of the `transactions_` subscription, which is how the carousel tells "not loaded" from "gone" */
+    transactionsStatus: 'loading' | 'loaded';
+    reportActionsCollection: Record<string, unknown>;
+    reportsCollection: Record<string, unknown>;
+};
+
+const mockState: MockOnyxState = {
+    transactionIDsList: undefined,
+    snapshotHash: undefined,
+    snapshot: undefined,
+    siblingDescriptors: undefined,
+    transactionsCollection: {},
+    transactionsStatus: 'loaded',
+    reportActionsCollection: {},
+    reportsCollection: {},
+};
+
+const mockUseOnyx = jest.fn();
+const mockMarkReportRHPWidth = jest.fn();
+
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    default: (...args: unknown[]) => mockUseOnyx(...args),
+}));
+
+jest.mock('@hooks/useThemeStyles', () => ({
+    __esModule: true,
+    default: () => ({}),
+}));
+
+jest.mock('@hooks/useLocalize', () => ({
+    __esModule: true,
+    default: () => ({translate: (key: string, params?: Record<string, unknown>) => (params ? `${key}:${JSON.stringify(params)}` : key)}),
+}));
+
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => ({
+    __esModule: true,
+    default: () => ({accountID: 1, email: 'me@example.com'}),
+}));
+
+jest.mock('@components/WideRHPContextProvider', () => ({
+    useWideRHPActions: () => ({markReportRHPWidth: mockMarkReportRHPWidth}),
+}));
+
+jest.mock('@components/OnyxListItemProvider', () => ({
+    usePersonalDetails: () => ({}),
+}));
+
+const mockIsOffline = {value: false};
+
+jest.mock('@hooks/useNetwork', () => ({
+    __esModule: true,
+    default: () => ({isOffline: mockIsOffline.value}),
+}));
+
+// Only useIsFocused is overridden; findFocusedRoute is the real one, since the teardown assertions depend on it.
+jest.mock('@react-navigation/native', () => ({
+    ...jest.requireActual<Record<string, unknown>>('@react-navigation/native'),
+    useIsFocused: () => true,
+}));
+
+type ReactActual = {createElement: typeof React.createElement; Fragment: typeof React.Fragment};
+type ReactNativeActual = {
+    Pressable: React.ComponentType<{testID?: string; accessibilityState?: {disabled?: boolean}; onPress?: () => void}>;
+    Text: React.ComponentType<{children?: React.ReactNode}>;
+};
+
+jest.mock('@components/Text', () => {
+    const {Text} = jest.requireActual<ReactNativeActual>('react-native');
+    return {__esModule: true, default: Text};
+});
+
+// The disabled flag is recorded on `accessibilityState` rather than forwarded to `Pressable`'s `disabled` prop
+// on purpose. A disabled Pressable returns `onStartShouldSetResponder: () => false`, RNTL then refuses to dispatch
+// the event, and `expect(setParams).not.toHaveBeenCalled()` becomes vacuous: it can't tell "correctly disabled"
+// from "handler bailed silently". Keeping the press live makes the two assertions independent.
+jest.mock('@components/PrevNextButtons', () => {
+    const ReactLib = jest.requireActual<ReactActual>('react');
+    const {Pressable} = jest.requireActual<ReactNativeActual>('react-native');
+    return {
+        __esModule: true,
+        default: (props: {onNext: () => void; onPrevious: () => void; isNextButtonDisabled?: boolean; isPrevButtonDisabled?: boolean}) =>
+            ReactLib.createElement(
+                ReactLib.Fragment,
+                null,
+                ReactLib.createElement(Pressable, {testID: 'prev-button', accessibilityState: {disabled: !!props.isPrevButtonDisabled}, onPress: () => props.onPrevious()}),
+                ReactLib.createElement(Pressable, {testID: 'next-button', accessibilityState: {disabled: !!props.isNextButtonDisabled}, onPress: () => props.onNext()}),
+            ),
+    };
+});
+
+jest.mock('@navigation/Navigation', () => ({
+    __esModule: true,
+    default: {
+        setParams: jest.fn(),
+        getActiveRoute: jest.fn(() => 'active-route'),
+    },
+}));
+
+const makeRootState = (focusedRouteName: string) => ({index: 0, routes: [{key: 'k', name: focusedRouteName}]});
+const mockGetRootState = jest.fn(() => makeRootState('testRoute'));
+
+jest.mock('@navigation/navigationRef', () => ({
+    __esModule: true,
+    default: {
+        getRootState: () => mockGetRootState(),
+        getCurrentRoute: jest.fn(() => undefined),
+    },
+}));
+
+jest.mock('@libs/actions/Report', () => ({
+    createTransactionThreadReport: jest.fn(() => undefined),
+    setOptimisticTransactionThread: jest.fn(),
+    openReport: jest.fn(),
+}));
+
+jest.mock('@libs/actions/TransactionThreadNavigation', () => ({
+    clearActiveTransactionIDs: jest.fn(),
+}));
+
+jest.mock('@libs/TransactionThreadNavigationUtils', () => ({
+    getReportIDToOpenForExpense: jest.fn(() => 'resolved-descriptor-report'),
+}));
+
+const makeIOUAction = (transactionID: string, {childReportID, reportID}: {childReportID?: string; reportID: string}) => ({
+    reportActionID: `action_${transactionID}`,
+    actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+    originalMessage: {IOUTransactionID: transactionID, type: 'create'},
+    childReportID,
+    reportID,
+});
+
+const CURRENT_ID = 'tCur';
+const PREV_ID = 'tPrev';
+const NEXT_ID = 'tNext';
+
+const resetMockState = () => {
+    mockState.transactionIDsList = [PREV_ID, CURRENT_ID, NEXT_ID];
+    mockState.snapshotHash = undefined;
+    mockState.snapshot = undefined;
+    mockState.siblingDescriptors = undefined;
+    mockState.transactionsCollection = {};
+    mockState.transactionsStatus = 'loaded';
+    mockState.reportActionsCollection = {};
+    mockState.reportsCollection = {};
+    mockGetRootState.mockReturnValue(makeRootState('testRoute'));
+    mockIsOffline.value = false;
+};
+
+const setupUseOnyx = () => {
+    mockUseOnyx.mockImplementation((key: string, options?: {selector?: (data: unknown) => unknown}) => {
+        const selector = options?.selector;
+        // Every branch returns the full `[value, metadata]` tuple `useOnyx` returns. Consumers read the metadata
+        // (`useCarouselTransactionIDs` gates on its `status`), so a value-only mock isn't the hook's contract.
+        const loaded = (value: unknown) => [value, {status: 'loaded'}];
+        if (key === ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS) {
+            return loaded(mockState.transactionIDsList);
+        }
+        if (key === ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH) {
+            return loaded(mockState.snapshotHash);
+        }
+        if (key === `${ONYXKEYS.COLLECTION.SNAPSHOT}${mockState.snapshotHash}`) {
+            return loaded(mockState.snapshot);
+        }
+        if (key === ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS) {
+            return loaded(mockState.siblingDescriptors);
+        }
+        if (key === ONYXKEYS.COLLECTION.TRANSACTION) {
+            return [selector ? selector(mockState.transactionsCollection) : undefined, {status: mockState.transactionsStatus}];
+        }
+        if (key === ONYXKEYS.COLLECTION.REPORT_ACTIONS) {
+            return loaded(selector ? selector(mockState.reportActionsCollection) : undefined);
+        }
+        if (key.startsWith(ONYXKEYS.COLLECTION.REPORT)) {
+            return loaded(mockState.reportsCollection[key]);
+        }
+        // NVP_ONBOARDING (selector-based), NVP_INTRO_SELECTED, BETAS and anything else are not relevant to resolution.
+        return loaded(undefined);
+    });
+};
+
+const renderNavigation = () => render(<MoneyRequestReportTransactionsNavigation currentTransactionID={CURRENT_ID} />);
+
+// Navigation.setParams is deferred inside requestAnimationFrame. Run it synchronously so the resolved
+// navigation happens during the press and can be asserted immediately afterwards.
+const expectArrowDisabled = (testID: string, isDisabled: boolean) => {
+    expect(screen.getByTestId(testID).props.accessibilityState).toEqual({disabled: isDisabled});
+};
+
+const press = (testID: string) => {
+    global.requestAnimationFrame = (callback: FrameRequestCallback) => {
+        callback(0);
+        return 0;
+    };
+    fireEvent.press(screen.getByTestId(testID));
+};
+
+describe('MoneyRequestReportTransactionsNavigation', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        resetMockState();
+        setupUseOnyx();
+    });
+
+    describe('one-transaction parent report', () => {
+        beforeEach(() => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+            mockState.reportsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT}rPrev`]: {reportID: 'rPrev', transactionCount: 1},
+                [`${ONYXKEYS.COLLECTION.REPORT}rNext`]: {reportID: 'rNext', transactionCount: 1},
+            };
+        });
+
+        it('navigates next to the parent reportID', () => {
+            renderNavigation();
+
+            press('next-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'rNext', reportActionID: undefined, anchorTransactionID: NEXT_ID}));
+            expect(mockMarkReportRHPWidth).toHaveBeenCalledWith('rNext', 'wide');
+        });
+
+        it('navigates previous to the parent reportID', () => {
+            renderNavigation();
+
+            press('prev-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'rPrev', reportActionID: undefined, anchorTransactionID: PREV_ID}));
+            expect(mockMarkReportRHPWidth).toHaveBeenCalledWith('rPrev', 'wide');
+        });
+    });
+
+    describe('resolves siblings and parents from the search snapshot', () => {
+        beforeEach(() => {
+            // Live collections are intentionally empty; everything is only in the snapshot.
+            mockState.snapshotHash = 'hash1';
+            mockState.snapshot = {
+                data: {
+                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                    [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+                    [`${ONYXKEYS.COLLECTION.REPORT}rPrev`]: {reportID: 'rPrev', transactionCount: 1},
+                    [`${ONYXKEYS.COLLECTION.REPORT}rNext`]: {reportID: 'rNext', transactionCount: 1},
+                },
+            };
+        });
+
+        it('navigates next using snapshot-only data', () => {
+            renderNavigation();
+
+            press('next-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'rNext', anchorTransactionID: NEXT_ID}));
+        });
+
+        it('navigates previous using snapshot-only data', () => {
+            renderNavigation();
+
+            press('prev-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'rPrev', anchorTransactionID: PREV_ID}));
+        });
+    });
+
+    describe('multi-transaction parent with an existing thread', () => {
+        beforeEach(() => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+            mockState.reportActionsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rPrev`]: {actionPrev: makeIOUAction(PREV_ID, {childReportID: 'threadPrev', reportID: 'rPrev'})},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rNext`]: {actionNext: makeIOUAction(NEXT_ID, {childReportID: 'threadNext', reportID: 'rNext'})},
+            };
+            mockState.reportsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT}rPrev`]: {reportID: 'rPrev', transactionCount: 2},
+                [`${ONYXKEYS.COLLECTION.REPORT}rNext`]: {reportID: 'rNext', transactionCount: 2},
+            };
+        });
+
+        it('navigates next to the existing transaction thread reportID', () => {
+            renderNavigation();
+
+            press('next-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'threadNext', anchorTransactionID: NEXT_ID}));
+            expect(mockMarkReportRHPWidth).toHaveBeenCalledWith('threadNext', 'wide');
+        });
+
+        it('navigates previous to the existing transaction thread reportID', () => {
+            renderNavigation();
+
+            press('prev-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'threadPrev', anchorTransactionID: PREV_ID}));
+            expect(mockMarkReportRHPWidth).toHaveBeenCalledWith('threadPrev', 'wide');
+        });
+    });
+
+    describe('live report actions take precedence over a stale snapshot copy', () => {
+        beforeEach(() => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+            mockState.reportActionsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rPrev`]: {actionPrev: makeIOUAction(PREV_ID, {childReportID: 'threadPrev', reportID: 'rPrev'})},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rNext`]: {actionNext: makeIOUAction(NEXT_ID, {childReportID: 'threadNext', reportID: 'rNext'})},
+            };
+            mockState.reportsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT}rPrev`]: {reportID: 'rPrev', transactionCount: 2},
+                [`${ONYXKEYS.COLLECTION.REPORT}rNext`]: {reportID: 'rNext', transactionCount: 2},
+            };
+            mockState.snapshotHash = 'hash1';
+            mockState.snapshot = {
+                data: {
+                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rPrev`]: {actionPrev: makeIOUAction(PREV_ID, {reportID: 'rPrev'})},
+                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rNext`]: {actionNext: makeIOUAction(NEXT_ID, {reportID: 'rNext'})},
+                },
+            };
+        });
+
+        it('navigates next to the live thread instead of creating a duplicate', () => {
+            renderNavigation();
+
+            press('next-button');
+
+            expect(createTransactionThreadReport).not.toHaveBeenCalled();
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'threadNext', anchorTransactionID: NEXT_ID}));
+        });
+
+        it('navigates previous to the live thread instead of creating a duplicate', () => {
+            renderNavigation();
+
+            press('prev-button');
+
+            expect(createTransactionThreadReport).not.toHaveBeenCalled();
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'threadPrev', anchorTransactionID: PREV_ID}));
+        });
+    });
+
+    describe('multi-transaction parent without a thread', () => {
+        beforeEach(() => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+            mockState.reportActionsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rPrev`]: {actionPrev: makeIOUAction(PREV_ID, {reportID: 'rPrev'})},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rNext`]: {actionNext: makeIOUAction(NEXT_ID, {reportID: 'rNext'})},
+            };
+            mockState.reportsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT}rPrev`]: {reportID: 'rPrev', transactionCount: 2},
+                [`${ONYXKEYS.COLLECTION.REPORT}rNext`]: {reportID: 'rNext', transactionCount: 2},
+            };
+        });
+
+        // Thread creation is delegated to the shared resolver so that both directions, and the other screens that
+        // open a single expense, agree on where an expense opens.
+        it('resolves the target through the shared resolver and navigates next', () => {
+            jest.mocked(getReportIDToOpenForExpense).mockReturnValue('createdNext');
+            renderNavigation();
+
+            press('next-button');
+
+            expect(getReportIDToOpenForExpense).toHaveBeenCalledWith(
+                expect.objectContaining({reportID: 'rNext', transaction: expect.objectContaining({transactionID: NEXT_ID})}),
+                expect.anything(),
+            );
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'createdNext', anchorTransactionID: NEXT_ID}));
+        });
+
+        it('resolves the target through the shared resolver and navigates previous', () => {
+            jest.mocked(getReportIDToOpenForExpense).mockReturnValue('createdPrev');
+            renderNavigation();
+
+            press('prev-button');
+
+            expect(getReportIDToOpenForExpense).toHaveBeenCalledWith(
+                expect.objectContaining({reportID: 'rPrev', transaction: expect.objectContaining({transactionID: PREV_ID})}),
+                expect.anything(),
+            );
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'createdPrev', anchorTransactionID: PREV_ID}));
+        });
+    });
+
+    describe('snapshot-backed sibling descriptors', () => {
+        beforeEach(() => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+            // No parent report present -> not a one-transaction report, so resolution uses the descriptor.
+            mockState.siblingDescriptors = {
+                [PREV_ID]: {reportID: 'rPrev'},
+                [NEXT_ID]: {reportID: 'rNext'},
+            };
+        });
+
+        it('navigates next to the descriptor-resolved reportID', () => {
+            jest.mocked(getReportIDToOpenForExpense).mockReturnValue('descNext');
+            renderNavigation();
+
+            press('next-button');
+
+            expect(getReportIDToOpenForExpense).toHaveBeenCalled();
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'descNext', anchorTransactionID: NEXT_ID}));
+        });
+
+        it('navigates previous to the descriptor-resolved reportID', () => {
+            jest.mocked(getReportIDToOpenForExpense).mockReturnValue('descPrev');
+            renderNavigation();
+
+            press('prev-button');
+
+            expect(getReportIDToOpenForExpense).toHaveBeenCalled();
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'descPrev', anchorTransactionID: PREV_ID}));
+        });
+    });
+
+    it('does not render navigation when there are fewer than two transactions', () => {
+        mockState.transactionIDsList = [CURRENT_ID];
+
+        renderNavigation();
+
+        expect(screen.queryByTestId('next-button')).toBeNull();
+    });
+
+    /**
+     * The carousel list is a snapshot of what another screen was showing when it seeded it, and it goes stale.
+     * Validating it here is what keeps the counter and the arrows agreeing with what the user can actually reach.
+     */
+    describe('validates the seeded list against live transaction data', () => {
+        const counterFor = (current: number, total: number) => `common.currentOfTotal:${JSON.stringify({current, total})}`;
+
+        it('counts every sibling when they are all still live', () => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+
+            renderNavigation();
+
+            expect(screen.getByText(counterFor(2, 3))).toBeTruthy();
+        });
+
+        // Regression guard for https://github.com/Expensify/App/issues/99617 (the counter kept counting a deleted
+        // expense) and https://github.com/Expensify/App/issues/99614 (its arrow led to a "not here" page).
+        it('drops a sibling that is queued for deletion', () => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {
+                    transactionID: NEXT_ID,
+                    reportID: 'rNext',
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                },
+            };
+
+            renderNavigation();
+
+            expect(screen.getByText(counterFor(2, 2))).toBeTruthy();
+            // The deleted expense is no longer reachable: it was the last entry, so there is nothing after it.
+            expectArrowDisabled('next-button', true);
+            press('next-button');
+            expect(Navigation.setParams).not.toHaveBeenCalled();
+        });
+
+        it('drops a sibling that has already been deleted', () => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: CONST.REPORT.TRASH_REPORT_ID},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+
+            renderNavigation();
+
+            expect(screen.getByText(counterFor(1, 2))).toBeTruthy();
+            expectArrowDisabled('prev-button', true);
+            press('prev-button');
+            expect(Navigation.setParams).not.toHaveBeenCalled();
+        });
+
+        // A transaction that hasn't loaded yet is not a transaction that is gone: dropping those would shrink the
+        // carousel under the user on a cold open (https://github.com/Expensify/App/issues/99641).
+        it('keeps siblings while the transaction collection is still loading', () => {
+            mockState.transactionsCollection = {};
+            mockState.transactionsStatus = 'loading';
+
+            renderNavigation();
+
+            expect(screen.getByText(counterFor(2, 3))).toBeTruthy();
+        });
+
+        // The other half of that rule, and the regression guard that matters: a confirmed delete SETs
+        // `transactions_<id>` to null, so once the collection has loaded, absence means the expense is gone. Keeping
+        // it would re-admit a deleted expense one network round-trip after the optimistic delete dropped it, which is
+        // https://github.com/Expensify/App/issues/99617 and https://github.com/Expensify/App/issues/99614 again.
+        it('drops siblings that are absent once the transaction collection has loaded', () => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+            };
+
+            renderNavigation();
+
+            expect(screen.getByText(counterFor(2, 2))).toBeTruthy();
+            // An arrow that leads nowhere must not be pressable in the first place: deriving the disabled state from
+            // list position alone left it enabled, and the press then bailed silently with no spinner and no error.
+            expectArrowDisabled('next-button', true);
+            press('next-button');
+            expect(Navigation.setParams).not.toHaveBeenCalled();
+        });
+
+        // Siblings seeded by a snapshot-backed flow (Home "Recently added") carry a descriptor precisely because
+        // they may never reach the live collection, so their absence there is expected rather than a deletion.
+        it('keeps descriptor-backed siblings that are absent from the collection', () => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+            };
+            mockState.siblingDescriptors = {
+                [PREV_ID]: {reportID: 'rPrev', transaction: {transactionID: PREV_ID}},
+                [NEXT_ID]: {reportID: 'rNext', transaction: {transactionID: NEXT_ID}},
+            };
+
+            renderNavigation();
+
+            expect(screen.getByText(counterFor(2, 3))).toBeTruthy();
+        });
+
+        // Regression guard for https://github.com/Expensify/App/issues/99616: after backing out of a report, the
+        // report's list was left driving a thread that was never part of it, so the thread showed a foreign "x of y".
+        it('renders nothing when the current expense is not one of the siblings', () => {
+            mockState.transactionIDsList = [PREV_ID, NEXT_ID];
+
+            renderNavigation();
+
+            expect(screen.queryByTestId('next-button')).toBeNull();
+            expect(screen.queryByTestId('prev-button')).toBeNull();
+        });
+    });
+
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/99611: paying, approving or rejecting an expense
+     * produces further IOU actions carrying the same IOUTransactionID, each with its own thread. Paging onto one of
+     * those opens a system message ("marked as paid") instead of the expense.
+     */
+    describe('ignores IOU actions that did not create the expense', () => {
+        const makePayAction = (transactionID: string, {childReportID, reportID}: {childReportID: string; reportID: string}) => ({
+            reportActionID: `pay_${transactionID}`,
+            actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+            originalMessage: {IOUTransactionID: transactionID, type: CONST.IOU.REPORT_ACTION_TYPE.PAY},
+            childReportID,
+            reportID,
+        });
+
+        beforeEach(() => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: 'rPrev'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: 'rNext'},
+            };
+            mockState.reportsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT}rNext`]: {reportID: 'rNext', transactionCount: 2},
+            };
+        });
+
+        it('prefers the expense-creating action over the pay action on the same transaction', () => {
+            mockState.reportActionsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rNext`]: {
+                    payNext: makePayAction(NEXT_ID, {childReportID: 'payThreadNext', reportID: 'rNext'}),
+                    actionNext: makeIOUAction(NEXT_ID, {childReportID: 'threadNext', reportID: 'rNext'}),
+                },
+            };
+
+            renderNavigation();
+
+            press('next-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'threadNext', anchorTransactionID: NEXT_ID}));
+        });
+
+        it('does not open the pay action thread when it is the only action on the transaction', () => {
+            jest.mocked(getReportIDToOpenForExpense).mockReturnValue('rNext');
+            mockState.reportActionsCollection = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}rNext`]: {payNext: makePayAction(NEXT_ID, {childReportID: 'payThreadNext', reportID: 'rNext'})},
+            };
+
+            renderNavigation();
+
+            press('next-button');
+
+            expect(Navigation.setParams).not.toHaveBeenCalledWith(expect.objectContaining({reportID: 'payThreadNext'}));
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'rNext', anchorTransactionID: NEXT_ID}));
+        });
+    });
+
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/99612: an unreported (self-DM) sibling used to
+     * fall through with no resolved target, and the resulting navigation dumped the user in their self-DM.
+     */
+    it('stays put rather than navigating to the unreported placeholder report', () => {
+        jest.mocked(getReportIDToOpenForExpense).mockReturnValue(CONST.REPORT.UNREPORTED_REPORT_ID);
+        mockState.transactionsCollection = {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: CONST.REPORT.UNREPORTED_REPORT_ID},
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: CONST.REPORT.UNREPORTED_REPORT_ID},
+        };
+
+        renderNavigation();
+
+        press('next-button');
+
+        expect(Navigation.setParams).not.toHaveBeenCalled();
+        expect(mockMarkReportRHPWidth).not.toHaveBeenCalled();
+    });
+
+    /**
+     * An unreported (self-DM) sibling is the one case the transaction alone doesn't make resolvable: report "0" is
+     * neither a report to open nor one whose actions can be fetched, so without its IOU action the arrow has
+     * nowhere to go. It used to stay enabled and bail silently on press.
+     */
+    describe('unreported (self-DM) siblings', () => {
+        beforeEach(() => {
+            mockState.transactionsCollection = {
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${CURRENT_ID}`]: {transactionID: CURRENT_ID, reportID: 'rCur'},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${PREV_ID}`]: {transactionID: PREV_ID, reportID: CONST.REPORT.UNREPORTED_REPORT_ID},
+                [`${ONYXKEYS.COLLECTION.TRANSACTION}${NEXT_ID}`]: {transactionID: NEXT_ID, reportID: CONST.REPORT.UNREPORTED_REPORT_ID},
+            };
+        });
+
+        it('disables the arrow when the sibling has no IOU action to resolve or create a thread from', () => {
+            renderNavigation();
+
+            expectArrowDisabled('next-button', true);
+            expectArrowDisabled('prev-button', true);
+        });
+
+        it('keeps the arrow enabled and creates the thread once the IOU action is known', () => {
+            // The self-DM's actions, as the search snapshot carries them. The action has no childReportID, so the
+            // shared resolver creates the thread rather than leaving the press with report "0" and no target.
+            mockState.snapshotHash = 'hash1';
+            mockState.snapshot = {
+                data: {
+                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}selfDM`]: {
+                        [`action_${NEXT_ID}`]: makeIOUAction(NEXT_ID, {reportID: 'selfDM'}),
+                    },
+                },
+            };
+            jest.mocked(getReportIDToOpenForExpense).mockReturnValue('created-self-dm-thread');
+
+            renderNavigation();
+
+            expectArrowDisabled('next-button', false);
+            expectArrowDisabled('prev-button', true);
+
+            press('next-button');
+
+            expect(Navigation.setParams).toHaveBeenCalledWith(expect.objectContaining({reportID: 'created-self-dm-thread', anchorTransactionID: NEXT_ID}));
+        });
+    });
+
+    describe('clearing the carousel on unmount', () => {
+        const setFocusedRoute = (name: string) => {
+            mockGetRootState.mockReturnValue(makeRootState(name));
+        };
+
+        // Unmounting onto one of these means we're still inside the expense-navigation flow, and a screen lower in
+        // the RHP stack may still depend on the carousel. In particular, opening the parent report from the
+        // subtitle link pushes an EXPENSE_REPORT / SEARCH_MONEY_REQUEST_REPORT RHP on top of the transaction
+        // thread, so backing out of an expense onto it must not wipe the underlying thread's carousel (#90366).
+        it.each([
+            ['SEARCH_REPORT', SCREENS.RIGHT_MODAL.SEARCH_REPORT],
+            ['SEARCH_MONEY_REQUEST_REPORT', SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT],
+            ['EXPENSE_REPORT', SCREENS.RIGHT_MODAL.EXPENSE_REPORT],
+            ['TRANSACTION_DUPLICATE.DYNAMIC_REVIEW', SCREENS.TRANSACTION_DUPLICATE.DYNAMIC_REVIEW],
+        ])('keeps the active transaction IDs when unmounting onto %s', (_label, screenName) => {
+            setFocusedRoute(screenName);
+
+            renderNavigation().unmount();
+
+            expect(clearActiveTransactionIDs).not.toHaveBeenCalled();
+        });
+
+        it('clears the active transaction IDs when unmounting onto an unrelated screen', () => {
+            setFocusedRoute(SCREENS.SEARCH.ROOT);
+
+            renderNavigation().unmount();
+
+            expect(clearActiveTransactionIDs).toHaveBeenCalled();
+        });
+    });
+});
diff --git a/tests/unit/components/Table/TableSemanticContainerTest.tsx b/tests/unit/components/Table/TableSemanticContainerTest.tsx
index 5462430d7d53..d4216c3f223f 100644
--- a/tests/unit/components/Table/TableSemanticContainerTest.tsx
+++ b/tests/unit/components/Table/TableSemanticContainerTest.tsx
@@ -53,12 +53,14 @@ function renderContainer(
     {
         isEnabled = true,
         rowCount = 3,
+        hasHeaderRow = true,
         rendersBodyWhenEmpty = false,
         shouldUseDynamicColumns = false,
         onLayout,
     }: {
         isEnabled?: boolean;
         rowCount?: number;
+        hasHeaderRow?: boolean;
         rendersBodyWhenEmpty?: boolean;
         shouldUseDynamicColumns?: boolean;
         onLayout?: React.ComponentProps<typeof TableSemanticContainer>['onLayout'];
@@ -70,6 +72,7 @@ function renderContainer(
             title="Members"
             rowCount={rowCount}
             columnCount={4}
+            hasHeaderRow={hasHeaderRow}
             rendersBodyWhenEmpty={rendersBodyWhenEmpty}
             shouldUseDynamicColumns={shouldUseDynamicColumns}
             scrollWidth={undefined}
@@ -121,6 +124,12 @@ describe('TableSemanticContainer', () => {
         expect(within(table).getByTestId('stub-body')).toBeTruthy();
     });
 
+    it('leaves the header row out of aria-rowcount when the table has no column header', () => {
+        renderContainer([React.createElement(TableHeader, {key: 'h'}), React.createElement(TableBody, {key: 'b'})], {hasHeaderRow: false});
+
+        expect(screen.getByLabelText('Members').props['aria-rowcount']).toBe(3);
+    });
+
     it('keeps non-header/body children outside the table container', () => {
         const filterBar = React.createElement(View, {key: 'f', testID: 'filter-bar'});
         renderContainer([filterBar, React.createElement(TableHeader, {key: 'h'}), React.createElement(TableBody, {key: 'b'})]);
@@ -165,6 +174,7 @@ describe('TableSemanticContainer', () => {
                 title="Members"
                 rowCount={rowCount}
                 columnCount={4}
+                hasHeaderRow
                 rendersBodyWhenEmpty={false}
                 shouldUseDynamicColumns={false}
                 scrollWidth={undefined}
@@ -203,6 +213,7 @@ describe('TableSemanticContainer', () => {
                 title="Members"
                 rowCount={3}
                 columnCount={4}
+                hasHeaderRow
                 rendersBodyWhenEmpty={false}
                 shouldUseDynamicColumns
                 scrollWidth={undefined}
diff --git a/tests/unit/databaseSizeTrackerTest.ts b/tests/unit/databaseSizeTrackerTest.ts
index cb080a76b18e..c36e361b1c34 100644
--- a/tests/unit/databaseSizeTrackerTest.ts
+++ b/tests/unit/databaseSizeTrackerTest.ts
@@ -11,6 +11,7 @@ import {getGlobalSpanAttributes} from '@libs/telemetry/globalSpanAttributes';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
+import * as Sentry from '@sentry/react-native';
 import Onyx from 'react-native-onyx';
 
 import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
@@ -20,12 +21,21 @@ jest.mock('@libs/telemetry/databaseSize', () => ({
     default: jest.fn(),
 }));
 
+jest.mock('@sentry/react-native', () => ({
+    setTag: jest.fn(),
+}));
+
 Onyx.init({keys: ONYXKEYS});
 
 const mockMeasureDatabaseSize = jest.mocked(measureDatabaseSize);
 
 // The tracker keeps one-shot module state (initial schedule, first measurement), so these tests build on each other in order.
 describe('databaseSizeTracker', () => {
+    beforeEach(() => {
+        // Each test asserts its own setTag call, so an earlier test must not satisfy it
+        jest.mocked(Sentry.setTag).mockClear();
+    });
+
     afterEach(() => {
         jest.useRealTimers();
     });
@@ -36,6 +46,8 @@ describe('databaseSizeTracker', () => {
 
         expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_BYTES]).toBe(123);
         expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_SOURCE]).toBe(CONST.TELEMETRY.DB_SIZE_SOURCE.SQLITE);
+        // The tier is tagged from the persisted value too, so the startup span carries it before this session measures anything
+        expect(Sentry.setTag).toHaveBeenCalledWith(CONST.TELEMETRY.TAGS.DB_SIZE, CONST.TELEMETRY.SIZE_TIER.SMALL);
     });
 
     it('ignores re-measurement requests before the initial measurement ran', async () => {
@@ -60,6 +72,7 @@ describe('databaseSizeTracker', () => {
         expect(mockMeasureDatabaseSize).toHaveBeenCalledTimes(1);
         expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_BYTES]).toBe(5000);
         expect(setSpy).toHaveBeenCalledWith(ONYXKEYS.LAST_MEASURED_DATABASE_SIZE, {bytes: 5000, source: CONST.TELEMETRY.DB_SIZE_SOURCE.SQLITE});
+        expect(Sentry.setTag).toHaveBeenCalledWith(CONST.TELEMETRY.TAGS.DB_SIZE, CONST.TELEMETRY.SIZE_TIER.SMALL);
         setSpy.mockRestore();
     });
 
@@ -76,7 +89,7 @@ describe('databaseSizeTracker', () => {
     it('debounces re-measurements once the initial measurement exists', async () => {
         jest.useFakeTimers();
         mockMeasureDatabaseSize.mockClear();
-        mockMeasureDatabaseSize.mockResolvedValue({bytes: 6000, source: CONST.TELEMETRY.DB_SIZE_SOURCE.SQLITE});
+        mockMeasureDatabaseSize.mockResolvedValue({bytes: 21_000_000, source: CONST.TELEMETRY.DB_SIZE_SOURCE.SQLITE});
 
         requestDatabaseSizeRemeasurement(1);
         requestDatabaseSizeRemeasurement(1);
@@ -85,7 +98,9 @@ describe('databaseSizeTracker', () => {
         await jest.advanceTimersByTimeAsync(REMEASURE_DEBOUNCE_TIME_MS * 2);
 
         expect(mockMeasureDatabaseSize).toHaveBeenCalledTimes(1);
-        expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_BYTES]).toBe(6000);
+        expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_BYTES]).toBe(21_000_000);
+        // A live re-measurement that crosses the 20 MB border moves the tag, so a growing database changes cohort without a restart
+        expect(Sentry.setTag).toHaveBeenCalledWith(CONST.TELEMETRY.TAGS.DB_SIZE, CONST.TELEMETRY.SIZE_TIER.LARGE);
     });
 
     it('keeps the last good measurement when a re-measurement fails', async () => {
@@ -98,7 +113,7 @@ describe('databaseSizeTracker', () => {
         await jest.advanceTimersByTimeAsync(REMEASURE_DEBOUNCE_TIME_MS * 2);
 
         expect(mockMeasureDatabaseSize).toHaveBeenCalledTimes(1);
-        expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_BYTES]).toBe(6000);
+        expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_BYTES]).toBe(21_000_000);
         expect(getGlobalSpanAttributes()[CONST.TELEMETRY.ATTRIBUTE_DB_SIZE_SOURCE]).toBe(CONST.TELEMETRY.DB_SIZE_SOURCE.SQLITE);
         expect(setSpy).not.toHaveBeenCalledWith(ONYXKEYS.LAST_MEASURED_DATABASE_SIZE, {source: CONST.TELEMETRY.DB_SIZE_SOURCE.UNAVAILABLE});
         setSpy.mockRestore();
diff --git a/tests/unit/dismissModalAndOpenReportInInboxTabTest.ts b/tests/unit/dismissModalAndOpenReportInInboxTabTest.ts
index 06800964c755..32befce4bec5 100644
--- a/tests/unit/dismissModalAndOpenReportInInboxTabTest.ts
+++ b/tests/unit/dismissModalAndOpenReportInInboxTabTest.ts
@@ -1,3 +1,4 @@
+import {mergeExpenseAddedGrowlTransactionIDs} from '@libs/actions/Transaction';
 import dismissModalAndOpenReportInInboxTab from '@libs/Navigation/helpers/dismissModalAndOpenReportInInboxTab';
 import type isReportOpenInRHP from '@libs/Navigation/helpers/isReportOpenInRHP';
 import Navigation from '@libs/Navigation/Navigation';
@@ -17,6 +18,9 @@ jest.mock('@libs/Navigation/helpers/isReportOpenInSuperWideRHP', () => () => fal
 jest.mock('@libs/Navigation/helpers/setNavigationActionToMicrotaskQueue', () => (callback: () => void) => {
     callback();
 });
+jest.mock('@libs/actions/Transaction', () => ({
+    mergeExpenseAddedGrowlTransactionIDs: jest.fn(),
+}));
 jest.mock('@libs/getIsNarrowLayout', () => () => false);
 jest.mock('@libs/telemetry/submitFollowUpAction', () => ({
     isTracking: () => mockGetTrackingState(),
@@ -32,7 +36,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
     navigationRef: {
         getRootState: jest.fn(() => ({
-            routes: [],
+            routes: [{state: {key: 'rhp-key'}}],
         })),
     },
 }));
@@ -77,4 +81,32 @@ describe('dismissModalAndOpenReportInInboxTab', () => {
         expect(Navigation.dismissToPreviousRHP).not.toHaveBeenCalled();
         expect(Navigation.dismissModalWithReport).toHaveBeenCalledWith({reportID});
     });
+
+    it('should remove the pending growl before navigating to a multi-expense report', () => {
+        // Given a new transaction will be shown in a multi-expense report
+        const reportID = 'report-123';
+        const transactionID = 'transaction-123';
+        mockIsReportOpenInRHP.mockReturnValue(true);
+
+        // When the modal is dismissed and the expense report navigation is queued
+        dismissModalAndOpenReportInInboxTab(reportID, undefined, true, transactionID);
+
+        // Then the pending growl is consumed before navigating to the expense report
+        expect(mergeExpenseAddedGrowlTransactionIDs).toHaveBeenCalledWith({
+            [transactionID]: null,
+        });
+        expect(Navigation.navigate).toHaveBeenCalled();
+    });
+
+    it('should keep the pending growl when navigating to an Inbox chat', () => {
+        // Given a new transaction will be shown in an Inbox chat rather than a multi-expense report
+        const reportID = 'report-123';
+        const transactionID = 'transaction-123';
+
+        // When the modal is dismissed and the chat is opened
+        dismissModalAndOpenReportInInboxTab(reportID, undefined, false, transactionID);
+
+        // Then the pending growl is kept
+        expect(mergeExpenseAddedGrowlTransactionIDs).not.toHaveBeenCalled();
+    });
 });
diff --git a/tests/unit/getSuggestedAgentRuleIconTest.ts b/tests/unit/getSuggestedAgentRuleIconTest.ts
deleted file mode 100644
index 2897ff1413ec..000000000000
--- a/tests/unit/getSuggestedAgentRuleIconTest.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import {getSuggestedAgentRuleIcon} from '@libs/PolicyRulesUtils';
-
-describe('getSuggestedAgentRuleIcon', () => {
-    it('maps amount/cap titles to Coins even when the prompt says Reject', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'expense-amount-over',
-                title: 'Per-expense amount over a cap',
-                prompt: 'Reject any single expense of $75 or more.',
-            }),
-        ).toBe('Coins');
-    });
-
-    it('prefers Coins over Flag when amount and within both match', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'expense-amount-between',
-                title: 'Per-expense amount within a flagged band',
-                prompt: 'Reject expenses with an amount between $500 and $1000 inclusive.',
-            }),
-        ).toBe('Coins');
-    });
-
-    it('prefers CircleSlash over Coins when block and amount both match', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'blocked-amount',
-                title: 'Block expenses over an amount cap',
-                prompt: 'Reject blocked high-amount spend.',
-            }),
-        ).toBe('CircleSlash');
-    });
-
-    it('maps flagged titles without money keywords to Flag', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'receipt-mismatch',
-                title: 'Receipt mismatch on weekend',
-                prompt: 'Flag expenses with a receipt mismatch.',
-            }),
-        ).toBe('Flag');
-    });
-
-    it('maps banned/block titles to CircleSlash', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'merchant-contains',
-                title: 'Merchant name contains a banned word',
-                prompt: 'Reject any expense whose merchant name contains the word "casino".',
-            }),
-        ).toBe('CircleSlash');
-    });
-
-    it('defaults allow-list / category rules to ThumbsUp', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'category-is',
-                title: 'Category is a specific value',
-                prompt: 'Only approve expenses categorized as "Travel". Reject expenses in any other category.',
-            }),
-        ).toBe('ThumbsUp');
-    });
-
-    it('defaults to ThumbsUp when no keyword matches', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'custom',
-                title: 'Something custom',
-                prompt: 'Do a custom thing',
-            }),
-        ).toBe('ThumbsUp');
-    });
-
-    it('does not match age inside agent or manage', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'agent-rules',
-                title: 'Agent rules for workspace',
-                prompt: 'Describe agent rules.',
-            }),
-        ).toBe('ThumbsUp');
-
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'manage-approvals',
-                title: 'Manage approval workflow',
-                prompt: 'Manage approvals carefully.',
-            }),
-        ).toBe('ThumbsUp');
-    });
-
-    it('does not match cap inside capital', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'capital-expense',
-                title: 'Capital expense approval',
-                prompt: 'Approve capital expenses.',
-            }),
-        ).toBe('ThumbsUp');
-    });
-
-    it('does not match age inside page', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'page-count',
-                title: 'Page count limits',
-                prompt: 'Limit page count.',
-            }),
-        ).toBe('ThumbsUp');
-    });
-
-    it('overrides number-of-expenses to Flag even though its title has no keyword match', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'number-of-expenses',
-                title: 'Too many expenses',
-                prompt: 'Reject reports that contain more than 5 expenses; they must be split into smaller reports. Approve reports with 5 or fewer expenses.',
-            }),
-        ).toBe('Flag');
-    });
-
-    it('overrides receipt-transaction-mismatch to Flag even though its title also matches a Coins keyword', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'receipt-transaction-mismatch',
-                title: 'Receipt total mismatch',
-                prompt: 'Reject an expense when the total shown on its receipt does not match the expense amount, noting the discrepancy. Approve when the receipt total matches the expense amount.',
-            }),
-        ).toBe('Flag');
-    });
-
-    it('overrides itemized-split-recommended to Flag even though its title also matches a CircleSlash keyword', () => {
-        expect(
-            getSuggestedAgentRuleIcon({
-                id: 'itemized-split-recommended',
-                title: 'Mixed business / personal items',
-                prompt: 'When a single receipt mixes clearly business items with clearly personal items, reject it and ask the submitter to split out the personal items. Approve all-business receipts.',
-            }),
-        ).toBe('Flag');
-    });
-});
diff --git a/tests/unit/getWorkspaceMenuItemsTest.ts b/tests/unit/getWorkspaceMenuItemsTest.ts
index 6bbfacfbf7a5..0be6c2a0dfd0 100644
--- a/tests/unit/getWorkspaceMenuItemsTest.ts
+++ b/tests/unit/getWorkspaceMenuItemsTest.ts
@@ -267,32 +267,36 @@ describe('getWorkspaceMenuItems', () => {
         expect(items.find((item) => item.translationKey === 'workspace.common.workflows')?.brickRoadIndicator).toBe(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
     });
 
-    it('shows an error indicator when rules have errors', () => {
-        const policy = createMock<Policy>({
-            ...buildPolicy(CONST.POLICY.ROLE.ADMIN),
-            areRulesEnabled: true,
-            rules: {
-                codingRules: {
-                    rule: {
-                        ruleID: 'rule',
-                        filters: {left: 'merchant', operator: CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO, right: 'Acme'},
-                        errors: {error: 'Whoops'},
-                    },
-                },
-            },
-        });
+    it('shows an error indicator when a merchant rule failed to save', () => {
+        const policy = createMock<Policy>({...buildPolicy(CONST.POLICY.ROLE.ADMIN), areRulesEnabled: true});
 
         const items = getWorkspaceMenuItems({
             policy,
             policyID: policy.id,
             currentUserLogin,
             icons,
+            hasMerchantRuleErrors: true,
             convertToDisplayString: () => '',
         });
 
         expect(items.find((item) => item.translationKey === 'workspace.common.rules')?.brickRoadIndicator).toBe(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
     });
 
+    it('shows no error indicator when no merchant rule failed', () => {
+        const policy = createMock<Policy>({...buildPolicy(CONST.POLICY.ROLE.ADMIN), areRulesEnabled: true});
+
+        const items = getWorkspaceMenuItems({
+            policy,
+            policyID: policy.id,
+            currentUserLogin,
+            icons,
+            hasMerchantRuleErrors: false,
+            convertToDisplayString: () => '',
+        });
+
+        expect(items.find((item) => item.translationKey === 'workspace.common.rules')?.brickRoadIndicator).toBeUndefined();
+    });
+
     it('shows an information indicator when Merge HR setup is incomplete', () => {
         const policy = createMock<Policy>({
             ...buildPolicy(CONST.POLICY.ROLE.ADMIN),
@@ -317,6 +321,52 @@ describe('getWorkspaceMenuItems', () => {
         expect(items.find((item) => item.translationKey === 'workspace.common.hr')?.brickRoadIndicator).toBe(CONST.BRICK_ROAD_INDICATOR_STATUS.INFO);
     });
 
+    it('shows an information indicator on Accounting when the QBO refresh token is about to expire', () => {
+        const policy = createMock<Policy>({
+            ...buildPolicy(CONST.POLICY.ROLE.ADMIN),
+            areConnectionsEnabled: true,
+            connections: {
+                [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                    config: {credentials: {companyID: '12345', refreshTokenExpiresAt: Math.floor(Date.now() / 1000) + 3 * 86400}},
+                    lastSync: {isSuccessful: true, isConnected: true, isAuthenticationError: false},
+                },
+            },
+        });
+
+        const items = getWorkspaceMenuItems({
+            policy,
+            policyID: policy.id,
+            currentUserLogin,
+            icons,
+            convertToDisplayString: () => '',
+        });
+
+        expect(items.find((item) => item.translationKey === 'workspace.common.accounting')?.brickRoadIndicator).toBe(CONST.BRICK_ROAD_INDICATOR_STATUS.INFO);
+    });
+
+    it('keeps the error indicator on Accounting when a sync error exists even if the QBO refresh token is about to expire', () => {
+        const policy = createMock<Policy>({
+            ...buildPolicy(CONST.POLICY.ROLE.ADMIN),
+            areConnectionsEnabled: true,
+            connections: {
+                [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                    config: {credentials: {companyID: '12345', refreshTokenExpiresAt: Math.floor(Date.now() / 1000) + 3 * 86400}},
+                    lastSync: {isSuccessful: false, isConnected: false, isAuthenticationError: true, errorDate: new Date().toISOString(), errorMessage: 'Error'},
+                },
+            },
+        });
+
+        const items = getWorkspaceMenuItems({
+            policy,
+            policyID: policy.id,
+            currentUserLogin,
+            icons,
+            convertToDisplayString: () => '',
+        });
+
+        expect(items.find((item) => item.translationKey === 'workspace.common.accounting')?.brickRoadIndicator).toBe(CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR);
+    });
+
     it('shows an error indicator when the Merge HR connection has an authentication error', () => {
         const policy = createMock<Policy>({
             ...buildPolicy(CONST.POLICY.ROLE.ADMIN),
diff --git a/tests/unit/hasRenderableChildrenTest.tsx b/tests/unit/hasRenderableChildrenTest.tsx
new file mode 100644
index 000000000000..724a4138173c
--- /dev/null
+++ b/tests/unit/hasRenderableChildrenTest.tsx
@@ -0,0 +1,30 @@
+import hasRenderableChildren from '@libs/hasRenderableChildren';
+
+import React from 'react';
+import {View} from 'react-native';
+
+describe('hasRenderableChildren', () => {
+    it('returns false for children that render nothing', () => {
+        // Given children React skips when rendering: nothing at all, a single empty value, and sibling conditionals that all came out empty
+        // When checking each of them
+        // Then none counts as renderable, unlike `!!children`, which is true for the array
+        expect(hasRenderableChildren(undefined)).toBe(false);
+        expect(hasRenderableChildren(false)).toBe(false);
+        expect(hasRenderableChildren([false, null, undefined, ''])).toBe(false);
+    });
+
+    it('returns true when at least one child renders', () => {
+        // Given sibling conditionals where only one came out as an element
+        // When checking them
+        // Then the one element makes them renderable
+        expect(hasRenderableChildren([false, <View key="child" />])).toBe(true);
+    });
+
+    it('treats an empty string as nothing and other text as renderable', () => {
+        // Given text children, which React renders as-is unless empty
+        // When checking them
+        // Then only the non-empty one counts
+        expect(hasRenderableChildren('')).toBe(false);
+        expect(hasRenderableChildren('text')).toBe(true);
+    });
+});
diff --git a/tests/unit/hooks/useAdvancedSearchFilters.test.ts b/tests/unit/hooks/useAdvancedSearchFilters.test.ts
index c99c72eb5a2f..71b64312da65 100644
--- a/tests/unit/hooks/useAdvancedSearchFilters.test.ts
+++ b/tests/unit/hooks/useAdvancedSearchFilters.test.ts
@@ -7,6 +7,7 @@ import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, PolicyTagLists} from '@src/types/onyx';
+import type {Connections} from '@src/types/onyx/Policy';
 
 import type * as NativeNavigation from '@react-navigation/native';
 
@@ -14,6 +15,7 @@ import React from 'react';
 import Onyx from 'react-native-onyx';
 
 import createRandomPolicy from '../../utils/collections/policies';
+import createMock from '../../utils/createMock';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
 jest.mock('@src/libs/Log');
@@ -35,7 +37,6 @@ jest.mock('@hooks/useExportedToFilterOptions', () => ({
     __esModule: true,
     default: () => ({
         exportedToFilterOptions: [],
-        combinedUniqueExportTemplates: [],
         connectedIntegrationNames: new Set<string>(),
     }),
 }));
@@ -178,6 +179,37 @@ describe('useAdvancedSearchFilters', () => {
         });
     });
 
+    describe('vendor filter visibility', () => {
+        it('hides the vendor filter when no workspace has the vendor feature', async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, buildPolicy(1, {connections: undefined}));
+
+            const {result} = renderHook(() => useAdvancedSearchFilters(undefined), {wrapper});
+
+            await waitFor(() => {
+                const allKeys = result.current.flat();
+                expect(allKeys).toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY);
+                expect(allKeys).not.toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR);
+            });
+        });
+
+        it('shows the vendor filter when a workspace exports QBO card expenses as credit card transactions', async () => {
+            const connections = createMock<Connections>({
+                [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                    config: {nonReimbursableExpensesExportDestination: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD},
+                    data: {vendors: []},
+                },
+            });
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, buildPolicy(1, {connections}));
+
+            const {result} = renderHook(() => useAdvancedSearchFilters(undefined), {wrapper});
+
+            await waitFor(() => {
+                const allKeys = result.current.flat();
+                expect(allKeys).toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.VENDOR);
+            });
+        });
+    });
+
     describe('tax filter visibility', () => {
         it('hides tax filter when no policies have taxes enabled', async () => {
             const policy = buildPolicy(1, {tax: {trackingEnabled: false}});
diff --git a/tests/unit/hooks/useAppReturnCount.test.ts b/tests/unit/hooks/useAppReturnCount.test.ts
new file mode 100644
index 000000000000..b88709f50088
--- /dev/null
+++ b/tests/unit/hooks/useAppReturnCount.test.ts
@@ -0,0 +1,83 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useAppReturnCount from '@hooks/useAppReturnCount';
+
+import type {AppStateStatus} from 'react-native';
+
+import {AppState} from 'react-native';
+
+const mockedAddEventListener = jest.spyOn(AppState, 'addEventListener');
+
+function emitAppState(nextAppState: AppStateStatus) {
+    const callback = mockedAddEventListener.mock.calls.at(-1)?.[1];
+    act(() => callback?.(nextAppState));
+}
+
+describe('useAppReturnCount', () => {
+    beforeEach(() => {
+        mockedAddEventListener.mockClear();
+        mockedAddEventListener.mockImplementation(() => ({remove: jest.fn()}) as ReturnType<typeof AppState.addEventListener>);
+    });
+
+    it('starts at zero', () => {
+        // Given a freshly mounted hook
+
+        // When nothing has happened yet
+        const {result} = renderHook(() => useAppReturnCount());
+
+        // Then there is nothing to refresh for
+        expect(result.current).toBe(0);
+    });
+
+    it('counts a return from the background', () => {
+        // Given a mounted hook
+        const {result} = renderHook(() => useAppReturnCount());
+
+        // When the app is backgrounded and then reopened
+        emitAppState('background');
+        emitAppState('active');
+
+        // Then that counts as one return
+        expect(result.current).toBe(1);
+    });
+
+    it('ignores a transient interruption that never reached the background', () => {
+        // Given a mounted hook
+        const {result} = renderHook(() => useAppReturnCount());
+
+        // When iOS reports `inactive` and then `active`, like Control Center or a permission dialog
+        emitAppState('inactive');
+        emitAppState('active');
+
+        // Then the app never left, so nothing is refetched
+        expect(result.current).toBe(0);
+    });
+
+    it('counts a background trip that passes through inactive', () => {
+        // Given a mounted hook
+        const {result} = renderHook(() => useAppReturnCount());
+
+        // When the app follows the real iOS sequence for leaving and coming back
+        emitAppState('inactive');
+        emitAppState('background');
+        emitAppState('inactive');
+        emitAppState('active');
+
+        // Then it is counted once, not once per transition
+        expect(result.current).toBe(1);
+    });
+
+    it('counts each separate return', () => {
+        // Given a mounted hook
+        const {result} = renderHook(() => useAppReturnCount());
+
+        // When the user leaves and comes back twice
+        emitAppState('background');
+        emitAppState('active');
+        emitAppState('background');
+        emitAppState('active');
+
+        // Then both returns are reported, so a stale screen refreshes each time
+        expect(result.current).toBe(2);
+    });
+});
diff --git a/tests/unit/hooks/useAutocompleteSuggestions.test.ts b/tests/unit/hooks/useAutocompleteSuggestions.test.ts
index 2f2cb12291dd..689233186b42 100644
--- a/tests/unit/hooks/useAutocompleteSuggestions.test.ts
+++ b/tests/unit/hooks/useAutocompleteSuggestions.test.ts
@@ -23,6 +23,11 @@ jest.mock('@hooks/useOnyx', () => ({
 }));
 
 jest.mock('@hooks/useNetwork', () => jest.fn(() => ({isOffline: false})));
+
+jest.mock('@components/OnyxListItemProvider', () => ({
+    useCardList: () => ({}),
+    useWorkspaceCardList: () => ({}),
+}));
 jest.mock('@libs/actions/Search', () => ({openSearchCategoryFiltersPage: jest.fn()}));
 
 const mockConvertToDisplayString = jest.fn(() => '$0.00');
@@ -104,7 +109,6 @@ jest.mock('@hooks/useExportedToFilterOptions', () => ({
     __esModule: true,
     default: () => ({
         exportedToFilterOptions: ['QuickBooks Online', 'Xero', 'NetSuite'],
-        combinedUniqueExportTemplates: [],
         connectedIntegrationNames: new Set<string>(),
     }),
 }));
diff --git a/tests/unit/hooks/useCompanyCardConnectionError.test.ts b/tests/unit/hooks/useCompanyCardConnectionError.test.ts
new file mode 100644
index 000000000000..72e920eee26c
--- /dev/null
+++ b/tests/unit/hooks/useCompanyCardConnectionError.test.ts
@@ -0,0 +1,70 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useCompanyCardConnectionError from '@hooks/useCompanyCardConnectionError';
+
+import {getCardFeedWithDomainID} from '@libs/CardUtils';
+
+import CONST from '@src/CONST';
+import type {AddNewCompanyCardFeed, CombinedCardFeeds} from '@src/types/onyx';
+
+import createMock from '../../utils/createMock';
+
+const newFeed = getCardFeedWithDomainID(CONST.COMPANY_CARD.FEED_BANK_NAME.AMEX_DIRECT, 1);
+const errorKey = '1';
+
+function getFeedWithErrors(errors?: Record<string, string>): CombinedCardFeeds {
+    return createMock<CombinedCardFeeds>({
+        [newFeed]: {errors},
+    });
+}
+
+function getAddNewCardWithErrors(errors?: Record<string, string>): AddNewCompanyCardFeed {
+    return createMock<AddNewCompanyCardFeed>({errors});
+}
+
+describe('useCompanyCardConnectionError', () => {
+    it('returns an add-flow error', () => {
+        // Given an add-card flow with an import error
+        const addNewCard = getAddNewCardWithErrors({[errorKey]: 'Add card error'});
+
+        // When the connection error hook is rendered for that flow
+        const {result} = renderHook(() => useCompanyCardConnectionError({addNewCard, isAddingNewCard: true}));
+
+        // Then it exposes the error and its message
+        expect(result.current).toMatchObject({hasError: true, errorMessage: 'Add card error'});
+    });
+
+    it('returns a newly connected feed error', () => {
+        // Given a newly connected feed with an error
+        const cardFeeds = getFeedWithErrors({[errorKey]: 'Feed error'});
+
+        // When the connection error hook is rendered for the new feed
+        const {result} = renderHook(() => useCompanyCardConnectionError({cardFeeds, newFeed, isAddingNewCard: true}));
+
+        // Then it exposes the feed error and its message
+        expect(result.current).toMatchObject({hasError: true, errorMessage: 'Feed error'});
+    });
+
+    it('prioritizes the add-flow error when both error sources are present', () => {
+        // Given both the add-card flow and newly connected feed have errors
+        const addNewCard = getAddNewCardWithErrors({[errorKey]: 'Add card error'});
+        const cardFeeds = getFeedWithErrors({[errorKey]: 'Feed error'});
+
+        // When the connection error hook is rendered for the add-card flow
+        const {result} = renderHook(() => useCompanyCardConnectionError({cardFeeds, addNewCard, newFeed, isAddingNewCard: true}));
+
+        // Then it exposes the add-flow error first
+        expect(result.current).toMatchObject({hasError: true, errorMessage: 'Add card error'});
+    });
+
+    it('ignores add-flow errors outside the add-card flow', () => {
+        // Given a stale add-card error without a new feed error
+        const addNewCard = getAddNewCardWithErrors({[errorKey]: 'Add card error'});
+
+        // When the connection error hook is rendered for an existing feed
+        const {result} = renderHook(() => useCompanyCardConnectionError({addNewCard, isAddingNewCard: false}));
+
+        // Then the add-card error does not affect the existing-feed flow
+        expect(result.current).toMatchObject({hasError: false, errorMessage: undefined});
+    });
+});
diff --git a/tests/unit/hooks/useConfirmationAmount.test.tsx b/tests/unit/hooks/useConfirmationAmount.test.tsx
index 900575432a4d..c1dc37b1d5ab 100644
--- a/tests/unit/hooks/useConfirmationAmount.test.tsx
+++ b/tests/unit/hooks/useConfirmationAmount.test.tsx
@@ -98,4 +98,43 @@ describe('useConfirmationAmount', () => {
         // 100 / 4 = 25
         expect(result.current.formattedAmountPerAttendee).toContain('25.00');
     });
+
+    it('formattedAmount is empty string for a failed-scan amount placeholder', () => {
+        const {result} = renderHook(
+            () =>
+                useConfirmationAmount({
+                    ...baseParams,
+                    iouAmount: 0,
+                    transaction: createMock<OnyxTypes.Transaction>({
+                        transactionID: 'txn1',
+                        amount: 0,
+                        iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                        receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+                        comment: {},
+                    }),
+                }),
+            {wrapper: Wrapper},
+        );
+        expect(result.current.formattedAmount).toBe('');
+    });
+
+    it('formattedAmount is not blanked once the failed-scan amount is confirmed', () => {
+        const {result} = renderHook(
+            () =>
+                useConfirmationAmount({
+                    ...baseParams,
+                    iouAmount: 0,
+                    transaction: createMock<OnyxTypes.Transaction>({
+                        transactionID: 'txn1',
+                        amount: 0,
+                        modifiedAmount: 0,
+                        iouRequestType: CONST.IOU.REQUEST_TYPE.SCAN,
+                        receipt: {state: CONST.IOU.RECEIPT_STATE.SCAN_FAILED},
+                        comment: {},
+                    }),
+                }),
+            {wrapper: Wrapper},
+        );
+        expect(result.current.formattedAmount).toContain('0.00');
+    });
 });
diff --git a/tests/unit/hooks/useDeleteTransactions.test.ts b/tests/unit/hooks/useDeleteTransactions.test.ts
index 4544629335ec..d6dbc11fa8dd 100644
--- a/tests/unit/hooks/useDeleteTransactions.test.ts
+++ b/tests/unit/hooks/useDeleteTransactions.test.ts
@@ -4,6 +4,7 @@ import OnyxListItemProvider from '@components/OnyxListItemProvider';
 
 import useDeleteTransactions from '@hooks/useDeleteTransactions';
 
+import {WRITE_COMMANDS} from '@libs/API/types';
 import {buildOptimisticIOUReportAction} from '@libs/ReportUtils';
 
 import CONST from '@src/CONST';
@@ -15,9 +16,9 @@ import type Transaction from '@src/types/onyx/Transaction';
 
 import Onyx from 'react-native-onyx';
 
-import {createSelfDM} from '../../utils/collections/reports';
+import {createExpenseReport, createSelfDM} from '../../utils/collections/reports';
 import getOnyxValue from '../../utils/getOnyxValue';
-import {getCurrencyDecimalsLocal, getGlobalFetchMock} from '../../utils/TestHelper';
+import {expectAPICommandToHaveBeenCalled, expectAPICommandToHaveBeenCalledWith, getCurrencyDecimalsLocal, getGlobalFetchMock} from '../../utils/TestHelper';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
 jest.mock('@libs/Navigation/Navigation', () => ({
@@ -107,4 +108,39 @@ describe('useDeleteTransactions', () => {
         // And the report actions are keyed on the self-DM report, not on a missing IOU report
         await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}undefined`)).resolves.toBeFalsy();
     });
+
+    it('deletes an expense that has no IOU action instead of silently skipping it', async () => {
+        // Given an expense on an expense report whose IOU action was never created
+        const expenseReport = createExpenseReport(1);
+        const transactionID = 'transaction';
+        const transaction: Transaction = {
+            transactionID,
+            amount: -10000,
+            currency: 'USD',
+            merchant: 'Test Merchant',
+            comment: {comment: 'Test comment'},
+            created: DateUtils.getDBTime(),
+            reportID: expenseReport.reportID,
+        };
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`, expenseReport);
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, transaction);
+        await waitForBatchedUpdates();
+
+        const {result} = renderHook(() => useDeleteTransactions({report: expenseReport, reportActions: []}), {wrapper: OnyxListItemProvider});
+        await waitForBatchedUpdates();
+
+        // When the expense is bulk-deleted from Search
+        act(() => {
+            result.current.deleteTransactions([transactionID], {}, {});
+        });
+        await waitForBatchedUpdates();
+
+        // Then DeleteMoneyRequest is sent with the transaction ID, since the API deletes expenses without an IOU action
+        expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.DELETE_MONEY_REQUEST, 1);
+        expectAPICommandToHaveBeenCalledWith(WRITE_COMMANDS.DELETE_MONEY_REQUEST, 0, {transactionID});
+
+        // And the expense is removed from Onyx once the request succeeds
+        await expect(getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`)).resolves.toBeFalsy();
+    });
 });
diff --git a/tests/unit/hooks/useExportedToFilterOptions.test.ts b/tests/unit/hooks/useExportedToFilterOptions.test.ts
index b282606bb60c..f5872782b241 100644
--- a/tests/unit/hooks/useExportedToFilterOptions.test.ts
+++ b/tests/unit/hooks/useExportedToFilterOptions.test.ts
@@ -14,10 +14,9 @@ import Onyx from 'react-native-onyx';
 import createMock from '../../utils/createMock';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
-const mockGetExportTemplates = jest.fn();
+const mockGetExportTemplates = jest.fn<unknown, unknown[]>();
 
 jest.mock('@libs/actions/Search', () => ({
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     getExportTemplates: (...args: unknown[]) => mockGetExportTemplates(...args),
 }));
 
@@ -26,11 +25,6 @@ function buildPolicyWithConnection(policyID: string, connectionName: ConnectionN
     return {id: policyID, connections: {[connectionName]: {lastSync: {isConnected: true}}}} as const;
 }
 
-/** Narrows the policy argument recorded by the getExportTemplates mock, whose arguments are typed as unknown. */
-function isPolicy(value: unknown): value is Policy {
-    return typeof value === 'object' && value !== null && 'id' in value;
-}
-
 describe('useExportedToFilterOptions', () => {
     const expenseLevelLabel = CONST.REPORT.EXPORT_OPTION_LABELS.EXPENSE_LEVEL_EXPORT;
     const quickBooksDisplayName = 'QuickBooks Online';
@@ -50,7 +44,6 @@ describe('useExportedToFilterOptions', () => {
         const {result} = renderHook(() => useExportedToFilterOptions());
 
         expect(result.current.exportedToFilterOptions).toEqual([]);
-        expect(result.current.combinedUniqueExportTemplates).toEqual([]);
         expect(result.current.connectedIntegrationNames).toEqual(new Set());
     });
 
@@ -58,7 +51,6 @@ describe('useExportedToFilterOptions', () => {
         const {result} = renderHook(() => useExportedToFilterOptions());
 
         expect(result.current.exportedToFilterOptions).toEqual([]);
-        expect(result.current.combinedUniqueExportTemplates).toEqual([]);
         expect(result.current.connectedIntegrationNames).toEqual(new Set());
     });
 
@@ -83,16 +75,35 @@ describe('useExportedToFilterOptions', () => {
         expect(result.current.exportedToFilterOptions).toContain(customName);
     });
 
-    it('excludes in-app custom templates from options', () => {
-        const templateName = 'Custom Export Format from OD';
-        mockGetExportTemplates.mockReturnValue({
-            customTemplates: [createMock<ExportTemplate>({templateName, name: templateName, type: CONST.EXPORT_TEMPLATE_TYPES.IN_APP})],
-            defaultTemplates: [],
+    it('builds templates once without in-app layouts, regardless of how many policies exist', async () => {
+        // Given several policies with in-app export layouts, which can't be identified in the exported-to filter
+        const exportLayouts = {layout: {name: 'Custom Export Format from OD'}};
+        await Onyx.mergeCollection(ONYXKEYS.COLLECTION.POLICY, {
+            [`${ONYXKEYS.COLLECTION.POLICY}1`]: {id: '1', exportLayouts},
+            [`${ONYXKEYS.COLLECTION.POLICY}2`]: {id: '2', exportLayouts},
         });
 
-        const {result} = renderHook(() => useExportedToFilterOptions());
+        // When the hook builds the filter options
+        renderHook(() => useExportedToFilterOptions());
 
-        expect(result.current.exportedToFilterOptions).not.toContain(templateName);
+        // Then getExportTemplates is called once with no account layouts and no policy, so no in-app templates are normalized
+        expect(mockGetExportTemplates).toHaveBeenCalledTimes(1);
+        expect(mockGetExportTemplates.mock.calls.at(0)?.at(1)).toEqual({});
+        expect(mockGetExportTemplates.mock.calls.at(0)?.at(4)).toBeUndefined();
+    });
+
+    it('includes the multiple tax export when any policy outputs in CAD', async () => {
+        // Given one USD and one CAD policy
+        await Onyx.mergeCollection(ONYXKEYS.COLLECTION.POLICY, {
+            [`${ONYXKEYS.COLLECTION.POLICY}1`]: {id: '1', outputCurrency: CONST.CURRENCY.USD},
+            [`${ONYXKEYS.COLLECTION.POLICY}2`]: {id: '2', outputCurrency: CONST.CURRENCY.CAD},
+        });
+
+        // When the hook builds the filter options
+        renderHook(() => useExportedToFilterOptions());
+
+        // Then the multiple tax export flag is on, matching the union of the per-policy templates
+        expect(mockGetExportTemplates.mock.calls.at(0)?.at(7)).toBe(true);
     });
 
     it('excludes templates whose templateName matches integration connection key', () => {
@@ -119,18 +130,6 @@ describe('useExportedToFilterOptions', () => {
         expect(result.current.exportedToFilterOptions).toContain(expenseLevelLabel);
     });
 
-    it('returns one template per templateName in combinedUniqueExportTemplates', async () => {
-        const sameName = 'SharedTemplate';
-        const template = createMock<ExportTemplate>({templateName: sameName, name: sameName});
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {});
-        mockGetExportTemplates.mockReturnValueOnce({customTemplates: [template], defaultTemplates: []}).mockReturnValueOnce({customTemplates: [template], defaultTemplates: []});
-
-        const {result} = renderHook(() => useExportedToFilterOptions());
-
-        expect(result.current.combinedUniqueExportTemplates).toHaveLength(1);
-        expect(result.current.combinedUniqueExportTemplates.at(0)?.templateName).toBe(sameName);
-    });
-
     it('returns connectedIntegrationNames from getConnectedIntegrationNamesForPolicies', async () => {
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, buildPolicyWithConnection('1', CONST.POLICY.CONNECTIONS.NAME.XERO));
 
@@ -147,17 +146,14 @@ describe('useExportedToFilterOptions', () => {
         expect(isAdminOfCardEnabledPolicy(trimmedPolicy)).toBe(true);
     });
 
-    it('passes a card enabled admin policy to getExportTemplates with its card product flags intact', async () => {
+    it('includes the reconciliation template when the user is a card admin of a card enabled policy', async () => {
+        // Given a card enabled policy where the user is a card admin
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}1`, {id: '1', role: CONST.POLICY.ROLE.CARD_ADMIN, areExpensifyCardsEnabled: true});
 
+        // When the hook builds the filter options
         renderHook(() => useExportedToFilterOptions());
 
-        const policiesPassedToGetExportTemplates = mockGetExportTemplates.mock.calls.flatMap((call: unknown[]) => {
-            const policy = call.at(4);
-            return isPolicy(policy) ? [policy] : [];
-        });
-
-        expect(policiesPassedToGetExportTemplates).toHaveLength(1);
-        expect(isAdminOfCardEnabledPolicy(policiesPassedToGetExportTemplates.at(0))).toBe(true);
+        // Then the reconciliation flag is on, since the selector keeps the role and card product fields
+        expect(mockGetExportTemplates.mock.calls.at(0)?.at(8)).toBe(true);
     });
 });
diff --git a/tests/unit/hooks/useFilterFormValues.test.ts b/tests/unit/hooks/useFilterFormValues.test.ts
index 849dd4b865c4..01c55af324b6 100644
--- a/tests/unit/hooks/useFilterFormValues.test.ts
+++ b/tests/unit/hooks/useFilterFormValues.test.ts
@@ -93,7 +93,7 @@ describe('useFilterFormValues selectors', () => {
             expect(exportedToPoliciesSelector(undefined)).toBeUndefined();
         });
 
-        it('extracts only id, name, connections, and exportLayouts', () => {
+        it('extracts only the fields needed for exported-to options', () => {
             const connections = {quickbooksOnline: {config: {}, lastSync: {isConnected: true}}};
             const exportLayouts = {template1: {name: 'Template 1'}};
             const policies: OnyxCollection<Policy> = {
@@ -111,7 +111,8 @@ describe('useFilterFormValues selectors', () => {
 
             const result = exportedToPoliciesSelector(policies);
 
-            expect(result?.[POLICY_KEY]).toEqual({id: '1', name: 'Policy 1', connections, exportLayouts});
+            expect(result?.[POLICY_KEY]).toEqual({id: '1', name: 'Policy 1', connections});
+            expect(result?.[POLICY_KEY]).not.toHaveProperty('exportLayouts');
             expect(result?.[POLICY_KEY]).not.toHaveProperty('employeeList');
             expect(result?.[POLICY_KEY]).not.toHaveProperty('taxRates');
             expect(result?.[POLICY_KEY]).not.toHaveProperty('customUnits');
diff --git a/tests/unit/hooks/useGPSTripStateChecker.test.tsx b/tests/unit/hooks/useGPSTripStateChecker.test.tsx
new file mode 100644
index 000000000000..8b22498a1fad
--- /dev/null
+++ b/tests/unit/hooks/useGPSTripStateChecker.test.tsx
@@ -0,0 +1,217 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import ComposeProviders from '@components/ComposeProviders';
+import {LocaleContextProvider} from '@components/LocaleContextProvider';
+import OnyxListItemProvider from '@components/OnyxListItemProvider';
+
+import useGPSTripStateChecker from '@hooks/useGPSTripStateChecker/index.native';
+
+import type * as GPSDraftDetailsUtils from '@libs/GPSDraftDetailsUtils';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {GpsDraftDetails} from '@src/types/onyx';
+
+import type {ValueOf} from 'type-fest';
+
+import React from 'react';
+import Onyx from 'react-native-onyx';
+
+import type * as MockUseConfirmModalUtil from '../../utils/mockUseConfirmModal';
+
+import getOnyxValue from '../../utils/getOnyxValue';
+import {getShowConfirmModalOption, mockCloseModalByID, MockModalActions, mockShowConfirmModal, resetMockConfirmModal, resolveShowConfirmModal} from '../../utils/mockUseConfirmModal';
+import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithAct';
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {navigate: jest.fn()},
+}));
+
+jest.mock('@pages/iou/request/step/IOURequestStepDistanceGPS/GPSNotifications', () => ({
+    startGpsTripNotification: jest.fn(),
+    stopGpsTripNotification: jest.fn(),
+    updateGpsTripNotificationDistance: jest.fn(),
+    updateGpsTripNotificationUnit: jest.fn(),
+    updateGpsTripNotificationLanguage: jest.fn(),
+    checkAndCleanGpsNotification: jest.fn(() => Promise.resolve()),
+    shouldUpdateGpsNotificationUnit: jest.fn(() => false),
+}));
+
+// The hook returns nothing and pushes its prompt onto the global modal stack, so what it pushed -- and when it
+// took that entry back down -- is the only observable behaviour there is to assert on.
+jest.mock('@hooks/useConfirmModal', () => {
+    const {default: mockUseConfirmModal} = jest.requireActual<typeof MockUseConfirmModalUtil>('../../utils/mockUseConfirmModal');
+    return mockUseConfirmModal;
+});
+
+jest.mock('@components/Modal/Global/ModalContext', () => {
+    const {createMockModalContextModule} = jest.requireActual<typeof MockUseConfirmModalUtil>('../../utils/mockUseConfirmModal');
+    return createMockModalContextModule();
+});
+
+// Stubbed so "did answering the prompt stop the trip, and with which points" is a direct assertion. The real one
+// talks to expo-location and fetches an address for the last point.
+const mockStopGpsTrip = jest.fn<Promise<void>, Parameters<typeof GPSDraftDetailsUtils.stopGpsTrip>>(() => Promise.resolve());
+jest.mock('@libs/GPSDraftDetailsUtils', () => ({
+    ...jest.requireActual<typeof GPSDraftDetailsUtils>('@libs/GPSDraftDetailsUtils'),
+    stopGpsTrip: (...args: Parameters<typeof GPSDraftDetailsUtils.stopGpsTrip>) => mockStopGpsTrip(...args),
+}));
+
+// Driven per test so the splash screen can be raised and lowered, which is one of the conditions that used to hide
+// the prompt for free while it was rendered inline.
+let mockSplashScreenState: ValueOf<typeof CONST.BOOT_SPLASH_STATE> = 'visible';
+jest.mock('@src/SplashScreenStateContext', () => ({
+    useSplashScreenState: () => ({splashScreenState: mockSplashScreenState}),
+}));
+
+const CURRENT_ACCOUNT_ID = 1;
+const OTHER_ACCOUNT_ID = 2;
+
+// Has to match the id the hook pushes its prompt under, because closing that exact entry is a behaviour under test.
+const CONTINUE_TRIP_MODAL_ID = 'gpsContinueTrip';
+
+const FIRST_POINT = {lat: 1, long: 2};
+const LATER_POINT = {lat: 3, long: 4};
+
+const trip: GpsDraftDetails = {
+    gpsPoints: [[FIRST_POINT]],
+    distanceInMeters: 100,
+    isTracking: true,
+    reportID: '1',
+    unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+};
+
+function Wrapper({children}: {children: React.ReactNode}) {
+    return <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>{children}</ComposeProviders>;
+}
+
+function renderChecker() {
+    return renderHook(() => useGPSTripStateChecker(), {wrapper: Wrapper});
+}
+
+describe('useGPSTripStateChecker', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        resetMockConfirmModal();
+        mockStopGpsTrip.mockClear();
+        mockSplashScreenState = CONST.BOOT_SPLASH_STATE.VISIBLE;
+        await Onyx.clear();
+        await Onyx.merge(ONYXKEYS.SESSION, {accountID: CURRENT_ACCOUNT_ID});
+        await waitForBatchedUpdatesWithAct();
+    });
+
+    it('keeps a trip that records no accountID, because it predates the trip owner being stored', async () => {
+        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, trip);
+        await waitForBatchedUpdatesWithAct();
+
+        renderChecker();
+        await waitForBatchedUpdatesWithAct();
+
+        expect((await getOnyxValue(ONYXKEYS.GPS_DRAFT_DETAILS))?.isTracking).toBe(true);
+    });
+
+    it('keeps a trip started by the signed in user', async () => {
+        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, {...trip, accountID: CURRENT_ACCOUNT_ID});
+        await waitForBatchedUpdatesWithAct();
+
+        renderChecker();
+        await waitForBatchedUpdatesWithAct();
+
+        expect((await getOnyxValue(ONYXKEYS.GPS_DRAFT_DETAILS))?.isTracking).toBe(true);
+    });
+
+    it('discards a trip started by a different user', async () => {
+        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, {...trip, accountID: OTHER_ACCOUNT_ID});
+        await waitForBatchedUpdatesWithAct();
+
+        renderChecker();
+        await waitForBatchedUpdatesWithAct();
+
+        expect(await getOnyxValue(ONYXKEYS.GPS_DRAFT_DETAILS)).toBeUndefined();
+    });
+
+    it('does not prompt while the splash screen is still up', async () => {
+        // Given a tracking trip restored on app restart, with the splash screen still covering the app
+        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, trip);
+        await waitForBatchedUpdatesWithAct();
+
+        // When the checker mounts
+        renderChecker();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then nothing is pushed, because a prompt behind the splash screen is one the user cannot answer
+        expect(mockShowConfirmModal).not.toHaveBeenCalled();
+    });
+
+    it('prompts to continue a tracking trip, and opts hardware back out of the destructive cancel', async () => {
+        // Given a tracking trip restored on app restart, with the splash screen already down
+        mockSplashScreenState = CONST.BOOT_SPLASH_STATE.HIDDEN;
+        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, trip);
+        await waitForBatchedUpdatesWithAct();
+
+        // When the checker mounts
+        renderChecker();
+        await waitForBatchedUpdatesWithAct();
+
+        // Then exactly one prompt is pushed, under the id the auto-hide below closes
+        expect(mockShowConfirmModal).toHaveBeenCalledTimes(1);
+        expect(getShowConfirmModalOption('id')).toBe(CONTINUE_TRIP_MODAL_ID);
+
+        // Then hardware back is opted out, because cancelling here stops the trip rather than dismissing the prompt
+        expect(getShowConfirmModalOption('shouldHandleNavigationBack')).toBe(false);
+    });
+
+    it('stops the trip with every point recorded up to the moment the user answered, not just the ones it had when prompted', async () => {
+        // Given a prompt that has been open long enough for the trip to record another point
+        mockSplashScreenState = CONST.BOOT_SPLASH_STATE.HIDDEN;
+        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, trip);
+        await waitForBatchedUpdatesWithAct();
+
+        renderChecker();
+        await waitForBatchedUpdatesWithAct();
+
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, {gpsPoints: [[FIRST_POINT, LATER_POINT]]});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // When the user picks "view trip", which stops it
+        await act(async () => {
+            resolveShowConfirmModal({action: MockModalActions.CLOSE});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // Then the trip is submitted with the points as they stand now. Reading the show-time value would truncate it
+        expect(mockStopGpsTrip).toHaveBeenCalledWith(false, [[FIRST_POINT, LATER_POINT]]);
+    });
+
+    it('takes the prompt down by id, and does not stop the trip, when tracking stops while it is open', async () => {
+        // Given an open continue-trip prompt
+        mockSplashScreenState = CONST.BOOT_SPLASH_STATE.HIDDEN;
+        await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, trip);
+        await waitForBatchedUpdatesWithAct();
+
+        renderChecker();
+        await waitForBatchedUpdatesWithAct();
+        expect(mockShowConfirmModal).toHaveBeenCalledTimes(1);
+
+        // When tracking stops without the user having answered
+        await act(async () => {
+            await Onyx.merge(ONYXKEYS.GPS_DRAFT_DETAILS, {isTracking: false});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        // Then that one entry is closed by id, rather than popping whatever modal happens to sit on top
+        expect(mockCloseModalByID).toHaveBeenCalledWith(CONTINUE_TRIP_MODAL_ID);
+
+        // Then the trip is left alone, because the user never chose to stop it
+        expect(mockStopGpsTrip).not.toHaveBeenCalled();
+
+        // Then the prompt is not pushed again once it is gone
+        expect(mockShowConfirmModal).toHaveBeenCalledTimes(1);
+    });
+});
diff --git a/tests/unit/hooks/useGeographicalStateAndCountryFromRoute.test.ts b/tests/unit/hooks/useGeographicalStateAndCountryFromRoute.test.ts
new file mode 100644
index 000000000000..e8c65132a621
--- /dev/null
+++ b/tests/unit/hooks/useGeographicalStateAndCountryFromRoute.test.ts
@@ -0,0 +1,77 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useGeographicalStateAndCountryFromRoute from '@hooks/useGeographicalStateAndCountryFromRoute';
+
+let mockRouteParams: unknown;
+
+jest.mock('@react-navigation/native', () => ({
+    useRoute: () => ({params: mockRouteParams}),
+}));
+
+function getGeographicalValues(stateParamName?: string, countryParamName?: string) {
+    return renderHook(() => useGeographicalStateAndCountryFromRoute(stateParamName, countryParamName)).result.current;
+}
+
+describe('useGeographicalStateAndCountryFromRoute', () => {
+    beforeEach(() => {
+        mockRouteParams = undefined;
+    });
+
+    it('returns valid state and country values', () => {
+        mockRouteParams = {state: 'MO', country: 'US'};
+
+        expect(getGeographicalValues()).toEqual({state: 'MO', country: 'US'});
+    });
+
+    it('supports custom parameter names', () => {
+        mockRouteParams = {province: 'MO', nation: 'US'};
+
+        expect(getGeographicalValues('province', 'nation')).toEqual({state: 'MO', country: 'US'});
+    });
+
+    it('accepts inherited valid state and country values', () => {
+        mockRouteParams = Object.setPrototypeOf({}, {state: 'MO', country: 'US'});
+
+        expect(getGeographicalValues()).toEqual({state: 'MO', country: 'US'});
+    });
+
+    it('accepts inherited valid values with custom parameter names', () => {
+        mockRouteParams = Object.setPrototypeOf({}, {province: 'MO', nation: 'US'});
+
+        expect(getGeographicalValues('province', 'nation')).toEqual({state: 'MO', country: 'US'});
+    });
+
+    it.each([
+        ['absent values', {}],
+        ['empty values', {state: '', country: ''}],
+        ['unknown values', {state: 'ASDF', country: 'XX'}],
+        ['non-string values', {state: 1, country: true}],
+        ['prototype keys', {state: 'constructor', country: 'toString'}],
+        ['a state hash suffix', {state: 'MO-hash-a12341', country: 'US-hash-a12341'}],
+    ])('returns undefined values for %s', (_description, params) => {
+        mockRouteParams = params;
+
+        expect(getGeographicalValues()).toEqual({state: undefined, country: undefined});
+    });
+
+    it.each([
+        ['missing params', undefined],
+        ['an array', ['MO', 'US']],
+    ])('returns own undefined properties for %s', (_description, params) => {
+        mockRouteParams = params;
+
+        expect(getGeographicalValues()).toStrictEqual({state: undefined, country: undefined});
+    });
+
+    it('rejects inherited values that are not supported strings', () => {
+        mockRouteParams = Object.setPrototypeOf({}, {state: 1, country: 'toString'});
+
+        expect(getGeographicalValues()).toEqual({state: undefined, country: undefined});
+    });
+
+    it('accepts a readonly route params object', () => {
+        mockRouteParams = Object.freeze({state: 'MO', country: 'US'});
+
+        expect(getGeographicalValues()).toEqual({state: 'MO', country: 'US'});
+    });
+});
diff --git a/tests/unit/hooks/useGettingStartedItems.test.ts b/tests/unit/hooks/useGettingStartedItems.test.ts
index 1b129e6ec4ad..5a0acb11eba5 100644
--- a/tests/unit/hooks/useGettingStartedItems.test.ts
+++ b/tests/unit/hooks/useGettingStartedItems.test.ts
@@ -16,6 +16,7 @@ import Onyx from 'react-native-onyx';
 
 import createRandomPolicy from '../../utils/collections/policies';
 import createMock from '../../utils/createMock';
+import {getGlobalFetchMock} from '../../utils/TestHelper';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
 jest.mock('@hooks/useLocalize', () =>
@@ -191,6 +192,8 @@ describe('useGettingStartedItems', () => {
     });
 
     beforeEach(async () => {
+        // When rules are enabled, the hook sends GetRules, so mock fetch to keep that request off the real network.
+        global.fetch = getGlobalFetchMock();
         await Onyx.clear();
         await waitForBatchedUpdates();
     });
diff --git a/tests/unit/hooks/useIsTabFocused.test.ts b/tests/unit/hooks/useIsTabFocused.test.ts
new file mode 100644
index 000000000000..430aaeeb8ac6
--- /dev/null
+++ b/tests/unit/hooks/useIsTabFocused.test.ts
@@ -0,0 +1,113 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useIsTabFocused from '@hooks/useIsTabFocused';
+import useRootNavigationState from '@hooks/useRootNavigationState';
+
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+import type {NavigationState} from '@react-navigation/native';
+
+jest.mock('@hooks/useRootNavigationState', () => ({
+    __esModule: true,
+    default: jest.fn(),
+}));
+
+const mockedUseRootNavigationState = jest.mocked(useRootNavigationState);
+
+type RootRoute = NavigationState['routes'][number];
+
+/** A tab navigator with `tabName` as the selected tab. */
+function buildTabNavigatorRoute(key: string, tabName: string): RootRoute {
+    const tabRoutes = [
+        {key: `${key}-home`, name: SCREENS.HOME},
+        {key: `${key}-inbox`, name: SCREENS.SEARCH.ROOT},
+    ];
+
+    return {
+        key,
+        name: NAVIGATORS.TAB_NAVIGATOR,
+        state: {
+            key: `${key}-state`,
+            index: tabRoutes.findIndex((route) => route.name === tabName),
+            routeNames: tabRoutes.map((route) => route.name),
+            type: 'tab',
+            stale: false,
+            routes: tabRoutes,
+        },
+    };
+}
+
+function buildRootState(routes: RootRoute[]): NavigationState {
+    return {
+        key: 'root',
+        index: routes.length - 1,
+        routeNames: routes.map((route) => route.name),
+        type: 'stack',
+        stale: false,
+        routes,
+    };
+}
+
+function renderWithState(state: NavigationState | undefined, tabName: string = SCREENS.HOME) {
+    mockedUseRootNavigationState.mockImplementation((selector) => selector(state));
+    return renderHook(() => useIsTabFocused(tabName)).result.current;
+}
+
+describe('useIsTabFocused', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('is true when the tab is the selected one', () => {
+        // Given a navigation state with Home selected in the tab navigator
+
+        // When the hook is asked about Home
+        const isFocused = renderWithState(buildRootState([buildTabNavigatorRoute('tabs', SCREENS.HOME)]));
+
+        // Then it reports the tab as focused
+        expect(isFocused).toBe(true);
+    });
+
+    it('stays true while an RHP is pushed over the tab', () => {
+        // Given Home selected with a right-hand pane stacked above it, which is what opening an expense does
+        const state = buildRootState([buildTabNavigatorRoute('tabs', SCREENS.HOME), {key: 'rhp', name: NAVIGATORS.RIGHT_MODAL_NAVIGATOR}]);
+
+        // When the hook is asked about Home
+        const isFocused = renderWithState(state);
+
+        // Then the tab is still the active one, unlike `useIsFocused()`, so closing the pane is not an arrival
+        expect(isFocused).toBe(true);
+    });
+
+    it('is false when another tab is selected', () => {
+        // Given the Inbox tab selected
+
+        // When the hook is asked about Home
+        const isFocused = renderWithState(buildRootState([buildTabNavigatorRoute('tabs', SCREENS.SEARCH.ROOT)]));
+
+        // Then Home is not the active tab, so its data is left alone
+        expect(isFocused).toBe(false);
+    });
+
+    it('reads the top-most tab navigator when more than one is on the stack', () => {
+        // Given an older tab navigator underneath a newer one that has Inbox selected
+        const state = buildRootState([buildTabNavigatorRoute('tabs', SCREENS.HOME), buildTabNavigatorRoute('tabs-2', SCREENS.SEARCH.ROOT)]);
+
+        // When the hook is asked about Home
+        const isFocused = renderWithState(state);
+
+        // Then it follows the top-most tab navigator, not the one buried below it
+        expect(isFocused).toBe(false);
+    });
+
+    it('is false before the navigation ref is ready', () => {
+        // Given navigation that has not initialized, which passes `undefined` to the selector
+
+        // When the hook runs
+        const isFocused = renderWithState(undefined);
+
+        // Then it reports not focused rather than refreshing against an unknown state
+        expect(isFocused).toBe(false);
+    });
+});
diff --git a/tests/unit/hooks/useMoneyReportHeaderStatusBarTest.ts b/tests/unit/hooks/useMoneyReportHeaderStatusBarTest.ts
index 737787949003..201c32b09ddd 100644
--- a/tests/unit/hooks/useMoneyReportHeaderStatusBarTest.ts
+++ b/tests/unit/hooks/useMoneyReportHeaderStatusBarTest.ts
@@ -7,6 +7,7 @@ import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportActionTypeGuards from '@libs/ReportActionTypeGuards';
 import * as ReportPrimaryActionUtils from '@libs/ReportPrimaryActionUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
+import * as TransactionViolationUtils from '@libs/TransactionUtils/violations';
 
 import CONST from '@src/CONST';
 import type {Report, Transaction} from '@src/types/onyx';
@@ -82,15 +83,16 @@ describe('useMoneyReportHeaderStatusBar - duplicate transactions', () => {
         // ReportUtils spies go through require() instead (matches other tests spying on this module).
         jest.spyOn(require('@libs/ReportUtils'), 'hasOnlyHeldExpenses').mockReturnValue(false);
         jest.spyOn(require('@libs/ReportUtils'), 'isSettled').mockReturnValue(false);
-        jest.spyOn(TransactionUtils, 'allHavePendingRTERViolation').mockReturnValue(false);
-        jest.spyOn(TransactionUtils, 'hasDuplicateTransactions').mockReturnValue(false);
-        jest.spyOn(TransactionUtils, 'isBrokenConnectionViolation').mockReturnValue(false);
+        // The violation helpers live in the TransactionUtils/violations leaf module that TransactionUtils only re-exports, so they must be spied at the leaf too.
+        jest.spyOn(TransactionViolationUtils, 'allHavePendingRTERViolation').mockReturnValue(false);
+        jest.spyOn(TransactionViolationUtils, 'hasDuplicateTransactions').mockReturnValue(false);
+        jest.spyOn(TransactionViolationUtils, 'isBrokenConnectionViolation').mockReturnValue(false);
         jest.spyOn(TransactionUtils, 'hasReceipt').mockReturnValue(false);
         jest.spyOn(TransactionUtils, 'isPayAtEndExpense').mockReturnValue(false);
         jest.spyOn(TransactionUtils, 'isPending').mockReturnValue(false);
         jest.spyOn(TransactionUtils, 'isScanning').mockReturnValue(false);
-        jest.spyOn(TransactionUtils, 'shouldSuppressBrokenConnectionStatus').mockReturnValue(false);
-        jest.spyOn(TransactionUtils, 'shouldShowBrokenConnectionViolationForMultipleTransactions').mockReturnValue(false);
+        jest.spyOn(TransactionViolationUtils, 'shouldSuppressBrokenConnectionStatus').mockReturnValue(false);
+        jest.spyOn(TransactionViolationUtils, 'shouldShowBrokenConnectionViolationForMultipleTransactions').mockReturnValue(false);
     });
 
     afterEach(() => {
@@ -100,14 +102,14 @@ describe('useMoneyReportHeaderStatusBar - duplicate transactions', () => {
     it('passes the report transactions through to hasDuplicateTransactions', () => {
         renderHook(() => useMoneyReportHeaderStatusBar(REPORT_ID, CHAT_REPORT_ID));
 
-        expect(jest.mocked(TransactionUtils.hasDuplicateTransactions)).toHaveBeenCalledWith('test@example.com', 1, mockMoneyRequestReport, undefined, undefined, undefined, [
+        expect(jest.mocked(TransactionViolationUtils.hasDuplicateTransactions)).toHaveBeenCalledWith('test@example.com', 1, mockMoneyRequestReport, undefined, undefined, undefined, [
             mockTransaction1,
             mockTransaction2,
         ]);
     });
 
     it('shows the duplicates status bar when hasDuplicateTransactions reports duplicates on an unsettled report', () => {
-        jest.spyOn(TransactionUtils, 'hasDuplicateTransactions').mockReturnValue(true);
+        jest.spyOn(TransactionViolationUtils, 'hasDuplicateTransactions').mockReturnValue(true);
 
         const {result} = renderHook(() => useMoneyReportHeaderStatusBar(REPORT_ID, CHAT_REPORT_ID));
 
@@ -116,7 +118,7 @@ describe('useMoneyReportHeaderStatusBar - duplicate transactions', () => {
     });
 
     it('does not show the duplicates status bar when the report is already settled, even if duplicates are found', () => {
-        jest.spyOn(TransactionUtils, 'hasDuplicateTransactions').mockReturnValue(true);
+        jest.spyOn(TransactionViolationUtils, 'hasDuplicateTransactions').mockReturnValue(true);
         jest.spyOn(require('@libs/ReportUtils'), 'isSettled').mockReturnValue(true);
 
         const {result} = renderHook(() => useMoneyReportHeaderStatusBar(REPORT_ID, CHAT_REPORT_ID));
diff --git a/tests/unit/hooks/useNavigateToTransactionThread.test.ts b/tests/unit/hooks/useNavigateToTransactionThread.test.ts
new file mode 100644
index 000000000000..ef95ab2e01c7
--- /dev/null
+++ b/tests/unit/hooks/useNavigateToTransactionThread.test.ts
@@ -0,0 +1,98 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useNavigateToTransactionThread from '@hooks/useNavigateToTransactionThread';
+
+import {CAROUSEL_SOURCE, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import Navigation from '@libs/Navigation/Navigation';
+import {getExpenseCreationIOUActionForTransactionID} from '@libs/ReportActionsUtils';
+
+import type {Report} from '@src/types/onyx';
+
+import createRandomReportAction from '../../utils/collections/reportActions';
+import {createExpenseReport} from '../../utils/collections/reports';
+import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
+
+const TRANSACTION_ID = 'B2';
+const SIBLING_TRANSACTION_IDS = ['B1', 'B2'];
+const THREAD_REPORT_ID = 'thread-1';
+const CAROUSEL_SOURCE_FOR_REPORT = 'reportRow:reportB';
+
+const report: Report = {...createExpenseReport(1), reportID: 'reportB'};
+// An IOU action that already has a thread, so the hook takes the short path to navigation.
+const iouAction = {...createRandomReportAction(1), reportActionID: 'action1', childReportID: THREAD_REPORT_ID};
+
+jest.mock('@libs/actions/TransactionThreadNavigation', () => ({
+    setActiveTransactionIDs: jest.fn(() => Promise.resolve()),
+    CAROUSEL_SOURCE: {reportRow: (reportID: string | undefined) => `reportRow:${reportID}`},
+}));
+
+jest.mock('@libs/actions/Report', () => ({
+    createTransactionThreadReport: jest.fn(),
+    setOptimisticTransactionThread: jest.fn(),
+}));
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    __esModule: true,
+    default: {getActiveRoute: jest.fn(() => '/search'), navigate: jest.fn()},
+}));
+
+jest.mock('@libs/ReportActionsUtils', () => ({getExpenseCreationIOUActionForTransactionID: jest.fn()}));
+
+jest.mock('@components/WideRHPContextProvider', () => ({useWideRHPActions: jest.fn(() => ({markReportRHPWidth: jest.fn()}))}));
+
+// The personal details context is only forwarded to createTransactionThreadReport (mocked above), so an empty map is enough.
+jest.mock('@components/OnyxListItemProvider', () => ({usePersonalDetails: jest.fn(() => ({}))}));
+
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => jest.fn(() => ({email: 'a@b.com', accountID: 1})));
+jest.mock('@hooks/useOnyx', () => jest.fn(() => [undefined, {status: 'loaded'}]));
+
+const mockedGetIOUAction = jest.mocked(getExpenseCreationIOUActionForTransactionID);
+const mockedSetActiveTransactionIDs = jest.mocked(setActiveTransactionIDs);
+const mockedNavigate = jest.mocked(Navigation.navigate);
+
+function callHook(overrides?: {carouselSource?: string}) {
+    const {result} = renderHook(() => useNavigateToTransactionThread());
+    result.current({
+        transactionID: TRANSACTION_ID,
+        reportActions: [iouAction],
+        report,
+        transaction: undefined,
+        siblingTransactionIDs: SIBLING_TRANSACTION_IDS,
+        ...overrides,
+    });
+    return waitForBatchedUpdates();
+}
+
+describe('useNavigateToTransactionThread', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockedGetIOUAction.mockReturnValue(iouAction);
+        mockedSetActiveTransactionIDs.mockReturnValue(Promise.resolve());
+    });
+
+    it('seeds the carousel with the given siblings', async () => {
+        await callHook();
+
+        expect(mockedSetActiveTransactionIDs).toHaveBeenCalledWith(SIBLING_TRANSACTION_IDS, {source: undefined});
+    });
+
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/99609: the pressed row's screen has to take
+     * ownership of the carousel. An earlier fix kept a broader list (e.g. the Spend page's) alive here, which left the
+     * report showing a counter and arrows covering expenses that weren't in it.
+     */
+    it('stamps the carousel with the source that seeded it', async () => {
+        await callHook({carouselSource: CAROUSEL_SOURCE.reportRow(report.reportID)});
+
+        expect(mockedSetActiveTransactionIDs).toHaveBeenCalledWith(SIBLING_TRANSACTION_IDS, {source: CAROUSEL_SOURCE_FOR_REPORT});
+    });
+
+    it('anchors the opened thread to the pressed expense so the header can show the carousel before data loads', async () => {
+        await callHook();
+
+        expect(mockedNavigate).toHaveBeenCalledTimes(1);
+        const route = mockedNavigate.mock.calls.at(0)?.at(0);
+        expect(route).toContain(THREAD_REPORT_ID);
+        expect(route).toContain(`anchorTransactionID=${TRANSACTION_ID}`);
+    });
+});
diff --git a/tests/unit/hooks/useReviewFlaggedExpenses.test.ts b/tests/unit/hooks/useReviewFlaggedExpenses.test.ts
index 86ae660fecd9..9f2a60c6cc86 100644
--- a/tests/unit/hooks/useReviewFlaggedExpenses.test.ts
+++ b/tests/unit/hooks/useReviewFlaggedExpenses.test.ts
@@ -16,6 +16,15 @@ import waitForBatchedUpdatesWithAct from '../../utils/waitForBatchedUpdatesWithA
 const mockNavigateToTransactionThread = jest.fn();
 jest.mock('@hooks/useNavigateToTransactionThread', () => jest.fn(() => mockNavigateToTransactionThread));
 
+const mockNavigate = jest.fn<void, [string]>();
+jest.mock('@libs/Navigation/Navigation', () => ({__esModule: true, default: {navigate: (route: string) => mockNavigate(route)}}));
+
+const mockSetActiveTransactionIDs = jest.fn<Promise<void>, [string[], {source?: string} | undefined]>(() => Promise.resolve());
+jest.mock('@libs/actions/TransactionThreadNavigation', () => ({
+    setActiveTransactionIDs: (ids: string[], options?: {source?: string}) => mockSetActiveTransactionIDs(ids, options),
+    CAROUSEL_SOURCE: {homeReviewFlagged: 'home:reviewFlagged'},
+}));
+
 // The hook gates its O(n) scan on useIsFocused(). Mock it with a toggleable flag so tests can exercise the
 // focused (live scan) and blurred (scan skipped, last count retained) paths.
 let mockIsFocused = true;
@@ -27,6 +36,14 @@ jest.mock('@react-navigation/native', () => {
     };
 });
 
+// The one-transaction-report branch opens full-screen on narrow layout and in the RHP on wide, and only the RHP
+// renders the carousel, so tests have to drive this deliberately rather than inherit the test env's default.
+let mockShouldUseNarrowLayout = false;
+jest.mock('@hooks/useResponsiveLayout', () => ({
+    __esModule: true,
+    default: () => ({shouldUseNarrowLayout: mockShouldUseNarrowLayout}),
+}));
+
 const ACCOUNT_ID = 1;
 
 /**
@@ -59,6 +76,7 @@ describe('useReviewFlaggedExpenses', () => {
 
     beforeEach(async () => {
         mockIsFocused = true;
+        mockShouldUseNarrowLayout = false;
         await act(async () => {
             await Onyx.set(ONYXKEYS.SESSION, {accountID: ACCOUNT_ID, email: 'test@example.com'});
         });
@@ -129,6 +147,7 @@ describe('useReviewFlaggedExpenses', () => {
                 transaction: expect.objectContaining({transactionID: 't1'}),
                 reportActions: expect.arrayContaining([expect.objectContaining({reportActionID: 'action1', childReportID: 'thread-r1'})]),
                 siblingTransactionIDs: ['t1', 't2'],
+                carouselSource: 'home:reviewFlagged',
                 backTo: ROUTES.HOME,
             }),
         );
@@ -177,6 +196,78 @@ describe('useReviewFlaggedExpenses', () => {
         );
     });
 
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/99621: the prev/next carousel opens a
+     * one-transaction report directly rather than its (redundant) transaction thread. This entry point has to agree,
+     * or stepping forward and back drops the user on the report when they started on the thread.
+     */
+    it('opens the report and seeds the carousel when the flagged expenses sit in one-transaction reports', async () => {
+        mockShouldUseNarrowLayout = false;
+        await act(async () => {
+            await seedFlaggedExpenses({transactionID: 't1', reportID: 'r1'}, {transactionID: 't2', reportID: 'r2'});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}r1`, {transactionCount: 1});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}r2`, {transactionCount: 1});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        const {result} = renderHook(() => useReviewFlaggedExpenses());
+        await waitForBatchedUpdatesWithAct();
+
+        expect(result.current.count).toBe(2);
+
+        await act(async () => {
+            result.current.reviewExpenses();
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        expect(mockNavigateToTransactionThread).not.toHaveBeenCalled();
+        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith(['t1', 't2'], {source: 'home:reviewFlagged'});
+        expect(mockNavigate).toHaveBeenCalledTimes(1);
+        expect(mockNavigate.mock.calls.at(0)?.at(0)).toContain('r1');
+    });
+
+    it('keeps the thread route for a multi-expense review on narrow layout', async () => {
+        mockShouldUseNarrowLayout = true;
+        await act(async () => {
+            await seedFlaggedExpenses({transactionID: 't1', reportID: 'r1'}, {transactionID: 't2', reportID: 'r2'});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}r1`, {transactionCount: 1});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}r2`, {transactionCount: 1});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        const {result} = renderHook(() => useReviewFlaggedExpenses());
+        await waitForBatchedUpdatesWithAct();
+
+        await act(async () => {
+            result.current.reviewExpenses();
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        expect(mockNavigate).not.toHaveBeenCalled();
+        expect(mockNavigateToTransactionThread).toHaveBeenCalledWith(
+            expect.objectContaining({transactionID: 't1', siblingTransactionIDs: ['t1', 't2'], carouselSource: 'home:reviewFlagged'}),
+        );
+    });
+
+    it('does not seed a carousel for a lone flagged expense in a one-transaction report', async () => {
+        await act(async () => {
+            await seedFlaggedExpenses({transactionID: 't1', reportID: 'r1'});
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}r1`, {transactionCount: 1});
+        });
+        await waitForBatchedUpdatesWithAct();
+
+        const {result} = renderHook(() => useReviewFlaggedExpenses());
+        await waitForBatchedUpdatesWithAct();
+
+        await act(async () => {
+            result.current.reviewExpenses();
+            await waitForBatchedUpdatesWithAct();
+        });
+
+        expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
+        expect(mockNavigate).toHaveBeenCalledTimes(1);
+    });
+
     it('updates the count live while the Home tab stays focused', async () => {
         await act(async () => {
             await seedFlaggedExpenses({transactionID: 't1', reportID: 'r1'});
diff --git a/tests/unit/hooks/useSearchBulkActionsDeleteTest.ts b/tests/unit/hooks/useSearchBulkActionsDeleteTest.ts
index a5a1cf9863d9..acdce7f4d86e 100644
--- a/tests/unit/hooks/useSearchBulkActionsDeleteTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsDeleteTest.ts
@@ -416,17 +416,15 @@ describe('useSearchBulkActions - delete unreported expenses', () => {
         });
     });
 
-    it('does NOT call deleteMoneyRequest when the IOU action is absent from both snapshot and Onyx REPORT_ACTIONS', async () => {
+    it('calls deleteMoneyRequest without a report action when the IOU action is absent from both snapshot and Onyx REPORT_ACTIONS', async () => {
         /**
          * Given: an unreported expense with no IOU action anywhere (neither in the
          *        search snapshot nor in the real Onyx REPORT_ACTIONS collection).
          *
          * When: the user confirms bulk delete.
          *
-         * Then: deleteMoneyRequest is NOT called — the transaction is silently skipped.
-         *
-         * This is a known graceful no-op: without the action there is no IOUReportID
-         * and nothing to delete server-side.
+         * Then: deleteMoneyRequest is still called for the transaction, without a report action,
+         *       because the API deletes the expense by transactionID alone.
          */
 
         // No snapshot data at all.
@@ -462,11 +460,14 @@ describe('useSearchBulkActions - delete unreported expenses', () => {
         });
 
         await waitFor(() => {
-            expect(mockShowConfirmModal).toHaveBeenCalled();
+            expect(deleteMoneyRequest).toHaveBeenCalledTimes(1);
+            expect(deleteMoneyRequest).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    transactionID: TRANSACTION_ID,
+                    reportAction: undefined,
+                }),
+            );
         });
-
-        // No deleteMoneyRequest call — no action was found.
-        expect(deleteMoneyRequest).not.toHaveBeenCalled();
     });
 
     it('passes the report and reportActions from the search snapshot to deleteAppReport when the report is not in Onyx', async () => {
diff --git a/tests/unit/hooks/useSearchBulkActionsExportTest.ts b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
index 1f782010c698..62d7b71b5f08 100644
--- a/tests/unit/hooks/useSearchBulkActionsExportTest.ts
+++ b/tests/unit/hooks/useSearchBulkActionsExportTest.ts
@@ -6,8 +6,9 @@ import type {SearchQueryJSON, SelectedReports, SelectedTransactions} from '@comp
 import useSearchBulkActions from '@hooks/useSearchBulkActions';
 
 import {markAsManuallyExported} from '@libs/actions/Report';
-import {exportSearchItemsToCSV, exportToIntegrationOnSearch, getExportTemplates} from '@libs/actions/Search';
+import {exportSearchItemsToCSV, exportToIntegrationOnSearch, getExportTemplates, queueBulkMarkAsExported, queueExportSearchWithTemplate} from '@libs/actions/Search';
 import type * as ReportSecondaryActionUtilsModule from '@libs/ReportSecondaryActionUtils';
+import {getSelectedGroupFilterEntry} from '@libs/SearchUIUtils';
 import type * as SearchUIUtilsModule from '@libs/SearchUIUtils';
 
 import CONST from '@src/CONST';
@@ -58,6 +59,7 @@ jest.mock('@libs/actions/Search', () => ({
     })),
     exportSearchItemsToCSV: jest.fn(),
     exportToIntegrationOnSearch: jest.fn(),
+    queueBulkMarkAsExported: jest.fn(),
     queueExportSearchItemsToCSV: jest.fn(),
     queueExportSearchWithTemplate: jest.fn(),
     getSearchApproveOnyxData: jest.fn(() => ({})),
@@ -142,9 +144,10 @@ jest.mock('@hooks/useTheme', () => ({
     default: () => ({icon: ''}),
 }));
 
+let mockIsOffline = false;
 jest.mock('@hooks/useNetwork', () => ({
     __esModule: true,
-    default: () => ({isOffline: false}),
+    default: () => ({isOffline: mockIsOffline}),
 }));
 
 jest.mock('@hooks/useEnvironment', () => ({
@@ -240,6 +243,7 @@ let mockSelectedTransactions: SelectedTransactions = {};
 let mockSelectedReports: SelectedReports[] = [];
 let mockCurrentSearchResults: SearchResults | undefined;
 let mockAreAllMatchingItemsSelected = false;
+let mockCurrentSearchKey: string | undefined;
 
 jest.mock('@components/Search/SearchContext', () => ({
     useSearchSelectionContext: () => ({
@@ -251,7 +255,7 @@ jest.mock('@components/Search/SearchContext', () => ({
         currentSearchResults: mockCurrentSearchResults,
     }),
     useSearchQueryContext: () => ({
-        currentSearchKey: undefined,
+        currentSearchKey: mockCurrentSearchKey,
         currentSearchHash: 12345,
         currentSearchQueryJSON: undefined,
         suggestedSearches: undefined,
@@ -312,6 +316,13 @@ const groupedExpenseQueryJSON: SearchQueryJSON = {
     groupBy: CONST.SEARCH.GROUP_BY.CATEGORY,
 };
 
+/** The shape of the Card statements and Card accruals suggested searches: an expense search grouped by card. */
+const cardGroupedExpenseQueryJSON: SearchQueryJSON = {
+    ...groupedExpenseQueryJSON,
+    inputQuery: `type:expense groupBy:${CONST.SEARCH.GROUP_BY.CARD}`,
+    groupBy: CONST.SEARCH.GROUP_BY.CARD,
+};
+
 const ungroupedExpenseQueryJSON: SearchQueryJSON = {
     ...expenseReportQueryJSON,
     inputQuery: 'type:expense status:all',
@@ -526,6 +537,8 @@ describe('useSearchBulkActions - export options', () => {
         // tests override with mockResolvedValueOnce to exercise the cancel path.
         mockShowConfirmModal.mockResolvedValue({action: 'CONFIRM'});
         mockAreAllMatchingItemsSelected = false;
+        mockCurrentSearchKey = undefined;
+        mockIsOffline = false;
 
         await Onyx.merge(ONYXKEYS.SESSION, {accountID: CURRENT_USER_ACCOUNT_ID, email: 'test@example.com'});
         // A policy connected to NetSuite so the integration export branch is reachable.
@@ -1254,6 +1267,147 @@ describe('useSearchBulkActions - export options', () => {
         expect(mockShowConfirmModal).not.toHaveBeenCalled();
     });
 
+    it('queues a server-side bulk mark-as-exported instead of marking specific report IDs when all matching items are selected', async () => {
+        // Given: "Select all" is checked, so the selection can span more reports than are loaded on the current page.
+        mockAreAllMatchingItemsSelected = true;
+        mockCurrentSearchResults = makeSearchResults([makeSnapshotReport()]);
+        mockSelectedReports = [makeSelectedReport()];
+        mockSelectedTransactions = {tx1: makeSelectedTransaction()};
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportSubMenuItems(result.current.headerButtonsOptions)?.some((item) => item.text === 'workspace.common.markAsExported')).toBe(true);
+        });
+
+        // When: the user clicks "Mark as exported".
+        getExportSubMenuItems(result.current.headerButtonsOptions)
+            ?.find((item) => item.text === 'workspace.common.markAsExported')
+            ?.onSelected?.();
+
+        // Then: the connection and search query are handed to the backend, which resolves every matching report
+        // itself, instead of looping markAsManuallyExported over the loaded report IDs.
+        await waitFor(() => {
+            expect(queueBulkMarkAsExported).toHaveBeenCalledWith(expect.any(String), CONST.POLICY.CONNECTIONS.NAME.NETSUITE, undefined);
+        });
+        expect(markAsManuallyExported).not.toHaveBeenCalled();
+        expect(mockClearSelectedTransactions).toHaveBeenCalled();
+    });
+
+    it('passes qboIntegrationAlias so the backend can tell an IES connection apart from a regular QBO connection sharing the same connectionName', async () => {
+        // Given: "Select all" is checked on a workspace connected to QBO with the Intuit Enterprise Suite scope.
+        mockAreAllMatchingItemsSelected = true;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {
+            id: POLICY_ID,
+            connections: {[CONST.POLICY.CONNECTIONS.NAME.QBO]: {config: {credentials: {scope: CONST.POLICY.CONNECTIONS.INTUIT_ENTERPRISE_SUITE_SCOPE}}}},
+        });
+        mockCurrentSearchResults = makeSearchResults([makeSnapshotReport()]);
+        mockSelectedReports = [makeSelectedReport()];
+        mockSelectedTransactions = {tx1: makeSelectedTransaction()};
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportSubMenuItems(result.current.headerButtonsOptions)?.some((item) => item.text === 'workspace.common.markAsExported')).toBe(true);
+        });
+
+        // When: the user clicks "Mark as exported".
+        getExportSubMenuItems(result.current.headerButtonsOptions)
+            ?.find((item) => item.text === 'workspace.common.markAsExported')
+            ?.onSelected?.();
+
+        // Then: qboIntegrationAlias is sent as the IES alias, since connectionName alone can't distinguish IES
+        // from a regular QBO connection.
+        await waitFor(() => {
+            expect(queueBulkMarkAsExported).toHaveBeenCalledWith(
+                expect.any(String),
+                CONST.POLICY.CONNECTIONS.NAME.QBO,
+                CONST.POLICY.CONNECTIONS.ACCOUNTING_INTEGRATION_ALIASES.INTUIT_ENTERPRISE_SUITE,
+            );
+        });
+    });
+
+    it('omits qboIntegrationAlias for a regular QBO connection', async () => {
+        // Given: "Select all" is checked on a workspace connected to regular QBO (no IES scope).
+        mockAreAllMatchingItemsSelected = true;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, {
+            id: POLICY_ID,
+            connections: {[CONST.POLICY.CONNECTIONS.NAME.QBO]: {}},
+        });
+        mockCurrentSearchResults = makeSearchResults([makeSnapshotReport()]);
+        mockSelectedReports = [makeSelectedReport()];
+        mockSelectedTransactions = {tx1: makeSelectedTransaction()};
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportSubMenuItems(result.current.headerButtonsOptions)?.some((item) => item.text === 'workspace.common.markAsExported')).toBe(true);
+        });
+
+        // When: the user clicks "Mark as exported".
+        getExportSubMenuItems(result.current.headerButtonsOptions)
+            ?.find((item) => item.text === 'workspace.common.markAsExported')
+            ?.onSelected?.();
+
+        // Then: qboIntegrationAlias is left undefined, since there is nothing to disambiguate.
+        await waitFor(() => {
+            expect(queueBulkMarkAsExported).toHaveBeenCalledWith(expect.any(String), CONST.POLICY.CONNECTIONS.NAME.QBO, undefined);
+        });
+    });
+
+    it('opens the offline modal instead of queuing when all matching items are selected and offline', async () => {
+        // Given: "Select all" is checked and the user is offline.
+        mockAreAllMatchingItemsSelected = true;
+        mockIsOffline = true;
+        mockCurrentSearchResults = makeSearchResults([makeSnapshotReport()]);
+        mockSelectedReports = [makeSelectedReport()];
+        mockSelectedTransactions = {tx1: makeSelectedTransaction()};
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportSubMenuItems(result.current.headerButtonsOptions)?.some((item) => item.text === 'workspace.common.markAsExported')).toBe(true);
+        });
+
+        // When: the user clicks "Mark as exported".
+        getExportSubMenuItems(result.current.headerButtonsOptions)
+            ?.find((item) => item.text === 'workspace.common.markAsExported')
+            ?.onSelected?.();
+
+        // Then: the offline modal opens and nothing is queued, matching bulk pay's offline behavior.
+        await waitFor(() => {
+            expect(result.current.isOfflineModalVisible).toBe(true);
+        });
+        expect(queueBulkMarkAsExported).not.toHaveBeenCalled();
+        expect(mockClearSelectedTransactions).not.toHaveBeenCalled();
+    });
+
+    it('marks the specific selected report IDs, not the search query, for a limited (non-select-all) selection', async () => {
+        // Given: a finite selection of specific reports ("Select all" is NOT checked).
+        mockAreAllMatchingItemsSelected = false;
+        mockCurrentSearchResults = makeSearchResults([makeSnapshotReport()]);
+        mockSelectedReports = [makeSelectedReport()];
+        mockSelectedTransactions = {tx1: makeSelectedTransaction()};
+
+        const {result} = renderHook(() => useSearchBulkActions({queryJSON: expenseReportQueryJSON}), {wrapper: OnyxListItemProvider});
+
+        await waitFor(() => {
+            expect(getExportSubMenuItems(result.current.headerButtonsOptions)?.some((item) => item.text === 'workspace.common.markAsExported')).toBe(true);
+        });
+
+        // When: the user clicks "Mark as exported".
+        getExportSubMenuItems(result.current.headerButtonsOptions)
+            ?.find((item) => item.text === 'workspace.common.markAsExported')
+            ?.onSelected?.();
+
+        // Then: the existing per-report flow runs (markAsManuallyExported with the loaded report IDs), and the
+        // select-all backend command is never called.
+        await waitFor(() => {
+            expect(markAsManuallyExported).toHaveBeenCalledWith([REPORT_ID], CONST.POLICY.CONNECTIONS.NAME.NETSUITE, expect.anything());
+        });
+        expect(queueBulkMarkAsExported).not.toHaveBeenCalled();
+    });
+
     it('shows templates when reports are selected through their report groups', async () => {
         mockCurrentSearchResults = makeSearchResults([makeSnapshotReport()]);
         mockSelectedReports = [makeSelectedReport()];
@@ -1286,6 +1440,310 @@ describe('useSearchBulkActions - export options', () => {
         });
     });
 
+    describe('Reconciliation - All Expenses on a card group selection', () => {
+        const CARD_GROUP_KEY = `${CONST.SEARCH.GROUP_PREFIX}1234`;
+
+        // jest.clearAllMocks() only clears recorded calls, so the template list each test installs has to be undone by hand.
+        const defaultExportTemplates = mockGetExportTemplates.getMockImplementation();
+
+        afterEach(() => {
+            mockGetExportTemplates.mockImplementation(defaultExportTemplates);
+        });
+
+        /** Offer the Reconciliation template alongside the templates that stay hidden for a group selection. */
+        function mockTemplatesIncludingReconciliation() {
+            mockGetExportTemplates.mockReturnValue({
+                customTemplates: [{name: 'Custom template', templateName: 'customTemplate', type: 'in-app', policyID: undefined, description: ''}],
+                defaultTemplates: [
+                    {name: 'export.expenseLevelExport', templateName: CONST.REPORT.EXPORT_OPTIONS.EXPENSE_LEVEL_EXPORT, type: 'integrations', policyID: undefined, description: ''},
+                    {
+                        name: 'export.reconciliationAllExpenses',
+                        templateName: CONST.REPORT.EXPORT_OPTIONS.RECONCILIATION_ALL_EXPENSES,
+                        type: 'integrations',
+                        policyID: undefined,
+                        description: '',
+                    },
+                ],
+            });
+        }
+
+        /**
+         * A selection made by ticking a populated card group's checkbox. `SearchWriteActionsProvider` stores the
+         * group's loaded children stamped with `groupKey`/`isSelectedViaGroup` and does NOT store the group key
+         * itself. It only stores that when the group had no children loaded (see `selectEmptyCardGroup`).
+         */
+        function selectCardGroup() {
+            mockSelectedTransactions = {
+                tx1: makeSelectedTransaction({groupKey: CARD_GROUP_KEY, isSelectedViaGroup: true}),
+            };
+        }
+
+        /** Ticking a card group row whose children were never loaded: the group key is stored on its own. */
+        function selectEmptyCardGroup() {
+            mockSelectedTransactions = {
+                [CARD_GROUP_KEY]: makeSelectedTransaction(),
+            };
+        }
+
+        it('offers the Reconciliation template, and only that template, for a card group selection', async () => {
+            // Given a user who qualifies for the Reconciliation template, offered alongside the templates that stay hidden for a group selection
+            mockTemplatesIncludingReconciliation();
+
+            // Given a ticked card group row, because selecting the card group rather than the individual expenses is how an admin reconciles a statement
+            selectCardGroup();
+
+            // When the export menu is built for a search grouped by card
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: cardGroupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            // Then Reconciliation is the one template still offered, because the selected card groups can be expressed as a `cardID:` filter while the other templates have no way to describe a group
+            await waitFor(() => {
+                expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(['export.currentView', 'export.reconciliationAllExpenses']);
+            });
+        });
+
+        it('offers the Reconciliation template for a card group whose children were never loaded', async () => {
+            // Given a user who qualifies for the Reconciliation template
+            mockTemplatesIncludingReconciliation();
+
+            // Given a card group ticked before any of its children were loaded, so the selection holds the group key on its own instead of stamped children
+            selectEmptyCardGroup();
+
+            // When the export menu is built for a search grouped by card
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: cardGroupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            // Then the template is offered just the same, because both shapes a card group selection can take have to reach the card group exception or the option would come and go with how far the list happened to be scrolled
+            await waitFor(() => {
+                expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(['export.currentView', 'export.reconciliationAllExpenses']);
+            });
+        });
+
+        it('keeps every template hidden when the group selection is grouped by something other than card', async () => {
+            // Given a user who qualifies for the Reconciliation template
+            mockTemplatesIncludingReconciliation();
+
+            // Given a ticked group row
+            selectCardGroup();
+
+            // When the export menu is built for a search grouped by category instead of by card
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: groupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            // Then no template is offered at all, because the exception is limited to card groups and every other grouping keeps the existing rule that a group cannot be scoped
+            await waitFor(() => {
+                expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(['export.currentView']);
+            });
+        });
+
+        it('hides the Reconciliation template for a card group selection when the user is not a card-enabled admin', async () => {
+            // Given a user who does not qualify for the template, so getExportTemplates leaves it out entirely
+
+            // Given a ticked card group row
+            selectCardGroup();
+
+            // When the export menu is built for a search grouped by card
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: cardGroupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            // Then only Current view is offered, because the card group exception only narrows the templates the user was already entitled to and must never hand out one they were not
+            await waitFor(() => {
+                expect(getExportOptionTexts(result.current.headerButtonsOptions)).toEqual(['export.currentView']);
+            });
+        });
+
+        // Regression test for detecting the group export from the child metadata: with only `isSelectedViaGroup`
+        // children selected, looking for the group prefix alone misses the group and exports the loaded IDs instead
+        // of the `cardID:` filter, so a group with paginated children would export incompletely.
+        it('scopes the Reconciliation export to the selected card groups instead of a transaction ID list', async () => {
+            // Given a user who qualifies for the Reconciliation template
+            mockTemplatesIncludingReconciliation();
+
+            // Given a ticked card group
+            selectCardGroup();
+
+            // Given one expense ticked on its own alongside it, because that expense belongs to another card and so is not covered by the group's filter
+            mockSelectedTransactions.tx2 = makeSelectedTransaction();
+            const searchResults = makeSearchResults([]);
+
+            // Given the card group row as it arrives in the search snapshot, which the group's filter entry is derived from
+            Object.assign(searchResults.data, {[CARD_GROUP_KEY]: {cardID: 1234}});
+            mockCurrentSearchResults = searchResults;
+            jest.mocked(getSelectedGroupFilterEntry).mockReturnValue({key: CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID, value: 1234});
+
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: cardGroupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            await waitFor(() => {
+                expect(getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')).toBeDefined();
+            });
+
+            // When the user runs the Reconciliation export on that selection
+            getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')?.onSelected?.();
+
+            await waitFor(() => {
+                expect(queueExportSearchWithTemplate).toHaveBeenCalled();
+            });
+
+            const [parameters] = jest.mocked(queueExportSearchWithTemplate).mock.calls.at(-1) ?? [];
+
+            // Then the chosen template is the one that runs
+            expect(parameters?.templateName).toBe(CONST.REPORT.EXPORT_OPTIONS.RECONCILIATION_ALL_EXPENSES);
+
+            // Then the card groups travel as a `cardID:` filter on the query rather than as IDs, so the export covers
+            // every expense on the card and not only the rows that happened to be loaded, while the expense ticked on
+            // its own is still sent as an ID so it is not dropped, matching what "Current view" does.
+            expect(parameters?.reportIDList).toEqual([]);
+            expect(parameters?.transactionIDList).toEqual(['tx2']);
+            expect(parameters?.jsonQuery).toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID);
+        });
+
+        // Regression test for https://github.com/Expensify/App/issues/102103: the template export has no isGroupExport
+        // flag, so a query that still carried groupBy exported one row per selected card instead of the card's expenses.
+        it('sends the Reconciliation export an ungrouped query scoped to the selected card groups', async () => {
+            // Given a user who qualifies for the Reconciliation template
+            mockTemplatesIncludingReconciliation();
+
+            // Given a ticked card group on the Reconciliation search, because searchKey changes which expenses the backend matches
+            selectCardGroup();
+            mockCurrentSearchKey = CONST.SEARCH.SEARCH_KEYS.RECONCILIATION;
+            const searchResults = makeSearchResults([]);
+            Object.assign(searchResults.data, {[CARD_GROUP_KEY]: {cardID: 1234}});
+            mockCurrentSearchResults = searchResults;
+            jest.mocked(getSelectedGroupFilterEntry).mockReturnValue({key: CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID, value: 1234});
+
+            // Given a limit on the grouped search, because it caps the number of card groups and would cap the exported expenses once groupBy is gone
+            const limitedCardGroupedQueryJSON: SearchQueryJSON = {...cardGroupedExpenseQueryJSON, inputQuery: `${cardGroupedExpenseQueryJSON.inputQuery} limit:1`, limit: 1};
+
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: limitedCardGroupedQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            await waitFor(() => {
+                expect(getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')).toBeDefined();
+            });
+
+            // When the user runs the Reconciliation export on that selection
+            getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')?.onSelected?.();
+
+            await waitFor(() => {
+                expect(queueExportSearchWithTemplate).toHaveBeenCalled();
+            });
+
+            const [parameters] = jest.mocked(queueExportSearchWithTemplate).mock.calls.at(-1) ?? [];
+            const query: unknown = JSON.parse(parameters?.jsonQuery ?? '{}');
+
+            // Then the query lists the card's expenses rather than the card group, and no group limit caps them
+            expect(query).not.toHaveProperty('groupBy');
+            expect(query).not.toHaveProperty('limit');
+
+            // Then the export is still scoped to the selected card
+            expect(JSON.stringify(query)).toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID);
+
+            // Then searchKey is sent, so the exported set matches the viewed set
+            expect(query).toHaveProperty('searchKey', CONST.SEARCH.SEARCH_KEYS.RECONCILIATION);
+        });
+
+        // Regression test for the select-all path: it sends the search's own query instead of the selected groups, so it
+        // has to drop groupBy the same way or the export lists one row per card again, as in https://github.com/Expensify/App/issues/102103.
+        it('sends the Reconciliation export an ungrouped query when all matching items are selected', async () => {
+            // Given a user who qualifies for the Reconciliation template
+            mockTemplatesIncludingReconciliation();
+
+            // Given every matching item selected on the Reconciliation search, because searchKey changes which expenses the backend matches
+            selectCardGroup();
+            mockAreAllMatchingItemsSelected = true;
+            mockCurrentSearchKey = CONST.SEARCH.SEARCH_KEYS.RECONCILIATION;
+
+            // Given a limit on the grouped search, because it caps the number of card groups and would cap the exported expenses once groupBy is gone
+            const limitedCardGroupedQueryJSON: SearchQueryJSON = {...cardGroupedExpenseQueryJSON, inputQuery: `${cardGroupedExpenseQueryJSON.inputQuery} limit:1`, limit: 1};
+
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: limitedCardGroupedQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            await waitFor(() => {
+                expect(getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')).toBeDefined();
+            });
+
+            // When the user runs the Reconciliation export on that selection
+            getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')?.onSelected?.();
+
+            await waitFor(() => {
+                expect(queueExportSearchWithTemplate).toHaveBeenCalled();
+            });
+
+            const [parameters] = jest.mocked(queueExportSearchWithTemplate).mock.calls.at(-1) ?? [];
+            const query: unknown = JSON.parse(parameters?.jsonQuery ?? '{}');
+
+            // Then the query lists every matching expense rather than one row per card, and no group limit caps them
+            expect(query).not.toHaveProperty('groupBy');
+            expect(query).not.toHaveProperty('limit');
+
+            // Then searchKey is sent, so the exported set matches the viewed set
+            expect(query).toHaveProperty('searchKey', CONST.SEARCH.SEARCH_KEYS.RECONCILIATION);
+
+            // Then the whole search is exported through the query, not through IDs
+            expect(parameters?.reportIDList).toEqual([]);
+            expect(parameters?.transactionIDList).toEqual([]);
+        });
+
+        it('shows the download error instead of exporting the whole search when the card group cannot be scoped', async () => {
+            // Given a user who qualifies for the Reconciliation template
+            mockTemplatesIncludingReconciliation();
+
+            // Given a ticked card group whose row is missing from the snapshot, so no cardID filter can be built for it
+            selectCardGroup();
+            mockCurrentSearchResults = makeSearchResults([]);
+
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: cardGroupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            await waitFor(() => {
+                expect(getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')).toBeDefined();
+            });
+
+            // When the user runs the Reconciliation export on that selection
+            getExportOptionByText(result.current.headerButtonsOptions, 'export.reconciliationAllExpenses')?.onSelected?.();
+
+            // Then nothing is exported, because dropping groupBy without a cardID filter would export every card in the search
+            await waitFor(() => {
+                expect(result.current.isDownloadErrorModalVisible).toBe(true);
+            });
+            expect(queueExportSearchWithTemplate).not.toHaveBeenCalled();
+        });
+
+        // The template export and Current view both scope a group selection through `getGroupExportScope`. Pinning
+        // Current view to the same expectation is what stops the two paths drifting apart again: the gate that shows
+        // the Reconciliation option and the gate that scopes it have to agree, or a card group exports incompletely.
+        it('scopes the Current view export of a card group the same way as the Reconciliation template', async () => {
+            // Given the same selection the Reconciliation export was checked against, so the two paths are compared on identical input
+            mockTemplatesIncludingReconciliation();
+            selectCardGroup();
+
+            // Given one expense ticked on its own alongside the group, because that expense belongs to another card and so is not covered by the group's filter
+            mockSelectedTransactions.tx2 = makeSelectedTransaction();
+            const searchResults = makeSearchResults([]);
+            Object.assign(searchResults.data, {[CARD_GROUP_KEY]: {cardID: 1234}});
+            mockCurrentSearchResults = searchResults;
+            jest.mocked(getSelectedGroupFilterEntry).mockReturnValue({key: CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID, value: 1234});
+
+            const {result} = renderHook(() => useSearchBulkActions({queryJSON: cardGroupedExpenseQueryJSON}), {wrapper: OnyxListItemProvider});
+
+            await waitFor(() => {
+                expect(getExportOptionByText(result.current.headerButtonsOptions, 'export.currentView')).toBeDefined();
+            });
+
+            // When the user runs the Current view export instead of the template
+            getExportOptionByText(result.current.headerButtonsOptions, 'export.currentView')?.onSelected?.();
+
+            await waitFor(() => {
+                expect(exportSearchItemsToCSV).toHaveBeenCalled();
+            });
+
+            const {isGroupExport, reportIDList, transactionIDList, query} = getLastCSVExportParameters();
+
+            // Then it covers exactly the same rows, because an admin who exports the same selection twice must get the
+            // same scope back, and the two paths drifting apart is what made a card group export incompletely.
+            expect(isGroupExport).toBe(true);
+            expect(reportIDList).toEqual([]);
+            expect(transactionIDList).toEqual(['tx2']);
+
+            // Then the selected card groups reach the backend as a `cardID:` filter on the query rather than as IDs
+            expect(JSON.stringify(query)).toContain(CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID);
+        });
+    });
+
     it('offers Current view as the only plain-CSV export on a grouped search', async () => {
         mockSelectedTransactions = {tx1: makeSelectedTransaction()};
 
diff --git a/tests/unit/hooks/useSelectedTransactionsActions.test.ts b/tests/unit/hooks/useSelectedTransactionsActions.test.ts
index c91701edd41d..8b33047a021d 100644
--- a/tests/unit/hooks/useSelectedTransactionsActions.test.ts
+++ b/tests/unit/hooks/useSelectedTransactionsActions.test.ts
@@ -410,7 +410,7 @@ describe('useSelectedTransactionsActions', () => {
 
         await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, transaction);
 
-        jest.spyOn(require('@libs/ReportUtils'), 'canDeleteCardTransactionByLiabilityType').mockReturnValue(true);
+        jest.spyOn(require('@libs/ReportUtils'), 'canDeleteCardTransaction').mockReturnValue(true);
         jest.spyOn(require('@libs/ReportUtils'), 'canDeleteTransaction').mockReturnValue(true);
         jest.spyOn(require('@libs/ReportActionsUtils'), 'isDeletedAction').mockReturnValue(false);
         jest.spyOn(require('@libs/ReportActionsUtils'), 'getIOUActionForTransactionID').mockReturnValue(reportActions.at(0) as OnyxEntry<ReportAction>);
@@ -492,7 +492,7 @@ describe('useSelectedTransactionsActions', () => {
 
         await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, transaction);
 
-        jest.spyOn(require('@libs/ReportUtils'), 'canDeleteCardTransactionByLiabilityType').mockReturnValue(true);
+        jest.spyOn(require('@libs/ReportUtils'), 'canDeleteCardTransaction').mockReturnValue(true);
         jest.spyOn(require('@libs/ReportUtils'), 'canDeleteTransaction').mockReturnValue(true);
         jest.spyOn(require('@libs/ReportActionsUtils'), 'isDeletedAction').mockReturnValue(false);
         jest.spyOn(require('@libs/ReportActionsUtils'), 'getIOUActionForTransactionID').mockReturnValue(reportActions.at(0) as OnyxEntry<ReportAction>);
diff --git a/tests/unit/hooks/useSelectionModeReportActions.test.ts b/tests/unit/hooks/useSelectionModeReportActions.test.ts
index b20c6ad9cf46..a0b9606ce8bf 100644
--- a/tests/unit/hooks/useSelectionModeReportActions.test.ts
+++ b/tests/unit/hooks/useSelectionModeReportActions.test.ts
@@ -9,6 +9,7 @@ import type {ReportSubmitToPopoverOpenOptions} from '@hooks/useReportSubmitToPop
 import useSelectionModeReportActions from '@hooks/useSelectionModeReportActions';
 
 import {submitReport} from '@libs/actions/IOU/ReportWorkflow';
+import type * as MoneyRequestReportUtils from '@libs/MoneyRequestReportUtils';
 import {isSubmitPolicy} from '@libs/PolicyUtils';
 import {
     getNextApproverAccountID,
@@ -292,6 +293,7 @@ jest.mock('@libs/ReportActionsUtils', () => ({
 }));
 
 jest.mock('@libs/MoneyRequestReportUtils', () => ({
+    ...jest.requireActual<typeof MoneyRequestReportUtils>('@libs/MoneyRequestReportUtils'),
     __esModule: true,
     getTotalAmountForIOUReportPreviewButton: jest.fn(() => '$100.00'),
 }));
@@ -309,6 +311,7 @@ jest.mock('@libs/TransactionUtils', () => ({
     isExpensifyCardTransaction: jest.fn(() => false),
     isPending: jest.fn(() => false),
     getReimbursable: jest.fn(() => true),
+    isTransactionPendingDelete: jest.fn(() => false),
 }));
 
 jest.mock('@userActions/Transaction', () => ({
@@ -444,6 +447,20 @@ describe('useSelectionModeReportActions', () => {
             expect(result.current.allExpensesSelected).toBe(false);
         });
 
+        it('returns true when Select All has written every row it can, leaving only an expense the backend refused to reject', () => {
+            // Given a report whose third expense carries a refused reject, which keeps it on the report until the user dismisses it
+            const transactions = [buildTransaction(1), buildTransaction(2), buildTransaction(3, {errorFields: {reject: {1700000000000: 'iou.rejectReport.couldNotRejectExpense'}}})];
+
+            // When Select All writes the two rows a checkbox can reach
+            const {result} = renderSelectionModeHook({
+                transactions,
+                selectedTransactionIDs: ['1', '2'],
+            });
+
+            // Then the report counts as covered, or Submit, Approve and Pay stay hidden for as long as that error stands
+            expect(result.current.allExpensesSelected).toBe(true);
+        });
+
         it('returns false when no transactions are selected', () => {
             const {result} = renderSelectionModeHook({
                 selectedTransactionIDs: [],
diff --git a/tests/unit/hooks/useShiftRangeSelection.test.ts b/tests/unit/hooks/useShiftRangeSelection.test.ts
index 071706fcbf76..ff96c6b5a2c0 100644
--- a/tests/unit/hooks/useShiftRangeSelection.test.ts
+++ b/tests/unit/hooks/useShiftRangeSelection.test.ts
@@ -205,6 +205,59 @@ describe('useShiftRangeSelection', () => {
             });
             expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'c', 'e'], toDeselect: []});
         });
+
+        it('keeps the last usable anchor when notifyAnchor is passed a row the list does not contain', () => {
+            const onApplyRange = makeApplyMock();
+            const {result} = renderHook(() => useShiftRangeSelection<Row>(makeParams({onApplyRange})));
+            // Given 'b' clicked plainly, and then a row that can never be a range endpoint, such as an expanded child in a report list
+            act(() => result.current.notifyAnchor(ROW_B));
+            act(() => result.current.notifyAnchor({keyForList: 'not-in-the-list'}));
+
+            // When a shift+click lands further down
+            act(() => {
+                result.current.applyShiftClick(ROW_D, true);
+            });
+
+            // Then it still ranges from 'b', since a row no range can reach must not cost the user the anchor
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c', 'd'], toDeselect: []});
+        });
+
+        it('ends the range when a plain click lands on a row no range can reach, while keeping the anchor it can still use', () => {
+            const onApplyRange = makeApplyMock();
+            const {result} = renderHook(() => useShiftRangeSelection<Row>(makeParams({onApplyRange})));
+
+            // Given a range painted from 'a' through 'c'
+            act(() => result.current.notifyAnchor(ROW_A));
+            act(() => {
+                result.current.applyShiftClick(ROW_C, true);
+            });
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'b', 'c'], toDeselect: []});
+
+            // When a plain click lands on a row the list does not carry, such as one rendered inside an expanded report
+            act(() => result.current.notifyAnchor({keyForList: 'not-in-the-list'}));
+
+            // Then the next shift+click ranges from 'a' again and gives nothing back, since the click it follows painted nothing
+            act(() => {
+                result.current.applyShiftClick(ROW_B, true);
+            });
+            expect(nthBatchKeys(onApplyRange, 1)).toEqual({toSelect: ['a', 'b'], toDeselect: []});
+        });
+
+        it('matches notifyAnchor by key, so a re-rendered copy of a row still anchors', () => {
+            const onApplyRange = makeApplyMock();
+            const {result} = renderHook(() => useShiftRangeSelection<Row>(makeParams({onApplyRange})));
+
+            // Given the anchor notified with a copy of the row rather than the object the list holds
+            act(() => result.current.notifyAnchor({...ROW_B}));
+
+            // When a shift+click lands further down
+            act(() => {
+                result.current.applyShiftClick(ROW_D, true);
+            });
+
+            // Then it ranges from there, since the list builds a new object for every row on every render
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c', 'd'], toDeselect: []});
+        });
     });
 
     describe('range computation', () => {
@@ -397,6 +450,66 @@ describe('useShiftRangeSelection', () => {
             expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'b', 'c'], toDeselect: ['d', 'e']});
         });
 
+        it('collapses a row that was filtered out between Select All and the click, once it is back', () => {
+            const onApplyRange = makeApplyMock();
+            const {result, rerender} = renderHook((props: {items: Row[]}) => useShiftRangeSelection<Row>(makeParams({onApplyRange, items: props.items})), {initialProps: {items: ROWS}});
+
+            // Given Select All over the whole list, which paints every row present
+            act(() => result.current.seedFullRange());
+
+            // When a filter hides the tail and a shift+click narrows what is left
+            rerender({items: [ROW_A, ROW_B, ROW_C]});
+            act(() => {
+                result.current.applyShiftClick(ROW_B, true);
+            });
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'b'], toDeselect: ['c']});
+
+            // Then the rows that were hidden are still painted, so clearing the filter lets the next click collapse them
+            rerender({items: ROWS});
+            act(() => {
+                result.current.applyShiftClick(ROW_A, true);
+            });
+            expect(nthBatchKeys(onApplyRange, 1)).toEqual({toSelect: ['a'], toDeselect: ['b', 'd', 'e']});
+        });
+
+        it('takes in rows that arrive between Select All and the click, so they collapse with the rest', () => {
+            const onApplyRange = makeApplyMock();
+            const {result, rerender} = renderHook((props: {items: Row[]}) => useShiftRangeSelection<Row>(makeParams({onApplyRange, items: props.items})), {
+                initialProps: {items: [ROW_A, ROW_B]},
+            });
+
+            // Given Select All while only the first rows are on screen
+            act(() => result.current.seedFullRange());
+
+            // When the rest arrive and a shift+click lands on the second row
+            rerender({items: ROWS});
+            act(() => {
+                result.current.applyShiftClick(ROW_B, true);
+            });
+
+            // Then the rows that arrived belong to the block and collapse with it
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'b'], toDeselect: ['c', 'd', 'e']});
+        });
+
+        it('resolves the seeded anchor against the order on screen at the click, so a re-sort after Select All trims from the new top', () => {
+            const onApplyRange = makeApplyMock();
+            const {result, rerender} = renderHook((props: {items: Row[]}) => useShiftRangeSelection<Row>(makeParams({onApplyRange, items: props.items, isItemSelected: () => true})), {
+                initialProps: {items: ROWS},
+            });
+
+            // Given Select All over a b c d e
+            act(() => result.current.seedFullRange());
+
+            // When the list is re-sorted before the next click, as a column press does in the shared table
+            rerender({items: [...ROWS].reverse()});
+            act(() => {
+                result.current.applyShiftClick(ROW_C, true);
+            });
+
+            // Then it trims from the row now at the top down to the click, rather than from wherever the old first row moved to
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['e', 'd', 'c'], toDeselect: ['a', 'b']});
+        });
+
         it('spans only selectable rows, skipping excluded ones', () => {
             const onApplyRange = makeApplyMock();
             const {result} = renderHook(() => useShiftRangeSelection<Row>(makeParams({items: MIXED, onApplyRange, isDisabledItem: (row) => !!row.isDisabled})));
@@ -451,15 +564,68 @@ describe('useShiftRangeSelection', () => {
             expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c'], toDeselect: ['d']});
         });
 
-        it('clears the session when the selection is empty, so the next shift+click resolves a cold anchor', () => {
+        it('leaves the session alone when the block turns out to hold no rows, since nothing was selected', () => {
             const onApplyRange = makeApplyMock();
             const {result} = renderHook(() => useShiftRangeSelection<Row>(makeParams({onApplyRange})));
+            // Given 'b' clicked plainly, and then a block seeded that holds no rows at all
+            act(() => result.current.notifyAnchor(ROW_B));
             act(() => result.current.seedRangeFromSelection([]));
+
+            // When a shift+click lands further down
+            act(() => {
+                result.current.applyShiftClick(ROW_D, true);
+            });
+
+            // Then it ranges from 'b' as if nothing had been seeded, since a block holding nothing selected nothing to narrow
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c', 'd'], toDeselect: []});
+        });
+
+        it('starts at the clicked row when a seeded block resolves to no rows on screen, rather than sweeping from the top', () => {
+            const onApplyRange = makeApplyMock();
+            const {result} = renderHook(() => useShiftRangeSelection<Row>(makeParams({onApplyRange})));
+
+            // Given a block seeded for rows that are not on screen, as a collapsed group's are not
+            act(() => result.current.seedRangeFromSelection((key) => key === 'not-in-this-list'));
+
+            // When a shift+click lands
             act(() => {
-                // Session cleared → cold shift+click resolves the anchor from the first selectable row (a).
                 result.current.applyShiftClick(ROW_C, true);
             });
-            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'b', 'c'], toDeselect: []});
+
+            // Then it takes the clicked row alone: the block is what it would have narrowed, and none of it is here
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['c'], toDeselect: []});
+        });
+
+        it('resolves a seeded block against the rows the list holds at shift+click, not the ones it held when seeded', () => {
+            const onApplyRange = makeApplyMock();
+            // Given a block seeded while only `a` is in the list, so none of its rows can be resolved yet
+            const {result, rerender} = renderHook((props: {items: Row[]}) => useShiftRangeSelection<Row>(makeParams({onApplyRange, items: props.items})), {initialProps: {items: [ROW_A]}});
+            act(() => result.current.seedRangeFromSelection(['b', 'c', 'd']));
+
+            // When the rest of the block arrives, the way a group's children do once it is expanded, and a shift+click lands inside it
+            rerender({items: ROWS});
+            act(() => {
+                result.current.applyShiftClick(ROW_C, true);
+            });
+
+            // Then it narrows onto the rows now on screen, rather than onto the empty list it was seeded against
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c'], toDeselect: ['d']});
+        });
+
+        it('accepts a membership test, so a block can be seeded before any of its rows are known', () => {
+            const onApplyRange = makeApplyMock();
+            const {result} = renderHook(() => useShiftRangeSelection<Row>(makeParams({onApplyRange})));
+
+            // Given a block seeded as a test of what belongs to it rather than as a list of keys
+            act(() => result.current.seedRangeFromSelection((key) => key === 'b' || key === 'c' || key === 'd'));
+
+            // When a shift+click lands inside it
+            act(() => {
+                result.current.applyShiftClick(ROW_C, true);
+            });
+
+            // Then it narrows the same way a listed block does, which is what lets Select All seed before a row is known
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c'], toDeselect: ['d']});
         });
     });
 
@@ -488,6 +654,130 @@ describe('useShiftRangeSelection', () => {
             expect(nthBatchKeys(onApplyRange, 1)).toEqual({toSelect: ['b', 'c'], toDeselect: ['d', 'e']});
         });
 
+        it('narrows only the block a cold click lands in, never another block the user picked', () => {
+            const onApplyRange = makeApplyMock();
+            // Given two groups selected from their headers, so every row in both reads as selected and none as picked on its own
+            const twoBlocks: Row[] = [
+                {keyForList: 'h1', isHeader: true},
+                {keyForList: 'a'},
+                {keyForList: 'b'},
+                {keyForList: 'c'},
+                {keyForList: 'h2', isHeader: true},
+                {keyForList: 'd'},
+                {keyForList: 'e'},
+            ];
+            const {result} = renderHook(() =>
+                useShiftRangeSelection<Row>(
+                    makeParams({items: twoBlocks, isHeaderItem: (row) => !!row.isHeader, isItemSelected: (row) => !row.isHeader, isItemProtected: () => false, onApplyRange}),
+                ),
+            );
+
+            // When the first shift+click of a session lands inside the first group
+            act(() => {
+                result.current.applyShiftClick({keyForList: 'b'}, true);
+            });
+
+            // Then that group narrows and the second is left alone, rather than being given back for a click that never reached it
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'b'], toDeselect: ['c']});
+        });
+
+        it('anchors a cold click at the start of the block it lands in, so a later block narrows onto its own rows', () => {
+            const onApplyRange = makeApplyMock();
+            // Given the same two groups selected from their headers
+            const twoBlocks: Row[] = [
+                {keyForList: 'h1', isHeader: true},
+                {keyForList: 'a'},
+                {keyForList: 'b'},
+                {keyForList: 'c'},
+                {keyForList: 'h2', isHeader: true},
+                {keyForList: 'd'},
+                {keyForList: 'e'},
+            ];
+            const {result} = renderHook(() =>
+                useShiftRangeSelection<Row>(
+                    makeParams({items: twoBlocks, isHeaderItem: (row) => !!row.isHeader, isItemSelected: (row) => !row.isHeader, isItemProtected: () => false, onApplyRange}),
+                ),
+            );
+
+            // When the first shift+click of a session lands on the second group's first row
+            act(() => {
+                result.current.applyShiftClick({keyForList: 'd'}, true);
+            });
+
+            // Then the range stays inside that group, rather than running from the first group and sweeping it into the span
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['d'], toDeselect: ['e']});
+        });
+
+        it('adopts an unprotected block on a cold click, anchoring in it and narrowing it in one go', () => {
+            const onApplyRange = makeApplyMock();
+            // Given rows b..e reading as selected with none of them picked on their own, which is how a group-level selection looks
+            const {result} = renderHook(() =>
+                useShiftRangeSelection<Row>(
+                    makeParams({
+                        isItemSelected: (row) => row.keyForList !== 'a',
+                        isItemProtected: () => false,
+                        onApplyRange,
+                    }),
+                ),
+            );
+
+            // When the first shift+click of all lands inside that block
+            act(() => {
+                result.current.applyShiftClick(ROW_D, true);
+            });
+
+            // Then it anchors in the block and narrows it at once, rather than a cold click only ever adding
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c', 'd'], toDeselect: ['e']});
+
+            // And the session carries on from that anchor, so the next click narrows again
+            act(() => {
+                result.current.applyShiftClick(ROW_C, true);
+            });
+            expect(nthBatchKeys(onApplyRange, 1)).toEqual({toSelect: ['b', 'c'], toDeselect: ['d']});
+        });
+
+        it('adopts the block when the remembered anchor is gone, since that session is over', () => {
+            const onApplyRange = makeApplyMock();
+            const {result, rerender} = renderHook(
+                ({items}: {items: Row[]}) => useShiftRangeSelection<Row>(makeParams({items, onApplyRange, isItemSelected: (row) => row.keyForList !== 'a', isItemProtected: () => false})),
+                {initialProps: {items: [...ROWS]}},
+            );
+            // Given a session anchored on 'a', which the next render drops from the list
+            act(() => result.current.notifyAnchor(ROW_A));
+            rerender({items: ROWS.slice(1)});
+
+            // When a shift+click lands inside the block of selected rows
+            act(() => {
+                result.current.applyShiftClick(ROW_C, true);
+            });
+
+            // Then the block is adopted and narrowed, since an anchor the list no longer holds is a session that is over
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['b', 'c'], toDeselect: ['d', 'e']});
+        });
+
+        it('leaves a block alone when the session already has an anchor, so an unrelated range cannot dissolve it', () => {
+            const onApplyRange = makeApplyMock();
+            const {result} = renderHook(() =>
+                useShiftRangeSelection<Row>(
+                    makeParams({
+                        isItemSelected: (row) => row.keyForList === 'd' || row.keyForList === 'e',
+                        isItemProtected: () => false,
+                        onApplyRange,
+                    }),
+                ),
+            );
+            // Given 'd' and 'e' selected as a block, and a plain click on 'a' that starts a session the block was never part of
+            act(() => result.current.notifyAnchor(ROW_A));
+
+            // When a shift+click lands next to that anchor
+            act(() => {
+                result.current.applyShiftClick(ROW_B, true);
+            });
+
+            // Then only the span is written and the block is left standing, rather than an unrelated range dissolving it
+            expect(nthBatchKeys(onApplyRange, 0)).toEqual({toSelect: ['a', 'b'], toDeselect: []});
+        });
+
         it('selects on a cold shift+click even when every row is already selected', () => {
             const onApplyRange = makeApplyMock();
             const {isItemSelected} = makeSelection('a', 'b', 'c', 'd', 'e');
diff --git a/tests/unit/hooks/useSignOutTest.ts b/tests/unit/hooks/useSignOutTest.ts
new file mode 100644
index 000000000000..7584e40ac539
--- /dev/null
+++ b/tests/unit/hooks/useSignOutTest.ts
@@ -0,0 +1,352 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import {ModalActions} from '@components/Modal/Global/ModalContext';
+
+import useOnyx from '@hooks/useOnyx';
+import useSignOut from '@hooks/useSignOut';
+
+import {disconnect} from '@libs/actions/Delegate';
+import {getGpsPoints, stopGpsTrip} from '@libs/GPSDraftDetailsUtils';
+import {getSaveablePendingReceiptRequests, saveReceiptsToGallery} from '@libs/savePendingReceiptsToGallery';
+
+import {signOutAndRedirectToSignIn} from '@userActions/Session';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import {isActingAsDelegateSelector} from '@src/selectors/Account';
+import {isTrackingSelector} from '@src/selectors/GPSDraftDetails';
+import type GpsDraftDetails from '@src/types/onyx/GpsDraftDetails';
+
+const mockShowConfirmModal = jest.fn();
+const mockTranslate = jest.fn((key: string) => key);
+
+let mockIsOffline = false;
+
+jest.mock('@hooks/useLocalize', () => ({
+    __esModule: true,
+    default: () => ({translate: mockTranslate}),
+}));
+
+jest.mock('@hooks/useNetwork', () => ({
+    __esModule: true,
+    default: () => ({isOffline: mockIsOffline}),
+}));
+
+jest.mock('@hooks/useConfirmModal', () => ({
+    __esModule: true,
+    default: () => ({showConfirmModal: mockShowConfirmModal}),
+}));
+
+jest.mock('@hooks/useOnyx', () => ({
+    __esModule: true,
+    default: jest.fn(),
+}));
+
+jest.mock('@userActions/Session', () => ({
+    signOutAndRedirectToSignIn: jest.fn(),
+}));
+
+jest.mock('@libs/actions/Delegate', () => ({
+    disconnect: jest.fn(),
+}));
+
+jest.mock('@libs/savePendingReceiptsToGallery', () => ({
+    getSaveablePendingReceiptRequests: jest.fn(() => []),
+    saveReceiptsToGallery: jest.fn(() => Promise.resolve({savedCount: 0, failedCount: 0, permissionDenied: false})),
+}));
+
+jest.mock('@libs/GPSDraftDetailsUtils', () => ({
+    getGpsPoints: jest.fn(() => []),
+    stopGpsTrip: jest.fn(() => Promise.resolve()),
+}));
+
+jest.mock('@pages/iou/request/step/IOURequestStepDistanceGPS/GPSNotifications', () => ({
+    stopGpsTripNotification: jest.fn(),
+}));
+
+jest.mock('expo-location', () => ({
+    Accuracy: {Highest: 6},
+    stopLocationUpdatesAsync: jest.fn(() => Promise.resolve()),
+}));
+
+jest.mock('@pages/iou/request/step/IOURequestStepDistanceGPS/const', () => ({
+    BACKGROUND_LOCATION_TRACKING_TASK_NAME: 'background-location-tracking',
+}));
+
+const mockUseOnyx = jest.mocked(useOnyx);
+const mockSignOutAndRedirectToSignIn = jest.mocked(signOutAndRedirectToSignIn);
+const mockDelegateDisconnect = jest.mocked(disconnect);
+const mockGetSaveablePendingReceiptRequests = jest.mocked(getSaveablePendingReceiptRequests);
+const mockSaveReceiptsToGallery = jest.mocked(saveReceiptsToGallery);
+const mockStopGpsTrip = jest.mocked(stopGpsTrip);
+const mockGetGpsPoints = jest.mocked(getGpsPoints);
+
+type MockOnyxState = {
+    isTrackingGPS?: boolean;
+    isActingAsDelegate?: boolean;
+    stashedCredentials?: Record<string, unknown>;
+    stashedSession?: {email?: string};
+};
+
+const loadedOnyxMetadata = {status: 'loaded'} as const;
+
+const mockGpsDraftDetails: GpsDraftDetails = {
+    gpsPoints: [[{lat: 1, long: 2}]],
+    distanceInMeters: 0,
+    isTracking: true,
+    reportID: '1',
+    unit: 'mi',
+};
+
+function mockOnyxState({isTrackingGPS = false, isActingAsDelegate = false, stashedCredentials = {}, stashedSession = {email: 'copilot@expensify.com'}}: MockOnyxState = {}) {
+    mockUseOnyx.mockImplementation((key, options) => {
+        if (key === ONYXKEYS.GPS_DRAFT_DETAILS) {
+            if (options?.selector === isTrackingSelector) {
+                return [isTrackingGPS, loadedOnyxMetadata];
+            }
+            return [undefined, loadedOnyxMetadata];
+        }
+        if (key === ONYXKEYS.ACCOUNT) {
+            const account = isActingAsDelegate ? {delegatedAccess: {delegate: 'delegate@expensify.com'}} : {};
+            if (options?.selector === isActingAsDelegateSelector) {
+                return [isActingAsDelegateSelector(account), loadedOnyxMetadata];
+            }
+            return [account, loadedOnyxMetadata];
+        }
+        if (key === ONYXKEYS.STASHED_CREDENTIALS) {
+            return [stashedCredentials, loadedOnyxMetadata];
+        }
+        if (key === ONYXKEYS.STASHED_SESSION) {
+            return [stashedSession, loadedOnyxMetadata];
+        }
+        return [undefined, loadedOnyxMetadata];
+    });
+}
+
+describe('useSignOut', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockIsOffline = false;
+        mockOnyxState();
+        mockShowConfirmModal.mockResolvedValue({action: ModalActions.CONFIRM});
+    });
+
+    it('should sign out immediately when online with no GPS tracking or pending receipts', async () => {
+        // Given the user is online with no active GPS trip and no pending receipts
+        const {result} = renderHook(() => useSignOut());
+
+        // When they sign out from settings
+        await act(async () => {
+            await result.current.signOut();
+        });
+
+        // Then sign-out proceeds without an extra confirm modal
+        expect(mockSignOutAndRedirectToSignIn).toHaveBeenCalledTimes(1);
+        expect(mockShowConfirmModal).not.toHaveBeenCalled();
+    });
+
+    it('should show generic confirm when shouldAlwaysConfirm is true before signing out', async () => {
+        // Given the require-2FA overlay asks the hook to always confirm sign-out
+        const {result} = renderHook(() => useSignOut());
+
+        // When signOut is called with shouldAlwaysConfirm
+        await act(async () => {
+            await result.current.signOut({shouldAlwaysConfirm: true});
+        });
+
+        // Then the generic sign-out confirm appears before redirecting
+        expect(mockShowConfirmModal).toHaveBeenCalledWith(
+            expect.objectContaining({
+                prompt: 'initialSettingsPage.signOutConfirmationText',
+                confirmText: 'initialSettingsPage.signOut',
+            }),
+        );
+        expect(mockSignOutAndRedirectToSignIn).toHaveBeenCalledTimes(1);
+    });
+
+    it('should stay in flight until sign-out finishes and ignore a second press', async () => {
+        // Given sign-out has started but the redirect has not finished
+        let resolveSignOut: () => void = () => {};
+        mockSignOutAndRedirectToSignIn.mockImplementationOnce(
+            () =>
+                new Promise((resolve) => {
+                    resolveSignOut = () => {
+                        resolve(undefined);
+                    };
+                }),
+        );
+        const {result} = renderHook(() => useSignOut());
+
+        let firstSignOut: Promise<void> | undefined;
+        act(() => {
+            firstSignOut = result.current.signOut();
+        });
+
+        // When they press Sign out again before the first one finishes
+        await act(async () => {
+            await result.current.signOut();
+        });
+
+        // Then the second press is ignored and the first call is still waiting
+        expect(mockSignOutAndRedirectToSignIn).toHaveBeenCalledTimes(1);
+        expect(mockShowConfirmModal).not.toHaveBeenCalled();
+
+        let didSettle = false;
+        const trackedSignOut = firstSignOut?.finally(() => {
+            didSettle = true;
+        });
+        await act(async () => {
+            await Promise.resolve();
+        });
+        expect(didSettle).toBe(false);
+
+        await act(async () => {
+            resolveSignOut();
+            await trackedSignOut;
+        });
+        expect(didSettle).toBe(true);
+    });
+
+    it('should ignore a second sign-out while the first confirm is still open', async () => {
+        // Given the first sign-out confirm is still waiting for the user
+        let resolveModal: (value: {action: string}) => void = () => {};
+        mockShowConfirmModal.mockImplementation(
+            () =>
+                new Promise((resolve) => {
+                    resolveModal = resolve;
+                }),
+        );
+        const {result} = renderHook(() => useSignOut());
+
+        let firstSignOut: Promise<void> | undefined;
+        act(() => {
+            firstSignOut = result.current.signOut({shouldAlwaysConfirm: true});
+        });
+
+        // When they press Sign out again before the first modal closes
+        await act(async () => {
+            await result.current.signOut({shouldAlwaysConfirm: true});
+        });
+
+        // Then only one confirm modal is opened
+        expect(mockShowConfirmModal).toHaveBeenCalledTimes(1);
+
+        await act(async () => {
+            resolveModal({action: ModalActions.CLOSE});
+            await firstSignOut;
+        });
+    });
+
+    it('should show merged save-and-sign-out confirm when offline with pending receipts', async () => {
+        // Given the user is offline and has pending receipts to save
+        mockIsOffline = true;
+        mockGetSaveablePendingReceiptRequests.mockReturnValue([{localPath: 'file:///receipt.jpg', filename: 'receipt.jpg', type: 'image/jpeg'}]);
+
+        const {result} = renderHook(() => useSignOut());
+
+        // When they attempt to sign out
+        await act(async () => {
+            await result.current.signOut();
+        });
+
+        // Then the merged save-and-sign-out modal runs before redirecting
+        expect(mockShowConfirmModal).toHaveBeenCalledWith(
+            expect.objectContaining({
+                title: 'initialSettingsPage.saveReceiptsAndSignOutConfirmation.title',
+            }),
+        );
+        expect(mockSaveReceiptsToGallery).toHaveBeenCalledTimes(1);
+        expect(mockSignOutAndRedirectToSignIn).toHaveBeenCalledTimes(1);
+    });
+
+    it('should call signOutImmediately without showing confirm modals', () => {
+        // Given the settings page uses the immediate sign-out escape hatch
+        const {result} = renderHook(() => useSignOut());
+
+        // When signOutImmediately is invoked
+        act(() => {
+            result.current.signOutImmediately();
+        });
+
+        // Then redirect happens with no confirm modals
+        expect(mockSignOutAndRedirectToSignIn).toHaveBeenCalledTimes(1);
+        expect(mockShowConfirmModal).not.toHaveBeenCalled();
+    });
+
+    it('should disconnect instead of signing out when leaving a delegated account', async () => {
+        // Given the user is acting as a copilot delegate while online
+        mockOnyxState({isActingAsDelegate: true});
+
+        const {result} = renderHook(() => useSignOut());
+
+        // When they choose to leave the delegated account
+        await act(async () => {
+            await result.current.leaveDelegateAccount();
+        });
+
+        // Then the leave confirm appears and disconnect runs instead of sign-out
+        expect(mockShowConfirmModal).toHaveBeenCalledWith(
+            expect.objectContaining({
+                prompt: 'delegate.leaveAccountConfirmationText',
+                confirmText: 'delegate.leaveAccount',
+            }),
+        );
+        expect(mockDelegateDisconnect).toHaveBeenCalledTimes(1);
+        expect(mockSignOutAndRedirectToSignIn).not.toHaveBeenCalled();
+    });
+
+    it('should show GPS switch-account warning before disconnecting from a delegated account', async () => {
+        // Given a copilot is leaving while a GPS trip is in progress
+        mockOnyxState({isActingAsDelegate: true, isTrackingGPS: true});
+
+        const {result} = renderHook(() => useSignOut());
+
+        // When they confirm leaving after the ref has the latest GPS draft
+        await act(async () => {
+            await result.current.leaveDelegateAccount({gpsDraftDetailsRef: {current: mockGpsDraftDetails}});
+        });
+
+        // Then points are read from the ref after confirm, and the trip is stopped before disconnect
+        expect(mockGetGpsPoints).toHaveBeenCalledWith(mockGpsDraftDetails);
+        expect(mockShowConfirmModal).toHaveBeenCalledWith(
+            expect.objectContaining({
+                title: 'gps.switchAccountWarningTripInProgress.title',
+            }),
+        );
+        expect(mockStopGpsTrip).toHaveBeenCalledTimes(1);
+        expect(mockDelegateDisconnect).toHaveBeenCalledTimes(1);
+        expect(mockSignOutAndRedirectToSignIn).not.toHaveBeenCalled();
+    });
+
+    it('should block leaving a delegated account while offline', async () => {
+        // Given a copilot is offline and tries to leave the delegated account
+        mockIsOffline = true;
+        mockOnyxState({isActingAsDelegate: true});
+
+        const {result} = renderHook(() => useSignOut());
+
+        // When leaveDelegateAccount is invoked
+        await act(async () => {
+            await result.current.leaveDelegateAccount();
+        });
+
+        // Then the offline modal appears first and disconnect never runs
+        expect(mockShowConfirmModal).toHaveBeenCalledWith(
+            expect.objectContaining({
+                title: 'common.youAppearToBeOffline',
+            }),
+        );
+        expect(mockDelegateDisconnect).not.toHaveBeenCalled();
+        expect(mockSignOutAndRedirectToSignIn).not.toHaveBeenCalled();
+    });
+
+    it('should expose isActingAsDelegate from account state', () => {
+        // Given the account is in delegate mode
+        mockOnyxState({isActingAsDelegate: true});
+
+        const {result} = renderHook(() => useSignOut());
+
+        // When the hook is rendered
+        // Then callers can branch on isActingAsDelegate
+        expect(result.current.isActingAsDelegate).toBe(true);
+    });
+});
diff --git a/tests/unit/hooks/useTabFocusedRefresh.test.ts b/tests/unit/hooks/useTabFocusedRefresh.test.ts
new file mode 100644
index 000000000000..66a41e543ece
--- /dev/null
+++ b/tests/unit/hooks/useTabFocusedRefresh.test.ts
@@ -0,0 +1,190 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useAppReturnCount from '@hooks/useAppReturnCount';
+import useIsTabFocused from '@hooks/useIsTabFocused';
+import useTabFocusedRefresh from '@hooks/useTabFocusedRefresh';
+
+import SCREENS from '@src/SCREENS';
+
+import {useIsFocused} from '@react-navigation/native';
+
+jest.mock('@hooks/useIsTabFocused', () => ({
+    __esModule: true,
+    default: jest.fn(() => true),
+}));
+
+jest.mock('@react-navigation/native', () => ({
+    useIsFocused: jest.fn(() => true),
+}));
+
+jest.mock('@hooks/useAppReturnCount', () => ({
+    __esModule: true,
+    default: jest.fn(() => 0),
+}));
+
+const mockedUseIsTabFocused = jest.mocked(useIsTabFocused);
+const mockedUseIsFocused = jest.mocked(useIsFocused);
+const mockedUseAppReturnCount = jest.mocked(useAppReturnCount);
+
+let appReturnCount = 0;
+
+/** Reports one more return to the app and re-renders so the hook sees it. */
+function returnToApp(rerender: (props: {refreshKey: string}) => void, refreshKey: string) {
+    appReturnCount++;
+    rerender({refreshKey});
+}
+
+/** Renders the hook with a controllable refresh key and returns the refresh spy. */
+function renderRefresh(refreshKey = 'key-1') {
+    const refresh = jest.fn();
+    const {rerender} = renderHook((props: {refreshKey: string}) => useTabFocusedRefresh(SCREENS.HOME, props.refreshKey, refresh), {initialProps: {refreshKey}});
+    return {refresh, rerender};
+}
+
+describe('useTabFocusedRefresh', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockedUseIsTabFocused.mockReturnValue(true);
+        mockedUseIsFocused.mockReturnValue(true);
+        appReturnCount = 0;
+        mockedUseAppReturnCount.mockImplementation(() => appReturnCount);
+    });
+
+    it('refreshes once when the tab is active and the screen is visible', () => {
+        // Given the Home tab is active and its screen is visible
+
+        // When the hook mounts
+        const {refresh} = renderRefresh();
+
+        // Then it refreshes exactly once
+        expect(refresh).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not refresh while the tab is inactive', () => {
+        // Given another tab is active
+        mockedUseIsTabFocused.mockReturnValue(false);
+        mockedUseIsFocused.mockReturnValue(false);
+
+        // When the hook mounts
+        const {refresh} = renderRefresh();
+
+        // Then nothing is refreshed for a screen the user isn't on
+        expect(refresh).not.toHaveBeenCalled();
+    });
+
+    it('does not refresh when an RHP opens and closes over the screen', () => {
+        // Given the screen has already refreshed once
+        const {refresh, rerender} = renderRefresh();
+        expect(refresh).toHaveBeenCalledTimes(1);
+
+        // When an RHP is pushed on top (the tab stays active, the leaf route does not) and then popped
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender({refreshKey: 'key-1'});
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender({refreshKey: 'key-1'});
+
+        // Then the close does not replay the refresh
+        expect(refresh).toHaveBeenCalledTimes(1);
+    });
+
+    it('holds a change made behind an RHP and refreshes once on close', () => {
+        // Given the screen has refreshed once and an RHP is now covering it
+        const {refresh, rerender} = renderRefresh();
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender({refreshKey: 'key-1'});
+
+        // When several changes land behind the RHP and it is then closed
+        rerender({refreshKey: 'key-2'});
+        rerender({refreshKey: 'key-3'});
+        expect(refresh).toHaveBeenCalledTimes(1);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender({refreshKey: 'key-3'});
+
+        // Then the whole batch costs a single refresh, fired only once the screen is visible again
+        expect(refresh).toHaveBeenCalledTimes(2);
+    });
+
+    it('refreshes immediately when the key changes while the screen is visible', () => {
+        // Given a visible screen that has refreshed once
+        const {refresh, rerender} = renderRefresh();
+
+        // When its inputs change
+        rerender({refreshKey: 'key-2'});
+
+        // Then it refreshes again
+        expect(refresh).toHaveBeenCalledTimes(2);
+    });
+
+    it('refreshes when the user switches tabs away and back', () => {
+        // Given the screen has refreshed once
+        const {refresh, rerender} = renderRefresh();
+
+        // When the user switches to another tab and returns, with nothing else changed
+        mockedUseIsTabFocused.mockReturnValue(false);
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender({refreshKey: 'key-1'});
+        mockedUseIsTabFocused.mockReturnValue(true);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender({refreshKey: 'key-1'});
+
+        // Then arriving back on the tab refreshes the data
+        expect(refresh).toHaveBeenCalledTimes(2);
+    });
+
+    it('holds the arrival refresh when the tab is re-entered behind an RHP', () => {
+        // Given the user left the tab
+        const {refresh, rerender} = renderRefresh();
+        mockedUseIsTabFocused.mockReturnValue(false);
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender({refreshKey: 'key-1'});
+
+        // When they come back to the tab while an RHP still covers the screen, then close it
+        mockedUseIsTabFocused.mockReturnValue(true);
+        rerender({refreshKey: 'key-1'});
+        expect(refresh).toHaveBeenCalledTimes(1);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender({refreshKey: 'key-1'});
+
+        // Then the arrival refresh is not lost, it fires when the screen becomes visible
+        expect(refresh).toHaveBeenCalledTimes(2);
+    });
+
+    it('refreshes when the user returns to the app', () => {
+        // Given a visible screen that has refreshed once
+        const {refresh, rerender} = renderRefresh();
+        expect(refresh).toHaveBeenCalledTimes(1);
+
+        // When the user comes back to the app, with nothing else changed
+        returnToApp(rerender, 'key-1');
+
+        // Then the values the screen cannot derive locally are re-read
+        expect(refresh).toHaveBeenCalledTimes(2);
+    });
+
+    it('does not refresh on a re-render that reports no return', () => {
+        // Given a visible screen that has refreshed once
+        const {refresh, rerender} = renderRefresh();
+
+        // When it re-renders with the same key and no new return
+        rerender({refreshKey: 'key-1'});
+
+        // Then nothing is refetched
+        expect(refresh).toHaveBeenCalledTimes(1);
+    });
+
+    it('holds the return refresh until the screen is visible again', () => {
+        // Given an RHP covering the screen
+        const {refresh, rerender} = renderRefresh();
+        mockedUseIsFocused.mockReturnValue(false);
+        rerender({refreshKey: 'key-1'});
+
+        // When the user leaves the app and comes back while the RHP is still open, then closes it
+        returnToApp(rerender, 'key-1');
+        expect(refresh).toHaveBeenCalledTimes(1);
+        mockedUseIsFocused.mockReturnValue(true);
+        rerender({refreshKey: 'key-1'});
+
+        // Then the refresh lands once, after the screen is visible
+        expect(refresh).toHaveBeenCalledTimes(2);
+    });
+});
diff --git a/tests/unit/hooks/useUpdateTransactionCategory.test.ts b/tests/unit/hooks/useUpdateTransactionCategory.test.ts
new file mode 100644
index 000000000000..b134b020ee8e
--- /dev/null
+++ b/tests/unit/hooks/useUpdateTransactionCategory.test.ts
@@ -0,0 +1,145 @@
+import {renderHook} from '@testing-library/react-native';
+
+import useUpdateTransactionCategory from '@hooks/useUpdateTransactionCategory';
+
+import {setMoneyRequestCategory} from '@libs/actions/IOU/MoneyRequest';
+import {setDraftSplitTransaction} from '@libs/actions/IOU/Split';
+import {updateMoneyRequestCategory} from '@libs/actions/IOU/UpdateMoneyRequest';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+
+import Onyx from 'react-native-onyx';
+
+import createMock from '../../utils/createMock';
+import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
+
+// The three writes are the assertions: each branch must reach exactly one of them.
+jest.mock('@libs/actions/IOU/MoneyRequest', () => ({setMoneyRequestCategory: jest.fn()}));
+jest.mock('@libs/actions/IOU/Split', () => ({setDraftSplitTransaction: jest.fn()}));
+jest.mock('@libs/actions/IOU/UpdateMoneyRequest', () => ({updateMoneyRequestCategory: jest.fn()}));
+
+// Peripheral data the writes are handed. None of it decides which branch runs.
+jest.mock('@hooks/useCurrencyList', () => ({useCurrencyListActions: jest.fn(() => ({getCurrencyDecimals: jest.fn(() => 2), getCurrencySymbol: jest.fn(() => '$')}))}));
+jest.mock('@hooks/useCurrentUserPersonalDetails', () => jest.fn(() => ({accountID: 1, login: 'me@example.com'})));
+jest.mock('@hooks/useDelegateAccountID', () => jest.fn(() => undefined));
+jest.mock('@hooks/useAllTransactionViolations', () => jest.fn(() => undefined));
+jest.mock('@hooks/usePersonalDetails', () => ({usePersonalDetail: jest.fn(() => [undefined])}));
+jest.mock('@hooks/usePermissions', () => jest.fn(() => ({isBetaEnabled: jest.fn(() => false), isBetaEnabledOrUnknown: jest.fn(() => false)})));
+
+const TRANSACTION_ID = 'txn1';
+const CATEGORY = 'Travel';
+
+const transaction = createMock<OnyxTypes.Transaction>({transactionID: TRANSACTION_ID});
+const report = createMock<OnyxTypes.Report>({reportID: 'report1', parentReportID: 'parent1'});
+const policy = createMock<OnyxTypes.Policy>({id: 'policy1'});
+
+type Params = Parameters<typeof useUpdateTransactionCategory>[0];
+
+const baseParams: Params = {
+    transactionID: TRANSACTION_ID,
+    transaction,
+    report,
+    policy,
+    policyCategories: undefined,
+    isEditing: false,
+    isEditingSplit: false,
+};
+
+const renderUpdater = (overrides: Partial<Params> = {}) => renderHook(() => useUpdateTransactionCategory({...baseParams, ...overrides}));
+
+describe('useUpdateTransactionCategory', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('writes a split being edited to its own draft', () => {
+        // Given a split expense being edited, whose source of truth is the split draft
+        const {result} = renderUpdater({isEditing: true, isEditingSplit: true});
+
+        // When a category is picked
+        result.current.updateCategory(CATEGORY);
+
+        // Then only the split draft is written, and the caller is told this is not a money request draft write
+        expect(setDraftSplitTransaction).toHaveBeenCalledTimes(1);
+        expect(setDraftSplitTransaction).toHaveBeenCalledWith(TRANSACTION_ID, undefined, {category: CATEGORY}, expect.any(Function), expect.any(Function), policy);
+        expect(updateMoneyRequestCategory).not.toHaveBeenCalled();
+        expect(setMoneyRequestCategory).not.toHaveBeenCalled();
+        expect(result.current.isDraftUpdate).toBe(false);
+    });
+
+    it('writes a saved expense through the money request update', () => {
+        // Given an existing expense being edited, which has a report to write through
+        const {result} = renderUpdater({isEditing: true});
+
+        // When a category is picked
+        result.current.updateCategory(CATEGORY);
+
+        // Then it saves to the expense itself, carrying the report the violations are recomputed against
+        expect(updateMoneyRequestCategory).toHaveBeenCalledTimes(1);
+        expect(updateMoneyRequestCategory).toHaveBeenCalledWith(expect.objectContaining({transactionID: TRANSACTION_ID, category: CATEGORY, transactionThreadReport: report}));
+        expect(setDraftSplitTransaction).not.toHaveBeenCalled();
+        expect(setMoneyRequestCategory).not.toHaveBeenCalled();
+        expect(result.current.isDraftUpdate).toBe(false);
+    });
+
+    it('writes an expense that is still being created to the money request draft', () => {
+        // Given an expense that is not being edited at all, i.e. one still being filled in
+        const {result} = renderUpdater();
+
+        // When a category is picked
+        result.current.updateCategory(CATEGORY);
+
+        // Then it lands on the money request draft, and says so: the category step reads this to decide whether
+        // it may carry forward into confirmation.
+        expect(setMoneyRequestCategory).toHaveBeenCalledTimes(1);
+        expect(setMoneyRequestCategory).toHaveBeenCalledWith(TRANSACTION_ID, CATEGORY, policy, expect.any(Function));
+        expect(setDraftSplitTransaction).not.toHaveBeenCalled();
+        expect(updateMoneyRequestCategory).not.toHaveBeenCalled();
+        expect(result.current.isDraftUpdate).toBe(true);
+    });
+
+    it('falls back to the draft when an edit has no report to write through', () => {
+        // Given an edit of a saved expense whose report has not resolved
+        const {result} = renderUpdater({isEditing: true, report: undefined});
+
+        // When a category is picked
+        result.current.updateCategory(CATEGORY);
+
+        // Then it writes the draft rather than updating with no report to recompute violations against
+        expect(setMoneyRequestCategory).toHaveBeenCalledTimes(1);
+        expect(updateMoneyRequestCategory).not.toHaveBeenCalled();
+        expect(result.current.isDraftUpdate).toBe(true);
+    });
+
+    it('falls back to the draft when there is no transaction yet', () => {
+        // Given a split edit before the transaction has resolved
+        const {result} = renderUpdater({isEditing: true, isEditingSplit: true, transaction: undefined});
+
+        // When a category is picked
+        result.current.updateCategory(CATEGORY);
+
+        // Then nothing is written to a transaction that isn't there
+        expect(setDraftSplitTransaction).not.toHaveBeenCalled();
+        expect(updateMoneyRequestCategory).not.toHaveBeenCalled();
+        expect(setMoneyRequestCategory).toHaveBeenCalledTimes(1);
+        expect(result.current.isDraftUpdate).toBe(true);
+    });
+
+    it('clears the category when an empty one is picked', () => {
+        // Given an expense still being created
+        const {result} = renderUpdater();
+
+        // When the selected category is picked again, which the callers turn into an empty category
+        result.current.updateCategory('');
+
+        // Then the empty value is written through rather than dropped
+        expect(setMoneyRequestCategory).toHaveBeenCalledWith(TRANSACTION_ID, '', policy, expect.any(Function));
+    });
+});
diff --git a/tests/unit/inlineEditing/PolicyInlineEdit.test.ts b/tests/unit/inlineEditing/PolicyInlineEdit.test.ts
new file mode 100644
index 000000000000..14e4e2ed45f6
--- /dev/null
+++ b/tests/unit/inlineEditing/PolicyInlineEdit.test.ts
@@ -0,0 +1,364 @@
+import type PolicyData from '@hooks/usePolicyData/types';
+
+import {
+    canUpdateExpensifyCardLimitTypeInline,
+    getExpensifyCardLimitInlineUpdate,
+    renameCategoryInline,
+    renameExpensifyCardInline,
+    updateExpensifyCardLimitInline,
+    updateExpensifyCardLimitTypeInline,
+    updateMemberRoleInline,
+} from '@libs/actions/Policy/InlineEdit';
+import {write} from '@libs/API';
+import {WRITE_COMMANDS} from '@libs/API/types';
+import {isRecord} from '@libs/ObjectUtils';
+
+import {updateExpensifyCardLimitType} from '@userActions/Card';
+import {renamePolicyCategory} from '@userActions/Policy/Category';
+import {updateWorkspaceMembersRole} from '@userActions/Policy/Member';
+
+import CONST from '@src/CONST';
+import type {Card, Policy} from '@src/types/onyx';
+
+import type {PartialDeep} from 'type-fest';
+
+import createMock from '../../utils/createMock';
+
+jest.mock('@libs/API');
+jest.mock('@userActions/Policy/Category', () => ({
+    renamePolicyCategory: jest.fn(),
+}));
+jest.mock('@userActions/Policy/Member', () => ({
+    updateWorkspaceMembersRole: jest.fn(),
+}));
+
+const mockWrite = jest.mocked(write);
+const mockRenamePolicyCategory = jest.mocked(renamePolicyCategory);
+const mockUpdateWorkspaceMembersRole = jest.mocked(updateWorkspaceMembersRole);
+
+function getWriteCall(command: string) {
+    const call = mockWrite.mock.calls.find((writeCall) => writeCall.at(0) === command);
+    if (!call) {
+        throw new Error(`${command} was not written`);
+    }
+
+    return {params: call.at(1), onyxData: call.at(2)};
+}
+
+function requireRecord(value: unknown, message: string): Record<string, unknown> {
+    if (!isRecord(value)) {
+        throw new Error(message);
+    }
+    return value;
+}
+
+function getOptimisticCardNameValuePairs(cardID: number): Record<string, unknown> {
+    const onyxData = requireRecord(getWriteCall(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT_TYPE).onyxData, 'Missing onyx data');
+    if (!Array.isArray(onyxData.optimisticData)) {
+        throw new Error('Missing optimistic data');
+    }
+
+    const firstUpdate = requireRecord(onyxData.optimisticData.at(0), 'Missing cards list optimistic update');
+    const cardListUpdate = requireRecord(firstUpdate.value, 'Missing cards list optimistic value');
+    const cardUpdate = requireRecord(cardListUpdate[cardID], `Missing card ${cardID} optimistic update`);
+    return requireRecord(cardUpdate.nameValuePairs, 'Missing nameValuePairs optimistic update');
+}
+
+const encodedFoodAndDrink = 'Food &amp; Drink';
+
+const policyData = createMock<PolicyData>({
+    policy: {id: '1'},
+    categories: {
+        Food: {name: 'Food', enabled: true},
+        Travel: {name: 'Travel', enabled: true},
+        [encodedFoodAndDrink]: {name: encodedFoodAndDrink, enabled: true},
+    },
+    tags: {},
+    reports: [],
+    transactionsAndViolations: {},
+});
+
+const policy = createMock<Policy>({id: '1'});
+
+function buildCard(overrides: PartialDeep<Card> = {}): Card {
+    return createMock<Card>({
+        cardID: 10,
+        availableSpend: 5000,
+        ...overrides,
+        nameValuePairs: {
+            cardTitle: 'Travel',
+            limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+            unapprovedExpenseLimit: 10000,
+            isVirtual: true,
+            validFrom: '2026-01-01',
+            validThru: '2026-12-31',
+            ...overrides.nameValuePairs,
+        },
+    });
+}
+
+describe('PolicyInlineEdit', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    describe('renameCategoryInline', () => {
+        it('does not persist when the sanitized name is unchanged', () => {
+            renameCategoryInline(policyData, 'Food', '  Food  ', true);
+
+            expect(mockRenamePolicyCategory).not.toHaveBeenCalled();
+        });
+
+        it('does not persist an invalid name', () => {
+            renameCategoryInline(policyData, 'Food', 'Travel', true);
+
+            expect(mockRenamePolicyCategory).not.toHaveBeenCalled();
+        });
+
+        it('delegates a valid rename to the canonical action', () => {
+            renameCategoryInline(policyData, 'Food', '  Meals  ', true);
+
+            expect(mockRenamePolicyCategory).toHaveBeenCalledWith(policyData, {oldName: 'Food', newName: 'Meals'}, true);
+        });
+
+        it('does not persist a name that matches an HTML-encoded category', () => {
+            renameCategoryInline(policyData, 'Food', 'Food & Drink', true);
+
+            expect(mockRenamePolicyCategory).not.toHaveBeenCalled();
+        });
+
+        it('does not persist when the sanitized name matches the decoded stored name', () => {
+            renameCategoryInline(policyData, encodedFoodAndDrink, '  Food & Drink  ', true);
+
+            expect(mockRenamePolicyCategory).not.toHaveBeenCalled();
+        });
+
+        it('persists a rename of an HTML-encoded category using the raw stored name', () => {
+            renameCategoryInline(policyData, encodedFoodAndDrink, 'Snacks', true);
+
+            expect(mockRenamePolicyCategory).toHaveBeenCalledWith(policyData, {oldName: encodedFoodAndDrink, newName: 'Snacks'}, true);
+        });
+    });
+
+    describe('updateMemberRoleInline', () => {
+        it('does not persist an unchanged role', () => {
+            updateMemberRoleInline(policy, 'user@expensify.com', 1, CONST.POLICY.ROLE.ADMIN, CONST.POLICY.ROLE.ADMIN);
+
+            expect(mockUpdateWorkspaceMembersRole).not.toHaveBeenCalled();
+        });
+
+        it('delegates an assignable role change to the canonical action', () => {
+            updateMemberRoleInline(policy, 'user@expensify.com', 1, CONST.POLICY.ROLE.USER, CONST.POLICY.ROLE.ADMIN);
+
+            expect(mockUpdateWorkspaceMembersRole).toHaveBeenCalledWith(policy, ['user@expensify.com'], [1], CONST.POLICY.ROLE.ADMIN);
+        });
+    });
+
+    describe('renameExpensifyCardInline', () => {
+        it('does not persist an invalid name', () => {
+            renameExpensifyCardInline(1, 10, '   ', 'Travel');
+
+            expect(mockWrite).not.toHaveBeenCalled();
+        });
+
+        it('persists the sanitized name', () => {
+            renameExpensifyCardInline(1, 10, '  Travel card  ', 'Travel');
+
+            expect(mockWrite).toHaveBeenCalledWith(
+                WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_TITLE,
+                expect.objectContaining({
+                    cardID: 10,
+                    cardTitle: 'Travel card',
+                }),
+                expect.anything(),
+            );
+        });
+    });
+
+    describe('getExpensifyCardLimitInlineUpdate', () => {
+        it('returns undefined for an invalid limit so the confirm modal is not shown', () => {
+            // Given a card with a current limit of $100
+            const card = buildCard();
+
+            // When the inline value is not an integer dollar amount
+            const nextLimit = getExpensifyCardLimitInlineUpdate(card, '10.5');
+
+            // Then there is no persistable update because the RHP form would also reject this
+            expect(nextLimit).toBeUndefined();
+        });
+
+        it('returns undefined when the dollar amount matches the stored limit', () => {
+            // Given a card whose unapproved expense limit is already 10000 cents
+            const card = buildCard();
+
+            // When the inline value is that same dollar amount
+            const nextLimit = getExpensifyCardLimitInlineUpdate(card, '100');
+
+            // Then there is no persistable update so the page can skip the remaining-spend confirm
+            expect(nextLimit).toBeUndefined();
+        });
+
+        it('returns the backend amount in cents for a valid new limit', () => {
+            // Given a card whose stored limit is $100
+            const card = buildCard();
+
+            // When the inline value is a different integer dollar amount
+            const nextLimit = getExpensifyCardLimitInlineUpdate(card, '50');
+
+            // Then the page and write path share the same cents value to persist
+            expect(nextLimit).toBe(5000);
+        });
+    });
+
+    describe('updateExpensifyCardLimitInline', () => {
+        it('does not persist an invalid limit', () => {
+            updateExpensifyCardLimitInline(1, buildCard(), '10.5');
+
+            expect(mockWrite).not.toHaveBeenCalled();
+        });
+
+        it('does not persist an unchanged limit', () => {
+            updateExpensifyCardLimitInline(1, buildCard(), '100');
+
+            expect(mockWrite).not.toHaveBeenCalled();
+        });
+
+        it('persists the dollar amount as cents', () => {
+            updateExpensifyCardLimitInline(1, buildCard(), '50');
+
+            expect(mockWrite).toHaveBeenCalledWith(
+                WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT,
+                expect.objectContaining({
+                    cardID: 10,
+                    limit: 5000,
+                }),
+                expect.anything(),
+            );
+        });
+    });
+
+    describe('canUpdateExpensifyCardLimitTypeInline', () => {
+        it('returns false when the type is unchanged so the confirm modal is not shown', () => {
+            // Given a card that is already Monthly
+            const card = buildCard();
+
+            // When the inline picker selects Monthly again
+            const canUpdate = canUpdateExpensifyCardLimitTypeInline(card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY);
+
+            // Then the page should not confirm or persist because nothing would change
+            expect(canUpdate).toBe(false);
+        });
+
+        it('returns false for Single Use on a physical card', () => {
+            // Given a physical card, which cannot use Single Use
+            const card = buildCard({nameValuePairs: {isVirtual: false}});
+
+            // When the inline picker selects Single Use
+            const canUpdate = canUpdateExpensifyCardLimitTypeInline(card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE);
+
+            // Then the page should skip confirm because the write path would no-op
+            expect(canUpdate).toBe(false);
+        });
+
+        it('returns true for a persistable type change', () => {
+            // Given a virtual Monthly card that can switch to Smart
+            const card = buildCard();
+
+            // When the inline picker selects Smart
+            const canUpdate = canUpdateExpensifyCardLimitTypeInline(card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART);
+
+            // Then the page can proceed to confirm or persist
+            expect(canUpdate).toBe(true);
+        });
+    });
+
+    describe('updateExpensifyCardLimitTypeInline', () => {
+        it('does not persist Single Use on a physical card', () => {
+            updateExpensifyCardLimitTypeInline(1, buildCard({nameValuePairs: {isVirtual: false}}), CONST.EXPENSIFY_CARD.LIMIT_TYPES.SINGLE_USE);
+
+            expect(mockWrite).not.toHaveBeenCalled();
+        });
+
+        it('does not persist Fixed when that type is not valid for the card', () => {
+            const card = buildCard({
+                totalSpend: -10000,
+                nameValuePairs: {
+                    limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                    unapprovedExpenseLimit: 10000,
+                },
+            });
+
+            updateExpensifyCardLimitTypeInline(1, card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED);
+
+            expect(mockWrite).not.toHaveBeenCalled();
+        });
+
+        it('does not persist Fixed when the fallback limit type is fully spent', () => {
+            const card = buildCard({
+                totalSpend: -10000,
+                nameValuePairs: {
+                    limitType: undefined,
+                    unapprovedExpenseLimit: 10000,
+                },
+            });
+
+            updateExpensifyCardLimitTypeInline(1, card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY);
+
+            expect(mockWrite).not.toHaveBeenCalled();
+        });
+
+        it('changes only the limit type and leaves validity dates untouched', () => {
+            const card = buildCard();
+
+            updateExpensifyCardLimitTypeInline(1, card, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART);
+
+            const {params} = getWriteCall(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT_TYPE);
+            const nameValuePairs = getOptimisticCardNameValuePairs(10);
+            const pendingFields = requireRecord(nameValuePairs.pendingFields, 'Missing pendingFields');
+
+            expect(params).toEqual({
+                cardID: 10,
+                limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+            });
+            expect(nameValuePairs).not.toHaveProperty('validFrom');
+            expect(nameValuePairs).not.toHaveProperty('validThru');
+            expect(pendingFields).not.toHaveProperty('validFrom');
+            expect(pendingFields).not.toHaveProperty('validThru');
+        });
+    });
+});
+
+describe('updateExpensifyCardLimitType', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('still writes validity dates when the RHP supplies them', () => {
+        const nameValuePairs = buildCard().nameValuePairs;
+
+        updateExpensifyCardLimitType({
+            workspaceAccountID: 1,
+            cardID: 10,
+            newLimitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+            oldCardNameValuePairs: nameValuePairs,
+            validFrom: '2026-03-01',
+            validThru: '2026-03-31',
+            shouldClearValidityDates: false,
+        });
+
+        const {params} = getWriteCall(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT_TYPE);
+        const optimisticNameValuePairs = getOptimisticCardNameValuePairs(10);
+
+        expect(params).toEqual(
+            expect.objectContaining({
+                cardID: 10,
+                limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                clearValidityDates: false,
+            }),
+        );
+        expect(params).toHaveProperty('validFrom');
+        expect(params).toHaveProperty('validThru');
+        expect(optimisticNameValuePairs).toHaveProperty('validFrom');
+        expect(optimisticNameValuePairs).toHaveProperty('validThru');
+    });
+});
diff --git a/tests/unit/inlineEditing/TransactionInlineEdit.test.ts b/tests/unit/inlineEditing/TransactionInlineEdit.test.ts
index da108209f612..a19cae171a98 100644
--- a/tests/unit/inlineEditing/TransactionInlineEdit.test.ts
+++ b/tests/unit/inlineEditing/TransactionInlineEdit.test.ts
@@ -314,6 +314,41 @@ describe('TransactionInlineEdit', () => {
 
                 expect(permissions.canEditCategory).toBe(true);
             });
+
+            it('should enable category editing when the category is missing and the policy categories have not loaded yet', () => {
+                // Lazy-loaded accounts have no policyCategories in Onyx on a fresh sign-in. Without this the cell
+                // deadlocks: the edit icon stays hidden, so the picker never mounts and never backfills the list.
+                const permissions = getTransactionEditPermissions({
+                    ...baseUnreportedParams,
+                    policyCategories: undefined,
+                });
+
+                expect(permissions.canEditCategory).toBe(true);
+            });
+
+            it('should disable category editing when the category is missing and the loaded policy categories are empty', () => {
+                const permissions = getTransactionEditPermissions({
+                    ...baseUnreportedParams,
+                    policyCategories: {},
+                });
+
+                expect(permissions.canEditCategory).toBe(false);
+            });
+
+            it('should disable category editing when categories are not enabled on policy and the policy categories have not loaded yet', () => {
+                const policyWithoutCategories: Policy = {
+                    ...basePolicy,
+                    areCategoriesEnabled: false,
+                };
+
+                const permissions = getTransactionEditPermissions({
+                    ...baseUnreportedParams,
+                    policy: policyWithoutCategories,
+                    policyCategories: undefined,
+                });
+
+                expect(permissions.canEditCategory).toBe(false);
+            });
         });
 
         describe('tag permissions', () => {
@@ -360,6 +395,38 @@ describe('TransactionInlineEdit', () => {
 
                 expect(permissions.canEditTag).toBe(true);
             });
+
+            it('should enable tag editing when the tag is missing and the policy tags have not loaded yet', () => {
+                // Same deadlock as categories. With the collection absent the edit icon stays hidden, so TagPicker
+                // never mounts and never backfills the list.
+                const permissions = getTransactionEditPermissions({
+                    ...baseUnreportedParams,
+                    policy: {...basePolicy, areTagsEnabled: true},
+                    policyTags: undefined,
+                });
+
+                expect(permissions.canEditTag).toBe(true);
+            });
+
+            it('should disable tag editing when the tag is missing and the loaded policy tags are empty', () => {
+                const permissions = getTransactionEditPermissions({
+                    ...baseUnreportedParams,
+                    policy: {...basePolicy, areTagsEnabled: true},
+                    policyTags: {},
+                });
+
+                expect(permissions.canEditTag).toBe(false);
+            });
+
+            it('should disable tag editing when tags are not enabled on policy and the policy tags have not loaded yet', () => {
+                const permissions = getTransactionEditPermissions({
+                    ...baseUnreportedParams,
+                    policy: {...basePolicy, areTagsEnabled: false},
+                    policyTags: undefined,
+                });
+
+                expect(permissions.canEditTag).toBe(false);
+            });
         });
 
         describe('unreported expenses', () => {
@@ -384,12 +451,14 @@ describe('TransactionInlineEdit', () => {
                 } satisfies TransactionEditPermissions);
             });
 
+            // An empty collection rather than an absent one is what "no available options" means here. An absent
+            // collection only tells us the lazy-loaded account hasn't fetched it yet, so the cell stays editable.
             it('should disable category and tag editing without available options', () => {
                 const permissions = getTransactionEditPermissions({
                     ...baseUnreportedParams,
                     transaction: unreportedTransaction,
-                    policyCategories: undefined,
-                    policyTags: undefined,
+                    policyCategories: {},
+                    policyTags: {},
                 });
 
                 expect(permissions).toMatchObject({
diff --git a/tests/unit/inlineEditing/editableCellHooks.test.ts b/tests/unit/inlineEditing/editableCellHooks.test.ts
index 91dc285589d5..214f074d9307 100644
--- a/tests/unit/inlineEditing/editableCellHooks.test.ts
+++ b/tests/unit/inlineEditing/editableCellHooks.test.ts
@@ -1,7 +1,7 @@
 import {act, renderHook} from '@testing-library/react-native';
 
-import useInlineEditState from '@components/TransactionItemRow/EditableCell/useInlineEditState';
-import usePopoverEditState from '@components/TransactionItemRow/EditableCell/usePopoverEditState';
+import useInlineEditState from '@components/EditableCell/useInlineEditState';
+import usePopoverEditState from '@components/EditableCell/usePopoverEditState';
 
 type InlineHookParameters = Parameters<typeof useInlineEditState<string>>;
 
diff --git a/tests/unit/insightsFilterParsingTest.ts b/tests/unit/insightsFilterParsingTest.ts
index 890fcf910376..3c66773a35b6 100644
--- a/tests/unit/insightsFilterParsingTest.ts
+++ b/tests/unit/insightsFilterParsingTest.ts
@@ -32,6 +32,17 @@ describe('insightsFilterParsing', () => {
             expect(parsed).toEqual(filters);
         });
 
+        it.each(Object.values(CONST.SEARCH.COMPARE))('reads back a dashboard compared against %s', (compare) => {
+            // Given a dashboard drawn against a comparison
+            const filters: InsightsFilters = {...FILTERS, compare};
+
+            // When its stored query is read back
+            const parsed = parseInsightsFilters(buildInsightsQueryString(filters));
+
+            // Then the comparison survives the round trip, so the page reopens with it still drawn
+            expect(parsed.compare).toBe(compare);
+        });
+
         it('tells a preset apart from a day that happens to be stored the same way', () => {
             // Given two dashboards, one on a preset and one on a literal day, which the query writes with the same `date:` operator
             const preset = parseInsightsFilters(buildInsightsQueryString({...FILTERS, date: {preset: CONST.SEARCH.DATE_PRESETS.THIS_MONTH}}));
@@ -61,6 +72,17 @@ describe('insightsFilterParsing', () => {
             expect(parsed.date).toBeUndefined();
         });
 
+        it('reads back a dashboard grouped by day', () => {
+            // Given a dashboard grouped by day, the finest time bucket the headline chart offers
+            const filters: InsightsFilters = {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.DAY};
+
+            // When its stored query is read back
+            const parsed = parseInsightsFilters(buildInsightsQueryString(filters));
+
+            // Then the daily grouping survives the round trip instead of falling back to the default
+            expect(parsed.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
+        });
+
         it('ignores a group-by no Insights chart offers', () => {
             // Given a query grouped by a dimension rather than a time bucket
             const parsed = parseInsightsFilters('groupBy:category groupCurrency:USD date:year-to-date');
diff --git a/tests/unit/insightsQueriesTest.ts b/tests/unit/insightsQueriesTest.ts
index 7aee84f364f7..cf78f1d50a66 100644
--- a/tests/unit/insightsQueriesTest.ts
+++ b/tests/unit/insightsQueriesTest.ts
@@ -1,3 +1,5 @@
+import type {SearchCompareMode} from '@components/Search/types';
+
 import {buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 
 import INSIGHTS_DASHBOARD_SPECS from '@pages/Insights/dashboardSpecs';
@@ -32,10 +34,16 @@ function parsePayload(request: InsightsQuery | undefined): InsightsPayload | und
     return payload as InsightsPayload;
 }
 
-/** The snapshot hash expected of every chart on the spend dashboard, taken from what the chart declares. */
+/** The snapshot hashes expected of every chart on the spend dashboard, taken from what the chart declares. */
 function buildExpectedHashes(filters: InsightsFilters) {
     return Object.fromEntries(
-        [SPEND_SPEC.headlineChart, ...SPEND_SPEC.supportingCharts].map((chart) => [chart.graphKey, {snapshotHash: buildSearchQueryJSON(applyInsightsFilters(chart, filters))?.hash}]),
+        [SPEND_SPEC.headlineChart, ...SPEND_SPEC.supportingCharts].map((chart) => {
+            const getHashOf = (compare?: SearchCompareMode) => buildSearchQueryJSON(applyInsightsFilters(chart, filters, compare))?.hash;
+            return [
+                chart.graphKey,
+                {snapshotHash: getHashOf(), previousPeriodSnapshotHash: getHashOf(CONST.SEARCH.COMPARE.PREVIOUS_PERIOD), averageSnapshotHash: getHashOf(CONST.SEARCH.COMPARE.AVERAGE)},
+            ];
+        }),
     );
 }
 
@@ -46,7 +54,7 @@ describe('insightsQueries', () => {
             const filters: InsightsFilters = {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.MONTH};
 
             // When its request is built
-            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters);
+            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
             // Then it is addressed to the spend dashboard and names the snapshot each chart's data belongs in
             const payload = parsePayload(request);
@@ -58,15 +66,45 @@ describe('insightsQueries', () => {
                 groupBy: filters.groupBy,
                 filters: queryJSON?.filters,
                 insightsHashes: buildExpectedHashes(filters),
+                numberOfPeriods: 1,
             });
         });
 
+        it('sends the same request whether or not the dashboard is compared', () => {
+            // Given the spend dashboard shown on its own
+            const standalone = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS, true);
+
+            // When it is compared against the previous period
+            const filters: InsightsFilters = {...FILTERS, compare: CONST.SEARCH.COMPARE.PREVIOUS_PERIOD};
+            const compared = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
+
+            // Then every response carries all comparisons, so switching one never fetches again or stores the response apart
+            expect(compared).toEqual(standalone);
+        });
+
+        it('requests only the current period for users without the compare beta', () => {
+            // Given the spend dashboard for a user who can't compare it
+            const filters: InsightsFilters = {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.MONTH};
+
+            // When its request is built without comparisons
+            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, false);
+
+            // Then each chart names only its own snapshot, so the backend doesn't compute periods nobody sees
+            const payload = parsePayload(request);
+            const expectedHashes = Object.fromEntries(
+                [SPEND_SPEC.headlineChart, ...SPEND_SPEC.supportingCharts].map((chart) => [chart.graphKey, {snapshotHash: buildSearchQueryJSON(applyInsightsFilters(chart, filters))?.hash}]),
+            );
+            expect(payload).toMatchObject({insightsHashes: expectedHashes});
+            expect(payload).not.toHaveProperty('numberOfPeriods');
+            expect(request?.snapshotHashes).toEqual(Object.values(expectedHashes).map(({snapshotHash}) => snapshotHash));
+        });
+
         it('hashes every set of filters on its own', () => {
             // Given the spend dashboard grouped by month
-            const monthly = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS);
+            const monthly = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS, true);
 
             // When the same dashboard is grouped by quarter instead
-            const quarterly = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.QUARTER});
+            const quarterly = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.QUARTER}, true);
 
             // Then each request carries the hash of the query it asks for, so the two responses are stored apart
             expect(monthly?.hash).toBe(parsePayload(monthly)?.hash);
@@ -78,7 +116,7 @@ describe('insightsQueries', () => {
             const filters: InsightsFilters = {...FILTERS, policyIDs: ['A1'], groupBy: CONST.SEARCH.GROUP_BY.MONTH, groupCurrency: 'USD'};
 
             // When its request is built
-            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters);
+            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
             // Then the query carries those filters and nothing else, such as the sorting of a table no chart renders
             expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD policyID:A1 date:year-to-date');
@@ -92,7 +130,7 @@ describe('insightsQueries', () => {
             };
 
             // When its request is built
-            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters);
+            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
             // Then the query is bounded by the range, both ends included, and the charts ask for snapshots of it
             expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD date>=2026-01-01 date<=2026-03-31');
@@ -104,7 +142,7 @@ describe('insightsQueries', () => {
             const filters: InsightsFilters = {...FILTERS, date: {on: '2026-03-04'}};
 
             // When its request is built
-            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters);
+            const request = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
             // Then the query names that day, the same way it names a preset
             expect(parsePayload(request)?.inputQuery).toBe('groupBy:month groupCurrency:USD date:2026-03-04');
@@ -112,11 +150,11 @@ describe('insightsQueries', () => {
         });
         it('leaves the workspaces out of the query until some are selected', () => {
             // Given a dashboard requested with no workspace selected
-            const allWorkspaces = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS);
+            const allWorkspaces = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, FILTERS, true);
 
             // When two workspaces are selected
             const filters: InsightsFilters = {...FILTERS, policyIDs: ['A1', 'B2']};
-            const twoWorkspaces = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters);
+            const twoWorkspaces = buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true);
 
             // Then only the second query names them, and its charts point at different snapshots
             expect(parsePayload(allWorkspaces)?.inputQuery).not.toContain('policyID');
@@ -134,7 +172,7 @@ describe('insightsQueries', () => {
             const queryString = buildInsightsQueryString(filters);
 
             // Then it is the very query the request carries
-            expect(queryString).toBe(parsePayload(buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters))?.inputQuery);
+            expect(queryString).toBe(parsePayload(buildInsightsJsonQuery(CONST.INSIGHTS.DASHBOARD.SPEND, filters, true))?.inputQuery);
         });
     });
 
@@ -179,5 +217,18 @@ describe('insightsQueries', () => {
             // Then the chart is grouped by quarter
             expect(buildSearchQueryJSON(chartQuery)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.QUARTER);
         });
+
+        it('groups the headline chart by day while supporting charts keep their own group-by', () => {
+            // Given the page filters grouped by day
+            const filters: InsightsFilters = {...FILTERS, groupBy: CONST.SEARCH.GROUP_BY.DAY};
+
+            // When the filters are applied to the headline chart and to every supporting chart
+            const headlineQuery = applyInsightsFilters(SPEND_SPEC.headlineChart, filters);
+            const supportingGroupBys = SPEND_SPEC.supportingCharts.map((chart) => buildSearchQueryJSON(applyInsightsFilters(chart, filters))?.groupBy);
+
+            // Then only the headline chart, which declares no group-by, is grouped by day
+            expect(buildSearchQueryJSON(headlineQuery)?.groupBy).toBe(CONST.SEARCH.GROUP_BY.DAY);
+            expect(supportingGroupBys).toEqual(SPEND_SPEC.supportingCharts.map((chart) => chart.groupBy));
+        });
     });
 });
diff --git a/tests/unit/libs/Avatars/InitialAvatarsTest.tsx b/tests/unit/libs/Avatars/InitialAvatarsTest.tsx
deleted file mode 100644
index c03c9c61a92a..000000000000
--- a/tests/unit/libs/Avatars/InitialAvatarsTest.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import {DEFAULT_INITIAL, getInitialFromText} from '@libs/Avatars/InitialAvatars';
-
-describe('getInitialFromText', () => {
-    it('returns the first valid letter or number', () => {
-        expect(getInitialFromText('John')).toBe('J');
-        expect(getInitialFromText(' Ringo')).toBe('R');
-        expect(getInitialFromText('123George')).toBe('1');
-        expect(getInitialFromText('!@#Paul')).toBe('P');
-    });
-
-    it('falls back to DEFAULT_INITIAL for empty or invalid input', () => {
-        expect(getInitialFromText('')).toBe(DEFAULT_INITIAL);
-        expect(getInitialFromText(null)).toBe(DEFAULT_INITIAL);
-        expect(getInitialFromText(undefined)).toBe(DEFAULT_INITIAL);
-        expect(getInitialFromText('!@#$')).toBe(DEFAULT_INITIAL);
-    });
-
-    it('ignores non-ASCII leading characters', () => {
-        expect(getInitialFromText('éJohn')).toBe('J'); // diacritic ignored
-        expect(getInitialFromText('你好')).toBe(DEFAULT_INITIAL);
-    });
-});
diff --git a/tests/unit/libs/MultifactorAuthentication/shared/helpers.test.ts b/tests/unit/libs/MultifactorAuthentication/shared/helpers.test.ts
index 4495668239b2..d1bbca1993fc 100644
--- a/tests/unit/libs/MultifactorAuthentication/shared/helpers.test.ts
+++ b/tests/unit/libs/MultifactorAuthentication/shared/helpers.test.ts
@@ -92,5 +92,18 @@ describe('MultifactorAuthentication shared helpers', () => {
             expect(result.httpStatusCode).toBe(401);
             expect(result.reason).toBe(VALUES.REASON.CLIENT_ERRORS.REGISTRATION_REQUIRED);
         });
+
+        it('should resolve the real backend invalid validate code message to a continuable reason', () => {
+            // Given the exact message the backend returns when a user submits a wrong magic code
+            const responseMap = VALUES.API_RESPONSE_MAP.REQUEST_AUTHENTICATION_CHALLENGE;
+
+            // When the response is parsed
+            const result = parseHttpResponse(401, responseMap, '401 Not authorized - Invalid validateCode');
+
+            // Then it must resolve to INVALID_VALIDATE_CODE, which keeps the user on the magic code screen.
+            // Falling back to UNRECOGNIZED here is treated as a fatal error and dead-ends the flow on the failure screen.
+            expect(result.httpStatusCode).toBe(401);
+            expect(result.reason).toBe(VALUES.REASON.CLIENT_ERRORS.INVALID_VALIDATE_CODE);
+        });
     });
 });
diff --git a/tests/unit/libs/TransactionThreadNavigationUtilsTest.ts b/tests/unit/libs/TransactionThreadNavigationUtilsTest.ts
index 3cf386421a7c..e6978cc5e679 100644
--- a/tests/unit/libs/TransactionThreadNavigationUtilsTest.ts
+++ b/tests/unit/libs/TransactionThreadNavigationUtilsTest.ts
@@ -111,6 +111,62 @@ describe('getReportIDToOpenForExpense', () => {
         expect(getReportIDToOpenForExpense(expense, CONTEXT)).toBe('parent4');
         expect(mockCreateTransactionThreadReport).not.toHaveBeenCalled();
     });
+
+    /**
+     * An unreported (tracked) expense keeps its IOU action in the self-DM, since report "0" is a placeholder rather
+     * than a report. Resolving from there is the only way such an expense opens at all.
+     */
+    describe('unreported (tracked) expenses', () => {
+        const buildUnreportedExpense = (transactionID: string, reportAction?: ReportAction): TransactionThreadNavigationDescriptor => ({
+            reportID: CONST.REPORT.UNREPORTED_REPORT_ID,
+            transaction: buildTransaction(transactionID, CONST.REPORT.UNREPORTED_REPORT_ID),
+            reportAction,
+        });
+
+        beforeEach(async () => {
+            await Onyx.set(ONYXKEYS.SELF_DM_REPORT_ID, 'selfDM');
+            await waitForBatchedUpdates();
+        });
+
+        it("resolves the thread from the self-DM's report actions when the snapshot has no thread", async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}selfDM`, {a1: buildIOUAction('a1', 'self_dm_thread')});
+            await waitForBatchedUpdates();
+
+            expect(getReportIDToOpenForExpense(buildUnreportedExpense(transactionR14932.transactionID), CONTEXT)).toBe('self_dm_thread');
+            expect(mockCreateTransactionThreadReport).not.toHaveBeenCalled();
+        });
+
+        /**
+         * Regression guard: this used to fall through to report "0", which is not a report that can be opened. The
+         * prev/next carousel enabled the arrow from the transaction alone and then had nowhere to navigate, so the
+         * press did nothing at all.
+         */
+        it("creates the thread when the self-DM's IOU action has none yet", async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}selfDM`, {a1: buildIOUAction('a1')});
+            await waitForBatchedUpdates();
+
+            expect(getReportIDToOpenForExpense(buildUnreportedExpense(transactionR14932.transactionID), CONTEXT)).toBe('created_thread');
+            expect(mockCreateTransactionThreadReport).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    // Report "0" is a placeholder, so there is no parent expense report to build the thread from;
+                    // createTransactionThreadReport parents it to the self-DM off the transaction instead.
+                    iouReport: undefined,
+                    iouReportAction: expect.objectContaining({reportActionID: 'a1'}),
+                    transaction: expect.objectContaining({transactionID: transactionR14932.transactionID}),
+                }),
+            );
+        });
+
+        it('creates the thread from the snapshot action when the self-DM actions were never fetched', () => {
+            expect(getReportIDToOpenForExpense(buildUnreportedExpense('t5', buildIOUAction('a5')), CONTEXT)).toBe('created_thread');
+            expect(mockCreateTransactionThreadReport).toHaveBeenCalledWith(expect.objectContaining({iouReportAction: expect.objectContaining({reportActionID: 'a5'})}));
+        });
+
+        it('falls back to the unreported placeholder when no IOU action exists anywhere', () => {
+            expect(getReportIDToOpenForExpense(buildUnreportedExpense('t6'), CONTEXT)).toBe(CONST.REPORT.UNREPORTED_REPORT_ID);
+            expect(mockCreateTransactionThreadReport).not.toHaveBeenCalled();
+        });
+    });
 });
 
 describe('getOrCreateTransactionThreadReportID', () => {
diff --git a/tests/unit/libs/actions/TransactionThreadNavigationTest.ts b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
new file mode 100644
index 000000000000..b0fabc4c81f3
--- /dev/null
+++ b/tests/unit/libs/actions/TransactionThreadNavigationTest.ts
@@ -0,0 +1,282 @@
+import {
+    CAROUSEL_SOURCE,
+    clearActiveTransactionIDs,
+    clearActiveTransactionIDsForSource,
+    disownActiveTransactionIDs,
+    getActiveTransactionIDs,
+    setActiveTransactionIDs,
+    shouldRefreshActiveTransactionIDs,
+} from '@libs/actions/TransactionThreadNavigation';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import type {OnyxEntry, OnyxKey, OnyxValue} from 'react-native-onyx';
+
+import Onyx from 'react-native-onyx';
+
+import createRandomTransaction from '../../../utils/collections/transaction';
+import waitForBatchedUpdates from '../../../utils/waitForBatchedUpdates';
+
+const SEARCH_HASH = 959171759;
+const SEARCH_SOURCE = CAROUSEL_SOURCE.search(SEARCH_HASH);
+const OTHER_SEARCH_SOURCE = CAROUSEL_SOURCE.search(123456);
+const REPORT_SOURCE = CAROUSEL_SOURCE.report('B');
+
+// The Spend page's expense list, as the carousel was seeded with it when a row was pressed.
+const SEEDED_IDS = ['A1', 'A2', 'A3'];
+
+// The Spend page holds one expense from report A and two from report B; report B owns only its own two.
+const SPEND_PAGE_IDS = ['A1', 'B1', 'B2'];
+const REPORT_B_IDS = ['B1', 'B2'];
+
+describe('TransactionThreadNavigation carousel ownership', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await clearActiveTransactionIDs();
+        await waitForBatchedUpdates();
+    });
+
+    /** Reads the three carousel keys straight out of Onyx, which is where every consumer actually reads them. */
+    async function readCarouselFromOnyx() {
+        await waitForBatchedUpdates();
+        const readOnce = <TKey extends OnyxKey>(key: TKey) =>
+            new Promise<OnyxEntry<OnyxValue<TKey>>>((resolve) => {
+                const connection = Onyx.connect({
+                    key,
+                    callback: (value) => {
+                        Onyx.disconnect(connection);
+                        resolve(value);
+                    },
+                });
+            });
+        const [ids, snapshotHash, descriptors] = await Promise.all([
+            readOnce(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS),
+            readOnce(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH),
+            readOnce(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS),
+        ]);
+        return {ids, snapshotHash, descriptors};
+    }
+
+    describe('setActiveTransactionIDs', () => {
+        it('records the owning source alongside the IDs', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            expect(getActiveTransactionIDs()).toEqual({ids: SEEDED_IDS, descriptors: null, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+        });
+
+        /**
+         * `getActiveTransactionIDs` reads the in-module mirror, which only arbitrates writes within one session.
+         * Every consumer - the header, the carousel - reads Onyx, so the Onyx writes need asserting on their own:
+         * without this, deleting them would leave the suite green while the arrows vanished app-wide.
+         */
+        it('writes the IDs, snapshot hash and descriptors through to Onyx', async () => {
+            const descriptors = {A1: {reportID: 'rA', transaction: {...createRandomTransaction(1), transactionID: 'A1'}}};
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH, descriptors});
+
+            await expect(readCarouselFromOnyx()).resolves.toEqual({ids: SEEDED_IDS, snapshotHash: SEARCH_HASH, descriptors});
+        });
+
+        it('clears all three Onyx keys when the carousel is released', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+            await clearActiveTransactionIDsForSource(SEARCH_SOURCE);
+
+            await expect(readCarouselFromOnyx()).resolves.toEqual({ids: undefined, snapshotHash: undefined, descriptors: undefined});
+        });
+
+        it('lets a different screen take ownership of the carousel', async () => {
+            await setActiveTransactionIDs(SPEND_PAGE_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
+
+            expect(getActiveTransactionIDs()).toEqual({ids: REPORT_B_IDS, descriptors: null, source: REPORT_SOURCE, snapshotHash: null});
+        });
+
+        /**
+         * Duplicate review takes the carousel over while it is open and hands the previous one back on refocus. It
+         * can only do that if everything it read back is also something it can write, so a restored carousel keeps
+         * its original owner (which is what lets that screen refresh and release it) along with the snapshot hash
+         * and descriptors its siblings are resolved from.
+         */
+        it('round-trips a displaced carousel back to its original owner', async () => {
+            const descriptors = {A1: {reportID: 'rA', transaction: {...createRandomTransaction(1), transactionID: 'A1'}}};
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH, descriptors});
+            const displaced = getActiveTransactionIDs();
+
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: CAROUSEL_SOURCE.duplicateReview('B1')});
+            await setActiveTransactionIDs(displaced.ids ?? [], {
+                source: displaced.source ?? undefined,
+                snapshotHash: displaced.snapshotHash ?? undefined,
+                descriptors: displaced.descriptors ?? undefined,
+            });
+
+            expect(getActiveTransactionIDs()).toEqual({ids: SEEDED_IDS, descriptors, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+            // The original owner can refresh its own carousel again, which is what the source is for.
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, SPEND_PAGE_IDS)).toBe(true);
+        });
+    });
+
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/99609 and
+     * https://github.com/Expensify/App/issues/99617: a search list left mounted behind the RHP used to keep pushing
+     * its own (broader, or stale) list over the carousel of whatever screen the user had drilled into.
+     */
+    describe('shouldRefreshActiveTransactionIDs', () => {
+        it('seeds when no carousel is active', () => {
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, SEEDED_IDS)).toBe(true);
+        });
+
+        it('does not seed a list with nothing to page between', () => {
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, ['A1'])).toBe(false);
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, [])).toBe(false);
+        });
+
+        /**
+         * That length rule applies only to taking the carousel over, never to the screen that already owns it.
+         * Applied to the owner too, it let a list grow its carousel but never shrink or release it, so a list that
+         * dropped to a single expense left the old, longer list active and the arrows still showing.
+         */
+        it('lets its owner shrink the carousel down to nothing to page between', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, ['A1'])).toBe(true);
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, [])).toBe(true);
+        });
+
+        it('refreshes its own carousel when the list gained an expense', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, ['A0', ...SEEDED_IDS])).toBe(true);
+        });
+
+        it('refreshes its own carousel when the list lost an expense', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, ['A1', 'A3'])).toBe(true);
+        });
+
+        it('refreshes its own carousel when only the order changed', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, ['A3', 'A2', 'A1'])).toBe(true);
+        });
+
+        it('skips the write when its own carousel is already up to date', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, [...SEEDED_IDS])).toBe(false);
+        });
+
+        it('leaves a carousel owned by another screen alone', async () => {
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, SPEND_PAGE_IDS)).toBe(false);
+        });
+
+        it('leaves a carousel owned by a different search alone', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: OTHER_SEARCH_SOURCE, snapshotHash: 123456});
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, SPEND_PAGE_IDS)).toBe(false);
+        });
+
+        it('re-seeds once the owning screen releases the carousel', async () => {
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, SPEND_PAGE_IDS)).toBe(false);
+
+            await clearActiveTransactionIDsForSource(REPORT_SOURCE);
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, SPEND_PAGE_IDS)).toBe(true);
+        });
+
+        it('ignores a carousel that only exists in persisted Onyx state', async () => {
+            // The Onyx key is persisted, so on a fresh load it can hold a carousel from an earlier session. Without a
+            // recorded owner there is nothing to defer to, so the visible list wins.
+            await Onyx.set(ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS, SPEND_PAGE_IDS);
+            await waitForBatchedUpdates();
+
+            expect(shouldRefreshActiveTransactionIDs(SEARCH_SOURCE, SEEDED_IDS)).toBe(true);
+        });
+    });
+
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/99630: a screen tearing down used to clear the
+     * carousel unconditionally, wiping the list another screen had already taken over and leaving no arrows at all.
+     */
+    describe('clearActiveTransactionIDsForSource', () => {
+        it('clears a carousel it still owns', async () => {
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
+
+            await clearActiveTransactionIDsForSource(REPORT_SOURCE);
+
+            expect(getActiveTransactionIDs()).toEqual({ids: null, descriptors: null, source: null, snapshotHash: null});
+        });
+
+        it('leaves a carousel another screen has taken over', async () => {
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
+            await setActiveTransactionIDs(SPEND_PAGE_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            await clearActiveTransactionIDsForSource(REPORT_SOURCE);
+
+            expect(getActiveTransactionIDs()).toEqual({ids: SPEND_PAGE_IDS, descriptors: null, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+        });
+    });
+
+    /**
+     * Search is keyed by its query hash, so re-sorting or re-filtering unmounts the list that seeded the carousel
+     * and mounts a replacement under a new source. Clearing on the way out stripped the arrows of an expense open
+     * in the RHP until the replacement had loaded - and for good, when the new results no longer held it.
+     */
+    describe('disownActiveTransactionIDs', () => {
+        it('keeps the list so an expense open on top of it keeps its arrows', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            disownActiveTransactionIDs(SEARCH_SOURCE);
+
+            expect(getActiveTransactionIDs()).toEqual({ids: SEEDED_IDS, descriptors: null, source: null, snapshotHash: SEARCH_HASH});
+            expect((await readCarouselFromOnyx()).ids).toEqual(SEEDED_IDS);
+        });
+
+        it('lets the screen that replaces the previous writer take the carousel over', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+            expect(shouldRefreshActiveTransactionIDs(OTHER_SEARCH_SOURCE, SPEND_PAGE_IDS)).toBe(false);
+
+            disownActiveTransactionIDs(SEARCH_SOURCE);
+
+            expect(shouldRefreshActiveTransactionIDs(OTHER_SEARCH_SOURCE, SPEND_PAGE_IDS)).toBe(true);
+        });
+
+        /**
+         * Regression guard for https://github.com/Expensify/App/pull/100331#issuecomment-5812384643: switching from
+         * Spend > Expenses to Spend > Reports unmounts the expense list (which disowns its carousel) and mounts a
+         * list of report groups with no transaction rows to seed from. Refusing that empty write left the Expenses
+         * tab's list active, so the first one-expense report the user paged onto swapped its report arrows for that
+         * stale expense carousel and paged them out of the reports they were browsing.
+         */
+        it('lets the screen that replaces the previous writer retire a disowned carousel', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            disownActiveTransactionIDs(SEARCH_SOURCE);
+
+            expect(shouldRefreshActiveTransactionIDs(OTHER_SEARCH_SOURCE, ['A1'])).toBe(true);
+            expect(shouldRefreshActiveTransactionIDs(OTHER_SEARCH_SOURCE, [])).toBe(true);
+        });
+
+        it('leaves a disowned carousel alone when the replacement list is identical', async () => {
+            await setActiveTransactionIDs(SEEDED_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            disownActiveTransactionIDs(SEARCH_SOURCE);
+
+            expect(shouldRefreshActiveTransactionIDs(OTHER_SEARCH_SOURCE, SEEDED_IDS)).toBe(false);
+        });
+
+        it('leaves a carousel another screen has taken over', async () => {
+            await setActiveTransactionIDs(REPORT_B_IDS, {source: REPORT_SOURCE});
+            await setActiveTransactionIDs(SPEND_PAGE_IDS, {source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+
+            disownActiveTransactionIDs(REPORT_SOURCE);
+
+            expect(getActiveTransactionIDs()).toEqual({ids: SPEND_PAGE_IDS, descriptors: null, source: SEARCH_SOURCE, snapshotHash: SEARCH_HASH});
+        });
+    });
+});
diff --git a/tests/unit/libs/getClipboardTextTest.ts b/tests/unit/libs/getClipboardTextTest.ts
index 9bfd8f363d97..9de3a26ceef8 100644
--- a/tests/unit/libs/getClipboardTextTest.ts
+++ b/tests/unit/libs/getClipboardTextTest.ts
@@ -13,6 +13,8 @@ const mockedParser = jest.mocked(Parser);
 
 describe('getClipboardText', () => {
     const selection = '<a href="https://expensify.com">Expensify</a>';
+    const mentionedReportID = '1';
+    const reportIDToName = {[mentionedReportID]: '#general'};
 
     beforeEach(() => {
         jest.clearAllMocks();
@@ -28,7 +30,7 @@ describe('getClipboardText', () => {
         const result = getClipboardText(selection);
 
         expect(result).toBe('[Expensify](https://expensify.com)');
-        expect(mockedParser.htmlToMarkdown.mock.calls).toContainEqual([selection]);
+        expect(mockedParser.htmlToMarkdown.mock.calls).toContainEqual([selection, {reportIDToName: undefined}]);
     });
 
     it('returns the parser output without modification', () => {
@@ -38,6 +40,17 @@ describe('getClipboardText', () => {
         const result = getClipboardText('<b>test</b>');
 
         expect(result).toBe(expected);
-        expect(mockedParser.htmlToMarkdown.mock.calls).toContainEqual(['<b>test</b>']);
+        expect(mockedParser.htmlToMarkdown.mock.calls).toContainEqual(['<b>test</b>', {reportIDToName: undefined}]);
+    });
+
+    it('forwards the report name map so a report mention resolves instead of rendering as "#Hidden"', () => {
+        // Given a caller that resolved the names of the reports mentioned in the HTML
+        mockedParser.htmlToMarkdown.mockReturnValue('#general');
+
+        // When the clipboard text is produced
+        getClipboardText(selection, reportIDToName);
+
+        // Then the map reaches the parser, which is what turns `<mention-report reportID>` into the room name
+        expect(mockedParser.htmlToMarkdown.mock.calls).toContainEqual([selection, {reportIDToName}]);
     });
 });
diff --git a/tests/unit/libs/prepareRequestPayloadNativeTest.ts b/tests/unit/libs/prepareRequestPayloadNativeTest.ts
index e660121a8018..9e5853d42ff6 100644
--- a/tests/unit/libs/prepareRequestPayloadNativeTest.ts
+++ b/tests/unit/libs/prepareRequestPayloadNativeTest.ts
@@ -81,9 +81,11 @@ describe('prepareRequestPayload (native)', () => {
             transactionID: 'txn-456',
             command: 'RequestMoney',
             source: 'file:///var/mobile/Library/Caches/ImageManipulator/receipt.jpg',
+            localUri: 'file:///var/mobile/Library/Caches/ImageManipulator/receipt.jpg',
             fileName: 'receipt.jpg',
             // The errno separates a deleted file from one that is there but unreadable
             statError: {message: 'ENOENT: no such file', code: 'ENOENT'},
+            receiptsFolder: {exists: false},
         });
     });
 
diff --git a/tests/unit/libs/receiptStorageTest.ts b/tests/unit/libs/receiptStorageTest.ts
index b02239c08497..17bd5b431300 100644
--- a/tests/unit/libs/receiptStorageTest.ts
+++ b/tests/unit/libs/receiptStorageTest.ts
@@ -20,6 +20,7 @@ jest.mock('@libs/getReceiptsUploadFolderPath', () => ({
 
 // Import the native implementation by path. Jest resolves the bare specifier to the web implementation.
 const {default: ReceiptStorage}: {default: ReceiptStorageType} = jest.requireActual('@libs/ReceiptStorage/index.native.ts');
+const {default: WebReceiptStorage}: {default: ReceiptStorageType} = jest.requireActual('@libs/ReceiptStorage/index.ts');
 
 describe('ReceiptStorage', () => {
     beforeEach(() => {
@@ -103,4 +104,40 @@ describe('ReceiptStorage', () => {
             expect(ReceiptStorage.resolve('https://www.expensify.com/receipts/w_9.jpg')).toBe('https://www.expensify.com/receipts/w_9.jpg');
         });
     });
+
+    describe('retain (native)', () => {
+        it('is a no-op that does not change resolve behaviour', () => {
+            const path = `file://${FOLDER}/receipt_9.jpg`;
+            ReceiptStorage.retain(path);
+            expect(ReceiptStorage.resolve(path)).toBe(path);
+        });
+    });
+});
+
+describe('ReceiptStorage (web)', () => {
+    it('returns a retained blob: URL from resolve for the rest of the session', () => {
+        const blobURL = `blob:https://new.expensify.com/${Math.random()}`;
+        WebReceiptStorage.retain(blobURL);
+
+        expect(WebReceiptStorage.resolve(blobURL)).toBe(blobURL);
+    });
+
+    it('returns undefined for a blob: URL that was never retained this session (e.g. restored from Onyx after reload)', () => {
+        expect(WebReceiptStorage.resolve('blob:https://new.expensify.com/stale-from-previous-document')).toBeUndefined();
+    });
+
+    it('returns undefined for a file: URL that was never retained this session', () => {
+        expect(WebReceiptStorage.resolve('file:///tmp/stale-receipt.jpg')).toBeUndefined();
+    });
+
+    it('passes remote and root-relative sources through without requiring retain', () => {
+        expect(WebReceiptStorage.resolve('https://www.expensify.com/receipts/w_9.jpg')).toBe('https://www.expensify.com/receipts/w_9.jpg');
+        expect(WebReceiptStorage.resolve('/staging/chat-attachments/abc.jpg')).toBe('/staging/chat-attachments/abc.jpg');
+    });
+
+    it('ignores retain for non-session-local URIs', () => {
+        const remote = 'https://www.expensify.com/receipts/w_9.jpg';
+        WebReceiptStorage.retain(remote);
+        expect(WebReceiptStorage.resolve(remote)).toBe(remote);
+    });
 });
diff --git a/tests/unit/navigateAfterExpenseCreateTest.ts b/tests/unit/navigateAfterExpenseCreateTest.ts
index f05703644965..bfd08b253a98 100644
--- a/tests/unit/navigateAfterExpenseCreateTest.ts
+++ b/tests/unit/navigateAfterExpenseCreateTest.ts
@@ -17,6 +17,8 @@ const mockGetTrackingState = jest.fn<boolean, []>();
 // Declared but assigned after jest.mock hoisting - use require() to access the mock in tests
 let mockSetPendingSubmitFollowUpAction: jest.MockedFunction<typeof setPendingSubmitFollowUpAction>;
 const mockGetCurrentSearchQueryJSON = jest.fn<ReturnType<typeof getCurrentSearchQueryJSON>, Parameters<typeof getCurrentSearchQueryJSON>>();
+const mockGetCurrentRoute = jest.fn<{params?: Record<string, unknown>} | undefined, []>();
+const mockGetFocusedReportId = jest.fn<string | undefined, []>();
 
 jest.mock('@libs/Navigation/helpers/isReportTopmostSplitNavigator', () => () => mockIsReportTopmostSplitNavigator());
 jest.mock('@libs/Navigation/helpers/isSearchTopmostFullScreenRoute', () => () => mockIsSearchTopmostFullScreenRoute());
@@ -35,6 +37,9 @@ jest.mock('@libs/SearchQueryUtils', () => ({
     buildCannedSearchQuery: jest.fn(({type}: {type: string}) => `type:${type}`),
     getCurrentSearchQueryJSON: mockGetCurrentSearchQueryJSON,
 }));
+jest.mock('@libs/actions/TransactionThreadNavigation', () => ({
+    setActiveTransactionIDs: jest.fn(() => Promise.resolve()),
+}));
 
 jest.mock('@libs/Navigation/Navigation', () => ({
     dismissModal: jest.fn(),
@@ -42,6 +47,8 @@ jest.mock('@libs/Navigation/Navigation', () => ({
     dismissModalWithReport: jest.fn(),
     pop: jest.fn(),
     navigate: jest.fn(),
+    getActiveRoute: jest.fn(() => ''),
+    getFocusedReportId: () => mockGetFocusedReportId(),
     revealRouteBeforeDismissingModal: jest.fn(),
     isNavigationReady: jest.fn(() => Promise.resolve()),
     getIsFullscreenPreInsertedUnderRHP: jest.fn(() => false),
@@ -51,6 +58,9 @@ jest.mock('@libs/Navigation/Navigation', () => ({
             routes: [],
         })),
         isReady: jest.fn(() => true),
+        current: {
+            getCurrentRoute: () => mockGetCurrentRoute(),
+        },
     },
 }));
 
@@ -69,6 +79,8 @@ describe('navigateAfterExpenseCreate', () => {
         mockIsReportOpenInRHP.mockReturnValue(false);
         mockGetTrackingState.mockReturnValue(false);
         mockGetCurrentSearchQueryJSON.mockReturnValue(undefined);
+        mockGetCurrentRoute.mockReturnValue(undefined);
+        mockGetFocusedReportId.mockReturnValue(undefined);
     });
 
     it('should dismiss to report when not from global create', () => {
@@ -138,7 +150,7 @@ describe('navigateAfterExpenseCreate', () => {
 
     it('should NOT route a LOOKING_AROUND user to search when the destination is a real report (not the self-DM)', () => {
         // A LOOKING_AROUND user who later has a workspace and submits to a real report/friend from the Inbox must open that
-        // report, not be permanently misrouted to Search. isSelfDMDestination is false, so they are treated as "on inbox".
+        // report, not be permanently routed to Search. isSelfDMDestination is false, so they are treated as "on inbox".
         mockIsReportTopmostSplitNavigator.mockReturnValue(true);
         mockGetIsNarrowLayout.mockReturnValue(true);
 
diff --git a/tests/unit/navigateAfterOnboardingTest.ts b/tests/unit/navigateAfterOnboardingTest.ts
index e008d488fb90..1e342d33cd0e 100644
--- a/tests/unit/navigateAfterOnboardingTest.ts
+++ b/tests/unit/navigateAfterOnboardingTest.ts
@@ -3,6 +3,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type * as ReportUtils from '@libs/ReportUtils';
 
 import initOnyxDerivedValues from '@userActions/OnyxDerived';
+import SidePanelActions from '@userActions/SidePanel';
 
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -10,6 +11,7 @@ import ROUTES from '@src/ROUTES';
 
 import Onyx from 'react-native-onyx';
 
+import getOnyxValue from '../utils/getOnyxValue';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 const ONBOARDING_ADMINS_CHAT_REPORT_ID = '1';
@@ -188,4 +190,65 @@ describe('navigateAfterOnboarding', () => {
         navigateAfterOnboarding(false, true, '', {}, undefined, ONBOARDING_ADMINS_CHAT_REPORT_ID, false, {variantOverride: CONST.ONBOARDING_RHP_VARIANT.INBOX_ADMINS_BESPOKE});
         expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(ONBOARDING_ADMINS_CHAT_REPORT_ID), undefined);
     });
+
+    it('should land on Home instead of the admin room for the homePageNoRHP variant', () => {
+        // Given an admin whose #admins room exists, which the control and inboxAdminsBespoke arms open after onboarding
+        const navigate = jest.spyOn(Navigation, 'navigate');
+
+        // When onboarding finishes with the homePageNoRHP arm of the experiment
+        navigateAfterOnboarding(false, true, '', {}, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID, false, {variantOverride: CONST.ONBOARDING_RHP_VARIANT.HOME_PAGE_NO_RHP});
+
+        // Then the user starts on Home, so Home's Getting started is the only onboarding surface they see
+        expect(navigate).toHaveBeenCalledWith(ROUTES.HOME, undefined);
+        expect(navigate).not.toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(ONBOARDING_ADMINS_CHAT_REPORT_ID), undefined);
+    });
+
+    it.each([CONST.ONBOARDING_COMPANY_SIZE.MICRO_SMALL, CONST.ONBOARDING_COMPANY_SIZE.SMALL, CONST.ONBOARDING_COMPANY_SIZE.LARGE])(
+        'should land on Home without opening the side panel at company size %s for the homePageNoRHP variant',
+        async (companySize) => {
+            // Given a new account at a company size that decides whether the older RHP arms open the side panel
+            const navigate = jest.spyOn(Navigation, 'navigate');
+            const openSidePanel = jest.spyOn(SidePanelActions, 'openSidePanel');
+            await Onyx.set(ONYXKEYS.ONBOARDING_COMPANY_SIZE, companySize);
+
+            // When onboarding finishes with the homePageNoRHP arm
+            navigateAfterOnboarding(false, true, '', {}, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID, false, {variantOverride: CONST.ONBOARDING_RHP_VARIANT.HOME_PAGE_NO_RHP});
+            await waitForBatchedUpdates();
+
+            // Then the arm behaves the same at every company size: Home, and the side panel is never opened
+            expect(navigate).toHaveBeenCalledWith(ROUTES.HOME, undefined);
+            expect(openSidePanel).not.toHaveBeenCalled();
+            const sidePanel = await getOnyxValue(ONYXKEYS.NVP_SIDE_PANEL);
+            expect(sidePanel?.open).toBeFalsy();
+            expect(sidePanel?.openNarrowScreen).toBeFalsy();
+        },
+    );
+
+    it('should keep a report that is already on top for the homePageNoRHP variant', async () => {
+        // Given a report is already showing, which the other paths that end on Home also leave in place
+        const navigate = jest.spyOn(Navigation, 'navigate');
+        const openSidePanel = jest.spyOn(SidePanelActions, 'openSidePanel');
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+
+        // When onboarding finishes with the homePageNoRHP arm
+        navigateAfterOnboarding(false, true, '', {}, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID, false, {variantOverride: CONST.ONBOARDING_RHP_VARIANT.HOME_PAGE_NO_RHP});
+        await waitForBatchedUpdates();
+
+        // Then the report stays where it is, and the side panel is not opened over it
+        expect(navigate).not.toHaveBeenCalled();
+        expect(openSidePanel).not.toHaveBeenCalled();
+    });
+
+    it('should use the stored homePageNoRHP variant when the onboarding response does not carry one', async () => {
+        // Given the variant was saved to Onyx earlier and the completion response has no variant of its own
+        const navigate = jest.spyOn(Navigation, 'navigate');
+        await Onyx.set(ONYXKEYS.NVP_ONBOARDING_RHP_VARIANT, CONST.ONBOARDING_RHP_VARIANT.HOME_PAGE_NO_RHP);
+
+        // When onboarding finishes without a variant override
+        navigateAfterOnboarding(false, true, '', {}, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
+
+        // Then the stored variant still applies and the user lands on Home rather than the admin room
+        expect(navigate).toHaveBeenCalledWith(ROUTES.HOME, undefined);
+        expect(navigate).not.toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(ONBOARDING_ADMINS_CHAT_REPORT_ID), undefined);
+    });
 });
diff --git a/tests/unit/navigateToCreatedExpenseTest.ts b/tests/unit/navigateToCreatedExpenseTest.ts
new file mode 100644
index 000000000000..916c75012254
--- /dev/null
+++ b/tests/unit/navigateToCreatedExpenseTest.ts
@@ -0,0 +1,468 @@
+import {setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import type isReportOpenInRHP from '@libs/Navigation/helpers/isReportOpenInRHP';
+import navigateToCreatedExpense from '@libs/Navigation/helpers/navigateToCreatedExpense';
+import Navigation from '@libs/Navigation/Navigation';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {Transaction} from '@src/types/onyx';
+
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+const mockIsReportTopmostSplitNavigator = jest.fn<boolean, []>();
+const mockIsSearchTopmostFullScreenRoute = jest.fn<boolean, []>();
+const mockIsReportOpenInRHP = jest.fn<ReturnType<typeof isReportOpenInRHP>, Parameters<typeof isReportOpenInRHP>>();
+const mockGetIsNarrowLayout = jest.fn<boolean, []>();
+const mockGetCurrentRoute = jest.fn<{params?: Record<string, unknown>} | undefined, []>();
+const mockGetFocusedReportId = jest.fn<string | undefined, [unknown]>();
+const mockGetRootState = jest.fn<unknown, []>(() => ({routes: []}));
+const mockGetTopmostReportId = jest.fn<string | undefined, []>();
+const mockIsMoneyRequestReport = jest.fn<boolean, [string]>();
+
+function buildTransaction(transactionID: string): Transaction {
+    return {transactionID, reportID: 'iou-1', amount: 0, created: '', currency: CONST.CURRENCY.USD, merchant: '', comment: {}};
+}
+
+jest.mock('@libs/Navigation/helpers/isReportTopmostSplitNavigator', () => () => mockIsReportTopmostSplitNavigator());
+jest.mock('@libs/Navigation/helpers/isSearchTopmostFullScreenRoute', () => () => mockIsSearchTopmostFullScreenRoute());
+jest.mock('@libs/Navigation/helpers/isReportOpenInRHP', () => (state: Parameters<typeof isReportOpenInRHP>[0]) => mockIsReportOpenInRHP(state));
+jest.mock('@libs/Navigation/helpers/setNavigationActionToMicrotaskQueue', () => (callback: () => void) => {
+    callback();
+});
+jest.mock('@libs/getIsNarrowLayout', () => () => mockGetIsNarrowLayout());
+jest.mock('@libs/ReportUtils', () => ({
+    isMoneyRequestReport: (reportID: string) => mockIsMoneyRequestReport(reportID),
+}));
+jest.mock('@libs/actions/TransactionThreadNavigation', () => ({
+    setActiveTransactionIDs: jest.fn(() => Promise.resolve()),
+}));
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    dismissModal: jest.fn(),
+    getActiveRoute: jest.fn(() => ''),
+    getFocusedReportId: (state: unknown) => mockGetFocusedReportId(state),
+    getTopmostReportId: () => mockGetTopmostReportId(),
+    navigationRef: {
+        getRootState: () => mockGetRootState(),
+        current: {
+            getCurrentRoute: () => mockGetCurrentRoute(),
+        },
+    },
+}));
+
+jest.mock('@react-navigation/native');
+
+describe('navigateToCreatedExpense', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockIsReportTopmostSplitNavigator.mockReturnValue(false);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockIsReportOpenInRHP.mockReturnValue(false);
+        mockGetCurrentRoute.mockReturnValue(undefined);
+        mockGetFocusedReportId.mockReturnValue(undefined);
+        mockGetRootState.mockReturnValue({routes: []});
+        mockGetTopmostReportId.mockReturnValue(undefined);
+        mockIsMoneyRequestReport.mockReturnValue(false);
+    });
+
+    it('should do nothing when the user already has the transaction thread open', async () => {
+        // Given the user opened the expense themselves before pressing "View"
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('thread-1');
+
+        // When they press "View"
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: 'iou-1', reportTransactions: []});
+        await waitForBatchedUpdates();
+
+        // Then no navigation happens, so the report is not pushed a second time
+        expect(Navigation.navigate).not.toHaveBeenCalled();
+    });
+
+    it('should do nothing when the user already has the collapsed expense report open', async () => {
+        // Given the user opened the single-transaction expense report, which renders the thread itself
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('iou-1');
+
+        // When they press "View"
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: 'iou-1', reportTransactions: [buildTransaction('txn-1')]});
+        await waitForBatchedUpdates();
+
+        // Then no navigation happens, so the same expense is not opened a second time
+        expect(Navigation.navigate).not.toHaveBeenCalled();
+    });
+
+    it('should still navigate when the focused expense report lists several transactions', async () => {
+        // Given the user is on an expense report holding more than one expense, so it shows a list rather than the thread
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('iou-1');
+
+        // When they press "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the transaction thread opens on top of the report already open, since the list does not show the expense itself
+        expect(Navigation.navigate).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: ''}), {forceReplace: false});
+    });
+
+    it('should open the expense report then the thread RHP with the prev/next arrows on a narrow layout when the report has multiple transactions', async () => {
+        // Given the user is on a chat in the Inbox tab on a narrow layout, and the report holds several expenses
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('chat-1');
+
+        // When they press "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the thread opens in the RHP on top of its report, the same as opening it from the report preview
+        const reportRoute = ROUTES.REPORT_WITH_ID.getRoute('iou-1', undefined, undefined, '');
+        expect(setActiveTransactionIDs).toHaveBeenCalledWith(['txn-1', 'txn-2']);
+        expect(Navigation.navigate).toHaveBeenCalledTimes(2);
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(1, reportRoute, {forceReplace: false});
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(2, ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: reportRoute}));
+    });
+
+    it('should replace the open RHP with the thread on a narrow layout when the expense report is under it', async () => {
+        // Given another expense of the same report is open in the RHP, on top of the full screen expense report
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('other-thread');
+        mockGetTopmostReportId.mockReturnValue('iou-1');
+        mockGetCurrentRoute.mockReturnValue({params: {backTo: 'r/iou-1'}});
+
+        // When the user presses "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the thread replaces the open RHP, so going back lands on the expense report under it
+        expect(Navigation.dismissModal).not.toHaveBeenCalled();
+        expect(Navigation.navigate).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: 'r/iou-1'}), {forceReplace: true});
+    });
+
+    it('should close the open RHP before opening the expense report and thread on a narrow layout when the RHP is over another report', async () => {
+        // Given an expense of a different report is open in the RHP, on top of that other report
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('other-thread');
+        mockGetTopmostReportId.mockReturnValue('other-iou');
+
+        // When the user presses "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the RHP closes first, since a full screen report would be pushed above it instead of replacing it
+        expect(Navigation.navigate).not.toHaveBeenCalled();
+        const afterTransition = jest.mocked(Navigation.dismissModal).mock.calls.at(0)?.at(0)?.afterTransition;
+        afterTransition?.();
+
+        // And then the expense report opens with the thread on top of it
+        const reportRoute = ROUTES.REPORT_WITH_ID.getRoute('iou-1', undefined, undefined, '');
+        expect(setActiveTransactionIDs).toHaveBeenCalledWith(['txn-1', 'txn-2']);
+        expect(Navigation.navigate).toHaveBeenCalledTimes(2);
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(1, reportRoute, {forceReplace: false});
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(2, ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: reportRoute}));
+    });
+
+    it('should replace another expense report open under the RHP instead of stacking on it on a narrow layout', async () => {
+        // Given an expense of another expense report is open in the RHP, on top of that report opened from its chat
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('other-thread');
+        mockGetTopmostReportId.mockReturnValue('other-iou');
+        mockIsMoneyRequestReport.mockImplementation((reportID) => reportID === 'other-iou');
+
+        // When the user presses "View" and the RHP has closed, leaving the other expense report on top
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+        mockGetCurrentRoute.mockReturnValue({params: {backTo: 'r/chat-1'}});
+        jest.mocked(Navigation.dismissModal).mock.calls.at(0)?.at(0)?.afterTransition?.();
+
+        // Then the new expense report replaces the other one and takes over its backTo, so going back skips it
+        const reportRoute = ROUTES.REPORT_WITH_ID.getRoute('iou-1', undefined, undefined, 'r/chat-1');
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(1, reportRoute, {forceReplace: true});
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(2, ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: reportRoute}));
+    });
+
+    it('should fall back to the expense report as the thread backTo when the replaced RHP had none', async () => {
+        // Given an expense of the same report is open in the RHP without a backTo, on top of the full screen expense report
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('other-thread');
+        mockGetTopmostReportId.mockReturnValue('iou-1');
+        mockGetCurrentRoute.mockReturnValue({params: {}});
+
+        // When the user presses "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the thread still points back at its expense report, so a reload keeps the user in the Inbox
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: ROUTES.REPORT_WITH_ID.getRoute('iou-1')}), {forceReplace: true});
+    });
+
+    it('should close the RHP showing the expense report itself before stacking the thread on a narrow layout', async () => {
+        // Given the expense report itself is open in the RHP, on top of a chat
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('iou-1');
+        mockGetTopmostReportId.mockReturnValue('chat-1');
+
+        // When the user presses "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the RHP closes instead of being replaced by the thread, so going back still lands on the expense report
+        expect(Navigation.navigate).not.toHaveBeenCalled();
+        expect(Navigation.dismissModal).toHaveBeenCalledTimes(1);
+    });
+
+    it('should still navigate when the focused report is a different one', async () => {
+        // Given the user is viewing some other report
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockGetFocusedReportId.mockReturnValue('some-other-report');
+
+        // When they press "View"
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: 'iou-1', reportTransactions: []});
+        await waitForBatchedUpdates();
+
+        // Then the transaction thread still opens
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute('thread-1', undefined, undefined, ''), {forceReplace: false});
+    });
+
+    it('should open the transaction thread in the Spend RHP when the user is on the Spend tab', async () => {
+        // Given the user is on the Spend tab
+        mockIsReportTopmostSplitNavigator.mockReturnValue(false);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(true);
+
+        // When they open a newly-created expense
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: 'iou-1', reportTransactions: []});
+        await waitForBatchedUpdates();
+
+        // Then the transaction thread opens in the Spend RHP
+        expect(Navigation.navigate).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: ''}), {forceReplace: false});
+    });
+
+    it('should replace the currently-open report instead of stacking when one is already open in the RHP', async () => {
+        // Given a report is already open in the RHP
+        mockIsReportTopmostSplitNavigator.mockReturnValue(false);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(true);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+
+        // When the user opens a newly-created expense
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: 'iou-1', reportTransactions: []});
+        await waitForBatchedUpdates();
+
+        // Then the open report is replaced rather than stacked on
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: ''}), {forceReplace: true});
+    });
+
+    it('should open the transaction thread as a full report when the user is on the Inbox tab on a narrow layout', () => {
+        // Given the user is on the Inbox tab on a narrow layout
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+
+        // When they open a newly-created expense
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: 'iou-1', reportTransactions: []});
+
+        // Then the transaction thread opens as a full report
+        expect(Navigation.navigate).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute('thread-1', undefined, undefined, ''), {forceReplace: false});
+    });
+
+    it('should open the expense report then stack the thread RHP when the user is on the Inbox tab on a wide layout and the report has multiple transactions', async () => {
+        // Given the user is on the Inbox tab on a wide layout and the expense report holds several transactions
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        // When they open a newly-created expense
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the expense report opens with the thread RHP stacked on top of it
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(1, ROUTES.EXPENSE_REPORT_RHP.getRoute({reportID: 'iou-1', backTo: ''}), {forceReplace: false});
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(2, ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: ''}));
+    });
+
+    it('should seed every non-deleted expense on the report so the thread shows the prev/next arrows', async () => {
+        // Given the user is on the Inbox tab on a wide layout and the expense report holds several transactions, one pending delete
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        const deletedTransaction = {...buildTransaction('txn-3'), pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+
+        // When they press "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2'), deletedTransaction],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the arrows cover the report's other expenses, but skip the one being deleted
+        expect(setActiveTransactionIDs).toHaveBeenCalledWith(['txn-1', 'txn-2']);
+    });
+
+    it('should seed the expenses oldest first rather than in creation order', async () => {
+        // Given the expenses were created in a different order than their dates
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        const octoberExpense = {...buildTransaction('txn-oct'), created: '2026-10-01'};
+        const septemberExpense = {...buildTransaction('txn-sep'), created: '2026-09-15'};
+        const newExpense = {...buildTransaction('txn-new'), created: '2026-09-20'};
+
+        // When the user presses "View" on the newest expense
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-new',
+            iouReportID: 'iou-1',
+            reportTransactions: [octoberExpense, septemberExpense, newExpense],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the arrows follow the dates, so "Next" from the new expense opens the October one
+        expect(setActiveTransactionIDs).toHaveBeenCalledWith(['txn-sep', 'txn-new', 'txn-oct']);
+    });
+
+    it('should open the expense report without the replaced RHP backTo, so deleting the report falls back to its chat', async () => {
+        // Given the user is on the Inbox tab on a wide layout with another report already open in the RHP
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+        mockGetCurrentRoute.mockReturnValue({params: {backTo: '/home'}});
+
+        // When they open a newly-created expense
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then the expense report opens with no backTo instead of inheriting the replaced RHP's origin
+        expect(Navigation.navigate).toHaveBeenNthCalledWith(1, ROUTES.EXPENSE_REPORT_RHP.getRoute({reportID: 'iou-1'}), {forceReplace: true});
+    });
+
+    it('should open the expense report when the user is on the Inbox tab on a wide layout and the report has a single transaction', () => {
+        // Given the user is on the Inbox tab on a wide layout and the expense report holds one transaction
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+        // When they open a newly-created expense
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: 'iou-1', reportTransactions: [buildTransaction('txn-1')]});
+
+        // Then only the expense report opens, since it collapses to the thread itself
+        expect(Navigation.navigate).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.EXPENSE_REPORT_RHP.getRoute({reportID: 'iou-1', backTo: ''}), {forceReplace: false});
+    });
+
+    it('should open the transaction thread as a full report when there is no expense report (tracked/unreported self-DM expense) on the Inbox tab', () => {
+        // Given the user is on the Inbox tab on a wide layout
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(false);
+        mockGetIsNarrowLayout.mockReturnValue(false);
+
+        // When they open a newly-created tracked expense, which has no expense report
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: undefined, reportTransactions: []});
+
+        // Then the thread opens as a full report, matching how tapping it in its self-DM chat does
+        expect(Navigation.navigate).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute('thread-1', undefined, undefined, ''), {forceReplace: false});
+    });
+
+    it('should open the transaction thread in the Spend RHP for a tracked/unreported expense when the user is on the Spend tab', async () => {
+        // Given the user is on the Spend tab
+        mockIsReportTopmostSplitNavigator.mockReturnValue(false);
+        mockIsSearchTopmostFullScreenRoute.mockReturnValue(true);
+
+        // When they open a newly-created tracked expense, which has no expense report
+        navigateToCreatedExpense({threadReportID: 'thread-1', transactionID: 'txn-1', iouReportID: undefined, reportTransactions: []});
+        await waitForBatchedUpdates();
+
+        // Then the transaction thread still opens in the Spend RHP
+        expect(Navigation.navigate).toHaveBeenCalledTimes(1);
+        expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.SEARCH_REPORT.getRoute({reportID: 'thread-1', backTo: ''}), {forceReplace: false});
+    });
+
+    it('should do nothing when the transaction thread is open in an RHP the navigation state has not synced yet', async () => {
+        // Given the thread was just opened in the RHP, so only the root state shows it as focused
+        const rootState = {routes: [{name: 'RightModalNavigator'}]};
+        mockGetRootState.mockReturnValue(rootState);
+        mockGetFocusedReportId.mockImplementation((state) => (state === rootState ? 'thread-1' : 'iou-1'));
+        mockIsReportTopmostSplitNavigator.mockReturnValue(true);
+        mockGetIsNarrowLayout.mockReturnValue(true);
+        mockIsReportOpenInRHP.mockReturnValue(true);
+
+        // When the user presses "View"
+        navigateToCreatedExpense({
+            threadReportID: 'thread-1',
+            transactionID: 'txn-1',
+            iouReportID: 'iou-1',
+            reportTransactions: [buildTransaction('txn-1'), buildTransaction('txn-2')],
+        });
+        await waitForBatchedUpdates();
+
+        // Then nothing happens, since the user is already looking at the thread
+        expect(Navigation.navigate).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/onyxDerivedComputeSpanTest.ts b/tests/unit/onyxDerivedComputeSpanTest.ts
index b111c7e5e041..9342fd31acb7 100644
--- a/tests/unit/onyxDerivedComputeSpanTest.ts
+++ b/tests/unit/onyxDerivedComputeSpanTest.ts
@@ -106,6 +106,7 @@ describe('OnyxDerived compute span parenting', () => {
         expect(call).toBeDefined();
         expect(call?.parentSpan).toBeUndefined();
         expect(call?.onlyIfParent).toBe(true);
+        expect(call?.forceTransaction).toBe(false);
     });
 
     it('prefers the startup span over a send span', async () => {
@@ -126,5 +127,6 @@ describe('OnyxDerived compute span parenting', () => {
         const call = getComputeCallForDerivedKey(DERIVED_KEY);
         expect(call).toBeDefined();
         expect(call?.parentSpan).toBeUndefined();
+        expect(call?.forceTransaction).toBe(false);
     });
 });
diff --git a/tests/unit/pages/DynamicReportDetailsPage/useReportDetailsReportNameTest.ts b/tests/unit/pages/DynamicReportDetailsPage/useReportDetailsReportNameTest.ts
new file mode 100644
index 000000000000..7737993501e2
--- /dev/null
+++ b/tests/unit/pages/DynamicReportDetailsPage/useReportDetailsReportNameTest.ts
@@ -0,0 +1,154 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useReportDetailsReportName from '@pages/DynamicReportDetailsPage/useReportDetailsReportName';
+
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report, ReportAction, ReportAttributesDerivedValue} from '@src/types/onyx';
+
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../../../utils/waitForBatchedUpdates';
+
+const REPORT_ID = '1';
+const PARENT_REPORT_ID = '2';
+
+function buildReport(overrides: Partial<Report> = {}): Report {
+    return {
+        reportID: REPORT_ID,
+        type: CONST.REPORT.TYPE.CHAT,
+        reportName: 'Stored name',
+        ...overrides,
+    };
+}
+
+function buildParentReportAction(actionName: ReportAction['actionName']): ReportAction {
+    return {
+        reportActionID: '3',
+        actionName,
+        created: '2026-01-01 00:00:00.000',
+    } as ReportAction;
+}
+
+async function setDerivedReportNames(namesByReportID: Record<string, string>) {
+    const reports: ReportAttributesDerivedValue['reports'] = {};
+    for (const [reportID, reportName] of Object.entries(namesByReportID)) {
+        reports[reportID] = {reportName, isEmpty: false, brickRoadStatus: undefined, requiresAttention: false, reportErrors: {}};
+    }
+    await Onyx.set(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, {reports, locale: 'en'});
+    await waitForBatchedUpdates();
+}
+
+describe('useReportDetailsReportName', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('should return the derived names of the report and its parent', async () => {
+        // Given derived names exist for both the report and its parent
+        await setDerivedReportNames({[REPORT_ID]: 'Derived name', [PARENT_REPORT_ID]: 'Derived parent name'});
+        const report = buildReport({parentReportID: PARENT_REPORT_ID});
+        const parentReport = buildReport({reportID: PARENT_REPORT_ID});
+
+        // When the hook resolves the names
+        const {result} = renderHook(() => useReportDetailsReportName(report, parentReport, undefined));
+
+        // Then the derived names win over the stored report name
+        expect(result.current.reportName).toBe('Derived name');
+        expect(result.current.derivedParentReportName).toBe('Derived parent name');
+    });
+
+    it('should fall back to the stored report name when no derived name exists', async () => {
+        // Given the derived value has no entry for the report
+        await setDerivedReportNames({});
+        const report = buildReport();
+
+        // When the hook resolves the names
+        const {result} = renderHook(() => useReportDetailsReportName(report, undefined, undefined));
+
+        // Then the page still shows the name stored on the report, and there is no parent name to show
+        expect(result.current.reportName).toBe('Stored name');
+        expect(result.current.derivedParentReportName).toBeUndefined();
+    });
+
+    it('should return an empty name when the report is not loaded', async () => {
+        // Given a derived name exists but the report itself is not loaded yet
+        await setDerivedReportNames({[REPORT_ID]: 'Derived name'});
+
+        // When the hook resolves the names without a report
+        const {result} = renderHook(() => useReportDetailsReportName(undefined, undefined, undefined));
+
+        // Then no name is shown instead of a stale or unrelated one
+        expect(result.current.reportName).toBe('');
+    });
+
+    it('should use the parent invoice name for a chat thread under an invoice', async () => {
+        // Given a chat thread whose parent is an invoice report
+        await setDerivedReportNames({[REPORT_ID]: 'Thread name', [PARENT_REPORT_ID]: 'Invoice name'});
+        const report = buildReport({parentReportID: PARENT_REPORT_ID, parentReportActionID: '3'});
+        const parentReport = buildReport({reportID: PARENT_REPORT_ID, type: CONST.REPORT.TYPE.INVOICE});
+
+        // When the hook resolves the names
+        const {result} = renderHook(() => useReportDetailsReportName(report, parentReport, undefined));
+
+        // Then the header shows the invoice name, because getReportForHeader swaps in the parent for invoice threads
+        expect(result.current.reportName).toBe('Invoice name');
+    });
+
+    it('should strip HTML from the name when the parent action is not a comment', async () => {
+        // Given an HTML name on a report whose parent action is not a comment
+        await setDerivedReportNames({[REPORT_ID]: '<strong>Bold</strong> name'});
+        const report = buildReport();
+
+        // When the hook resolves the names
+        const {result} = renderHook(() => useReportDetailsReportName(report, undefined, buildParentReportAction(CONST.REPORT.ACTIONS.TYPE.IOU)));
+
+        // Then the name is converted to plain text
+        expect(result.current.reportName).toBe('Bold name');
+    });
+
+    it('should keep the raw name when the parent action is a comment', async () => {
+        // Given an HTML name on a thread started from a comment
+        await setDerivedReportNames({[REPORT_ID]: '<strong>Bold</strong> name'});
+        const report = buildReport();
+
+        // When the hook resolves the names
+        const {result} = renderHook(() => useReportDetailsReportName(report, undefined, buildParentReportAction(CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT)));
+
+        // Then the name is left unparsed
+        expect(result.current.reportName).toBe('<strong>Bold</strong> name');
+    });
+
+    it('should keep the raw name for a group chat', async () => {
+        // Given an HTML name on a group chat
+        await setDerivedReportNames({[REPORT_ID]: '<strong>Bold</strong> name'});
+        const report = buildReport({chatType: CONST.REPORT.CHAT_TYPE.GROUP});
+
+        // When the hook resolves the names
+        const {result} = renderHook(() => useReportDetailsReportName(report, undefined, undefined));
+
+        // Then the name is left unparsed
+        expect(result.current.reportName).toBe('<strong>Bold</strong> name');
+    });
+
+    it('should update the name when the derived name changes', async () => {
+        // Given the hook already resolved a derived name
+        await setDerivedReportNames({[REPORT_ID]: 'Old name'});
+        const report = buildReport();
+        const {result} = renderHook(() => useReportDetailsReportName(report, undefined, undefined));
+        expect(result.current.reportName).toBe('Old name');
+
+        // When the derived value recomputes with a new name
+        await act(async () => {
+            await setDerivedReportNames({[REPORT_ID]: 'New name'});
+        });
+
+        // Then the hook returns the new name, because it owns the REPORT_ATTRIBUTES subscription
+        expect(result.current.reportName).toBe('New name');
+    });
+});
diff --git a/tests/unit/pages/HomePage.test.tsx b/tests/unit/pages/HomePage.test.tsx
index c8224234e4b2..78284e673804 100644
--- a/tests/unit/pages/HomePage.test.tsx
+++ b/tests/unit/pages/HomePage.test.tsx
@@ -29,6 +29,11 @@ jest.mock('@hooks/useLocalize', () =>
     })),
 );
 jest.mock('@hooks/useDocumentTitle', () => jest.fn());
+jest.mock('@react-navigation/native', () => ({
+    ...jest.requireActual<Record<string, unknown>>('@react-navigation/native'),
+    useFocusEffect: jest.fn(),
+}));
+jest.mock('@libs/actions/HomePage', () => jest.fn());
 jest.mock('@hooks/useThemeStyles', () =>
     jest.fn(() => ({
         flex1: {},
diff --git a/tests/unit/pages/home/GettingStartedSection/GettingStartedSectionTest.tsx b/tests/unit/pages/home/GettingStartedSection/GettingStartedSectionTest.tsx
index 4c162387fe76..17820abd1498 100644
--- a/tests/unit/pages/home/GettingStartedSection/GettingStartedSectionTest.tsx
+++ b/tests/unit/pages/home/GettingStartedSection/GettingStartedSectionTest.tsx
@@ -17,6 +17,7 @@ import React from 'react';
 import Onyx from 'react-native-onyx';
 
 import createMock from '../../../../utils/createMock';
+import {getGlobalFetchMock} from '../../../../utils/TestHelper';
 import waitForBatchedUpdates from '../../../../utils/waitForBatchedUpdates';
 
 const TEST_POLICY_ID = 'ABC123';
@@ -124,6 +125,8 @@ describe('GettingStartedSection', () => {
 
     beforeEach(async () => {
         jest.clearAllMocks();
+        // When rules are enabled, the section sends GetRules, so mock fetch to keep that request off the real network.
+        global.fetch = getGlobalFetchMock();
         await Onyx.clear();
         await waitForBatchedUpdates();
     });
diff --git a/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx b/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx
index fd4b0c5f184e..076bb81d59be 100644
--- a/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx
+++ b/tests/unit/pages/home/TimeSensitiveSection/UnlockBankAccountTest.tsx
@@ -368,6 +368,8 @@ describe('TimeSensitiveSection - UnlockBankAccount', () => {
             introSelected: undefined,
             currentUserAccountID: ADMIN_ACCOUNT_ID,
             isSelfTourViewed: false,
+            // Narrowed to Concierge only, which is not in the personal details list here
+            conciergePersonalDetails: {},
         });
     });
 });
diff --git a/tests/unit/pages/inbox/ConciergeDraftContext.test.tsx b/tests/unit/pages/inbox/ConciergeDraftContext.test.tsx
index 480d7e9728d2..b972c095a126 100644
--- a/tests/unit/pages/inbox/ConciergeDraftContext.test.tsx
+++ b/tests/unit/pages/inbox/ConciergeDraftContext.test.tsx
@@ -591,7 +591,11 @@ describe('ConciergeDraftContext', () => {
         unmount();
     });
 
-    it('reveals a matching persisted report action after a content-free completion', async () => {
+    it.each(['missing', 'content-free'])('reveals a matching persisted report action with a %s completion event', async (completionEvent) => {
+        // Given a paced draft containing literal text that only the server can render
+        const bodyMarkdown = 'Here &lt;client team&gt;';
+        const finalText = `${CANONICAL_FINAL_TEXT} <client team>`;
+        const finalRenderedHTML = `<comment>${CANONICAL_FINAL_TEXT} &lt;client team&gt;</comment>`;
         const wrapper = ({children}: PropsWithChildren) => <ConciergeDraftProvider reportID={REPORT_ID}>{children}</ConciergeDraftProvider>;
         const {result, unmount} = renderHook(
             () => ({
@@ -608,37 +612,53 @@ describe('ConciergeDraftContext', () => {
             jest.useFakeTimers();
 
             act(() => {
-                emitPusherEvent(Pusher.TYPE.CONCIERGE_DRAFT_UPDATED, createDraftEvent('Here'));
+                emitPusherEvent(Pusher.TYPE.CONCIERGE_DRAFT_UPDATED, createDraftEvent(bodyMarkdown));
             });
             expect(getFirstMessageText(result.current.state.draftReportAction)).toBe('H');
 
             act(() => {
-                emitPusherEvent(
-                    Pusher.TYPE.CONCIERGE_DRAFT_COMPLETED,
-                    createDraftEvent('', {
-                        sequence: 356,
-                        status: 'completed',
-                        bodyMarkdown: undefined,
-                        finalRenderedHTML: undefined,
-                    }),
-                );
+                jest.advanceTimersByTime(100);
             });
+            expect(getFirstMessageText(result.current.state.draftReportAction)).toBe('Here ');
+            expect(getCachedDraft(REPORT_ID)?.pusherTargetBodyMarkdown).toBe(bodyMarkdown);
+            const visibleSourceOffset = getCachedDraft(REPORT_ID)?.pusherVisibleSourceOffset;
+            expect(visibleSourceOffset).toBeGreaterThan('Here &'.length);
+            expect(getCachedDraft(REPORT_ID)?.bodyMarkdown).toBe(bodyMarkdown.slice(0, visibleSourceOffset));
+            expect(getCachedDraft(REPORT_ID)?.pusherVisibleSourceMarkdown).toBe(bodyMarkdown.slice(0, visibleSourceOffset));
+
+            // When completion is missing or has no content, the saved action supplies the final HTML
+            if (completionEvent === 'content-free') {
+                act(() => {
+                    emitPusherEvent(
+                        Pusher.TYPE.CONCIERGE_DRAFT_COMPLETED,
+                        createDraftEvent('', {
+                            sequence: 356,
+                            status: 'completed',
+                            bodyMarkdown: undefined,
+                            finalRenderedHTML: undefined,
+                        }),
+                    );
+                });
+            }
 
             expect(result.current.state.isDraftPendingCompletion).toBe(true);
-            expect(getFirstMessageText(result.current.state.draftReportAction)).not.toBe(CANONICAL_FINAL_TEXT);
+            expect(getFirstMessageText(result.current.state.draftReportAction)).not.toBe(finalText);
 
             act(() => {
-                result.current.actions.revealDraftFromReportAction(createReportAction(CANONICAL_FINAL_TEXT));
+                result.current.actions.revealDraftFromReportAction(createReportAction(finalRenderedHTML));
             });
 
-            expect(getFirstMessageText(result.current.state.draftReportAction)).not.toBe(CANONICAL_FINAL_TEXT);
+            expect(getFirstMessageText(result.current.state.draftReportAction)).not.toBe(finalText);
 
             act(() => {
                 jest.advanceTimersByTime(2_000);
             });
 
+            // Then the complete literal text replaces the prefix in the same action
             await waitFor(() => {
-                expect(getFirstMessageText(result.current.state.draftReportAction)).toBe(CANONICAL_FINAL_TEXT);
+                expect(getFirstMessageText(result.current.state.draftReportAction)).toBe(finalText);
+                expect(getReportActionHtml(result.current.state.draftReportAction)).toBe(finalRenderedHTML);
+                expect(result.current.state.draftReportAction?.reportActionID).toBe(REPORT_ACTION_ID);
                 expect(result.current.state.isDraftPendingCompletion).toBe(false);
             });
         } finally {
@@ -647,6 +667,45 @@ describe('ConciergeDraftContext', () => {
         }
     });
 
+    it('completes a pending draft from a matching persisted action with identical HTML', async () => {
+        // Given a fully revealed draft whose terminal completion event never arrived
+        const wrapper = ({children}: PropsWithChildren) => <ConciergeDraftProvider reportID={REPORT_ID}>{children}</ConciergeDraftProvider>;
+        const {result, unmount} = renderHook(
+            () => ({
+                actions: useConciergeDraftActions(),
+                state: useConciergeDraft(),
+            }),
+            {wrapper},
+        );
+
+        try {
+            await waitFor(() => {
+                expect(Pusher.subscribe).toHaveBeenCalledTimes(6);
+            });
+            jest.useFakeTimers();
+
+            act(() => {
+                emitPusherEvent(Pusher.TYPE.CONCIERGE_DRAFT_UPDATED, createDraftEvent('OK'));
+                jest.advanceTimersByTime(100);
+            });
+
+            expect(getFirstMessageText(result.current.state.draftReportAction)).toBe('OK');
+            expect(result.current.state.isDraftPendingCompletion).toBe(true);
+
+            // When the saved action provides the same content as the last streamed update
+            act(() => {
+                result.current.actions.revealDraftFromReportAction(createReportAction(SHORT_FINAL_RENDERED_HTML));
+            });
+
+            // Then the durable reply completes the draft without requiring another Pusher event
+            expect(getFirstMessageText(result.current.state.draftReportAction)).toBe('OK');
+            expect(result.current.state.isDraftPendingCompletion).toBe(false);
+        } finally {
+            unmount();
+            jest.useRealTimers();
+        }
+    });
+
     it('applies ordered batched Pusher draft events', async () => {
         const wrapper = ({children}: PropsWithChildren) => <ConciergeDraftProvider reportID={REPORT_ID}>{children}</ConciergeDraftProvider>;
         const {result, unmount} = renderHook(() => useConciergeDraft(), {wrapper});
diff --git a/tests/unit/pages/inbox/conciergeDraftState.test.ts b/tests/unit/pages/inbox/conciergeDraftState.test.ts
index c53db50f80e5..a25866d1c440 100644
--- a/tests/unit/pages/inbox/conciergeDraftState.test.ts
+++ b/tests/unit/pages/inbox/conciergeDraftState.test.ts
@@ -77,6 +77,68 @@ describe('conciergeDraftState', () => {
         expect(getFirstMessageHTML(draft)).not.toContain('<strong>streaming</strong>');
     });
 
+    it('keeps canonical entity Markdown while displaying only the prefix until final HTML arrives', () => {
+        // Given an entity split across streamed snapshots
+        const bodyMarkdown = '**Lunch** &lt;client team&gt; &#42;alpha&#42; &amp;lt;literal&amp;gt;';
+        const initialDraft = applyConciergeDraftEvent(null, createDraftEvent({bodyMarkdown: '**Lunch** &'}), REPORT_ID, false);
+        expect(getFirstMessageText(initialDraft)).toBe('Lunch ');
+
+        // When the complete source arrives, the draft must not display double-escaped entities
+        const updatedDraft = applyConciergeDraftEvent(initialDraft, createDraftEvent({sequence: 2, status: 'updated', bodyMarkdown}), REPORT_ID, false);
+        expect(updatedDraft?.bodyMarkdown).toBe(bodyMarkdown);
+        expect(updatedDraft?.sequence).toBe(2);
+        expect(updatedDraft?.streamSessionID).toBe(STREAM_SESSION_ID);
+        expect(updatedDraft?.reportAction.reportActionID).toBe(REPORT_ACTION_ID);
+        expect(getFirstMessageHTML(updatedDraft)).toContain('<strong>Lunch</strong>');
+        expect(getFirstMessageText(updatedDraft)).toBe('Lunch ');
+
+        // Then server-rendered HTML reveals the exact literal text in the same action
+        const finalRenderedHTML = '<comment><strong>Lunch</strong> &lt;client team&gt; &#42;alpha&#42; &amp;lt;literal&amp;gt;</comment>';
+        const completedDraft = applyConciergeDraftEvent(updatedDraft, createDraftEvent({sequence: 3, status: 'completed', bodyMarkdown, finalRenderedHTML}), REPORT_ID, false);
+        expect(completedDraft?.bodyMarkdown).toBe(bodyMarkdown);
+        expect(completedDraft?.status).toBe('completed');
+        expect(completedDraft?.reportAction.reportActionID).toBe(REPORT_ACTION_ID);
+        expect(getFirstMessageHTML(completedDraft)).toBe(finalRenderedHTML);
+        expect(getFirstMessageText(completedDraft)).toBe('Lunch <client team> *alpha* &lt;literal&gt;');
+    });
+
+    it('waits for final HTML when an entity starts the draft', () => {
+        // Given a draft whose first character could start an encoded literal
+        const initialDraft = applyConciergeDraftEvent(null, createDraftEvent({bodyMarkdown: '&'}), REPORT_ID, false);
+        expect(initialDraft).toBeNull();
+
+        // When the entity completes, there is still no prefix that the client can safely render
+        const bodyMarkdown = '&lt;client team&gt;';
+        const updatedDraft = applyConciergeDraftEvent(initialDraft, createDraftEvent({sequence: 2, status: 'updated', bodyMarkdown}), REPORT_ID, false);
+        expect(updatedDraft).toBeNull();
+
+        // Then final HTML creates the intended action without displaying entity syntax
+        const finalRenderedHTML = '<comment>&lt;client team&gt;</comment>';
+        const completedDraft = applyConciergeDraftEvent(updatedDraft, createDraftEvent({sequence: 3, status: 'completed', bodyMarkdown, finalRenderedHTML}), REPORT_ID, false);
+        expect(completedDraft?.reportAction.reportActionID).toBe(REPORT_ACTION_ID);
+        expect(getFirstMessageHTML(completedDraft)).toBe(finalRenderedHTML);
+        expect(getFirstMessageText(completedDraft)).toBe('<client team>');
+    });
+
+    it('also waits at an ordinary ampersand until final HTML arrives', () => {
+        // Given an ordinary draft that contains an ampersand rather than an entity
+        const bodyMarkdown = 'Lunch & dinner';
+
+        // When rendering Markdown, the same boundary avoids guessing which ampersands start entities
+        const draft = applyConciergeDraftEvent(null, createDraftEvent({bodyMarkdown}), REPORT_ID, false);
+        expect(draft?.bodyMarkdown).toBe(bodyMarkdown);
+        expect(getFirstMessageText(draft)).toBe('Lunch ');
+
+        // Then final HTML reveals the complete text without truncation
+        const completedDraft = applyConciergeDraftEvent(
+            draft,
+            createDraftEvent({sequence: 2, status: 'completed', bodyMarkdown, finalRenderedHTML: '<comment>Lunch &amp; dinner</comment>'}),
+            REPORT_ID,
+            false,
+        );
+        expect(getFirstMessageText(completedDraft)).toBe(bodyMarkdown);
+    });
+
     it('should ignore stale events from the same stream session', () => {
         const initialDraft = applyConciergeDraftEvent(null, createDraftEvent({sequence: 3}), REPORT_ID, false);
         const staleDraft = applyConciergeDraftEvent(
diff --git a/tests/unit/pages/settings/AgentsTableRowTest.tsx b/tests/unit/pages/settings/AgentsTableRowTest.tsx
index 00367f5c1d21..b650bfae984d 100644
--- a/tests/unit/pages/settings/AgentsTableRowTest.tsx
+++ b/tests/unit/pages/settings/AgentsTableRowTest.tsx
@@ -65,7 +65,7 @@ jest.mock('@components/Table/TableContext', () => ({
         isMobileSelectionEnabled: false,
         tableListMetadata: {
             hasPageHeader: false,
-            shouldRenderStickyHeader: false,
+            columnHeaderPlacement: 'none',
         },
     })),
     useTableRowSemanticID: jest.fn(() => undefined),
diff --git a/tests/unit/pages/settings/EditAgentPageTest.tsx b/tests/unit/pages/settings/EditAgentPageTest.tsx
index 97074480fad8..3d7bde35c08a 100644
--- a/tests/unit/pages/settings/EditAgentPageTest.tsx
+++ b/tests/unit/pages/settings/EditAgentPageTest.tsx
@@ -112,26 +112,12 @@ jest.mock('@components/ConfirmModal', () => {
     return MockConfirmModal;
 });
 
-jest.mock('@components/MenuItem', () => {
-    function MockMenuItem({title}: {title: string}) {
-        return title ?? null;
-    }
-    return MockMenuItem;
-});
-
 jest.mock('@components/MenuItem/presets/MenuItemAction', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const {Text} = jest.requireActual('react-native');
     return ({title, onPress, isDisabled}: {title: string; onPress?: () => void; isDisabled?: boolean}) => <Text onPress={isDisabled ? undefined : onPress}>{title}</Text>;
 });
 
-jest.mock('@components/MenuItemWithTopDescription', () => {
-    function MockMenuItemWithTopDescription({title, description}: {title: string; description: string}) {
-        return `${description}::${title}`;
-    }
-    return MockMenuItemWithTopDescription;
-});
-
 jest.mock('@components/OfflineWithFeedback', () => {
     function MockOfflineWithFeedback({children, errors}: {children: React.ReactNode; errors?: Record<string, unknown> | null}) {
         return (
@@ -290,7 +276,12 @@ describe('EditAgentPage', () => {
     });
 
     it('renders NotFoundPage when agent and personalDetails are both missing after Onyx is loaded', () => {
-        mockUseOnyx.mockReturnValue([undefined, {status: 'loaded'}]);
+        mockUseOnyx.mockImplementation((key) => {
+            if (key === ONYXKEYS.IS_LOADING_APP) {
+                return [false, {status: 'loaded'}];
+            }
+            return [undefined, {status: 'loaded'}];
+        });
 
         const {toJSON} = render(
             <EditAgentPage
diff --git a/tests/unit/pages/workspace/accounting/netsuite/NetSuiteTokenInputPageTest.tsx b/tests/unit/pages/workspace/accounting/netsuite/NetSuiteTokenInputPageTest.tsx
index 58e86991fbbf..44cf776ff8ef 100644
--- a/tests/unit/pages/workspace/accounting/netsuite/NetSuiteTokenInputPageTest.tsx
+++ b/tests/unit/pages/workspace/accounting/netsuite/NetSuiteTokenInputPageTest.tsx
@@ -1,12 +1,14 @@
 import {render, screen} from '@testing-library/react-native';
 
 import useEnvironment from '@hooks/useEnvironment';
-import usePermissions from '@hooks/usePermissions';
+
+import {isAuthenticationError} from '@libs/actions/connections';
 
 import NetSuiteTokenInputPage from '@pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage';
 import type {CustomSubPageTokenInputProps} from '@pages/workspace/accounting/netsuite/types';
 
 import CONST from '@src/CONST';
+import type Policy from '@src/types/onyx/Policy';
 
 import type {ValueOf} from 'type-fest';
 
@@ -50,7 +52,6 @@ jest.mock('@hooks/useThemeStyles', () =>
     ),
 );
 jest.mock('@hooks/useEnvironment');
-jest.mock('@hooks/usePermissions');
 jest.mock('@libs/actions/connections', () => ({
     isAuthenticationError: jest.fn(() => false),
 }));
@@ -88,26 +89,72 @@ jest.mock(
 jest.mock('@pages/workspace/accounting/netsuite/NetSuiteTokenInput/subPages/NetSuiteTokenSetupContent', () => () => null);
 
 const mockedUseEnvironment = jest.mocked(useEnvironment);
-const mockedUsePermissions = jest.mocked(usePermissions);
+const mockedIsAuthenticationError = jest.mocked(isAuthenticationError);
 
-function setEnvironment({environment, isOAuthBetaEnabled}: {environment: ValueOf<typeof CONST.ENVIRONMENT>; isOAuthBetaEnabled: boolean}) {
+function setEnvironment(environment: ValueOf<typeof CONST.ENVIRONMENT>) {
     mockedUseEnvironment.mockReturnValue({
         environment,
         environmentURL: 'https://new.expensify.com',
         isProduction: environment === CONST.ENVIRONMENT.PRODUCTION,
         isDevelopment: environment === CONST.ENVIRONMENT.DEV,
     });
-    mockedUsePermissions.mockReturnValue({
-        isBetaEnabled: (beta) => beta === CONST.BETAS.NETSUITE_OAUTH && isOAuthBetaEnabled,
-        isBetaEnabledOrUnknown: (beta) => beta === CONST.BETAS.NETSUITE_OAUTH && isOAuthBetaEnabled,
-    });
 }
 
-function renderPage(subPage: string, authType?: string) {
+function buildNetsuitePolicy(tokenID: string): Policy {
+    return {
+        id: POLICY_ID,
+        name: '',
+        role: CONST.POLICY.ROLE.ADMIN,
+        type: CONST.POLICY.TYPE.TEAM,
+        owner: '',
+        outputCurrency: 'USD',
+        connections: {
+            netsuite: {
+                accountID: 'NS_ACCOUNT',
+                tokenID,
+                tokenSecret: '',
+                verified: false,
+                lastSyncDate: '',
+                lastErrorSyncDate: '',
+                options: {
+                    data: {customLists: [], subsidiaryList: [], payableList: []},
+                    config: {
+                        exportToNextOpenPeriod: false,
+                        reimbursableExpensesExportDestination: 'EXPENSE_REPORT',
+                        subsidiary: '',
+                        autoCreateEntities: false,
+                        nonreimbursableExpensesExportDestination: 'VENDOR_BILL',
+                        reimbursablePayableAccount: '',
+                        approvalAccount: '',
+                        payableAcct: '',
+                        syncOptions: {
+                            mapping: {classes: 'NETSUITE_DEFAULT', jobs: 'NETSUITE_DEFAULT', locations: 'NETSUITE_DEFAULT', customers: 'NETSUITE_DEFAULT', departments: 'NETSUITE_DEFAULT'},
+                            crossSubsidiaryCustomers: false,
+                            syncApprovalWorkflow: false,
+                            exportReportsTo: 'REPORTS_APPROVED_NONE',
+                            exportVendorBillsTo: 'VENDOR_BILLS_APPROVED_NONE',
+                            setFinalApprover: false,
+                            syncReimbursedReports: false,
+                            syncPeople: false,
+                            hasChosenAutoSyncOption: false,
+                            finalApprover: '',
+                            syncCategories: false,
+                            hasChosenSyncReimbursedReportsOption: false,
+                            exportJournalsTo: 'JOURNALS_APPROVED_NONE',
+                        },
+                    },
+                },
+                config: {autoSync: {enabled: false, jobID: ''}},
+            },
+        },
+    };
+}
+
+function renderPage(subPage: string, authType?: string, policy?: Policy) {
     mockRoute.current = {...mockRoute.current, params: {policyID: POLICY_ID, subPage, authType}};
     render(
         <NetSuiteTokenInputPage
-            policy={undefined}
+            policy={policy}
             policyDraft={undefined}
             isLoadingPolicy={false}
             // @ts-expect-error - route type from navigator
@@ -120,46 +167,83 @@ describe('NetSuiteTokenInputPage', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         mockStepNames.current = undefined;
+        mockedIsAuthenticationError.mockReturnValue(false);
     });
 
-    it('runs the token-based authentication flow without the netSuiteOAuth beta', () => {
-        setEnvironment({environment: CONST.ENVIRONMENT.PRODUCTION, isOAuthBetaEnabled: false});
-        renderPage(PAGE_NAME.CREDENTIALS);
+    it('runs the OAuth flow by default for fresh connections in production', () => {
+        // Given a fresh connection (no auth error) in production
+        setEnvironment(CONST.ENVIRONMENT.PRODUCTION);
 
-        expect(screen.getByTestId('token-form')).toBeOnTheScreen();
-        expect(mockStepNames.current).toBe(CONST.NETSUITE_CONFIG.TOKEN_INPUT.STEP_INDEX_LIST);
-    });
-
-    it('runs the OAuth flow with the netSuiteOAuth beta and hides the token-based link in production', () => {
-        setEnvironment({environment: CONST.ENVIRONMENT.PRODUCTION, isOAuthBetaEnabled: true});
+        // When the credentials page is rendered
         renderPage(PAGE_NAME.CREDENTIALS);
 
+        // Then the OAuth form and OAuth step names are shown, with no TBA fallback link
         expect(screen.getByTestId('oauth-form')).toBeOnTheScreen();
         expect(screen.queryByTestId('token-authentication-link')).toBeNull();
         expect(mockStepNames.current).toBe(CONST.NETSUITE_CONFIG.TOKEN_INPUT.OAUTH_STEP_INDEX_LIST);
     });
 
-    it('ignores the token-based route param in production', () => {
-        setEnvironment({environment: CONST.ENVIRONMENT.PRODUCTION, isOAuthBetaEnabled: true});
+    it('ignores the TBA route param in production and keeps OAuth', () => {
+        // Given a fresh connection in production with a TBA auth type in the route
+        setEnvironment(CONST.ENVIRONMENT.PRODUCTION);
+
+        // When the credentials page is rendered with the TBA param
         renderPage(PAGE_NAME.CREDENTIALS, CONST.NETSUITE_CONFIG.TOKEN_INPUT.AUTH_TYPE.TBA);
 
+        // Then production ignores the param and still shows the OAuth form
         expect(screen.getByTestId('oauth-form')).toBeOnTheScreen();
     });
 
-    it('offers the token-based link to beta members on staging', () => {
-        setEnvironment({environment: CONST.ENVIRONMENT.STAGING, isOAuthBetaEnabled: true});
+    it('offers the TBA fallback link on staging when using OAuth', () => {
+        // Given a fresh connection on staging (non-production)
+        setEnvironment(CONST.ENVIRONMENT.STAGING);
+
+        // When the credentials page is rendered
         renderPage(PAGE_NAME.CREDENTIALS);
 
+        // Then the OAuth form is shown along with the TBA fallback link
         expect(screen.getByTestId('oauth-form')).toBeOnTheScreen();
         expect(screen.getByTestId('token-authentication-link')).toBeOnTheScreen();
     });
 
-    it('runs the token-based authentication flow on dev when the route asks for it', () => {
-        setEnvironment({environment: CONST.ENVIRONMENT.DEV, isOAuthBetaEnabled: true});
+    it('runs the TBA flow on dev when the route asks for it', () => {
+        // Given a fresh connection on dev with TBA auth type in the route
+        setEnvironment(CONST.ENVIRONMENT.DEV);
+
+        // When the credentials page is rendered with the TBA param
         renderPage(PAGE_NAME.CREDENTIALS, CONST.NETSUITE_CONFIG.TOKEN_INPUT.AUTH_TYPE.TBA);
 
+        // Then the TBA form and TBA step names are shown, with no TBA fallback link
         expect(screen.getByTestId('token-form')).toBeOnTheScreen();
         expect(screen.queryByTestId('token-authentication-link')).toBeNull();
         expect(mockStepNames.current).toBe(CONST.NETSUITE_CONFIG.TOKEN_INPUT.STEP_INDEX_LIST);
     });
+
+    it('shows the TBA credentials form when reconnecting after an auth error on a TBA connection', () => {
+        // Given an existing TBA connection (tokenID present) that has an auth error
+        setEnvironment(CONST.ENVIRONMENT.PRODUCTION);
+        mockedIsAuthenticationError.mockReturnValue(true);
+        const policy = buildNetsuitePolicy('encrypted-token-id');
+
+        // When the credentials page is rendered for reconnection
+        renderPage(PAGE_NAME.CREDENTIALS, undefined, policy);
+
+        // Then the TBA credentials form is shown (OAuth not used for TBA reconnect until Release 5)
+        expect(screen.getByTestId('token-form')).toBeOnTheScreen();
+        expect(mockStepNames.current).toBe(CONST.NETSUITE_CONFIG.TOKEN_INPUT.STEP_INDEX_LIST);
+    });
+
+    it('shows the OAuth credentials form when reconnecting after an auth error on an OAuth connection', () => {
+        // Given an existing OAuth connection (no tokenID) that has an auth error
+        setEnvironment(CONST.ENVIRONMENT.PRODUCTION);
+        mockedIsAuthenticationError.mockReturnValue(true);
+        const policy = buildNetsuitePolicy('');
+
+        // When the credentials page is rendered for reconnection
+        renderPage(PAGE_NAME.CREDENTIALS, undefined, policy);
+
+        // Then the OAuth credentials form is shown
+        expect(screen.getByTestId('oauth-form')).toBeOnTheScreen();
+        expect(mockStepNames.current).toBe(CONST.NETSUITE_CONFIG.TOKEN_INPUT.OAUTH_STEP_INDEX_LIST);
+    });
 });
diff --git a/tests/unit/resolveDashboardStateTest.ts b/tests/unit/resolveDashboardStateTest.ts
index 9439cd68b6fc..e810c2e17d43 100644
--- a/tests/unit/resolveDashboardStateTest.ts
+++ b/tests/unit/resolveDashboardStateTest.ts
@@ -1,26 +1,34 @@
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
+import {buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 
+import INSIGHTS_DASHBOARD_SPECS from '@pages/Insights/dashboardSpecs';
 import {getDashboardState, INSIGHTS_DASHBOARD_STATE} from '@pages/Insights/resolveDashboardState';
+import type {InsightsDashboardChart} from '@pages/Insights/resolveDashboardState';
 
 import CONST from '@src/CONST';
 import type {InsightsDashboard} from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 
+const {headlineChart: HEADLINE_CHART, supportingCharts: SUPPORTING_CHARTS} = INSIGHTS_DASHBOARD_SPECS[CONST.INSIGHTS.DASHBOARD.SPEND];
+const [SUPPORTING_CHART] = SUPPORTING_CHARTS;
 const QUERY = 'groupBy:month groupCurrency:USD date:year-to-date';
+const QUERY_JSON = buildSearchQueryJSON(QUERY);
 const LOADED_DASHBOARD: InsightsDashboard = {inputQuery: QUERY, hasResults: true};
 const ERRORS = getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage');
 
+/** Builds a snapshot a request settled for the chart's query, the way GetInsights and Search both leave it. */
 function makeSnapshot(data: SearchResults['data']): SearchResults {
     return {
         search: {
             offset: 0,
-            hash: 1234,
+            hash: QUERY_JSON?.hash ?? 0,
             type: CONST.SEARCH.DATA_TYPES.EXPENSE,
             sortBy: CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH,
             sortOrder: CONST.SEARCH.SORT_ORDER.ASC,
             hasMoreResults: false,
             hasResults: true,
             isLoading: false,
+            state: CONST.SEARCH.SNAPSHOT_STATE.LOADED,
         },
         data,
     };
@@ -29,12 +37,20 @@ function makeSnapshot(data: SearchResults['data']): SearchResults {
 const GROUP_KEY = `${CONST.SEARCH.GROUP_PREFIX}1` as const;
 const SNAPSHOT_WITH_ROWS = makeSnapshot({[GROUP_KEY]: {count: 1, total: 1000, currency: 'USD', year: 2026, month: 1}});
 const SNAPSHOT_WITHOUT_ROWS = makeSnapshot({});
+const FAILED_SNAPSHOT: SearchResults = {...makeSnapshot({}), errors: ERRORS};
+
+function makeCharts(headline: SearchResults | undefined, supporting: SearchResults | undefined): InsightsDashboardChart[] {
+    return [
+        {chart: HEADLINE_CHART, snapshot: headline, queryJSON: QUERY_JSON},
+        {chart: SUPPORTING_CHART, snapshot: supporting, queryJSON: QUERY_JSON},
+    ];
+}
 
 describe('getDashboardState', () => {
     it('says the user is offline while no response has landed', () => {
         // Given no stored response and no connection
         // When the page's state is resolved
-        const state = getDashboardState(undefined, true, undefined);
+        const state = getDashboardState(undefined, true, makeCharts(undefined, undefined));
 
         // Then the page says it is offline rather than spinning forever
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.OFFLINE);
@@ -43,16 +59,70 @@ describe('getDashboardState', () => {
     it('keeps showing a stored dashboard while offline', () => {
         // Given a response that already landed, and a connection that since dropped
         // When the page's state is resolved
-        const state = getDashboardState(LOADED_DASHBOARD, true, SNAPSHOT_WITH_ROWS);
+        const state = getDashboardState(LOADED_DASHBOARD, true, makeCharts(SNAPSHOT_WITH_ROWS, SNAPSHOT_WITH_ROWS));
 
         // Then the charts stay on screen instead of being replaced by the offline state
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
     });
 
+    it('draws the charts offline when only a supporting chart has data stored', () => {
+        // Given no response and no connection, and a supporting chart whose query a Search request already settled
+        // When the page's state is resolved
+        const state = getDashboardState(undefined, true, makeCharts(undefined, SNAPSHOT_WITH_ROWS));
+
+        // Then the page shows the stored chart and leaves the rest to say they are offline, instead of hiding everything
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
+    });
+
+    it('says the user is offline when the only stored snapshot is a failed Search', () => {
+        // Given no stored response and no connection, and a headline snapshot whose Search request failed
+        // When the page's state is resolved
+        const state = getDashboardState(undefined, true, makeCharts(FAILED_SNAPSHOT, undefined));
+
+        // Then the whole page says it is offline, since a failed request left nothing to draw
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.OFFLINE);
+    });
+
+    it("says the user is offline instead of empty when every chart's Search failed", () => {
+        // Given no stored response and no connection, and Home having failed a Search for every chart on the page
+        // When the page's state is resolved
+        const state = getDashboardState(undefined, true, makeCharts(FAILED_SNAPSHOT, FAILED_SNAPSHOT));
+
+        // Then the whole page says it is offline, since failed requests don't mean the filters matched nothing
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.OFFLINE);
+    });
+
+    it('says the user is offline when every chart failed after a response landed', () => {
+        // Given a stored response, charts whose later Search requests all failed, and no connection to refresh them
+        // When the page's state is resolved
+        const state = getDashboardState(LOADED_DASHBOARD, true, makeCharts(FAILED_SNAPSHOT, FAILED_SNAPSHOT));
+
+        // Then the whole page says it is offline, rather than every chart saying so on its own
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.OFFLINE);
+    });
+
+    it('says the user is offline when the only stored rows belong to a failed Search', () => {
+        // Given no stored response and no connection, and a snapshot that kept its rows when a later Search failed
+        // When the page's state is resolved
+        const state = getDashboardState(undefined, true, makeCharts({...SNAPSHOT_WITH_ROWS, errors: ERRORS}, undefined));
+
+        // Then the whole page says it is offline, since the charts don't plot rows from a failed request either
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.OFFLINE);
+    });
+
+    it('does not read a failed snapshot as an empty one', () => {
+        // Given a loaded response, a headline chart whose Search request failed, and an empty supporting snapshot
+        // When the page's state is resolved
+        const state = getDashboardState(LOADED_DASHBOARD, false, makeCharts(FAILED_SNAPSHOT, SNAPSHOT_WITHOUT_ROWS));
+
+        // Then the charts render and the failed one shows its own error, instead of the page claiming nothing matched
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
+    });
+
     it('reports a failed request', () => {
         // Given a record the request wrote errors to
         // When the page's state is resolved
-        const state = getDashboardState({errors: ERRORS}, false, undefined);
+        const state = getDashboardState({errors: ERRORS}, false, makeCharts(undefined, undefined));
 
         // Then the page offers the error state
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.ERROR);
@@ -61,63 +131,99 @@ describe('getDashboardState', () => {
     it('waits while the request is in flight', () => {
         // Given a record holding nothing but the cleared errors the request wrote optimistically
         // When the page's state is resolved
-        const state = getDashboardState({errors: undefined}, false, undefined);
+        const state = getDashboardState({errors: undefined}, false, makeCharts(undefined, undefined));
 
         // Then the page is still loading, because only a response sets `inputQuery`
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.LOADING);
     });
 
     it('says the account has no expenses without waiting on a snapshot', () => {
-        // Given a response saying the account has no expenses at all, and no snapshot for the headline chart
+        // Given a response saying the account has no expenses at all, and no chart snapshots
         // When the page's state is resolved
-        const state = getDashboardState({inputQuery: QUERY, hasResults: false}, false, undefined);
+        const state = getDashboardState({inputQuery: QUERY, hasResults: false}, false, makeCharts(undefined, undefined));
 
         // Then the page says so straight away, since no set of filters could fill it
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.NO_EXPENSES);
     });
 
+    it('says the account has no expenses offline after its snapshots were evicted', () => {
+        // Given a stored response saying the account has no expenses, snapshots Onyx has since evicted, and no connection
+        // When the page's state is resolved
+        const state = getDashboardState({inputQuery: QUERY, hasResults: false}, true, makeCharts(undefined, undefined));
+
+        // Then the page keeps the stored answer instead of saying it is offline, since no refresh is needed to know it
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.NO_EXPENSES);
+    });
+
     it('prefers the no-expenses state over the empty one', () => {
-        // Given an account with no expenses whose headline snapshot also came back with no rows
+        // Given an account with no expenses whose chart snapshots also came back with no rows
         // When the page's state is resolved
-        const state = getDashboardState({inputQuery: QUERY, hasResults: false}, false, SNAPSHOT_WITHOUT_ROWS);
+        const state = getDashboardState({...LOADED_DASHBOARD, hasResults: false}, false, makeCharts(SNAPSHOT_WITHOUT_ROWS, SNAPSHOT_WITHOUT_ROWS));
 
         // Then the page says the user has no expenses, not that their filters matched nothing
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.NO_EXPENSES);
     });
 
-    it('says the filters matched nothing when the account does have expenses', () => {
-        // Given an account with expenses and a headline snapshot holding no grouped rows
+    it('draws the charts when rows loaded after a response said the account had no expenses', () => {
+        // Given a stored response from before the account's first expense, and a chart snapshot Search has since filled with rows
+        // When the page's state is resolved
+        const state = getDashboardState({...LOADED_DASHBOARD, hasResults: false}, true, makeCharts(SNAPSHOT_WITH_ROWS, undefined));
+
+        // Then the rows win, since they prove the stored `hasResults` is stale
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
+    });
+
+    it('says the filters matched nothing when every chart came back without rows', () => {
+        // Given an account with expenses and no grouped rows in any chart's snapshot
         // When the page's state is resolved
-        const state = getDashboardState(LOADED_DASHBOARD, false, SNAPSHOT_WITHOUT_ROWS);
+        const state = getDashboardState(LOADED_DASHBOARD, false, makeCharts(SNAPSHOT_WITHOUT_ROWS, SNAPSHOT_WITHOUT_ROWS));
 
         // Then the page points at the filters rather than the account
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.EMPTY);
     });
 
+    it('draws the charts when any of them has rows', () => {
+        // Given a headline snapshot with no rows, and a supporting chart that has some
+        // When the page's state is resolved
+        const state = getDashboardState(LOADED_DASHBOARD, false, makeCharts(SNAPSHOT_WITHOUT_ROWS, SNAPSHOT_WITH_ROWS));
+
+        // Then the dashboard renders, since the page is only empty when no chart has anything to plot
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
+    });
+
     it('does not read a missing snapshot as an empty one', () => {
-        // Given a response whose headline snapshot has not arrived yet
+        // Given a response whose supporting chart snapshot has not arrived yet, and an empty headline snapshot
         // When the page's state is resolved
-        const state = getDashboardState(LOADED_DASHBOARD, false, undefined);
+        const state = getDashboardState(LOADED_DASHBOARD, false, makeCharts(SNAPSHOT_WITHOUT_ROWS, undefined));
 
         // Then the charts render and show their own loading, instead of the page flashing the empty state
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
     });
 
     it('treats a record with no `hasResults` as an account that may have expenses', () => {
-        // Given a response that says nothing about whether the account has expenses, and a headline snapshot with no rows
+        // Given a response that says nothing about whether the account has expenses, and chart snapshots with no rows
         // When the page's state is resolved
-        const state = getDashboardState({inputQuery: QUERY}, false, SNAPSHOT_WITHOUT_ROWS);
+        const state = getDashboardState({inputQuery: QUERY}, false, makeCharts(SNAPSHOT_WITHOUT_ROWS, SNAPSHOT_WITHOUT_ROWS));
 
         // Then the page shows the empty state, never claiming an account has no expenses on a guess
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.EMPTY);
     });
 
     it('draws the charts once rows are in', () => {
-        // Given a loaded response and a headline snapshot holding grouped rows
+        // Given a loaded response and chart snapshots holding grouped rows
         // When the page's state is resolved
-        const state = getDashboardState(LOADED_DASHBOARD, false, SNAPSHOT_WITH_ROWS);
+        const state = getDashboardState(LOADED_DASHBOARD, false, makeCharts(SNAPSHOT_WITH_ROWS, SNAPSHOT_WITH_ROWS));
 
         // Then the dashboard renders
         expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
     });
+
+    it('draws the charts from a headline snapshot a Search request loaded before the response landed', () => {
+        // Given no stored response yet, and a headline snapshot a Search request settled for the same query
+        // When the page's state is resolved
+        const state = getDashboardState(undefined, false, makeCharts(SNAPSHOT_WITH_ROWS, undefined));
+
+        // Then the dashboard renders instead of waiting on GetInsights for data it already has
+        expect(state).toBe(INSIGHTS_DASHBOARD_STATE.READY);
+    });
 });
diff --git a/tests/unit/resolveInsightsChartDataTest.ts b/tests/unit/resolveInsightsChartDataTest.ts
index 897434fecab5..0b995bc0bacb 100644
--- a/tests/unit/resolveInsightsChartDataTest.ts
+++ b/tests/unit/resolveInsightsChartDataTest.ts
@@ -1,30 +1,28 @@
 import type {GroupedItem} from '@components/Search/types';
 
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
-
-import INSIGHTS_DASHBOARD_SPECS from '@pages/Insights/dashboardSpecs';
-import {INSIGHTS_CHART_STATE, resolveInsightsChartData} from '@pages/Insights/resolveChartData';
+import {INSIGHTS_CHART_STATE, resolveInsightsChartData} from '@libs/resolveInsightsChartData';
+import {buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 
 import CONST from '@src/CONST';
-import type {InsightsDashboard} from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
 
-const CHART = INSIGHTS_DASHBOARD_SPECS[CONST.INSIGHTS.DASHBOARD.SPEND].headlineChart;
-const QUERY = 'groupBy:month groupCurrency:USD date:year-to-date';
-const DASHBOARD_WITH_SNAPSHOT: InsightsDashboard = {inputQuery: QUERY, graphs: {[CHART.graphKey]: {snapshotHash: 1234}}};
+const QUERY_JSON = buildSearchQueryJSON('groupBy:month groupCurrency:USD date:year-to-date');
 const ERRORS = getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage');
 
+/** Builds a snapshot a request settled for the chart's query, the way GetInsights and Search both leave it. */
 function makeSnapshot(overrides: Partial<SearchResults> = {}): SearchResults {
     return {
         search: {
             offset: 0,
-            hash: 1234,
+            hash: QUERY_JSON?.hash ?? 0,
             type: CONST.SEARCH.DATA_TYPES.EXPENSE,
             sortBy: CONST.SEARCH.TABLE_COLUMNS.GROUP_MONTH,
             sortOrder: CONST.SEARCH.SORT_ORDER.ASC,
             hasMoreResults: false,
             hasResults: true,
             isLoading: false,
+            state: CONST.SEARCH.SNAPSHOT_STATE.LOADED,
         },
         data: {},
         ...overrides,
@@ -48,67 +46,98 @@ function makeRows(count: number): GroupedItem[] {
 }
 
 describe('resolveInsightsChartData', () => {
-    it('plots the rows once the snapshot the record named holds data', () => {
-        // Given a record that answered the query on screen, and the rows read off the snapshot it named
+    it('plots the rows once a request settled the snapshot', () => {
+        // Given a snapshot GetInsights or Search settled for the chart's query, and the rows read off it
         const sortedData = makeRows(3);
 
         // When the chart is resolved against them
-        const {data, state} = resolveInsightsChartData({chart: CHART, dashboard: DASHBOARD_WITH_SNAPSHOT, snapshot: makeSnapshot(), sortedData});
+        const {data, state} = resolveInsightsChartData({snapshot: makeSnapshot(), queryJSON: QUERY_JSON, sortedData});
 
-        // Then the chart is ready and plots those rows
+        // Then the chart is ready and plots those rows, whichever request loaded them
         expect(state).toBe(INSIGHTS_CHART_STATE.READY);
         expect(data).toBe(sortedData);
     });
 
-    it('waits while the snapshot the record named holds nothing yet', () => {
-        // Given a record naming a snapshot Onyx has not written yet
+    it('waits while nothing is stored for the chart', () => {
+        // Given no snapshot under the chart's query yet
         // When the chart is resolved
-        const {data, state} = resolveInsightsChartData({chart: CHART, dashboard: DASHBOARD_WITH_SNAPSHOT, snapshot: undefined, sortedData: undefined});
+        const {data, state} = resolveInsightsChartData({snapshot: undefined, queryJSON: QUERY_JSON, sortedData: undefined});
 
-        // Then the chart is still loading rather than empty, because a named snapshot says data is on its way
+        // Then the chart is still loading rather than empty
         expect(state).toBe(INSIGHTS_CHART_STATE.LOADING);
         expect(data).toEqual([]);
     });
 
-    it('is loading rather than empty until a response is stored', () => {
-        // Given nothing stored for the dashboard yet, so no chart has a snapshot hash
-        const dashboard = undefined;
+    it('waits while the stored snapshot answers a different query', () => {
+        // Given a snapshot whose metadata names another query's hash
+        const snapshot = makeSnapshot({search: {...makeSnapshot().search, hash: 1234}});
 
         // When the chart is resolved
-        const {state} = resolveInsightsChartData({chart: CHART, dashboard, snapshot: undefined, sortedData: undefined});
+        const {state} = resolveInsightsChartData({snapshot, queryJSON: QUERY_JSON, sortedData: makeRows(2)});
 
-        // Then it is loading, because only a stored response can tell a chart it has nothing to plot
+        // Then the chart keeps loading instead of plotting rows that belong to another query
         expect(state).toBe(INSIGHTS_CHART_STATE.LOADING);
     });
 
-    it('is empty when the response named no snapshot for the chart', () => {
-        // Given a record that answered the query without a snapshot for this chart
-        const dashboard: InsightsDashboard = {inputQuery: QUERY, graphs: {}};
+    it('is empty when the request settled without any data', () => {
+        // Given a snapshot the request marked loaded but wrote no data to, as when GetInsights found nothing for the chart
+        const snapshot = makeSnapshot({data: undefined});
 
         // When the chart is resolved
-        const {state} = resolveInsightsChartData({chart: CHART, dashboard, snapshot: undefined, sortedData: undefined});
+        const {state} = resolveInsightsChartData({snapshot, queryJSON: QUERY_JSON, sortedData: undefined});
 
-        // Then the chart is empty, because the response found nothing to plot
+        // Then the chart is empty, because the request is done and found nothing to plot
         expect(state).toBe(INSIGHTS_CHART_STATE.EMPTY);
     });
 
     it('is empty when the snapshot arrived with no rows in it', () => {
-        // Given a snapshot holding data that groups into nothing
+        // Given a settled snapshot holding data that groups into nothing
         // When the chart is resolved
-        const {state} = resolveInsightsChartData({chart: CHART, dashboard: DASHBOARD_WITH_SNAPSHOT, snapshot: makeSnapshot(), sortedData: []});
+        const {state} = resolveInsightsChartData({snapshot: makeSnapshot(), queryJSON: QUERY_JSON, sortedData: []});
 
         // Then the chart is empty
         expect(state).toBe(INSIGHTS_CHART_STATE.EMPTY);
     });
 
     it('fails when the snapshot itself carries errors', () => {
-        // Given a record that answered the query, whose snapshot came back with errors
+        // Given a snapshot that came back with errors
         const snapshot = makeSnapshot({errors: ERRORS});
 
         // When the chart is resolved
-        const {state} = resolveInsightsChartData({chart: CHART, dashboard: DASHBOARD_WITH_SNAPSHOT, snapshot, sortedData: undefined});
+        const {state} = resolveInsightsChartData({snapshot, queryJSON: QUERY_JSON, sortedData: undefined});
 
         // Then the chart shows the failure
         expect(state).toBe(INSIGHTS_CHART_STATE.ERROR);
     });
+
+    it('says it is offline instead of offering a retry that cannot be sent', () => {
+        // Given a snapshot still carrying errors from an earlier failure, while the device is offline
+        const snapshot = makeSnapshot({errors: ERRORS});
+
+        // When the chart is resolved
+        const {state} = resolveInsightsChartData({snapshot, queryJSON: QUERY_JSON, sortedData: undefined, isOffline: true});
+
+        // Then the chart waits for the connection, rather than calling itself empty or showing a retry that does nothing offline
+        expect(state).toBe(INSIGHTS_CHART_STATE.OFFLINE);
+    });
+
+    it('says it is offline when nothing is stored for it and no data can arrive', () => {
+        // Given no snapshot for the chart, while the device is offline
+        // When the chart is resolved
+        const {state} = resolveInsightsChartData({snapshot: undefined, queryJSON: QUERY_JSON, sortedData: undefined, isOffline: true});
+
+        // Then it shows the offline state instead of loading forever
+        expect(state).toBe(INSIGHTS_CHART_STATE.OFFLINE);
+    });
+
+    it('keeps plotting stored rows while offline', () => {
+        // Given a settled snapshot with rows, and a connection that since dropped
+        const sortedData = makeRows(3);
+
+        // When the chart is resolved
+        const {state} = resolveInsightsChartData({snapshot: makeSnapshot(), queryJSON: QUERY_JSON, sortedData, isOffline: true});
+
+        // Then the chart stays on screen rather than being replaced by the offline state
+        expect(state).toBe(INSIGHTS_CHART_STATE.READY);
+    });
 });
diff --git a/tests/unit/searchMatchUtilsTest.ts b/tests/unit/searchMatchUtilsTest.ts
index 19bbf8395572..bea45a16d912 100644
--- a/tests/unit/searchMatchUtilsTest.ts
+++ b/tests/unit/searchMatchUtilsTest.ts
@@ -2,6 +2,7 @@ import {doesPersonalDetailMatchSearchTerm} from '@libs/OptionsListUtils/searchMa
 
 // cspell:ignore René Résumé
 import deburr from 'lodash/deburr';
+import {translateLocal} from 'tests/utils/TestHelper';
 
 const CURRENT_USER_ACCOUNT_ID = 2;
 const OTHER_USER_ACCOUNT_ID = 99;
@@ -9,93 +10,93 @@ const OTHER_USER_ACCOUNT_ID = 99;
 describe('doesPersonalDetailMatchSearchTerm', () => {
     describe('basic matching', () => {
         it('should match by displayName', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John Doe'}, OTHER_USER_ACCOUNT_ID, 'john')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John Doe'}, OTHER_USER_ACCOUNT_ID, 'john', translateLocal)).toBe(true);
         });
 
         it('should match by login (email)', () => {
-            expect(doesPersonalDetailMatchSearchTerm({login: 'john@example.com'}, OTHER_USER_ACCOUNT_ID, 'john@example')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({login: 'john@example.com'}, OTHER_USER_ACCOUNT_ID, 'john@example', translateLocal)).toBe(true);
         });
 
         it('should match by login without dots before @', () => {
-            expect(doesPersonalDetailMatchSearchTerm({login: 'john.doe@example.com'}, OTHER_USER_ACCOUNT_ID, 'johndoe@')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({login: 'john.doe@example.com'}, OTHER_USER_ACCOUNT_ID, 'johndoe@', translateLocal)).toBe(true);
         });
 
         it('should match by participantsList displayName', () => {
             const item = {participantsList: [{displayName: 'Jane Smith', accountID: 123}]};
-            expect(doesPersonalDetailMatchSearchTerm(item, OTHER_USER_ACCOUNT_ID, 'jane')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm(item, OTHER_USER_ACCOUNT_ID, 'jane', translateLocal)).toBe(true);
         });
 
         it('should not match when search term is absent from all fields', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Alice', login: 'alice@test.com'}, OTHER_USER_ACCOUNT_ID, 'bob')).toBe(false);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Alice', login: 'alice@test.com'}, OTHER_USER_ACCOUNT_ID, 'bob', translateLocal)).toBe(false);
         });
 
         it('should match when search term is empty string', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Anyone'}, OTHER_USER_ACCOUNT_ID, '')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Anyone'}, OTHER_USER_ACCOUNT_ID, '', translateLocal)).toBe(true);
         });
     });
 
     describe('case insensitivity', () => {
         it('should match mixed case displayName against lowercased search', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John DOE'}, OTHER_USER_ACCOUNT_ID, 'john doe')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John DOE'}, OTHER_USER_ACCOUNT_ID, 'john doe', translateLocal)).toBe(true);
         });
 
         it('should match mixed case login against lowercased search', () => {
-            expect(doesPersonalDetailMatchSearchTerm({login: 'John.Doe@Example.COM'}, OTHER_USER_ACCOUNT_ID, 'john.doe@example.com')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({login: 'John.Doe@Example.COM'}, OTHER_USER_ACCOUNT_ID, 'john.doe@example.com', translateLocal)).toBe(true);
         });
     });
 
     describe('current user matching', () => {
         it('should match by text field for current user', () => {
-            expect(doesPersonalDetailMatchSearchTerm({accountID: CURRENT_USER_ACCOUNT_ID, text: 'My Display Name'}, CURRENT_USER_ACCOUNT_ID, 'my display')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({accountID: CURRENT_USER_ACCOUNT_ID, text: 'My Display Name'}, CURRENT_USER_ACCOUNT_ID, 'my display', translateLocal)).toBe(true);
         });
 
         it('should fall back to displayName when text is missing for current user', () => {
-            expect(doesPersonalDetailMatchSearchTerm({accountID: CURRENT_USER_ACCOUNT_ID, displayName: 'Fallback Name'}, CURRENT_USER_ACCOUNT_ID, 'fallback')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({accountID: CURRENT_USER_ACCOUNT_ID, displayName: 'Fallback Name'}, CURRENT_USER_ACCOUNT_ID, 'fallback', translateLocal)).toBe(true);
         });
     });
 
     describe('partial / sparse items', () => {
         it('should match with only login provided', () => {
-            expect(doesPersonalDetailMatchSearchTerm({login: 'solo@test.com'}, OTHER_USER_ACCOUNT_ID, 'solo')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({login: 'solo@test.com'}, OTHER_USER_ACCOUNT_ID, 'solo', translateLocal)).toBe(true);
         });
 
         it('should match with only displayName provided', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Solo'}, OTHER_USER_ACCOUNT_ID, 'solo')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Solo'}, OTHER_USER_ACCOUNT_ID, 'solo', translateLocal)).toBe(true);
         });
 
         it('should not match empty item with a search term', () => {
-            expect(doesPersonalDetailMatchSearchTerm({}, OTHER_USER_ACCOUNT_ID, 'anything')).toBe(false);
+            expect(doesPersonalDetailMatchSearchTerm({}, OTHER_USER_ACCOUNT_ID, 'anything', translateLocal)).toBe(false);
         });
 
         it('should match empty item with empty search term', () => {
-            expect(doesPersonalDetailMatchSearchTerm({}, OTHER_USER_ACCOUNT_ID, '')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({}, OTHER_USER_ACCOUNT_ID, '', translateLocal)).toBe(true);
         });
     });
 
     describe('cross-field matching', () => {
         it('should match a search term that spans displayName and login', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John', login: 'doe@test.com'}, OTHER_USER_ACCOUNT_ID, 'john doe')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John', login: 'doe@test.com'}, OTHER_USER_ACCOUNT_ID, 'john doe', translateLocal)).toBe(true);
         });
     });
 
     describe('useLocaleLowerCase config', () => {
         it('should lowercase with toLocaleLowerCase when enabled', () => {
             expect(
-                doesPersonalDetailMatchSearchTerm({displayName: 'ISTANBUL'}, OTHER_USER_ACCOUNT_ID, 'istanbul', {
+                doesPersonalDetailMatchSearchTerm({displayName: 'ISTANBUL'}, OTHER_USER_ACCOUNT_ID, 'istanbul', translateLocal, {
                     useLocaleLowerCase: true,
                 }),
             ).toBe(true);
         });
 
         it('should lowercase with toLowerCase by default', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'ISTANBUL'}, OTHER_USER_ACCOUNT_ID, 'istanbul')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'ISTANBUL'}, OTHER_USER_ACCOUNT_ID, 'istanbul', translateLocal)).toBe(true);
         });
     });
 
     describe('transformSearchText config', () => {
         it('should match against appended text from transform callback', () => {
             expect(
-                doesPersonalDetailMatchSearchTerm({displayName: 'John'}, OTHER_USER_ACCOUNT_ID, 'extra', {
+                doesPersonalDetailMatchSearchTerm({displayName: 'John'}, OTHER_USER_ACCOUNT_ID, 'extra', translateLocal, {
                     transformSearchText: (concatenatedSearchTerms) => `${concatenatedSearchTerms} extra stuff`,
                 }),
             ).toBe(true);
@@ -103,7 +104,7 @@ describe('doesPersonalDetailMatchSearchTerm', () => {
 
         it('should pass already-lowercased terms to the transform callback', () => {
             let receivedText = '';
-            doesPersonalDetailMatchSearchTerm({displayName: 'UPPER Case'}, OTHER_USER_ACCOUNT_ID, 'test', {
+            doesPersonalDetailMatchSearchTerm({displayName: 'UPPER Case'}, OTHER_USER_ACCOUNT_ID, 'test', translateLocal, {
                 transformSearchText: (concatenatedSearchTerms) => {
                     receivedText = concatenatedSearchTerms;
                     return concatenatedSearchTerms;
@@ -114,7 +115,7 @@ describe('doesPersonalDetailMatchSearchTerm', () => {
 
         it('should use the transform result as the final match target', () => {
             expect(
-                doesPersonalDetailMatchSearchTerm({displayName: 'Alice'}, OTHER_USER_ACCOUNT_ID, 'replaced', {
+                doesPersonalDetailMatchSearchTerm({displayName: 'Alice'}, OTHER_USER_ACCOUNT_ID, 'replaced', translateLocal, {
                     transformSearchText: () => 'completely replaced',
                 }),
             ).toBe(true);
@@ -122,7 +123,7 @@ describe('doesPersonalDetailMatchSearchTerm', () => {
 
         it('should support deburr with appended text (real-world usage)', () => {
             expect(
-                doesPersonalDetailMatchSearchTerm({displayName: 'René'}, OTHER_USER_ACCOUNT_ID, 'rene', {
+                doesPersonalDetailMatchSearchTerm({displayName: 'René'}, OTHER_USER_ACCOUNT_ID, 'rene', translateLocal, {
                     useLocaleLowerCase: true,
                     transformSearchText: (concatenatedSearchTerms) => deburr(`${concatenatedSearchTerms} ${'Résumé'.toLocaleLowerCase()}`),
                 }),
@@ -132,15 +133,15 @@ describe('doesPersonalDetailMatchSearchTerm', () => {
 
     describe('negative cases', () => {
         it('should not match when search term is longer than all fields', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Jo'}, OTHER_USER_ACCOUNT_ID, 'john')).toBe(false);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'Jo'}, OTHER_USER_ACCOUNT_ID, 'john', translateLocal)).toBe(false);
         });
 
         it('should not match when search contains characters not in any field', () => {
-            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John'}, OTHER_USER_ACCOUNT_ID, 'john!')).toBe(false);
+            expect(doesPersonalDetailMatchSearchTerm({displayName: 'John'}, OTHER_USER_ACCOUNT_ID, 'john!', translateLocal)).toBe(false);
         });
 
         it('should not crash with undefined accountID', () => {
-            expect(doesPersonalDetailMatchSearchTerm({accountID: undefined, displayName: 'Test'}, CURRENT_USER_ACCOUNT_ID, 'test')).toBe(true);
+            expect(doesPersonalDetailMatchSearchTerm({accountID: undefined, displayName: 'Test'}, CURRENT_USER_ACCOUNT_ID, 'test', translateLocal)).toBe(true);
         });
     });
 });
diff --git a/tests/unit/selectors/ReportTest.ts b/tests/unit/selectors/ReportTest.ts
index db514df28fce..e8ec24e9c382 100644
--- a/tests/unit/selectors/ReportTest.ts
+++ b/tests/unit/selectors/ReportTest.ts
@@ -1,7 +1,7 @@
 import CONST from '@src/CONST';
 import type {Report} from '@src/types/onyx';
 
-import {expenseReportAvatarSelector, reportAvatarKindSelector, reportPolicyFieldsSelector} from '@selectors/Report';
+import {reportAvatarFieldsSelector, reportAvatarKindSelector, reportPolicyFieldsSelector} from '@selectors/Report';
 
 const REPORT_ID = 'report123';
 const PARENT_REPORT_ID = 'parentReport123';
@@ -36,8 +36,9 @@ describe('reportAvatarKindSelector', () => {
         ['a DM', {type: CONST.REPORT.TYPE.CHAT}, CONST.REPORT_AVATAR_KIND.DEFAULT],
         ['a self DM', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.SELF_DM}, CONST.REPORT_AVATAR_KIND.DEFAULT],
         ['a system chat', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.SYSTEM}, CONST.REPORT_AVATAR_KIND.DEFAULT],
-        // Trip rooms keep bespoke avatar logic in the legacy hook, so they stay on the default kind for now.
-        ['a trip room', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM}, CONST.REPORT_AVATAR_KIND.DEFAULT],
+        // A trip room is itself a thread of its trip preview, so it routes to the thread wrapper.
+        ['a trip room', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM, ...threadFields}, CONST.REPORT_AVATAR_KIND.CHAT_THREAD],
+        ['a trip room without parent fields', {type: CONST.REPORT.TYPE.CHAT, chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM}, CONST.REPORT_AVATAR_KIND.DEFAULT],
         ['a report without a type', {}, CONST.REPORT_AVATAR_KIND.DEFAULT],
         // Legacy getIcons classifies chats purely off chatType — a chat row whose type hasn't populated yet still routes by it.
         ['a group chat without a type', {chatType: CONST.REPORT.CHAT_TYPE.GROUP}, CONST.REPORT_AVATAR_KIND.GROUP_CHAT],
@@ -53,34 +54,36 @@ describe('reportAvatarKindSelector', () => {
     });
 });
 
-describe('expenseReportAvatarSelector', () => {
-    it('should project exactly the fields the expense report avatar renders from', () => {
+describe('reportAvatarFieldsSelector', () => {
+    it('should project exactly the fields the report-type avatar wrappers render from', () => {
         const report = createReport({
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: 42,
+            chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM,
             policyID: 'policy123',
             policyAvatar: 'https://example.com/policy-avatar.png',
             policyName: 'Policy Name',
             oldPolicyName: 'Old Policy Name',
             chatReportID: 'chatReport123',
-            parentReportID: PARENT_REPORT_ID,
-            // A field the avatar does not read, to prove it is stripped
+            ...threadFields,
+            // A field the avatars do not read, to prove it is stripped
             lastMessageText: 'Hello',
         });
 
-        expect(expenseReportAvatarSelector(report)).toEqual({
+        expect(reportAvatarFieldsSelector(report)).toEqual({
             ownerAccountID: 42,
+            chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM,
             policyID: 'policy123',
             policyAvatar: 'https://example.com/policy-avatar.png',
             policyName: 'Policy Name',
             oldPolicyName: 'Old Policy Name',
             chatReportID: 'chatReport123',
-            parentReportID: PARENT_REPORT_ID,
+            ...threadFields,
         });
     });
 
     it('should return undefined when the report is not in Onyx', () => {
-        expect(expenseReportAvatarSelector(undefined)).toBeUndefined();
+        expect(reportAvatarFieldsSelector(undefined)).toBeUndefined();
     });
 });
 
diff --git a/tests/unit/shouldFollowActionBadgeTargetTest.ts b/tests/unit/shouldFollowActionBadgeTargetTest.ts
index e0ab679a0ce4..eb84959a583f 100644
--- a/tests/unit/shouldFollowActionBadgeTargetTest.ts
+++ b/tests/unit/shouldFollowActionBadgeTargetTest.ts
@@ -1,7 +1,6 @@
 import shouldFollowActionBadgeTarget from '@pages/inbox/report/shouldFollowActionBadgeTarget';
 
 const BASE_PARAMS = {
-    isProduction: false,
     actionTargetReportActionID: '200',
     prevActionTargetReportActionID: '100',
     actionBadgeTargetIndex: 2,
@@ -21,10 +20,6 @@ describe('shouldFollowActionBadgeTarget', () => {
         expect(shouldFollowActionBadgeTarget({...BASE_PARAMS, actionBadgeTargetIndex: 5})).toBe(false);
     });
 
-    it('does not follow in production', () => {
-        expect(shouldFollowActionBadgeTarget({...BASE_PARAMS, isProduction: true})).toBe(false);
-    });
-
     it('does not follow when the target id did not change', () => {
         expect(shouldFollowActionBadgeTarget({...BASE_PARAMS, actionTargetReportActionID: '100'})).toBe(false);
     });
diff --git a/tests/unit/shouldShowRBRIndicatorTest.ts b/tests/unit/shouldShowRBRIndicatorTest.ts
index 21a7f84c9786..b200b3f811b4 100644
--- a/tests/unit/shouldShowRBRIndicatorTest.ts
+++ b/tests/unit/shouldShowRBRIndicatorTest.ts
@@ -9,14 +9,12 @@ const buildItem = (extra: Partial<ListItem> = {}): ListItem => ({text: 'Test Use
 
 describe('shouldShowRBRIndicator', () => {
     it.each([
-        ['an unselected item with a status', true, buildItem({brickRoadIndicator: ERROR}), undefined],
-        ['an item without a status', false, buildItem(), undefined],
-        ['an item with an empty status', false, buildItem({brickRoadIndicator: ''}), undefined],
-        ['a selected item (via the item)', false, buildItem({brickRoadIndicator: ERROR, isSelected: true}), undefined],
-        ['a selected item (via the override)', false, buildItem({brickRoadIndicator: ERROR}), true],
-        ['an unselected override beating a selected item', true, buildItem({brickRoadIndicator: ERROR, isSelected: true}), false],
-        ['a selected item that can show several indicators', true, buildItem({brickRoadIndicator: ERROR, isSelected: true, canShowSeveralIndicators: true}), undefined],
-    ])('shows the indicator for %s: %s', (_label, expected, item, isSelected) => {
-        expect(shouldShowRBRIndicator(item, isSelected)).toBe(expected);
+        ['an unselected item with a status', true, buildItem({brickRoadIndicator: ERROR})],
+        ['an item without a status', false, buildItem()],
+        ['an item with an empty status', false, buildItem({brickRoadIndicator: ''})],
+        ['a selected item', false, buildItem({brickRoadIndicator: ERROR, isSelected: true})],
+        ['a selected item that can show several indicators', true, buildItem({brickRoadIndicator: ERROR, isSelected: true, canShowSeveralIndicators: true})],
+    ])('shows the indicator for %s: %s', (_label, expected, item) => {
+        expect(shouldShowRBRIndicator(item)).toBe(expected);
     });
 });
diff --git a/tests/unit/useListItemHighlightTest.ts b/tests/unit/useListItemHighlightTest.ts
deleted file mode 100644
index 5854b6965791..000000000000
--- a/tests/unit/useListItemHighlightTest.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import {renderHook} from '@testing-library/react-native';
-
-import useListItemHighlight from '@components/SelectionList/ListItemComposed/hooks/useListItemHighlight';
-
-import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-const animatedHighlightStyleMock = {backgroundColor: 'animated-highlight'};
-jest.mock('@hooks/useAnimatedHighlightStyle', () => jest.fn(() => animatedHighlightStyleMock));
-
-const mockUseAnimatedHighlightStyle = jest.mocked(useAnimatedHighlightStyle);
-
-type HookParams = Parameters<typeof useListItemHighlight>[0];
-
-function renderHighlightHook(params?: HookParams) {
-    const {result} = renderHook(() => ({
-        styles: useThemeStyles(),
-        theme: useTheme(),
-        highlight: useListItemHighlight(params),
-    }));
-    return result.current;
-}
-
-describe('useListItemHighlight', () => {
-    beforeEach(() => {
-        mockUseAnimatedHighlightStyle.mockClear();
-    });
-
-    it.each<[string, HookParams]>([
-        ['unselected', {shouldHighlight: true}],
-        ['selected', {shouldHighlight: true, isSelected: true}],
-    ])('configures the animation with the selection list border radius, the resting background and full style application when %s', (_name, params) => {
-        const {styles, theme} = renderHighlightHook(params);
-
-        expect(mockUseAnimatedHighlightStyle).toHaveBeenCalledWith({
-            borderRadius: styles.selectionListPressableItemWrapper.borderRadius,
-            shouldHighlight: true,
-            highlightColor: theme.messageHighlightBG,
-            backgroundColor: theme.highlightBG,
-            shouldApplyOtherStyles: true,
-        });
-    });
-
-    it('rests on the wrapper style and margins, staying transparent for the animated background', () => {
-        const {styles, highlight} = renderHighlightHook();
-
-        expect(highlight.pressableStyle).toContain(styles.selectionListPressableItemWrapper);
-        expect(highlight.pressableStyle).toContain(styles.mh0);
-        // Unconditional even when not highlighting: the highlight flag resets mid-animation, so an opaque
-        // background here would mask the still-running animation on the wrapper underneath.
-        expect(highlight.pressableStyle).toContain(styles.bgTransparent);
-        expect(highlight.pressableWrapperStyle).toContain(styles.mh5);
-        expect(highlight.pressableWrapperStyle).toContain(animatedHighlightStyleMock);
-    });
-
-    it('paints the selected background when selected', () => {
-        const {styles, highlight} = renderHighlightHook({isSelected: true});
-
-        expect(highlight.pressableStyle).toContain(styles.activeComponentBG);
-    });
-
-    it('returns the animated highlight style for rows that own their pressable layout', () => {
-        const {highlight} = renderHighlightHook();
-
-        expect(highlight.animatedHighlightStyle).toBe(animatedHighlightStyleMock);
-    });
-});
diff --git a/tests/unit/useLoadPolicyCategoriesAndTagsTest.ts b/tests/unit/useLoadPolicyCategoriesAndTagsTest.ts
new file mode 100644
index 000000000000..12606399c037
--- /dev/null
+++ b/tests/unit/useLoadPolicyCategoriesAndTagsTest.ts
@@ -0,0 +1,84 @@
+import {renderHook, waitFor} from '@testing-library/react-native';
+
+import useLoadPolicyCategories from '@hooks/useLoadPolicyCategories';
+import useLoadPolicyTags from '@hooks/useLoadPolicyTags';
+
+import type * as PolicyCategory from '@libs/actions/Policy/Category';
+import type * as PolicyTag from '@libs/actions/Policy/Tag';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+
+import Onyx from 'react-native-onyx';
+
+/**
+ * Both hooks own the picker's loading flag. Without a policyID no read is ever dispatched, so the loading state key
+ * stays absent forever and the flag has to settle on false, otherwise the picker sits on a skeleton for good.
+ */
+
+const POLICY_ID = 'A1B2C3';
+
+const mockGetPolicyCategories = jest.fn<void, [string]>();
+const mockOpenPolicyTagsPage = jest.fn<void, [string]>();
+
+jest.mock('@libs/actions/Policy/Category', () => {
+    const actual = jest.requireActual<typeof PolicyCategory>('@libs/actions/Policy/Category');
+    return {
+        ...actual,
+        getPolicyCategories: (policyID: string) => mockGetPolicyCategories(policyID),
+    };
+});
+
+jest.mock('@libs/actions/Policy/Tag', () => {
+    const actual = jest.requireActual<typeof PolicyTag>('@libs/actions/Policy/Tag');
+    return {
+        ...actual,
+        openPolicyTagsPage: (policyID: string) => mockOpenPolicyTagsPage(policyID),
+    };
+});
+
+const hooks = [
+    {
+        name: 'useLoadPolicyCategories',
+        renderPicker: (policyID: string | undefined) => renderHook(() => useLoadPolicyCategories(policyID)),
+        getIsLoading: (result: {isLoadingPolicyCategories?: boolean; isLoadingPolicyTags?: boolean}) => result.isLoadingPolicyCategories,
+        mockRead: mockGetPolicyCategories,
+    },
+    {
+        name: 'useLoadPolicyTags',
+        renderPicker: (policyID: string | undefined) => renderHook(() => useLoadPolicyTags(policyID)),
+        getIsLoading: (result: {isLoadingPolicyCategories?: boolean; isLoadingPolicyTags?: boolean}) => result.isLoadingPolicyTags,
+        mockRead: mockOpenPolicyTagsPage,
+    },
+] as const;
+
+describe.each(hooks)('$name', ({renderPicker, getIsLoading, mockRead}) => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        mockRead.mockClear();
+        await Onyx.clear();
+    });
+
+    it.each([undefined, ''])('settles on not-loading and dispatches no read when policyID is %p', async (policyID) => {
+        const {result} = renderPicker(policyID);
+
+        // The flag is read on the very first render, before any Onyx subscription can settle, so it must already be
+        // false there. Waiting only guards against it flipping true once the subscriptions land.
+        expect(getIsLoading(result.current)).toBe(false);
+        await waitFor(() => {
+            expect(getIsLoading(result.current)).toBe(false);
+        });
+        expect(mockRead).not.toHaveBeenCalled();
+    });
+
+    it('reports loading and dispatches a read when a policyID is given and nothing is cached', async () => {
+        const {result} = renderPicker(POLICY_ID);
+
+        await waitFor(() => {
+            expect(mockRead).toHaveBeenCalledWith(POLICY_ID);
+        });
+        expect(getIsLoading(result.current)).toBe(true);
+    });
+});
diff --git a/tests/unit/useMoneyRequestReportActiveTransactionIDsTest.ts b/tests/unit/useMoneyRequestReportActiveTransactionIDsTest.ts
index c3a76001f7ae..3fb9b4dbc767 100644
--- a/tests/unit/useMoneyRequestReportActiveTransactionIDsTest.ts
+++ b/tests/unit/useMoneyRequestReportActiveTransactionIDsTest.ts
@@ -2,7 +2,7 @@ import {renderHook} from '@testing-library/react-native';
 
 import useMoneyRequestReportActiveTransactionIDs from '@components/MoneyRequestReportView/useMoneyRequestReportActiveTransactionIDs';
 
-import {clearActiveTransactionIDs, getActiveTransactionIDs, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
+import {clearActiveTransactionIDsForSource, getActiveTransactionIDs, setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
 import {navigationRef} from '@libs/Navigation/Navigation';
 
 import SCREENS from '@src/SCREENS';
@@ -15,8 +15,9 @@ import createMock from '../utils/createMock';
 // Mock the TransactionThreadNavigation module
 jest.mock('@libs/actions/TransactionThreadNavigation', () => ({
     setActiveTransactionIDs: jest.fn(() => Promise.resolve()),
-    clearActiveTransactionIDs: jest.fn(() => Promise.resolve()),
-    getActiveTransactionIDs: jest.fn(() => ({ids: null, descriptors: null})),
+    clearActiveTransactionIDsForSource: jest.fn(() => Promise.resolve()),
+    getActiveTransactionIDs: jest.fn(() => ({ids: null, descriptors: null, source: null})),
+    CAROUSEL_SOURCE: {report: (reportID: string | undefined) => `report:${reportID}`},
 }));
 
 // Mock the navigation module
@@ -34,16 +35,19 @@ jest.mock('@react-navigation/native', () => ({
     useFocusEffect: jest.fn(),
 }));
 
+const REPORT_ID = 'reportA';
+const CAROUSEL_SOURCE_FOR_REPORT = `report:${REPORT_ID}`;
+
 describe('useMoneyRequestReportActiveTransactionIDs', () => {
     const mockSetActiveTransactionIDs = jest.mocked(setActiveTransactionIDs);
-    const mockClearActiveTransactionIDs = jest.mocked(clearActiveTransactionIDs);
+    const mockClearActiveTransactionIDsForSource = jest.mocked(clearActiveTransactionIDsForSource);
     const mockGetActiveTransactionIDs = jest.mocked(getActiveTransactionIDs);
     const mockFindFocusedRoute = jest.mocked(findFocusedRoute);
     const mockGetRootState = jest.spyOn(navigationRef, 'getRootState');
 
     beforeEach(() => {
         jest.clearAllMocks();
-        mockGetActiveTransactionIDs.mockReturnValue({ids: null, descriptors: null});
+        mockGetActiveTransactionIDs.mockReturnValue({ids: null, descriptors: null, source: null, snapshotHash: null});
         mockGetRootState.mockReturnValue(createMock<NonNullable<ReturnType<typeof navigationRef.getRootState>>>({}));
     });
 
@@ -54,10 +58,10 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
         const transactionIDs = ['trans1', 'trans2', 'trans3'];
 
         // When the hook is rendered
-        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
-        // Then setActiveTransactionIDs should be called with the transaction IDs
-        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith(transactionIDs);
+        // Then setActiveTransactionIDs should be called with the transaction IDs, stamped with this report's source
+        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith(transactionIDs, {source: CAROUSEL_SOURCE_FOR_REPORT});
     });
 
     it('should NOT call setActiveTransactionIDs when focused route is NOT SEARCH_REPORT', () => {
@@ -67,7 +71,7 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
         const transactionIDs = ['trans1', 'trans2'];
 
         // When the hook is rendered
-        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
         // Then setActiveTransactionIDs should NOT be called
         expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
@@ -77,45 +81,62 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
         // Given there is no focused route
         mockFindFocusedRoute.mockReturnValue(undefined);
 
-        const transactionIDs = ['trans1'];
+        const transactionIDs = ['trans1', 'trans2'];
 
         // When the hook is rendered
-        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
         // Then setActiveTransactionIDs should NOT be called
         expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
     });
 
-    it('should call clearActiveTransactionIDs on unmount when route was SEARCH_REPORT', () => {
+    // A report with one expense (or none) has nothing to page between. Seeding it would clobber the broader carousel
+    // the user drilled in from, and leave the header rendering an empty expense carousel.
+    it.each([
+        ['a single transaction', ['trans1']],
+        ['no transactions', [] as string[]],
+    ])('should NOT seed the carousel for a report with %s', (_label, transactionIDs) => {
+        // Given the focused route is SEARCH_REPORT
+        mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
+
+        // When the hook is rendered for a report that has nothing to page between
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
+
+        // Then nothing is written through
+        expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
+    });
+
+    it('should release the carousel on unmount when route was SEARCH_REPORT', () => {
         // Given the focused route is SEARCH_REPORT
         mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
 
         const transactionIDs = ['trans1', 'trans2'];
 
         // When the hook is rendered and then unmounted
-        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
-        expect(mockClearActiveTransactionIDs).not.toHaveBeenCalled();
+        expect(mockClearActiveTransactionIDsForSource).not.toHaveBeenCalled();
 
         unmount();
 
-        // Then clearActiveTransactionIDs should be called
-        expect(mockClearActiveTransactionIDs).toHaveBeenCalledTimes(1);
+        // Then it should release only its own carousel, not whatever is active
+        expect(mockClearActiveTransactionIDsForSource).toHaveBeenCalledTimes(1);
+        expect(mockClearActiveTransactionIDsForSource).toHaveBeenCalledWith(CAROUSEL_SOURCE_FOR_REPORT);
     });
 
-    it('should NOT call clearActiveTransactionIDs on unmount when route was NOT SEARCH_REPORT', () => {
+    it('should NOT release the carousel on unmount when route was NOT SEARCH_REPORT', () => {
         // Given the focused route is NOT SEARCH_REPORT
         mockFindFocusedRoute.mockReturnValue({name: 'SomeOtherRoute', key: 'test-key'});
 
-        const transactionIDs = ['trans1'];
+        const transactionIDs = ['trans1', 'trans2'];
 
         // When the hook is rendered and then unmounted
-        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
         unmount();
 
-        // Then clearActiveTransactionIDs should NOT be called (since the effect returned early, no cleanup was registered)
-        expect(mockClearActiveTransactionIDs).not.toHaveBeenCalled();
+        // Then nothing was seeded, so nothing should be released
+        expect(mockClearActiveTransactionIDsForSource).not.toHaveBeenCalled();
     });
 
     it('should update active transaction IDs when the list changes', () => {
@@ -125,12 +146,12 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
         const initialTransactionIDs = ['trans1', 'trans2'];
 
         // When the hook is rendered
-        const {rerender} = renderHook(({ids}) => useMoneyRequestReportActiveTransactionIDs(ids), {
+        const {rerender} = renderHook(({ids}) => useMoneyRequestReportActiveTransactionIDs(ids, REPORT_ID), {
             initialProps: {ids: initialTransactionIDs},
         });
 
         expect(mockSetActiveTransactionIDs).toHaveBeenCalledTimes(1);
-        expect(mockSetActiveTransactionIDs).toHaveBeenLastCalledWith(initialTransactionIDs);
+        expect(mockSetActiveTransactionIDs).toHaveBeenLastCalledWith(initialTransactionIDs, {source: CAROUSEL_SOURCE_FOR_REPORT});
 
         // When the transaction IDs change
         const newTransactionIDs = ['trans1', 'trans2', 'trans3'];
@@ -138,23 +159,28 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
 
         // Then setActiveTransactionIDs should be called again with the new IDs
         expect(mockSetActiveTransactionIDs).toHaveBeenCalledTimes(2);
-        expect(mockSetActiveTransactionIDs).toHaveBeenLastCalledWith(newTransactionIDs);
+        expect(mockSetActiveTransactionIDs).toHaveBeenLastCalledWith(newTransactionIDs, {source: CAROUSEL_SOURCE_FOR_REPORT});
     });
 
-    it('should clear the previous seed before re-seeding when the rows change', () => {
+    /**
+     * Regression guard for https://github.com/Expensify/App/issues/99630: teardown used to be the seeding effect's
+     * own cleanup, so React ran it on every re-seed. Any run that then bailed out at a guard left the carousel
+     * cleared, and the arrows vanished after an action that changed the report's transactions (duplicating an
+     * expense, for instance).
+     */
+    it('should NOT release the carousel while re-seeding it', () => {
         // Given the focused route is SEARCH_REPORT and the hook seeded the carousel
         mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
-        const {rerender} = renderHook(({ids}) => useMoneyRequestReportActiveTransactionIDs(ids), {
+
+        const {rerender} = renderHook(({ids}) => useMoneyRequestReportActiveTransactionIDs(ids, REPORT_ID), {
             initialProps: {ids: ['trans1', 'trans2']},
         });
 
-        // When the rows change
-        rerender({ids: ['trans1']});
+        // When the rows change and the carousel is re-seeded
+        rerender({ids: ['trans1', 'trans2', 'trans3']});
 
-        // Then the old seed is cleared by the effect cleanup before the new one is written
-        expect(mockClearActiveTransactionIDs).toHaveBeenCalledTimes(1);
-        expect(mockClearActiveTransactionIDs.mock.invocationCallOrder.at(0)).toBeLessThan(mockSetActiveTransactionIDs.mock.invocationCallOrder.at(1) ?? 0);
-        expect(mockSetActiveTransactionIDs).toHaveBeenLastCalledWith(['trans1']);
+        // Then the carousel is never released in between, so the arrows stay on screen
+        expect(mockClearActiveTransactionIDsForSource).not.toHaveBeenCalled();
     });
 
     it('should NOT re-fire when array reference changes but content is the same', () => {
@@ -164,7 +190,7 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
         const initialTransactionIDs = ['trans1', 'trans2'];
 
         // When the hook is rendered
-        const {rerender} = renderHook(({ids}) => useMoneyRequestReportActiveTransactionIDs(ids), {
+        const {rerender} = renderHook(({ids}) => useMoneyRequestReportActiveTransactionIDs(ids, REPORT_ID), {
             initialProps: {ids: initialTransactionIDs},
         });
 
@@ -177,7 +203,7 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
         // Then the effect should NOT re-fire because the join(',') key hasn't changed.
         // This prevents overwriting IDs set by other callers (e.g. TransactionDuplicateReview.onPreviewPressed).
         expect(mockSetActiveTransactionIDs).toHaveBeenCalledTimes(1);
-        expect(mockClearActiveTransactionIDs).not.toHaveBeenCalled();
+        expect(mockClearActiveTransactionIDsForSource).not.toHaveBeenCalled();
     });
 
     it('should NOT take over a snapshot-backed carousel that already has sibling descriptors', () => {
@@ -186,63 +212,104 @@ describe('useMoneyRequestReportActiveTransactionIDs', () => {
         mockGetActiveTransactionIDs.mockReturnValue({
             ids: ['recentlyAdded1', 'recentlyAdded2'],
             descriptors: {recentlyAdded1: {reportID: 'r1', transaction: {...createRandomTransaction(1), transactionID: 'recentlyAdded1'}}},
+            source: 'home:recentlyAdded',
+            snapshotHash: null,
         });
 
         const transactionIDs = ['trans1', 'trans2', 'trans3'];
 
         // When the hook is rendered and then unmounted
-        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
         // Then it should neither overwrite nor clear the existing carousel context
         expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
 
         unmount();
 
-        expect(mockClearActiveTransactionIDs).not.toHaveBeenCalled();
+        expect(mockClearActiveTransactionIDsForSource).not.toHaveBeenCalled();
     });
 
     it('should keep an active seed that covers the same rows in a different order', () => {
         // Given the focused route is SEARCH_REPORT and a report preview press seeded the same rows in carousel order
         mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
-        mockGetActiveTransactionIDs.mockReturnValue({ids: ['trans3', 'trans1', 'trans2'], descriptors: null});
+        mockGetActiveTransactionIDs.mockReturnValue({ids: ['trans3', 'trans1', 'trans2'], descriptors: null, source: null, snapshotHash: null});
 
         const transactionIDs = ['trans1', 'trans2', 'trans3'];
 
         // When the hook is rendered and then unmounted
-        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        const {unmount} = renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
         // Then it should neither overwrite the carousel order nor clear it
         expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
 
         unmount();
 
-        expect(mockClearActiveTransactionIDs).not.toHaveBeenCalled();
+        expect(mockClearActiveTransactionIDsForSource).not.toHaveBeenCalled();
     });
 
-    it('should re-seed when the active seed covers different rows', () => {
-        // Given the focused route is SEARCH_REPORT and the active seed is missing one of the rows
+    it('should re-seed a carousel it owns when the same rows are re-ordered', () => {
+        // Given the focused route is SEARCH_REPORT and this report owns a seed holding exactly these rows, in the
+        // order they were rendered before the user sorted a column
         mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
-        mockGetActiveTransactionIDs.mockReturnValue({ids: ['trans2', 'trans1'], descriptors: null});
+        mockGetActiveTransactionIDs.mockReturnValue({ids: ['trans1', 'trans2', 'trans3'], descriptors: null, source: CAROUSEL_SOURCE_FOR_REPORT, snapshotHash: null});
 
-        const transactionIDs = ['trans1', 'trans2', 'trans3'];
+        const sortedTransactionIDs = ['trans3', 'trans1', 'trans2'];
+
+        // When the rows come back in a different order
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(sortedTransactionIDs, REPORT_ID));
+
+        // Then the new order is written through: the arrows walk the rows the user is looking at, so a seed this
+        // list owns has to follow the rendered order rather than stay frozen at the order it was first seeded in
+        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith(sortedTransactionIDs, {source: CAROUSEL_SOURCE_FOR_REPORT});
+    });
+
+    it('should NOT take over a carousel it does not own with fewer than two rows', () => {
+        // Given the focused route is SEARCH_REPORT, a broader carousel is active, and this report has one row left
+        mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
+        mockGetActiveTransactionIDs.mockReturnValue({ids: ['spend1', 'spend2', 'spend3'], descriptors: null, source: 'search:1234', snapshotHash: 1234});
 
         // When the hook is rendered
-        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs));
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(['trans1'], REPORT_ID));
 
-        // Then setActiveTransactionIDs should be called with the visual order
-        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith(transactionIDs);
+        // Then the broader carousel is left alone
+        expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
     });
 
-    it('should handle empty transaction IDs array', () => {
-        // Given the focused route is SEARCH_REPORT
+    it('should shrink a carousel it owns when the report drops below two rows', () => {
+        // Given the focused route is SEARCH_REPORT and this report owns a two-entry carousel
+        mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
+        mockGetActiveTransactionIDs.mockReturnValue({ids: ['trans1', 'trans2'], descriptors: null, source: CAROUSEL_SOURCE_FOR_REPORT, snapshotHash: null});
+
+        // When one of the expenses leaves the report (e.g. it was moved to another report)
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(['trans1'], REPORT_ID));
+
+        // Then the shorter list is written through, so the counter and arrows stop offering the expense that left
+        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith(['trans1'], {source: CAROUSEL_SOURCE_FOR_REPORT});
+    });
+
+    it('should NOT write an empty list over a carousel it owns', () => {
+        // Given the focused route is SEARCH_REPORT and this report owns the carousel
+        mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
+        mockGetActiveTransactionIDs.mockReturnValue({ids: ['trans1', 'trans2'], descriptors: null, source: CAROUSEL_SOURCE_FOR_REPORT, snapshotHash: null});
+
+        // When the report renders with no rows at all
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs([], REPORT_ID));
+
+        // Then nothing is written: an empty list carries no information the header can act on
+        expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
+    });
+
+    it('should re-seed when the active seed covers different rows', () => {
+        // Given the focused route is SEARCH_REPORT and the active seed is missing one of the rows
         mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
+        mockGetActiveTransactionIDs.mockReturnValue({ids: ['trans2', 'trans1'], descriptors: null, source: null, snapshotHash: null});
 
-        const emptyTransactionIDs: string[] = [];
+        const transactionIDs = ['trans1', 'trans2', 'trans3'];
 
-        // When the hook is rendered with empty array
-        renderHook(() => useMoneyRequestReportActiveTransactionIDs(emptyTransactionIDs));
+        // When the hook is rendered
+        renderHook(() => useMoneyRequestReportActiveTransactionIDs(transactionIDs, REPORT_ID));
 
-        // Then setActiveTransactionIDs should be called with empty array
-        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith([]);
+        // Then setActiveTransactionIDs should be called with the visual order, stamped with this report's source
+        expect(mockSetActiveTransactionIDs).toHaveBeenCalledWith(transactionIDs, {source: CAROUSEL_SOURCE_FOR_REPORT});
     });
 });
diff --git a/tests/unit/useMoneyRequestReportPendingExpenseTest.ts b/tests/unit/useMoneyRequestReportPendingExpenseTest.ts
new file mode 100644
index 000000000000..606136c2f76a
--- /dev/null
+++ b/tests/unit/useMoneyRequestReportPendingExpenseTest.ts
@@ -0,0 +1,236 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useMoneyRequestReportPendingExpense from '@components/MoneyRequestReportView/useMoneyRequestReportPendingExpense';
+
+import type {SubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
+
+import CONST from '@src/CONST';
+import type {Transaction} from '@src/types/onyx';
+
+import type * as ReactNavigationNative from '@react-navigation/native';
+
+import createRandomTransaction from '../utils/collections/transaction';
+
+type FocusCallback = () => void | (() => void);
+
+type PendingSubmit = {followUpAction: SubmitFollowUpAction; reportID?: string} | null;
+
+const mockUseFocusEffect = jest.fn<void, [FocusCallback]>();
+
+jest.mock('@react-navigation/native', () => ({
+    ...jest.requireActual<typeof ReactNavigationNative>('@react-navigation/native'),
+    useFocusEffect: (callback: FocusCallback) => {
+        mockUseFocusEffect(callback);
+    },
+}));
+
+const mockGetPendingSubmitFollowUpAction = jest.fn<PendingSubmit, []>(() => null);
+
+jest.mock('@libs/telemetry/submitFollowUpAction', () => ({
+    getPendingSubmitFollowUpAction: () => mockGetPendingSubmitFollowUpAction(),
+}));
+
+const mockIsReportOpenInSuperWideRHP = jest.fn(() => true);
+
+jest.mock('@navigation/helpers/isReportOpenInSuperWideRHP', () => ({
+    __esModule: true,
+    default: () => mockIsReportOpenInSuperWideRHP(),
+}));
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigationRef: {
+        getRootState: jest.fn(),
+    },
+}));
+
+const REPORT_ID = '1';
+
+let transactionSequence = 0;
+
+function buildTransaction(pendingAction?: Transaction['pendingAction']): Transaction {
+    transactionSequence += 1;
+    return {
+        ...createRandomTransaction(transactionSequence),
+        transactionID: `${transactionSequence}`,
+        reportID: REPORT_ID,
+        pendingAction,
+        pendingFields: undefined,
+    };
+}
+
+function mockPendingSubmitThatWouldShowPlaceholder() {
+    mockGetPendingSubmitFollowUpAction.mockReturnValue({
+        followUpAction: CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.DISMISS_MODAL_ONLY,
+        reportID: REPORT_ID,
+    });
+}
+
+function getFocusCallback(): FocusCallback {
+    const callback = mockUseFocusEffect.mock.calls.at(-1)?.[0];
+    if (!callback) {
+        throw new Error('useFocusEffect was not called');
+    }
+    return callback;
+}
+
+function refocus() {
+    act(() => {
+        getFocusCallback()();
+    });
+}
+
+beforeEach(() => {
+    jest.clearAllMocks();
+    transactionSequence = 0;
+    mockGetPendingSubmitFollowUpAction.mockReturnValue(null);
+    mockIsReportOpenInSuperWideRHP.mockReturnValue(true);
+});
+
+describe('useMoneyRequestReportPendingExpense', () => {
+    it('shows the placeholder on focus when a submit is awaiting its deferred write in a super-wide RHP', () => {
+        // Given a report whose submit is waiting out the safety timeout before the IOU write is
+        // forwarded, with transactions on screen but no new one yet
+        mockPendingSubmitThatWouldShowPlaceholder();
+        const {result} = renderHook(() => useMoneyRequestReportPendingExpense(REPORT_ID, [buildTransaction()]));
+
+        // When the screen gains focus - the moment the user would otherwise see the approved report
+        // without the expense they just submitted
+        refocus();
+
+        // Then a placeholder stands in for the expense the backend has accepted but the client
+        // cannot render yet, so the list does not look like the submit was ignored
+        expect(result.current).toBe(true);
+    });
+
+    it('does not show the placeholder when no submit is awaiting its deferred write', () => {
+        // Given this report was opened normally, with no deferred submit pending
+        mockGetPendingSubmitFollowUpAction.mockReturnValue(null);
+        const {result} = renderHook(() => useMoneyRequestReportPendingExpense(REPORT_ID, [buildTransaction()]));
+
+        // When
+        refocus();
+
+        // Then nothing is faked - the transactions reported by the backend are the whole truth
+        expect(result.current).toBe(false);
+    });
+
+    it('does not show the placeholder for a deferred submit made on another report', () => {
+        // Given a deferred submit exists, but for a different report than the one now focused
+        mockGetPendingSubmitFollowUpAction.mockReturnValue({
+            followUpAction: CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.DISMISS_MODAL_ONLY,
+            reportID: '2',
+        });
+        const {result} = renderHook(() => useMoneyRequestReportPendingExpense(REPORT_ID, [buildTransaction()]));
+
+        // When
+        refocus();
+
+        // Then this report stays clean rather than borrowing another report's pending expense
+        expect(result.current).toBe(false);
+    });
+
+    it('does not show the placeholder for a follow-up action that forwards the write immediately', () => {
+        // Given the dismissed modal was going to open the report or navigate to search, so the write
+        // is forwarded instead of deferred
+        mockGetPendingSubmitFollowUpAction.mockReturnValue({
+            followUpAction: CONST.TELEMETRY.SUBMIT_FOLLOW_UP_ACTION.DISMISS_MODAL_AND_OPEN_REPORT,
+            reportID: REPORT_ID,
+        });
+        const {result} = renderHook(() => useMoneyRequestReportPendingExpense(REPORT_ID, [buildTransaction()]));
+
+        // When
+        refocus();
+
+        // Then
+        expect(result.current).toBe(false);
+    });
+
+    it('does not show the placeholder when the report is not open in a super-wide RHP', () => {
+        // Given the deferred submit is pending, but the report is not visible next to the modal -
+        // full-screen flows already hide the stale list behind the modal
+        mockPendingSubmitThatWouldShowPlaceholder();
+        mockIsReportOpenInSuperWideRHP.mockReturnValue(false);
+        const {result} = renderHook(() => useMoneyRequestReportPendingExpense(REPORT_ID, [buildTransaction()]));
+
+        // When
+        refocus();
+
+        // Then
+        expect(result.current).toBe(false);
+        expect(mockIsReportOpenInSuperWideRHP).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not show the placeholder when an optimistically created transaction is already visible', () => {
+        // Given the deferred submit is pending, but the user created a transaction that is already
+        // on screen optimistically
+        mockPendingSubmitThatWouldShowPlaceholder();
+        const {result} = renderHook(() => useMoneyRequestReportPendingExpense(REPORT_ID, [buildTransaction(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD)]));
+
+        // When
+        refocus();
+
+        // Then no placeholder is added, because it would duplicate a transaction the user can see
+        expect(result.current).toBe(false);
+    });
+
+    it('keeps the placeholder shown while the pending transaction has not arrived', () => {
+        // Given the placeholder is up for a deferred submit
+        mockPendingSubmitThatWouldShowPlaceholder();
+        const transactions = [buildTransaction()];
+        const {result, rerender} = renderHook(({transactions: current}) => useMoneyRequestReportPendingExpense(REPORT_ID, current), {
+            initialProps: {transactions},
+        });
+
+        refocus();
+        expect(result.current).toBe(true);
+
+        // When the screen is refocused after the safety timeout expired without the backend sending
+        // the new transaction, so the count has not grown
+        mockGetPendingSubmitFollowUpAction.mockReturnValue(null);
+        rerender({transactions: [...transactions]});
+        refocus();
+
+        // Then the placeholder stays: the hook cannot tell a lost write from a slow one, so it keeps
+        // showing a pending expense rather than implying the submit failed
+        expect(result.current).toBe(true);
+    });
+
+    it('removes the placeholder once an optimistically created transaction arrives', () => {
+        // Given the placeholder is up for a deferred submit
+        mockPendingSubmitThatWouldShowPlaceholder();
+        const transactions = [buildTransaction()];
+        const {result, rerender} = renderHook(({transactions: current}) => useMoneyRequestReportPendingExpense(REPORT_ID, current), {
+            initialProps: {transactions},
+        });
+
+        refocus();
+        expect(result.current).toBe(true);
+
+        // When the user creates a transaction in the meantime, so a real row is now on screen
+        rerender({transactions: [...transactions, buildTransaction(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD)]});
+        refocus();
+
+        // Then the placeholder yields to the real transaction instead of showing the expense twice
+        expect(result.current).toBe(false);
+    });
+
+    it('removes the placeholder when the transaction count grows past the one captured at display time', () => {
+        // Given the placeholder is up with one transaction on screen
+        mockPendingSubmitThatWouldShowPlaceholder();
+        const transactions = [buildTransaction()];
+        const {result, rerender} = renderHook(({transactions: current}) => useMoneyRequestReportPendingExpense(REPORT_ID, current), {
+            initialProps: {transactions},
+        });
+
+        refocus();
+        expect(result.current).toBe(true);
+
+        // When more transactions than were present at display time arrive without offline feedback -
+        // the heuristic for "the deferred write landed, and there may be more"
+        rerender({transactions: [...transactions, buildTransaction(), buildTransaction()]});
+        refocus();
+
+        // Then the real transactions are trusted over the placeholder
+        expect(result.current).toBe(false);
+    });
+});
diff --git a/tests/unit/useMoneyRequestReportScrollTest.tsx b/tests/unit/useMoneyRequestReportScrollTest.tsx
index 776b75d9655f..8c2e0270e4e3 100644
--- a/tests/unit/useMoneyRequestReportScrollTest.tsx
+++ b/tests/unit/useMoneyRequestReportScrollTest.tsx
@@ -483,11 +483,13 @@ describe('useMoneyRequestReportScroll', () => {
                 jest.advanceTimersByTime(100);
             });
 
-            // Then the list follows the user's own message, the delay giving the item time to land in the data
+            // Then the list follows the user's own message, the delay giving the item time to land in the data, and the
+            // pill is dismissed because the list is heading to the newest message
             expect(mockScrollToIndex).toHaveBeenCalledWith(LAST_ITEM_INDEX, {animated: false, viewPosition: 1});
+            expect(mockSetIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
         });
 
-        it('should not move the list when someone else sends a comment', async () => {
+        it('should not move the list or hide the pill when someone else sends a comment', async () => {
             // Given a list scrolled away from the bottom
             const {result} = await renderScroll();
             applyLayoutAndScroll(result, BOTTOM_OFFSET_AT_TOP);
@@ -498,9 +500,9 @@ describe('useMoneyRequestReportScroll', () => {
                 jest.advanceTimersByTime(100);
             });
 
-            // Then the reader's position is left alone, and only the pill is dismissed
+            // Then the reader's position is left alone and the pill stays, so the reader can still see a new message arrived
             expect(mockScrollToIndex).not.toHaveBeenCalled();
-            expect(mockSetIsFloatingMessageCounterVisible).toHaveBeenCalledWith(false);
+            expect(mockSetIsFloatingMessageCounterVisible).not.toHaveBeenCalled();
         });
 
         it('should not move the list for an own action that is not a comment', async () => {
@@ -514,8 +516,9 @@ describe('useMoneyRequestReportScroll', () => {
                 jest.advanceTimersByTime(100);
             });
 
-            // Then the list does not jump, because expense rows scroll through their own flow
+            // Then the list does not jump and the pill stays, because expense rows scroll through their own flow
             expect(mockScrollToIndex).not.toHaveBeenCalled();
+            expect(mockSetIsFloatingMessageCounterVisible).not.toHaveBeenCalled();
         });
 
         it('should jump when a comment the user sent lands after the event was handled', async () => {
diff --git a/tests/unit/useMoneyRequestReportTransactionSelectionTest.ts b/tests/unit/useMoneyRequestReportTransactionSelectionTest.ts
new file mode 100644
index 000000000000..cb9b4faf8581
--- /dev/null
+++ b/tests/unit/useMoneyRequestReportTransactionSelectionTest.ts
@@ -0,0 +1,323 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useMoneyRequestReportTransactionSelection from '@components/MoneyRequestReportView/useMoneyRequestReportTransactionSelection';
+
+import {navigationRef} from '@libs/Navigation/Navigation';
+
+import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
+import type {GroupedTransactions, Transaction} from '@src/types/onyx';
+
+import type * as ReactNavigationNative from '@react-navigation/native';
+
+import createRandomTransaction from '../utils/collections/transaction';
+import createMock from '../utils/createMock';
+
+type FocusCallback = () => void | (() => void);
+
+const mockUseFocusEffect = jest.fn<void, [FocusCallback]>();
+
+jest.mock('@react-navigation/native', () => ({
+    ...jest.requireActual<typeof ReactNavigationNative>('@react-navigation/native'),
+    useFocusEffect: (callback: FocusCallback) => {
+        mockUseFocusEffect(callback);
+    },
+}));
+
+let mockSelectedTransactionIDs: string[] = [];
+
+const mockSetSelectedTransactions = jest.fn((ids: string[]) => {
+    mockSelectedTransactionIDs = ids;
+});
+const mockClearSelectedTransactions = jest.fn(() => {
+    mockSelectedTransactionIDs = [];
+});
+
+jest.mock('@components/Search/SearchContext', () => ({
+    __esModule: true,
+    useSearchSelectionContext: () => ({selectedTransactionIDs: mockSelectedTransactionIDs}),
+    useSearchSelectionActions: () => ({
+        setSelectedTransactions: mockSetSelectedTransactions,
+        clearSelectedTransactions: mockClearSelectedTransactions,
+    }),
+}));
+
+jest.mock('@hooks/useHandleSelectionMode', () => ({__esModule: true, default: jest.fn()}));
+jest.mock('@hooks/useMobileSelectionMode', () => ({__esModule: true, default: jest.fn(() => false)}));
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    navigationRef: {
+        getRootState: jest.fn(),
+    },
+}));
+
+const REPORT_ID = '1';
+
+const mockGetRootState = jest.spyOn(navigationRef, 'getRootState');
+
+let transactionSequence = 0;
+
+function buildTransaction(pendingAction?: Transaction['pendingAction']): Transaction {
+    transactionSequence += 1;
+    return {
+        ...createRandomTransaction(transactionSequence),
+        transactionID: `${transactionSequence}`,
+        reportID: REPORT_ID,
+        pendingAction,
+        pendingFields: undefined,
+    };
+}
+
+function buildGroup(groupKey: string, transactions: Transaction[]): GroupedTransactions {
+    return createMock<GroupedTransactions>({groupKey, transactions});
+}
+
+/** A grouped list renders its groups in order, so that is the order a range spans. */
+function selectionParams(groupedTransactions: GroupedTransactions[], reportID: string = REPORT_ID) {
+    return {reportID, groupedTransactions, visualOrderTransactions: groupedTransactions.flatMap((group) => group.transactions)};
+}
+
+function getFocusCallback(): FocusCallback {
+    const callback = mockUseFocusEffect.mock.calls.at(-1)?.[0];
+    if (!callback) {
+        throw new Error('useFocusEffect was not called');
+    }
+    return callback;
+}
+
+function blur() {
+    const cleanup = getFocusCallback()();
+    act(() => {
+        cleanup?.();
+    });
+}
+
+function rootStateWithTopRoute(routeName: string): ReactNavigationNative.NavigationState {
+    return createMock<ReactNavigationNative.NavigationState>({routes: [{name: routeName}]});
+}
+
+beforeEach(() => {
+    jest.clearAllMocks();
+    transactionSequence = 0;
+    mockSelectedTransactionIDs = [];
+    mockGetRootState.mockReturnValue(rootStateWithTopRoute('SomeOtherNavigator'));
+});
+
+describe('useMoneyRequestReportTransactionSelection', () => {
+    it('clears the selection when the report changes', () => {
+        // Given a report opened with a leftover selection from the previous report
+        const {rerender} = renderHook(({reportID}) => useMoneyRequestReportTransactionSelection(selectionParams([], reportID)), {
+            initialProps: {reportID: REPORT_ID},
+        });
+        mockClearSelectedTransactions.mockClear();
+        mockSelectedTransactionIDs = ['1'];
+
+        // When the user switches to another report
+        rerender({reportID: '2'});
+
+        // Then the selection is dropped, so a transaction of the previous report cannot be paid or
+        // deleted through the new report's action bar
+        expect(mockClearSelectedTransactions).toHaveBeenCalledWith(true);
+        expect(mockSelectedTransactionIDs).toEqual([]);
+    });
+
+    it('clears the selection when leaving the screen', () => {
+        // Given transactions of the report are selected while the screen is focused
+        renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([])));
+        mockClearSelectedTransactions.mockClear();
+        mockSelectedTransactionIDs = ['1'];
+
+        // When the user navigates away to a plain screen
+        blur();
+
+        // Then
+        expect(mockClearSelectedTransactions).toHaveBeenCalledWith(true);
+        expect(mockSelectedTransactionIDs).toEqual([]);
+    });
+
+    it('keeps the selection when the screen is covered by the right modal navigator', () => {
+        // Given transactions of the report are selected while the screen is focused
+        renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([])));
+        mockClearSelectedTransactions.mockClear();
+        mockSelectedTransactionIDs = ['1'];
+        mockGetRootState.mockReturnValue(rootStateWithTopRoute(NAVIGATORS.RIGHT_MODAL_NAVIGATOR));
+
+        // When the user opens a transaction in the right modal, which remove focus from the report list
+        blur();
+
+        // Then the selection survives, otherwise opening a transaction would silently deselect it
+        expect(mockClearSelectedTransactions).not.toHaveBeenCalled();
+        expect(mockSelectedTransactionIDs).toEqual(['1']);
+    });
+
+    it('adds and removes a single transaction from the selection', () => {
+        // Given nothing is selected
+        const first = buildTransaction();
+        const second = buildTransaction();
+        const {result, rerender} = renderHook(({transactions}) => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', transactions)])), {
+            initialProps: {transactions: [first, second]},
+        });
+
+        // When the user taps a transaction row
+        act(() => {
+            result.current.toggleTransaction(first.transactionID);
+        });
+
+        // Then it becomes the only selected transaction
+        expect(mockSetSelectedTransactions).toHaveBeenCalledWith([first.transactionID]);
+        mockSetSelectedTransactions.mockClear();
+
+        // When the context hands the new selection back and the user taps the same row again
+        rerender({transactions: [first, second]});
+        act(() => {
+            result.current.toggleTransaction(first.transactionID);
+        });
+
+        // Then it is removed, leaving the selection empty rather than accumulating duplicates
+        expect(mockSetSelectedTransactions).toHaveBeenCalledWith([]);
+    });
+
+    it('reports whether each transaction is selected', () => {
+        // Given one transaction is selected
+        const first = buildTransaction();
+        const second = buildTransaction();
+        mockSelectedTransactionIDs = [second.transactionID];
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', [first, second])])));
+
+        // When the list asks for the checkbox state of each row
+        // Then only the selected row is checked
+        expect(result.current.isTransactionSelected(first.transactionID)).toBe(false);
+        expect(result.current.isTransactionSelected(second.transactionID)).toBe(true);
+    });
+
+    it('marks a group header as fully selected when every selectable transaction is selected', () => {
+        // Given all transactions of the group are selected
+        const transactions = [buildTransaction(), buildTransaction()];
+        mockSelectedTransactionIDs = transactions.map((t) => t.transactionID);
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', transactions)])));
+
+        // When the section header renders its checkbox
+        // Then it is checked with no indeterminate dash, so tapping it deselects the group
+        expect(result.current.groupSelectionState.get('g1')).toEqual({
+            isSelected: true,
+            isIndeterminate: false,
+            isDisabled: false,
+            pendingAction: undefined,
+        });
+    });
+
+    it('marks a group header as indeterminate when only some transactions are selected', () => {
+        // Given one of two transactions in the group is selected
+        const first = buildTransaction();
+        const second = buildTransaction();
+        mockSelectedTransactionIDs = [first.transactionID];
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', [first, second])])));
+
+        // When
+        // Then the header shows the mixed state, and tapping it selects the rest instead of clearing
+        expect(result.current.groupSelectionState.get('g1')).toEqual({
+            isSelected: false,
+            isIndeterminate: true,
+            isDisabled: false,
+            pendingAction: undefined,
+        });
+    });
+
+    it('excludes transactions pending deletion from the group selection state', () => {
+        // Given the group holds one live transaction and one whose delete is still in flight, and only
+        // the live one is selected
+        const live = buildTransaction();
+        const pendingDelete = buildTransaction(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+        mockSelectedTransactionIDs = [live.transactionID];
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', [live, pendingDelete])])));
+
+        // When the section header renders
+        // Then the group counts as fully selected: the transaction being deleted cannot be selected,
+        // so ignoring it is what makes "select all in group" reachable. The header still shows the
+        // in-flight marker, because a member of the group has an unsynced action.
+        expect(result.current.groupSelectionState.get('g1')).toEqual({
+            isSelected: true,
+            isIndeterminate: false,
+            isDisabled: false,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+        });
+    });
+
+    it('disables a group header whose transactions are all pending deletion', () => {
+        // Given every transaction in the group is being deleted, so there is nothing to select
+        const pendingDeletes = [buildTransaction(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE), buildTransaction(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)];
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', pendingDeletes)])));
+
+        // When
+        // Then the checkbox is disabled rather than offering an empty selection
+        expect(result.current.groupSelectionState.get('g1')).toEqual({
+            isSelected: false,
+            isIndeterminate: false,
+            isDisabled: true,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+        });
+    });
+
+    it('marks a group header as pending while one of its transactions has an unsynced change', () => {
+        // Given one transaction in the group carries an offline update (no pendingAction, only a
+        // pending field), which the pending-action helper reports as an update
+        const first = buildTransaction();
+        const second = buildTransaction();
+        second.pendingFields = {comment: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', [first, second])])));
+
+        // When
+        // Then the header is greyed out with the in-flight indicator, matching how a single
+        // transaction with an unsynced change is shown
+        expect(result.current.groupSelectionState.get('g1')).toEqual({
+            isSelected: false,
+            isIndeterminate: false,
+            isDisabled: false,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+        });
+    });
+
+    it('selects every selectable transaction of a group when its header is tapped with nothing selected', () => {
+        // Given an unselected group that also contains a transaction pending deletion
+        const live = [buildTransaction(), buildTransaction()];
+        const pendingDelete = buildTransaction(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', [...live, pendingDelete])])));
+
+        // When the user taps the group header
+        act(() => {
+            result.current.toggleGroupSelection('g1');
+        });
+
+        // Then the live transactions are selected and the one being deleted is left out
+        expect(mockSetSelectedTransactions).toHaveBeenCalledWith(live.map((t) => t.transactionID));
+    });
+
+    it('deselects a group when its header is tapped with any transaction already selected', () => {
+        // Given a group whose selection is partial
+        const first = buildTransaction();
+        const second = buildTransaction();
+        mockSelectedTransactionIDs = [first.transactionID, 'outside_group'];
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([buildGroup('g1', [first, second])])));
+
+        // When the user taps the group header again
+        act(() => {
+            result.current.toggleGroupSelection('g1');
+        });
+
+        // Then only that group is emptied; selection in other groups is untouched
+        expect(mockSetSelectedTransactions).toHaveBeenCalledWith(['outside_group']);
+    });
+
+    it('ignores a group toggle for a group that is no longer rendered', () => {
+        // Given the group list changed since the header was rendered (e.g. the group-by changed)
+        const {result} = renderHook(() => useMoneyRequestReportTransactionSelection(selectionParams([])));
+
+        // When a stale group key is toggled
+        act(() => {
+            result.current.toggleGroupSelection('gone');
+        });
+
+        // Then nothing is selected, instead of an error or a partial update
+        expect(mockSetSelectedTransactions).not.toHaveBeenCalled();
+    });
+});
diff --git a/tests/unit/useReportActionsScrollTest.tsx b/tests/unit/useReportActionsScrollTest.tsx
index 0cf03c9ff5e6..c3e78bccf919 100644
--- a/tests/unit/useReportActionsScrollTest.tsx
+++ b/tests/unit/useReportActionsScrollTest.tsx
@@ -403,7 +403,7 @@ describe('useReportActionsScroll', () => {
                 result.current.scrollToActionBadgeTarget();
             });
 
-            expect(mockScrollToIndex).toHaveBeenCalledWith(5, {viewPosition: 1, viewOffset: CONST.REPORT.ACTIONS.LINKED_MESSAGE_OFFSET});
+            expect(mockScrollToIndex).toHaveBeenCalledWith(5, {animated: true, viewPosition: 1, viewOffset: CONST.REPORT.ACTIONS.LINKED_MESSAGE_OFFSET});
         });
     });
 
diff --git a/tests/unit/useReportIDToNameMapTest.tsx b/tests/unit/useReportIDToNameMapTest.tsx
new file mode 100644
index 000000000000..966bab252c2c
--- /dev/null
+++ b/tests/unit/useReportIDToNameMapTest.tsx
@@ -0,0 +1,92 @@
+import {act, renderHook} from '@testing-library/react-native';
+
+import useReportIDToNameMap from '@hooks/useReportIDToNameMap';
+
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+
+import Onyx from 'react-native-onyx';
+
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+function createReport(reportID: string, overrides: Partial<Report> = {}): Report {
+    return {
+        reportID,
+        reportName: `Report ${reportID}`,
+        ...overrides,
+    } as Report;
+}
+
+const renderReportIDToNameMap = async () => {
+    const hook = renderHook(() => useReportIDToNameMap());
+    await act(async () => {
+        await waitForBatchedUpdates();
+    });
+    return hook;
+};
+
+describe('useReportIDToNameMap', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(async () => {
+        await Onyx.clear();
+        await waitForBatchedUpdates();
+    });
+
+    it('returns an empty object when reports are not set', async () => {
+        const {result} = await renderReportIDToNameMap();
+        expect(result.current).toEqual({});
+    });
+
+    it('maps reportID to reportName when reportName is present', async () => {
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}1`, createReport('1', {reportName: 'Expense Report'}));
+        const {result} = await renderReportIDToNameMap();
+        expect(result.current['1']).toBe('Expense Report');
+    });
+
+    it('falls back to reportID when reportName is undefined', async () => {
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}2`, createReport('2', {reportName: undefined}));
+        const {result} = await renderReportIDToNameMap();
+        expect(result.current['2']).toBe('2');
+    });
+
+    it('maps multiple reports and skips null entries', async () => {
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}10`, createReport('10', {reportName: 'Trip Report'}));
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}11`, createReport('11', {reportName: undefined}));
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}12`, null);
+
+        const {result} = await renderReportIDToNameMap();
+
+        expect(result.current['10']).toBe('Trip Report');
+        expect(result.current['11']).toBe('11');
+        expect(result.current['12']).toBeUndefined();
+    });
+
+    it('reflects updates to reports', async () => {
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}1`, createReport('1', {reportName: 'Old Name'}));
+        const {result} = await renderReportIDToNameMap();
+        expect(result.current['1']).toBe('Old Name');
+
+        await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}1`, {reportName: 'New Name'});
+            await waitForBatchedUpdates();
+        });
+
+        expect(result.current['1']).toBe('New Name');
+    });
+
+    it('keeps a stable reference across re-renders when reports do not change', async () => {
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}1`, createReport('1', {reportName: 'Stable'}));
+        const {result, rerender} = await renderReportIDToNameMap();
+        const firstResult = result.current;
+
+        rerender({});
+        await act(async () => {
+            await waitForBatchedUpdates();
+        });
+
+        expect(result.current).toBe(firstResult);
+    });
+});
diff --git a/tests/unit/useSearchHighlightAndScrollTest.ts b/tests/unit/useSearchAutoRefetchTest.ts
similarity index 59%
rename from tests/unit/useSearchHighlightAndScrollTest.ts
rename to tests/unit/useSearchAutoRefetchTest.ts
index d34623d5f160..676384d8be82 100644
--- a/tests/unit/useSearchHighlightAndScrollTest.ts
+++ b/tests/unit/useSearchAutoRefetchTest.ts
@@ -1,10 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import {renderHook} from '@testing-library/react-native';
 
-import type {SearchListItem} from '@components/Search/SearchList/ListItem/types';
-
-import useSearchHighlightAndScroll from '@hooks/useSearchHighlightAndScroll';
-import type {UseSearchHighlightAndScroll} from '@hooks/useSearchHighlightAndScroll';
+import useSearchAutoRefetch from '@hooks/useSearchAutoRefetch';
+import type {UseSearchAutoRefetch} from '@hooks/useSearchAutoRefetch';
 
 import {search} from '@libs/actions/Search';
 
@@ -37,15 +35,14 @@ afterEach(() => {
     mockIsOffline = false;
 });
 
-describe('useSearchHighlightAndScroll', () => {
+describe('useSearchAutoRefetch', () => {
     beforeAll(async () => {
         Onyx.init({
             keys: ONYXKEYS,
         });
     });
 
-    const baseProps: UseSearchHighlightAndScroll = {
-        shouldUseLiveData: false,
+    const baseProps: UseSearchAutoRefetch = {
         searchResults: {
             data: {
                 personalDetailsList: {},
@@ -83,22 +80,22 @@ describe('useSearchHighlightAndScroll', () => {
     };
 
     it('should not trigger search when collections are empty', () => {
-        renderHook(() => useSearchHighlightAndScroll(baseProps));
+        renderHook(() => useSearchAutoRefetch(baseProps));
         expect(search).not.toHaveBeenCalled();
     });
 
     it('should trigger search when new transaction added and focused', () => {
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             transactions: {transactions_1: {transactionID: '1'}},
             previousTransactions: {transactions_1: {transactionID: '1'}},
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             transactions: {
                 transactions_1: {transactionID: '1'},
@@ -114,11 +111,11 @@ describe('useSearchHighlightAndScroll', () => {
     it('should not trigger search when not focused', () => {
         mockUseIsFocused.mockReturnValue(false);
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps: baseProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             transactions: {transactions_1: {transactionID: '1'}},
         });
@@ -130,7 +127,7 @@ describe('useSearchHighlightAndScroll', () => {
     it('should trigger search for chat when report actions added and focused', () => {
         mockUseIsFocused.mockReturnValue(true);
 
-        const chatProps = createMock<UseSearchHighlightAndScroll>({
+        const chatProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             queryJSON: {...baseProps.queryJSON, type: 'chat' as const},
             reportActions: {
@@ -145,11 +142,11 @@ describe('useSearchHighlightAndScroll', () => {
             },
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps: chatProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...chatProps,
             reportActions: {
                 reportActions_1: {
@@ -164,7 +161,7 @@ describe('useSearchHighlightAndScroll', () => {
     });
 
     it('should not trigger search when new transaction removed and focused', () => {
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             transactions: {
                 transactions_1: {transactionID: '1'},
@@ -176,11 +173,11 @@ describe('useSearchHighlightAndScroll', () => {
             },
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             transactions: {
                 transactions_1: {transactionID: '1'},
@@ -192,7 +189,7 @@ describe('useSearchHighlightAndScroll', () => {
     });
 
     it('should trigger search when a transaction that is absent from the results is added', () => {
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -208,11 +205,11 @@ describe('useSearchHighlightAndScroll', () => {
             },
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             transactions: {
                 transactions_1: {transactionID: '1'},
@@ -228,7 +225,7 @@ describe('useSearchHighlightAndScroll', () => {
         // Onyx keeps one value object per collection member, so an unedited transaction has to keep its
         // reference across renders — the hook reads that identity to tell an edit from an untouched row.
         const transaction1 = createMock<Transaction>({transactionID: '1'});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -245,11 +242,11 @@ describe('useSearchHighlightAndScroll', () => {
             },
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             transactions: {
                 transactions_1: transaction1,
@@ -263,7 +260,7 @@ describe('useSearchHighlightAndScroll', () => {
 
     it('should trigger search when a transaction that is already in the results is edited', () => {
         const transaction = createMock<Transaction>({transactionID: '1', amount: 100});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -275,11 +272,11 @@ describe('useSearchHighlightAndScroll', () => {
             previousTransactions: {transactions_1: transaction},
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             transactions: {transactions_1: {transactionID: '1', amount: 250}},
         });
@@ -291,7 +288,7 @@ describe('useSearchHighlightAndScroll', () => {
     it('should not trigger search when the edited transaction is absent from the results', () => {
         const visibleTransaction = createMock<Transaction>({transactionID: '1', amount: 100});
         const filteredOutTransaction = createMock<Transaction>({transactionID: '99', amount: 100});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -303,11 +300,11 @@ describe('useSearchHighlightAndScroll', () => {
             previousTransactions: {transactions_1: visibleTransaction, transactions_99: filteredOutTransaction},
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             transactions: {transactions_1: visibleTransaction, transactions_99: {transactionID: '99', amount: 250}},
         });
@@ -318,7 +315,7 @@ describe('useSearchHighlightAndScroll', () => {
 
     it('should trigger search when a transaction moves into a report the results display', () => {
         const movedTransaction = createMock<Transaction>({transactionID: '99', reportID: '5'});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -330,11 +327,11 @@ describe('useSearchHighlightAndScroll', () => {
             previousTransactions: {transactions_99: movedTransaction},
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             transactions: {transactions_99: {transactionID: '99', reportID: '2'}},
         });
@@ -345,7 +342,7 @@ describe('useSearchHighlightAndScroll', () => {
 
     it('should not trigger search when a transaction moves between reports the results do not display', () => {
         const movedTransaction = createMock<Transaction>({transactionID: '99', reportID: '5'});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -357,11 +354,11 @@ describe('useSearchHighlightAndScroll', () => {
             previousTransactions: {transactions_99: movedTransaction},
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             transactions: {transactions_99: {transactionID: '99', reportID: '7'}},
         });
@@ -373,7 +370,7 @@ describe('useSearchHighlightAndScroll', () => {
     it('should trigger the deferred search once Search is active again, after previousTransactions caught up', () => {
         const transaction = createMock<Transaction>({transactionID: '1', amount: 100});
         const editedTransaction = createMock<Transaction>({transactionID: '1', amount: 250});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -386,17 +383,17 @@ describe('useSearchHighlightAndScroll', () => {
         });
 
         mockIsOffline = true;
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const editedProps = createMock<UseSearchHighlightAndScroll>({...initialProps, transactions: {transactions_1: editedTransaction}});
+        const editedProps = createMock<UseSearchAutoRefetch>({...initialProps, transactions: {transactions_1: editedTransaction}});
 
         rerender(editedProps);
         expect(search).not.toHaveBeenCalled();
 
         // `usePrevious` catches up while Search is inactive, so the edit is no longer visible to the comparisons.
-        const settledProps = createMock<UseSearchHighlightAndScroll>({...editedProps, previousTransactions: {transactions_1: editedTransaction}});
+        const settledProps = createMock<UseSearchAutoRefetch>({...editedProps, previousTransactions: {transactions_1: editedTransaction}});
 
         rerender(settledProps);
         expect(search).not.toHaveBeenCalled();
@@ -410,7 +407,7 @@ describe('useSearchHighlightAndScroll', () => {
     it('should not trigger search on a non-chat search when a report action was added and Onyx holds a transaction the query filters out', () => {
         const transaction1 = createMock<Transaction>({transactionID: '1'});
         const transaction99 = createMock<Transaction>({transactionID: '99'});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -439,11 +436,11 @@ describe('useSearchHighlightAndScroll', () => {
             },
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             reportActions: {
                 reportActions_1: {
@@ -460,7 +457,7 @@ describe('useSearchHighlightAndScroll', () => {
     it('should not trigger search when the added transaction is already in the results and Onyx holds one the query filters out', () => {
         const transaction1 = createMock<Transaction>({transactionID: '1'});
         const transaction99 = createMock<Transaction>({transactionID: '99'});
-        const initialProps = createMock<UseSearchHighlightAndScroll>({
+        const initialProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             searchResults: {
                 ...baseProps.searchResults,
@@ -479,11 +476,11 @@ describe('useSearchHighlightAndScroll', () => {
             },
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...initialProps,
             transactions: {
                 transactions_1: transaction1,
@@ -499,7 +496,7 @@ describe('useSearchHighlightAndScroll', () => {
     it('should not trigger search for chat when report actions removed and focused', () => {
         mockUseIsFocused.mockReturnValue(true);
 
-        const chatProps = createMock<UseSearchHighlightAndScroll>({
+        const chatProps = createMock<UseSearchAutoRefetch>({
             ...baseProps,
             queryJSON: {...baseProps.queryJSON, type: 'chat' as const},
             reportActions: {
@@ -516,11 +513,11 @@ describe('useSearchHighlightAndScroll', () => {
             },
         });
 
-        const {rerender} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
+        const {rerender} = renderHook((props: UseSearchAutoRefetch) => useSearchAutoRefetch(props), {
             initialProps: chatProps,
         });
 
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
+        const updatedProps = createMock<UseSearchAutoRefetch>({
             ...chatProps,
             reportActions: {
                 reportActions_1: {
@@ -532,168 +529,4 @@ describe('useSearchHighlightAndScroll', () => {
         rerender(updatedProps);
         expect(search).not.toHaveBeenCalled();
     });
-
-    it('should clear the scroll trigger when the first new expense is already first', () => {
-        const {rerender, result} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
-            initialProps: baseProps,
-        });
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
-            ...baseProps,
-            searchResults: {
-                ...baseProps.searchResults,
-                data: {
-                    transactions_1: {
-                        transactionID: '1',
-                    },
-                    transactions_2: {
-                        transactionID: '2',
-                    },
-                },
-            },
-            transactions: {
-                transactions_1: {transactionID: '1'},
-                transactions_2: {transactionID: '2'},
-                transactions_3: {transactionID: '3'},
-            },
-            previousTransactions: {
-                transactions_1: {transactionID: '1'},
-            },
-        });
-        rerender(updatedProps);
-        expect(result.current.newSearchResultKeys?.size).toBe(2);
-
-        const scrollToIndex = jest.fn();
-        const ref: NonNullable<Parameters<typeof result.current.handleSelectionListScroll>[1]> = {
-            scrollAndHighlightItem: jest.fn(),
-            scrollToIndex,
-            updateFocusedIndex: jest.fn(),
-            scrollToFocusedInput: jest.fn(),
-            focusTextInput: jest.fn(),
-        };
-
-        const listItem1 = createMock<SearchListItem>({transactionID: '1'});
-        const listItem2 = createMock<SearchListItem>({transactionID: '2'});
-
-        result.current.handleSelectionListScroll([listItem1, listItem2], ref);
-        result.current.handleSelectionListScroll([listItem2, listItem1], ref);
-
-        expect(scrollToIndex).not.toHaveBeenCalled();
-    });
-
-    it('should return new search result keys for manually highlighted expenses', async () => {
-        const spyOnMergeTransactionIdsHighlightOnSearchRoute = jest
-            .spyOn(require('@libs/actions/Transaction'), 'mergeTransactionIdsHighlightOnSearchRoute')
-            .mockImplementationOnce(jest.fn());
-        // We need to mock requestAnimationFrame to mimic long Onyx merge overhead
-        jest.spyOn(global, 'requestAnimationFrame').mockImplementation((callback: FrameRequestCallback) => {
-            callback(performance.now());
-            return 0;
-        });
-
-        await Onyx.merge(ONYXKEYS.TRANSACTION_IDS_HIGHLIGHT_ON_SEARCH_ROUTE, {[baseProps.queryJSON.type]: {'3': true}});
-
-        const {rerender, result} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
-            initialProps: baseProps,
-        });
-        const updatedProps1 = createMock<UseSearchHighlightAndScroll>({
-            ...baseProps,
-            searchResults: {
-                ...baseProps.searchResults,
-                data: {
-                    transactions_1: {
-                        transactionID: '1',
-                    },
-                    transactions_2: {
-                        transactionID: '2',
-                    },
-                },
-            },
-            transactions: {
-                transactions_1: {transactionID: '1'},
-                transactions_2: {transactionID: '2'},
-                transactions_3: {transactionID: '3'},
-            },
-            previousTransactions: {
-                transactions_1: {transactionID: '1'},
-            },
-        });
-
-        // When there is no data yet, even if the transactionID has been added to manual highlight transactionIDs,
-        // it still will not be included in newSearchResultKeys.
-        rerender(updatedProps1);
-        expect(result.current.newSearchResultKeys?.size).toBe(2);
-        expect([...(result.current.newSearchResultKeys ?? new Set())]).not.toContain('transactions_3');
-
-        // When the data contains the highlight transactionID, it will be highlighted.
-        const updatedProps2 = createMock<UseSearchHighlightAndScroll>({
-            ...updatedProps1,
-            searchResults: {
-                ...updatedProps1.searchResults,
-                data: {
-                    transactions_1: {
-                        transactionID: '1',
-                    },
-                    transactions_2: {
-                        transactionID: '2',
-                    },
-                    transactions_3: {
-                        transactionID: '3',
-                    },
-                },
-            },
-        });
-
-        rerender(updatedProps2);
-        expect(result.current.newSearchResultKeys?.size).toBe(1);
-        expect([...(result.current.newSearchResultKeys ?? new Set())]).toContain('transactions_3');
-
-        expect(spyOnMergeTransactionIdsHighlightOnSearchRoute).toHaveBeenCalledWith(baseProps.queryJSON.type, {'3': false});
-    });
-
-    it('should return multiple new search result keys when there are multiple new chats', () => {
-        const chatProps = createMock<UseSearchHighlightAndScroll>({
-            ...baseProps,
-            queryJSON: {...baseProps.queryJSON, type: 'chat' as const},
-            reportActions: {
-                reportActions_1: {
-                    '1': {actionName: 'CREATED', reportActionID: '1'},
-                },
-            },
-        });
-        const {rerender, result} = renderHook((props: UseSearchHighlightAndScroll) => useSearchHighlightAndScroll(props), {
-            initialProps: chatProps,
-        });
-        const updatedProps = createMock<UseSearchHighlightAndScroll>({
-            ...chatProps,
-            searchResults: {
-                ...baseProps.searchResults,
-                data: {
-                    reportActions_1: {
-                        '1': {actionName: 'CREATED', reportActionID: '1'},
-                    },
-                    reportActions_2: {
-                        '2': {actionName: 'CREATED', reportActionID: '2'},
-                    },
-                },
-            },
-            reportActions: {
-                reportActions_1: {
-                    '1': {actionName: 'CREATED', reportActionID: '1'},
-                },
-                reportActions_2: {
-                    '2': {actionName: 'CREATED', reportActionID: '2'},
-                },
-                reportActions_3: {
-                    '3': {actionName: 'CREATED', reportActionID: '3'},
-                },
-            },
-            previousReportActions: {
-                reportActions_1: {
-                    '1': {actionName: 'CREATED', reportActionID: '1'},
-                },
-            },
-        });
-        rerender(updatedProps);
-        expect(result.current.newSearchResultKeys?.size).toBe(2);
-    });
 });
diff --git a/tests/unit/useSearchSelectorTest.tsx b/tests/unit/useSearchSelectorTest.tsx
index fd8f37fca934..cafd387c4466 100644
--- a/tests/unit/useSearchSelectorTest.tsx
+++ b/tests/unit/useSearchSelectorTest.tsx
@@ -55,6 +55,8 @@ jest.mock('@hooks/useFilteredOptions', () => ({
 jest.mock('@components/OnyxListItemProvider', () => ({
     ...jest.requireActual<typeof OnyxListItemProvider>('@components/OnyxListItemProvider'),
     usePersonalDetails: () => ({}),
+    useCardList: () => ({}),
+    useWorkspaceCardList: () => ({}),
 }));
 
 jest.mock('@hooks/useCurrentUserPersonalDetails', () => () => ({
diff --git a/tests/unit/useSearchTableItemHighlightTest.ts b/tests/unit/useSearchTableItemHighlightTest.ts
deleted file mode 100644
index edd1d518b937..000000000000
--- a/tests/unit/useSearchTableItemHighlightTest.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import {renderHook} from '@testing-library/react-native';
-
-import useSearchTableItemHighlight from '@components/Search/SearchList/ListItem/hooks/useSearchTableItemHighlight';
-
-import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-import variables from '@styles/variables';
-
-const animatedHighlightStyleMock = {backgroundColor: 'animated-highlight'};
-jest.mock('@hooks/useAnimatedHighlightStyle', () => jest.fn(() => animatedHighlightStyleMock));
-
-let mockIsLargeScreenWidth = false;
-jest.mock('@hooks/useResponsiveLayout', () => () => ({isLargeScreenWidth: mockIsLargeScreenWidth}));
-
-const mockUseAnimatedHighlightStyle = jest.mocked(useAnimatedHighlightStyle);
-
-type HookParams = Parameters<typeof useSearchTableItemHighlight>[0];
-
-function renderHighlightHook(params?: HookParams) {
-    const {result} = renderHook(() => ({
-        styles: useThemeStyles(),
-        StyleUtils: useStyleUtils(),
-        theme: useTheme(),
-        highlight: useSearchTableItemHighlight(params),
-    }));
-    return result.current;
-}
-
-describe('useSearchTableItemHighlight', () => {
-    beforeEach(() => {
-        mockUseAnimatedHighlightStyle.mockClear();
-        mockIsLargeScreenWidth = false;
-    });
-
-    it.each([
-        ['wide', true],
-        ['narrow', false],
-    ])('configures the animation on %s screens with the table border radius and layout styles only off-table', (_name, isLargeScreenWidth) => {
-        mockIsLargeScreenWidth = isLargeScreenWidth;
-        const {StyleUtils, theme} = renderHighlightHook();
-
-        expect(mockUseAnimatedHighlightStyle).toHaveBeenCalledWith({
-            borderRadius: StyleUtils.getSearchTableHighlightBorderRadius(isLargeScreenWidth),
-            shouldHighlight: false,
-            highlightColor: theme.messageHighlightBG,
-            backgroundColor: theme.highlightBG,
-            shouldApplyOtherStyles: !isLargeScreenWidth,
-        });
-    });
-
-    it('adds table paddings and stays transparent for the animated background', () => {
-        const {styles, highlight} = renderHighlightHook();
-
-        expect(highlight.pressableStyle).toContain(styles.pv3);
-        expect(highlight.pressableStyle).toContain(styles.ph3);
-        expect(highlight.pressableStyle).toContain(styles.bgTransparent);
-    });
-
-    it('paints the selected background when selected', () => {
-        const {styles, highlight} = renderHighlightHook({isSelected: true});
-
-        expect(highlight.pressableStyle).toContain(styles.activeComponentBG);
-    });
-
-    it('applies the table row pressable style on wide screens', () => {
-        mockIsLargeScreenWidth = true;
-        const {StyleUtils, highlight} = renderHighlightHook({isSelected: true, isLastItem: true});
-
-        expect(highlight.pressableStyle).toContainEqual(StyleUtils.getSearchTableRowPressableStyle(true, true, {vertical: variables.tableRowPaddingVertical}));
-    });
-
-    it('rounds and clips the last row on wide screens', () => {
-        mockIsLargeScreenWidth = true;
-        const {styles, highlight} = renderHighlightHook({isLastItem: true});
-
-        expect(highlight.pressableWrapperStyle).toContainEqual([styles.tableBottomRadius, styles.overflowHidden]);
-    });
-
-    it('skips the last-row rounding on narrow screens', () => {
-        const {styles, highlight} = renderHighlightHook({isLastItem: true});
-
-        expect(highlight.pressableWrapperStyle).not.toContainEqual([styles.tableBottomRadius, styles.overflowHidden]);
-    });
-
-    it('returns the animated highlight style for rows that own their pressable layout', () => {
-        const {highlight} = renderHighlightHook();
-
-        expect(highlight.animatedHighlightStyle).toBe(animatedHighlightStyleMock);
-    });
-});
diff --git a/tests/utils/MockSearchContextProvider.tsx b/tests/utils/MockSearchContextProvider.tsx
index 0549d8dfa1b2..9860de95043d 100644
--- a/tests/utils/MockSearchContextProvider.tsx
+++ b/tests/utils/MockSearchContextProvider.tsx
@@ -6,6 +6,7 @@ import {
     SearchSelectionActionsContext,
     SearchSelectionContext,
 } from '@components/Search/SearchContext';
+import {SearchSelectionClearGenerationContext} from '@components/Search/SearchContextDefinitions';
 import type {
     SearchActionsContextValue,
     SearchQueryActionsValue,
@@ -22,6 +23,10 @@ import React from 'react';
 type MockSearchContextProviderProps = {
     state: SearchStateContextValue;
     actions: SearchActionsContextValue;
+
+    /** The counter a range session ends on, so a test can clear the selection the way the provider does */
+    selectionClearGeneration?: number;
+
     children: React.ReactNode;
 };
 
@@ -77,6 +82,9 @@ function splitActions(value: SearchActionsContextValue): {
         },
         selection: {
             setSelectedTransactions: value.setSelectedTransactions,
+            getSelectedTransactions: value.getSelectedTransactions,
+            getExcludedTransactions: value.getExcludedTransactions,
+            getAreAllMatchingItemsSelected: value.getAreAllMatchingItemsSelected,
             applySelection: value.applySelection,
             setSelectedReports: value.setSelectedReports,
             setCurrentSelectedTransactionReportID: value.setCurrentSelectedTransactionReportID,
@@ -87,16 +95,25 @@ function splitActions(value: SearchActionsContextValue): {
     };
 }
 
-function MockSearchContextProvider({state, actions, children}: MockSearchContextProviderProps) {
+function MockSearchContextProvider({state, actions, selectionClearGeneration = 0, children}: MockSearchContextProviderProps) {
     const stateSlices = splitState(state);
     const actionsSlices = splitActions(actions);
+    // Answered from the state the checkboxes render from, so the range and the rows cannot read different selections.
+    const selectionActions: SearchSelectionActionsValue = {
+        ...actionsSlices.selection,
+        getSelectedTransactions: actions.getSelectedTransactions ?? (() => stateSlices.selection.selectedTransactions),
+        getExcludedTransactions: actions.getExcludedTransactions ?? (() => stateSlices.selection.excludedTransactions),
+        getAreAllMatchingItemsSelected: actions.getAreAllMatchingItemsSelected ?? (() => stateSlices.selection.areAllMatchingItemsSelected),
+    };
     return (
         <SearchQueryContext value={stateSlices.query}>
             <SearchQueryActionsContext value={actionsSlices.query}>
                 <SearchResultsContext value={stateSlices.results}>
                     <SearchResultsActionsContext value={actionsSlices.results}>
                         <SearchSelectionContext value={stateSlices.selection}>
-                            <SearchSelectionActionsContext value={actionsSlices.selection}>{children}</SearchSelectionActionsContext>
+                            <SearchSelectionActionsContext value={selectionActions}>
+                                <SearchSelectionClearGenerationContext value={selectionClearGeneration}>{children}</SearchSelectionClearGenerationContext>
+                            </SearchSelectionActionsContext>
                         </SearchSelectionContext>
                     </SearchResultsActionsContext>
                 </SearchResultsContext>
diff --git a/tests/utils/collections/card.ts b/tests/utils/collections/card.ts
index 18498ac2b30f..af32b5b30a99 100644
--- a/tests/utils/collections/card.ts
+++ b/tests/utils/collections/card.ts
@@ -117,4 +117,17 @@ function createRandomCompanyCard(
     });
 }
 
-export {createRandomExpensifyCard, createRandomCompanyCard};
+function createCashCard(accountID: number, cardID?: number): Card {
+    return {
+        cardID: cardID ?? randNumber(),
+        state: CONST.EXPENSIFY_CARD.STATE.OPEN,
+        bank: CONST.EXPENSIFY_CARD.BANK,
+        domainName: '',
+        lastUpdated: '',
+        fraud: CONST.EXPENSIFY_CARD.FRAUD_TYPES.NONE,
+        accountID,
+        cardName: CONST.CASH_CARD_NAME,
+    };
+}
+
+export {createRandomExpensifyCard, createRandomCompanyCard, createCashCard};
diff --git a/tests/utils/getOnyxValue.ts b/tests/utils/getOnyxValue.ts
index 69cf47f289e7..c9d9ff940973 100644
--- a/tests/utils/getOnyxValue.ts
+++ b/tests/utils/getOnyxValue.ts
@@ -1,12 +1,3 @@
-import type {OnyxKey, OnyxValue} from 'react-native-onyx';
+import readOnceOnyxValue from '@libs/readOnceOnyxValue';
 
-import Onyx from 'react-native-onyx';
-
-export default function getOnyxValue<TKey extends OnyxKey>(key: TKey): Promise<OnyxValue<TKey>> {
-    return new Promise((resolve) => {
-        Onyx.connect({
-            key,
-            callback: (value) => resolve(value),
-        });
-    });
-}
+export default readOnceOnyxValue;
diff --git a/web/index.html b/web/index.html
index 613ebe68e501..da7a135748b5 100644
--- a/web/index.html
+++ b/web/index.html
@@ -125,6 +125,11 @@
             transition: transform var(--label-transition-duration);
         }
 
+        /* Hold a table's columns still while the pointer is on the filter bar pinned inside their scroller */
+        [data-table-column-scroller='true']:has([data-table-page-header='true']:hover) {
+            overflow-x: hidden !important;
+        }
+
         .splash-logo > svg {
             width: 104px;
             height: 104px;