diff --git a/.github/workflows/buildAndroid.yml b/.github/workflows/buildAndroid.yml
index 49f3d23ec02c..d7784e2f610b 100644
--- a/.github/workflows/buildAndroid.yml
+++ b/.github/workflows/buildAndroid.yml
@@ -54,8 +54,6 @@ jobs:
   build:
     name: Build Android app
     runs-on: ubuntu-latest-xl
-    env:
-      RUBYOPT: '-rostruct'
     outputs:
       AAB_FILE_NAME: ${{ steps.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME: ${{ steps.build.outputs.APK_FILE_NAME }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1447bbf20c6d..1ceb12a30af5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -81,8 +81,6 @@ jobs:
     name: Upload Android build to Google Play Store
     needs: buildAndroid
     runs-on: ubuntu-latest
-    env:
-      RUBYOPT: '-rostruct'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -121,8 +119,6 @@ jobs:
     needs: prep
     if: ${{ github.ref == 'refs/heads/production' }}
     runs-on: ubuntu-latest
-    env:
-      RUBYOPT: '-rostruct'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -170,8 +166,6 @@ jobs:
     defaults:
       run:
         working-directory: Mobile-Expensify/react-native
-    env:
-      RUBYOPT: '-rostruct'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index 035879bf9727..1ce493715b78 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -93,8 +93,6 @@ jobs:
     name: Upload Android app to S3
     needs: [buildAndroid]
     runs-on: ubuntu-latest
-    env:
-      RUBYOPT: '-rostruct'
     outputs:
       S3_APK_PATH: ${{ steps.exportS3Path.outputs.S3_APK_PATH }}
     steps:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 458dff08605a..5fd9f28f0732 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009006302
-        versionName "9.0.63-2"
+        versionCode 1009006303
+        versionName "9.0.63-3"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 31738835b1dc..dcf7c9f238a6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -265,11 +265,15 @@ platform :android do
 
     desc "Submit HybridApp to 100% rollout on Google Play"
     lane :complete_hybrid_rollout do
-        productionVersionCode = google_play_track_version_codes(track: 'production')
+        productionVersionCodes = google_play_track_version_codes(
+                                            track: 'production',
+                                            package_name: "org.me.mobiexpensifyg",
+                                            json_key: './android/app/android-fastlane-json-key.json',
+                                        )
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: '1',
             skip_upload_apk: true,
@@ -283,14 +287,15 @@ platform :android do
 
     desc "Update HybridApp rollout percentage on Google Play"
     lane :update_hybrid_rollout do |options|
-        productionVersionCode = google_play_track_version_codes(
+        productionVersionCodes = google_play_track_version_codes(
                                     track: 'production',
+                                    package_name: "org.me.mobiexpensifyg",
                                     json_key: './android/app/android-fastlane-json-key.json',
                                 )
         upload_to_play_store(
             package_name: "org.me.mobiexpensifyg",
             json_key: './android/app/android-fastlane-json-key.json',
-            version_code: productionVersionCode,
+            version_code: productionVersionCodes.sort.last, # Get the latest version code
             track: 'production',
             rollout: options[:rollout],
             skip_upload_apk: true,
diff --git a/help/_includes/search.html b/help/_includes/search.html
deleted file mode 100644
index 7b024ba8ec33..000000000000
--- a/help/_includes/search.html
+++ /dev/null
@@ -1,363 +0,0 @@
-<div id="search-container">
-  <!-- Search Input styled as button -->
-  <input type="text" id="search-input-box" placeholder="Search..." />
-
-  <!-- Search Modal -->
-  <div id="search-modal" style="display:none;">
-    <div id="modal-content">
-      <div class="search-icon-wrapper">
-        <span class="search-icon">🔍</span>
-        <input type="text" id="search-input" placeholder="Go to..." />
-      </div>
-      <!-- Hidden Search Button -->
-      <button id="search-submit" style="display:none;">Search</button>
-
-      <!-- Search results container with tabindex to make it focusable -->
-      <div id="search-results" tabindex="0" style="display:none;"></div>
-
-      <!-- Footer with shortcut info -->
-      <div id="search-footer" style="text-align: center; margin-top: 10px; font-size: 14px; color: #586069;">
-        ⇵ Select, ↩ Go
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- Modal and Search Styling -->
-<style>
-  /* Style for search input box (replaces button) */
-  #search-input-box {
-    padding: 8px 16px;
-    font-size: 16px;
-    cursor: pointer;
-    border: 1px solid #eaecef;
-    border-radius: 6px;
-    width: 100%;
-    box-sizing: border-box;
-    margin-bottom: 20px;
-  }
-
-  /* Modal background */
-  #search-modal {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, 0.7);
-    z-index: 1000;
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-  }
-
-  /* Modal content */
-  #modal-content {
-    top: 20%;
-    background: white;
-    padding: 20px;
-    width: 60%;
-    max-width: 600px;
-    position: relative;
-    border-radius: 6px;
-    box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
-  }
-
-  /* Search input with magnifying glass */
-  .search-icon-wrapper {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    padding: 8px;
-    border: 1px solid #eaecef;
-    border-radius: 6px;
-    box-sizing: border-box;
-  }
-
-  .search-icon {
-    font-size: 18px;
-    margin-right: 8px;
-  }
-
-  /* Updated input style */
-  #search-input {
-    width: 100%;
-    border: none;
-    outline: none;
-    font-size: 20px;
-  }
-
-  /* Search results */
-  #search-results {
-    margin-top: 20px;
-    max-height: 300px;
-    overflow-y: auto;
-    border-top: 1px solid #eaecef;
-    padding-top: 10px;
-    outline: none; /* Disable the strong outline */
-  }
-
-  .search-result {
-    margin-bottom: 15px;
-    padding-bottom: 10px;
-    border-bottom: 1px solid #eaecef;
-  }
-
-  .search-result-title {
-    font-weight: bold;
-    margin-bottom: 5px;
-    color: #0366d6;
-    text-decoration: none;
-  }
-
-  .search-result-title:hover {
-    text-decoration: underline;
-  }
-
-  .search-result-context {
-    font-size: 14px;
-    color: #586069;
-  }
-
-  /* Highlighted search result */
-  .highlight {
-    background-color: #eaecef;
-  }
-
-  /* Softer focus style for search results */
-  #search-results:focus {
-    border: 2px solid #ddd; /* Softer border on focus */
-    outline: none;
-  }
-
-  /* Soft yellow highlight for selected section */
-  .highlight-section {
-    background-color: #fffbcc;
-    transition: background-color 0.3s ease;
-  }
-</style>
-
-<!-- FlexSearch CDN -->
-<script src="https://cdn.jsdelivr.net/npm/flexsearch@0.7.31/dist/flexsearch.bundle.js"></script>
-
-<!-- JavaScript for modal and search -->
-<script>
-  // Keep track of the search results
-  let g_searchResultsArray = [];
-  let g_currentSelectionIndex = -1;
-  let g_highlightedSection = null;
-
-  // Declare the index variable globally so it can be reused
-  let g_index = null;
-
-  // Look up some commonly used elements once
-  const g_searchInputBox = document.getElementById('search-input-box');
-  const g_searchModal = document.getElementById('search-modal');
-  const g_searchResults = document.getElementById('search-results');
-  const g_searchInput = document.getElementById('search-input');
-
-  // Show and initialize the search modal
-  function showSearchModal() {
-    g_searchModal.style.display = 'flex';
-    if (g_searchResultsArray.length > 0) {
-      g_searchResults.style.display = 'block';
-      g_searchResults.focus(); // Focus on search results if they exist
-    } else {
-      g_searchInput.focus();
-    }
-  }
-
-  // Open modal when search input is clicked
-  g_searchInputBox.addEventListener('click', showSearchModal);
-
-  // Open modal when Cmd+K is pressed
-  document.addEventListener('keydown', function(event) {
-    if (event.metaKey && event.key === 'k') {
-      event.preventDefault();
-      showSearchModal();
-    }
-  });
-
-  // Close modal when pressing "Escape"
-  document.addEventListener('keydown', function(event) {
-    if (event.key === 'Escape' && g_searchModal.style.display === 'flex') {
-      g_searchModal.style.display = 'none';
-    }
-  });
-
-  // Close modal when clicking outside of modal content
-  window.addEventListener('click', function(event) {
-    if (event.target == g_searchModal) {
-      g_searchModal.style.display = 'none';
-    }
-  });
-
-  // Handle keyboard navigation (arrow keys and enter)
-  g_searchResults.addEventListener('keydown', function(event) {
-    // If the modal is being shown and has active search results, capture keydown
-    if (g_searchModal.style.display === 'flex' && g_searchResultsArray.length > 0) {
-      if (event.key === 'ArrowDown') {
-        event.preventDefault();
-        selectNextResult();
-      } else if (event.key === 'ArrowUp') {
-        event.preventDefault();
-        selectPreviousResult();
-      } else if (event.key === 'Enter' && g_currentSelectionIndex >= 0) {
-        event.preventDefault();
-        navigateToSelectedResult();
-      } else if (!['Tab', 'Shift'].includes(event.key)) {
-        g_searchInput.focus(); // Focus back on input if typing occurs
-      }
-    }
-  });
-
-  function selectNextResult() {
-    if (g_currentSelectionIndex < g_searchResultsArray.length - 1) {
-      g_currentSelectionIndex++;
-      updateSelectedResult();
-    }
-  }
-
-  function selectPreviousResult() {
-    if (g_currentSelectionIndex > 0) {
-      g_currentSelectionIndex--;
-      updateSelectedResult();
-    }
-  }
-
-  function updateSelectedResult() {
-    g_searchResultsArray.forEach((result, index) => {
-      if (index === g_currentSelectionIndex) {
-        result.classList.add('highlight');
-        result.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
-      } else {
-        result.classList.remove('highlight');
-      }
-    });
-  }
-
-  function navigateToSelectedResult() {
-    const selectedResult = g_searchResultsArray[g_currentSelectionIndex];
-    const link = selectedResult.querySelector('a');
-    if (link) {
-      link.click();
-    }
-  }
-
-  // Execute search when pressing "Enter" in the input field
-  g_searchInput.addEventListener('keydown', function(event) {
-    if (event.key === 'Enter') {
-      event.preventDefault();
-      g_searchSubmit.click();
-    }
-  });
-
-  // Perform search when search button is clicked
-  const g_searchSubmit = document.getElementById('search-submit');
-
-  // Handle submitting the search query
-  g_searchSubmit.addEventListener('click', async function() {
-    const query = g_searchInput.value.trim().toLowerCase();
-    g_searchResults.innerHTML = '';
-    g_currentSelectionIndex = -1;
-
-    if (query.length === 0) {
-      g_searchResults.style.display = 'none';
-      return;
-    }
-
-    // Load the JSON search index file, if not already defined
-    if (g_index === null) {
-      console.log('Loading search index from:', '/searchIndex.json');
-      const response = await fetch('/searchIndex.json');
-      const indexData = await response.json();
-      g_index = new FlexSearch.Document({
-        document: {
-          id: 'id',
-          index: ['content'], // Index on the content field
-          store: ['title', 'url', 'content'], // Store title, URL, and content
-        }
-      });
-
-      // Import the index
-      for (const [key, data] of Object.entries(indexData)) {
-        await g_index.import(key, data);
-      }
-    } else {
-      console.log('Reusing existing search index');
-    }
-
-    // Perform search
-    const results = await g_index.search({
-      query,
-      field: 'content'
-    });
-
-    if (results.length > 0) {
-      g_searchResultsArray = [];
-      results.forEach(result => {
-        result.result.forEach(docId => {
-          const doc = g_index.store[docId];
-          if (doc && doc.content) {
-            const searchTermIndex = doc.content.toLowerCase().indexOf(query);
-            const contextBefore = doc.content.substring(Math.max(0, searchTermIndex - 30), searchTermIndex);
-            const contextAfter = doc.content.substring(searchTermIndex + query.length, Math.min(doc.content.length, searchTermIndex + query.length + 30));
-            const searchResultHtml = `
-              <div class="search-result">
-                <a href="${doc.url}" class="search-result-title" onclick="scrollToTOC('${doc.url}')">${doc.title}</a>
-                <div class="search-result-context">...${contextBefore}<strong>${query}</strong>${contextAfter}...</div>
-              </div>
-            `;
-            const resultElement = document.createElement('div');
-            resultElement.innerHTML = searchResultHtml;
-            g_searchResults.appendChild(resultElement);
-            g_searchResultsArray.push(resultElement);
-
-            // Automatically select the first result
-            if (g_searchResultsArray.length === 1) {
-              g_currentSelectionIndex = 0;
-              updateSelectedResult();
-            }
-          }
-        });
-      });
-      g_searchResults.style.display = 'block';
-      g_searchResults.focus();  // Focus on search results whenever there are results
-    } else {
-      g_searchResults.style.display = 'none';
-    }
-  });
-
-  // Trigger the TOC link click to use TocBot's smooth scrolling behavior
-  function scrollToTOC(url) {
-    const elementId = url.split('#')[1];
-    const tocLink = document.querySelector(`.toc-sidebar a[href="#${elementId}"]`);
-
-    if (tocLink) {
-      tocLink.click(); // Simulate a click on the TOC link for smooth scroll
-      highlightSelectedSection(elementId); // Highlight the section in yellow
-      closeModalAfterClick();
-    }
-  }
-
-  // Highlight the selected section
-  function highlightSelectedSection(sectionId) {
-    // Remove the previous highlight, if any
-    if (g_highlightedSection) {
-      g_highlightedSection.classList.remove('highlight-section');
-    }
-
-    // Highlight the new section
-    const sectionElement = document.getElementById(sectionId);
-    if (sectionElement) {
-      sectionElement.classList.add('highlight-section');
-      g_highlightedSection = sectionElement;
-    }
-  }
-
-  // Close modal after clicking a search result
-  function closeModalAfterClick() {
-    g_searchModal.style.display = 'none';
-  }
-</script>
-
diff --git a/help/_layouts/default.html b/help/_layouts/default.html
index c3981f17296f..906dacd9f2b4 100644
--- a/help/_layouts/default.html
+++ b/help/_layouts/default.html
@@ -5,247 +5,67 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{ page.title }}</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.27.4/tocbot.css">
-    <style>
-        body {
-            margin: 0;
-            font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", sans-serif;
-            background-color: #f9fafb;
-            color: #333;
-        }
-
-        /* Header styling */
-        .header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            background-color: #fff;
-            padding: 15px 20px;
-            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-            position: fixed;
-            top: 0;
-            width: 100%;
-        }
-
-        .logo {
-            font-size: 24px;
-            font-weight: bold;
-            color: #0366d6;
-        }
-
-        .logo a {
-            text-decoration: none;
-            color: inherit;
-        }
-
-        .nav-links {
-            display: flex;
-            gap: 15px;
-            padding-right: 20px;
-        }
-
-        .nav-links a {
-            text-decoration: none;
-            color: #0366d6;
-            font-weight: 500;
-            padding: 10px 15px;
-            border-radius: 6px;
-            transition: background-color 0.3s;
-        }
-
-        .nav-links a:hover {
-            background-color: #f1f8ff;
-        }
-
-        .nav-links a.active {
-            background-color: #eaf5ff;
-            color: #0366d6;
-            font-weight: bold;
-        }
-
-        /* Sidebar navigation for TOC */
-        .toc-sidebar {
-            width: 250px;
-            position: fixed;
-            top: 80px;
-            bottom: 0;
-            left: 0;
-            background-color: #fff;
-            padding: 20px;
-            overflow-y: auto;
-            border-right: 1px solid #eaecef;
-            box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1);
-        }
-
-        .toc-link::before {
-            display: none;
-        }
-
-        .toc-sidebar ul {
-            list-style: none;
-            padding-left: 0;
-            line-height: 1.0;
-            font-size: 15px;
-        }
-
-        .toc-sidebar li {
-            margin-left: 0;
-            padding-left: 0;
-        }
-
-        .js-toc > ul > li > a {
-            font-weight: bold;
-            font-size: 18px;
-
-        }
-
-        .js-toc > ul > li > ul > li {
-            margin-top: 25px;
-        }
-
-        .js-toc > ul > li > ul > li > a {
-            font-weight: bold;
-        }
-
-        .js-toc > ul > li > ul > li > ul > li > ul > li {
-            padding-left: 10px;
-        }
-
-        .toc-sidebar a {
-            word-wrap: break-word;
-            display: block;
-            padding: 1px 10px;
-            margin-bottom: 5px;
-            text-decoration: none;
-            color: #0366d6;
-            border-radius: 6px;
-        }
-
-        .toc-sidebar a:hover {
-            background-color: #f1f8ff;
-            text-decoration: none;
-        }
-
-        .toc-sidebar .is-active-link {
-            background-color: #eaf5ff;
-            color: #0366d6;
-            border-radius: 6px;
-        }
-
-        /* Main content area */
-        main {
-            margin-left: 300px;
-            padding: 20px;
-            margin-top: 80px;
-            flex-grow: 1;
-            max-width: 900px;
-        }
-
-        main h1 {
-            font-size: 36px;
-            font-weight: bold;
-            margin-bottom: 20px;
-        }
-
-        main h2 {
-            font-size: 28px;
-            margin-bottom: 16px;
-        }
-
-        main h3 {
-            font-size: 24px;
-            margin-bottom: 12px;
-        }
-
-        main h4 {
-            font-size: 20px;
-            margin-bottom: 12px;
-        }
-
-        main p {
-            font-size: 16px;
-            line-height: 1.6;
-            margin-bottom: 20px;
-        }
-
-        .is-active-link {
-            font-weight: normal;
-        }
-
-        .scroll-spacer {
-            height: 300px;
-        }
-
-        /* Footer */
-        footer {
-            margin-left: 300px;
-            color: #0366d6;
-            background-color: #f9fafb;
-            padding: 40px 20px;
-            font-size: 14px;
-            max-width: 900px;
-        }
-
-        footer h3 {
-            color: #0366d6;
-        }
-
-        footer ul {
-            list-style: none;
-            padding: 0;
-        }
-
-        footer ul li a {
-            color: #0366d6;
-            text-decoration: none;
-        }
-
-        footer ul li a:hover {
-            text-decoration: underline;
-        }
-
-        footer .social-icons a img {
-            width: 20px;
-            margin-right: 10px;
-        }
-
-        .footer-container {
-            display: flex;
-            justify-content: center;
-            max-width: 1200px;
-            margin: 0 auto;
-        }
-
-        .footer-column {
-            flex: 1;
-            max-width: 300px; /* Set a max-width for each column */
-            padding: 0 20px;  /* Add padding for some space between the columns */
-        }
-    </style>
+    <link rel="stylesheet" href="default.css">
 </head>
 <body>
 
     <!-- Header -->
     <header class="header">
         <div class="logo">
+            <div class="hamburger" id="hamburger">
+                <div class="bar"></div>
+                <div class="bar"></div>
+                <div class="bar"></div>
+            </div>
+
             <a href="/">Expensify</a>
+            /
+            <!-- Dropdown for product selection -->
+            <div class="dropdown">
+                <span>{{ page.title | remove_first: 'Expensify ' }}</span>
+                <div class="dropdown-content">
+                    <a href="/expense" class="{% if page.title == 'Expensify Expense' %}active{% endif %}">Expense</a>
+                    <a href="/card" class="{% if page.title == 'Expensify Cards' %}active{% endif %}">Card</a>
+                    <a href="/travel" class="{% if page.title == 'Expensify Travel' %}active{% endif %}">Travel</a>
+                    <a href="/chat" class="{% if page.title == 'Expensify Chat' %}active{% endif %}">Chat</a>
+                    <a href="/invoice" class="{% if page.title == 'Expensify Invoice' %}active{% endif %}">Invoice</a>
+                    <a href="/billpay" class="{% if page.title == 'Expensify Billpay' %}active{% endif %}">Billpay</a>
+                </div>
+            </div>
+        </div>
+        <div id="search-container">
+            <!-- Search Input styled as button -->
+            <span id="search-icon" style="cursor: pointer; font-size: 24px;">🔍</span>
+
+            <!-- Search Modal -->
+            <div id="search-modal" style="display:none;">
+                <div id="modal-content">
+                    <div class="search-icon-wrapper">
+                        <span class="search-icon">🔍</span>
+                        <input type="text" id="search-input" placeholder="Go to..." />
+                    </div>
+                    <!-- Hidden Search Button -->
+                    <button id="search-submit" style="display:none;">Search</button>
+
+                    <!-- Search results container with tabindex to make it focusable -->
+                    <div id="search-results" tabindex="0" style="display:none;"></div>
+
+                    <!-- Footer with shortcut info -->
+                    <div id="search-footer" style="text-align: center; margin-top: 10px; font-size: 14px; color: #586069;">
+                        ⇵ Select, ↩ Go
+                    </div>
+                </div>
+            </div>
         </div>
-        <nav class="nav-links">
-            <a href="/expense" class="{% if page.title == 'Expensify Expense' %}active{% endif %}">Expense</a>
-            <a href="/card" class="{% if page.title == 'Expensify Cards' %}active{% endif %}">Card</a>
-            <a href="/travel" class="{% if page.title == 'Expensify Travel' %}active{% endif %}">Travel</a>
-            <a href="/chat" class="{% if page.title == 'Expensify Chat' %}active{% endif %}">Chat</a>
-            <a href="/invoice" class="{% if page.title == 'Expensify Invoice' %}active{% endif %}">Invoice</a>
-            <a href="/billpay" class="{% if page.title == 'Expensify Billpay' %}active{% endif %}">Billpay</a>
-        </nav>
     </header>
 
     <!-- TOC Sidebar -->
-    <nav class="toc-sidebar">
-        {% include search.html %}
+    <nav class="toc-sidebar" id="toc-sidebar">
         <div class="js-toc"></div>
     </nav>
 
     <!-- Main Content -->
+    <h1>{{ page.title }}</h1>
     <main class="js-toc-content">
         {{ content }}
 
@@ -330,73 +150,8 @@ <h3>Get Started</h3>
     </footer>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.32.1/tocbot.min.js"></script>
-    <script>
-        function updateURLHashOnScroll() {
-            const activeLink = document.querySelector('.toc-sidebar .is-active-link');
-            if (activeLink) {
-                const hash = activeLink.getAttribute('href');
-                if (history.pushState) {
-                    history.pushState(null, null, hash);
-                } else {
-                    window.location.hash = hash;
-                }
-            }
-        }
-
-        function scrollActiveLinkIntoView() {
-            const activeLink = document.querySelector('.toc-sidebar .is-active-link');
-            if (activeLink) {
-                activeLink.scrollIntoView({
-                    behavior: 'smooth',
-                    block: 'nearest'
-                });
-            }
-        }
-
-        tocbot.init({
-          tocSelector: '.js-toc',
-          contentSelector: '.js-toc-content',
-          headingSelector: 'h1, h2, h3, h4, h5, h6',
-          collapseDepth: 3,
-          orderedList: false,
-          scrollSmooth: true,
-          scrollToActive: true,
-          enableUrlHashUpdateOnScroll: false,
-          headingsOffset: 80,
-          scrollSmoothOffset: -80,
-          tocScrollingWrapper: document.querySelector('.toc-sidebar'),
-          tocScrollOffset: 80,
-          headingObjectCallback: function(obj, element) {
-            const tocTitle = element.getAttribute('data-toc-title');
-            if (tocTitle) {
-                obj.textContent = tocTitle;
-            }
-            return obj;
-          },
-          onClick: function(e) {
-              setTimeout(scrollActiveLinkIntoView, 300);
-          },
-          scrollEndCallback: function() {
-              updateURLHashOnScroll();
-              scrollActiveLinkIntoView();
-          }
-        });
-
-        function adjustAnchorOnLoad() {
-            if (window.location.hash) {
-                const element = document.querySelector(window.location.hash);
-                if (element) {
-                    window.scrollTo({
-                        top: element.getBoundingClientRect().top + window.pageYOffset - 80,
-                        behavior: 'smooth'
-                    });
-                }
-            }
-        }
-
-        window.addEventListener('load', adjustAnchorOnLoad);
-    </script>
+    <script src="https://cdn.jsdelivr.net/npm/flexsearch@0.7.31/dist/flexsearch.bundle.js"></script>
+    <script src="default.js"></script>
 
 </body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/help/_layouts/product.html b/help/_layouts/product.html
index cb8b5e882f24..89c2f92b8926 100644
--- a/help/_layouts/product.html
+++ b/help/_layouts/product.html
@@ -2,8 +2,6 @@
 layout: default
 ---
 
-<h1>{{ page.title }}</h1>
-
 <!-- Render the markdown content here -->
 <div class="product-content">
     {{ content }}
diff --git a/help/default.css b/help/default.css
new file mode 100644
index 000000000000..c71cbafcab75
--- /dev/null
+++ b/help/default.css
@@ -0,0 +1,373 @@
+body {
+    margin: 0;
+    font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", sans-serif;
+    background-color: #f9fafb;
+    color: #333;
+}
+
+/* Header styling */
+.header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    background-color: #fff;
+    padding: 15px 0px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    position: fixed;
+    top: 0;
+    width: 100%;
+    z-index: 1000;
+}
+
+.logo {
+    display: flex;
+    align-items: center;
+    font-size: 24px;
+    font-weight: bold;
+    color: #0366d6;
+    margin-left: 20px;
+}
+
+.logo a {
+    text-decoration: none;
+    color: inherit;
+}
+
+/* Dropdown styling */
+.dropdown {
+    position: relative;
+    display: inline-block;
+    font-size: 24px; /* Match the logo font size */
+    font-weight: normal;
+    text-decoration: underline;
+    color: #0366d6;
+    cursor: pointer;
+}
+
+.dropdown-content {
+    display: none;
+    position: absolute;
+    background-color: #fff;
+    min-width: 160px;
+    box-shadow: 0 8px 16px rgba(0, 0, 0, 0.2);
+    z-index: 1;
+    padding: 12px 16px;
+}
+
+.dropdown:hover .dropdown-content {
+    display: block;
+}
+
+.dropdown a {
+    text-decoration: none;
+    color: #0366d6;
+    padding: 8px 0;
+    display: block;
+}
+
+.dropdown a.active {
+    font-weight: bold;
+    background-color: #eaf5ff;
+}
+
+/* Sidebar navigation for TOC */
+.toc-sidebar {
+    width: 250px;
+    position: fixed;
+    top: 60px;
+    bottom: 0;
+    left: 0;
+    background-color: #fff;
+    padding: 20px;
+    overflow-y: auto;
+    border-right: 1px solid #eaecef;
+    box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1);
+    transform: translateY(0);
+    transition: transform 0.3s ease-in-out;
+    z-index: 999;
+}
+
+.toc-sidebar.open {
+    transform: translateY(0);
+}
+
+.toc-link::before {
+    display: none;
+}
+
+.toc-sidebar ul {
+    list-style: none;
+    padding-left: 0;
+    line-height: 1.0;
+    font-size: 15px;
+}
+
+.toc-sidebar li {
+    margin-left: 0;
+    padding-left: 0;
+}
+
+.js-toc > a {
+    font-weight: bold;
+    font-size: 18px;
+
+}
+
+.js-toc > ul > li {
+    margin-top: 25px;
+}
+
+.js-toc > ul > li > a {
+    font-weight: bold;
+}
+
+.js-toc > ul > li > ul > li > ul > li {
+    padding-left: 10px;
+}
+
+.toc-sidebar a {
+    word-wrap: break-word;
+    display: block;
+    padding: 1px 10px;
+    margin-bottom: 5px;
+    text-decoration: none;
+    color: #0366d6;
+    border-radius: 6px;
+}
+
+.toc-sidebar a:hover {
+    background-color: #f1f8ff;
+    text-decoration: none;
+}
+
+.toc-sidebar .is-active-link {
+    background-color: #eaf5ff;
+    color: #0366d6;
+    border-radius: 6px;
+}
+
+/* Main content area */
+main {
+    margin-left: 300px;
+    padding: 20px;
+    flex-grow: 1;
+    max-width: 900px;
+}
+
+main h1 {
+    display: none;
+}
+
+main h2 {
+    font-size: 28px;
+    margin-bottom: 16px;
+}
+
+main h3 {
+    font-size: 24px;
+    margin-bottom: 12px;
+}
+
+main h4 {
+    font-size: 20px;
+    margin-bottom: 12px;
+}
+
+main p {
+    font-size: 16px;
+    line-height: 1.6;
+    margin-bottom: 20px;
+}
+
+.is-active-link {
+    font-weight: normal;
+}
+
+.scroll-spacer {
+    height: 300px;
+}
+
+/* Footer */
+footer {
+    margin-left: 300px;
+    color: #0366d6;
+    background-color: #f9fafb;
+    padding: 40px 20px;
+    font-size: 14px;
+    max-width: 900px;
+}
+
+footer h3 {
+    color: #0366d6;
+}
+
+footer ul {
+    list-style: none;
+    padding: 0;
+}
+
+footer ul li a {
+    color: #0366d6;
+    text-decoration: none;
+}
+
+footer ul li a:hover {
+    text-decoration: underline;
+}
+
+footer .social-icons a img {
+    width: 20px;
+    margin-right: 10px;
+}
+
+.footer-container {
+    display: flex;
+    justify-content: center;
+    max-width: 1200px;
+    margin: 0 auto;
+}
+
+.footer-column {
+    flex: 1;
+    max-width: 300px; /* Set a max-width for each column */
+    padding: 0 20px;  /* Add padding for some space between the columns */
+}
+
+/* Mobile Styles */
+.hamburger {
+    display: none;
+    cursor: pointer;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 24px;
+    height: 18px;
+}
+
+.bar {
+    height: 3px;
+    width: 100%;
+    background-color: #0366d6;
+    border-radius: 10px;
+}
+
+@media (max-width: 768px) {
+
+    .hamburger {
+        display: flex;
+        margin-right: 20px;
+    }
+
+    .toc-sidebar {
+        transform: translateY(-100%);
+        width: 100%;
+    }
+
+    main {
+        margin-left: 0;
+        padding: 20px;
+        max-width: 100%;
+    }
+
+    footer {
+        display: none;
+    }
+}
+
+/* Modal background */
+#search-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.7);
+    z-index: 1000;
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+}
+
+/* Modal content */
+#modal-content {
+    top: 20%;
+    background: white;
+    padding: 20px;
+    width: 60%;
+    max-width: 600px;
+    position: relative;
+    border-radius: 6px;
+    box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+}
+
+/* Search input with magnifying glass */
+.search-icon-wrapper {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    padding: 8px;
+    border: 1px solid #eaecef;
+    border-radius: 6px;
+    box-sizing: border-box;
+}
+
+.search-icon {
+    font-size: 18px;
+    margin-right: 8px;
+}
+
+/* Updated input style */
+#search-input {
+    width: 100%;
+    border: none;
+    outline: none;
+    font-size: 20px;
+}
+
+/* Search results */
+#search-results {
+    margin-top: 20px;
+    max-height: 300px;
+    overflow-y: auto;
+    border-top: 1px solid #eaecef;
+    padding-top: 10px;
+    outline: none; /* Disable the strong outline */
+}
+
+.search-result {
+    margin-bottom: 15px;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #eaecef;
+}
+
+.search-result-title {
+    font-weight: bold;
+    margin-bottom: 5px;
+    color: #0366d6;
+    text-decoration: none;
+}
+
+.search-result-title:hover {
+    text-decoration: underline;
+}
+
+.search-result-context {
+    font-size: 14px;
+    color: #586069;
+}
+
+/* Highlighted search result */
+.highlight {
+    background-color: #eaecef;
+}
+
+/* Softer focus style for search results */
+#search-results:focus {
+    border: 2px solid #ddd; /* Softer border on focus */
+    outline: none;
+}
+
+/* Soft yellow highlight for selected section */
+.highlight-section {
+    background-color: #fffbcc;
+    transition: background-color 0.3s ease;
+}
\ No newline at end of file
diff --git a/help/default.js b/help/default.js
new file mode 100644
index 000000000000..1c27ade6c9e1
--- /dev/null
+++ b/help/default.js
@@ -0,0 +1,267 @@
+function updateURLHashOnScroll() {
+    const activeLink = document.querySelector('.toc-sidebar .is-active-link');
+    if (!activeLink) {
+        return;
+    }
+    const hash = activeLink.getAttribute('href');
+    if (window.history.pushState) {
+        window.history.pushState(null, null, hash);
+    } else {
+        window.location.hash = hash;
+    }
+}
+
+function scrollActiveLinkIntoView() {
+    const activeLink = document.querySelector('.toc-sidebar .is-active-link');
+    if (activeLink) {
+        activeLink.scrollIntoView({
+            behavior: 'smooth',
+            block: 'nearest',
+        });
+    }
+}
+
+// Assuming tocbot is globally defined
+window.tocbot.init({
+    tocSelector: '.js-toc',
+    contentSelector: '.js-toc-content',
+    headingSelector: 'h1, h2, h3, h4, h5, h6',
+    collapseDepth: 4,
+    orderedList: false,
+    scrollSmooth: true,
+    scrollToActive: true,
+    enableUrlHashUpdateOnScroll: false,
+    headingsOffset: 80,
+    scrollSmoothOffset: -80,
+    tocScrollingWrapper: document.querySelector('.toc-sidebar'),
+    tocScrollOffset: 80,
+    headingObjectCallback(obj, element) {
+        const tocTitle = element.getAttribute('data-toc-title');
+        if (tocTitle) {
+            const newObj = {...obj};
+            newObj.textContent = tocTitle;
+            return newObj;
+        }
+        return obj;
+    },
+    onClick() {
+        setTimeout(scrollActiveLinkIntoView, 300);
+        document.getElementById('toc-sidebar').classList.remove('open');
+    },
+    scrollEndCallback() {
+        updateURLHashOnScroll();
+        scrollActiveLinkIntoView();
+    },
+});
+
+function adjustAnchorOnLoad() {
+    if (!window.location.hash) {
+        return;
+    }
+    const element = document.querySelector(window.location.hash);
+    if (element) {
+        window.scrollTo({
+            top: element.getBoundingClientRect().top + window.pageYOffset - 80,
+            behavior: 'smooth',
+        });
+    }
+}
+
+window.addEventListener('load', adjustAnchorOnLoad);
+
+// Toggle sidebar on hamburger click
+document.getElementById('hamburger').addEventListener('click', function () {
+    const sidebar = document.getElementById('toc-sidebar');
+    sidebar.classList.toggle('open');
+});
+
+// Keep track of the search results
+let g_searchResultsArray = [];
+let g_currentSelectionIndex = -1;
+
+// Declare the index variable globally so it can be reused
+let g_index = null;
+
+// Look up some commonly used elements once
+const g_searchIcon = document.getElementById('search-icon');
+const g_searchModal = document.getElementById('search-modal');
+const g_searchResults = document.getElementById('search-results');
+const g_searchInput = document.getElementById('search-input');
+
+// Show and initialize the search modal
+function showSearchModal() {
+    g_searchModal.style.display = 'flex';
+    if (g_searchResultsArray.length > 0) {
+        g_searchResults.style.display = 'block';
+        g_searchResults.focus();
+    } else {
+        g_searchInput.focus();
+    }
+}
+
+// Open modal when search icon is clicked
+g_searchIcon.addEventListener('click', showSearchModal);
+
+// Open modal when Cmd+K is pressed
+document.addEventListener('keydown', function (event) {
+    if (!(event.metaKey && event.key === 'k')) {
+        return;
+    }
+    event.preventDefault();
+    showSearchModal();
+});
+
+// Close modal when pressing "Escape"
+document.addEventListener('keydown', function (event) {
+    if (!(event.key === 'Escape' && g_searchModal.style.display === 'flex')) {
+        return;
+    }
+    g_searchModal.style.display = 'none';
+});
+
+// Close modal when clicking outside of modal content
+window.addEventListener('click', function (event) {
+    if (!(event.target === g_searchModal)) {
+        return;
+    }
+    g_searchModal.style.display = 'none';
+});
+
+// Handle keyboard navigation (arrow keys and enter)
+g_searchResults.addEventListener('keydown', function (event) {
+    if (g_searchModal.style.display !== 'flex' || g_searchResultsArray.length === 0) {
+        return;
+    }
+    if (event.key === 'ArrowDown') {
+        event.preventDefault();
+        selectNextResult();
+    } else if (event.key === 'ArrowUp') {
+        event.preventDefault();
+        selectPreviousResult();
+    } else if (event.key === 'Enter' && g_currentSelectionIndex >= 0) {
+        event.preventDefault();
+        navigateToSelectedResult();
+    } else if (!['Tab', 'Shift'].includes(event.key)) {
+        g_searchInput.focus();
+    }
+});
+
+function selectNextResult() {
+    if (g_currentSelectionIndex >= g_searchResultsArray.length - 1) {
+        return;
+    }
+    g_currentSelectionIndex++;
+    updateSelectedResult();
+}
+
+function selectPreviousResult() {
+    if (g_currentSelectionIndex <= 0) {
+        return;
+    }
+    g_currentSelectionIndex--;
+    updateSelectedResult();
+}
+
+function updateSelectedResult() {
+    g_searchResultsArray.forEach((result, index) => {
+        if (index === g_currentSelectionIndex) {
+            result.classList.add('highlight');
+            result.scrollIntoView({behavior: 'smooth', block: 'nearest'});
+        } else {
+            result.classList.remove('highlight');
+        }
+    });
+}
+
+function navigateToSelectedResult() {
+    const selectedResult = g_searchResultsArray[g_currentSelectionIndex];
+    const link = selectedResult.querySelector('a');
+    if (link) {
+        link.click();
+    }
+}
+
+// Execute search when pressing "Enter" in the input field
+g_searchInput.addEventListener('keydown', function (event) {
+    if (!(event.key === 'Enter')) {
+        return;
+    }
+    event.preventDefault();
+    document.getElementById('search-submit').click();
+});
+
+// Perform search when search button is clicked
+// Assuming search-submit is defined
+document.getElementById('search-submit').addEventListener('click', function () {
+    const query = g_searchInput.value.trim().toLowerCase();
+    g_searchResults.innerHTML = '';
+    g_currentSelectionIndex = -1;
+
+    if (query.length === 0) {
+        g_searchResults.style.display = 'none';
+        return;
+    }
+
+    if (g_index === null) {
+        // Assuming the fetch works correctly without console.log
+        fetch('/searchIndex.json')
+            .then((response) => response.json())
+            .then((indexData) => {
+                g_index = new window.FlexSearch.Document({
+                    document: {
+                        id: 'id',
+                        index: ['content'],
+                        store: ['title', 'url', 'content'],
+                    },
+                });
+
+                for (const [key, data] of Object.entries(indexData)) {
+                    g_index.import(key, data);
+                }
+
+                performSearch(query);
+            });
+    } else {
+        performSearch(query);
+    }
+});
+
+function performSearch(query) {
+    const results = g_index.search({
+        query,
+        field: 'content',
+    });
+
+    if (results && results.length > 0) {
+        g_searchResultsArray = [];
+        results.forEach((result) => {
+            result.result.forEach((docId) => {
+                const doc = g_index.store[docId];
+                if (doc && doc.content) {
+                    const searchTermIndex = doc.content.toLowerCase().indexOf(query);
+                    const contextBefore = doc.content.substring(Math.max(0, searchTermIndex - 30), searchTermIndex);
+                    const contextAfter = doc.content.substring(searchTermIndex + query.length, Math.min(doc.content.length, searchTermIndex + query.length + 30));
+                    const searchResultHtml = `
+                        <div class="search-result">
+                            <a href="${doc.url}" class="search-result-title">${doc.title}</a>
+                            <div class="search-result-context">...${contextBefore}<strong>${query}</strong>${contextAfter}...</div>
+                        </div>
+                    `;
+                    const resultElement = document.createElement('div');
+                    resultElement.innerHTML = searchResultHtml;
+                    g_searchResults.appendChild(resultElement);
+                    g_searchResultsArray.push(resultElement);
+
+                    if (g_searchResultsArray.length === 1) {
+                        g_currentSelectionIndex = 0;
+                        updateSelectedResult();
+                    }
+                }
+            });
+        });
+        g_searchResults.style.display = 'block';
+        g_searchResults.focus();
+    } else {
+        g_searchResults.style.display = 'none';
+    }
+}
diff --git a/help/index.md b/help/index.md
index 45366fecae11..e5c79ece08af 100644
--- a/help/index.md
+++ b/help/index.md
@@ -1,11 +1,11 @@
 ---
 layout: product
-title: Expensify
+title: Help
 ---
 ## Introduction
 The Expensify Superapp combines 6 world-class business, finance, and collaboration products into one app. It works identically on desktop and mobile, with colleagues and customers, and for personal use.
 
-### Main uses
+### [Main uses] What does Expensify do?
 Expensify can do a lot. You should check us out whenever you need to:
 * **Track and manage expenses** - Whether reimbursing employee receipts, deducting personal expenses, or splitting a bill, Expensify Expense is for you.
 * **Issue corporate cards** - Skip reimbursement and capture receipts in real-time by issuing the Expensify Card to yourself and employees.
@@ -16,7 +16,7 @@ Expensify can do a lot. You should check us out whenever you need to:
 
 If you send, receive, or spend money – or talk to anyone about anything – Expensify is for you.
 
-### Core users
+### [Core users] Who should use Expensify?
 Expensify offers something for everyone. Common users include:
 * **Individuals** - Millions track personal expenses to maximize deductions, stay within budgets, or see where money goes.
 * **Friends** - Split bills with friends for rent, parties, or drinks.
@@ -27,7 +27,7 @@ Expensify offers something for everyone. Common users include:
 
 If you're online doing anything, Expensify can probably help.
 
-### Key advantages
+### [Key advantages] Why should you use Expensify?
 You've got options, but use Expensify because it is:
 * **Simple enough for individuals** - A simple tool without overwhelming functionality or language.
 * **Powerful enough for enterprises** - It scales up to reveal sophisticated features only when needed. Used by public companies, multinationals, and more.
@@ -502,4 +502,4 @@ Members using paid functionality on multiple workspaces in a month aren't billed
 The billing page is currently under development and will be available soon. Stay tuned for updates on how to access and use the new billing features.
 
 #### [Recovery Codes Usage] How do I use my recovery codes if I lose access to my authenticator app?
-Your recovery codes work the same way as your authenticator codes. Just enter a recovery code as you would the authenticator code.
\ No newline at end of file
+Your recovery codes work the same way as your authenticator codes. Just enter a recovery code as you would the authenticator code.
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 67868734116e..d2577911d8e8 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.63.2</string>
+	<string>9.0.63.3</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 4eb3c8bc116f..3b6df8fa0017 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.63.2</string>
+	<string>9.0.63.3</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index e9b60076f29c..47515260d65c 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.63</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.63.2</string>
+	<string>9.0.63.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index b55b187bb8ac..4caba424161e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "9.0.63-2",
+  "version": "9.0.63-3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "9.0.63-2",
+      "version": "9.0.63-3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 936e34b1e727..766126a91393 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.63-2",
+  "version": "9.0.63-3",
   "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.",
diff --git a/src/CONST.ts b/src/CONST.ts
index 2c1595f8ca53..484c08dae0ea 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -134,7 +134,7 @@ const onboardingEmployerOrSubmitMessage: OnboardingMessage = {
                 '\n' +
                 'Here’s how to set up your bank account:\n' +
                 '\n' +
-                '1. Click your profile picture.\n' +
+                '1. Click the settings tab.\n' +
                 '2. Click *Wallet* > *Bank accounts* > *+ Add bank account*.\n' +
                 '3. Connect your bank account.\n' +
                 '\n' +
@@ -172,7 +172,7 @@ const combinedTrackSubmitOnboardingEmployerOrSubmitMessage: OnboardingMessage =
                 '\n' +
                 'Here’s how to set up your bank account:\n' +
                 '\n' +
-                '1. Click your profile picture.\n' +
+                '1. Click the settings tab.\n' +
                 '2. Click *Wallet* > *Bank accounts* > *+ Add bank account*.\n' +
                 '3. Connect your bank account.\n' +
                 '\n' +
@@ -274,6 +274,7 @@ type OnboardingTask = {
                   workspaceMembersLink: string;
                   integrationName: string;
                   workspaceAccountingLink: string;
+                  workspaceSettingsLink: string;
                   navatticURL: string;
               }>,
           ) => string);
@@ -4896,7 +4897,7 @@ const CONST = {
                         '\n' +
                         'Here’s how to create a workspace:\n' +
                         '\n' +
-                        '1. Click your profile picture.\n' +
+                        '1. Click the settings tab.\n' +
                         '2. Click *Workspaces* > *New workspace*.\n' +
                         '\n' +
                         '*Your new workspace is ready! It’ll keep all of your spend (and chats) in one place.*',
@@ -4911,6 +4912,15 @@ const CONST = {
                         '\n' +
                         `Chat with the specialist in your [#admins room](${adminsRoomLink}).`,
                 },
+                {
+                    type: 'setupCategoriesAndTags',
+                    autoCompleted: false,
+                    title: 'Set up categories and tags',
+                    description: ({workspaceSettingsLink, workspaceAccountingLink}) =>
+                        '*Set up categories and tags* so your team can code expenses for easy reporting.\n' +
+                        '\n' +
+                        `Import them automatically by [connecting your accounting software](${workspaceAccountingLink}), or set them up manually in your [workspace settings](${workspaceSettingsLink}).`,
+                },
                 {
                     type: 'setupCategories',
                     autoCompleted: false,
@@ -4920,7 +4930,7 @@ const CONST = {
                         '\n' +
                         'Here’s how to set up categories:\n' +
                         '\n' +
-                        '1. Click your profile picture.\n' +
+                        '1. Click the settings tab.\n' +
                         '2. Go to *Workspaces*.\n' +
                         '3. Select your workspace.\n' +
                         '4. Click *Categories*.\n' +
@@ -4939,7 +4949,7 @@ const CONST = {
                         '\n' +
                         '*Here’s how to set up tags:*\n' +
                         '\n' +
-                        '1. Click your profile picture.\n' +
+                        '1. Click the settings tab.\n' +
                         '2. Go to Workspaces.\n' +
                         '3. Select your workspace.\n' +
                         '4. Click More features.\n' +
@@ -4958,7 +4968,7 @@ const CONST = {
                         '\n' +
                         'Here’s how to add expense approvals:\n' +
                         '\n' +
-                        '1. Click your profile picture.\n' +
+                        '1. Click the settings tab.\n' +
                         '2. Go to Workspaces.\n' +
                         '3. Select your workspace.\n' +
                         '4. Click *More features*.\n' +
@@ -4977,7 +4987,7 @@ const CONST = {
                         '\n' +
                         'Here’s how to invite your team:\n' +
                         '\n' +
-                        '1. Click your profile picture.\n' +
+                        '1. Click the settings tab.\n' +
                         '2. Go to Workspaces.\n' +
                         '3. Select your workspace.\n' +
                         '4. Click *Members* > *Invite member*.\n' +
@@ -5064,7 +5074,7 @@ const CONST = {
                         '\n' +
                         'Here’s how to set up your bank account:\n' +
                         '\n' +
-                        '1. Click your profile picture.\n' +
+                        '1. Click the settings tab.\n' +
                         '2. Click *Wallet* > *Bank accounts* > *+ Add bank account*.\n' +
                         '3. Connect your bank account.\n' +
                         '\n' +
@@ -5098,7 +5108,7 @@ const CONST = {
                     description:
                         "Here's how to review and update your workspace settings:" +
                         '\n' +
-                        '1. Click your profile picture.' +
+                        '1. Click the settings tab.' +
                         '2. Click *Workspaces* > [Your workspace].' +
                         '\n' +
                         "Make any changes there and we'll track them in the #admins room.",
@@ -5857,6 +5867,12 @@ const CONST = {
             DONT_UNDERSTAND: 'dontUnderstand',
             PREFER_CLASSIC: 'preferClassic',
         },
+        BENEFIT: {
+            CHATTING_DIRECTLY: 'chattingDirectly',
+            EVERYTHING_MOBILE: 'everythingMobile',
+            TRAVEL_EXPENSE: 'travelExpense',
+        },
+        BOOK_MEETING_LINK: 'https://calendly.com/d/cqsm-2gm-fxr/expensify-product-team',
     },
 
     SESSION_STORAGE_KEYS: {
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 9f9b4070ec1d..29dd7530f80f 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -256,7 +256,14 @@ const ROUTES = {
         getRoute: (source: string) => `settings/troubleshoot/console/share-log?source=${encodeURI(source)}` as const,
     },
 
-    SETTINGS_EXIT_SURVEY_REASON: 'settings/exit-survey/reason',
+    SETTINGS_EXIT_SURVEY_REASON: {
+        route: 'settings/exit-survey/reason',
+        getRoute: (backTo?: string) => getUrlWithBackToParam('settings/exit-survey/reason', backTo),
+    },
+    SETTINGS_EXIT_SURVERY_BOOK_CALL: {
+        route: 'settings/exit-survey/book-call',
+        getRoute: (backTo?: string) => getUrlWithBackToParam('settings/exit-survey/book-call', backTo),
+    },
     SETTINGS_EXIT_SURVEY_RESPONSE: {
         route: 'settings/exit-survey/response',
         getRoute: (reason?: ValueOf<typeof CONST.EXIT_SURVEY.REASONS>, backTo?: string) =>
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 81fc08775356..543e8708fea3 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -116,6 +116,7 @@ const SCREENS = {
         },
 
         EXIT_SURVEY: {
+            BOOK_CALL: 'Settings_ExitSurvey_Book_Call',
             REASON: 'Settings_ExitSurvey_Reason',
             RESPONSE: 'Settings_ExitSurvey_Response',
             CONFIRM: 'Settings_ExitSurvey_Confirm',
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx
index 94a46d861dde..89a9fb21d48f 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx
@@ -34,7 +34,7 @@ const getMentionDetails = (htmlAttributeReportID: string, currentReport: OnyxEnt
     if (!isEmpty(htmlAttributeReportID)) {
         const report = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${htmlAttributeReportID}`];
         reportID = report?.reportID ?? htmlAttributeReportID;
-        mentionDisplayText = removeLeadingLTRAndHash(report?.reportName ?? report?.displayName ?? htmlAttributeReportID);
+        mentionDisplayText = removeLeadingLTRAndHash(report?.reportName ?? htmlAttributeReportID);
         // Get mention details from name inside tnode
     } else if ('data' in tnode && !isEmptyObject(tnode.data)) {
         mentionDisplayText = removeLeadingLTRAndHash(tnode.data);
diff --git a/src/components/ProcessMoneyReportHoldMenu.tsx b/src/components/ProcessMoneyReportHoldMenu.tsx
index 3d6ad9006dc5..f1a72cc7fb8e 100644
--- a/src/components/ProcessMoneyReportHoldMenu.tsx
+++ b/src/components/ProcessMoneyReportHoldMenu.tsx
@@ -4,6 +4,7 @@ import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import Navigation from '@libs/Navigation/Navigation';
 import {isLinkedTransactionHeld} from '@libs/ReportActionsUtils';
+import playSound, {SOUNDS} from '@libs/Sound';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -74,6 +75,7 @@ function ProcessMoneyReportHoldMenu({
             if (startAnimation) {
                 startAnimation();
             }
+            playSound(SOUNDS.SUCCESS);
             IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport, full);
         }
         onClose();
diff --git a/src/components/Search/SearchFiltersChatsSelector.tsx b/src/components/Search/SearchFiltersChatsSelector.tsx
index 36b56867b99f..47cd2a6086d4 100644
--- a/src/components/Search/SearchFiltersChatsSelector.tsx
+++ b/src/components/Search/SearchFiltersChatsSelector.tsx
@@ -24,8 +24,6 @@ const defaultListOptions = {
     userToInvite: null,
     currentUserOption: null,
     categoryOptions: [],
-    tagOptions: [],
-    taxRatesOptions: [],
     headerMessage: '',
 };
 
diff --git a/src/components/Search/SearchFiltersParticipantsSelector.tsx b/src/components/Search/SearchFiltersParticipantsSelector.tsx
index e7a60a5dc212..1e0c3ca8aae7 100644
--- a/src/components/Search/SearchFiltersParticipantsSelector.tsx
+++ b/src/components/Search/SearchFiltersParticipantsSelector.tsx
@@ -26,8 +26,6 @@ const defaultListOptions = {
     currentUserOption: null,
     headerMessage: '',
     categoryOptions: [],
-    tagOptions: [],
-    taxRatesOptions: [],
 };
 
 function getSelectedOptionData(option: Option): OptionData {
diff --git a/src/components/Search/SearchRouter/SearchRouter.tsx b/src/components/Search/SearchRouter/SearchRouter.tsx
index e65b12deb64b..4c57c0d1f63f 100644
--- a/src/components/Search/SearchRouter/SearchRouter.tsx
+++ b/src/components/Search/SearchRouter/SearchRouter.tsx
@@ -72,7 +72,7 @@ function SearchRouter({onRouterClose}: SearchRouterProps) {
     const {options, areOptionsInitialized} = useOptionsList();
     const searchOptions = useMemo(() => {
         if (!areOptionsInitialized) {
-            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: [], tagOptions: [], taxRatesOptions: []};
+            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: []};
         }
         return OptionsListUtils.getSearchOptions(options, '', betas ?? []);
     }, [areOptionsInitialized, betas, options]);
diff --git a/src/components/Search/SearchRouter/SearchRouterList.tsx b/src/components/Search/SearchRouter/SearchRouterList.tsx
index da300f12eb9b..b16894f65f51 100644
--- a/src/components/Search/SearchRouter/SearchRouterList.tsx
+++ b/src/components/Search/SearchRouter/SearchRouterList.tsx
@@ -124,7 +124,7 @@ function SearchRouterItem(props: UserListItemProps<OptionData> | SearchQueryList
     }
     return (
         <UserListItem
-            pressableStyle={[styles.br2]}
+            pressableStyle={[styles.br2, styles.ph3]}
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
@@ -305,7 +305,7 @@ function SearchRouterList(
             ListItem={SearchRouterItem}
             containerStyle={[styles.mh100]}
             sectionListStyle={[shouldUseNarrowLayout ? styles.ph5 : styles.ph2, styles.pb2]}
-            listItemWrapperStyle={[styles.pr3, styles.pl3]}
+            listItemWrapperStyle={[styles.pr0, styles.pl0]}
             getItemHeight={getItemHeight}
             onLayout={setPerformanceTimersEnd}
             ref={ref}
diff --git a/src/components/SettlementButton/index.tsx b/src/components/SettlementButton/index.tsx
index c2b2d462aa41..ed1d8fd73565 100644
--- a/src/components/SettlementButton/index.tsx
+++ b/src/components/SettlementButton/index.tsx
@@ -213,7 +213,9 @@ function SettlementButton({
             return;
         }
 
-        playSound(SOUNDS.SUCCESS);
+        if (!ReportUtils.hasHeldExpenses(iouReport?.reportID)) {
+            playSound(SOUNDS.SUCCESS);
+        }
         onPress(iouPaymentType);
     };
 
diff --git a/src/components/TaxPicker.tsx b/src/components/TaxPicker.tsx
index a91965811d81..4cb92eda3f10 100644
--- a/src/components/TaxPicker.tsx
+++ b/src/components/TaxPicker.tsx
@@ -6,7 +6,7 @@ import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import * as IOUUtils from '@libs/IOUUtils';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as PolicyUtils from '@libs/PolicyUtils';
+import * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import type {IOUAction} from '@src/CONST';
@@ -20,11 +20,9 @@ type TaxPickerProps = {
     selectedTaxRate?: string;
 
     /** ID of the policy */
-    // eslint-disable-next-line react/no-unused-prop-types
     policyID?: string;
 
     /** ID of the transaction */
-    // eslint-disable-next-line react/no-unused-prop-types
     transactionID?: string;
 
     /**
@@ -34,10 +32,9 @@ type TaxPickerProps = {
     insets?: EdgeInsets;
 
     /** Callback to fire when a tax is pressed */
-    onSubmit: (tax: OptionsListUtils.TaxRatesOption) => void;
+    onSubmit: (tax: TaxOptionsListUtils.TaxRatesOption) => void;
 
     /** The action to take */
-    // eslint-disable-next-line react/no-unused-prop-types
     action?: IOUAction;
 
     /** The type of IOU */
@@ -50,12 +47,17 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const [searchValue, setSearchValue] = useState('');
-    const policy = PolicyUtils.getPolicy(policyID);
-    const [draftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`);
-    const [defaultTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
     const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`);
 
-    const transaction = IOUUtils.shouldUseTransactionDraft(action) ? draftTransaction : defaultTransaction;
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+    const [transaction] = useOnyx(
+        (() => {
+            if (IOUUtils.shouldUseTransactionDraft(action)) {
+                return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`;
+            }
+            return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+        })(),
+    );
 
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
@@ -67,7 +69,7 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
 
     const shouldShowTextInput = !isTaxRatesCountBelowThreshold;
 
-    const selectedOptions = useMemo(() => {
+    const selectedOptions = useMemo<TaxOptionsListUtils.Tax[]>(() => {
         if (!selectedTaxRate) {
             return [];
         }
@@ -82,7 +84,13 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
     }, [selectedTaxRate]);
 
     const sections = useMemo(
-        () => OptionsListUtils.getTaxRatesSection(policy, selectedOptions as OptionsListUtils.Tax[], searchValue, currentTransaction),
+        () =>
+            TaxOptionsListUtils.getTaxRatesSection({
+                policy,
+                searchValue,
+                selectedOptions,
+                transaction: currentTransaction,
+            }),
         [searchValue, selectedOptions, policy, currentTransaction],
     );
 
@@ -91,7 +99,7 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
     const selectedOptionKey = useMemo(() => sections?.at(0)?.data?.find((taxRate) => taxRate.searchText === selectedTaxRate)?.keyForList, [sections, selectedTaxRate]);
 
     const handleSelectRow = useCallback(
-        (newSelectedOption: OptionsListUtils.TaxRatesOption) => {
+        (newSelectedOption: TaxOptionsListUtils.TaxRatesOption) => {
             if (selectedOptionKey === newSelectedOption.keyForList) {
                 onDismiss();
                 return;
diff --git a/src/components/ValidateCodeActionModal/index.tsx b/src/components/ValidateCodeActionModal/index.tsx
index b848cb501b0f..f715fd8ef136 100644
--- a/src/components/ValidateCodeActionModal/index.tsx
+++ b/src/components/ValidateCodeActionModal/index.tsx
@@ -38,7 +38,7 @@ function ValidateCodeActionModal({
 
     const hide = useCallback(() => {
         clearError();
-        onClose();
+        onClose?.();
     }, [onClose, clearError]);
 
     useEffect(() => {
diff --git a/src/components/ValidateCodeActionModal/type.ts b/src/components/ValidateCodeActionModal/type.ts
index 2682ac3a6ea3..2fbf88768e62 100644
--- a/src/components/ValidateCodeActionModal/type.ts
+++ b/src/components/ValidateCodeActionModal/type.ts
@@ -15,7 +15,7 @@ type ValidateCodeActionModalProps = {
     descriptionSecondary?: string | null;
 
     /** Function to call when the user closes the modal */
-    onClose: () => void;
+    onClose?: () => void;
 
     /** Function to be called when the modal is closed */
     onModalHide?: () => void;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1a703f1bea1b..5c72a1ad21c5 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -4976,6 +4976,19 @@ const translations = {
         offlineTitle: "Looks like you're stuck here...",
         offline:
             "You appear to be offline. Unfortunately, Expensify Classic doesn't work offline, but New Expensify does. If you prefer to use Expensify Classic, try again when you have an internet connection.",
+        quickTip: 'Quick tip...',
+        quickTipSubTitle: 'You can go straight to Expensify Classic by visiting expensify.com. Bookmark it for an easy shortcut!',
+        bookACall: 'Book a call',
+        noThanks: 'No thanks',
+        bookACallTitle: 'Would you like to speak to a product manager?',
+        benefits: {
+            [CONST.EXIT_SURVEY.BENEFIT.CHATTING_DIRECTLY]: 'Chatting directly on expenses and reports',
+            [CONST.EXIT_SURVEY.BENEFIT.EVERYTHING_MOBILE]: 'Ability to do everything on mobile',
+            [CONST.EXIT_SURVEY.BENEFIT.TRAVEL_EXPENSE]: 'Travel and expense at the speed of chat',
+        },
+        bookACallTextTop: 'By switching to Expensify Classic, you will miss out on:',
+        bookACallTextBottom: 'We’d be excited to get on a call with you to understand why. You can book a call with one of our senior product managers to discuss your needs.',
+        takeMeToExpensifyClassic: 'Take me to Expensify Classic',
     },
     listBoundary: {
         errorMessage: 'An error occurred while loading more messages.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 2bb66cec6548..1f79dfa9b7b5 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -5491,6 +5491,19 @@ const translations = {
         offlineTitle: 'Parece que estás atrapado aquí...',
         offline:
             'Parece que estás desconectado. Desafortunadamente, Expensify Classic no funciona sin conexión, pero New Expensify sí. Si prefieres utilizar Expensify Classic, inténtalo de nuevo cuando tengas conexión a internet.',
+        quickTip: 'Consejo rápido...',
+        quickTipSubTitle: 'Puedes ir directamente a Expensify Classic visitando expensify.com. Márcalo como favorito para tener un acceso directo fácil.',
+        bookACall: 'Reservar una llamada',
+        noThanks: 'No, gracias',
+        bookACallTitle: '¿Desea hablar con un responsable de producto?',
+        benefits: {
+            [CONST.EXIT_SURVEY.BENEFIT.CHATTING_DIRECTLY]: 'Chat directo sobre gastos e informes',
+            [CONST.EXIT_SURVEY.BENEFIT.EVERYTHING_MOBILE]: 'Posibilidad de hacerlo todo desde el móvil',
+            [CONST.EXIT_SURVEY.BENEFIT.TRAVEL_EXPENSE]: 'Viajes y gastos a la velocidad del chat',
+        },
+        bookACallTextTop: 'Al cambiar a Expensify Classic, se perderá:',
+        bookACallTextBottom: 'Nos encantaría hablar con usted para entender por qué. Puede concertar una llamada con uno de nuestros jefes de producto para hablar de sus necesidades.',
+        takeMeToExpensifyClassic: 'Llévame a Expensify Classic',
     },
     listBoundary: {
         errorMessage: 'Se ha producido un error al cargar más mensajes.',
diff --git a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
index 78eb0adecc5e..d999f96fb505 100644
--- a/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/CategorizeTrackedExpenseParams.ts
@@ -20,6 +20,8 @@ type CategorizeTrackedExpenseParams = {
     taxCode: string;
     taxAmount: number;
     billable?: boolean;
+    waypoints?: string;
+    customUnitRateID?: string;
 };
 
 export default CategorizeTrackedExpenseParams;
diff --git a/src/libs/API/parameters/ShareTrackedExpenseParams.ts b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
index cee4bc40d9ac..c89c0d400e72 100644
--- a/src/libs/API/parameters/ShareTrackedExpenseParams.ts
+++ b/src/libs/API/parameters/ShareTrackedExpenseParams.ts
@@ -20,6 +20,8 @@ type ShareTrackedExpenseParams = {
     taxCode: string;
     taxAmount: number;
     billable?: boolean;
+    customUnitRateID?: string;
+    waypoints?: string;
 };
 
 export default ShareTrackedExpenseParams;
diff --git a/src/libs/DebugUtils.ts b/src/libs/DebugUtils.ts
index 2f0da08b194d..d0e203342aba 100644
--- a/src/libs/DebugUtils.ts
+++ b/src/libs/DebugUtils.ts
@@ -57,7 +57,6 @@ const REPORT_BOOLEAN_PROPERTIES: Array<keyof Report> = [
     'hasOutstandingChildRequest',
     'hasOutstandingChildTask',
     'isOwnPolicyExpenseChat',
-    'isPolicyExpenseChat',
     'isPinned',
     'hasParentAccess',
     'isDeletedParentAction',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 71de9bc420d6..8c0d45e8c313 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -373,6 +373,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.REPORT_CARD_LOST_OR_DAMAGED]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ReportCardLostPage').default,
     [SCREENS.KEYBOARD_SHORTCUTS]: () => require<ReactComponentModule>('../../../../pages/KeyboardShortcutsPage').default,
     [SCREENS.SETTINGS.EXIT_SURVEY.REASON]: () => require<ReactComponentModule>('../../../../pages/settings/ExitSurvey/ExitSurveyReasonPage').default,
+    [SCREENS.SETTINGS.EXIT_SURVEY.BOOK_CALL]: () => require<ReactComponentModule>('../../../../pages/settings/ExitSurvey/ExitSurveyBookCall').default,
     [SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE]: () => require<ReactComponentModule>('../../../../pages/settings/ExitSurvey/ExitSurveyResponsePage').default,
     [SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM]: () => require<ReactComponentModule>('../../../../pages/settings/ExitSurvey/ExitSurveyConfirmPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/import/QuickbooksImportPage').default,
diff --git a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
index 7c9f9775cd09..16a4b2613d8f 100755
--- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
@@ -37,7 +37,6 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial<Record<CentralPaneName, string[]>> =
         SCREENS.SETTINGS.WALLET.CARD_ACTIVATE,
         SCREENS.SETTINGS.WALLET.REPORT_VIRTUAL_CARD_FRAUD,
         SCREENS.SETTINGS.WALLET.CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS,
-        SCREENS.SETTINGS.WALLET.VERIFY_ACCOUNT,
     ],
     [SCREENS.SETTINGS.SECURITY]: [
         SCREENS.SETTINGS.TWO_FACTOR_AUTH,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index c7c9eb10d7d3..e0cd018086bd 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -882,7 +882,10 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             path: ROUTES.SETTINGS_SHARE_CODE,
                         },
                         [SCREENS.SETTINGS.EXIT_SURVEY.REASON]: {
-                            path: ROUTES.SETTINGS_EXIT_SURVEY_REASON,
+                            path: ROUTES.SETTINGS_EXIT_SURVEY_REASON.route,
+                        },
+                        [SCREENS.SETTINGS.EXIT_SURVEY.BOOK_CALL]: {
+                            path: ROUTES.SETTINGS_EXIT_SURVERY_BOOK_CALL.route,
                         },
                         [SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE]: {
                             path: ROUTES.SETTINGS_EXIT_SURVEY_RESPONSE.route,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 1c0895d2fbc6..983bd911b209 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -777,6 +777,7 @@ type SettingsNavigatorParamList = {
     };
     [SCREENS.KEYBOARD_SHORTCUTS]: undefined;
     [SCREENS.SETTINGS.EXIT_SURVEY.REASON]: undefined;
+    [SCREENS.SETTINGS.EXIT_SURVEY.BOOK_CALL]: undefined;
     [SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE]: {
         [EXIT_SURVEY_REASON_FORM_INPUT_IDS.REASON]: ValueOf<typeof CONST.EXIT_SURVEY.REASONS>;
         backTo: Routes;
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 3468bcf98b96..3308658fa735 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -26,10 +26,6 @@ import type {
     Report,
     ReportAction,
     ReportActions,
-    TaxRate,
-    TaxRates,
-    TaxRatesWithDefault,
-    Transaction,
     TransactionViolation,
 } from '@src/types/onyx';
 import type {Attendee, Participant} from '@src/types/onyx/IOU';
@@ -52,7 +48,6 @@ import * as PolicyUtils from './PolicyUtils';
 import * as ReportActionUtils from './ReportActionsUtils';
 import * as ReportUtils from './ReportUtils';
 import * as TaskUtils from './TaskUtils';
-import * as TransactionUtils from './TransactionUtils';
 import * as UserUtils from './UserUtils';
 
 type SearchOption<T> = ReportUtils.OptionData & {
@@ -98,23 +93,6 @@ type CategorySection = CategorySectionBase & {
     data: Option[];
 };
 
-type TaxRatesOption = {
-    text?: string;
-    code?: string;
-    searchText?: string;
-    tooltipText?: string;
-    isDisabled?: boolean;
-    keyForList?: string;
-    isSelected?: boolean;
-    pendingAction?: OnyxCommon.PendingAction;
-};
-
-type TaxSection = {
-    title: string | undefined;
-    shouldShow: boolean;
-    data: TaxRatesOption[];
-};
-
 type CategoryTreeSection = CategorySectionBase & {
     data: OptionTree[];
     indexOffset?: number;
@@ -127,12 +105,6 @@ type Category = {
     pendingAction?: OnyxCommon.PendingAction;
 };
 
-type Tax = {
-    modifiedName: string;
-    isSelected?: boolean;
-    isDisabled?: boolean;
-};
-
 type Hierarchy = Record<string, Category & {[key: string]: Hierarchy & Category}>;
 
 type GetOptionsConfig = {
@@ -160,10 +132,6 @@ type GetOptionsConfig = {
     recentlyUsedCategories?: string[];
     canInviteUser?: boolean;
     includeSelectedOptions?: boolean;
-    includeTaxRates?: boolean;
-    taxRates?: TaxRatesWithDefault;
-    policy?: OnyxEntry<Policy>;
-    transaction?: OnyxEntry<Transaction>;
     transactionViolations?: OnyxCollection<TransactionViolation[]>;
     includeInvoiceRooms?: boolean;
     includeDomainEmail?: boolean;
@@ -205,7 +173,6 @@ type Options = {
     userToInvite: ReportUtils.OptionData | null;
     currentUserOption: ReportUtils.OptionData | null | undefined;
     categoryOptions: CategoryTreeSection[];
-    taxRatesOptions: CategorySection[];
 };
 
 type PreviewConfig = {showChatPreviewLine?: boolean; forcePolicyNamePreview?: boolean; showPersonalDetails?: boolean};
@@ -1152,111 +1119,6 @@ function getCategoryListSections(
     return categorySections;
 }
 
-/**
- * Sorts tax rates alphabetically by name.
- */
-function sortTaxRates(taxRates: TaxRates): TaxRate[] {
-    const sortedtaxRates = lodashSortBy(taxRates, (taxRate) => taxRate.name);
-    return sortedtaxRates;
-}
-
-/**
- * Builds the options for taxRates
- */
-function getTaxRatesOptions(taxRates: Array<Partial<TaxRate>>): TaxRatesOption[] {
-    return taxRates.map(({code, modifiedName, isDisabled, isSelected, pendingAction}) => ({
-        code,
-        text: modifiedName,
-        keyForList: modifiedName,
-        searchText: modifiedName,
-        tooltipText: modifiedName,
-        isDisabled: !!isDisabled || pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-        isSelected,
-        pendingAction,
-    }));
-}
-
-/**
- * Builds the section list for tax rates
- */
-function getTaxRatesSection(policy: OnyxEntry<Policy> | undefined, selectedOptions: Tax[], searchInputValue: string, transaction?: OnyxEntry<Transaction>): TaxSection[] {
-    const policyRatesSections = [];
-
-    const taxes = TransactionUtils.transformedTaxRates(policy, transaction);
-
-    const sortedTaxRates = sortTaxRates(taxes);
-    const selectedOptionNames = selectedOptions.map((selectedOption) => selectedOption.modifiedName);
-    const enabledTaxRates = sortedTaxRates.filter((taxRate) => !taxRate.isDisabled);
-    const enabledTaxRatesNames = enabledTaxRates.map((tax) => tax.modifiedName);
-    const enabledTaxRatesWithoutSelectedOptions = enabledTaxRates.filter((tax) => tax.modifiedName && !selectedOptionNames.includes(tax.modifiedName));
-    const selectedTaxRateWithDisabledState: Tax[] = [];
-    const numberOfTaxRates = enabledTaxRates.length;
-
-    selectedOptions.forEach((tax) => {
-        if (enabledTaxRatesNames.includes(tax.modifiedName)) {
-            selectedTaxRateWithDisabledState.push({...tax, isDisabled: false, isSelected: true});
-            return;
-        }
-        selectedTaxRateWithDisabledState.push({...tax, isDisabled: true, isSelected: true});
-    });
-
-    // If all tax are disabled but there's a previously selected tag, show only the selected tag
-    if (numberOfTaxRates === 0 && selectedOptions.length > 0) {
-        policyRatesSections.push({
-            // "Selected" sectiong
-            title: '',
-            shouldShow: false,
-            data: getTaxRatesOptions(selectedTaxRateWithDisabledState),
-        });
-
-        return policyRatesSections;
-    }
-
-    if (searchInputValue) {
-        const enabledSearchTaxRates = enabledTaxRatesWithoutSelectedOptions.filter((taxRate) => taxRate.modifiedName?.toLowerCase().includes(searchInputValue.toLowerCase()));
-        const selectedSearchTags = selectedTaxRateWithDisabledState.filter((taxRate) => taxRate.modifiedName?.toLowerCase().includes(searchInputValue.toLowerCase()));
-        const taxesForSearch = [...selectedSearchTags, ...enabledSearchTaxRates];
-
-        policyRatesSections.push({
-            // "Search" section
-            title: '',
-            shouldShow: true,
-            data: getTaxRatesOptions(taxesForSearch),
-        });
-
-        return policyRatesSections;
-    }
-
-    if (numberOfTaxRates < CONST.STANDARD_LIST_ITEM_LIMIT) {
-        policyRatesSections.push({
-            // "All" section when items amount less than the threshold
-            title: '',
-            shouldShow: false,
-            data: getTaxRatesOptions([...selectedTaxRateWithDisabledState, ...enabledTaxRatesWithoutSelectedOptions]),
-        });
-
-        return policyRatesSections;
-    }
-
-    if (selectedOptions.length > 0) {
-        policyRatesSections.push({
-            // "Selected" section
-            title: '',
-            shouldShow: true,
-            data: getTaxRatesOptions(selectedTaxRateWithDisabledState),
-        });
-    }
-
-    policyRatesSections.push({
-        // "All" section when number of items are more than the threshold
-        title: '',
-        shouldShow: true,
-        data: getTaxRatesOptions(enabledTaxRatesWithoutSelectedOptions),
-    });
-
-    return policyRatesSections;
-}
-
 /**
  * Checks if a report option is selected based on matching accountID or reportID.
  *
@@ -1488,9 +1350,6 @@ function getOptions(
         canInviteUser = true,
         includeSelectedOptions = false,
         transactionViolations = {},
-        includeTaxRates,
-        policy,
-        transaction,
         includeSelfDM = false,
         includeInvoiceRooms = false,
         includeDomainEmail = false,
@@ -1508,20 +1367,6 @@ function getOptions(
             userToInvite: null,
             currentUserOption: null,
             categoryOptions,
-            taxRatesOptions: [],
-        };
-    }
-
-    if (includeTaxRates) {
-        const taxRatesOptions = getTaxRatesSection(policy, selectedOptions as Tax[], searchInputValue, transaction);
-
-        return {
-            recentReports: [],
-            personalDetails: [],
-            userToInvite: null,
-            currentUserOption: null,
-            categoryOptions: [],
-            taxRatesOptions,
         };
     }
 
@@ -1781,7 +1626,6 @@ function getOptions(
         userToInvite: canInviteUser ? userToInvite : null,
         currentUserOption,
         categoryOptions: [],
-        taxRatesOptions: [],
     };
 }
 
@@ -1869,8 +1713,6 @@ type FilteredOptionsParams = {
     recentlyUsedCategories?: string[];
     canInviteUser?: boolean;
     includeSelectedOptions?: boolean;
-    includeTaxRates?: boolean;
-    taxRates?: TaxRatesWithDefault;
     maxRecentReportsToShow?: number;
     includeSelfDM?: boolean;
     includeInvoiceRooms?: boolean;
@@ -1904,9 +1746,7 @@ function getFilteredOptions(params: FilteredOptionsParamsWithDefaultSearchValue
         recentlyUsedCategories = [],
         canInviteUser = true,
         includeSelectedOptions = false,
-        includeTaxRates = false,
         maxRecentReportsToShow = CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
-        taxRates = {} as TaxRatesWithDefault,
         includeSelfDM = false,
         includeInvoiceRooms = false,
         action,
@@ -1928,8 +1768,6 @@ function getFilteredOptions(params: FilteredOptionsParamsWithDefaultSearchValue
             recentlyUsedCategories,
             canInviteUser,
             includeSelectedOptions,
-            includeTaxRates,
-            taxRates,
             includeSelfDM,
             includeInvoiceRooms,
             action,
@@ -1966,9 +1804,7 @@ function getAttendeeOptions(
             recentlyUsedCategories: [],
             canInviteUser,
             includeSelectedOptions: false,
-            includeTaxRates: false,
             maxRecentReportsToShow: 0,
-            taxRates: {} as TaxRatesWithDefault,
             includeSelfDM: false,
             includeInvoiceRooms,
             action,
@@ -2264,7 +2100,6 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt
             userToInvite: null,
             currentUserOption,
             categoryOptions: [],
-            taxRatesOptions: [],
         };
     }, options);
 
@@ -2301,7 +2136,6 @@ function filterOptions(options: Options, searchInputValue: string, config?: Filt
         userToInvite,
         currentUserOption: matchResults.currentUserOption,
         categoryOptions: [],
-        taxRatesOptions: [],
     };
 }
 
@@ -2316,7 +2150,6 @@ function getEmptyOptions(): Options {
         userToInvite: null,
         currentUserOption: null,
         categoryOptions: [],
-        taxRatesOptions: [],
     };
 }
 
@@ -2359,7 +2192,6 @@ export {
     createOptionList,
     createOptionFromReport,
     getReportOption,
-    getTaxRatesSection,
     getFirstKeyForList,
     canCreateOptimisticPersonalDetailOption,
     getUserToInviteOption,
@@ -2372,4 +2204,4 @@ export {
     hasReportErrors,
 };
 
-export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, Tax, TaxRatesOption, Option, OptionTree};
+export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, Option, OptionTree};
diff --git a/src/libs/ReportConnection.ts b/src/libs/ReportConnection.ts
index f9f913d59beb..7b61b22681e5 100644
--- a/src/libs/ReportConnection.ts
+++ b/src/libs/ReportConnection.ts
@@ -28,7 +28,7 @@ Onyx.connect({
             if (!report) {
                 return;
             }
-            reportIDToNameMap[report.reportID] = report.reportName ?? report.displayName ?? report.reportID;
+            reportIDToNameMap[report.reportID] = report.reportName ?? report.reportID;
             ReportHelperActions.handleReportChanged(report);
         });
     },
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 97d199374e57..e1ec8bbe47af 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -489,7 +489,7 @@ type OptionData = {
     searchText?: string;
     isIOUReportOwner?: boolean | null;
     shouldShowSubscript?: boolean | null;
-    isPolicyExpenseChat?: boolean | null;
+    isPolicyExpenseChat?: boolean;
     isMoneyRequestReport?: boolean | null;
     isInvoiceReport?: boolean;
     isExpenseRequest?: boolean | null;
@@ -525,6 +525,7 @@ type OptionData = {
     participantsList?: PersonalDetails[];
     icons?: Icon[];
     iouReportAmount?: number;
+    displayName?: string;
 } & Report;
 
 type OnyxDataTaskAssigneeChat = {
@@ -1058,8 +1059,8 @@ function isUserCreatedPolicyRoom(report: OnyxEntry<Report>): boolean {
 /**
  * Whether the provided report is a Policy Expense chat.
  */
-function isPolicyExpenseChat(report: OnyxInputOrEntry<Report> | Participant): boolean {
-    return getChatType(report) === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT || (report?.isPolicyExpenseChat ?? false);
+function isPolicyExpenseChat(option: OnyxInputOrEntry<Report> | OptionData | Participant): boolean {
+    return getChatType(option) === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT ?? (option && 'isPolicyExpenseChat' in option && option.isPolicyExpenseChat) ?? false;
 }
 
 function isInvoiceRoom(report: OnyxEntry<Report>): boolean {
@@ -6457,13 +6458,11 @@ function getAllReportActionsErrorsAndReportActionThatRequiresAttention(report: O
  * Get an object of error messages keyed by microtime by combining all error objects related to the report.
  */
 function getAllReportErrors(report: OnyxEntry<Report>, reportActions: OnyxEntry<ReportActions>): Errors {
-    const reportErrors = report?.errors ?? {};
     const reportErrorFields = report?.errorFields ?? {};
     const {errors: reportActionErrors} = getAllReportActionsErrorsAndReportActionThatRequiresAttention(report, reportActions);
 
     // All error objects related to the report. Each object in the sources contains error messages keyed by microtime
     const errorSources = {
-        reportErrors,
         ...reportErrorFields,
         ...reportActionErrors,
     };
@@ -8429,10 +8428,6 @@ function hasMissingInvoiceBankAccount(iouReportID: string): boolean {
     return invoiceReport?.ownerAccountID === currentUserAccountID && !getPolicy(invoiceReport?.policyID)?.invoice?.bankAccount?.transferBankAccountID && isSettled(iouReportID);
 }
 
-function isExpenseReportWithoutParentAccess(report: OnyxEntry<Report>) {
-    return isExpenseReport(report) && report?.hasParentAccess === false;
-}
-
 function hasInvoiceReports() {
     const allReports = Object.values(ReportConnection.getAllReports() ?? {});
     return allReports.some((report) => isInvoiceReport(report));
@@ -8642,7 +8637,6 @@ export {
     isEmptyReport,
     isRootGroupChat,
     isExpenseReport,
-    isExpenseReportWithoutParentAccess,
     isExpenseRequest,
     isExpensifyOnlyParticipantInReport,
     isGroupChat,
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index b8acec00af05..806cebd9bf7f 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -126,10 +126,14 @@ function getOrderedReportIDs(
             return;
         }
         const isSystemChat = ReportUtils.isSystemChat(report);
-        const isExpenseReportWithoutParentAccess = ReportUtils.isExpenseReportWithoutParentAccess(report);
         const shouldOverrideHidden =
+            hasValidDraftComment(report.reportID) ||
+            hasErrorsOtherThanFailedReceipt ||
+            isFocused ||
+            isSystemChat ||
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-            hasValidDraftComment(report.reportID) || hasErrorsOtherThanFailedReceipt || isFocused || isSystemChat || report.isPinned || isExpenseReportWithoutParentAccess;
+            report.isPinned ||
+            ReportUtils.requiresAttentionFromCurrentUser(report, parentReportAction);
         if (isHidden && !shouldOverrideHidden) {
             return;
         }
diff --git a/src/libs/TaxOptionsListUtils.ts b/src/libs/TaxOptionsListUtils.ts
new file mode 100644
index 000000000000..12c911d4e600
--- /dev/null
+++ b/src/libs/TaxOptionsListUtils.ts
@@ -0,0 +1,147 @@
+import lodashSortBy from 'lodash/sortBy';
+import type {OnyxEntry} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import type {Policy, TaxRate, TaxRates, Transaction} from '@src/types/onyx';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import * as TransactionUtils from './TransactionUtils';
+
+type TaxRatesOption = {
+    text?: string;
+    code?: string;
+    searchText?: string;
+    tooltipText?: string;
+    isDisabled?: boolean;
+    keyForList?: string;
+    isSelected?: boolean;
+    pendingAction?: OnyxCommon.PendingAction;
+};
+
+type Tax = {
+    modifiedName: string;
+    isSelected?: boolean;
+    isDisabled?: boolean;
+};
+
+type TaxSection = {
+    title: string | undefined;
+    shouldShow: boolean;
+    data: TaxRatesOption[];
+};
+
+/**
+ * Sorts tax rates alphabetically by name.
+ */
+function sortTaxRates(taxRates: TaxRates): TaxRate[] {
+    const sortedtaxRates = lodashSortBy(taxRates, (taxRate) => taxRate.name);
+    return sortedtaxRates;
+}
+
+/**
+ * Builds the options for taxRates
+ */
+function getTaxRatesOptions(taxRates: Array<Partial<TaxRate>>): TaxRatesOption[] {
+    return taxRates.map(({code, modifiedName, isDisabled, isSelected, pendingAction}) => ({
+        code,
+        text: modifiedName,
+        keyForList: modifiedName,
+        searchText: modifiedName,
+        tooltipText: modifiedName,
+        isDisabled: !!isDisabled || pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        isSelected,
+        pendingAction,
+    }));
+}
+
+/**
+ * Builds the section list for tax rates
+ */
+function getTaxRatesSection({
+    policy,
+    searchValue,
+    selectedOptions = [],
+    transaction,
+}: {
+    policy: OnyxEntry<Policy> | undefined;
+    searchValue: string;
+    selectedOptions?: Tax[];
+    transaction?: OnyxEntry<Transaction>;
+}): TaxSection[] {
+    const policyRatesSections = [];
+
+    const taxes = TransactionUtils.transformedTaxRates(policy, transaction);
+
+    const sortedTaxRates = sortTaxRates(taxes);
+    const selectedOptionNames = selectedOptions.map((selectedOption) => selectedOption.modifiedName);
+    const enabledTaxRates = sortedTaxRates.filter((taxRate) => !taxRate.isDisabled);
+    const enabledTaxRatesNames = enabledTaxRates.map((tax) => tax.modifiedName);
+    const enabledTaxRatesWithoutSelectedOptions = enabledTaxRates.filter((tax) => tax.modifiedName && !selectedOptionNames.includes(tax.modifiedName));
+    const selectedTaxRateWithDisabledState: Tax[] = [];
+    const numberOfTaxRates = enabledTaxRates.length;
+
+    selectedOptions.forEach((tax) => {
+        if (enabledTaxRatesNames.includes(tax.modifiedName)) {
+            selectedTaxRateWithDisabledState.push({...tax, isDisabled: false, isSelected: true});
+            return;
+        }
+        selectedTaxRateWithDisabledState.push({...tax, isDisabled: true, isSelected: true});
+    });
+
+    // If all tax are disabled but there's a previously selected tag, show only the selected tag
+    if (numberOfTaxRates === 0 && selectedOptions.length > 0) {
+        policyRatesSections.push({
+            // "Selected" sectiong
+            title: '',
+            shouldShow: false,
+            data: getTaxRatesOptions(selectedTaxRateWithDisabledState),
+        });
+
+        return policyRatesSections;
+    }
+
+    if (searchValue) {
+        const enabledSearchTaxRates = enabledTaxRatesWithoutSelectedOptions.filter((taxRate) => taxRate.modifiedName?.toLowerCase().includes(searchValue.toLowerCase()));
+        const selectedSearchTags = selectedTaxRateWithDisabledState.filter((taxRate) => taxRate.modifiedName?.toLowerCase().includes(searchValue.toLowerCase()));
+        const taxesForSearch = [...selectedSearchTags, ...enabledSearchTaxRates];
+
+        policyRatesSections.push({
+            // "Search" section
+            title: '',
+            shouldShow: true,
+            data: getTaxRatesOptions(taxesForSearch),
+        });
+
+        return policyRatesSections;
+    }
+
+    if (numberOfTaxRates < CONST.STANDARD_LIST_ITEM_LIMIT) {
+        policyRatesSections.push({
+            // "All" section when items amount less than the threshold
+            title: '',
+            shouldShow: false,
+            data: getTaxRatesOptions([...selectedTaxRateWithDisabledState, ...enabledTaxRatesWithoutSelectedOptions]),
+        });
+
+        return policyRatesSections;
+    }
+
+    if (selectedOptions.length > 0) {
+        policyRatesSections.push({
+            // "Selected" section
+            title: '',
+            shouldShow: true,
+            data: getTaxRatesOptions(selectedTaxRateWithDisabledState),
+        });
+    }
+
+    policyRatesSections.push({
+        // "All" section when number of items are more than the threshold
+        title: '',
+        shouldShow: true,
+        data: getTaxRatesOptions(enabledTaxRatesWithoutSelectedOptions),
+    });
+
+    return policyRatesSections;
+}
+
+export {getTaxRatesSection, sortTaxRates, getTaxRatesOptions};
+export type {TaxRatesOption, Tax, TaxSection};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 213ce506c230..7725a4caceb1 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -3389,6 +3389,8 @@ function categorizeTrackedExpense(
     billable?: boolean,
     receipt?: Receipt,
     createdWorkspaceParams?: CreateWorkspaceParams,
+    waypoints?: string,
+    customUnitRateID?: string,
 ) {
     const {optimisticData, successData, failureData} = onyxData ?? {};
 
@@ -3435,6 +3437,8 @@ function categorizeTrackedExpense(
         policyExpenseCreatedReportActionID: createdWorkspaceParams?.expenseCreatedReportActionID,
         adminsChatReportID: createdWorkspaceParams?.adminsChatReportID,
         adminsCreatedReportActionID: createdWorkspaceParams?.adminsCreatedReportActionID,
+        waypoints,
+        customUnitRateID,
     };
 
     API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
@@ -3470,6 +3474,8 @@ function shareTrackedExpense(
     billable?: boolean,
     receipt?: Receipt,
     createdWorkspaceParams?: CreateWorkspaceParams,
+    waypoints?: string,
+    customUnitRateID?: string,
 ) {
     const {optimisticData, successData, failureData} = onyxData ?? {};
 
@@ -3516,6 +3522,8 @@ function shareTrackedExpense(
         policyExpenseCreatedReportActionID: createdWorkspaceParams?.expenseCreatedReportActionID,
         adminsChatReportID: createdWorkspaceParams?.adminsChatReportID,
         adminsCreatedReportActionID: createdWorkspaceParams?.adminsCreatedReportActionID,
+        waypoints,
+        customUnitRateID,
     };
 
     API.write(WRITE_COMMANDS.SHARE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
@@ -3819,6 +3827,8 @@ function trackExpense(
         value: recentServerValidatedWaypoints,
     });
 
+    const waypoints = validWaypoints ? JSON.stringify(sanitizeRecentWaypoints(validWaypoints)) : undefined;
+
     switch (action) {
         case CONST.IOU.ACTION.CATEGORIZE: {
             if (!linkedTrackedExpenseReportAction || !actionableWhisperReportActionID || !linkedTrackedExpenseReportID) {
@@ -3849,6 +3859,8 @@ function trackExpense(
                 billable,
                 trackedReceipt,
                 createdWorkspaceParams,
+                waypoints,
+                customUnitRateID,
             );
             break;
         }
@@ -3880,6 +3892,8 @@ function trackExpense(
                 billable,
                 trackedReceipt,
                 createdWorkspaceParams,
+                waypoints,
+                customUnitRateID,
             );
             break;
         }
@@ -3908,7 +3922,7 @@ function trackExpense(
                 receiptGpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
                 transactionThreadReportID: transactionThreadReportID ?? '-1',
                 createdReportActionIDForThread: createdReportActionIDForThread ?? '-1',
-                waypoints: validWaypoints ? JSON.stringify(sanitizeRecentWaypoints(validWaypoints)) : undefined,
+                waypoints,
                 customUnitRateID,
             };
             if (actionableWhisperReportActionIDParam) {
@@ -3921,6 +3935,10 @@ function trackExpense(
     Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : activeReportID);
 
     if (action === CONST.IOU.ACTION.SHARE) {
+        if (isSearchTopmostCentralPane() && activeReportID) {
+            Navigation.goBack();
+            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(activeReportID));
+        }
         Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? '-1', CONST.IOU.SHARE.ROLE.ACCOUNTANT)));
     }
 
@@ -7356,7 +7374,7 @@ function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: O
 function completePaymentOnboarding(paymentSelected: ValueOf<typeof CONST.PAYMENT_SELECTED>) {
     const isInviteOnboardingComplete = introSelected?.isInviteOnboardingComplete ?? false;
 
-    if (isInviteOnboardingComplete || !introSelected?.choice) {
+    if (isInviteOnboardingComplete || !introSelected?.choice || !introSelected?.inviteType) {
         return;
     }
 
@@ -7374,7 +7392,18 @@ function completePaymentOnboarding(paymentSelected: ValueOf<typeof CONST.PAYMENT
         onboardingPurpose = CONST.ONBOARDING_CHOICES.CHAT_SPLIT;
     }
 
-    Report.completeOnboarding(onboardingPurpose, CONST.ONBOARDING_MESSAGES[onboardingPurpose], personalDetails?.firstName ?? '', personalDetails?.lastName ?? '', paymentSelected);
+    Report.completeOnboarding(
+        onboardingPurpose,
+        CONST.ONBOARDING_MESSAGES[onboardingPurpose],
+        personalDetails?.firstName ?? '',
+        personalDetails?.lastName ?? '',
+        undefined,
+        undefined,
+        paymentSelected,
+        undefined,
+        undefined,
+        true,
+    );
 }
 
 function payMoneyRequest(paymentType: PaymentMethodType, chatReport: OnyxTypes.Report, iouReport: OnyxEntry<OnyxTypes.Report>, full = true) {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index ec87dcb16df8..32c0a40876d7 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -3478,6 +3478,7 @@ function prepareOnboardingOptimisticData(
     adminsChatReportID?: string,
     onboardingPolicyID?: string,
     userReportedIntegration?: OnboardingAccounting,
+    wasInvited?: boolean,
 ) {
     // If the user has the "combinedTrackSubmit" beta enabled we'll show different tasks for track and submit expense.
     if (Permissions.canUseCombinedTrackSubmit()) {
@@ -3528,7 +3529,11 @@ function prepareOnboardingOptimisticData(
     }
     const tasksData = data.tasks
         .filter((task) => {
-            if (task.type === 'addAccountingIntegration' && !userReportedIntegration) {
+            if (['setupCategories', 'setupTags'].includes(task.type) && userReportedIntegration) {
+                return false;
+            }
+
+            if (['addAccountingIntegration', 'setupCategoriesAndTags'].includes(task.type) && !userReportedIntegration) {
                 return false;
             }
             return true;
@@ -3544,6 +3549,7 @@ function prepareOnboardingOptimisticData(
                           navatticURL: getNavatticURL(environment, engagementChoice),
                           integrationName,
                           workspaceAccountingLink: `${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(onboardingPolicyID ?? '-1')}`,
+                          workspaceSettingsLink: `${environmentURL}/${ROUTES.WORKSPACE_INITIAL.getRoute(onboardingPolicyID ?? '-1')}`,
                       })
                     : task.description;
             const taskTitle =
@@ -3756,12 +3762,14 @@ function prepareOnboardingOptimisticData(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: engagementChoice},
         },
-        {
+    );
+    if (!wasInvited) {
+        optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_ONBOARDING,
             value: {hasCompletedGuidedSetupFlow: true},
-        },
-    );
+        });
+    }
 
     const successData: OnyxUpdate[] = [...tasksForSuccessData];
     successData.push({
@@ -3816,12 +3824,15 @@ function prepareOnboardingOptimisticData(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: null},
         },
-        {
+    );
+
+    if (!wasInvited) {
+        failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_ONBOARDING,
             value: {hasCompletedGuidedSetupFlow: false},
-        },
-    );
+        });
+    }
 
     if (userReportedIntegration) {
         optimisticData.push({
@@ -3905,6 +3916,7 @@ function completeOnboarding(
     paymentSelected?: string,
     companySize?: OnboardingCompanySize,
     userReportedIntegration?: OnboardingAccounting,
+    wasInvited?: boolean,
 ) {
     const {optimisticData, successData, failureData, guidedSetupData, actorAccountID} = prepareOnboardingOptimisticData(
         engagementChoice,
@@ -3912,6 +3924,7 @@ function completeOnboarding(
         adminsChatReportID,
         onboardingPolicyID,
         userReportedIntegration,
+        wasInvited,
     );
 
     const parameters: CompleteGuidedSetupParams = {
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index e99fb0118d4e..b9746126135d 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -73,7 +73,6 @@ const chatReportSelector = (report: OnyxEntry<Report>): OnyxEntry<Report> =>
         parentReportActionID: report.parentReportActionID,
         type: report.type,
         chatType: report.chatType,
-        isPolicyExpenseChat: report.isPolicyExpenseChat,
     };
 
 function ProfilePage({route}: ProfilePageProps) {
diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
index c833fdb68ae6..3fafc163e5ff 100644
--- a/src/pages/RoomInvitePage.tsx
+++ b/src/pages/RoomInvitePage.tsx
@@ -72,7 +72,7 @@ function RoomInvitePage({
 
     const defaultOptions = useMemo(() => {
         if (!areOptionsInitialized) {
-            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: [], tagOptions: [], taxRatesOptions: []};
+            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: []};
         }
 
         const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], '', excludedUsers);
@@ -96,8 +96,6 @@ function RoomInvitePage({
             recentReports: [],
             currentUserOption: null,
             categoryOptions: [],
-            tagOptions: [],
-            taxRatesOptions: [],
         };
     }, [areOptionsInitialized, betas, excludedUsers, options.personalDetails, selectedOptions]);
 
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 4398f89e3ecc..796e127dbbc0 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -18,7 +18,7 @@ import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils';
 import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
-import {getAllTaxRates, getTagNamesFromTagsLists} from '@libs/PolicyUtils';
+import {getAllTaxRates, getTagNamesFromTagsLists, isPolicyFeatureEnabled} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as SearchQueryUtils from '@libs/SearchQueryUtils';
 import * as SearchUIUtils from '@libs/SearchUIUtils';
@@ -28,6 +28,8 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import type {CardList, PersonalDetailsList, Policy, PolicyTagLists, Report} from '@src/types/onyx';
+import type {PolicyFeatureName} from '@src/types/onyx/Policy';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 const baseFilterConfig = {
     date: {
@@ -251,6 +253,17 @@ function getFilterInDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, _:
         : undefined;
 }
 
+function shouldDisplayFilter(numberOfFilters: number, isFeatureEnabled: boolean, singlePolicyCondition = false): boolean {
+    return (numberOfFilters !== 0 || singlePolicyCondition) && isFeatureEnabled;
+}
+
+function isFeatureEnabledInPolicies(policies: OnyxCollection<Policy>, featureName: PolicyFeatureName) {
+    if (isEmptyObject(policies)) {
+        return false;
+    }
+    return Object.values(policies).some((policy) => isPolicyFeatureEnabled(policy, featureName));
+}
+
 function AdvancedSearchFilters() {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -260,7 +273,6 @@ function AdvancedSearchFilters() {
     const [savedSearches] = useOnyx(ONYXKEYS.SAVED_SEARCHES);
     const [searchAdvancedFilters = {} as SearchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
     const policyID = searchAdvancedFilters.policyID ?? '-1';
-
     const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
     const taxRates = getAllTaxRates();
     const personalDetails = usePersonalDetails();
@@ -281,10 +293,17 @@ function AdvancedSearchFilters() {
         .map((policy) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy.id}`);
     const nonPersonalPolicyCategoryCount = Object.keys(allPolicyCategories).filter((policyCategoryId) => nonPersonalPolicyCategoryIds.includes(policyCategoryId)).length;
 
-    const shouldDisplayCategoryFilter = nonPersonalPolicyCategoryCount !== 0 || !!singlePolicyCategories;
-    const shouldDisplayTagFilter = tagListsUnpacked.length !== 0 || !!singlePolicyTagLists;
-    const shouldDisplayCardFilter = Object.keys(cardList).length !== 0;
-    const shouldDisplayTaxFilter = Object.keys(taxRates).length !== 0;
+    const areCategoriesEnabled = isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED);
+    const areTagsEnabled = isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED);
+    const areCardsEnabled =
+        isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED) ||
+        isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED);
+    const areTaxEnabled = isFeatureEnabledInPolicies(policies, CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED);
+
+    const shouldDisplayCategoryFilter = shouldDisplayFilter(nonPersonalPolicyCategoryCount, areCategoriesEnabled, !!singlePolicyCategories);
+    const shouldDisplayTagFilter = shouldDisplayFilter(tagListsUnpacked.length, areTagsEnabled, !!singlePolicyTagLists);
+    const shouldDisplayCardFilter = shouldDisplayFilter(Object.keys(cardList).length, areCardsEnabled);
+    const shouldDisplayTaxFilter = shouldDisplayFilter(Object.keys(taxRates).length, areTaxEnabled);
 
     let currentType = searchAdvancedFilters?.type ?? CONST.SEARCH.DATA_TYPES.EXPENSE;
     if (!Object.keys(typeFiltersKeys).includes(currentType)) {
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 62fd04f7572a..97057770baca 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -177,7 +177,6 @@ function ReportScreen({route, currentReportID = '', navigation}: ReportScreenPro
                 writeCapability: reportOnyx.writeCapability,
                 type: reportOnyx.type,
                 errorFields: reportOnyx.errorFields,
-                isPolicyExpenseChat: reportOnyx.isPolicyExpenseChat,
                 parentReportID: reportOnyx.parentReportID,
                 parentReportActionID: reportOnyx.parentReportActionID,
                 chatType: reportOnyx.chatType,
diff --git a/src/pages/iou/request/MoneyRequestAttendeeSelector.tsx b/src/pages/iou/request/MoneyRequestAttendeeSelector.tsx
index 8732efd2e72d..ca655caea123 100644
--- a/src/pages/iou/request/MoneyRequestAttendeeSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestAttendeeSelector.tsx
@@ -114,8 +114,6 @@ function MoneyRequestAttendeeSelector({attendees = [], onFinish, onAttendeesAdde
                 currentUserOption: null,
                 headerMessage: '',
                 categoryOptions: [],
-                tagOptions: [],
-                taxRatesOptions: [],
             };
         }
         const newOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, {
diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
index 4478951555ef..a17cffd0cdd9 100644
--- a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -103,8 +103,6 @@ function MoneyRequestParticipantsSelector({
                 currentUserOption: null,
                 headerMessage: '',
                 categoryOptions: [],
-                tagOptions: [],
-                taxRatesOptions: [],
             };
         }
 
@@ -140,8 +138,6 @@ function MoneyRequestParticipantsSelector({
                 currentUserOption: null,
                 headerMessage: '',
                 categoryOptions: [],
-                tagOptions: [],
-                taxRatesOptions: [],
             };
         }
 
diff --git a/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx b/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx
index 7fedc09e2abe..ccc2ed2ee45f 100644
--- a/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx
+++ b/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx
@@ -1,40 +1,28 @@
 import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import TaxPicker from '@components/TaxPicker';
 import useLocalize from '@hooks/useLocalize';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import type {TaxRatesOption} from '@libs/OptionsListUtils';
+import type {TaxRatesOption} from '@libs/TaxOptionsListUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import {getCurrency} from '@libs/TransactionUtils';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, PolicyCategories, PolicyTagLists, Transaction} from '@src/types/onyx';
+import type {Policy, Transaction} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import StepScreenWrapper from './StepScreenWrapper';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
 import withWritableReportOrNotFound from './withWritableReportOrNotFound';
 import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
 
-type IOURequestStepTaxRatePageOnyxProps = {
-    policy: OnyxEntry<Policy>;
-    policyCategories: OnyxEntry<PolicyCategories>;
-
-    /** Collection of tag list on a policy */
-    policyTags: OnyxEntry<PolicyTagLists>;
-
-    /** The draft transaction that holds data to be persisted on the current transaction */
-    splitDraftTransaction: OnyxEntry<Transaction>;
+type IOURequestStepTaxRatePageProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_TAX_RATE> & {
+    transaction: OnyxEntry<Transaction>;
 };
 
-type IOURequestStepTaxRatePageProps = IOURequestStepTaxRatePageOnyxProps &
-    WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_TAX_RATE> & {
-        transaction: OnyxEntry<Transaction>;
-    };
-
 function getTaxAmount(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, selectedTaxCode: string, amount: number): number | undefined {
     const getTaxValue = (taxCode: string) => TransactionUtils.getTaxValue(policy, transaction, taxCode);
     const taxPercentage = getTaxValue(selectedTaxCode);
@@ -45,17 +33,18 @@ function getTaxAmount(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transact
 
 function IOURequestStepTaxRatePage({
     route: {
-        params: {action, backTo, iouType},
+        params: {action, backTo, iouType, transactionID},
     },
-    policy,
     transaction,
     report,
-    policyCategories,
-    policyTags,
-    splitDraftTransaction,
 }: IOURequestStepTaxRatePageProps) {
     const {translate} = useLocalize();
 
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? '-1'}`);
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID ?? '-1'}`);
+    const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID ?? '-1'}`);
+    const [splitDraftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID ?? '-1'}`);
+
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
     const currentTransaction = isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction;
@@ -132,26 +121,8 @@ function IOURequestStepTaxRatePage({
 
 IOURequestStepTaxRatePage.displayName = 'IOURequestStepTaxRatePage';
 
-const IOURequestStepTaxRatePageWithOnyx = withOnyx<IOURequestStepTaxRatePageProps, IOURequestStepTaxRatePageOnyxProps>({
-    splitDraftTransaction: {
-        key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
-            return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
-        },
-    },
-    policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
-    },
-    policyCategories: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '-1'}`,
-    },
-    policyTags: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '-1'}`,
-    },
-})(IOURequestStepTaxRatePage);
-
 // eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepTaxRatePageWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepTaxRatePageWithOnyx);
+const IOURequestStepTaxRatePageWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepTaxRatePage);
 // eslint-disable-next-line rulesdir/no-negated-variables
 const IOURequestStepTaxRatePageWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepTaxRatePageWithWritableReportOrNotFound);
 
diff --git a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
index 3f5db6cf5613..cd4674ce0165 100644
--- a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
+++ b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
@@ -35,8 +35,6 @@ function BaseShareLogList({onAttachLogToReport}: BaseShareLogListProps) {
                 userToInvite: null,
                 currentUserOption: null,
                 categoryOptions: [],
-                tagOptions: [],
-                taxRatesOptions: [],
                 headerMessage: '',
             };
         }
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyBookCall.tsx b/src/pages/settings/ExitSurvey/ExitSurveyBookCall.tsx
new file mode 100644
index 000000000000..93191b809ee8
--- /dev/null
+++ b/src/pages/settings/ExitSurvey/ExitSurveyBookCall.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import FixedFooter from '@components/FixedFooter';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
+import * as Link from '@userActions/Link';
+import * as Expensicons from '@src/components/Icon/Expensicons';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import ExitSurveyOffline from './ExitSurveyOffline';
+
+function ExitSurveyBookCallPage() {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const styles = useThemeStyles();
+
+    return (
+        <ScreenWrapper testID={ExitSurveyBookCallPage.displayName}>
+            <HeaderWithBackButton
+                title={translate('exitSurvey.header')}
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            <View style={[styles.flex1, styles.mh5]}>
+                {isOffline && <ExitSurveyOffline />}
+                {!isOffline && (
+                    <>
+                        <Text style={[styles.headerAnonymousFooter, styles.mt3]}>{translate('exitSurvey.bookACallTitle')}</Text>
+                        <Text style={[styles.mt2]}>{translate('exitSurvey.bookACallTextTop')}</Text>
+                        <View style={styles.mv4}>
+                            {Object.values(CONST.EXIT_SURVEY.BENEFIT).map((value) => {
+                                return (
+                                    <View
+                                        key={value}
+                                        style={[styles.flexRow]}
+                                    >
+                                        <View style={styles.liDot} />
+                                        <Text>{translate(`exitSurvey.benefits.${value}`)}</Text>
+                                    </View>
+                                );
+                            })}
+                        </View>
+                        <Text>{translate('exitSurvey.bookACallTextBottom')}</Text>
+                    </>
+                )}
+            </View>
+            <FixedFooter>
+                <Button
+                    style={styles.mb3}
+                    large
+                    text={translate('exitSurvey.noThanks')}
+                    onPress={() => {
+                        Navigation.navigate(ROUTES.SETTINGS_EXIT_SURVEY_REASON.getRoute(ROUTES.SETTINGS_EXIT_SURVERY_BOOK_CALL.route));
+                    }}
+                    isDisabled={isOffline}
+                />
+                <Button
+                    success
+                    large
+                    iconRight={Expensicons.NewWindow}
+                    shouldShowRightIcon
+                    isContentCentered
+                    text={translate('exitSurvey.bookACall')}
+                    pressOnEnter
+                    onPress={() => {
+                        Navigation.dismissModal();
+                        Link.openExternalLink(CONST.EXIT_SURVEY.BOOK_MEETING_LINK);
+                    }}
+                    isDisabled={isOffline}
+                />
+            </FixedFooter>
+        </ScreenWrapper>
+    );
+}
+
+ExitSurveyBookCallPage.displayName = 'ExitSurveyBookCallPage';
+
+export default ExitSurveyBookCallPage;
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
index 00bfec6b05b0..50a3bb7767c0 100644
--- a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
+++ b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
@@ -24,6 +24,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {ExitSurveyReasonForm} from '@src/types/form/ExitSurveyReasonForm';
 import EXIT_SURVEY_REASON_INPUT_IDS from '@src/types/form/ExitSurveyReasonForm';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import ExitSurveyOffline from './ExitSurveyOffline';
 
 type ExitSurveyConfirmPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM>;
@@ -32,18 +33,21 @@ function ExitSurveyConfirmPage({route, navigation}: ExitSurveyConfirmPageProps)
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const styles = useThemeStyles();
+    const [tryNewDot] = useOnyx(ONYXKEYS.NVP_TRYNEWDOT);
     const [exitReason] = useOnyx(ONYXKEYS.FORMS.EXIT_SURVEY_REASON_FORM, {selector: (value: OnyxEntry<ExitSurveyReasonForm>) => value?.[EXIT_SURVEY_REASON_INPUT_IDS.REASON] ?? null});
+    const shouldShowQuickTips =
+        isEmptyObject(tryNewDot) || tryNewDot?.classicRedirect?.dismissed === true || (!isEmptyObject(tryNewDot) && tryNewDot?.classicRedirect?.dismissed === undefined);
 
     const getBackToParam = useCallback(() => {
         if (isOffline) {
             return ROUTES.SETTINGS;
         }
         if (exitReason) {
-            return ROUTES.SETTINGS_EXIT_SURVEY_RESPONSE.getRoute(exitReason, ROUTES.SETTINGS_EXIT_SURVEY_REASON);
+            return ROUTES.SETTINGS_EXIT_SURVEY_RESPONSE.getRoute(exitReason, ROUTES.SETTINGS_EXIT_SURVEY_REASON.route);
         }
         return ROUTES.SETTINGS;
     }, [exitReason, isOffline]);
-    const {backTo} = route.params;
+    const {backTo} = route.params || {};
     useEffect(() => {
         const newBackTo = getBackToParam();
         if (backTo === newBackTo) {
@@ -57,7 +61,7 @@ function ExitSurveyConfirmPage({route, navigation}: ExitSurveyConfirmPageProps)
     return (
         <ScreenWrapper testID={ExitSurveyConfirmPage.displayName}>
             <HeaderWithBackButton
-                title={translate('exitSurvey.header')}
+                title={translate(shouldShowQuickTips ? 'exitSurvey.goToExpensifyClassic' : 'exitSurvey.header')}
                 onBackButtonPress={() => Navigation.goBack()}
             />
             <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.mh5]}>
@@ -69,8 +73,10 @@ function ExitSurveyConfirmPage({route, navigation}: ExitSurveyConfirmPageProps)
                             width={variables.mushroomTopHatWidth}
                             height={variables.mushroomTopHatHeight}
                         />
-                        <Text style={[styles.headerAnonymousFooter, styles.mt5, styles.textAlignCenter]}>{translate('exitSurvey.thankYou')}</Text>
-                        <Text style={[styles.mt2, styles.textAlignCenter]}>{translate('exitSurvey.thankYouSubtitle')}</Text>
+                        <Text style={[styles.headerAnonymousFooter, styles.mt5, styles.textAlignCenter]}>
+                            {translate(shouldShowQuickTips ? 'exitSurvey.quickTip' : 'exitSurvey.thankYou')}
+                        </Text>
+                        <Text style={[styles.mt2, styles.textAlignCenter]}>{translate(shouldShowQuickTips ? 'exitSurvey.quickTipSubTitle' : 'exitSurvey.thankYouSubtitle')}</Text>
                     </>
                 )}
             </View>
@@ -78,7 +84,7 @@ function ExitSurveyConfirmPage({route, navigation}: ExitSurveyConfirmPageProps)
                 <Button
                     success
                     large
-                    text={translate('exitSurvey.goToExpensifyClassic')}
+                    text={translate(shouldShowQuickTips ? 'exitSurvey.takeMeToExpensifyClassic' : 'exitSurvey.goToExpensifyClassic')}
                     pressOnEnter
                     onPress={() => {
                         ExitSurvey.switchToOldDot();
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx
index d9f53faa62d0..b5bdcf9ac45c 100644
--- a/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx
@@ -1,5 +1,6 @@
 import React, {useEffect, useMemo, useState} from 'react';
-import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -15,21 +16,18 @@ import * as ExitSurvey from '@userActions/ExitSurvey';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {ExitReason} from '@src/types/form/ExitSurveyReasonForm';
+import type {ExitReason, ExitSurveyReasonForm} from '@src/types/form/ExitSurveyReasonForm';
 import INPUT_IDS from '@src/types/form/ExitSurveyReasonForm';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import ExitSurveyOffline from './ExitSurveyOffline';
 
-type ExitSurveyReasonPageOnyxProps = {
-    draftReason: ExitReason | null;
-};
-
-function ExitSurveyReasonPage({draftReason}: ExitSurveyReasonPageOnyxProps) {
+function ExitSurveyReasonPage() {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
+    const [draftReason] = useOnyx(ONYXKEYS.FORMS.EXIT_SURVEY_REASON_FORM_DRAFT, {selector: (value: OnyxEntry<ExitSurveyReasonForm>) => value?.[INPUT_IDS.REASON] ?? null});
 
-    const [reason, setReason] = useState<ExitReason | null>(draftReason);
+    const [reason, setReason] = useState<ExitReason | null>(draftReason ?? null);
     useEffect(() => {
         // disabling lint because || is fine to use as a logical operator (as opposed to being used to define a default value)
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -69,7 +67,7 @@ function ExitSurveyReasonPage({draftReason}: ExitSurveyReasonPageOnyxProps) {
                         return;
                     }
                     ExitSurvey.saveExitReason(reason);
-                    Navigation.navigate(ROUTES.SETTINGS_EXIT_SURVEY_RESPONSE.getRoute(reason, ROUTES.SETTINGS_EXIT_SURVEY_REASON));
+                    Navigation.navigate(ROUTES.SETTINGS_EXIT_SURVEY_RESPONSE.getRoute(reason, ROUTES.SETTINGS_EXIT_SURVEY_REASON.route));
                 }}
                 submitButtonText={translate('common.next')}
                 shouldValidateOnBlur
@@ -97,9 +95,4 @@ function ExitSurveyReasonPage({draftReason}: ExitSurveyReasonPageOnyxProps) {
 
 ExitSurveyReasonPage.displayName = 'ExitSurveyReasonPage';
 
-export default withOnyx<ExitSurveyReasonPageOnyxProps, ExitSurveyReasonPageOnyxProps>({
-    draftReason: {
-        key: ONYXKEYS.FORMS.EXIT_SURVEY_REASON_FORM_DRAFT,
-        selector: (value) => value?.[INPUT_IDS.REASON] ?? null,
-    },
-})(ExitSurveyReasonPage);
+export default ExitSurveyReasonPage;
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
index 82f245e2dd96..d33828b722eb 100644
--- a/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
+++ b/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
@@ -48,7 +48,7 @@ function ExitSurveyResponsePage({route, navigation}: ExitSurveyResponsePageProps
     const {isOffline} = useNetwork({
         onReconnect: () => {
             navigation.setParams({
-                backTo: ROUTES.SETTINGS_EXIT_SURVEY_REASON,
+                backTo: ROUTES.SETTINGS_EXIT_SURVEY_REASON.route,
             });
         },
     });
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 8c1d68e0a95b..0b5344ba662a 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -82,6 +82,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST);
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
+    const [tryNewDot] = useOnyx(ONYXKEYS.NVP_TRYNEWDOT);
 
     const network = useNetwork();
     const theme = useTheme();
@@ -101,6 +102,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
     const [shouldShowSignoutConfirmModal, setShouldShowSignoutConfirmModal] = useState(false);
 
     const freeTrialText = SubscriptionUtils.getFreeTrialText(policies);
+    const shouldOpenBookACall = tryNewDot?.classicRedirect?.dismissed === false;
 
     useEffect(() => {
         Wallet.openInitialSettingsPage();
@@ -242,7 +244,13 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                           }
                         : {
                               action() {
-                                  resetExitSurveyForm(() => Navigation.navigate(ROUTES.SETTINGS_EXIT_SURVEY_REASON));
+                                  resetExitSurveyForm(() => {
+                                      if (shouldOpenBookACall) {
+                                          Navigation.navigate(ROUTES.SETTINGS_EXIT_SURVERY_BOOK_CALL.route);
+                                          return;
+                                      }
+                                      Navigation.navigate(ROUTES.SETTINGS_EXIT_SURVEY_CONFIRM.route);
+                                  });
                               },
                           }),
                 },
@@ -270,7 +278,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                 },
             ],
         };
-    }, [styles.pt4, signOut, setInitialURL]);
+    }, [styles.pt4, signOut, setInitialURL, shouldOpenBookACall]);
 
     /**
      * Retuns JSX.Element with menu items
diff --git a/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx b/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
index a6ed5ca1b53e..6f54fc098633 100644
--- a/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
+++ b/src/pages/settings/Security/AddDelegate/AddDelegatePage.tsx
@@ -51,8 +51,6 @@ function useOptions() {
             currentUserOption,
             headerMessage,
             categoryOptions: [],
-            tagOptions: [],
-            taxRatesOptions: [],
         };
     }, [optionsList.reports, optionsList.personalDetails, betas, existingDelegates, isLoading]);
 
diff --git a/src/pages/settings/Wallet/VerifyAccountPage.tsx b/src/pages/settings/Wallet/VerifyAccountPage.tsx
index f8e362609d61..5699c0a31cc6 100644
--- a/src/pages/settings/Wallet/VerifyAccountPage.tsx
+++ b/src/pages/settings/Wallet/VerifyAccountPage.tsx
@@ -8,7 +8,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import * as User from '@userActions/User';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 type VerifyAccountPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD>;
@@ -21,7 +20,6 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
     const loginData = loginList?.[contactMethod];
     const validateLoginError = ErrorUtils.getEarliestErrorField(loginData, 'validateLogin');
     const [isUserValidated] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.validated});
-
     const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(true);
 
     const navigateBackTo = route?.params?.backTo;
@@ -39,6 +37,13 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
         User.clearContactMethodErrors(contactMethod, 'validateLogin');
     }, [contactMethod]);
 
+    const closeModal = useCallback(() => {
+        // Disable modal visibility so the navigation is animated
+        setIsValidateCodeActionModalVisible(false);
+        Navigation.goBack();
+    }, []);
+
+    // Handle navigation once the user is validated
     useEffect(() => {
         if (!isUserValidated) {
             return;
@@ -46,24 +51,12 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
 
         setIsValidateCodeActionModalVisible(false);
 
-        if (!navigateBackTo) {
-            return;
-        }
-
-        Navigation.navigate(navigateBackTo);
-    }, [isUserValidated, navigateBackTo]);
-
-    useEffect(() => {
-        if (isValidateCodeActionModalVisible) {
-            return;
-        }
-
-        if (!isUserValidated && navigateBackTo) {
-            Navigation.navigate(ROUTES.SETTINGS_WALLET);
-        } else if (!navigateBackTo) {
+        if (navigateBackTo) {
+            Navigation.navigate(navigateBackTo);
+        } else {
             Navigation.goBack();
         }
-    }, [isValidateCodeActionModalVisible, isUserValidated, navigateBackTo]);
+    }, [isUserValidated, navigateBackTo]);
 
     return (
         <ValidateCodeActionModal
@@ -75,8 +68,9 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
             title={translate('contacts.validateAccount')}
             descriptionPrimary={translate('contacts.featureRequiresValidate')}
             descriptionSecondary={translate('contacts.enterMagicCode', {contactMethod})}
-            onClose={() => setIsValidateCodeActionModalVisible(false)}
             clearError={clearError}
+            onClose={closeModal}
+            onModalHide={() => {}}
         />
     );
 }
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 5f00be36c018..e257efcce828 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -1,7 +1,7 @@
 import {Str} from 'expensify-common';
 import React, {forwardRef, useEffect, useImperativeHandle, useRef, useState} from 'react';
-import type {ForwardedRef} from 'react';
-import {useOnyx} from 'react-native-onyx';
+import type {ForwardedRef, RefAttributes} from 'react';
+import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
 import CustomStatusBarAndBackground from '@components/CustomStatusBarAndBackground';
@@ -24,7 +24,7 @@ import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Account, Credentials} from '@src/types/onyx';
+import type {Account, Credentials, Locale} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import ChooseSSOOrMagicCode from './ChooseSSOOrMagicCode';
 import EmailDeliveryFailurePage from './EmailDeliveryFailurePage';
@@ -37,7 +37,21 @@ import UnlinkLoginForm from './UnlinkLoginForm';
 import ValidateCodeForm from './ValidateCodeForm';
 import type {BaseValidateCodeFormRef} from './ValidateCodeForm/BaseValidateCodeForm';
 
-type SignInPageInnerProps = {
+type SignInPageInnerOnyxProps = {
+    /** The details about the account that the user is signing in with */
+    account: OnyxEntry<Account>;
+
+    /** The credentials of the person signing in */
+    credentials: OnyxEntry<Credentials>;
+
+    /** Active Clients connected to ONYX Database */
+    activeClients: OnyxEntry<string[]>;
+
+    /** The user's preferred locale */
+    preferredLocale: OnyxEntry<Locale>;
+};
+
+type SignInPageInnerProps = SignInPageInnerOnyxProps & {
     shouldEnableMaxHeight?: boolean;
 };
 
@@ -132,18 +146,8 @@ function getRenderOptions({
         shouldShouldSignUpWelcomeForm,
     };
 }
-function SignInPage({shouldEnableMaxHeight = true}: SignInPageInnerProps, ref: ForwardedRef<SignInPageRef>) {
-    const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS);
-    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
-    /**
-      This variable is only added to make sure the component is re-rendered
-      whenever the activeClients change, so that we call the
-      ActiveClientManager.isClientTheLeader function
-      everytime the leader client changes.
-      We use that function to prevent repeating code that checks which client is the leader.
-    */
-    const [activeClients] = useOnyx(ONYXKEYS.ACTIVE_CLIENTS);
-    const [preferredLocale] = useOnyx(ONYXKEYS.NVP_PREFERRED_LOCALE);
+
+function SignInPage({credentials, account, activeClients = [], preferredLocale, shouldEnableMaxHeight = true}: SignInPageInnerProps, ref: ForwardedRef<SignInPageRef>) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate, formatPhoneNumber} = useLocalize();
@@ -335,6 +339,7 @@ function SignInPage({shouldEnableMaxHeight = true}: SignInPageInnerProps, ref: F
 }
 
 type SignInPageProps = SignInPageInnerProps;
+type SignInPageOnyxProps = SignInPageInnerOnyxProps;
 const SignInPageWithRef = forwardRef(SignInPage);
 
 function SignInPageThemeWrapper(props: SignInPageProps, ref: ForwardedRef<SignInPageRef>) {
@@ -356,6 +361,20 @@ function SignInPageThemeWrapper(props: SignInPageProps, ref: ForwardedRef<SignIn
 
 SignInPageThemeWrapper.displayName = 'SignInPage';
 
-export default forwardRef(SignInPageThemeWrapper);
+export default withOnyx<SignInPageProps & RefAttributes<SignInPageRef>, SignInPageOnyxProps>({
+    account: {key: ONYXKEYS.ACCOUNT},
+    credentials: {key: ONYXKEYS.CREDENTIALS},
+    /**
+      This variable is only added to make sure the component is re-rendered
+      whenever the activeClients change, so that we call the
+      ActiveClientManager.isClientTheLeader function
+      everytime the leader client changes.
+      We use that function to prevent repeating code that checks which client is the leader.
+    */
+    activeClients: {key: ONYXKEYS.ACTIVE_CLIENTS},
+    preferredLocale: {
+        key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    },
+})(forwardRef(SignInPageThemeWrapper));
 
 export type {SignInPageRef};
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.tsx b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
index 59ebe08e41a4..33ca336206fe 100644
--- a/src/pages/tasks/TaskAssigneeSelectorModal.tsx
+++ b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
@@ -63,8 +63,6 @@ function useOptions() {
             currentUserOption,
             headerMessage,
             categoryOptions: [],
-            tagOptions: [],
-            taxRatesOptions: [],
         };
     }, [optionsList.reports, optionsList.personalDetails, betas, isLoading]);
 
diff --git a/src/pages/tasks/TaskShareDestinationSelectorModal.tsx b/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
index 8cd38a54f7f9..8465474ef609 100644
--- a/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
+++ b/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
@@ -64,8 +64,6 @@ function TaskShareDestinationSelectorModal() {
                 userToInvite: null,
                 currentUserOption: null,
                 categoryOptions: [],
-                tagOptions: [],
-                taxRatesOptions: [],
                 header: '',
             };
         }
@@ -78,8 +76,6 @@ function TaskShareDestinationSelectorModal() {
             userToInvite: null,
             currentUserOption: null,
             categoryOptions: [],
-            tagOptions: [],
-            taxRatesOptions: [],
             header,
         };
     }, [areOptionsInitialized, optionList.personalDetails, optionList.reports]);
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 3e63ae7cbe79..a259fc7b9ce1 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -87,12 +87,12 @@ function WorkspaceInvitePage({route, policy}: WorkspaceInvitePageProps) {
 
     const defaultOptions = useMemo(() => {
         if (!areOptionsInitialized) {
-            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: [], tagOptions: [], taxRatesOptions: []};
+            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: []};
         }
 
         const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], '', excludedUsers, true);
 
-        return {...inviteOptions, recentReports: [], currentUserOption: null, categoryOptions: [], tagOptions: [], taxRatesOptions: []};
+        return {...inviteOptions, recentReports: [], currentUserOption: null, categoryOptions: []};
     }, [areOptionsInitialized, betas, excludedUsers, options.personalDetails]);
 
     const inviteOptions = useMemo(
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index db21700a0c47..891a3d370085 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -124,7 +124,12 @@ function WorkspacesListPage() {
     const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyIDToDelete ?? '-1');
     const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
     const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
-    const hasCardFeedOrExpensifyCard = !isEmptyObject(cardFeeds) || !isEmptyObject(cardsList);
+    const policyToDelete = PolicyUtils.getPolicy(policyIDToDelete);
+    const hasCardFeedOrExpensifyCard =
+        !isEmptyObject(cardFeeds) ||
+        !isEmptyObject(cardsList) ||
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        ((policyToDelete?.areExpensifyCardsEnabled || policyToDelete?.areCompanyCardsEnabled) && policyToDelete?.workspaceAccountID);
 
     const confirmDeleteAndHideModal = () => {
         if (!policyIDToDelete || !policyNameToDelete) {
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
index 718b5953f3ac..a48dd6e0cd53 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
@@ -6,8 +6,8 @@ import TaxPicker from '@components/TaxPicker';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import type * as OptionsListUtils from '@libs/OptionsListUtils';
 import {getDistanceRateCustomUnit} from '@libs/PolicyUtils';
+import type * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -30,7 +30,7 @@ function PolicyDistanceRateTaxRateEditPage({route, policy}: PolicyDistanceRateTa
     const taxRateExternalID = rate?.attributes?.taxRateExternalID;
     const selectedTaxRate = TransactionUtils.getWorkspaceTaxesSettingsName(policy, taxRateExternalID ?? '');
 
-    const onTaxRateChange = (newTaxRate: OptionsListUtils.TaxRatesOption) => {
+    const onTaxRateChange = (newTaxRate: TaxOptionsListUtils.TaxRatesOption) => {
         if (taxRateExternalID === newTaxRate.code) {
             Navigation.goBack();
             return;
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
index 2e40667c1daf..ac8ddcd34c0e 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
@@ -8,7 +8,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import type * as OptionsListUtils from '@libs/OptionsListUtils';
+import type * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -33,7 +33,7 @@ function WorkspaceTaxesSettingsForeignCurrency({
 
     const selectedTaxRate = TransactionUtils.getWorkspaceTaxesSettingsName(policy, foreignTaxDefault);
 
-    const submit = (taxes: OptionsListUtils.TaxRatesOption) => {
+    const submit = (taxes: TaxOptionsListUtils.TaxRatesOption) => {
         setForeignCurrencyDefault(policyID, taxes.code ?? '');
         Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
     };
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
index c46efe3fd243..0a82d7c21a24 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
@@ -8,7 +8,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import type * as OptionsListUtils from '@libs/OptionsListUtils';
+import type * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -33,7 +33,7 @@ function WorkspaceTaxesSettingsWorkspaceCurrency({
     const defaultExternalID = policy?.taxRates?.defaultExternalID ?? '';
     const selectedTaxRate = policy?.taxRates && TransactionUtils.getWorkspaceTaxesSettingsName(policy, defaultExternalID);
 
-    const submit = (taxes: OptionsListUtils.TaxRatesOption) => {
+    const submit = (taxes: TaxOptionsListUtils.TaxRatesOption) => {
         setWorkspaceCurrencyDefault(policyID, taxes.code ?? '');
         Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
     };
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index b9948466bef9..77aaee13fb9e 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -1,7 +1,7 @@
 import {useFocusEffect} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useMemo, useState} from 'react';
-import {ActivityIndicator, View} from 'react-native';
+import {ActivityIndicator, InteractionManager, View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import ApprovalWorkflowSection from '@components/ApprovalWorkflowSection';
 import ConfirmModal from '@components/ConfirmModal';
@@ -92,7 +92,9 @@ function WorkspaceWorkflowsPage({policy, route}: WorkspaceWorkflowsPageProps) {
 
     useFocusEffect(
         useCallback(() => {
-            fetchData();
+            InteractionManager.runAfterInteractions(() => {
+                fetchData();
+            });
         }, [fetchData]),
     );
 
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
index d67dd564057c..b4f1164c8102 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
@@ -50,8 +50,10 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
         // We need to remove members and approvers that are no longer in the updated workflow
         const membersToRemove = initialApprovalWorkflow.members.filter((initialMember) => !approvalWorkflow.members.some((member) => member.email === initialMember.email));
         const approversToRemove = initialApprovalWorkflow.approvers.filter((initialApprover) => !approvalWorkflow.approvers.some((approver) => approver.email === initialApprover.email));
-        Workflow.updateApprovalWorkflow(route.params.policyID, approvalWorkflow, membersToRemove, approversToRemove);
         Navigation.dismissModal();
+        InteractionManager.runAfterInteractions(() => {
+            Workflow.updateApprovalWorkflow(route.params.policyID, approvalWorkflow, membersToRemove, approversToRemove);
+        });
     }, [approvalWorkflow, initialApprovalWorkflow, route.params.policyID]);
 
     const removeApprovalWorkflow = useCallback(() => {
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 8ebfc5582b02..154f8240b0c5 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -5313,6 +5313,14 @@ const styles = (theme: ThemeColors) =>
             borderColor: theme.border,
             padding: 16,
         },
+        liDot: {
+            width: 4,
+            height: 4,
+            borderRadius: 4,
+            backgroundColor: theme.text,
+            marginHorizontal: 8,
+            alignSelf: 'center',
+        },
     } satisfies Styles);
 
 type ThemeStyles = ReturnType<typeof styles>;
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index ffccc00a7a47..6178b940a486 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -85,9 +85,6 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Whether the user is not an admin of policyExpenseChat chat */
         isOwnPolicyExpenseChat?: boolean;
 
-        /** Whether the report is policyExpenseChat */
-        isPolicyExpenseChat?: boolean;
-
         /** Indicates if the report is pinned to the LHN or not */
         isPinned?: boolean;
 
@@ -178,9 +175,6 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** When was the last visible action last modified */
         lastVisibleActionLastModified?: string;
 
-        /** Display name of the report, shown in options and mentions */
-        displayName?: string;
-
         /** HTML content of the last message in the report */
         lastMessageHtml?: string;
 
@@ -205,9 +199,6 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** For expense reports, this is the currency of the expense */
         currency?: string;
 
-        /** Collection of errors to be shown to the user */
-        errors?: OnyxCommon.Errors;
-
         /** Collection of errors that exist in report fields */
         errorFields?: OnyxCommon.ErrorFields;
 
diff --git a/src/types/utils/whitelistedReportKeys.ts b/src/types/utils/whitelistedReportKeys.ts
index 3c566c987526..71510e498854 100644
--- a/src/types/utils/whitelistedReportKeys.ts
+++ b/src/types/utils/whitelistedReportKeys.ts
@@ -12,7 +12,6 @@ type WhitelistedReport = OnyxCommon.OnyxValueWithOfflineFeedback<
         hasOutstandingChildRequest: unknown;
         hasOutstandingChildTask: unknown;
         isOwnPolicyExpenseChat: unknown;
-        isPolicyExpenseChat: unknown;
         isPinned: unknown;
         lastMessageText: unknown;
         lastVisibleActionCreated: unknown;
@@ -43,7 +42,6 @@ type WhitelistedReport = OnyxCommon.OnyxValueWithOfflineFeedback<
         isOptimisticReport: unknown;
         managerID: unknown;
         lastVisibleActionLastModified: unknown;
-        displayName: unknown;
         lastMessageHtml: unknown;
         lastActorAccountID: unknown;
         lastActionType: unknown;
@@ -52,7 +50,6 @@ type WhitelistedReport = OnyxCommon.OnyxValueWithOfflineFeedback<
         total: unknown;
         unheldTotal: unknown;
         currency: unknown;
-        errors: unknown;
         errorFields: unknown;
         isWaitingOnBankAccount: unknown;
         isCancelledIOU: unknown;
diff --git a/tests/unit/DebugUtilsTest.ts b/tests/unit/DebugUtilsTest.ts
index abeaff971194..00dc85b9c196 100644
--- a/tests/unit/DebugUtilsTest.ts
+++ b/tests/unit/DebugUtilsTest.ts
@@ -860,15 +860,7 @@ describe('DebugUtils', () => {
             expect(reason).toBe('debug.reasonVisibleInLHN.hasRBR');
         });
         it('returns correct reason when report has errors', () => {
-            const reason = DebugUtils.getReasonForShowingRowInLHN(
-                {
-                    ...baseReport,
-                    errors: {
-                        error: 'Something went wrong',
-                    },
-                },
-                true,
-            );
+            const reason = DebugUtils.getReasonForShowingRowInLHN(baseReport, true);
             expect(reason).toBe('debug.reasonVisibleInLHN.hasRBR');
         });
     });
diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index d4d66fd1fd62..d71b5522e11b 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -6,7 +6,7 @@ import CONST from '@src/CONST';
 import * as OptionsListUtils from '@src/libs/OptionsListUtils';
 import * as ReportUtils from '@src/libs/ReportUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetails, Policy, PolicyCategories, Report, TaxRatesWithDefault, Transaction} from '@src/types/onyx';
+import type {PersonalDetails, Policy, PolicyCategories, Report} from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
@@ -1885,125 +1885,6 @@ describe('OptionsListUtils', () => {
         expect(OptionsListUtils.sortCategories(categoriesIncorrectOrdering3)).toStrictEqual(result3);
     });
 
-    it('getFilteredOptions() for taxRate', () => {
-        const search = 'rate';
-        const emptySearch = '';
-        const wrongSearch = 'bla bla';
-
-        const taxRatesWithDefault: TaxRatesWithDefault = {
-            name: 'Tax',
-            defaultExternalID: 'CODE1',
-            defaultValue: '0%',
-            foreignTaxDefault: 'CODE1',
-            taxes: {
-                CODE2: {
-                    name: 'Tax rate 2',
-                    value: '3%',
-                    code: 'CODE2',
-                    modifiedName: 'Tax rate 2 (3%)',
-                    pendingAction: 'delete',
-                },
-                CODE3: {
-                    name: 'Tax option 3',
-                    value: '5%',
-                    code: 'CODE3',
-                    modifiedName: 'Tax option 3 (5%)',
-                    pendingAction: undefined,
-                },
-                CODE1: {
-                    name: 'Tax exempt 1',
-                    value: '0%',
-                    code: 'CODE1',
-                    modifiedName: 'Tax exempt 1 (0%) • Default',
-                    pendingAction: undefined,
-                },
-            },
-        };
-        const policy = {
-            taxRates: taxRatesWithDefault,
-        } as Policy;
-
-        const transaction = {
-            taxCode: 'CODE1',
-        } as Transaction;
-
-        const resultList: OptionsListUtils.CategorySection[] = [
-            {
-                data: [
-                    {
-                        code: 'CODE1',
-                        isDisabled: false,
-                        isSelected: undefined,
-                        keyForList: 'Tax exempt 1 (0%) • Default',
-                        searchText: 'Tax exempt 1 (0%) • Default',
-                        text: 'Tax exempt 1 (0%) • Default',
-                        tooltipText: 'Tax exempt 1 (0%) • Default',
-                        pendingAction: undefined,
-                    },
-                    {
-                        code: 'CODE3',
-                        isDisabled: false,
-                        isSelected: undefined,
-                        keyForList: 'Tax option 3 (5%)',
-                        searchText: 'Tax option 3 (5%)',
-                        text: 'Tax option 3 (5%)',
-                        tooltipText: 'Tax option 3 (5%)',
-                        pendingAction: undefined,
-                    },
-                    {
-                        code: 'CODE2',
-                        isDisabled: true,
-                        isSelected: undefined,
-                        keyForList: 'Tax rate 2 (3%)',
-                        searchText: 'Tax rate 2 (3%)',
-                        text: 'Tax rate 2 (3%)',
-                        tooltipText: 'Tax rate 2 (3%)',
-                        pendingAction: 'delete',
-                    },
-                ],
-                shouldShow: false,
-                title: '',
-            },
-        ];
-
-        const searchResultList: OptionsListUtils.CategorySection[] = [
-            {
-                data: [
-                    {
-                        code: 'CODE2',
-                        isDisabled: true,
-                        isSelected: undefined,
-                        keyForList: 'Tax rate 2 (3%)',
-                        searchText: 'Tax rate 2 (3%)',
-                        text: 'Tax rate 2 (3%)',
-                        tooltipText: 'Tax rate 2 (3%)',
-                        pendingAction: 'delete',
-                    },
-                ],
-                shouldShow: true,
-                title: '',
-            },
-        ];
-
-        const wrongSearchResultList: OptionsListUtils.CategorySection[] = [
-            {
-                data: [],
-                shouldShow: true,
-                title: '',
-            },
-        ];
-
-        const result = OptionsListUtils.getTaxRatesSection(policy, [], emptySearch, transaction);
-
-        expect(result).toStrictEqual(resultList);
-
-        const searchResult = OptionsListUtils.getTaxRatesSection(policy, [], search, transaction);
-        expect(searchResult).toStrictEqual(searchResultList);
-
-        const wrongSearchResult = OptionsListUtils.getTaxRatesSection(policy, [], wrongSearch, transaction);
-        expect(wrongSearchResult).toStrictEqual(wrongSearchResultList);
-    });
-
     it('formatMemberForList()', () => {
         const formattedMembers = Object.values(PERSONAL_DETAILS).map((personalDetail) => OptionsListUtils.formatMemberForList(personalDetail));
 
diff --git a/tests/unit/TaxOptionsListUtilsTest.ts b/tests/unit/TaxOptionsListUtilsTest.ts
new file mode 100644
index 000000000000..255cedd7c7d5
--- /dev/null
+++ b/tests/unit/TaxOptionsListUtilsTest.ts
@@ -0,0 +1,136 @@
+import type {CategorySection} from '@libs/OptionsListUtils';
+import * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
+import type {Policy, TaxRatesWithDefault, Transaction} from '@src/types/onyx';
+
+describe('TaxOptionsListUtils', () => {
+    it('getTaxRatesSection()', () => {
+        const search = 'rate';
+        const emptySearch = '';
+        const wrongSearch = 'bla bla';
+
+        const taxRatesWithDefault: TaxRatesWithDefault = {
+            name: 'Tax',
+            defaultExternalID: 'CODE1',
+            defaultValue: '0%',
+            foreignTaxDefault: 'CODE1',
+            taxes: {
+                CODE2: {
+                    name: 'Tax rate 2',
+                    value: '3%',
+                    code: 'CODE2',
+                    modifiedName: 'Tax rate 2 (3%)',
+                    pendingAction: 'delete',
+                },
+                CODE3: {
+                    name: 'Tax option 3',
+                    value: '5%',
+                    code: 'CODE3',
+                    modifiedName: 'Tax option 3 (5%)',
+                    pendingAction: undefined,
+                },
+                CODE1: {
+                    name: 'Tax exempt 1',
+                    value: '0%',
+                    code: 'CODE1',
+                    modifiedName: 'Tax exempt 1 (0%) • Default',
+                    pendingAction: undefined,
+                },
+            },
+        };
+        const policy = {
+            taxRates: taxRatesWithDefault,
+        } as Policy;
+
+        const transaction = {
+            taxCode: 'CODE1',
+        } as Transaction;
+
+        const resultList: CategorySection[] = [
+            {
+                data: [
+                    {
+                        code: 'CODE1',
+                        isDisabled: false,
+                        isSelected: undefined,
+                        keyForList: 'Tax exempt 1 (0%) • Default',
+                        searchText: 'Tax exempt 1 (0%) • Default',
+                        text: 'Tax exempt 1 (0%) • Default',
+                        tooltipText: 'Tax exempt 1 (0%) • Default',
+                        pendingAction: undefined,
+                    },
+                    {
+                        code: 'CODE3',
+                        isDisabled: false,
+                        isSelected: undefined,
+                        keyForList: 'Tax option 3 (5%)',
+                        searchText: 'Tax option 3 (5%)',
+                        text: 'Tax option 3 (5%)',
+                        tooltipText: 'Tax option 3 (5%)',
+                        pendingAction: undefined,
+                    },
+                    {
+                        code: 'CODE2',
+                        isDisabled: true,
+                        isSelected: undefined,
+                        keyForList: 'Tax rate 2 (3%)',
+                        searchText: 'Tax rate 2 (3%)',
+                        text: 'Tax rate 2 (3%)',
+                        tooltipText: 'Tax rate 2 (3%)',
+                        pendingAction: 'delete',
+                    },
+                ],
+                shouldShow: false,
+                title: '',
+            },
+        ];
+
+        const searchResultList: CategorySection[] = [
+            {
+                data: [
+                    {
+                        code: 'CODE2',
+                        isDisabled: true,
+                        isSelected: undefined,
+                        keyForList: 'Tax rate 2 (3%)',
+                        searchText: 'Tax rate 2 (3%)',
+                        text: 'Tax rate 2 (3%)',
+                        tooltipText: 'Tax rate 2 (3%)',
+                        pendingAction: 'delete',
+                    },
+                ],
+                shouldShow: true,
+                title: '',
+            },
+        ];
+
+        const wrongSearchResultList: CategorySection[] = [
+            {
+                data: [],
+                shouldShow: true,
+                title: '',
+            },
+        ];
+
+        const result = TaxOptionsListUtils.getTaxRatesSection({
+            policy,
+            searchValue: emptySearch,
+            transaction,
+        });
+
+        expect(result).toStrictEqual(resultList);
+
+        const searchResult = TaxOptionsListUtils.getTaxRatesSection({
+            policy,
+            searchValue: search,
+            transaction,
+        });
+        expect(searchResult).toStrictEqual(searchResultList);
+
+        const wrongSearchResult = TaxOptionsListUtils.getTaxRatesSection({
+            policy,
+            searchValue: wrongSearch,
+            transaction,
+        });
+        expect(wrongSearchResult).toStrictEqual(wrongSearchResultList);
+    });
+});
diff --git a/tests/utils/collections/reports.ts b/tests/utils/collections/reports.ts
index cf8e85893996..51ec8fbf90b5 100644
--- a/tests/utils/collections/reports.ts
+++ b/tests/utils/collections/reports.ts
@@ -7,7 +7,6 @@ export default function createRandomReport(index: number): Report {
         reportID: index.toString(),
         chatType: rand(Object.values(CONST.REPORT.CHAT_TYPE)),
         currency: randCurrencyCode(),
-        displayName: randWord(),
         ownerAccountID: index,
         isPinned: randBoolean(),
         isOptimisticReport: randBoolean(),