diff --git a/README.md b/README.md
index 400260393bc1..7019567c7acb 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ These instructions should get you set up ready to work on New Expensify 🙌
 1. Install `nvm` then `node` & `npm`: `brew install nvm && nvm install`
 2. Install `watchman`: `brew install watchman`
 3. Install dependencies: `npm install`
-4. Install `mkcert`: `brew install mkcert` followed by `npm run setup-https`. If you are not using macOS, follow the instructions [here](https://github.com/FiloSottile/mkcert?tab=readme-ov-file#installation). 
+4. Install `mkcert`: `brew install mkcert` followed by `npm run setup-https`. If you are not using macOS, follow the instructions [here](https://github.com/FiloSottile/mkcert?tab=readme-ov-file#installation).
 5. Create a host entry in your local hosts file, `/etc/hosts` for dev.new.expensify.com pointing to localhost:
 ```
 127.0.0.1 dev.new.expensify.com
@@ -86,7 +86,7 @@ If you want to run the app on an actual physical iOS device, please follow the i
 1. If you are having issues with **_Getting Started_**, please reference [React Native's Documentation](https://reactnative.dev/docs/environment-setup)
 2. If you are running into CORS errors like (in the browser dev console)
    ```sh
-   Access to fetch at 'https://www.expensify.com/api?command=BeginSignIn' from origin 'http://localhost:8080' has been blocked by CORS policy
+   Access to fetch at 'https://www.expensify.com/api/BeginSignIn' from origin 'http://localhost:8080' has been blocked by CORS policy
    ```
    You probably have a misconfigured `.env` file - remove it (`rm .env`) and try again
 
@@ -113,7 +113,7 @@ variables referenced here get updated since your local `.env` file is ignored.
    see [PERFORMANCE.md](contributingGuides/PERFORMANCE.md#performance-metrics-opt-in-on-local-release-builds) for more information
 - `ONYX_METRICS` (optional) - Set this to `true` to capture even more performance metrics and see them in Flipper
    see [React-Native-Onyx#benchmarks](https://github.com/Expensify/react-native-onyx#benchmarks) for more information
-- `E2E_TESTING` (optional) - This needs to be set to `true` when running the e2e tests for performance regression testing. 
+- `E2E_TESTING` (optional) - This needs to be set to `true` when running the e2e tests for performance regression testing.
    This happens usually automatically, read [this](tests/e2e/README.md) for more information
 
 ----
@@ -127,7 +127,7 @@ You create this certificate by following the instructions in [`Configuring HTTPS
 #### Pre-requisite for Android flow
 1. Open any emulator using Android Studio
 2. Use `adb push "$(mkcert -CAROOT)/rootCA.pem" /storage/emulated/0/Download/` to push certificate to install in Download folder.
-3. Install the certificate as CA certificate from the settings. On the Android emulator, this option can be found in Settings > Security > Encryption & Credentials > Install a certificate > CA certificate.  
+3. Install the certificate as CA certificate from the settings. On the Android emulator, this option can be found in Settings > Security > Encryption & Credentials > Install a certificate > CA certificate.
 4. Close the emulator.
 
 Note - If you want to run app on `https://127.0.0.1:8082`, then just install the certificate and use `adb reverse tcp:8082 tcp:8082` on every startup.
@@ -196,7 +196,7 @@ Often, performance issue debugging occurs in debug builds, which can introduce e
 
 ### Getting Started with Source Maps
 To accurately profile your application, generating source maps for Android and iOS is crucial. Here's how to enable them:
-1. Enable source maps on Android 
+1. Enable source maps on Android
 Ensure the following is set in your app's `android/app/build.gradle` file.
 
     ```jsx
@@ -205,13 +205,13 @@ Ensure the following is set in your app's `android/app/build.gradle` file.
         hermesFlagsRelease: ["-O", "-output-source-map"], // <-- here, plus whichever flag was required to set this away from default
     ]
     ```
-    
-2. Enable source maps on IOS 
+
+2. Enable source maps on IOS
 Within Xcode head to the build phase - `Bundle React Native code and images`.
-    
+
     ```jsx
     export SOURCEMAP_FILE="$(pwd)/../main.jsbundle.map" // <-- here;
-    
+
     export NODE_BINARY=node
     ../node_modules/react-native/scripts/react-native-xcode.sh
     ```
@@ -221,8 +221,8 @@ Within Xcode head to the build phase - `Bundle React Native code and images`.
     ```
 7. Depending on the platform you are targeting, run your Android/iOS app in production mode.
 8. Upon completion, the generated source map can be found at:
-  Android: `android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map` 
-  IOS: `main.jsbundle.map` 
+  Android: `android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map`
+  IOS: `main.jsbundle.map`
 
 ### Recording a Trace:
 1. Ensure you have generated the source map as outlined above.
@@ -253,7 +253,7 @@ Build info:
 
 4. Use the following commands to symbolicate the trace for Android and iOS, respectively:
 Android: `npm run symbolicate-release:android`
-IOS: `npm run symbolicate-release:ios` 
+IOS: `npm run symbolicate-release:ios`
 5. A new file named `Profile_trace_for_<app version>-converted.json` will appear in your project's root folder.
 6. Open this file in your tool of choice:
     - SpeedScope ([https://www.speedscope.app](https://www.speedscope.app/))
@@ -482,8 +482,8 @@ Updated rules for managing members across all types of chats in New Expensify.
     - Members can't leave or be removed from the #announce room
     - Admins can't leave or be removed from #admins
     - Domain members can't leave or be removed from their domain chat
-    - Report submitters can't leave or be removed from their reports 
-    - Report managers can't leave or be removed from their reports 
+    - Report submitters can't leave or be removed from their reports
+    - Report managers can't leave or be removed from their reports
     - Group owners cannot be removed from their groups - they need to transfer ownership first
 - **Excepting the above, admins can remove anyone. For example:**
     - Group admins can remove other group admins, as well as group members
@@ -494,17 +494,17 @@ Updated rules for managing members across all types of chats in New Expensify.
 
 1. ### DM
     |  | Member
-    | :---: | :---: 
-    | **Invite** | ❌ 
-    | **Remove** | ❌ 
-    | **Leave**  | ❌ 
+    | :---: | :---:
+    | **Invite** | ❌
+    | **Remove** | ❌
+    | **Leave**  | ❌
     | **Can be removed**  | ❌
 - DM always has two participants. None of the participant can leave or be removed from the DM. Also no additional member can be invited to the chat.
 
 2. ### Workspace
     1. #### Workspace
         |   |  Creator  |  Member(Employee/User) | Admin |  Auditor?
-        | :---: | :---:  |  :---: | :---: | :---: 
+        | :---: | :---:  |  :---: | :---: | :---:
         | **Invite** | ✅ |  ❌ |  ✅ | ❌
         | **Remove** | ✅ |  ❌ |  ✅ | ❌
         | **Leave**  | ❌ |  ✅ |  ❌ | ✅
@@ -518,7 +518,7 @@ Updated rules for managing members across all types of chats in New Expensify.
 
     2. #### Workspace #announce room
         |   |  Member(Employee/User) | Admin |  Auditor?
-        | :---: | :---:  |  :---: | :---: 
+        | :---: | :---:  |  :---: | :---:
         | **Invite** | ❌ |  ❌ |  ❌
         | **Remove** | ❌ |  ❌ |  ❌
         | **Leave**  | ❌ |  ❌ |  ❌
@@ -528,14 +528,14 @@ Updated rules for managing members across all types of chats in New Expensify.
 
     3. #### Workspace #admin room
         |   |  Admin |
-        | :---: | :---: 
-        | **Invite** | ❌  
-        | **Remove** | ❌   
-        | **Leave**  | ❌ 
+        | :---: | :---:
+        | **Invite** | ❌
+        | **Remove** | ❌
+        | **Leave**  | ❌
         | **Can be removed**  | ❌
 
         - Admins can't leave or be removed from #admins
-    
+
     4. #### Workspace rooms
         |   |  Creator | Member | Guest(outside of the workspace)
         | :---: | :---:  |  :---: | :---:
@@ -548,10 +548,10 @@ Updated rules for managing members across all types of chats in New Expensify.
         - Guests are not able to remove anyone from the room
 
     4. #### Workspace chats
-        |   |  Admin | Member(default) | Member(invited)  
+        |   |  Admin | Member(default) | Member(invited)
         | :---: | :---:  |  :---:  |  :---:
         | **Invite** | ✅ |  ✅ | ❌
-        | **Remove** | ✅ |  ✅ | ❌  
+        | **Remove** | ✅ |  ✅ | ❌
         | **Leave**  | ❌ |  ❌  | ✅
         | **Can be removed**  | ❌ | ❌ | ✅
 
@@ -563,16 +563,16 @@ Updated rules for managing members across all types of chats in New Expensify.
 
 3. ### Domain chat
     |   |  Member
-    | :---: | :---:  
-    | **Remove** | ❌ 
-    | **Leave**  | ❌ 
-    | **Can be removed**  | ❌ 
+    | :---: | :---:
+    | **Remove** | ❌
+    | **Leave**  | ❌
+    | **Can be removed**  | ❌
 
 - Domain members can't leave or be removed from their domain chat
 
 4. ### Reports
     |   |  Submitter | Manager
-    | :---: | :---:  | :---:  
+    | :---: | :---:  | :---:
     | **Remove** | ❌ | ❌
     | **Leave**  | ❌ | ❌
     | **Can be removed**  | ❌ | ❌
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c30938a6da5c..d687ccfb0cc3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001045401
-        versionName "1.4.54-1"
+        versionCode 1001045500
+        versionName "1.4.55-0"
     }
 
     flavorDimensions "default"
diff --git a/docs/articles/expensify-classic/expenses/Add-expenses-in-bulk.md b/docs/articles/expensify-classic/expenses/Add-expenses-in-bulk.md
new file mode 100644
index 000000000000..6ee84e1ead15
--- /dev/null
+++ b/docs/articles/expensify-classic/expenses/Add-expenses-in-bulk.md
@@ -0,0 +1,44 @@
+---
+title: Add expenses in bulk
+description: Add multiple expenses at one time
+---
+<div id="expensify-classic" markdown="1">
+
+You can upload bulk receipt images or add receipt details in bulk.
+
+# SmartScan receipt images in bulk
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the **Expenses** tab.
+2. Drag and drop up to 10 images or PDF receipts at once from your computer’s files. You can drop them anywhere on the Expense page where you see a green plus icon next to your mouse cursor. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Open the mobile app and tap the camera icon in the bottom right corner.
+2. Tap the camera icon in the right corner to select the Rapid Fire mode. 
+3. Take a clear photo of each receipt. 
+4. When all receipts are captured, tap the X in the left corner to close the camera. 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# Manually add receipt details in bulk
+
+*Note: This process is currently not available from the mobile app and must be completed from the Expensify website.*
+
+1. Click the **Expenses** tab.
+2. Click **New Expense** and select **Create Multiple**.
+3. Enter the expense details for up to 10 expenses and click **Save**. 
+
+# Upload personal expenses via CSV, XLS, etc.
+
+*Note: This process is currently not available from the mobile app and must be completed from the Expensify website.*
+
+1. Hover over Settings, then click **Account**. 
+2. Click the **Credit Card Import** tab. 
+3. Under Personal Cards, click **Import Transactions from File**. 
+4. Click **Upload** and select a .csv, .xls, .ofx, or a .qfx file.
+
+</div>
diff --git a/docs/articles/expensify-classic/expenses/Split-an-expense.md b/docs/articles/expensify-classic/expenses/Split-an-expense.md
new file mode 100644
index 000000000000..997d81ef0729
--- /dev/null
+++ b/docs/articles/expensify-classic/expenses/Split-an-expense.md
@@ -0,0 +1,49 @@
+---
+title: Split an expense
+description: Divide expenses on a receipt into separate expenses
+---
+<div id="expensify-classic" markdown="1">
+
+You can break down a receipt into multiple expenses by splitting it. Each split expense is treated as an individual expense which can be categorized and tagged separately. The same receipt image will be attached to all of the split expenses. 
+
+{% include info.html %}
+Splitting an expense cannot be undone.
+{% include end-info.html %}
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the **Expenses** tab.
+2. Click the expense you want to split.
+3. Scroll down and click **Split Expense** in the bottom left corner.
+4. Use the buttons in the bottom left corner to select how to split the expenses. 
+   - Add additional splits by clicking **Add Split**. 
+   - Split the expense for multiple days by clicking **Split by Days**. This option is good for expenses like hotel stays. 
+   - Split the expense evenly by clicking **Split Even**. This option also works if you add more than two splits.
+
+{% include info.html %}
+Each split must have a value greater than $0.00 and all splits must add up to the total expense amount.
+{% include end-info.html %}
+ 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap the **Expenses** tab.
+2. Tap the expense you want to split.
+3. Scroll down to the bottom and tap **More Options**.
+4. Tap **Split**.
+5. Tap each split to add the expense details including the total and category, then click **Save**. To add any additional splits, click **Add Split**.
+
+{% include info.html %}
+Each split must have a value greater than $0.00 and all splits must add up to the total expense amount.
+{% include end-info.html %}
+
+6. Once all splits have been added and adjusted, click **Save**.  
+
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+
+
+</div>
diff --git a/docs/articles/expensify-classic/expenses/Track-group-expenses.md b/docs/articles/expensify-classic/expenses/Track-group-expenses.md
new file mode 100644
index 000000000000..82921b0e8cd3
--- /dev/null
+++ b/docs/articles/expensify-classic/expenses/Track-group-expenses.md
@@ -0,0 +1,41 @@
+---
+title: Track group expenses
+description: Use Attendee Tracking to track group expenses
+---
+<div id="expensify-classic" markdown="1">
+
+Capture group and event expenses with Attendee Tracking by documenting who attended and the cost per attendee. The amount is always divided evenly between all attendees—different amounts cannot be allocated to specific attendees. To divide the amounts differently, you’ll first have to split the expense. 
+
+{% include info.html %}
+Attendees added to an expense will not be notified that they were added to an expense, nor will they share in the expense or be requested to pay for any portion of the expense. 
+{% include end-info.html %}
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the **Expenses** tab. 
+2. Click the expense you want to add attendees to.
+3. Click the attendees field and enter the name or email address of the attendee.
+   - If the attendee is a member of your workspace, you can select their name from the list. 
+   - If the attendee is not a member of your workspace, enter their full name or email address and press Enter on your keyboard to add them as a new attendee. 
+4. Click **Save**.
+
+Once added, you’ll also see the list of attendees in the expense overview on the Expenses tab. To see the cost per employee, hover over the receipt total. These details are also available on any report that you add the expense to.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap the **Expenses** tab. 
+2. Tap the expense you want to add attendees to.
+3. Scroll down to the bottom and tap **More Options**.
+4. Tap the attendees field and enter the name or email address of the attendee. 
+   - If the attendee is a member of your workspace, you can select their name from the list. 
+   - If the attendee is not a member of your workspace, enter their full name or email address and press Enter on your keyboard to add them as a new attendee. 
+5. Tap **Save**.
+
+Attendees will also be listed on any report that you add the expense to. 
+ 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/expensify-classic/expenses/expenses/Merge-Expenses.md b/docs/articles/expensify-classic/expenses/expenses/Merge-Expenses.md
deleted file mode 100644
index a26146536e42..000000000000
--- a/docs/articles/expensify-classic/expenses/expenses/Merge-Expenses.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: Merge Expenses
-description: This article shows you all the ways that you can merge your expenses in Expensify!
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# About
-The merge expense function helps combine two separate expenses into one. This is useful when the same expense has been accidentally entered more than once, or if you have a connected credit card and an imported expense didn’t automatically merge with a manual entry. 
-
-# How-to merge expenses
-It’s important to note that merging expenses doesn't add the two values together. Instead, merging them combines both expenses to create a single, consolidated expense.
-
-Keep in mind: 
-1. Merging expenses cannot be undone.
-2. You can only merge two expenses at a time.
-3. You can merge a cash expense with a credit card expense, or two cash expenses - but not two credit card expenses.
-4. In order to merge, both expenses will need to be in a Personal or Draft status.
-
-# How to merge expenses on the web app
-To merge two expenses from the Expenses page:
-1. Sign into your Expensify account.
-2. Navigate to the Expenses page on the left-hand navigation.
-3. Click the checkboxes next to the two expenses you wish to merge.
-4. Click **Merge**.
-5. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.  
-
-To merge two expenses from the Reports page:
-1. Sign into your Expensify account.
-2. Navigate to the Reports page on the left-hand navigation.
-3. Click the Report that contains the expenses that you wish to merge.
-4. Click on the **Details** tab, then the Pencil icon.
-5. Select the two expenses that you wish to merge.
-6. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.   
-
-# How to merge expenses on the Expensify mobile app
-On the mobile app, merging is prompted when you see the message _"Potential duplicate expense detected"_. Simply tap **Resolve Now** to take a closer look, then hit **Merge Expense**, and you're done! 
-
-If the expenses exist on two different reports, you will be asked which report you'd like the newly created single expense to be reported onto.
-
-{% include faq-begin.md %}
-
-## Can you merge expenses across different reports?
-
-You cannot merge expenses across different reports. Expenses will only merge if they are on the same report. If you have expenses across different reports that you wish to merge, you’ll need to move both expenses onto the same report (and ensure they are in the Draft status) in order to merge them.
-
-## Can you merge expenses across different accounts?
-
-You cannot merge expenses across two separate accounts. You will need to choose one submitter and transfer the expense information to that user's account in order to merge the expense.
-
-## Can you merge expenses with different currencies?
-
-Yes, you can merge expenses with different currencies. The conversion amount will be based on the daily exchange rate for the date of the transaction, as long as the converted rates are within +/- 5%. If the currencies are the same, then the amounts must be an exact match to merge.
-
-## Can Expensify automatically merge a cash expense with a credit card expense?
-
-Yes, Expensify can merge a cash expense with a credit card expense. A receipt will need to be SmartScanned via the app or forwarded to [receipts@expensify.com](mailto:receipts@expensify.com) in order to merge with a card expense. Note that the SmartScan must be fully completed and not stopped or edited, otherwise the two won’t merge. 
-
-## It doesn’t look like my cash and card expenses merged properly. What are some troubleshooting tips?
-First, check the expense types - you can only merge a SmartScanned receipt (which will initially show with a cash icon) with a card transaction imported from a bank or via CSV.  
-
-If the card expense in your Expensify account is older than the receipt you're trying to merge it with, they won't merge, and if the receipt is dated more than 7 days prior to the card expense, then they also will not merge.
-
-If you have any expenses that are more than 90 days old from the date they were incurred (not the date they were imported to Expensify), Expensify will not automatically merge them. This safeguard helps prevent the merging of very old expenses that might not align with recent transactions or receipts.
-
-Lastly, transactions imported with the Expensify API (via the Expense Importer) will not automatically merge with SmartScanned transactions.
diff --git a/docs/articles/expensify-classic/expenses/expenses/Merge-expenses.md b/docs/articles/expensify-classic/expenses/expenses/Merge-expenses.md
new file mode 100644
index 000000000000..8b1f573a64b4
--- /dev/null
+++ b/docs/articles/expensify-classic/expenses/expenses/Merge-expenses.md
@@ -0,0 +1,57 @@
+---
+title: Merge expenses
+description: Combine two expenses into one
+---
+
+Combine two separate expenses by merging them into one single, consolidated expense.
+
+{% include info.html %}
+Merging expenses cannot be undone, and you cannot merge two credit card expenses.
+{% include end-info.html %}
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+To merge expenses from the Expenses tab,
+
+1. Click the **Expenses** tab.
+2. Select the checkbox next to the two expenses you wish to merge.
+3. Click **Merge**.
+4. Choose which details to use from each of the expenses, such as the receipt image, card, merchant, category, etc.
+
+To merge expenses from the Reports tab,
+
+1. Click the **Reports** tab.
+2. Click the Report that contains the expenses that you wish to merge.
+3. Click the **Details** tab, then the Edit icon.
+4. Select the two expenses that you wish to merge.
+5. You’ll be able to choose which details to use from each of the two expenses, such as the receipt image, card, merchant, category, etc.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+On the mobile app, you’ll be notified of duplicate expenses and can click **Resolve Now** to review them. To merge the two expenses into one expense, tap **Merge Expense**.
+
+If the expenses exist on two different reports, you will be asked which report you’d like the newly created single expense to be reported onto.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# FAQs
+
+**Why can’t I merge expenses that are on my submitted report?**
+You cannot merge expenses that are on reports that have already been submitted. 
+
+**Can I merge expenses that are under different accounts?**
+No, you cannot merge expenses across two separate accounts. 
+
+**Can you merge expenses with different currencies?**
+Yes, you can merge expenses with different currencies. The conversion amount will be based on the daily exchange rate for the date of the transaction, as long as the converted rates are within +/- 5%. If the currencies are the same, then the amounts must be an exact match to merge.
+
+**Can Expensify automatically merge a cash expense with a credit card expense?**
+Yes, Expensify merges a cash expense with a credit card expense if the receipt is SmartScanned or forwarded to receipts@expensify.com. However, these expenses will not merge if:
+- The card expense added to your Expensify account is older than the receipt you’re trying to merge it with
+- The receipt is dated older than 7 days of the card expense date
+- Either expense date (the date the Expense was incurred, not the date it was added into Expensify) is older than 90 days
+- The transaction was imported with the Expensify API
+
+However, if a receipt does not automatically merge with the card entry, you can complete this process manually.
diff --git a/docs/articles/expensify-classic/expenses/expenses/Upload-Receipts.md b/docs/articles/expensify-classic/expenses/expenses/Upload-Receipts.md
deleted file mode 100644
index b0e3ee1b9ade..000000000000
--- a/docs/articles/expensify-classic/expenses/expenses/Upload-Receipts.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Upload-Receipts.md
-description: This article shows you all the ways that you can upload your receipts to Expensify!
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# About
-Need to get paid? Check out this guide to see all the ways that you can upload your receipts to Expensify - whether it’s by SmartScanning them by forwarding via email or manually by taking a picture of a receipt, we’ll cover it here!
-
-# How-to Upload Receipts
-## SmartScan
-The easiest way to upload your receipts to Expensify is to SmartScan them with Expensify’s mobile app or forward a receipt from your email inbox! 
-
-When you SmartScan a receipt, we’ll read the Merchant, Date and Amount of the transaction, create an expense, and add it to your Expensify account automatically. The best practice is to take a picture of the receipt at the time of purchase or forward it to your Expensify account from the point of sale system. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported card expense instead. 
-
-## Email Receipts
-To SmartScan a receipt on your mobile app, tap the green camera button, point and shoot! You can also forward your digital receipts (or photos of receipts) to receipts@expensify.com from the email address associated with your Expensify account, and they’ll be SmartScanned. This may take a few minutes because Expensify aims to have the most accurate OCR.
-
-## Manually Upload
-To upload receipts on the web, simply navigate to the Expenses page and click on **New Expense**. Select **Scan Receipt** and choose the file you would like to upload, or drag-and-drop your image directly into the Expenses page, and that will start the SmartScanning process!
-
-{% include faq-begin.md %}
-## How do you SmartScan multiple receipts? 
-You can utilize the Rapid Fire Mode to quickly SmartScan multiple receipts at once! 
-
-To activate it, tap on the green camera button in the mobile app and then tap on the camera icon on the bottom right. When you see the little fire icon on the camera, Rapid Fire Mode has been activated - tap the camera icon again to disable Rapid Fire Mode.
-
-## How do you create an expense from an email address that is different from your Expensify login?
-You can email a receipt from a different email address by adding it as a Secondary Login to your Expensify account - this ensures that any receipts sent from this email to receipts@expensify.com will be associated with your current Expensify account.
-
-Once that email address has been added as a Secondary Login, simply forward your receipt image or emails to receipts@expensify.com.
-
-## How do you crop or rotate a receipt image?
-You can crop and rotate a receipt image on the web app, and you can only edit one expense at a time. 
-
-Navigate to your Expenses page and locate the expense whose receipt image you'd like to edit, then click the expense to open the Edit screen. If there is an image file associated with the receipt, you will see the Rotate and Crop buttons. Alternatively, you can also navigate to your Reports page, click on a report, and locate the individual expense.
-
-{% include faq-end.md %}
diff --git a/ios/NewApp_AdHoc.mobileprovision.gpg b/ios/NewApp_AdHoc.mobileprovision.gpg
index 2c5350cec2aa..c9b8286cf50f 100644
Binary files a/ios/NewApp_AdHoc.mobileprovision.gpg and b/ios/NewApp_AdHoc.mobileprovision.gpg differ
diff --git a/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg b/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg
index bae3cd9f3e21..18fbfec9390f 100644
Binary files a/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg and b/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg differ
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index eb51f4499583..1ea2673b92ee 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.54</string>
+	<string>1.4.55</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.54.1</string>
+	<string>1.4.55.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index faf2eea9f738..cc6c5cf4c86a 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.54</string>
+	<string>1.4.55</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.54.1</string>
+	<string>1.4.55.0</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 8abab817dfb1..7c90acab4958 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.54</string>
+	<string>1.4.55</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.54.1</string>
+	<string>1.4.55.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index ba15feeacae6..61d6a27821cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.54-1",
+  "version": "1.4.55-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.54-1",
+      "version": "1.4.55-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -51,7 +51,7 @@
         "date-fns-tz": "^2.0.0",
         "dom-serializer": "^0.2.2",
         "domhandler": "^4.3.0",
-        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#7bfd55f0ce75a37423119029fde58cfbe57086d9",
+        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#615f4a8662cd1abea9fdeee4d04847197c5e36ae",
         "expo": "^50.0.3",
         "expo-av": "~13.10.4",
         "expo-image": "1.10.1",
@@ -232,6 +232,7 @@
         "shellcheck": "^1.1.0",
         "style-loader": "^2.0.0",
         "time-analytics-webpack-plugin": "^0.1.17",
+        "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "type-fest": "^4.10.2",
         "typescript": "^5.3.2",
@@ -6400,22 +6401,31 @@
       }
     },
     "node_modules/@jest/types": {
-      "version": "26.6.2",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
+      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
+        "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^15.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10.14.2"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/types/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6428,7 +6438,10 @@
     },
     "node_modules/@jest/types/node_modules/chalk": {
       "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -6442,7 +6455,10 @@
     },
     "node_modules/@jest/types/node_modules/color-convert": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -6452,18 +6468,27 @@
     },
     "node_modules/@jest/types/node_modules/color-name": {
       "version": "1.1.4",
-      "license": "MIT"
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/@jest/types/node_modules/has-flag": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jest/types/node_modules/supports-color": {
       "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8361,6 +8386,29 @@
         "ws": "^7.5.1"
       }
     },
+    "node_modules/@react-native-community/cli-server-api/node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@react-native-community/cli-server-api/node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
     "node_modules/@react-native-community/cli-server-api/node_modules/ansi-regex": {
       "version": "5.0.1",
       "license": "MIT",
@@ -8381,6 +8429,21 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/@react-native-community/cli-server-api/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/@react-native-community/cli-server-api/node_modules/color-convert": {
       "version": "2.0.1",
       "license": "MIT",
@@ -8395,6 +8458,14 @@
       "version": "1.1.4",
       "license": "MIT"
     },
+    "node_modules/@react-native-community/cli-server-api/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@react-native-community/cli-server-api/node_modules/pretty-format": {
       "version": "26.6.2",
       "license": "MIT",
@@ -8412,6 +8483,17 @@
       "version": "17.0.2",
       "license": "MIT"
     },
+    "node_modules/@react-native-community/cli-server-api/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@react-native-community/cli-server-api/node_modules/ws": {
       "version": "7.5.9",
       "license": "MIT",
@@ -18837,14 +18919,21 @@
       }
     },
     "node_modules/@types/yargs": {
-      "version": "15.0.15",
+      "version": "17.0.32",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
+      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
       "license": "MIT"
     },
     "node_modules/@types/yauzl": {
@@ -22184,6 +22273,18 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/bser": {
       "version": "2.1.1",
       "license": "Apache-2.0",
@@ -27269,8 +27370,8 @@
     },
     "node_modules/expensify-common": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#7bfd55f0ce75a37423119029fde58cfbe57086d9",
-      "integrity": "sha512-v6UnN9yAW6p2996Fvd4AZnMRnisVfjg6ijWzUQue/6JsjSY+MW10oP74hSjD6x32fRrNmMctjy6d5a79bQFdPA==",
+      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#615f4a8662cd1abea9fdeee4d04847197c5e36ae",
+      "integrity": "sha512-k/SmW3EBR+gxFkJP/59LJsmBKjnKR07XS30yk/GkQ0lIfyYkNmFJ0dWm/S/54ezFweezR7MDaQ3zGc45Mb/U5A==",
       "license": "MIT",
       "dependencies": {
         "classnames": "2.4.0",
@@ -34443,6 +34544,12 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "dev": true,
@@ -39531,6 +39638,29 @@
         "node": ">=8"
       }
     },
+    "node_modules/react-native/node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/react-native/node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
     "node_modules/react-native/node_modules/ansi-regex": {
       "version": "5.0.1",
       "license": "MIT",
@@ -39551,6 +39681,21 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/react-native/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/react-native/node_modules/color-convert": {
       "version": "2.0.1",
       "license": "MIT",
@@ -39577,6 +39722,14 @@
         "node": ">=18"
       }
     },
+    "node_modules/react-native/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/react-native/node_modules/mkdirp": {
       "version": "0.5.6",
       "license": "MIT",
@@ -39625,6 +39778,17 @@
         "loose-envify": "^1.1.0"
       }
     },
+    "node_modules/react-native/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/react-native/node_modules/ws": {
       "version": "6.2.2",
       "license": "MIT",
@@ -43820,6 +43984,58 @@
       "version": "0.1.13",
       "license": "Apache-2.0"
     },
+    "node_modules/ts-jest": {
+      "version": "29.1.2",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
+      "integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==",
+      "dev": true,
+      "dependencies": {
+        "bs-logger": "0.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^29.0.0",
+        "json5": "^2.2.3",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "semver": "^7.5.3",
+        "yargs-parser": "^21.0.1"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^16.10.0 || ^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@jest/types": "^29.0.0",
+        "babel-jest": "^29.0.0",
+        "jest": "^29.0.0",
+        "typescript": ">=4.3 <6"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@jest/types": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-jest/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/ts-node": {
       "version": "10.9.2",
       "devOptional": true,
diff --git a/package.json b/package.json
index d1974b99b91e..92a6b9cde5e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.54-1",
+  "version": "1.4.55-0",
   "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.",
@@ -19,7 +19,7 @@
     "ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --mode=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
     "start": "npx react-native start",
     "web": "scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server",
-    "web-proxy": "ts-node web/proxy.js",
+    "web-proxy": "ts-node web/proxy.ts",
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.js",
     "build": "webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
     "build-staging": "webpack --config config/webpack/webpack.common.js --env envFile=.env.staging",
@@ -56,7 +56,7 @@
     "test:e2e:dev": "ts-node tests/e2e/testRunner.ts --config ./config.dev.ts",
     "gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
     "workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
-    "workflow-test:generate": "ts-node workflow_tests/utils/preGenerateTest.js",
+    "workflow-test:generate": "ts-node workflow_tests/utils/preGenerateTest.ts",
     "setup-https": "mkcert -install && mkcert -cert-file config/webpack/certificate.pem -key-file config/webpack/key.pem dev.new.expensify.com localhost 127.0.0.1",
     "e2e-test-runner-build": "ncc build tests/e2e/testRunner.ts -o tests/e2e/dist/"
   },
@@ -102,7 +102,7 @@
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#7bfd55f0ce75a37423119029fde58cfbe57086d9",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#615f4a8662cd1abea9fdeee4d04847197c5e36ae",
     "expo": "^50.0.3",
     "expo-av": "~13.10.4",
     "expo-image": "1.10.1",
@@ -283,6 +283,7 @@
     "shellcheck": "^1.1.0",
     "style-loader": "^2.0.0",
     "time-analytics-webpack-plugin": "^0.1.17",
+    "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "type-fest": "^4.10.2",
     "typescript": "^5.3.2",
diff --git a/src/App.tsx b/src/App.tsx
index 0e247d5faa53..a2d353a026af 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -13,6 +13,7 @@ import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackgro
 import CustomStatusBarAndBackgroundContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider';
 import ErrorBoundary from './components/ErrorBoundary';
 import HTMLEngineProvider from './components/HTMLEngineProvider';
+import InitialURLContextProvider from './components/InitialURLContextProvider';
 import {LocaleContextProvider} from './components/LocaleContextProvider';
 import OnyxProvider from './components/OnyxProvider';
 import PopoverContextProvider from './components/PopoverProvider';
@@ -30,12 +31,11 @@ import {WindowDimensionsProvider} from './components/withWindowDimensions';
 import Expensify from './Expensify';
 import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
 import OnyxUpdateManager from './libs/actions/OnyxUpdateManager';
-import InitialUrlContext from './libs/InitialUrlContext';
 import {ReportAttachmentsProvider} from './pages/home/report/ReportAttachmentsContext';
 import type {Route} from './ROUTES';
 
 type AppProps = {
-    /** If we have an authToken this is true */
+    /** URL passed to our top-level React Native component by HybridApp. Will always be undefined in "pure" NewDot builds. */
     url?: Route;
 };
 
@@ -52,7 +52,7 @@ function App({url}: AppProps) {
     useDefaultDragAndDrop();
     OnyxUpdateManager();
     return (
-        <InitialUrlContext.Provider value={url}>
+        <InitialURLContextProvider url={url}>
             <GestureHandlerRootView style={fill}>
                 <ComposeProviders
                     components={[
@@ -88,7 +88,7 @@ function App({url}: AppProps) {
                     </ErrorBoundary>
                 </ComposeProviders>
             </GestureHandlerRootView>
-        </InitialUrlContext.Provider>
+        </InitialURLContextProvider>
     );
 }
 
diff --git a/src/CONST.ts b/src/CONST.ts
index 4ce71e024fbd..215a8129ccb7 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -513,7 +513,7 @@ const CONST = {
         EUR: 'EUR',
     },
     get DIRECT_REIMBURSEMENT_CURRENCIES() {
-        return [this.CURRENCY.USD, this.CURRENCY.AUD, this.CURRENCY.CAD, this.CURRENCY.GBP, this.CURRENCY.NZD, this.CURRENCY.EUR];
+        return [this.CURRENCY.USD, this.CURRENCY.AUD, this.CURRENCY.CAD, this.CURRENCY.GBP, this.CURRENCY.EUR];
     },
     EXAMPLE_PHONE_NUMBER: '+15005550006',
     CONCIERGE_CHAT_NAME: 'Concierge',
@@ -535,6 +535,10 @@ const CONST = {
     TERMS_URL: `${USE_EXPENSIFY_URL}/terms`,
     PRIVACY_URL: `${USE_EXPENSIFY_URL}/privacy`,
     LICENSES_URL: `${USE_EXPENSIFY_URL}/licenses`,
+    ACH_TERMS_URL: `${USE_EXPENSIFY_URL}/achterms`,
+    WALLET_AGREEMENT_URL: `${USE_EXPENSIFY_URL}/walletagreement`,
+    HELP_LINK_URL: `${USE_EXPENSIFY_URL}/usa-patriot-act`,
+    ELECTRONIC_DISCLOSURES_URL: `${USE_EXPENSIFY_URL}/esignagreement`,
     GITHUB_RELEASE_URL: 'https://api.github.com/repos/expensify/app/releases/latest',
     ADD_SECONDARY_LOGIN_URL: encodeURI('settings?param={"section":"account","openModal":"secondaryLogin"}'),
     MANAGE_CARDS_URL: 'domain_companycards',
@@ -575,6 +579,21 @@ const CONST = {
         REPORT: 'report',
         PERSONAL_DETAIL: 'personalDetail',
     },
+
+    QUICK_ACTIONS: {
+        REQUEST_MANUAL: 'requestManual',
+        REQUEST_SCAN: 'requestScan',
+        REQUEST_DISTANCE: 'requestDistance',
+        SPLIT_MANUAL: 'splitManual',
+        SPLIT_SCAN: 'splitScan',
+        SPLIT_DISTANCE: 'splitDistance',
+        TRACK_MANUAL: 'trackManual',
+        TRACK_SCAN: 'trackScan',
+        TRACK_DISTANCE: 'trackDistance',
+        ASSIGN_TASK: 'assignTask',
+        SEND_MONEY: 'sendMoney',
+    },
+
     RECEIPT: {
         ICON_SIZE: 164,
         PERMISSION_GRANTED: 'granted',
@@ -1453,16 +1472,45 @@ const CONST = {
             MAKE_MEMBER: 'makeMember',
             MAKE_ADMIN: 'makeAdmin',
         },
+        MORE_FEATURES: {
+            ARE_CATEGORIES_ENABLED: 'areCategoriesEnabled',
+            ARE_TAGS_ENABLED: 'areTagsEnabled',
+            ARE_DISTANCE_RATES_ENABLED: 'areDistanceRatesEnabled',
+            ARE_WORKFLOWS_ENABLED: 'areWorkflowsEnabled',
+            ARE_REPORTFIELDS_ENABLED: 'areReportFieldsEnabled',
+            ARE_CONNECTIONS_ENABLED: 'areConnectionsEnabled',
+            ARE_TAXES_ENABLED: 'tax',
+        },
         CATEGORIES_BULK_ACTION_TYPES: {
             DELETE: 'delete',
             DISABLE: 'disable',
             ENABLE: 'enable',
         },
+        TAGS_BULK_ACTION_TYPES: {
+            DELETE: 'delete',
+            DISABLE: 'disable',
+            ENABLE: 'enable',
+        },
         DISTANCE_RATES_BULK_ACTION_TYPES: {
             DELETE: 'delete',
             DISABLE: 'disable',
             ENABLE: 'enable',
         },
+        TAX_RATES_BULK_ACTION_TYPES: {
+            DELETE: 'delete',
+            DISABLE: 'disable',
+            ENABLE: 'enable',
+        },
+        COLLECTION_KEYS: {
+            DESCRIPTION: 'description',
+            REIMBURSER_EMAIL: 'reimburserEmail',
+            REIMBURSEMENT_CHOICE: 'reimbursementChoice',
+            APPROVAL_MODE: 'approvalMode',
+            AUTOREPORTING: 'autoReporting',
+            AUTOREPORTING_FREQUENCY: 'autoReportingFrequency',
+            AUTOREPORTING_OFFSET: 'autoReportingOffset',
+            GENERAL_SETTINGS: 'generalSettings',
+        },
     },
 
     CUSTOM_UNITS: {
@@ -1527,6 +1575,11 @@ const CONST = {
             STATE_SUSPENDED: 7,
         },
         ACTIVE_STATES: cardActiveStates,
+        LIMIT_TYPES: {
+            SMART: 'smart',
+            MONTHLY: 'monthly',
+            FIXED: 'fixed',
+        },
     },
     AVATAR_ROW_SIZE: {
         DEFAULT: 4,
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index e91b4d491423..51fec780fc9f 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -16,9 +16,6 @@ const ONYXKEYS = {
     /** Holds the reportID for the report between the user and their account manager */
     ACCOUNT_MANAGER_REPORT_ID: 'accountManagerReportID',
 
-    /** Boolean flag only true when first set */
-    NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER: 'isFirstTimeNewExpensifyUser',
-
     /** Holds an array of client IDs which is used for multi-tabs on web in order to know
      * which tab is the leader, and which ones are the followers */
     ACTIVE_CLIENTS: 'activeClients',
@@ -106,31 +103,59 @@ const ONYXKEYS = {
     STASHED_SESSION: 'stashedSession',
     BETAS: 'betas',
 
-    /** NVP keys
+    /** NVP keys */
+
+    /** Boolean flag only true when first set */
+    NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER: 'nvp_isFirstTimeNewExpensifyUser',
+
     /** Contains the user preference for the LHN priority mode */
     NVP_PRIORITY_MODE: 'nvp_priorityMode',
 
     /** Contains the users's block expiration (if they have one) */
-    NVP_BLOCKED_FROM_CONCIERGE: 'private_blockedFromConcierge',
+    NVP_BLOCKED_FROM_CONCIERGE: 'nvp_private_blockedFromConcierge',
 
     /** A unique identifier that each user has that's used to send notifications */
-    NVP_PRIVATE_PUSH_NOTIFICATION_ID: 'private_pushNotificationID',
+    NVP_PRIVATE_PUSH_NOTIFICATION_ID: 'nvp_private_pushNotificationID',
 
     /** The NVP with the last payment method used per policy */
-    NVP_LAST_PAYMENT_METHOD: 'nvp_lastPaymentMethod',
+    NVP_LAST_PAYMENT_METHOD: 'nvp_private_lastPaymentMethod',
 
     /** This NVP holds to most recent waypoints that a person has used when creating a distance request */
     NVP_RECENT_WAYPOINTS: 'expensify_recentWaypoints',
 
     /** This NVP will be `true` if the user has ever dismissed the engagement modal on either OldDot or NewDot. If it becomes true it should stay true forever. */
-    NVP_HAS_DISMISSED_IDLE_PANEL: 'hasDismissedIdlePanel',
+    NVP_HAS_DISMISSED_IDLE_PANEL: 'nvp_hasDismissedIdlePanel',
 
     /** This NVP contains the choice that the user made on the engagement modal */
-    NVP_INTRO_SELECTED: 'introSelected',
+    NVP_INTRO_SELECTED: 'nvp_introSelected',
+
+    /** This NVP contains the active policyID */
+    NVP_ACTIVE_POLICY_ID: 'nvp_expensify_activePolicyID',
+
+    /** This NVP contains the referral banners the user dismissed */
+    NVP_DISMISSED_REFERRAL_BANNERS: 'nvp_dismissedReferralBanners',
+
+    /** Indicates which locale should be used */
+    NVP_PREFERRED_LOCALE: 'nvp_preferredLocale',
+
+    /** Whether the user has tried focus mode yet */
+    NVP_TRY_FOCUS_MODE: 'nvp_tryFocusMode',
+
+    /** Whether the user has been shown the hold educational interstitial yet */
+    NVP_HOLD_USE_EXPLAINED: 'holdUseExplained',
+
+    /** Store preferred skintone for emoji */
+    PREFERRED_EMOJI_SKIN_TONE: 'nvp_expensify_preferredEmojiSkinTone',
+
+    /** Store frequently used emojis for this user */
+    FREQUENTLY_USED_EMOJIS: 'nvp_expensify_frequentlyUsedEmojis',
 
     /** The NVP with the last distance rate used per policy */
     NVP_LAST_SELECTED_DISTANCE_RATES: 'lastSelectedDistanceRates',
 
+    /** The NVP with the last action taken (for the Quick Action Button) */
+    NVP_QUICK_ACTION_GLOBAL_CREATE: 'nvp_quickActionGlobalCreate',
+
     /** Does this user have push notifications enabled for this device? */
     PUSH_NOTIFICATIONS_ENABLED: 'pushNotificationsEnabled',
 
@@ -150,9 +175,6 @@ const ONYXKEYS = {
     ONFIDO_TOKEN: 'onfidoToken',
     ONFIDO_APPLICANT_ID: 'onfidoApplicantID',
 
-    /** Indicates which locale should be used */
-    NVP_PREFERRED_LOCALE: 'preferredLocale',
-
     /** User's Expensify Wallet */
     USER_WALLET: 'userWallet',
 
@@ -174,12 +196,6 @@ const ONYXKEYS = {
     /** The user's cash card and imported cards (including the Expensify Card) */
     CARD_LIST: 'cardList',
 
-    /** Whether the user has tried focus mode yet */
-    NVP_TRY_FOCUS_MODE: 'tryFocusMode',
-
-    /** Whether the user has been shown the hold educational interstitial yet */
-    NVP_HOLD_USE_EXPLAINED: 'holdUseExplained',
-
     /** Boolean flag used to display the focus mode notification */
     FOCUS_MODE_NOTIFICATION: 'focusModeNotification',
 
@@ -192,12 +208,6 @@ const ONYXKEYS = {
     /** Stores information about the active reimbursement account being set up */
     REIMBURSEMENT_ACCOUNT: 'reimbursementAccount',
 
-    /** Store preferred skintone for emoji */
-    PREFERRED_EMOJI_SKIN_TONE: 'preferredEmojiSkinTone',
-
-    /** Store frequently used emojis for this user */
-    FREQUENTLY_USED_EMOJIS: 'frequentlyUsedEmojis',
-
     /** Stores Workspace ID that will be tied to reimbursement account during setup */
     REIMBURSEMENT_ACCOUNT_WORKSPACE_ID: 'reimbursementAccountWorkspaceID',
 
@@ -291,7 +301,8 @@ const ONYXKEYS = {
         POLICY_CATEGORIES: 'policyCategories_',
         POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
         POLICY_TAGS: 'policyTags_',
-        POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
+        POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
+        OLD_POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
         POLICY_REPORT_FIELDS: 'policyReportFields_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         WORKSPACE_INVITE_MESSAGE_DRAFT: 'workspaceInviteMessageDraft_',
@@ -332,8 +343,8 @@ const ONYXKEYS = {
         WORKSPACE_SETTINGS_FORM: 'workspaceSettingsForm',
         WORKSPACE_CATEGORY_FORM: 'workspaceCategoryForm',
         WORKSPACE_CATEGORY_FORM_DRAFT: 'workspaceCategoryFormDraft',
-        WORKSPACE_TAG_CREATE_FORM: 'workspaceTagCreate',
-        WORKSPACE_TAG_CREATE_FORM_DRAFT: 'workspaceTagCreateDraft',
+        WORKSPACE_TAG_FORM: 'workspaceTagForm',
+        WORKSPACE_TAG_FORM_DRAFT: 'workspaceTagFormDraft',
         WORKSPACE_SETTINGS_FORM_DRAFT: 'workspaceSettingsFormDraft',
         WORKSPACE_DESCRIPTION_FORM: 'workspaceDescriptionForm',
         WORKSPACE_DESCRIPTION_FORM_DRAFT: 'workspaceDescriptionFormDraft',
@@ -411,10 +422,16 @@ const ONYXKEYS = {
         EXIT_SURVEY_REASON_FORM_DRAFT: 'exitSurveyReasonFormDraft',
         EXIT_SURVEY_RESPONSE_FORM: 'exitSurveyResponseForm',
         EXIT_SURVEY_RESPONSE_FORM_DRAFT: 'exitSurveyResponseFormDraft',
+        WALLET_ADDITIONAL_DETAILS: 'walletAdditionalDetails',
+        WALLET_ADDITIONAL_DETAILS_DRAFT: 'walletAdditionalDetailsDraft',
         POLICY_TAG_NAME_FORM: 'policyTagNameForm',
         POLICY_TAG_NAME_FORM_DRAFT: 'policyTagNameFormDraft',
         WORKSPACE_NEW_TAX_FORM: 'workspaceNewTaxForm',
         WORKSPACE_NEW_TAX_FORM_DRAFT: 'workspaceNewTaxFormDraft',
+        WORKSPACE_TAX_NAME_FORM: 'workspaceTaxNameForm',
+        WORKSPACE_TAX_NAME_FORM_DRAFT: 'workspaceTaxNameFormDraft',
+        WORKSPACE_TAX_VALUE_FORM: 'workspaceTaxValueForm',
+        WORKSPACE_TAX_VALUE_FORM_DRAFT: 'workspaceTaxValueFormDraft',
     },
 } as const;
 
@@ -424,7 +441,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM]: FormTypes.AddDebitCardForm;
     [ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM]: FormTypes.WorkspaceSettingsForm;
     [ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM]: FormTypes.WorkspaceCategoryForm;
-    [ONYXKEYS.FORMS.WORKSPACE_TAG_CREATE_FORM]: FormTypes.WorkspaceTagCreateForm;
+    [ONYXKEYS.FORMS.WORKSPACE_TAG_FORM]: FormTypes.WorkspaceTagForm;
     [ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM]: FormTypes.WorkspaceRateAndUnitForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME]: FormTypes.WorkspaceTaxCustomName;
     [ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM]: FormTypes.CloseAccountForm;
@@ -462,9 +479,12 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM]: FormTypes.ReimbursementAccountForm;
     [ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT]: FormTypes.PersonalBankAccountForm;
     [ONYXKEYS.FORMS.WORKSPACE_DESCRIPTION_FORM]: FormTypes.WorkspaceDescriptionForm;
+    [ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS]: FormTypes.AdditionalDetailStepForm;
     [ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM]: FormTypes.PolicyTagNameForm;
     [ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM]: FormTypes.WorkspaceNewTaxForm;
     [ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM]: FormTypes.PolicyCreateDistanceRateForm;
+    [ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM]: FormTypes.WorkspaceTaxNameForm;
+    [ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM]: FormTypes.WorkspaceTaxValueForm;
 };
 
 type OnyxFormDraftValuesMapping = {
@@ -500,6 +520,7 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS]: OnyxTypes.TransactionViolations;
     [ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT]: OnyxTypes.Transaction;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS]: OnyxTypes.RecentlyUsedTags;
+    [ONYXKEYS.COLLECTION.OLD_POLICY_RECENTLY_USED_TAGS]: OnyxTypes.RecentlyUsedTags;
     [ONYXKEYS.COLLECTION.SELECTED_TAB]: string;
     [ONYXKEYS.COLLECTION.PRIVATE_NOTES_DRAFT]: string;
     [ONYXKEYS.COLLECTION.NEXT_STEP]: OnyxTypes.ReportNextStep;
@@ -555,6 +576,8 @@ type OnyxValuesMapping = {
     [ONYXKEYS.ONFIDO_TOKEN]: string;
     [ONYXKEYS.ONFIDO_APPLICANT_ID]: string;
     [ONYXKEYS.NVP_PREFERRED_LOCALE]: OnyxTypes.Locale;
+    [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: string;
+    [ONYXKEYS.NVP_DISMISSED_REFERRAL_BANNERS]: OnyxTypes.DismissedReferralBanners;
     [ONYXKEYS.USER_WALLET]: OnyxTypes.UserWallet;
     [ONYXKEYS.WALLET_ONFIDO]: OnyxTypes.WalletOnfido;
     [ONYXKEYS.WALLET_ADDITIONAL_DETAILS]: OnyxTypes.WalletAdditionalDetails;
@@ -596,6 +619,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.LOGS]: Record<number, OnyxTypes.Log>;
     [ONYXKEYS.SHOULD_STORE_LOGS]: boolean;
     [ONYXKEYS.CACHED_PDF_PATHS]: Record<string, string>;
+    [ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE]: OnyxTypes.QuickAction;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 5769b60a8284..9ce32835c8d7 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -37,7 +37,7 @@ const ROUTES = {
     },
     PROFILE_AVATAR: {
         route: 'a/:accountID/avatar',
-        getRoute: (accountID: string) => `a/${accountID}/avatar` as const,
+        getRoute: (accountID: string | number) => `a/${accountID}/avatar` as const,
     },
 
     TRANSITION_BETWEEN_APPS: 'transition',
@@ -576,6 +576,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/tags/edit',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags/edit` as const,
     },
+    WORKSPACE_TAG_EDIT: {
+        route: 'settings/workspace/:policyID/tag/:tagName/edit',
+        getRoute: (policyID: string, tagName: string) => `settings/workspace/${policyID}/tag/${encodeURIComponent(tagName)}/edit` as const,
+    },
     WORKSPACE_TAG_SETTINGS: {
         route: 'settings/workspaces/:policyID/tag/:tagName',
         getRoute: (policyID: string, tagName: string) => `settings/workspaces/${policyID}/tag/${encodeURIComponent(tagName)}` as const,
@@ -612,6 +616,18 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/taxes/new',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/taxes/new` as const,
     },
+    WORKSPACE_TAX_EDIT: {
+        route: 'settings/workspaces/:policyID/tax/:taxID',
+        getRoute: (policyID: string, taxID: string) => `settings/workspaces/${policyID}/tax/${encodeURI(taxID)}` as const,
+    },
+    WORKSPACE_TAX_NAME: {
+        route: 'settings/workspaces/:policyID/tax/:taxID/name',
+        getRoute: (policyID: string, taxID: string) => `settings/workspaces/${policyID}/tax/${encodeURI(taxID)}/name` as const,
+    },
+    WORKSPACE_TAX_VALUE: {
+        route: 'settings/workspaces/:policyID/tax/:taxID/value',
+        getRoute: (policyID: string, taxID: string) => `settings/workspaces/${policyID}/tax/${encodeURI(taxID)}/value` as const,
+    },
     WORKSPACE_DISTANCE_RATES: {
         route: 'settings/workspaces/:policyID/distance-rates',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/distance-rates` as const,
@@ -620,6 +636,10 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/distance-rates/new',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/distance-rates/new` as const,
     },
+    WORKSPACE_DISTANCE_RATES_SETTINGS: {
+        route: 'settings/workspace/:policyID/distance-rates/settings',
+        getRoute: (policyID: string) => `settings/workspace/${policyID}/distance-rates/settings` as const,
+    },
     // Referral program promotion
     REFERRAL_DETAILS_MODAL: {
         route: 'referral/:contentType',
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 2fbd122f9972..4d4e9ea327c6 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -215,7 +215,11 @@ const SCREENS = {
         TAGS: 'Workspace_Tags',
         TAGS_SETTINGS: 'Tags_Settings',
         TAGS_EDIT: 'Tags_Edit',
+        TAG_EDIT: 'Tag_Edit',
         TAXES: 'Workspace_Taxes',
+        TAX_EDIT: 'Workspace_Tax_Edit',
+        TAX_NAME: 'Workspace_Tax_Name',
+        TAX_VALUE: 'Workspace_Tax_Value',
         TAXES_SETTINGS: 'Workspace_Taxes_Settings',
         TAXES_SETTINGS_CUSTOM_TAX_NAME: 'Workspace_Taxes_Settings_CustomTaxName',
         TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT: 'Workspace_Taxes_Settings_WorkspaceCurrency',
@@ -241,6 +245,7 @@ const SCREENS = {
         MEMBER_DETAILS_ROLE_SELECTION: 'Workspace_Member_Details_Role_Selection',
         DISTANCE_RATES: 'Distance_Rates',
         CREATE_DISTANCE_RATE: 'Create_Distance_Rate',
+        DISTANCE_RATES_SETTINGS: 'Distance_Rates_Settings',
     },
 
     EDIT_REQUEST: {
diff --git a/src/components/AddressSearch/index.tsx b/src/components/AddressSearch/index.tsx
index a2e3f5d9948e..9901ff9243f9 100644
--- a/src/components/AddressSearch/index.tsx
+++ b/src/components/AddressSearch/index.tsx
@@ -369,7 +369,7 @@ function AddressSearch(
                         query={query}
                         requestUrl={{
                             useOnPlatform: 'all',
-                            url: isOffline ? '' : ApiUtils.getCommandURL({command: 'Proxy_GooglePlaces&proxyUrl='}),
+                            url: isOffline ? '' : ApiUtils.getCommandURL({command: 'Proxy_GooglePlaces?proxyUrl='}),
                         }}
                         textInputProps={{
                             InputComp: TextInput,
diff --git a/src/components/AmountPicker/index.tsx b/src/components/AmountPicker/index.tsx
index 701c75175c02..45e511f24748 100644
--- a/src/components/AmountPicker/index.tsx
+++ b/src/components/AmountPicker/index.tsx
@@ -25,7 +25,8 @@ function AmountPicker({value, description, title, errorText = '', onInputChange,
 
     const updateInput = (updatedValue: string) => {
         if (updatedValue !== value) {
-            onInputChange?.(updatedValue);
+            // We cast the updatedValue to a number and then back to a string to remove any leading zeros and separating commas
+            onInputChange?.(String(Number(updatedValue)));
         }
         hidePickerModal();
     };
diff --git a/src/components/AvatarSkeleton.tsx b/src/components/AvatarSkeleton.tsx
index a6781448c3ba..273143f76098 100644
--- a/src/components/AvatarSkeleton.tsx
+++ b/src/components/AvatarSkeleton.tsx
@@ -6,12 +6,12 @@ import SkeletonViewContentLoader from './SkeletonViewContentLoader';
 
 function AvatarSkeleton() {
     const theme = useTheme();
-    const skeletonCircleRadius = variables.componentSizeSmall / 2;
+    const skeletonCircleRadius = variables.sidebarAvatarSize / 2;
 
     return (
         <SkeletonViewContentLoader
             animate
-            height={variables.componentSizeSmall}
+            height={variables.sidebarAvatarSize}
             backgroundColor={theme.skeletonLHNIn}
             foregroundColor={theme.skeletonLHNOut}
         >
diff --git a/src/components/ButtonWithDropdownMenu/types.ts b/src/components/ButtonWithDropdownMenu/types.ts
index 798369292958..83100788761f 100644
--- a/src/components/ButtonWithDropdownMenu/types.ts
+++ b/src/components/ButtonWithDropdownMenu/types.ts
@@ -12,6 +12,8 @@ type WorkspaceMemberBulkActionType = DeepValueOf<typeof CONST.POLICY.MEMBERS_BUL
 
 type WorkspaceDistanceRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.DISTANCE_RATES_BULK_ACTION_TYPES>;
 
+type WorkspaceTaxRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES>;
+
 type DropdownOption<TValueType> = {
     value: TValueType;
     text: string;
@@ -73,4 +75,4 @@ type ButtonWithDropdownMenuProps<TValueType> = {
     wrapperStyle?: StyleProp<ViewStyle>;
 };
 
-export type {PaymentType, WorkspaceMemberBulkActionType, WorkspaceDistanceRatesBulkActionType, DropdownOption, ButtonWithDropdownMenuProps};
+export type {PaymentType, WorkspaceMemberBulkActionType, WorkspaceDistanceRatesBulkActionType, DropdownOption, ButtonWithDropdownMenuProps, WorkspaceTaxRatesBulkActionType};
diff --git a/src/components/CheckboxWithLabel.tsx b/src/components/CheckboxWithLabel.tsx
index 2919debe9cb1..dd169576186e 100644
--- a/src/components/CheckboxWithLabel.tsx
+++ b/src/components/CheckboxWithLabel.tsx
@@ -108,3 +108,5 @@ function CheckboxWithLabel(
 CheckboxWithLabel.displayName = 'CheckboxWithLabel';
 
 export default React.forwardRef(CheckboxWithLabel);
+
+export type {CheckboxWithLabelProps};
diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
index 6884966fb81a..f4e5bf4834e0 100644
--- a/src/components/Image/index.tsx
+++ b/src/components/Image/index.tsx
@@ -11,14 +11,19 @@ function Image({source: propsSource, isAuthTokenRequired = false, session, ...fo
      * to the source.
      */
     const source = useMemo(() => {
-        const authToken = session?.encryptedAuthToken ?? null;
-        if (isAuthTokenRequired && typeof propsSource === 'object' && 'uri' in propsSource && authToken) {
-            return {
-                ...propsSource,
-                headers: {
-                    [CONST.CHAT_ATTACHMENT_TOKEN_KEY]: authToken,
-                },
-            };
+        if (typeof propsSource === 'object' && 'uri' in propsSource) {
+            if (typeof propsSource.uri === 'number') {
+                return propsSource.uri;
+            }
+            const authToken = session?.encryptedAuthToken ?? null;
+            if (isAuthTokenRequired && authToken) {
+                return {
+                    ...propsSource,
+                    headers: {
+                        [CONST.CHAT_ATTACHMENT_TOKEN_KEY]: authToken,
+                    },
+                };
+            }
         }
         return propsSource;
         // The session prop is not required, as it causes the image to reload whenever the session changes. For more information, please refer to issue #26034.
diff --git a/src/components/InitialURLContextProvider.tsx b/src/components/InitialURLContextProvider.tsx
new file mode 100644
index 000000000000..a3df93844ca9
--- /dev/null
+++ b/src/components/InitialURLContextProvider.tsx
@@ -0,0 +1,33 @@
+import React, {createContext, useEffect, useState} from 'react';
+import type {ReactNode} from 'react';
+import {Linking} from 'react-native';
+import type {Route} from '@src/ROUTES';
+
+/** Initial url that will be opened when NewDot is embedded into Hybrid App. */
+const InitialURLContext = createContext<Route | undefined>(undefined);
+
+type InitialURLContextProviderProps = {
+    /** URL passed to our top-level React Native component by HybridApp. Will always be undefined in "pure" NewDot builds. */
+    url?: Route;
+
+    /** Children passed to the context provider */
+    children: ReactNode;
+};
+
+function InitialURLContextProvider({children, url}: InitialURLContextProviderProps) {
+    const [initialURL, setInitialURL] = useState(url);
+    useEffect(() => {
+        if (initialURL) {
+            return;
+        }
+        Linking.getInitialURL().then((initURL) => {
+            setInitialURL(initURL as Route);
+        });
+    }, [initialURL]);
+    return <InitialURLContext.Provider value={initialURL}>{children}</InitialURLContext.Provider>;
+}
+
+InitialURLContextProvider.displayName = 'InitialURLContextProvider';
+
+export default InitialURLContextProvider;
+export {InitialURLContext};
diff --git a/src/components/MapView/responder/index.android.ts b/src/components/MapView/responder/index.android.ts
deleted file mode 100644
index a0fce71d8ef5..000000000000
--- a/src/components/MapView/responder/index.android.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {PanResponder} from 'react-native';
-
-const responder = PanResponder.create({
-    onStartShouldSetPanResponder: () => true,
-    onPanResponderTerminationRequest: () => false,
-});
-
-export default responder;
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index 2b8d25d5d639..4604e831a2ae 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -41,6 +41,7 @@ function BaseModal(
         avoidKeyboard = false,
         children,
         shouldUseCustomBackdrop = false,
+        onBackdropPress,
     }: BaseModalProps,
     ref: React.ForwardedRef<View>,
 ) {
@@ -117,7 +118,11 @@ function BaseModal(
             return;
         }
 
-        onClose();
+        if (onBackdropPress) {
+            onBackdropPress();
+        } else {
+            onClose();
+        }
     };
 
     const handleDismissModal = () => {
diff --git a/src/components/Modal/types.ts b/src/components/Modal/types.ts
index a0cdb737d448..cfa4a28c4d87 100644
--- a/src/components/Modal/types.ts
+++ b/src/components/Modal/types.ts
@@ -23,6 +23,9 @@ type BaseModalProps = Partial<ModalProps> & {
     /** Callback method fired when the user requests to close the modal */
     onClose: () => void;
 
+    /** Function to call when the user presses on the modal backdrop */
+    onBackdropPress?: () => void;
+
     /** State that determines whether to display the modal or not */
     isVisible: boolean;
 
diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 6b562525258d..2e8f80175b56 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -527,7 +527,7 @@ function MoneyRequestConfirmationList({
         }
 
         const shouldShowSettlementButton = iouType === CONST.IOU.TYPE.SEND;
-        const shouldDisableButton = selectedParticipants.length === 0 || shouldDisplayMerchantError;
+        const shouldDisableButton = selectedParticipants.length === 0;
 
         const button = shouldShowSettlementButton ? (
             <SettlementButton
@@ -575,20 +575,7 @@ function MoneyRequestConfirmationList({
                 {button}
             </>
         );
-    }, [
-        isReadOnly,
-        iouType,
-        bankAccountRoute,
-        iouCurrencyCode,
-        policyID,
-        selectedParticipants.length,
-        shouldDisplayMerchantError,
-        confirm,
-        splitOrRequestOptions,
-        formError,
-        styles.ph1,
-        styles.mb2,
-    ]);
+    }, [isReadOnly, iouType, bankAccountRoute, iouCurrencyCode, policyID, selectedParticipants.length, confirm, splitOrRequestOptions, formError, styles.ph1, styles.mb2]);
 
     const {image: receiptImage, thumbnail: receiptThumbnail} =
         receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, receiptPath, receiptFilename) : ({} as ReceiptUtils.ThumbnailAndImageURI);
diff --git a/src/components/OptionRow.tsx b/src/components/OptionRow.tsx
index 7b45fd963fe7..97ef6885c80f 100644
--- a/src/components/OptionRow.tsx
+++ b/src/components/OptionRow.tsx
@@ -340,3 +340,5 @@ export default React.memo(
         prevProps.option.pendingAction === nextProps.option.pendingAction &&
         prevProps.option.customIcon === nextProps.option.customIcon,
 );
+
+export type {OptionRowProps};
diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index 4ee070e19893..44a446b56653 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -215,4 +215,4 @@ function PopoverMenu({
 PopoverMenu.displayName = 'PopoverMenu';
 
 export default React.memo(PopoverMenu);
-export type {PopoverMenuItem};
+export type {PopoverMenuItem, PopoverMenuProps};
diff --git a/src/components/ReferralProgramCTA.tsx b/src/components/ReferralProgramCTA.tsx
index 6db37ce1320a..c93b75bf11ad 100644
--- a/src/components/ReferralProgramCTA.tsx
+++ b/src/components/ReferralProgramCTA.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
@@ -8,7 +9,7 @@ import CONST from '@src/CONST';
 import Navigation from '@src/libs/Navigation/Navigation';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {DismissedReferralBanners} from '@src/types/onyx/Account';
+import type * as OnyxTypes from '@src/types/onyx';
 import Icon from './Icon';
 import {Close} from './Icon/Expensicons';
 import {PressableWithoutFeedback} from './Pressable';
@@ -16,7 +17,7 @@ import Text from './Text';
 import Tooltip from './Tooltip';
 
 type ReferralProgramCTAOnyxProps = {
-    dismissedReferralBanners: DismissedReferralBanners;
+    dismissedReferralBanners: OnyxEntry<OnyxTypes.DismissedReferralBanners>;
 };
 
 type ReferralProgramCTAProps = ReferralProgramCTAOnyxProps & {
@@ -36,7 +37,7 @@ function ReferralProgramCTA({referralContentType, dismissedReferralBanners}: Ref
         User.dismissReferralBanner(referralContentType);
     };
 
-    if (!referralContentType || dismissedReferralBanners[referralContentType]) {
+    if (!referralContentType || dismissedReferralBanners?.[referralContentType]) {
         return null;
     }
 
@@ -82,7 +83,6 @@ function ReferralProgramCTA({referralContentType, dismissedReferralBanners}: Ref
 
 export default withOnyx<ReferralProgramCTAProps, ReferralProgramCTAOnyxProps>({
     dismissedReferralBanners: {
-        key: ONYXKEYS.ACCOUNT,
-        selector: (data) => data?.dismissedReferralBanners ?? {},
+        key: ONYXKEYS.NVP_DISMISSED_REFERRAL_BANNERS,
     },
 })(ReferralProgramCTA);
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index f1aa1751dd84..d183d27fefb8 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -133,7 +133,8 @@ function ReportPreview({
 
     const hasReceipts = transactionsWithReceipts.length > 0;
     const isScanning = hasReceipts && areAllRequestsBeingSmartScanned;
-    const hasErrors = hasMissingSmartscanFields || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations));
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const hasErrors = hasMissingSmartscanFields || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations)) || ReportUtils.hasActionsWithErrors(iouReportID);
     const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3);
     const lastThreeReceipts = lastThreeTransactionsWithReceipts.map((transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction));
 
diff --git a/src/components/RoomHeaderAvatars.js b/src/components/RoomHeaderAvatars.tsx
similarity index 70%
rename from src/components/RoomHeaderAvatars.js
rename to src/components/RoomHeaderAvatars.tsx
index 64cc9ac7abf3..9298062aa6f9 100644
--- a/src/components/RoomHeaderAvatars.js
+++ b/src/components/RoomHeaderAvatars.tsx
@@ -1,63 +1,60 @@
-import PropTypes from 'prop-types';
 import React, {memo} from 'react';
 import {View} from 'react-native';
-import _ from 'underscore';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
 import Avatar from './Avatar';
-import avatarPropTypes from './avatarPropTypes';
 import PressableWithoutFocus from './Pressable/PressableWithoutFocus';
 import Text from './Text';
 
-const propTypes = {
-    icons: PropTypes.arrayOf(avatarPropTypes),
-    reportID: PropTypes.string,
+type RoomHeaderAvatarsProps = {
+    icons: Icon[];
+    reportID: string;
 };
 
-const defaultProps = {
-    icons: [],
-    reportID: '',
-};
-
-function RoomHeaderAvatars(props) {
-    const navigateToAvatarPage = (icon) => {
+function RoomHeaderAvatars({icons, reportID}: RoomHeaderAvatarsProps) {
+    const navigateToAvatarPage = (icon: Icon) => {
         if (icon.type === CONST.ICON_TYPE_WORKSPACE) {
-            Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(props.reportID));
+            Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(reportID));
             return;
         }
-        Navigation.navigate(ROUTES.PROFILE_AVATAR.getRoute(icon.id));
+
+        if (icon.id) {
+            Navigation.navigate(ROUTES.PROFILE_AVATAR.getRoute(icon.id));
+        }
     };
 
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    if (!props.icons.length) {
+
+    if (!icons.length) {
         return null;
     }
 
-    if (props.icons.length === 1) {
+    if (icons.length === 1) {
         return (
             <PressableWithoutFocus
-                style={[styles.noOutline]}
-                onPress={() => navigateToAvatarPage(props.icons[0])}
+                style={styles.noOutline}
+                onPress={() => navigateToAvatarPage(icons[0])}
                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                accessibilityLabel={props.icons[0].name}
+                accessibilityLabel={icons[0].name ?? ''}
             >
                 <Avatar
-                    source={props.icons[0].source}
-                    imageStyles={[styles.avatarLarge]}
+                    source={icons[0].source}
+                    imageStyles={styles.avatarLarge}
                     size={CONST.AVATAR_SIZE.LARGE}
-                    name={props.icons[0].name}
-                    type={props.icons[0].type}
-                    fallbackIcon={props.icons[0].fallbackIcon}
+                    name={icons[0].name}
+                    type={icons[0].type}
+                    fallbackIcon={icons[0].fallbackIcon}
                 />
             </PressableWithoutFocus>
         );
     }
 
-    const iconsToDisplay = props.icons.slice(0, CONST.REPORT.MAX_PREVIEW_AVATARS);
+    const iconsToDisplay = icons.slice(0, CONST.REPORT.MAX_PREVIEW_AVATARS);
 
     const iconStyle = [
         styles.roomHeaderAvatar,
@@ -68,8 +65,9 @@ function RoomHeaderAvatars(props) {
     return (
         <View style={styles.pointerEventsBoxNone}>
             <View style={[styles.flexRow, styles.wAuto, styles.ml3]}>
-                {_.map(iconsToDisplay, (icon, index) => (
+                {iconsToDisplay.map((icon, index) => (
                     <View
+                        // eslint-disable-next-line react/no-array-index-key
                         key={`${icon.id}${index}`}
                         style={[styles.justifyContentCenter, styles.alignItemsCenter]}
                     >
@@ -77,7 +75,7 @@ function RoomHeaderAvatars(props) {
                             style={[styles.mln4, StyleUtils.getAvatarBorderRadius(CONST.AVATAR_SIZE.LARGE_BORDERED, icon.type)]}
                             onPress={() => navigateToAvatarPage(icon)}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                            accessibilityLabel={icon.name}
+                            accessibilityLabel={icon.name ?? ''}
                         >
                             <Avatar
                                 source={icon.source}
@@ -88,7 +86,7 @@ function RoomHeaderAvatars(props) {
                                 fallbackIcon={icon.fallbackIcon}
                             />
                         </PressableWithoutFocus>
-                        {index === CONST.REPORT.MAX_PREVIEW_AVATARS - 1 && props.icons.length - CONST.REPORT.MAX_PREVIEW_AVATARS !== 0 && (
+                        {index === CONST.REPORT.MAX_PREVIEW_AVATARS - 1 && icons.length - CONST.REPORT.MAX_PREVIEW_AVATARS !== 0 && (
                             <>
                                 <View
                                     style={[
@@ -100,7 +98,7 @@ function RoomHeaderAvatars(props) {
                                         styles.roomHeaderAvatarOverlay,
                                     ]}
                                 />
-                                <Text style={styles.avatarInnerTextChat}>{`+${props.icons.length - CONST.REPORT.MAX_PREVIEW_AVATARS}`}</Text>
+                                <Text style={styles.avatarInnerTextChat}>{`+${icons.length - CONST.REPORT.MAX_PREVIEW_AVATARS}`}</Text>
                             </>
                         )}
                     </View>
@@ -110,8 +108,6 @@ function RoomHeaderAvatars(props) {
     );
 }
 
-RoomHeaderAvatars.defaultProps = defaultProps;
-RoomHeaderAvatars.propTypes = propTypes;
 RoomHeaderAvatars.displayName = 'RoomHeaderAvatars';
 
 export default memo(RoomHeaderAvatars);
diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index 4c1f208ce11d..596951374099 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -85,7 +85,7 @@ function BaseListItem<TItem extends ListItem>({
                             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                             disabled={isDisabled || item.isDisabledCheckbox}
                             onPress={handleCheckboxPress}
-                            style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled]}
+                            style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, styles.mr3]}
                         >
                             <View style={selectMultipleStyle}>
                                 {item.isSelected && (
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index ac48b0fa08a9..421e48dfc224 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -9,6 +9,7 @@ import Button from '@components/Button';
 import Checkbox from '@components/Checkbox';
 import FixedFooter from '@components/FixedFooter';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
+import {PressableWithFeedback} from '@components/Pressable';
 import SafeAreaConsumer from '@components/SafeAreaConsumer';
 import SectionList from '@components/SectionList';
 import ShowMoreButton from '@components/ShowMoreButton';
@@ -512,18 +513,30 @@ function BaseSelectionList<TItem extends ListItem>(
                         ) : (
                             <>
                                 {!headerMessage && canSelectMultiple && shouldShowSelectAll && (
-                                    <View style={[styles.peopleRow, styles.userSelectNone, styles.ph4, styles.pb3, listHeaderWrapperStyle]}>
-                                        <Checkbox
-                                            isChecked={flattenedSections.allSelected}
-                                            onPress={selectAllRow}
-                                            disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
-                                            accessibilityLabel={translate('workspace.people.selectAll')}
-                                        />
-                                        {customListHeader ?? (
-                                            <View style={[styles.flex1]}>
-                                                <Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
-                                            </View>
-                                        )}
+                                    <View style={[styles.userSelectNone, styles.peopleRow, styles.ph5, styles.pb3, listHeaderWrapperStyle]}>
+                                        <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                                            <Checkbox
+                                                accessibilityLabel={translate('workspace.people.selectAll')}
+                                                isChecked={flattenedSections.allSelected}
+                                                onPress={selectAllRow}
+                                                disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
+                                            />
+                                            {!customListHeader && (
+                                                <PressableWithFeedback
+                                                    style={[styles.userSelectNone, styles.flexRow, styles.alignItemsCenter]}
+                                                    onPress={selectAllRow}
+                                                    accessibilityLabel={translate('workspace.people.selectAll')}
+                                                    role="button"
+                                                    accessibilityState={{checked: flattenedSections.allSelected}}
+                                                    disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
+                                                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                                    onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
+                                                >
+                                                    <Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
+                                                </PressableWithFeedback>
+                                            )}
+                                        </View>
+                                        {customListHeader}
                                     </View>
                                 )}
                                 {!headerMessage && !canSelectMultiple && customListHeader}
diff --git a/src/components/SwipeInterceptPanResponder.tsx b/src/components/SwipeInterceptPanResponder.tsx
index fe1545d2f14b..6a3d14b3b24b 100644
--- a/src/components/SwipeInterceptPanResponder.tsx
+++ b/src/components/SwipeInterceptPanResponder.tsx
@@ -1,6 +1,7 @@
 import {PanResponder} from 'react-native';
 
 const SwipeInterceptPanResponder = PanResponder.create({
+    onStartShouldSetPanResponder: () => true,
     onMoveShouldSetPanResponder: () => true,
     onPanResponderTerminationRequest: () => false,
 });
diff --git a/src/components/TimePicker/TimePicker.js b/src/components/TimePicker/TimePicker.js
index 95af2bc0c1b5..4d4520fedeea 100644
--- a/src/components/TimePicker/TimePicker.js
+++ b/src/components/TimePicker/TimePicker.js
@@ -452,7 +452,6 @@ function TimePicker({forwardedRef, defaultValue, onSubmit, onInputChange}) {
                 >
                     <AmountTextInput
                         placeholder={numberFormat(0)}
-                        maxLength={2}
                         formattedAmount={hours}
                         onKeyPress={(e) => {
                             lastPressedKey.current = e.nativeEvent.key;
@@ -479,7 +478,6 @@ function TimePicker({forwardedRef, defaultValue, onSubmit, onInputChange}) {
                     <Text style={styles.timePickerSemiDot}>{CONST.COLON}</Text>
                     <AmountTextInput
                         placeholder={numberFormat(0)}
-                        maxLength={2}
                         formattedAmount={minutes}
                         onKeyPress={(e) => {
                             lastPressedKey.current = e.nativeEvent.key;
diff --git a/src/components/UnitPicker.tsx b/src/components/UnitPicker.tsx
new file mode 100644
index 000000000000..a9202a348e4d
--- /dev/null
+++ b/src/components/UnitPicker.tsx
@@ -0,0 +1,50 @@
+import Str from 'expensify-common/lib/str';
+import React, {useMemo} from 'react';
+import useLocalize from '@hooks/useLocalize';
+import {getUnitTranslationKey} from '@libs/WorkspacesSettingsUtils';
+import CONST from '@src/CONST';
+import type {Unit} from '@src/types/onyx/Policy';
+import SelectionList from './SelectionList';
+import RadioListItem from './SelectionList/RadioListItem';
+
+type UnitItemType = {
+    value: Unit;
+    text: string;
+    keyForList: string;
+    isSelected: boolean;
+};
+
+type UnitPickerProps = {
+    defaultValue: Unit;
+    onOptionSelected: (unit: UnitItemType) => void;
+};
+
+const units = [CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS, CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES];
+
+function UnitPicker({defaultValue, onOptionSelected}: UnitPickerProps) {
+    const {translate} = useLocalize();
+
+    const unitOptions = useMemo(
+        () =>
+            units.map((unit) => ({
+                value: unit as Unit,
+                text: Str.recapitalize(translate(getUnitTranslationKey(unit))),
+                keyForList: unit,
+                isSelected: defaultValue === unit,
+            })),
+        [defaultValue, translate],
+    );
+
+    return (
+        <SelectionList
+            sections={[{data: unitOptions}]}
+            ListItem={RadioListItem}
+            onSelectRow={onOptionSelected}
+            initiallyFocusedOptionKey={unitOptions.find((unit) => unit.isSelected)?.keyForList}
+        />
+    );
+}
+
+export default UnitPicker;
+
+export type {UnitItemType};
diff --git a/src/components/ValuePicker/ValueSelectorModal.tsx b/src/components/ValuePicker/ValueSelectorModal.tsx
index fda077898c78..5d4ced6fe291 100644
--- a/src/components/ValuePicker/ValueSelectorModal.tsx
+++ b/src/components/ValuePicker/ValueSelectorModal.tsx
@@ -8,7 +8,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import type {ValueSelectorModalProps} from './types';
 
-function ValueSelectorModal({items = [], selectedItem, label = '', isVisible, onClose, onItemSelected, shouldShowTooltips = true}: ValueSelectorModalProps) {
+function ValueSelectorModal({items = [], selectedItem, label = '', isVisible, onClose, onItemSelected, shouldShowTooltips = true, onBackdropPress}: ValueSelectorModalProps) {
     const styles = useThemeStyles();
 
     const sections = useMemo(
@@ -24,6 +24,7 @@ function ValueSelectorModal({items = [], selectedItem, label = '', isVisible, on
             onModalHide={onClose}
             hideModalContentWhileAnimating
             useNativeDriver
+            onBackdropPress={onBackdropPress}
         >
             <ScreenWrapper
                 style={styles.pb0}
diff --git a/src/components/ValuePicker/index.tsx b/src/components/ValuePicker/index.tsx
index cc8a0edf0b97..4fb5a8b588b3 100644
--- a/src/components/ValuePicker/index.tsx
+++ b/src/components/ValuePicker/index.tsx
@@ -5,6 +5,7 @@ import FormHelpMessage from '@components/FormHelpMessage';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
 import type {ValuePickerItem, ValuePickerProps} from './types';
 import ValueSelectorModal from './ValueSelectorModal';
@@ -55,6 +56,7 @@ function ValuePicker({value, label, items, placeholder = '', errorText = '', onI
                 onClose={hidePickerModal}
                 onItemSelected={updateInput}
                 shouldShowTooltips={shouldShowTooltips}
+                onBackdropPress={Navigation.dismissModal}
             />
         </View>
     );
diff --git a/src/components/ValuePicker/types.ts b/src/components/ValuePicker/types.ts
index 23f0d78493a8..b9c2c89948d9 100644
--- a/src/components/ValuePicker/types.ts
+++ b/src/components/ValuePicker/types.ts
@@ -30,6 +30,9 @@ type ValueSelectorModalProps = {
     /** Function to call when the user closes the modal */
     onClose?: () => void;
 
+    /** Function to call when the user presses on the modal backdrop */
+    onBackdropPress?: () => void;
+
     /** Whether to show the tooltip text */
     shouldShowTooltips?: boolean;
 };
diff --git a/src/components/VideoPlayer/BaseVideoPlayer.js b/src/components/VideoPlayer/BaseVideoPlayer.js
index 92d829e9d0db..2043f5620912 100644
--- a/src/components/VideoPlayer/BaseVideoPlayer.js
+++ b/src/components/VideoPlayer/BaseVideoPlayer.js
@@ -15,6 +15,7 @@ import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import CONST from '@src/CONST';
 import {videoPlayerDefaultProps, videoPlayerPropTypes} from './propTypes';
 import shouldReplayVideo from './shouldReplayVideo';
+import * as VideoUtils from './utils';
 import VideoPlayerControls from './VideoPlayerControls';
 
 const isMobileSafari = Browser.isMobileSafari();
@@ -49,7 +50,8 @@ function BaseVideoPlayer({
     const [isPlaying, setIsPlaying] = useState(false);
     const [isLoading, setIsLoading] = useState(true);
     const [isBuffering, setIsBuffering] = useState(true);
-    const [sourceURL] = useState(url.includes('blob:') || url.includes('file:///') ? url : addEncryptedAuthTokenToURL(url));
+    // we add "#t=0.001" at the end of the URL to skip first milisecond of the video and always be able to show proper video preview when video is paused at the beginning
+    const [sourceURL] = useState(VideoUtils.addSkipTimeTagToURL(url.includes('blob:') || url.includes('file:///') ? url : addEncryptedAuthTokenToURL(url), 0.001));
     const [isPopoverVisible, setIsPopoverVisible] = useState(false);
     const [popoverAnchorPosition, setPopoverAnchorPosition] = useState({horizontal: 0, vertical: 0});
     const videoPlayerRef = useRef(null);
diff --git a/src/components/VideoPlayer/VideoPlayerControls/index.js b/src/components/VideoPlayer/VideoPlayerControls/index.js
index 5a926123feef..262613ce0797 100644
--- a/src/components/VideoPlayer/VideoPlayerControls/index.js
+++ b/src/components/VideoPlayer/VideoPlayerControls/index.js
@@ -6,7 +6,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import refPropTypes from '@components/refPropTypes';
 import Text from '@components/Text';
 import IconButton from '@components/VideoPlayer/IconButton';
-import convertMillisecondsToTime from '@components/VideoPlayer/utils';
+import {convertMillisecondsToTime} from '@components/VideoPlayer/utils';
 import {usePlaybackContext} from '@components/VideoPlayerContexts/PlaybackContext';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
diff --git a/src/components/VideoPlayer/utils.ts b/src/components/VideoPlayer/utils.ts
index c13af0f874d1..8e5c0a471976 100644
--- a/src/components/VideoPlayer/utils.ts
+++ b/src/components/VideoPlayer/utils.ts
@@ -1,11 +1,23 @@
-// Converts milliseconds to '[hours:]minutes:seconds' format
-const convertMillisecondsToTime = (milliseconds: number) => {
+/**
+ * Converts milliseconds to '[hours:]minutes:seconds' format
+ */
+function convertMillisecondsToTime(milliseconds: number) {
     const hours = Math.floor(milliseconds / 3600000);
     const minutes = Math.floor((milliseconds / 60000) % 60);
     const seconds = Math.floor((milliseconds / 1000) % 60)
         .toFixed(0)
         .padStart(2, '0');
     return hours > 0 ? `${hours}:${String(minutes).padStart(2, '0')}:${seconds}` : `${minutes}:${seconds}`;
-};
+}
 
-export default convertMillisecondsToTime;
+/**
+ * Adds a #t=seconds tag to the end of the URL to skip first seconds of the video
+ */
+function addSkipTimeTagToURL(url: string, seconds: number) {
+    if (url.includes('#t=')) {
+        return url;
+    }
+    return `${url}#t=${seconds}`;
+}
+
+export {convertMillisecondsToTime, addSkipTimeTagToURL};
diff --git a/src/components/withCurrentUserPersonalDetails.tsx b/src/components/withCurrentUserPersonalDetails.tsx
index 313bcad74f35..8431ededcb56 100644
--- a/src/components/withCurrentUserPersonalDetails.tsx
+++ b/src/components/withCurrentUserPersonalDetails.tsx
@@ -43,4 +43,4 @@ export default function <TProps extends WithCurrentUserPersonalDetailsProps, TRe
 }
 
 export {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps};
-export type {WithCurrentUserPersonalDetailsProps};
+export type {WithCurrentUserPersonalDetailsProps, CurrentUserPersonalDetails};
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 42794ce73646..32a3dae86617 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -68,7 +68,6 @@ import type {
     SizeExceededParams,
     SplitAmountParams,
     StepCounterParams,
-    TagSelectionParams,
     TaskCreatedActionParams,
     TermsParams,
     ThreadRequestReportNameParams,
@@ -628,7 +627,7 @@ export default {
         splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `split ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         amountEach: ({amount}: AmountEachParams) => `${amount} each`,
-        payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} owes ${amount}`,
+        payerOwesAmount: ({payer, amount, comment}: PayerOwesAmountParams) => `${payer} owes ${amount}${comment ? ` for ${comment}` : ''}`,
         payerOwes: ({payer}: PayerOwesParams) => `${payer} owes: `,
         payerPaidAmount: ({payer, amount}: PayerPaidAmountParams): string => `${payer ? `${payer} ` : ''}paid ${amount}`,
         payerPaid: ({payer}: PayerPaidParams) => `${payer} paid: `,
@@ -657,8 +656,8 @@ export default {
             `changed the distance to ${newDistanceToDisplay} (previously ${oldDistanceToDisplay}), which updated the amount to ${newAmountToDisplay} (previously ${oldAmountToDisplay})`,
         threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${formattedAmount} ${comment ? `for ${comment}` : 'request'}`,
         threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
-        tagSelection: ({tagName}: TagSelectionParams) => `Select a ${tagName} to add additional organization to your money.`,
-        categorySelection: 'Select a category to add additional organization to your money.',
+        tagSelection: 'Select a tag to better organize your spend.',
+        categorySelection: 'Select a category to better organize your spend.',
         error: {
             invalidCategoryLength: 'The length of the category chosen exceeds the maximum allowed (255). Please choose a different or shorten the category name first.',
             invalidAmount: 'Please enter a valid amount before continuing.',
@@ -1072,6 +1071,14 @@ export default {
             },
         },
     },
+    workflowsDelayedSubmissionPage: {
+        autoReportingErrorMessage: 'The delayed submission parameter could not be changed. Please try again or contact support.',
+        autoReportingFrequencyErrorMessage: 'The submission frequency could not be changed. Please try again or contact support.',
+        monthlyOffsetErrorMessage: 'The monthly frequency could not be changed. Please try again or contact support.',
+    },
+    workflowsApprovalPage: {
+        genericErrorMessage: 'The approver could not be changed. Please try again or contact support.',
+    },
     workflowsPayerPage: {
         title: 'Authorized payer',
         genericErrorMessage: 'The authorized payer could not be changed. Please try again.',
@@ -1768,6 +1775,8 @@ export default {
             moreFeatures: 'More features',
             requested: 'Requested',
             distanceRates: 'Distance rates',
+            welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
+                `You have been invited to ${workspaceName || 'a workspace'}! Download the Expensify mobile app at use.expensify.com/download to start tracking your expenses.`,
         },
         type: {
             free: 'Free',
@@ -1846,14 +1855,20 @@ export default {
             requiresTag: 'Members must tag all spend',
             customTagName: 'Custom tag name',
             enableTag: 'Enable tag',
+            enableTags: 'Enable tags',
+            disableTag: 'Disable tag',
+            disableTags: 'Disable tags',
             addTag: 'Add tag',
+            editTag: 'Edit tag',
             subtitle: 'Tags add more detailed ways to classify costs.',
             emptyTags: {
                 title: "You haven't created any tags",
                 subtitle: 'Add a tag to track projects, locations, departments, and more.',
             },
             deleteTag: 'Delete tag',
+            deleteTags: 'Delete tags',
             deleteTagConfirmation: 'Are you sure that you want to delete this tag?',
+            deleteTagsConfirmation: 'Are you sure that you want to delete these tags?',
             deleteFailureMessage: 'An error occurred while deleting the tag, please try again.',
             tagRequiredError: 'Tag name is required.',
             existingTagError: 'A tag with this name already exists.',
@@ -1869,7 +1884,19 @@ export default {
             errors: {
                 taxRateAlreadyExists: 'This tax name is already in use.',
                 valuePercentageRange: 'Please enter a valid percentage between 0 and 100.',
-                genericFailureMessage: 'An error occurred while updating the tax rate, please try again.',
+                deleteFailureMessage: 'An error occurred while deleting the tax rate. Please try again or ask Concierge for help.',
+                updateFailureMessage: 'An error occurred while updating the tax rate. Please try again or ask Concierge for help.',
+                createFailureMessage: 'An error occurred while creating the tax rate. Please try again or ask Concierge for help.',
+            },
+            deleteTaxConfirmation: 'Are you sure you want to delete this tax?',
+            deleteMultipleTaxConfirmation: ({taxAmount}) => `Are you sure you want to delete ${taxAmount} taxes?`,
+            actions: {
+                delete: 'Delete rate',
+                deleteMultiple: 'Delete rates',
+                disable: 'Disable rate',
+                disableMultiple: 'Disable rates',
+                enable: 'Enable rate',
+                enableMultiple: 'Enable rates',
             },
         },
         emptyWorkspace: {
@@ -1935,8 +1962,6 @@ export default {
             trackDistanceRate: 'Rate',
             trackDistanceUnit: 'Unit',
             trackDistanceChooseUnit: 'Choose a default unit to track.',
-            kilometers: 'Kilometers',
-            miles: 'Miles',
             unlockNextDayReimbursements: 'Unlock next-day reimbursements',
             captureNoVBACopyBeforeEmail: 'Ask your workspace members to forward receipts to ',
             captureNoVBACopyAfterEmail: ' and download the Expensify App to track cash expenses on the go.',
@@ -1992,8 +2017,6 @@ export default {
             personalMessagePrompt: 'Message',
             genericFailureMessage: 'An error occurred inviting the user to the workspace, please try again.',
             inviteNoMembersError: 'Please select at least one member to invite',
-            welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
-                `You have been invited to ${workspaceName || 'a workspace'}! Download the Expensify mobile app at use.expensify.com/download to start tracking your expenses.`,
         },
         distanceRates: {
             oopsNotSoFast: 'Oops! Not so fast...',
@@ -2011,6 +2034,8 @@ export default {
             status: 'Status',
             enabled: 'Enabled',
             disabled: 'Disabled',
+            unit: 'Unit',
+            defaultCategory: 'Default category',
         },
         editor: {
             descriptionInputLabel: 'Description',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 412d3b0b73ae..a344aca58168 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -67,7 +67,6 @@ import type {
     SizeExceededParams,
     SplitAmountParams,
     StepCounterParams,
-    TagSelectionParams,
     TaskCreatedActionParams,
     TermsParams,
     ThreadRequestReportNameParams,
@@ -621,7 +620,7 @@ export default {
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `dividió ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         amountEach: ({amount}: AmountEachParams) => `${amount} cada uno`,
-        payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} debe ${amount}`,
+        payerOwesAmount: ({payer, amount, comment}: PayerOwesAmountParams) => `${payer} debe ${amount}${comment ? ` para ${comment}` : ''}`,
         payerOwes: ({payer}: PayerOwesParams) => `${payer} debe: `,
         payerPaidAmount: ({payer, amount}: PayerPaidAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount}`,
         payerPaid: ({payer}: PayerPaidParams) => `${payer} pagó: `,
@@ -652,7 +651,7 @@ export default {
             `cambió la distancia a ${newDistanceToDisplay} (previamente ${oldDistanceToDisplay}), lo que cambió el importe a ${newAmountToDisplay} (previamente ${oldAmountToDisplay})`,
         threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${comment ? `${formattedAmount} para ${comment}` : `Solicitud de ${formattedAmount}`}`,
         threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
-        tagSelection: ({tagName}: TagSelectionParams) => `Seleccione una ${tagName} para organizar mejor tu dinero.`,
+        tagSelection: 'Selecciona una etiqueta para organizar mejor tu dinero.',
         categorySelection: 'Seleccione una categoría para organizar mejor tu dinero.',
         error: {
             invalidCategoryLength: 'El largo de la categoría escogida excede el máximo permitido (255). Por favor, escoge otra categoría o acorta la categoría primero.',
@@ -1068,6 +1067,14 @@ export default {
             },
         },
     },
+    workflowsDelayedSubmissionPage: {
+        autoReportingErrorMessage: 'El parámetro de envío retrasado no pudo ser cambiado. Por favor, inténtelo de nuevo o contacte al soporte.',
+        autoReportingFrequencyErrorMessage: 'La frecuencia de envío no pudo ser cambiada. Por favor, inténtelo de nuevo o contacte al soporte.',
+        monthlyOffsetErrorMessage: 'La frecuencia mensual no pudo ser cambiada. Por favor, inténtelo de nuevo o contacte al soporte.',
+    },
+    workflowsApprovalPage: {
+        genericErrorMessage: 'El aprobador no pudo ser cambiado. Por favor, inténtelo de nuevo o contacte al soporte.',
+    },
     workflowsPayerPage: {
         title: 'Pagador autorizado',
         genericErrorMessage: 'El pagador autorizado no se pudo cambiar. Por favor, inténtalo mas tarde.',
@@ -1792,6 +1799,8 @@ export default {
             moreFeatures: 'Más características',
             requested: 'Solicitado',
             distanceRates: 'Tasas de distancia',
+            welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
+                `¡Has sido invitado a ${workspaceName}! Descargue la aplicación móvil Expensify en use.expensify.com/download para comenzar a rastrear sus gastos.`,
         },
         type: {
             free: 'Gratis',
@@ -1870,14 +1879,20 @@ export default {
             requiresTag: 'Los miembros deben etiquetar todos los gastos',
             customTagName: 'Nombre de etiqueta personalizada',
             enableTag: 'Habilitar etiqueta',
+            enableTags: 'Habilitar etiquetas',
+            disableTag: 'Desactivar etiqueta',
+            disableTags: 'Desactivar etiquetas',
             addTag: 'Añadir etiqueta',
+            editTag: 'Editar etiqueta',
             subtitle: 'Las etiquetas añaden formas más detalladas de clasificar los costos.',
             emptyTags: {
                 title: 'No has creado ninguna etiqueta',
                 subtitle: 'Añade una etiqueta para realizar el seguimiento de proyectos, ubicaciones, departamentos y otros.',
             },
             deleteTag: 'Eliminar etiqueta',
+            deleteTags: 'Eliminar etiquetas',
             deleteTagConfirmation: '¿Estás seguro de que quieres eliminar esta etiqueta?',
+            deleteTagsConfirmation: '¿Estás seguro de que quieres eliminar estas etiquetas?',
             deleteFailureMessage: 'Se ha producido un error al intentar eliminar la etiqueta. Por favor, inténtalo más tarde.',
             tagRequiredError: 'Lo nombre de la etiqueta es obligatorio.',
             existingTagError: 'Ya existe una etiqueta con este nombre.',
@@ -1892,8 +1907,20 @@ export default {
             value: 'Valor',
             errors: {
                 taxRateAlreadyExists: 'Ya existe un impuesto con este nombre',
-                valuePercentageRange: 'Introduzca un porcentaje válido entre 0 y 100',
-                genericFailureMessage: 'Se produjo un error al actualizar el tipo impositivo, inténtelo nuevamente.',
+                valuePercentageRange: 'Por favor, introduce un porcentaje entre 0 y 100',
+                deleteFailureMessage: 'Se ha producido un error al intentar eliminar la tasa de impuesto. Por favor, inténtalo más tarde.',
+                updateFailureMessage: 'Se ha producido un error al intentar modificar la tasa de impuesto. Por favor, inténtalo más tarde.',
+                createFailureMessage: 'Se ha producido un error al intentar crear la tasa de impuesto. Por favor, inténtalo más tarde.',
+            },
+            deleteTaxConfirmation: '¿Estás seguro de que quieres eliminar este impuesto?',
+            deleteMultipleTaxConfirmation: ({taxAmount}) => `¿Estás seguro de que quieres eliminar ${taxAmount} impuestos?`,
+            actions: {
+                delete: 'Eliminar tasa',
+                deleteMultiple: 'Eliminar tasas',
+                disable: 'Desactivar tasa',
+                disableMultiple: 'Desactivar tasas',
+                enable: 'Activar tasa',
+                enableMultiple: 'Activar tasas',
             },
         },
         emptyWorkspace: {
@@ -1960,8 +1987,6 @@ export default {
             trackDistanceRate: 'Tarifa',
             trackDistanceUnit: 'Unidad',
             trackDistanceChooseUnit: 'Elige una unidad predeterminada de medida.',
-            kilometers: 'Kilómetros',
-            miles: 'Millas',
             unlockNextDayReimbursements: 'Desbloquea reembolsos diarios',
             captureNoVBACopyBeforeEmail: 'Pide a los miembros de tu espacio de trabajo que envíen recibos a ',
             captureNoVBACopyAfterEmail: ' y descarga la App de Expensify para controlar tus gastos en efectivo sobre la marcha.',
@@ -2017,8 +2042,6 @@ export default {
             personalMessagePrompt: 'Mensaje',
             inviteNoMembersError: 'Por favor, selecciona al menos un miembro a invitar',
             genericFailureMessage: 'Se produjo un error al invitar al usuario al espacio de trabajo. Vuelva a intentarlo..',
-            welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
-                `¡Has sido invitado a ${workspaceName}! Descargue la aplicación móvil Expensify en use.expensify.com/download para comenzar a rastrear sus gastos.`,
         },
         distanceRates: {
             oopsNotSoFast: 'Ups! No tan rápido...',
@@ -2036,6 +2059,8 @@ export default {
             status: 'Estado',
             enabled: 'Activada',
             disabled: 'Desactivada',
+            unit: 'Unidad',
+            defaultCategory: 'Categoría predeterminada',
         },
         editor: {
             nameInputLabel: 'Nombre',
diff --git a/src/languages/types.ts b/src/languages/types.ts
index 2d04bdc156c9..93438d76885d 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -117,7 +117,7 @@ type DidSplitAmountMessageParams = {formattedAmount: string; comment: string};
 
 type AmountEachParams = {amount: string};
 
-type PayerOwesAmountParams = {payer: string; amount: number | string};
+type PayerOwesAmountParams = {payer: string; amount: number | string; comment?: string};
 
 type PayerOwesParams = {payer: string};
 
@@ -211,8 +211,6 @@ type UpdatedTheDistanceParams = {newDistanceToDisplay: string; oldDistanceToDisp
 
 type FormattedMaxLengthParams = {formattedMaxLength: string};
 
-type TagSelectionParams = {tagName: string};
-
 type WalletProgramParams = {walletProgram: string};
 
 type ViolationsAutoReportedRejectedExpenseParams = {rejectedBy: string; rejectReason: string};
@@ -362,7 +360,6 @@ export type {
     SizeExceededParams,
     SplitAmountParams,
     StepCounterParams,
-    TagSelectionParams,
     TaskCreatedActionParams,
     TermsParams,
     ThreadRequestReportNameParams,
diff --git a/src/libs/API/parameters/DeletePolicyTaxesParams.ts b/src/libs/API/parameters/DeletePolicyTaxesParams.ts
new file mode 100644
index 000000000000..9e0963cdcb28
--- /dev/null
+++ b/src/libs/API/parameters/DeletePolicyTaxesParams.ts
@@ -0,0 +1,11 @@
+type DeletePolicyTaxesParams = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<string>
+     * Each element is a tax name
+     */
+    taxNames: string;
+};
+
+export default DeletePolicyTaxesParams;
diff --git a/src/libs/API/parameters/OpenPlaidBankLoginParams.ts b/src/libs/API/parameters/OpenPlaidBankLoginParams.ts
index f76e05423d03..d60596eeb08f 100644
--- a/src/libs/API/parameters/OpenPlaidBankLoginParams.ts
+++ b/src/libs/API/parameters/OpenPlaidBankLoginParams.ts
@@ -1,5 +1,6 @@
 type OpenPlaidBankLoginParams = {
     redirectURI: string | undefined;
+    androidPackage?: string;
     allowDebit: boolean;
     bankAccountID: number;
 };
diff --git a/src/libs/API/parameters/RenamePolicyTagsParams.ts b/src/libs/API/parameters/RenamePolicyTagsParams.ts
new file mode 100644
index 000000000000..bcf38384cf2c
--- /dev/null
+++ b/src/libs/API/parameters/RenamePolicyTagsParams.ts
@@ -0,0 +1,7 @@
+type RenamePolicyTagsParams = {
+    policyID: string;
+    oldName: string;
+    newName: string;
+};
+
+export default RenamePolicyTagsParams;
diff --git a/src/libs/API/parameters/RenamePolicyTaxParams.ts b/src/libs/API/parameters/RenamePolicyTaxParams.ts
new file mode 100644
index 000000000000..b722f14e7b6e
--- /dev/null
+++ b/src/libs/API/parameters/RenamePolicyTaxParams.ts
@@ -0,0 +1,7 @@
+type SetPolicyCurrencyDefaultParams = {
+    policyID: string;
+    taxCode: string;
+    newName: string;
+};
+
+export default SetPolicyCurrencyDefaultParams;
diff --git a/src/libs/API/parameters/SetPolicyDistanceRatesDefaultCategoryParams.ts b/src/libs/API/parameters/SetPolicyDistanceRatesDefaultCategoryParams.ts
new file mode 100644
index 000000000000..d2d11993a172
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyDistanceRatesDefaultCategoryParams.ts
@@ -0,0 +1,6 @@
+type SetPolicyDistanceRatesDefaultCategoryParams = {
+    policyID: string;
+    customUnit: string;
+};
+
+export default SetPolicyDistanceRatesDefaultCategoryParams;
diff --git a/src/libs/API/parameters/SetPolicyDistanceRatesUnitParams.ts b/src/libs/API/parameters/SetPolicyDistanceRatesUnitParams.ts
new file mode 100644
index 000000000000..c841f480d1bf
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyDistanceRatesUnitParams.ts
@@ -0,0 +1,6 @@
+type SetPolicyDistanceRatesUnitParams = {
+    policyID: string;
+    customUnit: string;
+};
+
+export default SetPolicyDistanceRatesUnitParams;
diff --git a/src/libs/API/parameters/SetPolicyTaxesEnabledParams.ts b/src/libs/API/parameters/SetPolicyTaxesEnabledParams.ts
new file mode 100644
index 000000000000..4ed0a05cfdec
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyTaxesEnabledParams.ts
@@ -0,0 +1,10 @@
+type SetPolicyTaxesEnabledParams = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<{taxCode: string, enabled: bool}>
+     */
+    taxFieldsArray: string;
+};
+
+export default SetPolicyTaxesEnabledParams;
diff --git a/src/libs/API/parameters/UpdatePolicyTaxValueParams.ts b/src/libs/API/parameters/UpdatePolicyTaxValueParams.ts
new file mode 100644
index 000000000000..1124755ea9ef
--- /dev/null
+++ b/src/libs/API/parameters/UpdatePolicyTaxValueParams.ts
@@ -0,0 +1,7 @@
+type UpdatePolicyTaxValueParams = {
+    policyID: string;
+    taxCode: string;
+    taxAmount: number;
+};
+
+export default UpdatePolicyTaxValueParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index efb2f1fff7da..5b42f25d19be 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -181,8 +181,15 @@ export type {default as OpenPolicyTaxesPageParams} from './OpenPolicyTaxesPagePa
 export type {default as EnablePolicyTaxesParams} from './EnablePolicyTaxesParams';
 export type {default as OpenPolicyMoreFeaturesPageParams} from './OpenPolicyMoreFeaturesPageParams';
 export type {default as CreatePolicyDistanceRateParams} from './CreatePolicyDistanceRateParams';
+export type {default as SetPolicyDistanceRatesUnitParams} from './SetPolicyDistanceRatesUnitParams';
+export type {default as SetPolicyDistanceRatesDefaultCategoryParams} from './SetPolicyDistanceRatesDefaultCategoryParams';
 export type {default as CreatePolicyTagsParams} from './CreatePolicyTagsParams';
+export type {default as SetPolicyTaxesEnabledParams} from './SetPolicyTaxesEnabledParams';
+export type {default as DeletePolicyTaxesParams} from './DeletePolicyTaxesParams';
+export type {default as UpdatePolicyTaxValueParams} from './UpdatePolicyTaxValueParams';
+export type {default as RenamePolicyTagsParams} from './RenamePolicyTagsParams';
 export type {default as DeletePolicyTagsParams} from './DeletePolicyTagsParams';
 export type {default as SetPolicyCustomTaxNameParams} from './SetPolicyCustomTaxNameParams';
 export type {default as SetPolicyForeignCurrencyDefaultParams} from './SetPolicyForeignCurrencyDefaultParams';
 export type {default as SetPolicyCurrencyDefaultParams} from './SetPolicyCurrencyDefaultParams';
+export type {default as RenamePolicyTaxParams} from './RenamePolicyTaxParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index 132fbc60b967..c04702f38f6a 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -122,11 +122,12 @@ const WRITE_COMMANDS = {
     CREATE_WORKSPACE_CATEGORIES: 'CreateWorkspaceCategories',
     RENAME_WORKSPACE_CATEGORY: 'RenameWorkspaceCategory',
     CREATE_POLICY_TAG: 'CreatePolicyTag',
+    RENAME_POLICY_TAG: 'RenamePolicyTag',
     SET_WORKSPACE_REQUIRES_CATEGORY: 'SetWorkspaceRequiresCategory',
     DELETE_WORKSPACE_CATEGORIES: 'DeleteWorkspaceCategories',
     SET_POLICY_REQUIRES_TAG: 'SetPolicyRequiresTag',
     RENAME_POLICY_TAG_LIST: 'RenamePolicyTaglist',
-    DELETE_POLICY_TAGS: 'Policy_IndependentTaglist_Tags_Remove',
+    DELETE_POLICY_TAGS: 'DeletePolicyTags',
     CREATE_TASK: 'CreateTask',
     CANCEL_TASK: 'CancelTask',
     EDIT_TASK_ASSIGNEE: 'EditTaskAssignee',
@@ -181,7 +182,13 @@ const WRITE_COMMANDS = {
     ACCEPT_JOIN_REQUEST: 'AcceptJoinRequest',
     DECLINE_JOIN_REQUEST: 'DeclineJoinRequest',
     CREATE_POLICY_TAX: 'CreatePolicyTax',
+    SET_POLICY_TAXES_ENABLED: 'SetPolicyTaxesEnabled',
+    DELETE_POLICY_TAXES: 'DeletePolicyTaxes',
+    UPDATE_POLICY_TAX_VALUE: 'UpdatePolicyTaxValue',
+    RENAME_POLICY_TAX: 'RenamePolicyTax',
     CREATE_POLICY_DISTANCE_RATE: 'CreatePolicyDistanceRate',
+    SET_POLICY_DISTANCE_RATES_UNIT: 'SetPolicyDistanceRatesUnit',
+    SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY: 'SetPolicyDistanceRatesDefaultCategory',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -298,6 +305,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_POLICY_REQUIRES_TAG]: Parameters.SetPolicyRequiresTag;
     [WRITE_COMMANDS.RENAME_POLICY_TAG_LIST]: Parameters.RenamePolicyTaglist;
     [WRITE_COMMANDS.CREATE_POLICY_TAG]: Parameters.CreatePolicyTagsParams;
+    [WRITE_COMMANDS.RENAME_POLICY_TAG]: Parameters.RenamePolicyTagsParams;
     [WRITE_COMMANDS.SET_POLICY_TAGS_ENABLED]: Parameters.SetPolicyTagsEnabled;
     [WRITE_COMMANDS.DELETE_POLICY_TAGS]: Parameters.DeletePolicyTagsParams;
     [WRITE_COMMANDS.CREATE_TASK]: Parameters.CreateTaskParams;
@@ -361,7 +369,13 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SET_POLICY_CUSTOM_TAX_NAME]: Parameters.SetPolicyCustomTaxNameParams;
     [WRITE_COMMANDS.SET_POLICY_TAXES_FOREIGN_CURRENCY_DEFAULT]: Parameters.SetPolicyForeignCurrencyDefaultParams;
     [WRITE_COMMANDS.CREATE_POLICY_TAX]: Parameters.CreatePolicyTaxParams;
+    [WRITE_COMMANDS.SET_POLICY_TAXES_ENABLED]: Parameters.SetPolicyTaxesEnabledParams;
+    [WRITE_COMMANDS.DELETE_POLICY_TAXES]: Parameters.DeletePolicyTaxesParams;
+    [WRITE_COMMANDS.UPDATE_POLICY_TAX_VALUE]: Parameters.UpdatePolicyTaxValueParams;
     [WRITE_COMMANDS.CREATE_POLICY_DISTANCE_RATE]: Parameters.CreatePolicyDistanceRateParams;
+    [WRITE_COMMANDS.RENAME_POLICY_TAX]: Parameters.RenamePolicyTaxParams;
+    [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_UNIT]: Parameters.SetPolicyDistanceRatesUnitParams;
+    [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY]: Parameters.SetPolicyDistanceRatesDefaultCategoryParams;
 };
 
 const READ_COMMANDS = {
diff --git a/src/libs/ApiUtils.ts b/src/libs/ApiUtils.ts
index 67feb18b36fa..0c8fa3f53915 100644
--- a/src/libs/ApiUtils.ts
+++ b/src/libs/ApiUtils.ts
@@ -52,7 +52,8 @@ function getApiRoot(request?: Request): string {
  * @param - the name of the API command
  */
 function getCommandURL(request: Request): string {
-    return `${getApiRoot(request)}api?command=${request.command}`;
+    // If request.command already contains ? then we don't need to append it
+    return `${getApiRoot(request)}api/${request.command}${request.command.includes('?') ? '' : '?'}`;
 }
 
 /**
diff --git a/src/libs/ErrorUtils.ts b/src/libs/ErrorUtils.ts
index 784d339a4a0d..d38700efd53d 100644
--- a/src/libs/ErrorUtils.ts
+++ b/src/libs/ErrorUtils.ts
@@ -110,6 +110,21 @@ function getEarliestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxDa
     return {[key]: getErrorMessageWithTranslationData(errorsForField[key])};
 }
 
+/**
+ * Method used to get the latest error field for any field
+ */
+function getLatestErrorFieldForAnyField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: TOnyxData): Errors {
+    const errorFields = onyxData.errorFields ?? {};
+
+    if (Object.keys(errorFields).length === 0) {
+        return {};
+    }
+
+    const fieldNames = Object.keys(errorFields);
+    const latestErrorFields = fieldNames.map((fieldName) => getLatestErrorField(onyxData, fieldName));
+    return latestErrorFields.reduce((acc, error) => ({...acc, ...error}), {});
+}
+
 /**
  * Method used to attach already translated message with isTranslated property
  * @param errors - An object containing current errors in the form
@@ -176,6 +191,7 @@ export {
     getLatestErrorField,
     getLatestErrorMessage,
     getLatestErrorMessageField,
+    getLatestErrorFieldForAnyField,
     getMicroSecondOnyxError,
     getMicroSecondOnyxErrorObject,
     isReceiptError,
diff --git a/src/libs/HttpUtils.ts b/src/libs/HttpUtils.ts
index f52fefe02386..842776d0c8dd 100644
--- a/src/libs/HttpUtils.ts
+++ b/src/libs/HttpUtils.ts
@@ -39,7 +39,7 @@ const addSkewList: string[] = [SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT, SIDE_EF
 /**
  * Regex to get API command from the command
  */
-const APICommandRegex = /[?&]command=([^&]+)/;
+const APICommandRegex = /\/api\/([^&?]+)\??.*/;
 
 /**
  * Send an HTTP request, and attempt to resolve the json response.
diff --git a/src/libs/InitialUrlContext/index.ts b/src/libs/InitialUrlContext/index.ts
deleted file mode 100644
index a87417fe4cc6..000000000000
--- a/src/libs/InitialUrlContext/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {createContext} from 'react';
-import type {Route} from '@src/ROUTES';
-
-/** Initial url that will be opened when NewDot is embedded into Hybrid App. */
-const InitialUrlContext = createContext<Route | undefined>(undefined);
-
-export default InitialUrlContext;
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 585713243d3f..5835558e5de4 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -181,7 +181,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
         Pusher.init({
             appKey: CONFIG.PUSHER.APP_KEY,
             cluster: CONFIG.PUSHER.CLUSTER,
-            authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api?command=AuthenticatePusher`,
+            authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/AuthenticatePusher?`,
         }).then(() => {
             User.subscribeToUserEvents();
         });
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx
index 69741141f4f3..bd5bfc46134a 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.tsx
@@ -263,11 +263,13 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.MEMBER_DETAILS_ROLE_SELECTION]: () => require('../../../pages/workspace/members/WorkspaceMemberDetailsRoleSelectionPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.CATEGORY_CREATE]: () => require('../../../pages/workspace/categories/CreateCategoryPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.CATEGORY_EDIT]: () => require('../../../pages/workspace/categories/EditCategoryPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: () => require('@pages/workspace/distanceRates/CreateDistanceRatePage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: () => require('../../../pages/workspace/distanceRates/CreateDistanceRatePage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS]: () => require('../../../pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAGS_SETTINGS]: () => require('../../../pages/workspace/tags/WorkspaceTagsSettingsPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAG_SETTINGS]: () => require('../../../pages/workspace/tags/TagSettingsPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAGS_EDIT]: () => require('../../../pages/workspace/tags/WorkspaceEditTagsPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAG_CREATE]: () => require('../../../pages/workspace/tags/WorkspaceCreateTagPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.TAG_EDIT]: () => require('../../../pages/workspace/tags/EditTagPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAXES_SETTINGS]: () => require('../../../pages/workspace/taxes/WorkspaceTaxesSettingsPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAXES_SETTINGS_CUSTOM_TAX_NAME]: () => require('../../../pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAXES_SETTINGS_FOREIGN_CURRENCY_DEFAULT]: () => require('../../../pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency').default as React.ComponentType,
@@ -282,6 +284,9 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM]: () => require('../../../pages/settings/ExitSurvey/ExitSurveyConfirmPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default as React.ComponentType,
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () => require('../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.TAX_EDIT]: () => require('../../../pages/workspace/taxes/WorkspaceEditTaxPage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.TAX_NAME]: () => require('../../../pages/workspace/taxes/NamePage').default as React.ComponentType,
+    [SCREENS.WORKSPACE.TAX_VALUE]: () => require('../../../pages/workspace/taxes/ValuePage').default as React.ComponentType,
     [SCREENS.WORKSPACE.TAX_CREATE]: () => require('../../../pages/workspace/taxes/WorkspaceCreateTaxPage').default as React.ComponentType,
 });
 
diff --git a/src/libs/Navigation/AppNavigator/index.tsx b/src/libs/Navigation/AppNavigator/index.tsx
index 24f0f42c5d64..9729a2f812ce 100644
--- a/src/libs/Navigation/AppNavigator/index.tsx
+++ b/src/libs/Navigation/AppNavigator/index.tsx
@@ -1,6 +1,6 @@
 import React, {useContext, useEffect} from 'react';
 import {NativeModules} from 'react-native';
-import InitialUrlContext from '@libs/InitialUrlContext';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
 import Navigation from '@libs/Navigation/Navigation';
 
 type AppNavigatorProps = {
@@ -9,7 +9,7 @@ type AppNavigatorProps = {
 };
 
 function AppNavigator({authenticated}: AppNavigatorProps) {
-    const initUrl = useContext(InitialUrlContext);
+    const initUrl = useContext(InitialURLContext);
 
     useEffect(() => {
         if (!NativeModules.HybridAppModule || !initUrl) {
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index 6f06df9bf2ff..17f5049aab91 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -13,13 +13,18 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
     ],
     [SCREENS.WORKSPACE.TAXES]: [
         SCREENS.WORKSPACE.TAXES_SETTINGS,
+        SCREENS.WORKSPACE.TAX_CREATE,
         SCREENS.WORKSPACE.TAXES_SETTINGS_CUSTOM_TAX_NAME,
         SCREENS.WORKSPACE.TAXES_SETTINGS_FOREIGN_CURRENCY_DEFAULT,
         SCREENS.WORKSPACE.TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT,
+        SCREENS.WORKSPACE.TAX_CREATE,
+        SCREENS.WORKSPACE.TAX_EDIT,
+        SCREENS.WORKSPACE.TAX_NAME,
+        SCREENS.WORKSPACE.TAX_VALUE,
     ],
-    [SCREENS.WORKSPACE.TAGS]: [SCREENS.WORKSPACE.TAGS_SETTINGS, SCREENS.WORKSPACE.TAGS_EDIT, SCREENS.WORKSPACE.TAG_CREATE, SCREENS.WORKSPACE.TAG_SETTINGS, SCREENS.WORKSPACE.TAX_CREATE],
+    [SCREENS.WORKSPACE.TAGS]: [SCREENS.WORKSPACE.TAGS_SETTINGS, SCREENS.WORKSPACE.TAGS_EDIT, SCREENS.WORKSPACE.TAG_CREATE, SCREENS.WORKSPACE.TAG_SETTINGS, SCREENS.WORKSPACE.TAG_EDIT],
     [SCREENS.WORKSPACE.CATEGORIES]: [SCREENS.WORKSPACE.CATEGORY_CREATE, SCREENS.WORKSPACE.CATEGORY_SETTINGS, SCREENS.WORKSPACE.CATEGORIES_SETTINGS, SCREENS.WORKSPACE.CATEGORY_EDIT],
-    [SCREENS.WORKSPACE.DISTANCE_RATES]: [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE],
+    [SCREENS.WORKSPACE.DISTANCE_RATES]: [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE, SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS],
 };
 
 export default FULL_SCREEN_TO_RHP_MAPPING;
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index ae8d47a69988..130fdf23732f 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -292,6 +292,9 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: {
                             path: ROUTES.WORKSPACE_CREATE_DISTANCE_RATE.route,
                         },
+                        [SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS]: {
+                            path: ROUTES.WORKSPACE_DISTANCE_RATES_SETTINGS.route,
+                        },
                         [SCREENS.WORKSPACE.TAGS_SETTINGS]: {
                             path: ROUTES.WORKSPACE_TAGS_SETTINGS.route,
                         },
@@ -301,6 +304,12 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.TAG_CREATE]: {
                             path: ROUTES.WORKSPACE_TAG_CREATE.route,
                         },
+                        [SCREENS.WORKSPACE.TAG_EDIT]: {
+                            path: ROUTES.WORKSPACE_TAG_EDIT.route,
+                            parse: {
+                                tagName: (tagName: string) => decodeURIComponent(tagName),
+                            },
+                        },
                         [SCREENS.WORKSPACE.TAG_SETTINGS]: {
                             path: ROUTES.WORKSPACE_TAG_SETTINGS.route,
                             parse: {
@@ -345,6 +354,15 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.TAX_CREATE]: {
                             path: ROUTES.WORKSPACE_TAX_CREATE.route,
                         },
+                        [SCREENS.WORKSPACE.TAX_EDIT]: {
+                            path: ROUTES.WORKSPACE_TAX_EDIT.route,
+                        },
+                        [SCREENS.WORKSPACE.TAX_NAME]: {
+                            path: ROUTES.WORKSPACE_TAX_NAME.route,
+                        },
+                        [SCREENS.WORKSPACE.TAX_VALUE]: {
+                            path: ROUTES.WORKSPACE_TAX_VALUE.route,
+                        },
                     },
                 },
                 [SCREENS.RIGHT_MODAL.PRIVATE_NOTES]: {
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 4c9bdb579605..9b0d9ce4decc 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -193,6 +193,10 @@ type SettingsNavigatorParamList = {
         policyID: string;
         tagName: string;
     };
+    [SCREENS.WORKSPACE.TAG_EDIT]: {
+        policyID: string;
+        tagName: string;
+    };
     [SCREENS.WORKSPACE.TAXES_SETTINGS]: {
         policyID: string;
     };
@@ -218,6 +222,9 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS]: {
+        policyID: string;
+    };
     [SCREENS.GET_ASSISTANCE]: {
         backTo: Routes;
     };
@@ -235,6 +242,18 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.TAX_CREATE]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.TAX_EDIT]: {
+        policyID: string;
+        taxID: string;
+    };
+    [SCREENS.WORKSPACE.TAX_NAME]: {
+        policyID: string;
+        taxID: string;
+    };
+    [SCREENS.WORKSPACE.TAX_VALUE]: {
+        policyID: string;
+        taxID: string;
+    };
 } & ReimbursementAccountNavigatorParamList;
 
 type NewChatNavigatorParamList = {
diff --git a/src/libs/NetworkConnection.ts b/src/libs/NetworkConnection.ts
index 6839b290abdd..1cf37623ef2e 100644
--- a/src/libs/NetworkConnection.ts
+++ b/src/libs/NetworkConnection.ts
@@ -81,7 +81,7 @@ function subscribeToNetInfo(): void {
             // By default, NetInfo uses `/` for `reachabilityUrl`
             // When App is served locally (or from Electron) this address is always reachable - even offline
             // Using the API url ensures reachability is tested over internet
-            reachabilityUrl: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api?command=Ping`,
+            reachabilityUrl: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/Ping`,
             reachabilityMethod: 'GET',
             reachabilityTest: (response) => {
                 if (!response.ok) {
diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index 0a5cfad2d146..5a19e68afe72 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -258,7 +258,7 @@ function buildNextStep(
                         text: 'Waiting for ',
                     },
                     {
-                        text: managerDisplayName,
+                        text: 'you',
                         type: 'strong',
                     },
                     {
@@ -281,7 +281,7 @@ function buildNextStep(
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: managerDisplayName,
                         type: 'strong',
                     },
                     {
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index ff55343fa762..bacd019904a3 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -569,6 +569,7 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
             ReportUtils.isChatReport(report),
             null,
             true,
+            lastReportAction,
         );
     } else if (ReportActionUtils.isReimbursementQueuedAction(lastReportAction)) {
         lastMessageTextFromReport = ReportUtils.getReimbursementQueuedActionMessage(lastReportAction, report);
@@ -1013,8 +1014,8 @@ function getCategoryListSections(
     }
 
     const selectedOptionNames = selectedOptions.map((selectedOption) => selectedOption.name);
-    const enabledWithoutSelectedCategories = sortedCategories.filter((category) => category.enabled && !selectedOptionNames.includes(category.name));
-    const numberOfVisibleCategories = enabledWithoutSelectedCategories.length + selectedOptions.length;
+    const filteredCategories = enabledCategories.filter((category) => !selectedOptionNames.includes(category.name));
+    const numberOfVisibleCategories = filteredCategories.length + selectedOptionNames.length;
 
     if (numberOfVisibleCategories < CONST.CATEGORY_LIST_THRESHOLD) {
         categorySections.push({
@@ -1022,7 +1023,7 @@ function getCategoryListSections(
             title: '',
             shouldShow: false,
             indexOffset,
-            data: getCategoryOptionTree(enabledWithoutSelectedCategories),
+            data: getCategoryOptionTree(filteredCategories, false, selectedOptionNames),
         });
 
         return categorySections;
@@ -1049,8 +1050,6 @@ function getCategoryListSections(
         indexOffset += filteredRecentlyUsedCategories.length;
     }
 
-    const filteredCategories = enabledCategories.filter((category) => !selectedOptionNames.includes(category.name));
-
     categorySections.push({
         // "All" section when items amount more than the threshold
         title: Localize.translateLocal('common.all'),
diff --git a/src/libs/PersonalDetailsUtils.ts b/src/libs/PersonalDetailsUtils.ts
index c8107c22bb1a..c9ea65781117 100644
--- a/src/libs/PersonalDetailsUtils.ts
+++ b/src/libs/PersonalDetailsUtils.ts
@@ -1,6 +1,7 @@
 import Str from 'expensify-common/lib/str';
 import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import type {CurrentUserPersonalDetails} from '@components/withCurrentUserPersonalDetails';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx';
@@ -249,7 +250,7 @@ function createDisplayName(login: string, passedPersonalDetails: Pick<PersonalDe
  * If the login is the same as the displayName, then they don't exist,
  * so we return empty strings instead.
  */
-function extractFirstAndLastNameFromAvailableDetails({login, displayName, firstName, lastName}: PersonalDetails): FirstAndLastName {
+function extractFirstAndLastNameFromAvailableDetails({login, displayName, firstName, lastName}: CurrentUserPersonalDetails): FirstAndLastName {
     // It's possible for firstName to be empty string, so we must use "||" to consider lastName instead.
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     if (firstName || lastName) {
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 675e268045c1..39e6c8932aad 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -4,7 +4,8 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetailsList, Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags} from '@src/types/onyx';
+import type {PersonalDetailsList, Policy, PolicyCategories, PolicyMembers, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
+import type {PolicyFeatureName} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import Navigation from './Navigation/Navigation';
@@ -34,7 +35,7 @@ function hasPolicyMemberError(policyMembers: OnyxEntry<PolicyMembers>): boolean
  *  Check if the policy has any tax rate errors.
  */
 function hasTaxRateError(policy: OnyxEntry<Policy>): boolean {
-    return Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0);
+    return Object.values(policy?.taxRates?.taxes ?? {}).some((taxRate) => Object.keys(taxRate?.errors ?? {}).length > 0 || Object.values(taxRate?.errorFields ?? {}).some(Boolean));
 }
 
 /**
@@ -276,6 +277,26 @@ function goBackFromInvalidPolicy() {
     Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
 }
 
+/** Get a tax with given ID from policy */
+function getTaxByID(policy: OnyxEntry<Policy>, taxID: string): TaxRate | undefined {
+    return policy?.taxRates?.taxes?.[taxID];
+}
+
+/**
+ * Whether the tax rate can be deleted and disabled
+ */
+function canEditTaxRate(policy: Policy, taxID: string): boolean {
+    return policy.taxRates?.defaultExternalID !== taxID;
+}
+
+function isPolicyFeatureEnabled(policy: OnyxEntry<Policy> | EmptyObject, featureName: PolicyFeatureName): boolean {
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
+        return Boolean(policy?.tax?.trackingEnabled);
+    }
+
+    return Boolean(policy?.[featureName]);
+}
+
 export {
     getActivePolicies,
     hasAccountingConnections,
@@ -296,6 +317,7 @@ export {
     getIneligibleInvitees,
     getTagLists,
     getTagListName,
+    canEditTaxRate,
     getTagList,
     getCleanedTagName,
     getCountOfEnabledTagsOfList,
@@ -306,7 +328,9 @@ export {
     getPathWithoutPolicyID,
     getPolicyMembersByIdWithoutCurrentUser,
     goBackFromInvalidPolicy,
+    isPolicyFeatureEnabled,
     hasTaxRateError,
+    getTaxByID,
     hasPolicyCategoriesError,
 };
 
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index e39180db7fd0..b5351e13ea6c 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -2414,17 +2414,21 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction | Optimis
 /**
  * Get money request message for an IOU report
  *
- * @param [reportAction] This can be either a report preview action or the IOU action
+ * @param [iouReportAction] This is always an IOU action. When necessary, report preview actions will be unwrapped and the child iou report action is passed here (the original report preview
+ *     action will be passed as `originalReportAction` in this case).
+ * @param [originalReportAction] This can be either a report preview action or the IOU action. This will be the original report preview action in cases where `iouReportAction` was unwrapped
+ *     from a report preview action. Otherwise, it will be the same as `iouReportAction`.
  */
 function getReportPreviewMessage(
     report: OnyxEntry<Report> | EmptyObject,
-    reportAction: OnyxEntry<ReportAction> | EmptyObject = {},
+    iouReportAction: OnyxEntry<ReportAction> | EmptyObject = {},
     shouldConsiderScanningReceiptOrPendingRoute = false,
     isPreviewMessageForParentChatReport = false,
     policy: OnyxEntry<Policy> = null,
     isForListPreview = false,
+    originalReportAction: OnyxEntry<ReportAction> | EmptyObject = iouReportAction,
 ): string {
-    const reportActionMessage = reportAction?.message?.[0].html ?? '';
+    const reportActionMessage = iouReportAction?.message?.[0].html ?? '';
 
     if (isEmptyObject(report) || !report?.reportID) {
         // The iouReport is not found locally after SignIn because the OpenApp API won't return iouReports if they're settled
@@ -2432,9 +2436,9 @@ function getReportPreviewMessage(
         return reportActionMessage;
     }
 
-    if (!isEmptyObject(reportAction) && !isIOUReport(report) && reportAction && ReportActionsUtils.isSplitBillAction(reportAction)) {
+    if (!isEmptyObject(iouReportAction) && !isIOUReport(report) && iouReportAction && ReportActionsUtils.isSplitBillAction(iouReportAction)) {
         // This covers group chats where the last action is a split bill action
-        const linkedTransaction = getLinkedTransaction(reportAction);
+        const linkedTransaction = getLinkedTransaction(iouReportAction);
         if (isEmptyObject(linkedTransaction)) {
             return reportActionMessage;
         }
@@ -2469,8 +2473,8 @@ function getReportPreviewMessage(
     }
 
     let linkedTransaction;
-    if (!isEmptyObject(reportAction) && shouldConsiderScanningReceiptOrPendingRoute && reportAction && ReportActionsUtils.isMoneyRequestAction(reportAction)) {
-        linkedTransaction = getLinkedTransaction(reportAction);
+    if (!isEmptyObject(iouReportAction) && shouldConsiderScanningReceiptOrPendingRoute && iouReportAction && ReportActionsUtils.isMoneyRequestAction(iouReportAction)) {
+        linkedTransaction = getLinkedTransaction(iouReportAction);
     }
 
     if (!isEmptyObject(linkedTransaction) && TransactionUtils.hasReceipt(linkedTransaction) && TransactionUtils.isReceiptBeingScanned(linkedTransaction)) {
@@ -2481,7 +2485,7 @@ function getReportPreviewMessage(
         return Localize.translateLocal('iou.routePending');
     }
 
-    const originalMessage = reportAction?.originalMessage as IOUMessage | undefined;
+    const originalMessage = iouReportAction?.originalMessage as IOUMessage | undefined;
 
     // Show Paid preview message if it's settled or if the amount is paid & stuck at receivers end for only chat reports.
     if (isSettled(report.reportID) || (report.isWaitingOnBankAccount && isPreviewMessageForParentChatReport)) {
@@ -2509,7 +2513,7 @@ function getReportPreviewMessage(
         return Localize.translateLocal('iou.waitingOnBankAccount', {submitterDisplayName});
     }
 
-    const lastActorID = reportAction?.actorAccountID;
+    const lastActorID = iouReportAction?.actorAccountID;
     let amount = originalMessage?.amount;
     let currency = originalMessage?.currency ? originalMessage?.currency : report.currency;
 
@@ -2518,16 +2522,29 @@ function getReportPreviewMessage(
         currency = TransactionUtils.getCurrency(linkedTransaction);
     }
 
+    if (isEmptyObject(linkedTransaction) && !isEmptyObject(iouReportAction)) {
+        linkedTransaction = getLinkedTransaction(iouReportAction);
+    }
+
+    let comment = !isEmptyObject(linkedTransaction) ? TransactionUtils.getDescription(linkedTransaction) : undefined;
+    if (!isEmptyObject(originalReportAction) && ReportActionsUtils.isReportPreviewAction(originalReportAction) && ReportActionsUtils.getNumberOfMoneyRequests(originalReportAction) !== 1) {
+        comment = undefined;
+    }
+
     // if we have the amount in the originalMessage and lastActorID, we can use that to display the preview message for the latest request
     if (amount !== undefined && lastActorID && !isPreviewMessageForParentChatReport) {
         const amountToDisplay = CurrencyUtils.convertToDisplayString(Math.abs(amount), currency);
 
         // We only want to show the actor name in the preview if it's not the current user who took the action
         const requestorName = lastActorID && lastActorID !== currentUserAccountID ? getDisplayNameForParticipant(lastActorID, !isPreviewMessageForParentChatReport) : '';
-        return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay})}`;
+        return `${requestorName ? `${requestorName}: ` : ''}${Localize.translateLocal('iou.requestedAmount', {formattedAmount: amountToDisplay, comment})}`;
     }
 
-    return Localize.translateLocal(containsNonReimbursable ? 'iou.payerSpentAmount' : 'iou.payerOwesAmount', {payer: payerName ?? '', amount: formattedAmount});
+    if (containsNonReimbursable) {
+        return Localize.translateLocal('iou.payerSpentAmount', {payer: payerName ?? '', amount: formattedAmount});
+    }
+
+    return Localize.translateLocal('iou.payerOwesAmount', {payer: payerName ?? '', amount: formattedAmount, comment});
 }
 
 /**
@@ -5314,6 +5331,14 @@ function shouldCreateNewMoneyRequestReport(existingIOUReport: OnyxEntry<Report>
     return !existingIOUReport || hasIOUWaitingOnCurrentUserBankAccount(chatReport) || !canAddOrDeleteTransactions(existingIOUReport);
 }
 
+/**
+ * Checks if report contains actions with errors
+ */
+function hasActionsWithErrors(reportID: string): boolean {
+    const reportActions = ReportActionsUtils.getAllReportActions(reportID ?? '');
+    return Object.values(reportActions ?? {}).some((action) => !isEmptyObject(action.errors));
+}
+
 export {
     getReportParticipantsTitle,
     isReportMessageAttachment,
@@ -5524,6 +5549,7 @@ export {
     isJoinRequestInAdminRoom,
     canAddOrDeleteTransactions,
     shouldCreateNewMoneyRequestReport,
+    hasActionsWithErrors,
 };
 
 export type {
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 7bf163416054..4b4d71cd5cdc 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -352,25 +352,26 @@ function getOptionData({
         if (!lastMessageText) {
             // Here we get the beginning of chat history message and append the display name for each user, adding pronouns if there are any.
             // We also add a fullstop after the final name, the word "and" before the final name and commas between all previous names.
-            lastMessageText =
-                Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistory') +
-                displayNamesWithTooltips
-                    .map(({displayName, pronouns}, index) => {
-                        const formattedText = !pronouns ? displayName : `${displayName} (${pronouns})`;
-
-                        if (index === displayNamesWithTooltips.length - 1) {
-                            return `${formattedText}.`;
-                        }
-                        if (index === displayNamesWithTooltips.length - 2) {
-                            return `${formattedText} ${Localize.translate(preferredLocale, 'common.and')}`;
-                        }
-                        if (index < displayNamesWithTooltips.length - 2) {
-                            return `${formattedText},`;
-                        }
-
-                        return '';
-                    })
-                    .join(' ');
+            lastMessageText = ReportUtils.isSelfDM(report)
+                ? Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistorySelfDM')
+                : Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistory') +
+                  displayNamesWithTooltips
+                      .map(({displayName, pronouns}, index) => {
+                          const formattedText = !pronouns ? displayName : `${displayName} (${pronouns})`;
+
+                          if (index === displayNamesWithTooltips.length - 1) {
+                              return `${formattedText}.`;
+                          }
+                          if (index === displayNamesWithTooltips.length - 2) {
+                              return `${formattedText} ${Localize.translate(preferredLocale, 'common.and')}`;
+                          }
+                          if (index < displayNamesWithTooltips.length - 2) {
+                              return `${formattedText},`;
+                          }
+
+                          return '';
+                      })
+                      .join(' ');
         }
 
         result.alternateText = ReportUtils.isGroupChat(report) && lastActorDisplayName ? `${lastActorDisplayName}: ${lastMessageText}` : lastMessageText || formattedLogin;
diff --git a/src/libs/ValidationUtils.ts b/src/libs/ValidationUtils.ts
index 5876ccf5d7d7..cacab8333868 100644
--- a/src/libs/ValidationUtils.ts
+++ b/src/libs/ValidationUtils.ts
@@ -471,8 +471,9 @@ function isValidPercentage(value: string): boolean {
 /**
  * Validates the given value if it is correct tax name.
  */
-function isExistingTaxName(value: string, taxRates: TaxRates): boolean {
-    return !!Object.values(taxRates).find((taxRate) => taxRate.name === value);
+function isExistingTaxName(taxName: string, taxRates: TaxRates): boolean {
+    const trimmedTaxName = taxName.trim();
+    return !!Object.values(taxRates).find((taxRate) => taxRate.name === trimmedTaxName);
 }
 
 export {
diff --git a/src/libs/WorkspacesSettingsUtils.ts b/src/libs/WorkspacesSettingsUtils.ts
index 78a8edb4c73f..f808f602a1c6 100644
--- a/src/libs/WorkspacesSettingsUtils.ts
+++ b/src/libs/WorkspacesSettingsUtils.ts
@@ -2,8 +2,10 @@ import Onyx from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, PolicyMembers, ReimbursementAccount, Report} from '@src/types/onyx';
+import type {Unit} from '@src/types/onyx/Policy';
 import * as OptionsListUtils from './OptionsListUtils';
 import {hasCustomUnitsError, hasPolicyError, hasPolicyMemberError, hasTaxRateError} from './PolicyUtils';
 import * as ReportActionsUtils from './ReportActionsUtils';
@@ -90,8 +92,9 @@ function hasGlobalWorkspaceSettingsRBR(policies: OnyxCollection<Policy>, policyM
 
 function hasWorkspaceSettingsRBR(policy: Policy) {
     const policyMemberError = allPolicyMembers ? hasPolicyMemberError(allPolicyMembers[`${ONYXKEYS.COLLECTION.POLICY_MEMBERS}${policy.id}`]) : false;
+    const taxRateError = hasTaxRateError(policy);
 
-    return Object.keys(reimbursementAccount?.errors ?? {}).length > 0 || hasPolicyError(policy) || hasCustomUnitsError(policy) || policyMemberError;
+    return Object.keys(reimbursementAccount?.errors ?? {}).length > 0 || hasPolicyError(policy) || hasCustomUnitsError(policy) || policyMemberError || taxRateError;
 }
 
 function getChatTabBrickRoad(policyID?: string): BrickRoad | undefined {
@@ -196,6 +199,19 @@ function getWorkspacesUnreadStatuses(): Record<string, boolean> {
     return workspacesUnreadStatuses;
 }
 
+/**
+ * @param unit Unit
+ * @returns translation key for the unit
+ */
+function getUnitTranslationKey(unit: Unit): TranslationPaths {
+    const unitTranslationKeysStrategy: Record<Unit, TranslationPaths> = {
+        [CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: 'common.kilometers',
+        [CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: 'common.miles',
+    };
+
+    return unitTranslationKeysStrategy[unit];
+}
+
 export {
     getBrickRoadForPolicy,
     getWorkspacesBrickRoads,
@@ -204,5 +220,6 @@ export {
     checkIfWorkspaceSettingsTabHasRBR,
     hasWorkspaceSettingsRBR,
     getChatTabBrickRoad,
+    getUnitTranslationKey,
 };
 export type {BrickRoad};
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 868bfc28d781..562ed501eebc 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -231,6 +231,14 @@ Onyx.connect({
     },
 });
 
+let quickAction: OnyxEntry<OnyxTypes.QuickAction> = {};
+Onyx.connect({
+    key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
+    callback: (value) => {
+        quickAction = value;
+    },
+});
+
 /**
  * Initialize money request info
  * @param reportID to attach the transaction to
@@ -457,11 +465,16 @@ function buildOnyxDataForMoneyRequest(
     policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     optimisticNextStep?: OnyxTypes.ReportNextStep | null,
+    isOneOnOneSplit = false,
 ): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
     const isScanRequest = TransactionUtils.isScanRequest(transaction);
     const outstandingChildRequest = getOutstandingChildRequest(policy ?? {}, iouReport);
     const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null]));
     const optimisticData: OnyxUpdate[] = [];
+    let newQuickAction: ValueOf<typeof CONST.QUICK_ACTIONS> = isScanRequest ? CONST.QUICK_ACTIONS.REQUEST_SCAN : CONST.QUICK_ACTIONS.REQUEST_MANUAL;
+    if (TransactionUtils.isDistanceRequest(transaction)) {
+        newQuickAction = CONST.QUICK_ACTIONS.REQUEST_DISTANCE;
+    }
 
     if (chatReport) {
         optimisticData.push({
@@ -551,6 +564,18 @@ function buildOnyxDataForMoneyRequest(
         },
     );
 
+    if (!isOneOnOneSplit) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
+            value: {
+                action: newQuickAction,
+                reportID: chatReport?.reportID,
+                isFirstQuickAction: isEmptyObject(quickAction),
+            },
+        });
+    }
+
     if (optimisticPolicyRecentlyUsedCategories.length) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.SET,
@@ -715,31 +740,6 @@ function buildOnyxDataForMoneyRequest(
                 pendingFields: clearedPendingFields,
             },
         },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
-            value: {
-                ...(isNewChatReport
-                    ? {
-                          [chatCreatedAction.reportActionID]: {
-                              // Disabling this line since transaction.filename can be an empty string
-                              // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                              errors: getReceiptError(transaction?.receipt, transaction.filename || transaction.receipt?.filename, isScanRequest),
-                          },
-                          [reportPreviewAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError(null),
-                          },
-                      }
-                    : {
-                          [reportPreviewAction.reportActionID]: {
-                              created: reportPreviewAction.created,
-                              // Disabling this line since transaction.filename can be an empty string
-                              // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                              errors: getReceiptError(transaction?.receipt, transaction.filename || transaction.receipt?.filename, isScanRequest),
-                          },
-                      }),
-            },
-        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
@@ -1649,6 +1649,7 @@ function createSplitsAndOnyxData(
     tag: string,
     existingSplitChatReportID = '',
     billable = false,
+    iouRequestType: IOURequestType = CONST.IOU.REQUEST_TYPE.MANUAL,
 ): SplitsAndOnyxData {
     const currentUserEmailForIOUSplit = PhoneNumber.addSMSDomainIfPhoneNumber(currentUserLogin);
     const participantAccountIDs = participants.map((participant) => Number(participant.accountID));
@@ -1712,6 +1713,15 @@ function createSplitsAndOnyxData(
             key: `${ONYXKEYS.COLLECTION.REPORT}${splitChatReport.reportID}`,
             value: splitChatReport,
         },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
+            value: {
+                action: iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE ? CONST.QUICK_ACTIONS.SPLIT_DISTANCE : CONST.QUICK_ACTIONS.SPLIT_MANUAL,
+                reportID: splitChatReport.reportID,
+                isFirstQuickAction: isEmptyObject(quickAction),
+            },
+        },
         existingSplitChatReport
             ? {
                   onyxMethod: Onyx.METHOD.MERGE,
@@ -1943,6 +1953,11 @@ function createSplitsAndOnyxData(
             optimisticTransactionThread,
             optimisticCreatedActionForTransactionThread,
             shouldCreateNewOneOnOneIOUReport,
+            null,
+            null,
+            null,
+            null,
+            true,
         );
 
         const individualSplit = {
@@ -2001,6 +2016,7 @@ function splitBill(
     tag: string,
     existingSplitChatReportID = '',
     billable = false,
+    iouRequestType: IOURequestType = CONST.IOU.REQUEST_TYPE.MANUAL,
 ) {
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
     const {splitData, splits, onyxData} = createSplitsAndOnyxData(
@@ -2016,6 +2032,7 @@ function splitBill(
         tag,
         existingSplitChatReportID,
         billable,
+        iouRequestType,
     );
 
     const parameters: SplitBillParams = {
@@ -2057,9 +2074,24 @@ function splitBillAndOpenReport(
     category: string,
     tag: string,
     billable: boolean,
+    iouRequestType: IOURequestType = CONST.IOU.REQUEST_TYPE.MANUAL,
 ) {
     const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
-    const {splitData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, merchant, currentCreated, category, tag);
+    const {splitData, splits, onyxData} = createSplitsAndOnyxData(
+        participants,
+        currentUserLogin,
+        currentUserAccountID,
+        amount,
+        comment,
+        currency,
+        merchant,
+        currentCreated,
+        category,
+        tag,
+        '',
+        billable,
+        iouRequestType,
+    );
 
     const parameters: SplitBillParams = {
         reportID: splitData.chatReportID,
@@ -2167,6 +2199,15 @@ function startSplitBill(
             key: `${ONYXKEYS.COLLECTION.REPORT}${splitChatReport.reportID}`,
             value: splitChatReport,
         },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
+            value: {
+                action: CONST.QUICK_ACTIONS.SPLIT_SCAN,
+                reportID: splitChatReport.reportID,
+                isFirstQuickAction: isEmptyObject(quickAction),
+            },
+        },
         existingSplitChatReport
             ? {
                   onyxMethod: Onyx.METHOD.MERGE,
@@ -2542,6 +2583,11 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             optimisticTransactionThread,
             optimisticCreatedActionForTransactionThread,
             shouldCreateNewOneOnOneIOUReport,
+            null,
+            null,
+            null,
+            null,
+            true,
         );
 
         splits.push({
@@ -3274,6 +3320,15 @@ function getSendMoneyParams(
                   lastVisibleActionCreated: reportPreviewAction.created,
               },
           };
+    const optimisticQuickActionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.SET,
+        key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
+        value: {
+            action: CONST.QUICK_ACTIONS.SEND_MONEY,
+            reportID: chatReport.reportID,
+            isFirstQuickAction: isEmptyObject(quickAction),
+        },
+    };
     const optimisticIOUReportData: OnyxUpdate = {
         onyxMethod: Onyx.METHOD.SET,
         key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticIOUReport.reportID}`,
@@ -3440,6 +3495,7 @@ function getSendMoneyParams(
 
     const optimisticData: OnyxUpdate[] = [
         optimisticChatReportData,
+        optimisticQuickActionData,
         optimisticIOUReportData,
         optimisticChatReportActionsData,
         optimisticIOUReportActionsData,
diff --git a/src/libs/actions/Plaid.ts b/src/libs/actions/Plaid.ts
index 78bc91618215..7f63b3920e01 100644
--- a/src/libs/actions/Plaid.ts
+++ b/src/libs/actions/Plaid.ts
@@ -11,10 +11,11 @@ import ONYXKEYS from '@src/ONYXKEYS';
  */
 function openPlaidBankLogin(allowDebit: boolean, bankAccountID: number) {
     // redirect_uri needs to be in kebab case convention because that's how it's passed to the backend
-    const {redirectURI} = getPlaidLinkTokenParameters();
+    const {redirectURI, androidPackage} = getPlaidLinkTokenParameters();
 
     const params: OpenPlaidBankLoginParams = {
         redirectURI,
+        androidPackage,
         allowDebit,
         bankAccountID,
     };
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
index 213a03bca662..efd627e7ef93 100644
--- a/src/libs/actions/Policy.ts
+++ b/src/libs/actions/Policy.ts
@@ -34,6 +34,8 @@ import type {
     OpenWorkspaceMembersPageParams,
     OpenWorkspaceParams,
     OpenWorkspaceReimburseViewParams,
+    SetPolicyDistanceRatesDefaultCategoryParams,
+    SetPolicyDistanceRatesUnitParams,
     SetWorkspaceApprovalModeParams,
     SetWorkspaceAutoReportingFrequencyParams,
     SetWorkspaceAutoReportingMonthlyOffsetParams,
@@ -80,7 +82,7 @@ import type {
     ReportAction,
     Transaction,
 } from '@src/types/onyx';
-import type {Errors, OnyxValueWithOfflineFeedback, PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {ErrorFields, Errors, OnyxValueWithOfflineFeedback, PendingAction} from '@src/types/onyx/OnyxCommon';
 import type {OriginalMessageJoinPolicyChangeLog} from '@src/types/onyx/OriginalMessage';
 import type {Attributes, CustomUnit, Rate, Unit} from '@src/types/onyx/Policy';
 import type {OnyxData} from '@src/types/onyx/Request';
@@ -250,6 +252,14 @@ function updateLastAccessedWorkspace(policyID: OnyxEntry<string>) {
     Onyx.set(ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID, policyID);
 }
 
+/**
+ * Checks if the currency is supported for direct reimbursement
+ * USD currency is the only one supported in NewDot for now
+ */
+function isCurrencySupportedForDirectReimbursement(currency: string) {
+    return currency === CONST.CURRENCY.USD;
+}
+
 /**
  * Check if the user has any active free policies (aka workspaces)
  */
@@ -322,6 +332,7 @@ function deleteWorkspace(policyID: string, policyName: string) {
                 statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                 hasDraft: false,
                 oldPolicyName: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.name ?? '',
+                policyName: '',
             },
         });
 
@@ -368,6 +379,7 @@ function deleteWorkspace(policyID: string, policyName: string) {
                 statusNum,
                 hasDraft,
                 oldPolicyName,
+                policyName: report?.policyName,
             },
         });
     });
@@ -451,7 +463,7 @@ function setWorkspaceAutoReporting(policyID: string, enabled: boolean, frequency
                     enabled,
                 },
                 autoReportingFrequency: frequency,
-                pendingFields: {isAutoApprovalEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                pendingFields: {autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
             },
         },
     ];
@@ -466,7 +478,8 @@ function setWorkspaceAutoReporting(policyID: string, enabled: boolean, frequency
                     enabled: policy.harvesting?.enabled ?? null,
                 },
                 autoReportingFrequency: policy.autoReportingFrequency ?? null,
-                pendingFields: {isAutoApprovalEnabled: null, harvesting: null},
+                pendingFields: {autoReporting: null},
+                errorFields: {autoReporting: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.autoReportingErrorMessage')},
             },
         },
     ];
@@ -476,7 +489,7 @@ function setWorkspaceAutoReporting(policyID: string, enabled: boolean, frequency
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                pendingFields: {isAutoApprovalEnabled: null, harvesting: null},
+                pendingFields: {autoReporting: null},
             },
         },
     ];
@@ -507,6 +520,7 @@ function setWorkspaceAutoReportingFrequency(policyID: string, frequency: ValueOf
             value: {
                 autoReportingFrequency: policy.autoReportingFrequency ?? null,
                 pendingFields: {autoReportingFrequency: null},
+                errorFields: {autoReportingFrequency: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.autoReportingFrequencyErrorMessage')},
             },
         },
     ];
@@ -547,6 +561,7 @@ function setWorkspaceAutoReportingMonthlyOffset(policyID: string, autoReportingO
             value: {
                 autoReportingOffset: policy.autoReportingOffset ?? null,
                 pendingFields: {autoReportingOffset: null},
+                errorFields: {autoReportingOffset: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.monthlyOffsetErrorMessage')},
             },
         },
     ];
@@ -566,13 +581,11 @@ function setWorkspaceAutoReportingMonthlyOffset(policyID: string, autoReportingO
 }
 
 function setWorkspaceApprovalMode(policyID: string, approver: string, approvalMode: ValueOf<typeof CONST.POLICY.APPROVAL_MODE>) {
-    const isAutoApprovalEnabled = approvalMode === CONST.POLICY.APPROVAL_MODE.BASIC;
     const policy = ReportUtils.getPolicy(policyID);
 
     const value = {
         approver,
         approvalMode,
-        isAutoApprovalEnabled,
     };
 
     const optimisticData: OnyxUpdate[] = [
@@ -593,8 +606,8 @@ function setWorkspaceApprovalMode(policyID: string, approver: string, approvalMo
             value: {
                 approver: policy.approver ?? null,
                 approvalMode: policy.approvalMode ?? null,
-                isAutoApprovalEnabled: policy.isAutoApprovalEnabled ?? null,
                 pendingFields: {approvalMode: null},
+                errorFields: {approvalMode: ErrorUtils.getMicroSecondOnyxError('workflowsApprovalPage.genericErrorMessage')},
             },
         },
     ];
@@ -609,7 +622,14 @@ function setWorkspaceApprovalMode(policyID: string, approver: string, approvalMo
         },
     ];
 
-    const params: SetWorkspaceApprovalModeParams = {policyID, value: JSON.stringify(value)};
+    const params: SetWorkspaceApprovalModeParams = {
+        policyID,
+        value: JSON.stringify({
+            ...value,
+            // This property should now be set to false for all Collect policies
+            isAutoApprovalEnabled: false,
+        }),
+    };
     API.write(WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE, params, {optimisticData, failureData, successData});
 }
 
@@ -658,8 +678,8 @@ function setWorkspacePayer(policyID: string, reimburserEmail: string, reimburser
     API.write(WRITE_COMMANDS.SET_WORKSPACE_PAYER, params, {optimisticData, failureData, successData});
 }
 
-function clearWorkspacePayerError(policyID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {reimburserEmail: null}});
+function clearPolicyErrorField(policyID: string, fieldName: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {[fieldName]: null}});
 }
 
 function setWorkspaceReimbursement(policyID: string, reimbursementChoice: ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES>, reimburserAccountID: number, reimburserEmail: string) {
@@ -1360,6 +1380,7 @@ function updateGeneralSettings(policyID: string, name: string, currency: string)
             },
         },
     ];
+
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -2165,7 +2186,7 @@ function setWorkspaceInviteMembersDraft(policyID: string, invitedEmailsToAccount
     Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, invitedEmailsToAccountIDs);
 }
 
-function setWorkspaceInviteMessageDraft(policyID: string, message: string) {
+function setWorkspaceInviteMessageDraft(policyID: string, message: string | null) {
     Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT}${policyID}`, message);
 }
 
@@ -3082,6 +3103,72 @@ function clearPolicyTagErrors(policyID: string, tagName: string) {
     });
 }
 
+function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName: string}) {
+    const tagListName = Object.keys(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})[0];
+    const oldTag = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`]?.[policyTag.oldName] ?? {};
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagListName]: {
+                        tags: {
+                            [policyTag.oldName]: null,
+                            [policyTag.newName]: {
+                                ...oldTag,
+                                name: policyTag.newName,
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagListName]: {
+                        tags: {
+                            [policyTag.newName]: {
+                                errors: null,
+                                pendingAction: null,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagListName]: {
+                        tags: {
+                            [policyTag.newName]: null,
+                            [policyTag.oldName]: {
+                                ...oldTag,
+                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        oldName: policyTag.oldName,
+        newName: policyTag.newName,
+    };
+
+    API.write(WRITE_COMMANDS.RENAME_POLICY_TAG, parameters, onyxData);
+}
+
 function setWorkspaceRequiresCategory(policyID: string, requiresCategory: boolean) {
     const onyxData: OnyxData = {
         optimisticData: [
@@ -3330,7 +3417,15 @@ function navigateWhenEnableFeature(policyID: string, featureRoute: Route) {
         return;
     }
 
-    Navigation.navigate(featureRoute);
+    /**
+     * The app needs to set a navigation action to the microtask queue, it guarantees to execute Onyx.update first, then the navigation action.
+     * More details - https://github.com/Expensify/App/issues/37785#issuecomment-1989056726.
+     */
+    new Promise<void>((resolve) => {
+        resolve();
+    }).then(() => {
+        Navigation.navigate(featureRoute);
+    });
 }
 
 function enablePolicyCategories(policyID: string, enabled: boolean) {
@@ -3892,6 +3987,124 @@ function clearCreateDistanceRateItemAndError(policyID: string, customUnitID: str
     });
 }
 
+function clearPolicyDistanceRatesErrorFields(policyID: string, customUnitID: string, updatedErrorFields: ErrorFields) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        customUnits: {
+            [customUnitID]: {
+                errorFields: updatedErrorFields,
+            },
+        },
+    });
+}
+
+function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        ...newCustomUnit,
+                        pendingFields: {attributes: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        pendingFields: null,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [currentCustomUnit.customUnitID]: {
+                        ...currentCustomUnit,
+                        errorFields: {attributes: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
+                        pendingFields: {attributes: null},
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: SetPolicyDistanceRatesUnitParams = {
+        policyID,
+        customUnit: JSON.stringify(newCustomUnit),
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_UNIT, params, {optimisticData, successData, failureData});
+}
+
+function setPolicyDistanceRatesDefaultCategory(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        ...newCustomUnit,
+                        pendingFields: {defaultCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        pendingFields: {defaultCategory: null},
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [currentCustomUnit.customUnitID]: {
+                        ...currentCustomUnit,
+                        errorFields: {defaultCategory: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
+                        pendingFields: {defaultCategory: null},
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: SetPolicyDistanceRatesDefaultCategoryParams = {
+        policyID,
+        customUnit: JSON.stringify(newCustomUnit),
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY, params, {optimisticData, successData, failureData});
+}
+
 function setPolicyCustomTaxName(policyID: string, customTaxName: string) {
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const originalCustomTaxName = policy?.taxRates?.name;
@@ -4106,7 +4319,6 @@ export {
     renamePolicyCategory,
     clearCategoryErrors,
     setWorkspacePayer,
-    clearWorkspacePayerError,
     setWorkspaceReimbursement,
     openPolicyWorkflowsPage,
     setPolicyRequiresTag,
@@ -4123,7 +4335,10 @@ export {
     generateCustomUnitID,
     createPolicyDistanceRate,
     clearCreateDistanceRateItemAndError,
+    setPolicyDistanceRatesUnit,
+    setPolicyDistanceRatesDefaultCategory,
     createPolicyTag,
+    renamePolicyTag,
     clearPolicyTagErrors,
     clearWorkspaceReimbursementErrors,
     deleteWorkspaceCategories,
@@ -4132,4 +4347,7 @@ export {
     setWorkspaceCurrencyDefault,
     setForeignCurrencyDefault,
     setPolicyCustomTaxName,
+    clearPolicyErrorField,
+    isCurrencySupportedForDirectReimbursement,
+    clearPolicyDistanceRatesErrorFields,
 };
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 491a75f9c643..681ed0ec383f 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -59,6 +59,14 @@ Onyx.connect({
     callback: (value) => (allPersonalDetails = value),
 });
 
+let quickAction: OnyxEntry<OnyxTypes.QuickAction> = {};
+Onyx.connect({
+    key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
+    callback: (value) => {
+        quickAction = value;
+    },
+});
+
 const allReportActions: OnyxCollection<ReportActions> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
@@ -227,6 +235,18 @@ function createTaskAndNavigate(
         },
     );
 
+    // FOR QUICK ACTION NVP
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.SET,
+        key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
+        value: {
+            action: CONST.QUICK_ACTIONS.ASSIGN_TASK,
+            reportID: parentReportID,
+            isFirstQuickAction: isEmptyObject(quickAction),
+            targetAccountID: assigneeAccountID,
+        },
+    });
+
     // If needed, update optimistic data for parent report action of the parent report.
     const optimisticParentReportData = ReportUtils.getOptimisticDataForParentReportAction(parentReportID, currentTime, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
     if (!isEmptyObject(optimisticParentReportData)) {
diff --git a/src/libs/actions/TaxRate.ts b/src/libs/actions/TaxRate.ts
index 1bad1de0a9f5..3f2420c76f87 100644
--- a/src/libs/actions/TaxRate.ts
+++ b/src/libs/actions/TaxRate.ts
@@ -1,14 +1,25 @@
+import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import type {FormOnyxValues} from '@components/Form/types';
 import * as API from '@libs/API';
-import type {CreatePolicyTaxParams} from '@libs/API/parameters';
+import type {CreatePolicyTaxParams, DeletePolicyTaxesParams, RenamePolicyTaxParams, SetPolicyTaxesEnabledParams, UpdatePolicyTaxValueParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
+import * as ValidationUtils from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import * as ErrorUtils from '@src/libs/ErrorUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {TaxRate, TaxRates} from '@src/types/onyx';
-import type {PendingAction} from '@src/types/onyx/OnyxCommon';
+import INPUT_IDS from '@src/types/form/WorkspaceNewTaxForm';
+import type {Policy, TaxRate, TaxRates} from '@src/types/onyx';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type {OnyxData} from '@src/types/onyx/Request';
 
+let allPolicies: OnyxCollection<Policy>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    waitForCollectionCallback: true,
+    callback: (value) => (allPolicies = value),
+});
+
 /**
  * Get tax value with percentage
  */
@@ -20,6 +31,34 @@ function covertTaxNameToID(name: string) {
     return `id_${name.toUpperCase().replaceAll(' ', '_')}`;
 }
 
+/**
+ *  Function to validate tax name
+ */
+const validateTaxName = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM>) => {
+    const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.NAME]);
+
+    const name = values[INPUT_IDS.NAME];
+    if (policy?.taxRates?.taxes && ValidationUtils.isExistingTaxName(name, policy.taxRates.taxes)) {
+        errors[INPUT_IDS.NAME] = 'workspace.taxes.errors.taxRateAlreadyExists';
+    }
+
+    return errors;
+};
+
+/**
+ *  Function to validate tax value
+ */
+const validateTaxValue = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM>) => {
+    const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.VALUE]);
+
+    const value = values[INPUT_IDS.VALUE];
+    if (!ValidationUtils.isValidPercentage(value)) {
+        errors[INPUT_IDS.VALUE] = 'workspace.taxes.errors.valuePercentageRange';
+    }
+
+    return errors;
+};
+
 /**
  * Get new tax ID
  */
@@ -39,7 +78,8 @@ function getNextTaxCode(name: string, taxRates?: TaxRates): string {
 
 function createPolicyTax(policyID: string, taxRate: TaxRate) {
     if (!taxRate.code) {
-        throw new Error('Tax code is required when creating a new tax rate.');
+        console.debug('Policy or tax rates not found');
+        return;
     }
 
     const onyxData: OnyxData = {
@@ -83,7 +123,7 @@ function createPolicyTax(policyID: string, taxRate: TaxRate) {
                     taxRates: {
                         taxes: {
                             [taxRate.code]: {
-                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.errors.genericFailureMessage'),
+                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.errors.createFailureMessage'),
                             },
                         },
                     },
@@ -105,7 +145,24 @@ function createPolicyTax(policyID: string, taxRate: TaxRate) {
     API.write(WRITE_COMMANDS.CREATE_POLICY_TAX, parameters, onyxData);
 }
 
-function clearTaxRateError(policyID: string, taxID: string, pendingAction?: PendingAction) {
+function clearTaxRateFieldError(policyID: string, taxID: string, field: keyof TaxRate) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        taxRates: {
+            taxes: {
+                [taxID]: {
+                    pendingFields: {
+                        [field]: null,
+                    },
+                    errorFields: {
+                        [field]: null,
+                    },
+                },
+            },
+        },
+    });
+}
+
+function clearTaxRateError(policyID: string, taxID: string, pendingAction?: OnyxCommon.PendingAction) {
     if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
         Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
             taxRates: {
@@ -119,10 +176,288 @@ function clearTaxRateError(policyID: string, taxID: string, pendingAction?: Pend
     Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
         taxRates: {
             taxes: {
-                [taxID]: {pendingAction: null, errors: null},
+                [taxID]: {pendingAction: null, errors: null, errorFields: null},
             },
         },
     });
 }
 
-export {createPolicyTax, clearTaxRateError, getNextTaxCode, getTaxValueWithPercentage};
+type TaxRateEnabledMap = Record<string, Pick<TaxRate, 'isDisabled' | 'errors' | 'pendingAction' | 'pendingFields' | 'errorFields'>>;
+
+function setPolicyTaxesEnabled(policyID: string, taxesIDsToUpdate: string[], isEnabled: boolean) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const originalTaxes = {...policy?.taxRates?.taxes};
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: taxesIDsToUpdate.reduce<TaxRateEnabledMap>((acc, taxID) => {
+                            acc[taxID] = {
+                                isDisabled: !isEnabled,
+                                pendingFields: {isDisabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                errorFields: {isDisabled: null},
+                            };
+                            return acc;
+                        }, {}),
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: taxesIDsToUpdate.reduce<TaxRateEnabledMap>((acc, taxID) => {
+                            acc[taxID] = {pendingFields: {isDisabled: null}, errorFields: {isDisabled: null}};
+                            return acc;
+                        }, {}),
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: taxesIDsToUpdate.reduce<TaxRateEnabledMap>((acc, taxID) => {
+                            acc[taxID] = {
+                                isDisabled: !!originalTaxes[taxID].isDisabled,
+                                pendingFields: {isDisabled: null},
+                                errorFields: {isDisabled: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.errors.updateFailureMessage')},
+                            };
+                            return acc;
+                        }, {}),
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        taxFieldsArray: JSON.stringify(taxesIDsToUpdate.map((taxID) => ({taxCode: taxID, enabled: isEnabled}))),
+    } satisfies SetPolicyTaxesEnabledParams;
+
+    API.write(WRITE_COMMANDS.SET_POLICY_TAXES_ENABLED, parameters, onyxData);
+}
+
+type TaxRateDeleteMap = Record<
+    string,
+    | (Pick<TaxRate, 'pendingAction'> & {
+          errors: OnyxCommon.Errors | null;
+      })
+    | null
+>;
+
+function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const policyTaxRates = policy?.taxRates?.taxes;
+
+    if (!policyTaxRates) {
+        console.debug('Policy or tax rates not found');
+        return;
+    }
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
+                            acc[taxID] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, errors: null};
+                            return acc;
+                        }, {}),
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
+                            acc[taxID] = null;
+                            return acc;
+                        }, {}),
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
+                            acc[taxID] = {
+                                pendingAction: null,
+                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.errors.deleteFailureMessage'),
+                            };
+                            return acc;
+                        }, {}),
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        taxNames: JSON.stringify(taxesToDelete.map((taxID) => policyTaxRates[taxID].name)),
+    } satisfies DeletePolicyTaxesParams;
+
+    API.write(WRITE_COMMANDS.DELETE_POLICY_TAXES, parameters, onyxData);
+}
+
+function updatePolicyTaxValue(policyID: string, taxID: string, taxValue: number) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const originalTaxRate = {...policy?.taxRates?.taxes[taxID]};
+    const stringTaxValue = `${taxValue}%`;
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            [taxID]: {
+                                value: stringTaxValue,
+                                pendingFields: {value: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                errorFields: {value: null},
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            [taxID]: {pendingFields: {value: null}, errorFields: {value: null}},
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            [taxID]: {
+                                value: originalTaxRate.value,
+                                pendingFields: {value: null},
+                                errorFields: {value: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.errors.updateFailureMessage')},
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        taxCode: taxID,
+        taxAmount: Number(taxValue),
+    } satisfies UpdatePolicyTaxValueParams;
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_TAX_VALUE, parameters, onyxData);
+}
+
+function renamePolicyTax(policyID: string, taxID: string, newName: string) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const originalTaxRate = {...policy?.taxRates?.taxes[taxID]};
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            [taxID]: {
+                                name: newName,
+                                pendingFields: {name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                errorFields: {name: null},
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            [taxID]: {pendingFields: {name: null}, errorFields: {name: null}},
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            [taxID]: {
+                                name: originalTaxRate.name,
+                                pendingFields: {name: null},
+                                errorFields: {name: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.errors.updateFailureMessage')},
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        taxCode: taxID,
+        newName,
+    } satisfies RenamePolicyTaxParams;
+
+    API.write(WRITE_COMMANDS.RENAME_POLICY_TAX, parameters, onyxData);
+}
+
+export {
+    createPolicyTax,
+    getNextTaxCode,
+    clearTaxRateError,
+    clearTaxRateFieldError,
+    getTaxValueWithPercentage,
+    setPolicyTaxesEnabled,
+    validateTaxName,
+    validateTaxValue,
+    deletePolicyTaxes,
+    updatePolicyTaxValue,
+    renamePolicyTax,
+};
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index 6655d78cb0a8..2d23edfba93f 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -30,6 +30,7 @@ import PusherUtils from '@libs/PusherUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
 import playSoundExcludingMobile from '@libs/Sound/playSoundExcludingMobile';
+import Visibility from '@libs/Visibility';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -489,80 +490,84 @@ const isChannelMuted = (reportId: string) =>
 function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
     const reportActionsOnly = pushJSON.filter((update) => update.key?.includes('reportActions_'));
     // "reportActions_5134363522480668" -> "5134363522480668"
-    const reportIDs = reportActionsOnly.map((value) => value.key.split('_')[1]);
+    const reportID = reportActionsOnly
+        .map((value) => value.key.split('_')[1])
+        .find((reportKey) => reportKey === Navigation.getTopmostReportId() && Visibility.isVisible() && Visibility.hasFocus());
 
-    Promise.all(reportIDs.map((reportID) => isChannelMuted(reportID)))
-        .then((muted) => muted.every((isMuted) => isMuted))
-        .then((isSoundMuted) => {
-            if (isSoundMuted) {
-                return;
+    if (!reportID) {
+        return;
+    }
+
+    isChannelMuted(reportID).then((isSoundMuted) => {
+        if (isSoundMuted) {
+            return;
+        }
+
+        try {
+            const flatten = reportActionsOnly.flatMap((update) => {
+                const value = update.value as OnyxCollection<ReportAction>;
+
+                if (!value) {
+                    return [];
+                }
+
+                return Object.values(value);
+            }) as ReportAction[];
+
+            for (const data of flatten) {
+                // Someone completes a task
+                if (data.actionName === 'TASKCOMPLETED') {
+                    return playSound(SOUNDS.SUCCESS);
+                }
             }
 
-            try {
-                const flatten = reportActionsOnly.flatMap((update) => {
-                    const value = update.value as OnyxCollection<ReportAction>;
+            const types = flatten.map((data) => data?.originalMessage).filter(Boolean) as OriginalMessage[];
 
-                    if (!value) {
-                        return [];
-                    }
+            for (const message of types) {
+                // someone sent money
+                if ('IOUDetails' in message) {
+                    return playSound(SOUNDS.SUCCESS);
+                }
 
-                    return Object.values(value);
-                }) as ReportAction[];
+                // mention user
+                if ('html' in message && typeof message.html === 'string' && message.html.includes(`<mention-user>@${currentEmail}</mention-user>`)) {
+                    return playSoundExcludingMobile(SOUNDS.ATTENTION);
+                }
+
+                // mention @here
+                if ('html' in message && typeof message.html === 'string' && message.html.includes('<mention-here>')) {
+                    return playSoundExcludingMobile(SOUNDS.ATTENTION);
+                }
 
-                for (const data of flatten) {
-                    // Someone completes a task
-                    if (data.actionName === 'TASKCOMPLETED') {
-                        return playSound(SOUNDS.SUCCESS);
-                    }
+                // assign a task
+                if ('taskReportID' in message) {
+                    return playSound(SOUNDS.ATTENTION);
                 }
 
-                const types = flatten.map((data) => data?.originalMessage).filter(Boolean) as OriginalMessage[];
-
-                for (const message of types) {
-                    // someone sent money
-                    if ('IOUDetails' in message) {
-                        return playSound(SOUNDS.SUCCESS);
-                    }
-
-                    // mention user
-                    if ('html' in message && typeof message.html === 'string' && message.html.includes(`<mention-user>@${currentEmail}</mention-user>`)) {
-                        return playSoundExcludingMobile(SOUNDS.ATTENTION);
-                    }
-
-                    // mention @here
-                    if ('html' in message && typeof message.html === 'string' && message.html.includes('<mention-here>')) {
-                        return playSoundExcludingMobile(SOUNDS.ATTENTION);
-                    }
-
-                    // assign a task
-                    if ('taskReportID' in message) {
-                        return playSound(SOUNDS.ATTENTION);
-                    }
-
-                    // request money
-                    if ('IOUTransactionID' in message) {
-                        return playSound(SOUNDS.ATTENTION);
-                    }
-
-                    // Someone completes a money request
-                    if ('IOUReportID' in message) {
-                        return playSound(SOUNDS.SUCCESS);
-                    }
-
-                    // plain message
-                    if ('html' in message) {
-                        return playSoundExcludingMobile(SOUNDS.RECEIVE);
-                    }
+                // request money
+                if ('IOUTransactionID' in message) {
+                    return playSound(SOUNDS.ATTENTION);
                 }
-            } catch (e) {
-                let errorMessage = String(e);
-                if (e instanceof Error) {
-                    errorMessage = e.message;
+
+                // Someone completes a money request
+                if ('IOUReportID' in message) {
+                    return playSound(SOUNDS.SUCCESS);
                 }
 
-                Log.client(`Unexpected error occurred while parsing the data to play a sound: ${errorMessage}`);
+                // plain message
+                if ('html' in message) {
+                    return playSoundExcludingMobile(SOUNDS.RECEIVE);
+                }
             }
-        });
+        } catch (e) {
+            let errorMessage = String(e);
+            if (e instanceof Error) {
+                errorMessage = e.message;
+            }
+
+            Log.client(`Unexpected error occurred while parsing the data to play a sound: ${errorMessage}`);
+        }
+    });
 }
 
 /**
@@ -960,11 +965,9 @@ function dismissReferralBanner(type: ValueOf<typeof CONST.REFERRAL_PROGRAM.CONTE
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
+            key: ONYXKEYS.NVP_DISMISSED_REFERRAL_BANNERS,
             value: {
-                dismissedReferralBanners: {
-                    [type]: true,
-                },
+                [type]: true,
             },
         },
     ];
diff --git a/src/libs/actions/Wallet.ts b/src/libs/actions/Wallet.ts
index 354e5b076f01..097d9ee0419a 100644
--- a/src/libs/actions/Wallet.ts
+++ b/src/libs/actions/Wallet.ts
@@ -52,7 +52,7 @@ function openOnfidoFlow() {
     API.read(READ_COMMANDS.OPEN_ONFIDO_FLOW, {}, {optimisticData, finallyData});
 }
 
-function setAdditionalDetailsQuestions(questions: WalletAdditionalQuestionDetails[], idNumber: string) {
+function setAdditionalDetailsQuestions(questions: WalletAdditionalQuestionDetails[] | null, idNumber?: string) {
     Onyx.merge(ONYXKEYS.WALLET_ADDITIONAL_DETAILS, {questions, idNumber});
 }
 
@@ -79,7 +79,7 @@ function updatePersonalDetails(personalDetails: UpdatePersonalDetailsForWalletPa
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
+            key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
             value: {
                 isLoading: true,
                 errors: null,
@@ -91,7 +91,7 @@ function updatePersonalDetails(personalDetails: UpdatePersonalDetailsForWalletPa
     const finallyData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
+            key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
             value: {
                 isLoading: false,
             },
@@ -232,7 +232,7 @@ function answerQuestionsForWallet(answers: WalletQuestionAnswer[], idNumber: str
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
+            key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
             value: {
                 isLoading: true,
             },
@@ -242,7 +242,7 @@ function answerQuestionsForWallet(answers: WalletQuestionAnswer[], idNumber: str
     const finallyData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
+            key: ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS,
             value: {
                 isLoading: false,
             },
diff --git a/src/libs/desktopLoginRedirect/index.desktop.ts b/src/libs/desktopLoginRedirect/index.desktop.ts
new file mode 100644
index 000000000000..ccc442346dc1
--- /dev/null
+++ b/src/libs/desktopLoginRedirect/index.desktop.ts
@@ -0,0 +1,16 @@
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import type {AutoAuthState} from '@src/types/onyx/Session';
+
+function desktopLoginRedirect(autoAuthState: AutoAuthState, isSignedIn: boolean) {
+    // NOT_STARTED - covers edge case of autoAuthState not being initialized yet (after logout)
+    // JUST_SIGNED_IN - confirms passing the magic code step -> we're either logged-in or shown 2FA screen
+    // !isSignedIn - confirms we're not signed-in yet as there's possible one last step (2FA validation)
+    const shouldPopToTop = (autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED || autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN) && !isSignedIn;
+
+    if (shouldPopToTop) {
+        Navigation.isNavigationReady().then(() => Navigation.resetToHome());
+    }
+}
+
+export default desktopLoginRedirect;
diff --git a/src/libs/desktopLoginRedirect/index.ts b/src/libs/desktopLoginRedirect/index.ts
new file mode 100644
index 000000000000..14f5750c3de9
--- /dev/null
+++ b/src/libs/desktopLoginRedirect/index.ts
@@ -0,0 +1,5 @@
+import type {AutoAuthState} from '@src/types/onyx/Session';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function desktopLoginRedirect(autoAuthState: AutoAuthState, isSignedIn: boolean) {}
+export default desktopLoginRedirect;
diff --git a/src/libs/migrateOnyx.ts b/src/libs/migrateOnyx.ts
index 536b912e69e0..e8c0b2bf3e10 100644
--- a/src/libs/migrateOnyx.ts
+++ b/src/libs/migrateOnyx.ts
@@ -1,6 +1,7 @@
 import Log from './Log';
 import CheckForPreviousReportActionID from './migrations/CheckForPreviousReportActionID';
 import KeyReportActionsDraftByReportActionID from './migrations/KeyReportActionsDraftByReportActionID';
+import NVPMigration from './migrations/NVPMigration';
 import RemoveEmptyReportActionsDrafts from './migrations/RemoveEmptyReportActionsDrafts';
 import RenameReceiptFilename from './migrations/RenameReceiptFilename';
 import TransactionBackupsToCollection from './migrations/TransactionBackupsToCollection';
@@ -17,6 +18,7 @@ export default function (): Promise<void> {
             KeyReportActionsDraftByReportActionID,
             TransactionBackupsToCollection,
             RemoveEmptyReportActionsDrafts,
+            NVPMigration,
         ];
 
         // Reduce all promises down to a single promise. All promises run in a linear fashion, waiting for the
diff --git a/src/libs/migrations/NVPMigration.ts b/src/libs/migrations/NVPMigration.ts
new file mode 100644
index 000000000000..9ab774328f78
--- /dev/null
+++ b/src/libs/migrations/NVPMigration.ts
@@ -0,0 +1,86 @@
+import after from 'lodash/after';
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+// These are the oldKeyName: newKeyName of the NVPs we can migrate without any processing
+const migrations = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    nvp_lastPaymentMethod: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
+    isFirstTimeNewExpensifyUser: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
+    preferredLocale: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    preferredEmojiSkinTone: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE,
+    frequentlyUsedEmojis: ONYXKEYS.FREQUENTLY_USED_EMOJIS,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    private_blockedFromConcierge: ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    private_pushNotificationID: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
+    tryFocusMode: ONYXKEYS.NVP_TRY_FOCUS_MODE,
+    introSelected: ONYXKEYS.NVP_INTRO_SELECTED,
+    hasDismissedIdlePanel: ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL,
+};
+
+// This migration changes the keys of all the NVP related keys so that they are standardized
+export default function () {
+    return new Promise<void>((resolve) => {
+        // Resolve the migration when all the keys have been migrated. The number of keys is the size of the `migrations` object in addition to the ACCOUNT and OLD_POLICY_RECENTLY_USED_TAGS keys (which is why there is a +2).
+        const resolveWhenDone = after(Object.entries(migrations).length + 2, () => resolve());
+
+        for (const [oldKey, newKey] of Object.entries(migrations)) {
+            const connectionID = Onyx.connect({
+                // @ts-expect-error oldKey is a variable
+                key: oldKey,
+                callback: (value) => {
+                    Onyx.disconnect(connectionID);
+                    if (value === null) {
+                        resolveWhenDone();
+                        return;
+                    }
+                    // @ts-expect-error These keys are variables, so we can't check the type
+                    Onyx.multiSet({
+                        [newKey]: value,
+                        [oldKey]: null,
+                    }).then(resolveWhenDone);
+                },
+            });
+        }
+        const connectionIDAccount = Onyx.connect({
+            key: ONYXKEYS.ACCOUNT,
+            callback: (value) => {
+                Onyx.disconnect(connectionIDAccount);
+                // @ts-expect-error we are removing this property, so it is not in the type anymore
+                if (!value?.activePolicyID) {
+                    resolveWhenDone();
+                    return;
+                }
+                // @ts-expect-error we are removing this property, so it is not in the type anymore
+                const activePolicyID = value.activePolicyID;
+                const newValue = {...value};
+                // @ts-expect-error we are removing this property, so it is not in the type anymore
+                delete newValue.activePolicyID;
+                Onyx.multiSet({
+                    [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: activePolicyID,
+                    [ONYXKEYS.ACCOUNT]: newValue,
+                }).then(resolveWhenDone);
+            },
+        });
+        const connectionIDRecentlyUsedTags = Onyx.connect({
+            key: ONYXKEYS.COLLECTION.OLD_POLICY_RECENTLY_USED_TAGS,
+            waitForCollectionCallback: true,
+            callback: (value) => {
+                Onyx.disconnect(connectionIDRecentlyUsedTags);
+                if (!value) {
+                    resolveWhenDone();
+                    return;
+                }
+                const newValue = {};
+                for (const key of Object.keys(value)) {
+                    // @ts-expect-error We have no fixed types here
+                    newValue[`nvp_${key}`] = value[key];
+                    // @ts-expect-error We have no fixed types here
+                    newValue[key] = null;
+                }
+                Onyx.multiSet(newValue).then(resolveWhenDone);
+            },
+        });
+    });
+}
diff --git a/src/libs/shouldSkipDeepLinkNavigation/index.web.ts b/src/libs/shouldSkipDeepLinkNavigation/index.web.ts
new file mode 100644
index 000000000000..0a2d7f533e74
--- /dev/null
+++ b/src/libs/shouldSkipDeepLinkNavigation/index.web.ts
@@ -0,0 +1,12 @@
+import ROUTES from '@src/ROUTES';
+
+export default function shouldSkipDeepLinkNavigation(route: string) {
+    // When deep-linking to desktop app with `transition` route we don't want to call navigate
+    // on the route because it will display an infinite loading indicator.
+    // See issue: https://github.com/Expensify/App/issues/33149
+    if (route.includes(ROUTES.TRANSITION_BETWEEN_APPS)) {
+        return true;
+    }
+
+    return false;
+}
diff --git a/src/pages/EditRequestTagPage.js b/src/pages/EditRequestTagPage.js
index 74643afa347f..b64cb925a213 100644
--- a/src/pages/EditRequestTagPage.js
+++ b/src/pages/EditRequestTagPage.js
@@ -49,7 +49,7 @@ function EditRequestTagPage({defaultTag, policyID, tagName, tagIndex, onSubmit})
                         title={tagName || translate('common.tag')}
                         onBackButtonPress={Navigation.goBack}
                     />
-                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagName: tagName || translate('common.tag')})}</Text>
+                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection')}</Text>
                     <TagPicker
                         selectedTag={defaultTag}
                         tag={tagName}
diff --git a/src/pages/EnablePayments/ActivateStep.js b/src/pages/EnablePayments/ActivateStep.js
deleted file mode 100644
index 92342c28af73..000000000000
--- a/src/pages/EnablePayments/ActivateStep.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from 'react';
-import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
-import ConfirmationPage from '@components/ConfirmationPage';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import LottieAnimations from '@components/LottieAnimations';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
-import compose from '@libs/compose';
-import * as PaymentMethods from '@userActions/PaymentMethods';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import userWalletPropTypes from './userWalletPropTypes';
-import walletTermsPropTypes from './walletTermsPropTypes';
-
-const propTypes = {
-    ...withLocalizePropTypes,
-
-    /** The user's wallet */
-    userWallet: userWalletPropTypes,
-
-    /** Information about the user accepting the terms for payments */
-    walletTerms: walletTermsPropTypes,
-};
-
-const defaultProps = {
-    userWallet: {},
-    walletTerms: {
-        source: '',
-        chatReportID: 0,
-    },
-};
-
-function ActivateStep(props) {
-    const isActivatedWallet = _.contains([CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM], props.userWallet.tierName);
-    const animation = isActivatedWallet ? LottieAnimations.Fireworks : LottieAnimations.ReviewingBankInfo;
-    let continueButtonText = '';
-
-    if (props.walletTerms.chatReportID) {
-        continueButtonText = props.translate('activateStep.continueToPayment');
-    } else if (props.walletTerms.source === CONST.KYC_WALL_SOURCE.ENABLE_WALLET) {
-        continueButtonText = props.translate('common.continue');
-    } else {
-        continueButtonText = props.translate('activateStep.continueToTransfer');
-    }
-
-    return (
-        <>
-            <HeaderWithBackButton title={props.translate('activateStep.headerTitle')} />
-            <ConfirmationPage
-                animation={animation}
-                heading={props.translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Title`)}
-                description={props.translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Message`)}
-                shouldShowButton={isActivatedWallet}
-                buttonText={continueButtonText}
-                onButtonPress={() => PaymentMethods.continueSetup()}
-            />
-        </>
-    );
-}
-
-ActivateStep.propTypes = propTypes;
-ActivateStep.defaultProps = defaultProps;
-ActivateStep.displayName = 'ActivateStep';
-
-export default compose(
-    withLocalize,
-    withOnyx({
-        walletTerms: {
-            key: ONYXKEYS.WALLET_TERMS,
-        },
-    }),
-)(ActivateStep);
diff --git a/src/pages/EnablePayments/ActivateStep.tsx b/src/pages/EnablePayments/ActivateStep.tsx
new file mode 100644
index 000000000000..e0bea7488140
--- /dev/null
+++ b/src/pages/EnablePayments/ActivateStep.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import ConfirmationPage from '@components/ConfirmationPage';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import LottieAnimations from '@components/LottieAnimations';
+import useLocalize from '@hooks/useLocalize';
+import * as PaymentMethods from '@userActions/PaymentMethods';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {UserWallet, WalletTerms} from '@src/types/onyx';
+
+type ActivateStepOnyxProps = {
+    /** Information about the user accepting the terms for payments */
+    walletTerms: OnyxEntry<WalletTerms>;
+};
+
+type ActivateStepProps = ActivateStepOnyxProps & {
+    /** The user's wallet */
+    userWallet: OnyxEntry<UserWallet>;
+};
+
+function ActivateStep({userWallet, walletTerms}: ActivateStepProps) {
+    const {translate} = useLocalize();
+    const isActivatedWallet = userWallet?.tierName && [CONST.WALLET.TIER_NAME.GOLD, CONST.WALLET.TIER_NAME.PLATINUM].some((name) => name === userWallet.tierName);
+
+    const animation = isActivatedWallet ? LottieAnimations.Fireworks : LottieAnimations.ReviewingBankInfo;
+    let continueButtonText = '';
+
+    if (walletTerms?.chatReportID) {
+        continueButtonText = translate('activateStep.continueToPayment');
+    } else if (walletTerms?.source === CONST.KYC_WALL_SOURCE.ENABLE_WALLET) {
+        continueButtonText = translate('common.continue');
+    } else {
+        continueButtonText = translate('activateStep.continueToTransfer');
+    }
+
+    return (
+        <>
+            <HeaderWithBackButton title={translate('activateStep.headerTitle')} />
+            <ConfirmationPage
+                animation={animation}
+                heading={translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Title`)}
+                description={translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Message`)}
+                shouldShowButton={isActivatedWallet}
+                buttonText={continueButtonText}
+                onButtonPress={() => PaymentMethods.continueSetup()}
+            />
+        </>
+    );
+}
+
+ActivateStep.displayName = 'ActivateStep';
+
+export default withOnyx<ActivateStepProps, ActivateStepOnyxProps>({
+    walletTerms: {
+        key: ONYXKEYS.WALLET_TERMS,
+    },
+})(ActivateStep);
diff --git a/src/pages/EnablePayments/AdditionalDetailsStep.js b/src/pages/EnablePayments/AdditionalDetailsStep.tsx
similarity index 71%
rename from src/pages/EnablePayments/AdditionalDetailsStep.js
rename to src/pages/EnablePayments/AdditionalDetailsStep.tsx
index cf769bf58fd3..57b9c7c6ade4 100644
--- a/src/pages/EnablePayments/AdditionalDetailsStep.js
+++ b/src/pages/EnablePayments/AdditionalDetailsStep.tsx
@@ -1,21 +1,21 @@
 import {subYears} from 'date-fns';
-import PropTypes from 'prop-types';
 import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import DatePicker from '@components/DatePicker';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import TextLink from '@components/TextLink';
-import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '@components/withCurrentUserPersonalDetails';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
+import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
+import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import {parsePhoneNumber} from '@libs/PhoneNumber';
 import * as ValidationUtils from '@libs/ValidationUtils';
@@ -23,51 +23,25 @@ import AddressForm from '@pages/ReimbursementAccount/AddressForm';
 import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/AdditionalDetailStepForm';
+import type {WalletAdditionalDetails} from '@src/types/onyx';
 import IdologyQuestions from './IdologyQuestions';
 
-const propTypes = {
-    ...withLocalizePropTypes,
-    ...withCurrentUserPersonalDetailsPropTypes,
+const DEFAULT_WALLET_ADDITIONAL_DETAILS = {
+    errorFields: {},
+    isLoading: false,
+    errors: {},
+    questions: [],
+    idNumber: '',
+    errorCode: '',
+};
 
+type AdditionalDetailsStepOnyxProps = {
     /** Stores additional information about the additional details step e.g. loading state and errors with fields */
-    walletAdditionalDetails: PropTypes.shape({
-        /** Are we waiting for a response? */
-        isLoading: PropTypes.bool,
-
-        /** Which field needs attention? */
-        errorFields: PropTypes.objectOf(PropTypes.bool),
-
-        /** Any additional error message to show */
-        errors: PropTypes.objectOf(PropTypes.string),
-
-        /** Questions returned by Idology */
-        questions: PropTypes.arrayOf(
-            PropTypes.shape({
-                prompt: PropTypes.string,
-                type: PropTypes.string,
-                answer: PropTypes.arrayOf(PropTypes.string),
-            }),
-        ),
-
-        /** ExpectID ID number related to those questions */
-        idNumber: PropTypes.string,
-
-        /** Error code to determine additional behavior */
-        errorCode: PropTypes.string,
-    }),
+    walletAdditionalDetails: OnyxEntry<WalletAdditionalDetails>;
 };
 
-const defaultProps = {
-    walletAdditionalDetails: {
-        errorFields: {},
-        isLoading: false,
-        errors: {},
-        questions: [],
-        idNumber: '',
-        errorCode: '',
-    },
-    ...withCurrentUserPersonalDetailsDefaultProps,
-};
+type AdditionalDetailsStepProps = AdditionalDetailsStepOnyxProps & WithCurrentUserPersonalDetailsProps;
 
 const fieldNameTranslationKeys = {
     legalFirstName: 'additionalDetailsStep.legalFirstNameLabel',
@@ -77,22 +51,28 @@ const fieldNameTranslationKeys = {
     dob: 'common.dob',
     ssn: 'common.ssnLast4',
     ssnFull9: 'common.ssnFull9',
-};
-
-function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserPersonalDetails}) {
+} as const;
+const STEP_FIELDS = [
+    INPUT_IDS.LEGAL_FIRST_NAME,
+    INPUT_IDS.LEGAL_LAST_NAME,
+    INPUT_IDS.ADDRESS_STREET,
+    INPUT_IDS.ADDRESS_CITY,
+    INPUT_IDS.ADDRESS_ZIP_CODE,
+    INPUT_IDS.PHONE_NUMBER,
+    INPUT_IDS.DOB,
+    INPUT_IDS.ADDRESS_STATE,
+    INPUT_IDS.SSN,
+];
+function AdditionalDetailsStep({walletAdditionalDetails = DEFAULT_WALLET_ADDITIONAL_DETAILS, currentUserPersonalDetails}: AdditionalDetailsStepProps) {
+    const {translate} = useLocalize();
     const styles = useThemeStyles();
     const currentDate = new Date();
     const minDate = subYears(currentDate, CONST.DATE_BIRTH.MAX_AGE);
     const maxDate = subYears(currentDate, CONST.DATE_BIRTH.MIN_AGE_FOR_PAYMENT);
-    const shouldAskForFullSSN = walletAdditionalDetails.errorCode === CONST.WALLET.ERROR.SSN;
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
 
-    /**
-     * @param {Object} values The values object is passed from FormProvider and contains info for each form element that has an inputID
-     * @returns {Object}
-     */
-    const validate = (values) => {
-        const requiredFields = ['legalFirstName', 'legalLastName', 'addressStreet', 'addressCity', 'addressZipCode', 'phoneNumber', 'dob', 'ssn', 'addressState'];
-        const errors = ValidationUtils.getFieldRequiredErrors(values, requiredFields);
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
+        const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
 
         if (values.dob) {
             if (!ValidationUtils.isValidPastDate(values.dob) || !ValidationUtils.meetsMaximumAgeRequirement(values.dob)) {
@@ -116,7 +96,7 @@ function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserP
 
         // walletAdditionalDetails stores errors returned by the server. If the server returns an SSN error
         // then the user needs to provide the full 9 digit SSN.
-        if (walletAdditionalDetails.errorCode === CONST.WALLET.ERROR.SSN) {
+        if (walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN) {
             if (values.ssn && !ValidationUtils.isValidSSNFullNine(values.ssn)) {
                 errors.ssn = 'additionalDetailsStep.ssnFull9Error';
             }
@@ -127,26 +107,23 @@ function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserP
         return errors;
     };
 
-    /**
-     * @param {Object} values The values object is passed from FormProvider and contains info for each form element that has an inputID
-     */
-    const activateWallet = (values) => {
+    const activateWallet = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>) => {
         const personalDetails = {
-            phoneNumber: parsePhoneNumber(values.phoneNumber, {regionCode: CONST.COUNTRY.US}).number.significant || '',
-            legalFirstName: values.legalFirstName || '',
-            legalLastName: values.legalLastName || '',
-            addressStreet: values.addressStreet || '',
-            addressCity: values.addressCity || '',
-            addressState: values.addressState || '',
-            addressZip: values.addressZipCode || '',
-            dob: values.dob || '',
-            ssn: values.ssn || '',
+            phoneNumber: (values.phoneNumber && parsePhoneNumber(values.phoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '',
+            legalFirstName: values.legalFirstName ?? '',
+            legalLastName: values.legalLastName ?? '',
+            addressStreet: values.addressStreet ?? '',
+            addressCity: values.addressCity ?? '',
+            addressState: values.addressState ?? '',
+            addressZip: values.addressZipCode ?? '',
+            dob: values.dob ?? '',
+            ssn: values.ssn ?? '',
         };
         // Attempt to set the personal details
         Wallet.updatePersonalDetails(personalDetails);
     };
 
-    if (!_.isEmpty(walletAdditionalDetails.questions)) {
+    if (walletAdditionalDetails?.questions && walletAdditionalDetails.questions.length > 0) {
         return (
             <ScreenWrapper
                 shouldShowOfflineIndicator={false}
@@ -160,7 +137,7 @@ function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserP
                 />
                 <IdologyQuestions
                     questions={walletAdditionalDetails.questions}
-                    idNumber={walletAdditionalDetails.idNumber}
+                    idNumber={walletAdditionalDetails.idNumber ?? ''}
                 />
             </ScreenWrapper>
         );
@@ -174,13 +151,13 @@ function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserP
                     <Text style={styles.mb3}>{translate('additionalDetailsStep.helpText')}</Text>
                     <TextLink
                         style={styles.mb3}
-                        href="https://use.expensify.com/usa-patriot-act"
+                        href={CONST.HELP_LINK_URL}
                     >
                         {translate('additionalDetailsStep.helpLink')}
                     </TextLink>
                 </View>
                 <FormProvider
-                    formID={ONYXKEYS.WALLET_ADDITIONAL_DETAILS}
+                    formID={ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS}
                     validate={validate}
                     onSubmit={activateWallet}
                     scrollContextEnabled
@@ -230,7 +207,8 @@ function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserP
                         placeholder={translate('common.phoneNumberPlaceholder')}
                         shouldSaveDraft
                     />
-                    <InputWrapper
+                    {/* @ts-expect-error TODO: Remove this once DatePicker (https://github.com/Expensify/App/issues/25148) is migrated to TypeScript. */}
+                    <InputWrapper<unknown>
                         InputComponent={DatePicker}
                         inputID="dob"
                         containerStyles={[styles.mt4]}
@@ -256,16 +234,13 @@ function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserP
     );
 }
 
-AdditionalDetailsStep.propTypes = propTypes;
-AdditionalDetailsStep.defaultProps = defaultProps;
 AdditionalDetailsStep.displayName = 'AdditionalDetailsStep';
 
-export default compose(
-    withLocalize,
-    withCurrentUserPersonalDetails,
-    withOnyx({
+export default withCurrentUserPersonalDetails(
+    withOnyx<AdditionalDetailsStepProps, AdditionalDetailsStepOnyxProps>({
+        // @ts-expect-error: ONYXKEYS.WALLET_ADDITIONAL_DETAILS is conflicting with ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS
         walletAdditionalDetails: {
             key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
         },
-    }),
-)(AdditionalDetailsStep);
+    })(AdditionalDetailsStep),
+);
diff --git a/src/pages/EnablePayments/EnablePaymentsPage.js b/src/pages/EnablePayments/EnablePaymentsPage.tsx
similarity index 76%
rename from src/pages/EnablePayments/EnablePaymentsPage.js
rename to src/pages/EnablePayments/EnablePaymentsPage.tsx
index 257eab1d38d3..1384875fe031 100644
--- a/src/pages/EnablePayments/EnablePaymentsPage.js
+++ b/src/pages/EnablePayments/EnablePaymentsPage.tsx
@@ -1,6 +1,6 @@
 import React, {useEffect} from 'react';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -11,34 +11,34 @@ import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type {UserWallet} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import ActivateStep from './ActivateStep';
 import AdditionalDetailsStep from './AdditionalDetailsStep';
 import FailedKYC from './FailedKYC';
 // Steps
 import OnfidoStep from './OnfidoStep';
 import TermsStep from './TermsStep';
-import userWalletPropTypes from './userWalletPropTypes';
 
-const propTypes = {
+type EnablePaymentsPageOnyxProps = {
     /** The user's wallet */
-    userWallet: userWalletPropTypes,
+    userWallet: OnyxEntry<UserWallet>;
 };
 
-const defaultProps = {
-    userWallet: {},
-};
+type EnablePaymentsPageProps = EnablePaymentsPageOnyxProps;
 
-function EnablePaymentsPage({userWallet}) {
+function EnablePaymentsPage({userWallet}: EnablePaymentsPageProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
-    const {isPendingOnfidoResult, hasFailedOnfido} = userWallet;
+    const {isPendingOnfidoResult, hasFailedOnfido} = userWallet ?? {};
 
     useEffect(() => {
         if (isOffline) {
             return;
         }
 
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         if (isPendingOnfidoResult || hasFailedOnfido) {
             Navigation.navigate(ROUTES.SETTINGS_WALLET, CONST.NAVIGATION.TYPE.UP);
             return;
@@ -47,18 +47,18 @@ function EnablePaymentsPage({userWallet}) {
         Wallet.openEnablePaymentsPage();
     }, [isOffline, isPendingOnfidoResult, hasFailedOnfido]);
 
-    if (_.isEmpty(userWallet)) {
+    if (isEmptyObject(userWallet)) {
         return <FullScreenLoadingIndicator />;
     }
 
     return (
         <ScreenWrapper
-            shouldShowOfflineIndicator={userWallet.currentStep !== CONST.WALLET.STEP.ONFIDO}
+            shouldShowOfflineIndicator={userWallet?.currentStep !== CONST.WALLET.STEP.ONFIDO}
             includeSafeAreaPaddingBottom={false}
             testID={EnablePaymentsPage.displayName}
         >
             {() => {
-                if (userWallet.errorCode === CONST.WALLET.ERROR.KYC) {
+                if (userWallet?.errorCode === CONST.WALLET.ERROR.KYC) {
                     return (
                         <>
                             <HeaderWithBackButton
@@ -70,7 +70,7 @@ function EnablePaymentsPage({userWallet}) {
                     );
                 }
 
-                const currentStep = userWallet.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS;
+                const currentStep = userWallet?.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS;
 
                 switch (currentStep) {
                     case CONST.WALLET.STEP.ADDITIONAL_DETAILS:
@@ -91,10 +91,8 @@ function EnablePaymentsPage({userWallet}) {
 }
 
 EnablePaymentsPage.displayName = 'EnablePaymentsPage';
-EnablePaymentsPage.propTypes = propTypes;
-EnablePaymentsPage.defaultProps = defaultProps;
 
-export default withOnyx({
+export default withOnyx<EnablePaymentsPageProps, EnablePaymentsPageOnyxProps>({
     userWallet: {
         key: ONYXKEYS.USER_WALLET,
 
diff --git a/src/pages/EnablePayments/FailedKYC.js b/src/pages/EnablePayments/FailedKYC.tsx
similarity index 65%
rename from src/pages/EnablePayments/FailedKYC.js
rename to src/pages/EnablePayments/FailedKYC.tsx
index fc54ea9c1074..6b393229d62f 100644
--- a/src/pages/EnablePayments/FailedKYC.js
+++ b/src/pages/EnablePayments/FailedKYC.tsx
@@ -2,35 +2,31 @@ import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
+import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 
-const propTypes = {
-    ...withLocalizePropTypes,
-};
-
-function FailedKYC(props) {
+function FailedKYC() {
+    const {translate} = useLocalize();
     const styles = useThemeStyles();
     return (
         <View style={[styles.flex1]}>
             <View style={[styles.ph5]}>
                 <Text style={styles.mb3}>
-                    {props.translate('additionalDetailsStep.failedKYCTextBefore')}
+                    {translate('additionalDetailsStep.failedKYCTextBefore')}
                     <TextLink
                         href={`mailto:${CONST.EMAIL.CONCIERGE}`}
                         style={[styles.link]}
                     >
                         {CONST.EMAIL.CONCIERGE}
                     </TextLink>
-                    {props.translate('additionalDetailsStep.failedKYCTextAfter')}
+                    {translate('additionalDetailsStep.failedKYCTextAfter')}
                 </Text>
             </View>
         </View>
     );
 }
 
-FailedKYC.propTypes = propTypes;
 FailedKYC.displayName = 'FailedKYC';
 
-export default withLocalize(FailedKYC);
+export default FailedKYC;
diff --git a/src/pages/EnablePayments/IdologyQuestions.js b/src/pages/EnablePayments/IdologyQuestions.tsx
similarity index 68%
rename from src/pages/EnablePayments/IdologyQuestions.js
rename to src/pages/EnablePayments/IdologyQuestions.tsx
index a0c202b0bbbc..6baea2158613 100644
--- a/src/pages/EnablePayments/IdologyQuestions.js
+++ b/src/pages/EnablePayments/IdologyQuestions.tsx
@@ -1,64 +1,48 @@
-import PropTypes from 'prop-types';
 import React, {useState} from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {WalletAdditionalQuestionDetails} from 'src/types/onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import type {Choice} from '@components/RadioButtons';
 import SingleChoiceQuestion from '@components/SingleChoiceQuestion';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as BankAccounts from '@userActions/BankAccounts';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Errors} from '@src/types/onyx/OnyxCommon';
 
 const MAX_SKIP = 1;
 const SKIP_QUESTION_TEXT = 'Skip Question';
 
-const propTypes = {
+type IdologyQuestionsProps = {
     /** Questions returned by Idology */
     /** example: [{"answer":["1251","6253","113","None of the above","Skip Question"],"prompt":"Which number goes with your address on MASONIC AVE?","type":"street.number.b"}, ...] */
-    questions: PropTypes.arrayOf(
-        PropTypes.shape({
-            prompt: PropTypes.string,
-            type: PropTypes.string,
-            answer: PropTypes.arrayOf(PropTypes.string),
-        }),
-    ),
+    questions: WalletAdditionalQuestionDetails[];
 
     /** ID from Idology, referencing those questions */
-    idNumber: PropTypes.string,
-
-    walletAdditionalDetails: PropTypes.shape({
-        /** Are we waiting for a response? */
-        isLoading: PropTypes.bool,
-
-        /** Any additional error message to show */
-        errors: PropTypes.objectOf(PropTypes.string),
-
-        /** What error do we need to handle */
-        errorCode: PropTypes.string,
-    }),
+    idNumber: string;
 };
 
-const defaultProps = {
-    questions: [],
-    idNumber: '',
-    walletAdditionalDetails: {},
+type Answer = {
+    question: string;
+    answer: string;
 };
 
-function IdologyQuestions({questions, idNumber}) {
+function IdologyQuestions({questions, idNumber}: IdologyQuestionsProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
     const [currentQuestionIndex, setCurrentQuestionIndex] = useState(0);
     const [shouldHideSkipAnswer, setShouldHideSkipAnswer] = useState(false);
-    const [userAnswers, setUserAnswers] = useState([]);
+    const [userAnswers, setUserAnswers] = useState<Answer[]>([]);
 
     const currentQuestion = questions[currentQuestionIndex] || {};
-    const possibleAnswers = _.filter(
-        _.map(currentQuestion.answer, (answer) => {
+    const possibleAnswers: Choice[] = currentQuestion.answer
+        .map((answer) => {
             if (shouldHideSkipAnswer && answer === SKIP_QUESTION_TEXT) {
                 return;
             }
@@ -67,15 +51,11 @@ function IdologyQuestions({questions, idNumber}) {
                 label: answer,
                 value: answer,
             };
-        }),
-    );
+        })
+        .filter((answer): answer is Choice => answer !== undefined);
 
-    /**
-     * Put question answer in the state.
-     * @param {String} answer
-     */
-    const chooseAnswer = (answer) => {
-        const tempAnswers = _.map(userAnswers, _.clone);
+    const chooseAnswer = (answer: string) => {
+        const tempAnswers: Answer[] = userAnswers.map((userAnswer) => ({...userAnswer}));
 
         tempAnswers[currentQuestionIndex] = {question: currentQuestion.type, answer};
 
@@ -90,11 +70,11 @@ function IdologyQuestions({questions, idNumber}) {
             return;
         }
         // Get the number of questions that were skipped by the user.
-        const skippedQuestionsCount = _.filter(userAnswers, (answer) => answer.answer === SKIP_QUESTION_TEXT).length;
+        const skippedQuestionsCount = userAnswers.filter((answer) => answer.answer === SKIP_QUESTION_TEXT).length;
 
         // We have enough answers, let's call expectID KBA to verify them
         if (userAnswers.length - skippedQuestionsCount >= questions.length - MAX_SKIP) {
-            const tempAnswers = _.map(userAnswers, _.clone);
+            const tempAnswers: Answer[] = userAnswers.map((answer) => ({...answer}));
 
             // Auto skip any remaining questions
             if (tempAnswers.length < questions.length) {
@@ -112,8 +92,8 @@ function IdologyQuestions({questions, idNumber}) {
         }
     };
 
-    const validate = (values) => {
-        const errors = {};
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
+        const errors: Errors = {};
         if (!values.answer) {
             errors.answer = translate('additionalDetailsStep.selectAnswer');
         }
@@ -126,13 +106,13 @@ function IdologyQuestions({questions, idNumber}) {
                 <Text style={styles.mb3}>{translate('additionalDetailsStep.helpTextIdologyQuestions')}</Text>
                 <TextLink
                     style={styles.mb3}
-                    href="https://use.expensify.com/usa-patriot-act"
+                    href={CONST.HELP_LINK_URL}
                 >
                     {translate('additionalDetailsStep.helpLink')}
                 </TextLink>
             </View>
             <FormProvider
-                formID={ONYXKEYS.WALLET_ADDITIONAL_DETAILS}
+                formID={ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS}
                 onSubmit={submitAnswers}
                 key={currentQuestionIndex}
                 validate={validate}
@@ -147,7 +127,10 @@ function IdologyQuestions({questions, idNumber}) {
                     prompt={currentQuestion.prompt}
                     possibleAnswers={possibleAnswers}
                     currentQuestionIndex={currentQuestionIndex}
-                    onValueChange={chooseAnswer}
+                    onValueChange={(value) => {
+                        chooseAnswer(String(value));
+                    }}
+                    onInputChange={() => {}}
                 />
             </FormProvider>
         </View>
@@ -155,11 +138,5 @@ function IdologyQuestions({questions, idNumber}) {
 }
 
 IdologyQuestions.displayName = 'IdologyQuestions';
-IdologyQuestions.propTypes = propTypes;
-IdologyQuestions.defaultProps = defaultProps;
-
-export default withOnyx({
-    walletAdditionalDetails: {
-        key: ONYXKEYS.WALLET_ADDITIONAL_DETAILS,
-    },
-})(IdologyQuestions);
+
+export default IdologyQuestions;
diff --git a/src/pages/EnablePayments/OnfidoPrivacy.js b/src/pages/EnablePayments/OnfidoPrivacy.tsx
similarity index 58%
rename from src/pages/EnablePayments/OnfidoPrivacy.js
rename to src/pages/EnablePayments/OnfidoPrivacy.tsx
index 8de8bdb4bf07..cf6e6837df16 100644
--- a/src/pages/EnablePayments/OnfidoPrivacy.js
+++ b/src/pages/EnablePayments/OnfidoPrivacy.tsx
@@ -1,54 +1,57 @@
-import lodashGet from 'lodash/get';
 import React, {useRef} from 'react';
 import {View} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
+import type {ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import _ from 'underscore';
+import type {OnyxEntry} from 'react-native-onyx';
 import FixedFooter from '@components/FixedFooter';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import FormScrollView from '@components/FormScrollView';
 import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
+import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import * as BankAccounts from '@userActions/BankAccounts';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import walletOnfidoDataPropTypes from './walletOnfidoDataPropTypes';
+import type {WalletOnfido} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-const propTypes = {
-    /** Stores various information used to build the UI and call any APIs */
-    walletOnfidoData: walletOnfidoDataPropTypes,
-
-    ...withLocalizePropTypes,
+const DEFAULT_WALLET_ONFIDO_DATA = {
+    applicantID: '',
+    sdkToken: '',
+    loading: false,
+    errors: {},
+    fixableErrors: [],
+    hasAcceptedPrivacyPolicy: false,
 };
 
-const defaultProps = {
-    walletOnfidoData: {
-        applicantID: '',
-        sdkToken: '',
-        loading: false,
-        errors: {},
-        fixableErrors: [],
-        hasAcceptedPrivacyPolicy: false,
-    },
+type OnfidoPrivacyOnyxProps = {
+    /** Stores various information used to build the UI and call any APIs */
+    walletOnfidoData: OnyxEntry<WalletOnfido>;
 };
 
-function OnfidoPrivacy({walletOnfidoData, translate, form}) {
+type OnfidoPrivacyProps = OnfidoPrivacyOnyxProps;
+
+function OnfidoPrivacy({walletOnfidoData = DEFAULT_WALLET_ONFIDO_DATA}: OnfidoPrivacyProps) {
+    const {translate} = useLocalize();
+    const formRef = useRef<ScrollView>(null);
     const styles = useThemeStyles();
+    if (!walletOnfidoData) {
+        return;
+    }
     const {isLoading = false, hasAcceptedPrivacyPolicy} = walletOnfidoData;
 
-    const formRef = useRef(null);
-
     const openOnfidoFlow = () => {
         BankAccounts.openOnfidoFlow();
     };
 
-    const onfidoError = ErrorUtils.getLatestErrorMessage(walletOnfidoData) || '';
-    const onfidoFixableErrors = lodashGet(walletOnfidoData, 'fixableErrors', []);
-    if (_.isArray(onfidoError)) {
-        onfidoError[0] += !_.isEmpty(onfidoFixableErrors) ? `\n${onfidoFixableErrors.join('\n')}` : '';
+    const onfidoError = ErrorUtils.getLatestErrorMessage(walletOnfidoData) ?? '';
+    const onfidoFixableErrors = walletOnfidoData?.fixableErrors ?? [];
+    if (Array.isArray(onfidoError)) {
+        onfidoError[0] += !isEmptyObject(onfidoFixableErrors) ? `\n${onfidoFixableErrors.join('\n')}` : '';
     }
 
     return (
@@ -59,11 +62,11 @@ function OnfidoPrivacy({walletOnfidoData, translate, form}) {
                         <View style={[styles.mh5, styles.justifyContentCenter]}>
                             <Text style={[styles.mb5]}>
                                 {translate('onfidoStep.acceptTerms')}
-                                <TextLink href="https://onfido.com/facial-scan-policy-and-release/">{translate('onfidoStep.facialScan')}</TextLink>
+                                <TextLink href={CONST.ONFIDO_FACIAL_SCAN_POLICY_URL}>{translate('onfidoStep.facialScan')}</TextLink>
                                 {', '}
-                                <TextLink href="https://onfido.com/privacy/">{translate('common.privacy')}</TextLink>
+                                <TextLink href={CONST.ONFIDO_PRIVACY_POLICY_URL}>{translate('common.privacy')}</TextLink>
                                 {` ${translate('common.and')} `}
-                                <TextLink href="https://onfido.com/terms-of-service/">{translate('common.termsOfService')}</TextLink>.
+                                <TextLink href={CONST.ONFIDO_TERMS_OF_SERVICE_URL}>{translate('common.termsOfService')}</TextLink>.
                             </Text>
                         </View>
                     </FormScrollView>
@@ -72,7 +75,7 @@ function OnfidoPrivacy({walletOnfidoData, translate, form}) {
                             isAlertVisible={Boolean(onfidoError)}
                             onSubmit={openOnfidoFlow}
                             onFixTheErrorsLinkPressed={() => {
-                                form.scrollTo({y: 0, animated: true});
+                                formRef.current?.scrollTo({y: 0, animated: true});
                             }}
                             message={onfidoError}
                             isLoading={isLoading}
@@ -87,18 +90,13 @@ function OnfidoPrivacy({walletOnfidoData, translate, form}) {
     );
 }
 
-OnfidoPrivacy.propTypes = propTypes;
-OnfidoPrivacy.defaultProps = defaultProps;
 OnfidoPrivacy.displayName = 'OnfidoPrivacy';
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        walletOnfidoData: {
-            key: ONYXKEYS.WALLET_ONFIDO,
+export default withOnyx<OnfidoPrivacyProps, OnfidoPrivacyOnyxProps>({
+    walletOnfidoData: {
+        key: ONYXKEYS.WALLET_ONFIDO,
 
-            // Let's get a new onfido token each time the user hits this flow (as it should only be once)
-            initWithStoredValues: false,
-        },
-    }),
-)(OnfidoPrivacy);
+        // Let's get a new onfido token each time the user hits this flow (as it should only be once)
+        initWithStoredValues: false,
+    },
+})(OnfidoPrivacy);
diff --git a/src/pages/EnablePayments/OnfidoStep.js b/src/pages/EnablePayments/OnfidoStep.tsx
similarity index 69%
rename from src/pages/EnablePayments/OnfidoStep.js
rename to src/pages/EnablePayments/OnfidoStep.tsx
index d6279020bca9..f5a600cc8548 100644
--- a/src/pages/EnablePayments/OnfidoStep.js
+++ b/src/pages/EnablePayments/OnfidoStep.tsx
@@ -1,8 +1,10 @@
 import React, {useCallback} from 'react';
 import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Onfido from '@components/Onfido';
+import type {OnfidoData} from '@components/Onfido/types';
 import useLocalize from '@hooks/useLocalize';
 import Growl from '@libs/Growl';
 import Navigation from '@libs/Navigation/Navigation';
@@ -10,25 +12,25 @@ import * as BankAccounts from '@userActions/BankAccounts';
 import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {WalletOnfido} from '@src/types/onyx';
 import OnfidoPrivacy from './OnfidoPrivacy';
-import walletOnfidoDataPropTypes from './walletOnfidoDataPropTypes';
 
-const propTypes = {
-    /** Stores various information used to build the UI and call any APIs */
-    walletOnfidoData: walletOnfidoDataPropTypes,
+const DEFAULT_WALLET_ONFIDO_DATA = {
+    loading: false,
+    hasAcceptedPrivacyPolicy: false,
 };
 
-const defaultProps = {
-    walletOnfidoData: {
-        loading: false,
-        hasAcceptedPrivacyPolicy: false,
-    },
+type OnfidoStepOnyxProps = {
+    /** Stores various information used to build the UI and call any APIs */
+    walletOnfidoData: OnyxEntry<WalletOnfido>;
 };
 
-function OnfidoStep({walletOnfidoData}) {
+type OnfidoStepProps = OnfidoStepOnyxProps;
+
+function OnfidoStep({walletOnfidoData = DEFAULT_WALLET_ONFIDO_DATA}: OnfidoStepProps) {
     const {translate} = useLocalize();
 
-    const shouldShowOnfido = walletOnfidoData.hasAcceptedPrivacyPolicy && !walletOnfidoData.isLoading && !walletOnfidoData.error && walletOnfidoData.sdkToken;
+    const shouldShowOnfido = walletOnfidoData?.hasAcceptedPrivacyPolicy && !walletOnfidoData.isLoading && !walletOnfidoData.errors && walletOnfidoData.sdkToken;
 
     const goBack = useCallback(() => {
         Navigation.goBack();
@@ -43,15 +45,15 @@ function OnfidoStep({walletOnfidoData}) {
     }, [translate]);
 
     const verifyIdentity = useCallback(
-        (data) => {
+        (data: OnfidoData) => {
             BankAccounts.verifyIdentity({
                 onfidoData: JSON.stringify({
                     ...data,
-                    applicantID: walletOnfidoData.applicantID,
+                    applicantID: walletOnfidoData?.applicantID,
                 }),
             });
         },
-        [walletOnfidoData.applicantID],
+        [walletOnfidoData?.applicantID],
     );
 
     return (
@@ -63,24 +65,22 @@ function OnfidoStep({walletOnfidoData}) {
             <FullPageOfflineBlockingView>
                 {shouldShowOnfido ? (
                     <Onfido
-                        sdkToken={walletOnfidoData.sdkToken}
+                        sdkToken={walletOnfidoData.sdkToken ?? ''}
                         onUserExit={goBack}
                         onError={reportError}
                         onSuccess={verifyIdentity}
                     />
                 ) : (
-                    <OnfidoPrivacy walletOnfidoData={walletOnfidoData} />
+                    <OnfidoPrivacy />
                 )}
             </FullPageOfflineBlockingView>
         </>
     );
 }
 
-OnfidoStep.propTypes = propTypes;
-OnfidoStep.defaultProps = defaultProps;
 OnfidoStep.displayName = 'OnfidoStep';
 
-export default withOnyx({
+export default withOnyx<OnfidoStepProps, OnfidoStepOnyxProps>({
     walletOnfidoData: {
         key: ONYXKEYS.WALLET_ONFIDO,
 
diff --git a/src/pages/EnablePayments/TermsPage/LongTermsForm.js b/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
similarity index 98%
rename from src/pages/EnablePayments/TermsPage/LongTermsForm.js
rename to src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
index fad19c5ecf6f..81d18c5dfc44 100644
--- a/src/pages/EnablePayments/TermsPage/LongTermsForm.js
+++ b/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import {View} from 'react-native';
-import _ from 'underscore';
 import CollapsibleSection from '@components/CollapsibleSection';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -66,7 +65,7 @@ function LongTermsForm() {
     ];
 
     const getLongTermsSections = () =>
-        _.map(termsData, (section, index) => (
+        termsData.map((section, index) => (
             // eslint-disable-next-line react/no-array-index-key
             <View key={section.title + index}>
                 <View style={[styles.longTermsRow]}>
@@ -105,7 +104,6 @@ function LongTermsForm() {
             <View style={styles.flexRow}>
                 <Icon
                     fill={theme.icon}
-                    style={styles.flex1}
                     src={Expensicons.Printer}
                 />
                 <TextLink
diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
similarity index 93%
rename from src/pages/EnablePayments/TermsPage/ShortTermsForm.js
rename to src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
index 40824f47b036..f4db904c07f3 100644
--- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js
+++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
@@ -1,23 +1,20 @@
 import React from 'react';
 import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
-import userWalletPropTypes from '@pages/EnablePayments/userWalletPropTypes';
 import CONST from '@src/CONST';
+import type {UserWallet} from '@src/types/onyx';
 
-const propTypes = {
+type ShortTermsFormProps = {
     /** The user's wallet */
-    userWallet: userWalletPropTypes,
+    userWallet: OnyxEntry<UserWallet>;
 };
 
-const defaultProps = {
-    userWallet: {},
-};
-
-function ShortTermsForm(props) {
+function ShortTermsForm(props: ShortTermsFormProps) {
     const styles = useThemeStyles();
     const {translate, numberFormat} = useLocalize();
     return (
@@ -25,7 +22,9 @@ function ShortTermsForm(props) {
             <Text style={styles.mb5}>
                 {translate('termsStep.shortTermsForm.expensifyPaymentsAccount', {
                     walletProgram:
-                        props.userWallet.walletProgramID === CONST.WALLET.MTL_WALLET_PROGRAM_ID ? CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS : CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK,
+                        props.userWallet?.walletProgramID === CONST.WALLET.MTL_WALLET_PROGRAM_ID
+                            ? CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS
+                            : CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK,
                 })}
             </Text>
 
@@ -150,8 +149,6 @@ function ShortTermsForm(props) {
     );
 }
 
-ShortTermsForm.propTypes = propTypes;
-ShortTermsForm.defaultProps = defaultProps;
 ShortTermsForm.displayName = 'ShortTermsForm';
 
 export default ShortTermsForm;
diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.tsx
similarity index 69%
rename from src/pages/EnablePayments/TermsStep.js
rename to src/pages/EnablePayments/TermsStep.tsx
index a55816d207be..916a5200a2e0 100644
--- a/src/pages/EnablePayments/TermsStep.js
+++ b/src/pages/EnablePayments/TermsStep.tsx
@@ -1,36 +1,30 @@
 import React, {useEffect, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import CheckboxWithLabel from '@components/CheckboxWithLabel';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import * as BankAccounts from '@userActions/BankAccounts';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {UserWallet, WalletTerms} from '@src/types/onyx';
 import LongTermsForm from './TermsPage/LongTermsForm';
 import ShortTermsForm from './TermsPage/ShortTermsForm';
-import userWalletPropTypes from './userWalletPropTypes';
-import walletTermsPropTypes from './walletTermsPropTypes';
-
-const propTypes = {
-    /** The user's wallet */
-    userWallet: userWalletPropTypes,
 
+type TermsStepOnyxProps = {
     /** Comes from Onyx. Information about the terms for the wallet */
-    walletTerms: walletTermsPropTypes,
-
-    ...withLocalizePropTypes,
+    walletTerms: OnyxEntry<WalletTerms>;
 };
 
-const defaultProps = {
-    userWallet: {},
-    walletTerms: {},
+type TermsStepProps = TermsStepOnyxProps & {
+    /** The user's wallet */
+    userWallet: OnyxEntry<UserWallet>;
 };
 
 function HaveReadAndAgreeLabel() {
@@ -39,7 +33,7 @@ function HaveReadAndAgreeLabel() {
     return (
         <Text>
             {`${translate('termsStep.haveReadAndAgree')}`}
-            <TextLink href="https://use.expensify.com/esignagreement">{`${translate('termsStep.electronicDisclosures')}.`}</TextLink>
+            <TextLink href={CONST.ELECTRONIC_DISCLOSURES_URL}>{`${translate('termsStep.electronicDisclosures')}.`}</TextLink>
         </Text>
     );
 }
@@ -50,20 +44,21 @@ function AgreeToTheLabel() {
     return (
         <Text>
             {`${translate('termsStep.agreeToThe')} `}
-            <TextLink href="https://use.expensify.com/privacy">{`${translate('common.privacy')} `}</TextLink>
+            <TextLink href={CONST.PRIVACY_URL}>{`${translate('common.privacy')} `}</TextLink>
             {`${translate('common.and')} `}
-            <TextLink href="https://use.expensify.com/walletagreement">{`${translate('termsStep.walletAgreement')}.`}</TextLink>
+            <TextLink href={CONST.WALLET_AGREEMENT_URL}>{`${translate('termsStep.walletAgreement')}.`}</TextLink>
         </Text>
     );
 }
 
-function TermsStep(props) {
+function TermsStep(props: TermsStepProps) {
     const styles = useThemeStyles();
     const [hasAcceptedDisclosure, setHasAcceptedDisclosure] = useState(false);
     const [hasAcceptedPrivacyPolicyAndWalletAgreement, setHasAcceptedPrivacyPolicyAndWalletAgreement] = useState(false);
     const [error, setError] = useState(false);
+    const {translate} = useLocalize();
 
-    const errorMessage = error ? 'common.error.acceptTerms' : ErrorUtils.getLatestErrorMessage(props.walletTerms) || '';
+    const errorMessage = error ? 'common.error.acceptTerms' : ErrorUtils.getLatestErrorMessage(props.walletTerms ?? {}) ?? '';
 
     const toggleDisclosure = () => {
         setHasAcceptedDisclosure(!hasAcceptedDisclosure);
@@ -84,7 +79,7 @@ function TermsStep(props) {
 
     return (
         <>
-            <HeaderWithBackButton title={props.translate('termsStep.headerTitle')} />
+            <HeaderWithBackButton title={translate('termsStep.headerTitle')} />
 
             <ScrollView
                 style={styles.flex1}
@@ -93,18 +88,18 @@ function TermsStep(props) {
                 <ShortTermsForm userWallet={props.userWallet} />
                 <LongTermsForm />
                 <CheckboxWithLabel
-                    accessibilityLabel={props.translate('termsStep.haveReadAndAgree')}
+                    accessibilityLabel={translate('termsStep.haveReadAndAgree')}
                     style={[styles.mb4, styles.mt4]}
                     onInputChange={toggleDisclosure}
                     LabelComponent={HaveReadAndAgreeLabel}
                 />
                 <CheckboxWithLabel
-                    accessibilityLabel={props.translate('termsStep.agreeToThe')}
+                    accessibilityLabel={translate('termsStep.agreeToThe')}
                     onInputChange={togglePrivacyPolicy}
                     LabelComponent={AgreeToTheLabel}
                 />
                 <FormAlertWithSubmitButton
-                    buttonText={props.translate('termsStep.enablePayments')}
+                    buttonText={translate('termsStep.enablePayments')}
                     onSubmit={() => {
                         if (!hasAcceptedDisclosure || !hasAcceptedPrivacyPolicyAndWalletAgreement) {
                             setError(true);
@@ -114,12 +109,12 @@ function TermsStep(props) {
                         setError(false);
                         BankAccounts.acceptWalletTerms({
                             hasAcceptedTerms: hasAcceptedDisclosure && hasAcceptedPrivacyPolicyAndWalletAgreement,
-                            reportID: props.walletTerms.chatReportID,
+                            reportID: props.walletTerms?.chatReportID ?? '',
                         });
                     }}
                     message={errorMessage}
                     isAlertVisible={error || Boolean(errorMessage)}
-                    isLoading={!!props.walletTerms.isLoading}
+                    isLoading={!!props.walletTerms?.isLoading}
                     containerStyles={[styles.mh0, styles.mv4]}
                 />
             </ScrollView>
@@ -128,13 +123,9 @@ function TermsStep(props) {
 }
 
 TermsStep.displayName = 'TermsPage';
-TermsStep.propTypes = propTypes;
-TermsStep.defaultProps = defaultProps;
-export default compose(
-    withLocalize,
-    withOnyx({
-        walletTerms: {
-            key: ONYXKEYS.WALLET_TERMS,
-        },
-    }),
-)(TermsStep);
+
+export default withOnyx<TermsStepProps, TermsStepOnyxProps>({
+    walletTerms: {
+        key: ONYXKEYS.WALLET_TERMS,
+    },
+})(TermsStep);
diff --git a/src/pages/EnablePayments/walletAdditionalDetailsDraftPropTypes.js b/src/pages/EnablePayments/walletAdditionalDetailsDraftPropTypes.js
deleted file mode 100644
index 747fa82f9fa3..000000000000
--- a/src/pages/EnablePayments/walletAdditionalDetailsDraftPropTypes.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.shape({
-    legalFirstName: PropTypes.string,
-    legalLastName: PropTypes.string,
-    addressStreet: PropTypes.string,
-    addressCity: PropTypes.string,
-    addressState: PropTypes.string,
-    addressZip: PropTypes.string,
-    phoneNumber: PropTypes.string,
-    dob: PropTypes.string,
-    ssn: PropTypes.string,
-});
diff --git a/src/pages/EnablePayments/walletOnfidoDataPropTypes.js b/src/pages/EnablePayments/walletOnfidoDataPropTypes.js
deleted file mode 100644
index cedc1f2777b5..000000000000
--- a/src/pages/EnablePayments/walletOnfidoDataPropTypes.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.shape({
-    /** Unique identifier returned from openOnfidoFlow then re-sent to ActivateWallet with Onfido response data */
-    applicantID: PropTypes.string,
-
-    /** Token used to initialize the Onfido SDK token */
-    sdkToken: PropTypes.string,
-
-    /** Loading state to provide feedback when we are waiting for a request to finish */
-    loading: PropTypes.bool,
-
-    /** Error message to inform the user of any problem that might occur */
-    error: PropTypes.string,
-
-    /** A list of Onfido errors that the user can fix in order to attempt the Onfido flow again */
-    fixableErrors: PropTypes.arrayOf(PropTypes.string),
-
-    /** Whether the user has accepted the privacy policy of Onfido or not */
-    hasAcceptedPrivacyPolicy: PropTypes.bool,
-});
diff --git a/src/pages/EnablePayments/walletTermsPropTypes.js b/src/pages/EnablePayments/walletTermsPropTypes.js
deleted file mode 100644
index 4420a2dd0861..000000000000
--- a/src/pages/EnablePayments/walletTermsPropTypes.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import PropTypes from 'prop-types';
-import _ from 'underscore';
-import CONST from '@src/CONST';
-
-/** Prop types related to the Terms step of KYC flow */
-export default PropTypes.shape({
-    /** Any error message to show */
-    errors: PropTypes.objectOf(PropTypes.string),
-
-    /** The source that triggered the KYC wall */
-    source: PropTypes.oneOf(_.values(CONST.KYC_WALL_SOURCE)),
-
-    /** When the user accepts the Wallet's terms in order to pay an IOU, this is the ID of the chatReport the IOU is linked to */
-    chatReportID: PropTypes.string,
-
-    /** Boolean to indicate whether the submission of wallet terms is being processed */
-    isLoading: PropTypes.bool,
-});
diff --git a/src/pages/LogOutPreviousUserPage.tsx b/src/pages/LogOutPreviousUserPage.tsx
index 3df7a4cdb9f3..37402ea8b048 100644
--- a/src/pages/LogOutPreviousUserPage.tsx
+++ b/src/pages/LogOutPreviousUserPage.tsx
@@ -1,22 +1,27 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useEffect} from 'react';
-import {Linking} from 'react-native';
+import React, {useContext, useEffect} from 'react';
+import {NativeModules} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import Navigation from '@libs/Navigation/Navigation';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
 import * as SessionUtils from '@libs/SessionUtils';
+import Navigation from '@navigation/Navigation';
 import type {AuthScreensParamList} from '@navigation/types';
 import * as SessionActions from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {Session} from '@src/types/onyx';
 
 type LogOutPreviousUserPageOnyxProps = {
     /** The data about the current session which will be set once the user is authenticated and we return to this component as an AuthScreen */
     session: OnyxEntry<Session>;
+
+    /** Is the account loading? */
+    isAccountLoading: boolean;
 };
 
 type LogOutPreviousUserPageProps = LogOutPreviousUserPageOnyxProps & StackScreenProps<AuthScreensParamList, typeof SCREENS.TRANSITION_BETWEEN_APPS>;
@@ -25,42 +30,55 @@ type LogOutPreviousUserPageProps = LogOutPreviousUserPageOnyxProps & StackScreen
 // out if the transition is for another user.
 //
 // This component should not do any other navigation as that handled in App.setUpPoliciesAndNavigate
-function LogOutPreviousUserPage({session, route}: LogOutPreviousUserPageProps) {
+function LogOutPreviousUserPage({session, route, isAccountLoading}: LogOutPreviousUserPageProps) {
+    const initialURL = useContext(InitialURLContext);
     useEffect(() => {
-        Linking.getInitialURL().then((transitionURL) => {
-            const sessionEmail = session?.email;
-            const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL ?? undefined, sessionEmail);
-            const isSupportalLogin = route.params.authTokenType === CONST.AUTH_TOKEN_TYPES.SUPPORT;
+        const sessionEmail = session?.email;
+        const transitionURL = NativeModules.HybridAppModule ? `${CONST.DEEPLINK_BASE_URL}${initialURL ?? ''}` : initialURL;
+        const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL ?? undefined, sessionEmail);
+        const isSupportalLogin = route.params.authTokenType === CONST.AUTH_TOKEN_TYPES.SUPPORT;
 
-            if (isLoggingInAsNewUser) {
-                SessionActions.signOutAndRedirectToSignIn(false, isSupportalLogin);
-            }
+        if (isLoggingInAsNewUser) {
+            SessionActions.signOutAndRedirectToSignIn(false, isSupportalLogin);
+            return;
+        }
 
-            if (isSupportalLogin) {
-                SessionActions.signInWithSupportAuthToken(route.params.shortLivedAuthToken ?? '');
-                Navigation.isNavigationReady().then(() => {
-                    // We must call goBack() to remove the /transition route from history
-                    Navigation.goBack();
-                    Navigation.navigate(ROUTES.HOME);
-                });
-                return;
-            }
+        if (isSupportalLogin) {
+            SessionActions.signInWithSupportAuthToken(route.params.shortLivedAuthToken ?? '');
+            Navigation.isNavigationReady().then(() => {
+                // We must call goBack() to remove the /transition route from history
+                Navigation.goBack();
+                Navigation.navigate(ROUTES.HOME);
+            });
+            return;
+        }
 
-            // We need to signin and fetch a new authToken, if a user was already authenticated in NewDot, and was redirected to OldDot
-            // and their authToken stored in Onyx becomes invalid.
-            // This workflow is triggered while setting up VBBA. User is redirected from NewDot to OldDot to set up 2FA, and then redirected back to NewDot
-            // On Enabling 2FA, authToken stored in Onyx becomes expired and hence we need to fetch new authToken
-            const shouldForceLogin = route.params.shouldForceLogin === 'true';
-            if (shouldForceLogin) {
-                const email = route.params.email ?? '';
-                const shortLivedAuthToken = route.params.shortLivedAuthToken ?? '';
-                SessionActions.signInWithShortLivedAuthToken(email, shortLivedAuthToken);
-            }
-        });
+        // We need to signin and fetch a new authToken, if a user was already authenticated in NewDot, and was redirected to OldDot
+        // and their authToken stored in Onyx becomes invalid.
+        // This workflow is triggered while setting up VBBA. User is redirected from NewDot to OldDot to set up 2FA, and then redirected back to NewDot
+        // On Enabling 2FA, authToken stored in Onyx becomes expired and hence we need to fetch new authToken
+        const shouldForceLogin = route.params.shouldForceLogin === 'true';
+        if (shouldForceLogin) {
+            const email = route.params.email ?? '';
+            const shortLivedAuthToken = route.params.shortLivedAuthToken ?? '';
+            SessionActions.signInWithShortLivedAuthToken(email, shortLivedAuthToken);
+        }
+        const exitTo = route.params.exitTo as Route | null;
+        // We don't want to navigate to the exitTo route when creating a new workspace from a deep link,
+        // because we already handle creating the optimistic policy and navigating to it in App.setUpPoliciesAndNavigate,
+        // which is already called when AuthScreens mounts.
+        if (exitTo && exitTo !== ROUTES.WORKSPACE_NEW && !isAccountLoading && !isLoggingInAsNewUser) {
+            Navigation.isNavigationReady().then(() => {
+                // remove this screen and navigate to exit route
+                const exitUrl = NativeModules.HybridAppModule ? Navigation.parseHybridAppUrl(exitTo) : exitTo;
+                Navigation.goBack();
+                Navigation.navigate(exitUrl);
+            });
+        }
 
         // We only want to run this effect once on mount (when the page first loads after transitioning from OldDot)
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [initialURL, isAccountLoading]);
 
     return <FullScreenLoadingIndicator />;
 }
@@ -68,6 +86,10 @@ function LogOutPreviousUserPage({session, route}: LogOutPreviousUserPageProps) {
 LogOutPreviousUserPage.displayName = 'LogOutPreviousUserPage';
 
 export default withOnyx<LogOutPreviousUserPageProps, LogOutPreviousUserPageOnyxProps>({
+    isAccountLoading: {
+        key: ONYXKEYS.ACCOUNT,
+        selector: (account) => account?.isLoading ?? false,
+    },
     session: {
         key: ONYXKEYS.SESSION,
     },
diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 72393e89ae1a..f4eccd52c78e 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -22,7 +22,6 @@ import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {DismissedReferralBanners} from '@src/types/onyx/Account';
 
 type NewChatPageWithOnyxProps = {
     /** All reports shared with the user */
@@ -34,7 +33,7 @@ type NewChatPageWithOnyxProps = {
     betas: OnyxEntry<OnyxTypes.Beta[]>;
 
     /** An object that holds data about which referral banners have been dismissed */
-    dismissedReferralBanners: DismissedReferralBanners;
+    dismissedReferralBanners: OnyxEntry<OnyxTypes.DismissedReferralBanners>;
 
     /** Whether we are searching for reports in the server */
     isSearchingForReports: OnyxEntry<boolean>;
@@ -265,7 +264,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, isSearchingF
                             shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                             shouldShowOptions={isOptionsDataReady && didScreenTransitionEnd}
                             shouldShowConfirmButton
-                            shouldShowReferralCTA={!dismissedReferralBanners[CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT]}
+                            shouldShowReferralCTA={!dismissedReferralBanners?.[CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT]}
                             referralContentType={CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT}
                             confirmButtonText={selectedOptions.length > 1 ? translate('newChatPage.createGroup') : translate('newChatPage.createChat')}
                             textInputAlert={isOffline ? [`${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}`, {isTranslated: true}] : ''}
@@ -287,8 +286,7 @@ NewChatPage.displayName = 'NewChatPage';
 
 export default withOnyx<NewChatPageProps, NewChatPageWithOnyxProps>({
     dismissedReferralBanners: {
-        key: ONYXKEYS.ACCOUNT,
-        selector: (data) => data?.dismissedReferralBanners ?? {},
+        key: ONYXKEYS.NVP_DISMISSED_REFERRAL_BANNERS,
     },
     reports: {
         key: ONYXKEYS.COLLECTION.REPORT,
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js
index 666e233196b6..e8aacadc6e1a 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountStep.js
@@ -185,7 +185,7 @@ function BankAccountStep(props) {
                         </View>
                     )}
                     <View style={[styles.mv0, styles.mh5, styles.flexRow, styles.justifyContentBetween]}>
-                        <TextLink href="https://use.expensify.com/privacy">{props.translate('common.privacy')}</TextLink>
+                        <TextLink href={CONST.PRIVACY_URL}>{props.translate('common.privacy')}</TextLink>
                         <PressableWithoutFeedback
                             onPress={() => Link.openExternalLink('https://community.expensify.com/discussion/5677/deep-dive-how-expensify-protects-your-information/')}
                             style={[styles.flexRow, styles.alignItemsCenter]}
diff --git a/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx b/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx
index 208f7a19ddf3..03a178f186ee 100644
--- a/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx
+++ b/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx
@@ -11,6 +11,7 @@ import useLocalize from '@hooks/useLocalize';
 import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ValidationUtils from '@libs/ValidationUtils';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
 import type {ReimbursementAccount} from '@src/types/onyx';
@@ -62,7 +63,7 @@ function TermsAndConditionsLabel() {
     return (
         <Text>
             {translate('common.iAcceptThe')}
-            <TextLink href="https://use.expensify.com/achterms">{`${translate('completeVerificationStep.termsAndConditions')}`}</TextLink>
+            <TextLink href={CONST.ACH_TERMS_URL}>{`${translate('completeVerificationStep.termsAndConditions')}`}</TextLink>
         </Text>
     );
 }
diff --git a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
index 5d5fa080ff92..6ce8356e7273 100644
--- a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
+++ b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
@@ -65,12 +65,13 @@ function ContinueBankAccountSetup(props) {
                     >
                         <Text>{props.translate('workspace.bankAccount.youreAlmostDone')}</Text>
                         <Button
+                            iconStyles={[styles.customMarginButtonWithMenuItem]}
                             text={props.translate('workspace.bankAccount.continueWithSetup')}
                             onPress={props.continue}
                             icon={Expensicons.Bank}
                             style={[styles.mv4]}
                             shouldShowRightIcon
-                            large
+                            innerStyles={[styles.pr2, styles.pl4, styles.h13]}
                             success
                             isDisabled={Boolean(pendingAction) || !_.isEmpty(errors)}
                         />
diff --git a/src/pages/ValidateLoginPage/index.website.tsx b/src/pages/ValidateLoginPage/index.website.tsx
index 2acad7815754..b8e8709215e8 100644
--- a/src/pages/ValidateLoginPage/index.website.tsx
+++ b/src/pages/ValidateLoginPage/index.website.tsx
@@ -4,6 +4,7 @@ import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import ExpiredValidateCodeModal from '@components/ValidateCode/ExpiredValidateCodeModal';
 import JustSignedInModal from '@components/ValidateCode/JustSignedInModal';
 import ValidateCodeModal from '@components/ValidateCode/ValidateCodeModal';
+import desktopLoginRedirect from '@libs/desktopLoginRedirect';
 import Navigation from '@libs/Navigation/Navigation';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
@@ -43,6 +44,11 @@ function ValidateLoginPage({
 
         // The user has initiated the sign in process on the same browser, in another tab.
         Session.signInWithValidateCode(Number(accountID), validateCode);
+
+        // Since on Desktop we don't have multi-tab functionality to handle the login flow,
+        // we need to `popToTop` the stack after `signInWithValidateCode` in order to
+        // perform login for both 2FA and non-2FA accounts.
+        desktopLoginRedirect(autoAuthState, isSignedIn);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
index cdc3e72f98f4..0923bf4bd7f9 100644
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
@@ -360,8 +360,7 @@ MoneyTemporaryForRefactorRequestParticipantsSelector.displayName = 'MoneyTempora
 
 export default withOnyx({
     dismissedReferralBanners: {
-        key: ONYXKEYS.ACCOUNT,
-        selector: (data) => data.dismissedReferralBanners || {},
+        key: ONYXKEYS.NVP_DISMISSED_REFERRAL_BANNERS,
     },
     reports: {
         key: ONYXKEYS.COLLECTION.REPORT,
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.js b/src/pages/iou/request/step/IOURequestStepConfirmation.js
index 0a6a4cc610a9..2c869354d96f 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.js
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.js
@@ -295,6 +295,7 @@ function IOURequestStepConfirmation({
                     transaction.tag,
                     report.reportID,
                     transaction.billable,
+                    transaction.iouRequestType,
                 );
                 return;
             }
@@ -313,6 +314,7 @@ function IOURequestStepConfirmation({
                     transaction.category,
                     transaction.tag,
                     transaction.billable,
+                    transaction.iouRequestType,
                 );
                 return;
             }
diff --git a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.js b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.js
index 10b16da13b6e..37223915f4a2 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.js
+++ b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.js
@@ -1,61 +1,20 @@
 import PropTypes from 'prop-types';
-import React, {useEffect, useRef} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import Webcam from 'react-webcam';
 import useTabNavigatorFocus from '@hooks/useTabNavigatorFocus';
 
 const propTypes = {
-    /** Flag to turn on/off the torch/flashlight - if available */
-    torchOn: PropTypes.bool,
-
     /** The index of the tab that contains this camera */
     cameraTabIndex: PropTypes.number.isRequired,
-
-    /** Callback function when media stream becomes available - user granted camera permissions and camera starts to work */
-    onUserMedia: PropTypes.func,
-
-    /** Callback function passing torch/flashlight capability as bool param of the browser */
-    onTorchAvailability: PropTypes.func,
-};
-
-const defaultProps = {
-    onUserMedia: undefined,
-    onTorchAvailability: undefined,
-    torchOn: false,
 };
 
 // Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused.
-const NavigationAwareCamera = React.forwardRef(({torchOn, onTorchAvailability, cameraTabIndex, ...props}, ref) => {
-    const trackRef = useRef(null);
+const NavigationAwareCamera = React.forwardRef(({cameraTabIndex, ...props}, ref) => {
     const shouldShowCamera = useTabNavigatorFocus({
         tabIndex: cameraTabIndex,
     });
 
-    const handleOnUserMedia = (stream) => {
-        if (props.onUserMedia) {
-            props.onUserMedia(stream);
-        }
-
-        const [track] = stream.getVideoTracks();
-        const capabilities = track.getCapabilities();
-        if (capabilities.torch) {
-            trackRef.current = track;
-        }
-        if (onTorchAvailability) {
-            onTorchAvailability(!!capabilities.torch);
-        }
-    };
-
-    useEffect(() => {
-        if (!trackRef.current) {
-            return;
-        }
-
-        trackRef.current.applyConstraints({
-            advanced: [{torch: torchOn}],
-        });
-    }, [torchOn]);
-
     if (!shouldShowCamera) {
         return null;
     }
@@ -67,7 +26,6 @@ const NavigationAwareCamera = React.forwardRef(({torchOn, onTorchAvailability, c
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 ref={ref}
-                onUserMedia={handleOnUserMedia}
             />
         </View>
     );
@@ -75,6 +33,5 @@ const NavigationAwareCamera = React.forwardRef(({torchOn, onTorchAvailability, c
 
 NavigationAwareCamera.propTypes = propTypes;
 NavigationAwareCamera.displayName = 'NavigationAwareCamera';
-NavigationAwareCamera.defaultProps = defaultProps;
 
 export default NavigationAwareCamera;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.js b/src/pages/iou/request/step/IOURequestStepScan/index.js
index 7da97c34cc2b..577ee8845292 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.js
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.js
@@ -1,6 +1,7 @@
 import lodashGet from 'lodash/get';
-import React, {useCallback, useContext, useReducer, useRef, useState} from 'react';
+import React, {useCallback, useContext, useEffect, useReducer, useRef, useState} from 'react';
 import {ActivityIndicator, PanResponder, PixelRatio, View} from 'react-native';
+import _ from 'underscore';
 import Hand from '@assets/images/hand.svg';
 import ReceiptUpload from '@assets/images/receipt-upload.svg';
 import Shutter from '@assets/images/shutter.svg';
@@ -15,6 +16,7 @@ import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Text from '@components/Text';
 import transactionPropTypes from '@components/transactionPropTypes';
 import useLocalize from '@hooks/useLocalize';
+import useTabNavigatorFocus from '@hooks/useTabNavigatorFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -74,6 +76,57 @@ function IOURequestStepScan({
     const [isFlashLightOn, toggleFlashlight] = useReducer((state) => !state, false);
     const [isTorchAvailable, setIsTorchAvailable] = useState(false);
     const cameraRef = useRef(null);
+    const trackRef = useRef(null);
+
+    const getScreenshotTimeoutRef = useRef(null);
+
+    const [videoConstraints, setVideoConstraints] = useState(null);
+    const tabIndex = 1;
+    const isTabActive = useTabNavigatorFocus({tabIndex});
+
+    /**
+     * On phones that have ultra-wide lens, react-webcam uses ultra-wide by default.
+     * The last deviceId is of regular len camera.
+     */
+    useEffect(() => {
+        if (!_.isEmpty(videoConstraints) || !isTabActive || !Browser.isMobile()) {
+            return;
+        }
+
+        navigator.mediaDevices.getUserMedia({video: {facingMode: {exact: 'environment'}, zoom: {ideal: 1}}}).then((stream) => {
+            _.forEach(stream.getTracks(), (track) => track.stop());
+            // Only Safari 17+ supports zoom constraint
+            if (Browser.isMobileSafari() && stream.getTracks().length > 0) {
+                const deviceId = _.chain(stream.getTracks())
+                    .map((track) => track.getSettings())
+                    .find((setting) => setting.zoom === 1)
+                    .get('deviceId')
+                    .value();
+                if (deviceId) {
+                    setVideoConstraints({deviceId});
+                    return;
+                }
+            }
+            if (!navigator.mediaDevices.enumerateDevices) {
+                setVideoConstraints({facingMode: {exact: 'environment'}});
+                return;
+            }
+            navigator.mediaDevices.enumerateDevices().then((devices) => {
+                const lastBackDeviceId = _.chain(devices)
+                    .filter((item) => item.kind === 'videoinput')
+                    .last()
+                    .get('deviceId', '')
+                    .value();
+
+                if (!lastBackDeviceId) {
+                    setVideoConstraints({facingMode: {exact: 'environment'}});
+                    return;
+                }
+                setVideoConstraints({deviceId: lastBackDeviceId});
+            });
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [isTabActive]);
 
     const hideRecieptModal = () => {
         setIsAttachmentInvalid(false);
@@ -162,11 +215,24 @@ function IOURequestStepScan({
         navigateToConfirmationStep();
     };
 
-    const capturePhoto = useCallback(() => {
-        if (!cameraRef.current.getScreenshot) {
+    const setupCameraPermissionsAndCapabilities = (stream) => {
+        setCameraPermissionState('granted');
+
+        const [track] = stream.getVideoTracks();
+        const capabilities = track.getCapabilities();
+        if (capabilities.torch) {
+            trackRef.current = track;
+        }
+        setIsTorchAvailable(!!capabilities.torch);
+    };
+
+    const getScreenshot = useCallback(() => {
+        if (!cameraRef.current) {
             return;
         }
+
         const imageBase64 = cameraRef.current.getScreenshot();
+
         const filename = `receipt_${Date.now()}.png`;
         const file = FileUtils.base64ToFile(imageBase64, filename);
         const source = URL.createObjectURL(file);
@@ -178,7 +244,34 @@ function IOURequestStepScan({
         }
 
         navigateToConfirmationStep();
-    }, [cameraRef, action, transactionID, updateScanAndNavigate, navigateToConfirmationStep]);
+    }, [action, transactionID, updateScanAndNavigate, navigateToConfirmationStep]);
+
+    const clearTorchConstraints = useCallback(() => {
+        if (!trackRef.current) {
+            return;
+        }
+        trackRef.current.applyConstraints({
+            advanced: [{torch: false}],
+        });
+    }, []);
+
+    const capturePhoto = useCallback(() => {
+        if (trackRef.current && isFlashLightOn) {
+            trackRef.current
+                .applyConstraints({
+                    advanced: [{torch: true}],
+                })
+                .then(() => {
+                    getScreenshotTimeoutRef.current = setTimeout(() => {
+                        getScreenshot();
+                        clearTorchConstraints();
+                    }, 2000);
+                });
+            return;
+        }
+
+        getScreenshot();
+    }, [isFlashLightOn, getScreenshot, clearTorchConstraints]);
 
     const panResponder = useRef(
         PanResponder.create({
@@ -186,6 +279,16 @@ function IOURequestStepScan({
         }),
     ).current;
 
+    useEffect(
+        () => () => {
+            if (!getScreenshotTimeoutRef.current) {
+                return;
+            }
+            clearTimeout(getScreenshotTimeoutRef.current);
+        },
+        [],
+    );
+
     const mobileCameraView = () => (
         <>
             <View style={[styles.cameraView]}>
@@ -208,18 +311,18 @@ function IOURequestStepScan({
                         <Text style={[styles.subTextReceiptUpload]}>{translate('receipt.cameraAccess')}</Text>
                     </View>
                 )}
-                <NavigationAwareCamera
-                    onUserMedia={() => setCameraPermissionState('granted')}
-                    onUserMediaError={() => setCameraPermissionState('denied')}
-                    style={{...styles.videoContainer, display: cameraPermissionState !== 'granted' ? 'none' : 'block'}}
-                    ref={cameraRef}
-                    screenshotFormat="image/png"
-                    videoConstraints={{facingMode: {exact: 'environment'}}}
-                    torchOn={isFlashLightOn}
-                    onTorchAvailability={setIsTorchAvailable}
-                    forceScreenshotSourceSize
-                    cameraTabIndex={1}
-                />
+                {!_.isEmpty(videoConstraints) && (
+                    <NavigationAwareCamera
+                        onUserMedia={setupCameraPermissionsAndCapabilities}
+                        onUserMediaError={() => setCameraPermissionState('denied')}
+                        style={{...styles.videoContainer, display: cameraPermissionState !== 'granted' ? 'none' : 'block'}}
+                        ref={cameraRef}
+                        screenshotFormat="image/png"
+                        videoConstraints={videoConstraints}
+                        forceScreenshotSourceSize
+                        cameraTabIndex={tabIndex}
+                    />
+                )}
             </View>
 
             <View style={[styles.flexRow, styles.justifyContentAround, styles.alignItemsCenter, styles.pv3]}>
diff --git a/src/pages/iou/request/step/IOURequestStepTag.js b/src/pages/iou/request/step/IOURequestStepTag.js
index a0d148dab085..79ed26b76b19 100644
--- a/src/pages/iou/request/step/IOURequestStepTag.js
+++ b/src/pages/iou/request/step/IOURequestStepTag.js
@@ -144,7 +144,7 @@ function IOURequestStepTag({
         >
             {({insets}) => (
                 <>
-                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagName: policyTagListName})}</Text>
+                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection')}</Text>
                     <TagPicker
                         policyID={report.policyID}
                         tag={policyTagListName}
diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
index a095b2418b82..8375d9122340 100644
--- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
+++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
@@ -1,10 +1,10 @@
 import {useNavigation} from '@react-navigation/native';
 import React, {useMemo, useRef, useState} from 'react';
-import {View} from 'react-native';
 import type {TextInput} from 'react-native';
+import {View} from 'react-native';
 import type {Place} from 'react-native-google-places-autocomplete';
-import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import AddressSearch from '@components/AddressSearch';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
@@ -124,8 +124,10 @@ function IOURequestStepWaypoint({
         // Therefore, we're going to save the waypoint as just the address, and the lat/long will be filled in on the backend
         if (isOffline && waypointValue) {
             const waypoint = {
-                address: waypointValue,
-                name: values.name,
+                address: waypointValue ?? '',
+                name: values.name ?? '',
+                lat: values.lat ?? 0,
+                lng: values.lng ?? 0,
             };
             saveWaypoint(waypoint);
         }
@@ -142,10 +144,10 @@ function IOURequestStepWaypoint({
 
     const selectWaypoint = (values: Waypoint) => {
         const waypoint = {
-            lat: values.lat,
-            lng: values.lng,
-            address: values.address,
-            name: values.name,
+            lat: values.lat ?? 0,
+            lng: values.lng ?? 0,
+            address: values.address ?? '',
+            name: values.name ?? '',
         };
 
         Transaction.saveWaypoint(transactionID, pageIndex, waypoint, action === CONST.IOU.ACTION.CREATE);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
index fd869973d36a..07b80a371ea6 100755
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -373,8 +373,7 @@ MoneyRequestParticipantsSelector.defaultProps = defaultProps;
 
 export default withOnyx({
     dismissedReferralBanners: {
-        key: ONYXKEYS.ACCOUNT,
-        selector: (data) => data.dismissedReferralBanners || {},
+        key: ONYXKEYS.NVP_DISMISSED_REFERRAL_BANNERS,
     },
     reports: {
         key: ONYXKEYS.COLLECTION.REPORT,
diff --git a/src/pages/workspace/FeatureEnabledAccessOrNotFoundWrapper.tsx b/src/pages/workspace/FeatureEnabledAccessOrNotFoundWrapper.tsx
new file mode 100644
index 000000000000..3bcdc1fe3303
--- /dev/null
+++ b/src/pages/workspace/FeatureEnabledAccessOrNotFoundWrapper.tsx
@@ -0,0 +1,74 @@
+/* eslint-disable rulesdir/no-negated-variables */
+import React, {useEffect} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as Policy from '@userActions/Policy';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {PolicyFeatureName} from '@src/types/onyx/Policy';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type FeatureEnabledAccessOrNotFoundOnyxProps = {
+    /** The report currently being looked at */
+    policy: OnyxEntry<OnyxTypes.Policy>;
+
+    /** Indicated whether the report data is loading */
+    isLoadingReportData: OnyxEntry<boolean>;
+};
+
+type FeatureEnabledAccessOrNotFoundComponentProps = FeatureEnabledAccessOrNotFoundOnyxProps & {
+    /** The children to render */
+    children: ((props: FeatureEnabledAccessOrNotFoundOnyxProps) => React.ReactNode) | React.ReactNode;
+
+    /** The report currently being looked at */
+    policyID: string;
+
+    /** The current feature name that the user tries to get access */
+    featureName: PolicyFeatureName;
+};
+
+function FeatureEnabledAccessOrNotFoundComponent(props: FeatureEnabledAccessOrNotFoundComponentProps) {
+    const isPolicyIDInRoute = !!props.policyID?.length;
+    const shouldShowFullScreenLoadingIndicator = props.isLoadingReportData !== false && (!Object.entries(props.policy ?? {}).length || !props.policy?.id);
+    const shouldShowNotFoundPage = isEmptyObject(props.policy) || !props.policy?.id || !PolicyUtils.isPolicyFeatureEnabled(props.policy, props.featureName);
+
+    useEffect(() => {
+        if (!isPolicyIDInRoute || !isEmptyObject(props.policy)) {
+            // If the workspace is not required or is already loaded, we don't need to call the API
+            return;
+        }
+
+        Policy.openWorkspace(props.policyID, []);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [isPolicyIDInRoute, props.policyID]);
+
+    if (shouldShowFullScreenLoadingIndicator) {
+        return <FullscreenLoadingIndicator />;
+    }
+
+    if (shouldShowNotFoundPage) {
+        return (
+            <FullPageNotFoundView
+                shouldShow={shouldShowNotFoundPage}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
+                shouldForceFullScreen
+            />
+        );
+    }
+
+    return typeof props.children === 'function' ? props.children(props) : props.children;
+}
+
+export default withOnyx<FeatureEnabledAccessOrNotFoundComponentProps, FeatureEnabledAccessOrNotFoundOnyxProps>({
+    policy: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID ?? ''}`,
+    },
+    isLoadingReportData: {
+        key: ONYXKEYS.IS_LOADING_REPORT_DATA,
+    },
+})(FeatureEnabledAccessOrNotFoundComponent);
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 9a56a2da0314..0d3bb027b8e6 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -249,7 +249,6 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, policyMembers, r
         <ScreenWrapper
             testID={WorkspaceInitialPage.displayName}
             includeSafeAreaPaddingBottom={false}
-            style={[styles.pb0]}
         >
             <FullPageNotFoundView
                 onBackButtonPress={Navigation.dismissModal}
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
index df1d3cd63011..a9d8860ae12a 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -1,4 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import lodashDebounce from 'lodash/debounce';
 import React, {useEffect, useState} from 'react';
 import {Keyboard, View} from 'react-native';
@@ -52,6 +53,8 @@ type WorkspaceInviteMessagePageProps = WithPolicyAndFullscreenLoadingProps &
     WorkspaceInviteMessagePageOnyxProps &
     StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVITE_MESSAGE>;
 
+const parser = new ExpensiMark();
+
 function WorkspaceInviteMessagePage({workspaceInviteMessageDraft, invitedEmailsToAccountIDsDraft, policy, route, allPersonalDetails}: WorkspaceInviteMessagePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -64,20 +67,25 @@ function WorkspaceInviteMessagePage({workspaceInviteMessageDraft, invitedEmailsT
         // workspaceInviteMessageDraft can be an empty string
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         workspaceInviteMessageDraft ||
-        translate('workspace.inviteMessage.welcomeNote', {
-            workspaceName: policy?.name ?? '',
-        });
+        // policy?.description can be an empty string
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        policy?.description ||
+        parser.replace(
+            translate('workspace.common.welcomeNote', {
+                workspaceName: policy?.name ?? '',
+            }),
+        );
 
     useEffect(() => {
         if (!isEmptyObject(invitedEmailsToAccountIDsDraft)) {
-            setWelcomeNote(getDefaultWelcomeNote());
+            setWelcomeNote(parser.htmlToMarkdown(getDefaultWelcomeNote()));
             return;
         }
         Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID), true);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    const debouncedSaveDraft = lodashDebounce((newDraft: string) => {
+    const debouncedSaveDraft = lodashDebounce((newDraft: string | null) => {
         Policy.setWorkspaceInviteMessageDraft(route.params.policyID, newDraft);
     });
 
@@ -85,6 +93,7 @@ function WorkspaceInviteMessagePage({workspaceInviteMessageDraft, invitedEmailsT
         Keyboard.dismiss();
         // Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
         Policy.addMembersToWorkspace(invitedEmailsToAccountIDsDraft ?? {}, welcomeNote ?? '', route.params.policyID);
+        debouncedSaveDraft(null);
         SearchInputManager.searchInput = '';
         // Pop the invite message page before navigating to the members page.
         Navigation.goBack();
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.tsx b/src/pages/workspace/WorkspaceNewRoomPage.tsx
index 69f2d74b6be7..d92c650fa9c7 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.tsx
+++ b/src/pages/workspace/WorkspaceNewRoomPage.tsx
@@ -35,7 +35,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {NewRoomForm} from '@src/types/form/NewRoomForm';
 import INPUT_IDS from '@src/types/form/NewRoomForm';
-import type {Account, Policy, Report as ReportType, Session} from '@src/types/onyx';
+import type {Policy, Report as ReportType, Session} from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
@@ -53,7 +53,7 @@ type WorkspaceNewRoomPageOnyxProps = {
     session: OnyxEntry<Session>;
 
     /** policyID for main workspace */
-    activePolicyID: OnyxEntry<Required<Account>['activePolicyID']>;
+    activePolicyID: OnyxEntry<Required<string>>;
 };
 
 type WorkspaceNewRoomPageProps = WorkspaceNewRoomPageOnyxProps;
@@ -343,8 +343,7 @@ export default withOnyx<WorkspaceNewRoomPageProps, WorkspaceNewRoomPageOnyxProps
         key: ONYXKEYS.SESSION,
     },
     activePolicyID: {
-        key: ONYXKEYS.ACCOUNT,
-        selector: (account) => account?.activePolicyID ?? null,
+        key: ONYXKEYS.NVP_ACTIVE_POLICY_ID,
         initialValue: null,
     },
 })(WorkspaceNewRoomPage);
diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index 46a83dd2b166..bd8ec5b03f05 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -26,7 +26,18 @@ const parser = new ExpensiMark();
 function WorkspaceProfileDescriptionPage({policy}: Props) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const [description, setDescription] = useState(() => parser.htmlToMarkdown(policy?.description ?? ''));
+    const [description, setDescription] = useState(() =>
+        parser.htmlToMarkdown(
+            // policy?.description can be an empty string
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            policy?.description ||
+                parser.replace(
+                    translate('workspace.common.welcomeNote', {
+                        workspaceName: policy?.name ?? '',
+                    }),
+                ),
+        ),
+    );
 
     /**
      * @param {Object} values - form input values passed by the Form component
diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 59c66f0c06a7..7169d8a4ab7c 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -1,3 +1,4 @@
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React, {useCallback, useState} from 'react';
 import type {ImageStyle, StyleProp} from 'react-native';
 import {Image, StyleSheet, View} from 'react-native';
@@ -19,6 +20,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeIllustrations from '@hooks/useThemeIllustrations';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -41,6 +43,8 @@ type WorkSpaceProfilePageOnyxProps = {
 
 type WorkSpaceProfilePageProps = WithPolicyProps & WorkSpaceProfilePageOnyxProps;
 
+const parser = new ExpensiMark();
+
 function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfilePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -58,7 +62,15 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
     const onPressShare = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_SHARE.getRoute(policy?.id ?? '')), [policy?.id]);
 
     const policyName = policy?.name ?? '';
-    const policyDescription = policy?.description ?? '';
+    const policyDescription =
+        // policy?.description can be an empty string
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        policy?.description ||
+        parser.replace(
+            translate('workspace.common.welcomeNote', {
+                workspaceName: policy?.name ?? '',
+            }),
+        );
     const readOnly = !PolicyUtils.isPolicyAdmin(policy);
     const imageStyle: StyleProp<ImageStyle> = isSmallScreenWidth ? [styles.mhv12, styles.mhn5, styles.mbn5] : [styles.mhv8, styles.mhn8, styles.mbn5];
 
@@ -162,7 +174,11 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                                 />
                             </OfflineWithFeedback>
                             {(!StringUtils.isEmptyString(policy?.description ?? '') || !readOnly) && (
-                                <OfflineWithFeedback pendingAction={policy?.pendingFields?.description}>
+                                <OfflineWithFeedback
+                                    pendingAction={policy?.pendingFields?.description}
+                                    errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
+                                    onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
+                                >
                                     <MenuItemWithTopDescription
                                         title={policyDescription}
                                         description={translate('workspace.editor.descriptionInputLabel')}
@@ -176,7 +192,12 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                                     />
                                 </OfflineWithFeedback>
                             )}
-                            <OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
+                            <OfflineWithFeedback
+                                pendingAction={policy?.pendingFields?.generalSettings}
+                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
+                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
+                                errorRowStyles={[styles.mt2]}
+                            >
                                 <View>
                                     <MenuItemWithTopDescription
                                         title={formattedCurrency}
diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
index 1fa3fdcdd042..5f6ec26cab10 100644
--- a/src/pages/workspace/categories/CategorySettingsPage.tsx
+++ b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -20,8 +20,10 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -71,53 +73,58 @@ function CategorySettingsPage({route, policyCategories}: CategorySettingsPagePro
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={CategorySettingsPage.displayName}
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        shouldShowThreeDotsButton
-                        title={route.params.categoryName}
-                        threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
-                        threeDotsMenuItems={threeDotsMenuItems}
-                    />
-                    <ConfirmModal
-                        isVisible={deleteCategoryConfirmModalVisible}
-                        onConfirm={deleteCategory}
-                        onCancel={() => setDeleteCategoryConfirmModalVisible(false)}
-                        title={translate('workspace.categories.deleteCategory')}
-                        prompt={translate('workspace.categories.deleteCategoryPrompt')}
-                        confirmText={translate('common.delete')}
-                        cancelText={translate('common.cancel')}
-                        danger
-                    />
-                    <View style={styles.flexGrow1}>
-                        <OfflineWithFeedback
-                            errors={ErrorUtils.getLatestErrorMessageField(policyCategory)}
-                            pendingAction={policyCategory?.pendingFields?.enabled}
-                            errorRowStyles={styles.mh5}
-                            onClose={() => Policy.clearCategoryErrors(route.params.policyID, route.params.categoryName)}
-                        >
-                            <View style={[styles.mt2, styles.mh5]}>
-                                <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                    <Text>{translate('workspace.categories.enableCategory')}</Text>
-                                    <Switch
-                                        isOn={policyCategory.enabled}
-                                        accessibilityLabel={translate('workspace.categories.enableCategory')}
-                                        onToggle={updateWorkspaceRequiresCategory}
-                                    />
-                                </View>
-                            </View>
-                        </OfflineWithFeedback>
-                        <MenuItemWithTopDescription
-                            title={policyCategory.name}
-                            description={translate(`workspace.categories.categoryName`)}
-                            onPress={navigateToEditCategory}
-                            shouldShowRightIcon
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={CategorySettingsPage.displayName}
+                    >
+                        <HeaderWithBackButton
+                            shouldShowThreeDotsButton
+                            title={route.params.categoryName}
+                            threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
+                            threeDotsMenuItems={threeDotsMenuItems}
+                        />
+                        <ConfirmModal
+                            isVisible={deleteCategoryConfirmModalVisible}
+                            onConfirm={deleteCategory}
+                            onCancel={() => setDeleteCategoryConfirmModalVisible(false)}
+                            title={translate('workspace.categories.deleteCategory')}
+                            prompt={translate('workspace.categories.deleteCategoryPrompt')}
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
                         />
-                    </View>
-                </ScreenWrapper>
+                        <View style={styles.flexGrow1}>
+                            <OfflineWithFeedback
+                                errors={ErrorUtils.getLatestErrorMessageField(policyCategory)}
+                                pendingAction={policyCategory?.pendingFields?.enabled}
+                                errorRowStyles={styles.mh5}
+                                onClose={() => Policy.clearCategoryErrors(route.params.policyID, route.params.categoryName)}
+                            >
+                                <View style={[styles.mt2, styles.mh5]}>
+                                    <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                        <Text>{translate('workspace.categories.enableCategory')}</Text>
+                                        <Switch
+                                            isOn={policyCategory.enabled}
+                                            accessibilityLabel={translate('workspace.categories.enableCategory')}
+                                            onToggle={updateWorkspaceRequiresCategory}
+                                        />
+                                    </View>
+                                </View>
+                            </OfflineWithFeedback>
+                            <MenuItemWithTopDescription
+                                title={policyCategory.name}
+                                description={translate(`workspace.categories.categoryName`)}
+                                onPress={navigateToEditCategory}
+                                shouldShowRightIcon
+                            />
+                        </View>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/categories/CreateCategoryPage.tsx b/src/pages/workspace/categories/CreateCategoryPage.tsx
index 80370d2197fa..b31207e73208 100644
--- a/src/pages/workspace/categories/CreateCategoryPage.tsx
+++ b/src/pages/workspace/categories/CreateCategoryPage.tsx
@@ -10,8 +10,10 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type {PolicyCategories} from '@src/types/onyx';
@@ -38,21 +40,26 @@ function CreateCategoryPage({route, policyCategories}: CreateCategoryPageProps)
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={CreateCategoryPage.displayName}
-                    shouldEnableMaxHeight
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        title={translate('workspace.categories.addCategory')}
-                        onBackButtonPress={Navigation.goBack}
-                    />
-                    <CategoryForm
-                        onSubmit={createCategory}
-                        policyCategories={policyCategories}
-                    />
-                </ScreenWrapper>
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={CreateCategoryPage.displayName}
+                        shouldEnableMaxHeight
+                    >
+                        <HeaderWithBackButton
+                            title={translate('workspace.categories.addCategory')}
+                            onBackButtonPress={Navigation.goBack}
+                        />
+                        <CategoryForm
+                            onSubmit={createCategory}
+                            policyCategories={policyCategories}
+                        />
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx
index 11df2f195f9d..0e5ed0589934 100644
--- a/src/pages/workspace/categories/EditCategoryPage.tsx
+++ b/src/pages/workspace/categories/EditCategoryPage.tsx
@@ -10,8 +10,10 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -40,22 +42,27 @@ function EditCategoryPage({route, policyCategories}: EditCategoryPageProps) {
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={EditCategoryPage.displayName}
-                    shouldEnableMaxHeight
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        title={translate('workspace.categories.editCategory')}
-                        onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))}
-                    />
-                    <CategoryForm
-                        onSubmit={editCategory}
-                        categoryName={currentCategoryName}
-                        policyCategories={policyCategories}
-                    />
-                </ScreenWrapper>
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={EditCategoryPage.displayName}
+                        shouldEnableMaxHeight
+                    >
+                        <HeaderWithBackButton
+                            title={translate('workspace.categories.editCategory')}
+                            onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))}
+                        />
+                        <CategoryForm
+                            onSubmit={editCategory}
+                            categoryName={currentCategoryName}
+                            policyCategories={policyCategories}
+                        />
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 74b439004020..f3456c3875f5 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -28,6 +28,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
@@ -228,7 +229,7 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
                     buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
                     customText={translate('workspace.common.selected', {selectedNumber: selectedCategoriesArray.length})}
                     options={options}
-                    style={[isSmallScreenWidth && styles.w50, isSmallScreenWidth && styles.mb3]}
+                    style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
                 />
             );
         }
@@ -263,62 +264,67 @@ function WorkspaceCategoriesPage({policy, policyCategories, route}: WorkspaceCat
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={WorkspaceCategoriesPage.displayName}
-                    shouldShowOfflineIndicatorInWideScreen
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        icon={Illustrations.FolderOpen}
-                        title={translate('workspace.common.categories')}
-                        shouldShowBackButton={isSmallScreenWidth}
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={WorkspaceCategoriesPage.displayName}
+                        shouldShowOfflineIndicatorInWideScreen
                     >
-                        {!isSmallScreenWidth && getHeaderButtons()}
-                    </HeaderWithBackButton>
-                    <ConfirmModal
-                        isVisible={deleteCategoriesConfirmModalVisible}
-                        onConfirm={handleDeleteCategories}
-                        onCancel={() => setDeleteCategoriesConfirmModalVisible(false)}
-                        title={translate(selectedCategoriesArray.length === 1 ? 'workspace.categories.deleteCategory' : 'workspace.categories.deleteCategories')}
-                        prompt={translate(selectedCategoriesArray.length === 1 ? 'workspace.categories.deleteCategoryPrompt' : 'workspace.categories.deleteCategoriesPrompt')}
-                        confirmText={translate('common.delete')}
-                        cancelText={translate('common.cancel')}
-                        danger
-                    />
-                    {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
-                    <View style={[styles.ph5, styles.pb5, styles.pt3]}>
-                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.categories.subtitle')}</Text>
-                    </View>
-                    {isLoading && (
-                        <ActivityIndicator
-                            size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
-                            style={[styles.flex1]}
-                            color={theme.spinner}
-                        />
-                    )}
-                    {shouldShowEmptyState && (
-                        <WorkspaceEmptyStateSection
-                            title={translate('workspace.categories.emptyCategories.title')}
-                            icon={Illustrations.EmptyStateExpenses}
-                            subtitle={translate('workspace.categories.emptyCategories.subtitle')}
-                        />
-                    )}
-                    {!shouldShowEmptyState && (
-                        <SelectionList
-                            canSelectMultiple
-                            sections={[{data: categoryList, indexOffset: 0, isDisabled: false}]}
-                            onCheckboxPress={toggleCategory}
-                            onSelectRow={navigateToCategorySettings}
-                            onSelectAll={toggleAllCategories}
-                            showScrollIndicator
-                            ListItem={TableListItem}
-                            onDismissError={dismissError}
-                            customListHeader={getCustomListHeader()}
-                            listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        <HeaderWithBackButton
+                            icon={Illustrations.FolderOpen}
+                            title={translate('workspace.common.categories')}
+                            shouldShowBackButton={isSmallScreenWidth}
+                        >
+                            {!isSmallScreenWidth && getHeaderButtons()}
+                        </HeaderWithBackButton>
+                        <ConfirmModal
+                            isVisible={deleteCategoriesConfirmModalVisible}
+                            onConfirm={handleDeleteCategories}
+                            onCancel={() => setDeleteCategoriesConfirmModalVisible(false)}
+                            title={translate(selectedCategoriesArray.length === 1 ? 'workspace.categories.deleteCategory' : 'workspace.categories.deleteCategories')}
+                            prompt={translate(selectedCategoriesArray.length === 1 ? 'workspace.categories.deleteCategoryPrompt' : 'workspace.categories.deleteCategoriesPrompt')}
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
                         />
-                    )}
-                </ScreenWrapper>
+                        {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
+                        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+                            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.categories.subtitle')}</Text>
+                        </View>
+                        {isLoading && (
+                            <ActivityIndicator
+                                size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                                style={[styles.flex1]}
+                                color={theme.spinner}
+                            />
+                        )}
+                        {shouldShowEmptyState && (
+                            <WorkspaceEmptyStateSection
+                                title={translate('workspace.categories.emptyCategories.title')}
+                                icon={Illustrations.EmptyStateExpenses}
+                                subtitle={translate('workspace.categories.emptyCategories.subtitle')}
+                            />
+                        )}
+                        {!shouldShowEmptyState && (
+                            <SelectionList
+                                canSelectMultiple
+                                sections={[{data: categoryList, indexOffset: 0, isDisabled: false}]}
+                                onCheckboxPress={toggleCategory}
+                                onSelectRow={navigateToCategorySettings}
+                                onSelectAll={toggleAllCategories}
+                                showScrollIndicator
+                                ListItem={TableListItem}
+                                onDismissError={dismissError}
+                                customListHeader={getCustomListHeader()}
+                                listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                            />
+                        )}
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
index 6939bac56894..0ec937b19ba2 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -11,7 +11,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {setWorkspaceRequiresCategory} from '@libs/actions/Policy';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 
 type WorkspaceCategoriesSettingsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.CATEGORIES_SETTINGS>;
@@ -27,34 +29,39 @@ function WorkspaceCategoriesSettingsPage({route}: WorkspaceCategoriesSettingsPag
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                {({policy}) => (
-                    <ScreenWrapper
-                        includeSafeAreaPaddingBottom={false}
-                        style={[styles.defaultModalContainer]}
-                        testID={WorkspaceCategoriesSettingsPage.displayName}
-                    >
-                        <HeaderWithBackButton title={translate('common.settings')} />
-                        <View style={styles.flexGrow1}>
-                            <OfflineWithFeedback
-                                errors={policy?.errorFields?.requiresCategory}
-                                pendingAction={policy?.pendingFields?.requiresCategory}
-                                errorRowStyles={styles.mh5}
-                            >
-                                <View style={[styles.mt2, styles.mh4]}>
-                                    <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.categories.requiresCategory')}</Text>
-                                        <Switch
-                                            isOn={policy?.requiresCategory ?? false}
-                                            accessibilityLabel={translate('workspace.categories.requiresCategory')}
-                                            onToggle={updateWorkspaceRequiresCategory}
-                                            disabled={!policy?.areCategoriesEnabled}
-                                        />
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
+                >
+                    {({policy}) => (
+                        <ScreenWrapper
+                            includeSafeAreaPaddingBottom={false}
+                            style={[styles.defaultModalContainer]}
+                            testID={WorkspaceCategoriesSettingsPage.displayName}
+                        >
+                            <HeaderWithBackButton title={translate('common.settings')} />
+                            <View style={styles.flexGrow1}>
+                                <OfflineWithFeedback
+                                    errors={policy?.errorFields?.requiresCategory}
+                                    pendingAction={policy?.pendingFields?.requiresCategory}
+                                    errorRowStyles={styles.mh5}
+                                >
+                                    <View style={[styles.mt2, styles.mh4]}>
+                                        <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.categories.requiresCategory')}</Text>
+                                            <Switch
+                                                isOn={policy?.requiresCategory ?? false}
+                                                accessibilityLabel={translate('workspace.categories.requiresCategory')}
+                                                onToggle={updateWorkspaceRequiresCategory}
+                                                disabled={!policy?.areCategoriesEnabled}
+                                            />
+                                        </View>
                                     </View>
-                                </View>
-                            </OfflineWithFeedback>
-                        </View>
-                    </ScreenWrapper>
-                )}
+                                </OfflineWithFeedback>
+                            </View>
+                        </ScreenWrapper>
+                    )}
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/distanceRates/CategorySelector/CategorySelectorModal.tsx b/src/pages/workspace/distanceRates/CategorySelector/CategorySelectorModal.tsx
new file mode 100644
index 000000000000..b48456ecce79
--- /dev/null
+++ b/src/pages/workspace/distanceRates/CategorySelector/CategorySelectorModal.tsx
@@ -0,0 +1,65 @@
+import React from 'react';
+import CategoryPicker from '@components/CategoryPicker';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import type {ListItem} from '@components/SelectionList/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+
+type CategorySelectorModalProps = {
+    /** The ID of the associated policy */
+    policyID: string;
+
+    /** Whether the modal is visible */
+    isVisible: boolean;
+
+    /** Selected category  */
+    currentCategory: string;
+
+    /** Function to call when the user selects a category */
+    onCategorySelected: (value: ListItem) => void;
+
+    /** Function to call when the user closes the category selector modal */
+    onClose: () => void;
+
+    /** Label to display on field */
+    label: string;
+};
+
+function CategorySelectorModal({policyID, isVisible, currentCategory, onCategorySelected, onClose, label}: CategorySelectorModalProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <Modal
+            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
+            isVisible={isVisible}
+            onClose={onClose}
+            onModalHide={onClose}
+            hideModalContentWhileAnimating
+            useNativeDriver
+        >
+            <ScreenWrapper
+                style={[styles.pb0]}
+                includePaddingTop={false}
+                includeSafeAreaPaddingBottom={false}
+                testID={CategorySelectorModal.displayName}
+            >
+                <HeaderWithBackButton
+                    title={label}
+                    shouldShowBackButton
+                    onBackButtonPress={onClose}
+                />
+                <CategoryPicker
+                    policyID={policyID}
+                    selectedCategory={currentCategory}
+                    onSubmit={onCategorySelected}
+                />
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+CategorySelectorModal.displayName = 'CategorySelectorModal';
+
+export default CategorySelectorModal;
diff --git a/src/pages/workspace/distanceRates/CategorySelector/index.tsx b/src/pages/workspace/distanceRates/CategorySelector/index.tsx
new file mode 100644
index 000000000000..f7a1ba49d91e
--- /dev/null
+++ b/src/pages/workspace/distanceRates/CategorySelector/index.tsx
@@ -0,0 +1,71 @@
+import React, {useState} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import type {ListItem} from '@components/SelectionList/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CategorySelectorModal from './CategorySelectorModal';
+
+type CategorySelectorProps = {
+    /** The ID of the associated policy */
+    policyID: string;
+
+    /** Function to call when the user selects a category */
+    setNewCategory: (value: ListItem) => void;
+
+    /** Currently selected category */
+    defaultValue?: string;
+
+    /** Label to display on field */
+    label: string;
+
+    /** Any additional styles to apply */
+    wrapperStyle: StyleProp<ViewStyle>;
+};
+
+function CategorySelector({defaultValue = '', wrapperStyle, label, setNewCategory, policyID}: CategorySelectorProps) {
+    const styles = useThemeStyles();
+
+    const [isPickerVisible, setIsPickerVisible] = useState(false);
+
+    const showPickerModal = () => {
+        setIsPickerVisible(true);
+    };
+
+    const hidePickerModal = () => {
+        setIsPickerVisible(false);
+    };
+
+    const updateCategoryInput = (categoryItem: ListItem) => {
+        setNewCategory(categoryItem);
+        hidePickerModal();
+    };
+
+    const title = defaultValue;
+    const descStyle = title.length === 0 ? styles.textNormal : null;
+
+    return (
+        <View>
+            <MenuItemWithTopDescription
+                shouldShowRightIcon
+                title={title}
+                description={label}
+                descriptionTextStyle={descStyle}
+                onPress={showPickerModal}
+                wrapperStyle={wrapperStyle}
+            />
+            <CategorySelectorModal
+                policyID={policyID}
+                isVisible={isPickerVisible}
+                currentCategory={defaultValue}
+                onClose={hidePickerModal}
+                onCategorySelected={updateCategoryInput}
+                label={label}
+            />
+        </View>
+    );
+}
+
+CategorySelector.displayName = 'CategorySelector';
+
+export default CategorySelector;
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index b29a3cd9a9b5..32531da0dd25 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -24,6 +24,7 @@ import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
 import ButtonWithDropdownMenu from '@src/components/ButtonWithDropdownMenu';
@@ -110,7 +111,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     };
 
     const openSettings = () => {
-        // Navigation.navigate(ROUTES.WORKSPACE_DISTANCE_RATES_SETTINGS.getRoute(policyID));
+        Navigation.navigate(ROUTES.WORKSPACE_DISTANCE_RATES_SETTINGS.getRoute(policyID));
     };
 
     const editRate = () => {
@@ -237,53 +238,58 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={PolicyDistanceRatesPage.displayName}
-                    shouldShowOfflineIndicatorInWideScreen
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        icon={Illustrations.CarIce}
-                        title={translate('workspace.common.distanceRates')}
-                        shouldShowBackButton={isSmallScreenWidth}
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={PolicyDistanceRatesPage.displayName}
+                        shouldShowOfflineIndicatorInWideScreen
                     >
-                        {!isSmallScreenWidth && headerButtons}
-                    </HeaderWithBackButton>
-                    {isSmallScreenWidth && <View style={[styles.ph5]}>{headerButtons}</View>}
-                    <View style={[styles.ph5, styles.pb5, styles.pt3]}>
-                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.distanceRates.centrallyManage')}</Text>
-                    </View>
-                    {isLoading && (
-                        <ActivityIndicator
-                            size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
-                            style={[styles.flex1]}
-                            color={theme.spinner}
-                        />
-                    )}
-                    {Object.values(customUnitRates).length > 0 && (
-                        <SelectionList
-                            canSelectMultiple
-                            sections={[{data: distanceRatesList, indexOffset: 0, isDisabled: false}]}
-                            onCheckboxPress={toggleRate}
-                            onSelectRow={editRate}
-                            onSelectAll={toggleAllRates}
-                            onDismissError={dismissError}
-                            showScrollIndicator
-                            ListItem={TableListItem}
-                            customListHeader={getCustomListHeader()}
-                            listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        <HeaderWithBackButton
+                            icon={Illustrations.CarIce}
+                            title={translate('workspace.common.distanceRates')}
+                            shouldShowBackButton={isSmallScreenWidth}
+                        >
+                            {!isSmallScreenWidth && headerButtons}
+                        </HeaderWithBackButton>
+                        {isSmallScreenWidth && <View style={[styles.ph5]}>{headerButtons}</View>}
+                        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+                            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.distanceRates.centrallyManage')}</Text>
+                        </View>
+                        {isLoading && (
+                            <ActivityIndicator
+                                size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                                style={[styles.flex1]}
+                                color={theme.spinner}
+                            />
+                        )}
+                        {Object.values(customUnitRates).length > 0 && (
+                            <SelectionList
+                                canSelectMultiple
+                                sections={[{data: distanceRatesList, indexOffset: 0, isDisabled: false}]}
+                                onCheckboxPress={toggleRate}
+                                onSelectRow={editRate}
+                                onSelectAll={toggleAllRates}
+                                onDismissError={dismissError}
+                                showScrollIndicator
+                                ListItem={TableListItem}
+                                customListHeader={getCustomListHeader()}
+                                listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                            />
+                        )}
+                        <ConfirmModal
+                            onConfirm={() => setIsWarningModalVisible(false)}
+                            isVisible={isWarningModalVisible}
+                            title={translate('workspace.distanceRates.oopsNotSoFast')}
+                            prompt={translate('workspace.distanceRates.workspaceNeeds')}
+                            confirmText={translate('common.buttonConfirm')}
+                            shouldShowCancelButton={false}
                         />
-                    )}
-                    <ConfirmModal
-                        onConfirm={() => setIsWarningModalVisible(false)}
-                        isVisible={isWarningModalVisible}
-                        title={translate('workspace.distanceRates.oopsNotSoFast')}
-                        prompt={translate('workspace.distanceRates.workspaceNeeds')}
-                        confirmText={translate('common.buttonConfirm')}
-                        shouldShowCancelButton={false}
-                    />
-                </ScreenWrapper>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
new file mode 100644
index 000000000000..83b096db1301
--- /dev/null
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
@@ -0,0 +1,112 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import ScreenWrapper from '@components/ScreenWrapper';
+import type {ListItem} from '@components/SelectionList/types';
+import type {UnitItemType} from '@components/UnitPicker';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
+import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import * as Policy from '@userActions/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {CustomUnit} from '@src/types/onyx/Policy';
+import CategorySelector from './CategorySelector';
+import UnitSelector from './UnitSelector';
+
+type PolicyDistanceRatesSettingsPageOnyxProps = {
+    /** Policy details */
+    policy: OnyxEntry<OnyxTypes.Policy>;
+};
+
+type PolicyDistanceRatesSettingsPageProps = PolicyDistanceRatesSettingsPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS>;
+
+function PolicyDistanceRatesSettingsPage({policy, route}: PolicyDistanceRatesSettingsPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = route.params.policyID;
+    const customUnits = policy?.customUnits ?? {};
+    const customUnit = customUnits[Object.keys(customUnits)[0]];
+    const customUnitID = customUnit?.customUnitID ?? '';
+
+    const defaultCategory = customUnits[customUnitID].defaultCategory;
+    const defaultUnit = customUnits[customUnitID].attributes.unit;
+    const errorFields = customUnits[customUnitID].errorFields;
+
+    const setNewUnit = (unit: UnitItemType) => {
+        Policy.setPolicyDistanceRatesUnit(policyID, customUnit, {...customUnit, attributes: {unit: unit.value}});
+    };
+
+    const setNewCategory = (category: ListItem) => {
+        Policy.setPolicyDistanceRatesDefaultCategory(policyID, customUnit, {...customUnit, defaultCategory: category.text});
+    };
+
+    const clearErrorFields = (fieldName: keyof CustomUnit) => {
+        Policy.clearPolicyDistanceRatesErrorFields(policyID, customUnitID, {...errorFields, [fieldName]: null});
+    };
+
+    return (
+        <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
+            <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
+                >
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={PolicyDistanceRatesSettingsPage.displayName}
+                    >
+                        <HeaderWithBackButton title={translate('workspace.common.settings')} />
+                        <OfflineWithFeedback
+                            errors={errorFields?.attributes}
+                            pendingAction={customUnits[customUnitID].pendingFields?.attributes}
+                            errorRowStyles={styles.mh5}
+                            onClose={() => clearErrorFields('attributes')}
+                        >
+                            <UnitSelector
+                                label={translate('workspace.distanceRates.unit')}
+                                defaultValue={defaultUnit}
+                                wrapperStyle={[styles.ph5, styles.mt3]}
+                                setNewUnit={setNewUnit}
+                            />
+                        </OfflineWithFeedback>
+                        {policy?.areCategoriesEnabled && (
+                            <OfflineWithFeedback
+                                errors={errorFields?.defaultCategory}
+                                pendingAction={customUnits[customUnitID].pendingFields?.defaultCategory}
+                                errorRowStyles={styles.mh5}
+                                onClose={() => clearErrorFields('defaultCategory')}
+                            >
+                                <CategorySelector
+                                    policyID={policyID}
+                                    label={translate('workspace.distanceRates.defaultCategory')}
+                                    defaultValue={defaultCategory}
+                                    wrapperStyle={[styles.ph5, styles.mt3]}
+                                    setNewCategory={setNewCategory}
+                                />
+                            </OfflineWithFeedback>
+                        )}
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
+            </PaidPolicyAccessOrNotFoundWrapper>
+        </AdminPolicyAccessOrNotFoundWrapper>
+    );
+}
+
+PolicyDistanceRatesSettingsPage.displayName = 'PolicyDistanceRatesSettingsPage';
+
+export default withOnyx<PolicyDistanceRatesSettingsPageProps, PolicyDistanceRatesSettingsPageOnyxProps>({
+    policy: {
+        key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID}`,
+    },
+})(PolicyDistanceRatesSettingsPage);
diff --git a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
new file mode 100644
index 000000000000..5a9f5e7c6ea1
--- /dev/null
+++ b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import type {UnitItemType} from '@components/UnitPicker';
+import UnitPicker from '@components/UnitPicker';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import type {Unit} from '@src/types/onyx/Policy';
+
+type UnitSelectorModalProps = {
+    /** Whether the modal is visible */
+    isVisible: boolean;
+
+    /** Selected unit  */
+    currentUnit: Unit;
+
+    /** Function to call when the user selects a unit */
+    onUnitSelected: (value: UnitItemType) => void;
+
+    /** Function to call when the user closes the unit selector modal */
+    onClose: () => void;
+
+    /** Label to display on field */
+    label: string;
+};
+
+function UnitSelectorModal({isVisible, currentUnit, onUnitSelected, onClose, label}: UnitSelectorModalProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <Modal
+            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
+            isVisible={isVisible}
+            onClose={onClose}
+            onModalHide={onClose}
+            hideModalContentWhileAnimating
+            useNativeDriver
+        >
+            <ScreenWrapper
+                style={[styles.pb0]}
+                includePaddingTop={false}
+                includeSafeAreaPaddingBottom={false}
+                testID={UnitSelectorModal.displayName}
+            >
+                <HeaderWithBackButton
+                    title={label}
+                    shouldShowBackButton
+                    onBackButtonPress={onClose}
+                />
+                <UnitPicker
+                    defaultValue={currentUnit}
+                    onOptionSelected={onUnitSelected}
+                />
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+UnitSelectorModal.displayName = 'UnitSelectorModal';
+
+export default UnitSelectorModal;
diff --git a/src/pages/workspace/distanceRates/UnitSelector/index.tsx b/src/pages/workspace/distanceRates/UnitSelector/index.tsx
new file mode 100644
index 000000000000..e6511e7d6418
--- /dev/null
+++ b/src/pages/workspace/distanceRates/UnitSelector/index.tsx
@@ -0,0 +1,68 @@
+import Str from 'expensify-common/lib/str';
+import React, {useState} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import type {UnitItemType} from '@components/UnitPicker';
+import useLocalize from '@hooks/useLocalize';
+import {getUnitTranslationKey} from '@libs/WorkspacesSettingsUtils';
+import type {Unit} from '@src/types/onyx/Policy';
+import UnitSelectorModal from './UnitSelectorModal';
+
+type UnitSelectorProps = {
+    /** Function to call when the user selects a unit */
+    setNewUnit: (value: UnitItemType) => void;
+
+    /** Currently selected unit */
+    defaultValue: Unit;
+
+    /** Label to display on field */
+    label: string;
+
+    /** Any additional styles to apply */
+    wrapperStyle: StyleProp<ViewStyle>;
+};
+
+function UnitSelector({defaultValue, wrapperStyle, label, setNewUnit}: UnitSelectorProps) {
+    const {translate} = useLocalize();
+
+    const [isPickerVisible, setIsPickerVisible] = useState(false);
+
+    const showPickerModal = () => {
+        setIsPickerVisible(true);
+    };
+
+    const hidePickerModal = () => {
+        setIsPickerVisible(false);
+    };
+
+    const updateUnitInput = (unit: UnitItemType) => {
+        setNewUnit(unit);
+        hidePickerModal();
+    };
+
+    const title = Str.recapitalize(translate(getUnitTranslationKey(defaultValue)));
+
+    return (
+        <View>
+            <MenuItemWithTopDescription
+                shouldShowRightIcon
+                title={title}
+                description={label}
+                onPress={showPickerModal}
+                wrapperStyle={wrapperStyle}
+            />
+            <UnitSelectorModal
+                isVisible={isPickerVisible}
+                currentUnit={defaultValue}
+                onClose={hidePickerModal}
+                onUnitSelected={updateUnitInput}
+                label={label}
+            />
+        </View>
+    );
+}
+
+UnitSelector.displayName = 'UnitSelector';
+
+export default UnitSelector;
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx
index bc728992b811..684b4be37d44 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx
@@ -1,4 +1,5 @@
-import React, {useEffect, useMemo} from 'react';
+import Str from 'expensify-common/lib/str';
+import React, {useEffect} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -12,6 +13,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import compose from '@libs/compose';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import {getUnitTranslationKey} from '@libs/WorkspacesSettingsUtils';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
@@ -59,14 +61,6 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
         Policy.openWorkspaceReimburseView(props.policy?.id ?? '');
     }, [props]);
 
-    const unitItems = useMemo(
-        () => ({
-            [CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: translate('workspace.reimburse.kilometers'),
-            [CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: translate('workspace.reimburse.miles'),
-        }),
-        [translate],
-    );
-
     const saveUnitAndRate = (newUnit: Unit, newRate: string) => {
         const distanceCustomUnit = Object.values(props.policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
         if (!distanceCustomUnit) {
@@ -93,6 +87,7 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
 
     const unitValue = props.workspaceRateAndUnit?.unit ?? distanceCustomUnit?.attributes.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES;
     const rateValue = props.workspaceRateAndUnit?.rate ?? distanceCustomRate?.rate?.toString() ?? '';
+    const unitTitle = Str.recapitalize(translate(getUnitTranslationKey(unitValue)));
 
     const submit = () => {
         saveUnitAndRate(unitValue, rateValue);
@@ -131,7 +126,7 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
                                 />
                                 <MenuItemWithTopDescription
                                     description={translate('workspace.reimburse.trackDistanceUnit')}
-                                    title={unitItems[unitValue]}
+                                    title={unitTitle}
                                     onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT_UNIT.getRoute(props.policy?.id ?? ''))}
                                     shouldShowRightIcon
                                 />
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx
index 3bd5a9e01bab..36efc239fe69 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx
@@ -1,9 +1,9 @@
 import React, {useEffect, useMemo} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
-import SelectionList from '@components/SelectionList';
-import RadioListItem from '@components/SelectionList/RadioListItem';
 import Text from '@components/Text';
+import type {UnitItemType} from '@components/UnitPicker';
+import UnitPicker from '@components/UnitPicker';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import compose from '@libs/compose';
@@ -16,14 +16,6 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {WorkspaceRateAndUnit} from '@src/types/onyx';
-import type {Unit} from '@src/types/onyx/Policy';
-
-type OptionRow = {
-    value: Unit;
-    text: string;
-    keyForList: string;
-    isSelected: boolean;
-};
 
 type WorkspaceUnitPageBaseProps = WithPolicyProps;
 
@@ -35,13 +27,6 @@ type WorkspaceUnitPageProps = WorkspaceUnitPageBaseProps & WorkspaceRateAndUnitO
 function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const unitItems = useMemo(
-        () => ({
-            [CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: translate('workspace.reimburse.kilometers'),
-            [CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: translate('workspace.reimburse.miles'),
-        }),
-        [translate],
-    );
 
     useEffect(() => {
         if (props.workspaceRateAndUnit?.policyID === props.policy?.id) {
@@ -51,8 +36,8 @@ function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
-    const updateUnit = (unit: Unit) => {
-        Policy.setUnitForReimburseView(unit);
+    const updateUnit = (unit: UnitItemType) => {
+        Policy.setUnitForReimburseView(unit.value);
         Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? ''));
     };
 
@@ -61,20 +46,6 @@ function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
         return defaultDistanceCustomUnit?.attributes.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES;
     }, [props.policy?.customUnits]);
 
-    const unitOptions = useMemo(() => {
-        const arr: OptionRow[] = [];
-        Object.entries(unitItems).forEach(([unit, label]) => {
-            arr.push({
-                value: unit as Unit,
-                text: label,
-                keyForList: unit,
-                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                isSelected: (props.workspaceRateAndUnit?.unit || defaultValue) === unit,
-            });
-        });
-        return arr;
-    }, [defaultValue, props.workspaceRateAndUnit?.unit, unitItems]);
-
     return (
         <WorkspacePageWithSections
             headerText={translate('workspace.reimburse.trackDistanceUnit')}
@@ -88,12 +59,9 @@ function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
             {() => (
                 <>
                     <Text style={[styles.mh5, styles.mv4]}>{translate('workspace.reimburse.trackDistanceChooseUnit')}</Text>
-
-                    <SelectionList
-                        sections={[{data: unitOptions}]}
-                        ListItem={RadioListItem}
-                        onSelectRow={(unit: OptionRow) => updateUnit(unit.value)}
-                        initiallyFocusedOptionKey={unitOptions.find((unit) => unit.isSelected)?.keyForList}
+                    <UnitPicker
+                        defaultValue={props.workspaceRateAndUnit?.unit ?? defaultValue}
+                        onOptionSelected={updateUnit}
                     />
                 </>
             )}
diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
new file mode 100644
index 000000000000..92d7c0a11ac9
--- /dev/null
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -0,0 +1,116 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {Keyboard} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
+import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import * as Policy from '@userActions/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
+import type {PolicyTagList} from '@src/types/onyx';
+
+type EditTagPageOnyxProps = {
+    /** All policy tags */
+    policyTags: OnyxEntry<PolicyTagList>;
+};
+
+type EditTagPageProps = EditTagPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_EDIT>;
+
+function EditTagPage({route, policyTags}: EditTagPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const currentTagName = route.params.tagName;
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
+            const tagName = values.tagName.trim();
+            const {tags} = PolicyUtils.getTagList(policyTags, 0);
+            if (!ValidationUtils.isRequiredFulfilled(tagName)) {
+                errors.tagName = 'workspace.tags.tagRequiredError';
+            } else if (tags?.[tagName] && currentTagName !== tagName) {
+                errors.tagName = 'workspace.tags.existingTagError';
+            }
+
+            return errors;
+        },
+        [currentTagName, policyTags],
+    );
+
+    const editTag = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
+            Policy.renamePolicyTag(route.params.policyID, {oldName: currentTagName, newName: values.tagName.trim()});
+            Keyboard.dismiss();
+            Navigation.dismissModal();
+        },
+        [route.params.policyID, currentTagName],
+    );
+
+    return (
+        <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
+            <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
+                >
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={EditTagPage.displayName}
+                        shouldEnableMaxHeight
+                    >
+                        <HeaderWithBackButton
+                            title={translate('workspace.tags.editTag')}
+                            onBackButtonPress={Navigation.goBack}
+                        />
+                        <FormProvider
+                            formID={ONYXKEYS.FORMS.WORKSPACE_TAG_FORM}
+                            onSubmit={editTag}
+                            submitButtonText={translate('common.save')}
+                            validate={validate}
+                            style={[styles.mh5, styles.flex1]}
+                            enabledWhenOffline
+                        >
+                            <InputWrapper
+                                InputComponent={TextInput}
+                                maxLength={CONST.TAG_NAME_LIMIT}
+                                defaultValue={currentTagName}
+                                label={translate('common.name')}
+                                accessibilityLabel={translate('common.name')}
+                                inputID={INPUT_IDS.TAG_NAME}
+                                role={CONST.ROLE.PRESENTATION}
+                                ref={inputCallbackRef}
+                            />
+                        </FormProvider>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
+            </PaidPolicyAccessOrNotFoundWrapper>
+        </AdminPolicyAccessOrNotFoundWrapper>
+    );
+}
+
+EditTagPage.displayName = 'EditTagPage';
+
+export default withOnyx<EditTagPageProps, EditTagPageOnyxProps>({
+    policyTags: {
+        key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${route?.params?.policyID}`,
+    },
+})(EditTagPage);
diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index 6e6694d1dc39..107689bc46b9 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -21,9 +21,12 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {PolicyTagList} from '@src/types/onyx';
 
@@ -59,62 +62,73 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
         setWorkspaceTagEnabled(route.params.policyID, {[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}});
     };
 
+    const navigateToEditTag = () => {
+        Navigation.navigate(ROUTES.WORKSPACE_TAG_EDIT.getRoute(route.params.policyID, currentPolicyTag.name));
+    };
+
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={TagSettingsPage.displayName}
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        title={route.params.tagName}
-                        shouldShowThreeDotsButton
-                        shouldSetModalVisibility={false}
-                        threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
-                        threeDotsMenuItems={[
-                            {
-                                icon: Trashcan,
-                                text: translate('workspace.tags.deleteTag'),
-                                onSelected: () => setIsDeleteTagModalOpen(true),
-                            },
-                        ]}
-                    />
-                    <ConfirmModal
-                        title={translate('workspace.tags.deleteTag')}
-                        isVisible={isDeleteTagModalOpen}
-                        onConfirm={deleteTagAndHideModal}
-                        onCancel={() => setIsDeleteTagModalOpen(false)}
-                        shouldSetModalVisibility={false}
-                        prompt={translate('workspace.tags.deleteTagConfirmation')}
-                        confirmText={translate('common.delete')}
-                        cancelText={translate('common.cancel')}
-                        danger
-                    />
-                    <View style={styles.flexGrow1}>
-                        <OfflineWithFeedback
-                            errors={ErrorUtils.getLatestErrorMessageField(currentPolicyTag)}
-                            pendingAction={currentPolicyTag.pendingFields?.enabled}
-                            errorRowStyles={styles.mh5}
-                            onClose={() => Policy.clearPolicyTagErrors(route.params.policyID, route.params.tagName)}
-                        >
-                            <View style={[styles.mt2, styles.mh5]}>
-                                <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                    <Text>{translate('workspace.tags.enableTag')}</Text>
-                                    <Switch
-                                        isOn={currentPolicyTag.enabled}
-                                        accessibilityLabel={translate('workspace.tags.enableTag')}
-                                        onToggle={updateWorkspaceTagEnabled}
-                                    />
-                                </View>
-                            </View>
-                        </OfflineWithFeedback>
-                        <MenuItemWithTopDescription
-                            title={currentPolicyTag.name}
-                            description={translate(`workspace.tags.tagName`)}
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={TagSettingsPage.displayName}
+                    >
+                        <HeaderWithBackButton
+                            title={route.params.tagName}
+                            shouldShowThreeDotsButton
+                            shouldSetModalVisibility={false}
+                            threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
+                            threeDotsMenuItems={[
+                                {
+                                    icon: Trashcan,
+                                    text: translate('workspace.tags.deleteTag'),
+                                    onSelected: () => setIsDeleteTagModalOpen(true),
+                                },
+                            ]}
                         />
-                    </View>
-                </ScreenWrapper>
+                        <ConfirmModal
+                            title={translate('workspace.tags.deleteTag')}
+                            isVisible={isDeleteTagModalOpen}
+                            onConfirm={deleteTagAndHideModal}
+                            onCancel={() => setIsDeleteTagModalOpen(false)}
+                            shouldSetModalVisibility={false}
+                            prompt={translate('workspace.tags.deleteTagConfirmation')}
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
+                        />
+                        <View style={styles.flexGrow1}>
+                            <OfflineWithFeedback
+                                errors={ErrorUtils.getLatestErrorMessageField(currentPolicyTag)}
+                                pendingAction={currentPolicyTag.pendingFields?.enabled}
+                                errorRowStyles={styles.mh5}
+                                onClose={() => Policy.clearPolicyTagErrors(route.params.policyID, route.params.tagName)}
+                            >
+                                <View style={[styles.mt2, styles.mh5]}>
+                                    <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                        <Text>{translate('workspace.tags.enableTag')}</Text>
+                                        <Switch
+                                            isOn={currentPolicyTag.enabled}
+                                            accessibilityLabel={translate('workspace.tags.enableTag')}
+                                            onToggle={updateWorkspaceTagEnabled}
+                                        />
+                                    </View>
+                                </View>
+                            </OfflineWithFeedback>
+                            <MenuItemWithTopDescription
+                                title={currentPolicyTag.name}
+                                description={translate(`workspace.tags.tagName`)}
+                                onPress={navigateToEditTag}
+                                shouldShowRightIcon
+                            />
+                        </View>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index 2df7621c17d3..346d56891dd5 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -18,12 +18,13 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import INPUT_IDS from '@src/types/form/WorkspaceTagCreateForm';
+import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
 import type {PolicyTagList} from '@src/types/onyx';
 
 type WorkspaceCreateTagPageOnyxProps = {
@@ -39,8 +40,8 @@ function CreateTagPage({route, policyTags}: CreateTagPageProps) {
     const {inputCallbackRef} = useAutoFocusInput();
 
     const validate = useCallback(
-        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_CREATE_FORM>) => {
-            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_CREATE_FORM> = {};
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
             const tagName = values.tagName.trim();
             const {tags} = PolicyUtils.getTagList(policyTags, 0);
 
@@ -59,7 +60,7 @@ function CreateTagPage({route, policyTags}: CreateTagPageProps) {
     );
 
     const createTag = useCallback(
-        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_CREATE_FORM>) => {
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
             Policy.createPolicyTag(route.params.policyID, values.tagName.trim());
             Keyboard.dismiss();
             Navigation.goBack();
@@ -70,35 +71,40 @@ function CreateTagPage({route, policyTags}: CreateTagPageProps) {
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={CreateTagPage.displayName}
-                    shouldEnableMaxHeight
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        title={translate('workspace.tags.addTag')}
-                        onBackButtonPress={Navigation.goBack}
-                    />
-                    <FormProvider
-                        formID={ONYXKEYS.FORMS.WORKSPACE_TAG_CREATE_FORM}
-                        onSubmit={createTag}
-                        submitButtonText={translate('common.save')}
-                        validate={validate}
-                        style={[styles.mh5, styles.flex1]}
-                        enabledWhenOffline
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={CreateTagPage.displayName}
+                        shouldEnableMaxHeight
                     >
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            maxLength={CONST.TAG_NAME_LIMIT}
-                            label={translate('common.name')}
-                            accessibilityLabel={translate('common.name')}
-                            inputID={INPUT_IDS.TAG_NAME}
-                            role={CONST.ROLE.PRESENTATION}
-                            ref={inputCallbackRef}
+                        <HeaderWithBackButton
+                            title={translate('workspace.tags.addTag')}
+                            onBackButtonPress={Navigation.goBack}
                         />
-                    </FormProvider>
-                </ScreenWrapper>
+                        <FormProvider
+                            formID={ONYXKEYS.FORMS.WORKSPACE_TAG_FORM}
+                            onSubmit={createTag}
+                            submitButtonText={translate('common.save')}
+                            validate={validate}
+                            style={[styles.mh5, styles.flex1]}
+                            enabledWhenOffline
+                        >
+                            <InputWrapper
+                                InputComponent={TextInput}
+                                maxLength={CONST.TAG_NAME_LIMIT}
+                                label={translate('common.name')}
+                                accessibilityLabel={translate('common.name')}
+                                inputID={INPUT_IDS.TAG_NAME}
+                                role={CONST.ROLE.PRESENTATION}
+                                ref={inputCallbackRef}
+                            />
+                        </FormProvider>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index 98ae6f726d73..0072d37ef631 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -16,6 +16,9 @@ import * as Policy from '@libs/actions/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
+import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
+import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -52,33 +55,42 @@ function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps)
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            shouldEnableMaxHeight
-            testID={WorkspaceEditTagsPage.displayName}
-        >
-            <HeaderWithBackButton title={translate(`workspace.tags.customTagName`)} />
-            <FormProvider
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM}
-                onSubmit={updateTaglistName}
-                validate={validateTagName}
-                submitButtonText={translate('common.save')}
-                enabledWhenOffline
-            >
-                <View style={styles.mb4}>
-                    <InputWrapper
-                        InputComponent={TextInput}
-                        inputID={INPUT_IDS.POLICY_TAGS_NAME}
-                        label={translate(`workspace.tags.customTagName`)}
-                        accessibilityLabel={translate(`workspace.tags.customTagName`)}
-                        defaultValue={taglistName}
-                        role={CONST.ROLE.PRESENTATION}
-                        ref={inputCallbackRef}
-                    />
-                </View>
-            </FormProvider>
-        </ScreenWrapper>
+        <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
+            <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
+                >
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        shouldEnableMaxHeight
+                        testID={WorkspaceEditTagsPage.displayName}
+                    >
+                        <HeaderWithBackButton title={translate(`workspace.tags.customTagName`)} />
+                        <FormProvider
+                            style={[styles.flexGrow1, styles.ph5]}
+                            formID={ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM}
+                            onSubmit={updateTaglistName}
+                            validate={validateTagName}
+                            submitButtonText={translate('common.save')}
+                            enabledWhenOffline
+                        >
+                            <View style={styles.mb4}>
+                                <InputWrapper
+                                    InputComponent={TextInput}
+                                    inputID={INPUT_IDS.POLICY_TAGS_NAME}
+                                    label={translate(`workspace.tags.customTagName`)}
+                                    accessibilityLabel={translate(`workspace.tags.customTagName`)}
+                                    defaultValue={taglistName}
+                                    role={CONST.ROLE.PRESENTATION}
+                                    ref={inputCallbackRef}
+                                />
+                            </View>
+                        </FormProvider>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
+            </PaidPolicyAccessOrNotFoundWrapper>
+        </AdminPolicyAccessOrNotFoundWrapper>
     );
 }
 
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 7cf42b17fe5e..a355cc062f3d 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -1,9 +1,12 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useEffect, useMemo, useState} from 'react';
+import React, {useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Button from '@components/Button';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -19,10 +22,12 @@ import useNetwork from '@hooks/useNetwork';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
@@ -30,6 +35,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
 
 type PolicyForList = {
     value: string;
@@ -37,6 +43,7 @@ type PolicyForList = {
     keyForList: string;
     isSelected: boolean;
     rightElement: React.ReactNode;
+    enabled: boolean;
 };
 
 type PolicyOption = ListItem & {
@@ -57,6 +64,8 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
     const theme = useTheme();
     const {translate} = useLocalize();
     const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
+    const dropdownButtonRef = useRef(null);
+    const [deleteTagsConfirmModalVisible, setDeleteTagsConfirmModalVisible] = useState(false);
 
     function fetchTags() {
         Policy.openPolicyTagsPage(route.params.policyID);
@@ -74,32 +83,40 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
         () =>
             policyTagLists
                 .map((policyTagList) =>
-                    Object.values(policyTagList.tags || []).map((value) => ({
-                        value: value.name,
-                        text: value.name,
-                        keyForList: value.name,
-                        isSelected: !!selectedTags[value.name],
-                        pendingAction: value.pendingAction,
-                        errors: value.errors ?? undefined,
-                        rightElement: (
-                            <View style={styles.flexRow}>
-                                <Text style={[styles.textSupporting, styles.alignSelfCenter, styles.pl2, styles.label]}>
-                                    {value.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')}
-                                </Text>
-                                <View style={[styles.p1, styles.pl2]}>
-                                    <Icon
-                                        src={Expensicons.ArrowRight}
-                                        fill={theme.icon}
-                                    />
+                    Object.values(policyTagList.tags || [])
+                        .sort((a, b) => localeCompare(a.name, b.name))
+                        .map((value) => ({
+                            value: value.name,
+                            text: value.name,
+                            keyForList: value.name,
+                            isSelected: !!selectedTags[value.name],
+                            pendingAction: value.pendingAction,
+                            errors: value.errors ?? undefined,
+                            enabled: value.enabled,
+                            rightElement: (
+                                <View style={styles.flexRow}>
+                                    <Text style={[styles.textSupporting, styles.alignSelfCenter, styles.pl2, styles.label]}>
+                                        {value.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')}
+                                    </Text>
+                                    <View style={[styles.p1, styles.pl2]}>
+                                        <Icon
+                                            src={Expensicons.ArrowRight}
+                                            fill={theme.icon}
+                                        />
+                                    </View>
                                 </View>
-                            </View>
-                        ),
-                    })),
+                            ),
+                        })),
                 )
                 .flat(),
         [policyTagLists, selectedTags, styles.alignSelfCenter, styles.flexRow, styles.label, styles.p1, styles.pl2, styles.textSupporting, theme.icon, translate],
     );
 
+    const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {
+        acc[tag.value] = tag;
+        return acc;
+    }, {});
+
     const toggleTag = (tag: PolicyForList) => {
         setSelectedTags((prev) => ({
             ...prev,
@@ -128,82 +145,177 @@ function WorkspaceTagsPage({policyTags, route}: WorkspaceTagsPageProps) {
     };
 
     const navigateToTagSettings = (tag: PolicyOption) => {
+        setSelectedTags({});
         Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route.params.policyID, tag.keyForList));
     };
 
+    const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]);
+
+    const handleDeleteTags = () => {
+        setSelectedTags({});
+        Policy.deletePolicyTags(route.params.policyID, selectedTagsArray);
+        setDeleteTagsConfirmModalVisible(false);
+    };
+
     const isLoading = !isOffline && policyTags === undefined;
 
-    const headerButtons = (
-        <View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
-            <Button
-                medium
-                success
-                onPress={navigateToCreateTagPage}
-                icon={Expensicons.Plus}
-                text={translate('workspace.tags.addTag')}
-                style={[styles.mr3, isSmallScreenWidth && styles.w50]}
-            />
-            {policyTags && (
+    const getHeaderButtons = () => {
+        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.TAGS_BULK_ACTION_TYPES>>> = [];
+
+        if (selectedTagsArray.length > 0) {
+            options.push({
+                icon: Expensicons.Trashcan,
+                text: translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags'),
+                value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.DELETE,
+                onSelected: () => setDeleteTagsConfirmModalVisible(true),
+            });
+
+            const enabledTags = selectedTagsArray.filter((tagName) => tagListKeyedByName?.[tagName]?.enabled);
+            if (enabledTags.length > 0) {
+                const tagsToDisable = selectedTagsArray
+                    .filter((tagName) => tagListKeyedByName?.[tagName]?.enabled)
+                    .reduce<Record<string, {name: string; enabled: boolean}>>((acc, tagName) => {
+                        acc[tagName] = {
+                            name: tagName,
+                            enabled: false,
+                        };
+                        return acc;
+                    }, {});
+
+                options.push({
+                    icon: Expensicons.DocumentSlash,
+                    text: translate(enabledTags.length === 1 ? 'workspace.tags.disableTag' : 'workspace.tags.disableTags'),
+                    value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.DISABLE,
+                    onSelected: () => {
+                        setSelectedTags({});
+                        Policy.setWorkspaceTagEnabled(route.params.policyID, tagsToDisable);
+                    },
+                });
+            }
+
+            const disabledTags = selectedTagsArray.filter((tagName) => !tagListKeyedByName?.[tagName]?.enabled);
+            if (disabledTags.length > 0) {
+                const tagsToEnable = selectedTagsArray
+                    .filter((tagName) => !tagListKeyedByName?.[tagName]?.enabled)
+                    .reduce<Record<string, {name: string; enabled: boolean}>>((acc, tagName) => {
+                        acc[tagName] = {
+                            name: tagName,
+                            enabled: true,
+                        };
+                        return acc;
+                    }, {});
+                options.push({
+                    icon: Expensicons.Document,
+                    text: translate(disabledTags.length === 1 ? 'workspace.tags.enableTag' : 'workspace.tags.enableTags'),
+                    value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.ENABLE,
+                    onSelected: () => {
+                        setSelectedTags({});
+                        Policy.setWorkspaceTagEnabled(route.params.policyID, tagsToEnable);
+                    },
+                });
+            }
+
+            return (
+                <ButtonWithDropdownMenu
+                    buttonRef={dropdownButtonRef}
+                    onPress={() => null}
+                    shouldAlwaysShowDropdownMenu
+                    pressOnEnter
+                    buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+                    customText={translate('workspace.common.selected', {selectedNumber: selectedTagsArray.length})}
+                    options={options}
+                    style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
+                />
+            );
+        }
+
+        return (
+            <View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
                 <Button
                     medium
-                    onPress={navigateToTagsSettings}
-                    icon={Expensicons.Gear}
-                    text={translate('common.settings')}
-                    style={[isSmallScreenWidth && styles.w50]}
+                    success
+                    onPress={navigateToCreateTagPage}
+                    icon={Expensicons.Plus}
+                    text={translate('workspace.tags.addTag')}
+                    style={[styles.mr3, isSmallScreenWidth && styles.w50]}
                 />
-            )}
-        </View>
-    );
+                {policyTags && (
+                    <Button
+                        medium
+                        onPress={navigateToTagsSettings}
+                        icon={Expensicons.Gear}
+                        text={translate('common.settings')}
+                        style={[isSmallScreenWidth && styles.w50]}
+                    />
+                )}
+            </View>
+        );
+    };
 
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={WorkspaceTagsPage.displayName}
-                    shouldShowOfflineIndicatorInWideScreen
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        icon={Illustrations.Tag}
-                        title={translate('workspace.common.tags')}
-                        shouldShowBackButton={isSmallScreenWidth}
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={WorkspaceTagsPage.displayName}
+                        shouldShowOfflineIndicatorInWideScreen
                     >
-                        {!isSmallScreenWidth && headerButtons}
-                    </HeaderWithBackButton>
-                    {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{headerButtons}</View>}
-                    <View style={[styles.ph5, styles.pb5]}>
-                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.subtitle')}</Text>
-                    </View>
-                    {isLoading && (
-                        <ActivityIndicator
-                            size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
-                            style={[styles.flex1]}
-                            color={theme.spinner}
-                        />
-                    )}
-                    {tagList.length === 0 && !isLoading && (
-                        <WorkspaceEmptyStateSection
-                            title={translate('workspace.tags.emptyTags.title')}
-                            icon={Illustrations.EmptyStateExpenses}
-                            subtitle={translate('workspace.tags.emptyTags.subtitle')}
-                        />
-                    )}
-                    {tagList.length > 0 && (
-                        <SelectionList
-                            canSelectMultiple
-                            sections={[{data: tagList, indexOffset: 0, isDisabled: false}]}
-                            onCheckboxPress={toggleTag}
-                            onSelectRow={navigateToTagSettings}
-                            onSelectAll={toggleAllTags}
-                            showScrollIndicator
-                            ListItem={TableListItem}
-                            customListHeader={getCustomListHeader()}
-                            listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
-                            onDismissError={(item) => Policy.clearPolicyTagErrors(route.params.policyID, item.value)}
+                        <HeaderWithBackButton
+                            icon={Illustrations.Tag}
+                            title={translate('workspace.common.tags')}
+                            shouldShowBackButton={isSmallScreenWidth}
+                        >
+                            {!isSmallScreenWidth && getHeaderButtons()}
+                        </HeaderWithBackButton>
+                        <ConfirmModal
+                            isVisible={deleteTagsConfirmModalVisible}
+                            onConfirm={handleDeleteTags}
+                            onCancel={() => setDeleteTagsConfirmModalVisible(false)}
+                            title={translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags')}
+                            prompt={translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTagConfirmation' : 'workspace.tags.deleteTagsConfirmation')}
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
                         />
-                    )}
-                </ScreenWrapper>
+                        {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
+                        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+                            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.subtitle')}</Text>
+                        </View>
+                        {isLoading && (
+                            <ActivityIndicator
+                                size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                                style={[styles.flex1]}
+                                color={theme.spinner}
+                            />
+                        )}
+                        {tagList.length === 0 && !isLoading && (
+                            <WorkspaceEmptyStateSection
+                                title={translate('workspace.tags.emptyTags.title')}
+                                icon={Illustrations.EmptyStateExpenses}
+                                subtitle={translate('workspace.tags.emptyTags.subtitle')}
+                            />
+                        )}
+                        {tagList.length > 0 && (
+                            <SelectionList
+                                canSelectMultiple
+                                sections={[{data: tagList, indexOffset: 0, isDisabled: false}]}
+                                onCheckboxPress={toggleTag}
+                                onSelectRow={navigateToTagSettings}
+                                onSelectAll={toggleAllTags}
+                                showScrollIndicator
+                                ListItem={TableListItem}
+                                customListHeader={getCustomListHeader()}
+                                listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                                onDismissError={(item) => Policy.clearPolicyTagErrors(route.params.policyID, item.value)}
+                            />
+                        )}
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
index 67b033b68f72..b421698b8f2f 100644
--- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
@@ -16,7 +16,9 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -39,49 +41,53 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
         },
         [route.params.policyID],
     );
-
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                {({policy}) => (
-                    <ScreenWrapper
-                        includeSafeAreaPaddingBottom={false}
-                        style={[styles.defaultModalContainer]}
-                        testID={WorkspaceTagsSettingsPage.displayName}
-                    >
-                        <HeaderWithBackButton title={translate('common.settings')} />
-                        <View style={styles.flexGrow1}>
-                            <OfflineWithFeedback
-                                errors={policy?.errorFields?.requiresTag}
-                                pendingAction={policy?.pendingFields?.requiresTag}
-                                errorRowStyles={styles.mh5}
-                            >
-                                <View style={[styles.mt2, styles.mh4]}>
-                                    <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.requiresTag')}</Text>
-                                        <Switch
-                                            isOn={policy?.requiresTag ?? false}
-                                            accessibilityLabel={translate('workspace.tags.requiresTag')}
-                                            onToggle={updateWorkspaceRequiresTag}
-                                        />
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={route.params.policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
+                >
+                    {({policy}) => (
+                        <ScreenWrapper
+                            includeSafeAreaPaddingBottom={false}
+                            style={[styles.defaultModalContainer]}
+                            testID={WorkspaceTagsSettingsPage.displayName}
+                        >
+                            <HeaderWithBackButton title={translate('common.settings')} />
+                            <View style={styles.flexGrow1}>
+                                <OfflineWithFeedback
+                                    errors={policy?.errorFields?.requiresTag}
+                                    pendingAction={policy?.pendingFields?.requiresTag}
+                                    errorRowStyles={styles.mh5}
+                                >
+                                    <View style={[styles.mt2, styles.mh4]}>
+                                        <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.requiresTag')}</Text>
+                                            <Switch
+                                                isOn={policy?.requiresTag ?? false}
+                                                accessibilityLabel={translate('workspace.tags.requiresTag')}
+                                                onToggle={updateWorkspaceRequiresTag}
+                                            />
+                                        </View>
                                     </View>
-                                </View>
-                            </OfflineWithFeedback>
-                            <OfflineWithFeedback
-                                errors={policyTags?.[policyTagName]?.errors}
-                                pendingAction={policyTags?.[policyTagName]?.pendingAction}
-                                errorRowStyles={styles.mh5}
-                            >
-                                <MenuItemWithTopDescription
-                                    title={policyTagName}
-                                    description={translate(`workspace.tags.customTagName`)}
-                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EDIT_TAGS.getRoute(route.params.policyID))}
-                                    shouldShowRightIcon
-                                />
-                            </OfflineWithFeedback>
-                        </View>
-                    </ScreenWrapper>
-                )}
+                                </OfflineWithFeedback>
+                                <OfflineWithFeedback
+                                    errors={policyTags?.[policyTagName]?.errors}
+                                    pendingAction={policyTags?.[policyTagName]?.pendingAction}
+                                    errorRowStyles={styles.mh5}
+                                >
+                                    <MenuItemWithTopDescription
+                                        title={policyTagName}
+                                        description={translate(`workspace.tags.customTagName`)}
+                                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EDIT_TAGS.getRoute(route.params.policyID))}
+                                        shouldShowRightIcon
+                                    />
+                                </OfflineWithFeedback>
+                            </View>
+                        </ScreenWrapper>
+                    )}
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx
new file mode 100644
index 000000000000..1efb983be19e
--- /dev/null
+++ b/src/pages/workspace/taxes/NamePage.tsx
@@ -0,0 +1,120 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
+import React, {useCallback, useState} from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {renamePolicyTax, validateTaxName} from '@libs/actions/TaxRate';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
+import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceTaxNameForm';
+
+type NamePageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAX_NAME>;
+
+const parser = new ExpensiMark();
+
+function NamePage({
+    route: {
+        params: {policyID, taxID},
+    },
+    policy,
+}: NamePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID);
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const [name, setName] = useState(() => parser.htmlToMarkdown(currentTaxRate?.name ?? ''));
+
+    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '', taxID)), [policyID, taxID]);
+
+    const submit = () => {
+        renamePolicyTax(policyID, taxID, name);
+        goBack();
+    };
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM>) => {
+            if (!policy) {
+                return {};
+            }
+            if (values[INPUT_IDS.NAME] === currentTaxRate?.name) {
+                return {};
+            }
+            return validateTaxName(policy, values);
+        },
+        [currentTaxRate?.name, policy],
+    );
+
+    if (!currentTaxRate) {
+        return <NotFoundPage />;
+    }
+
+    return (
+        <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
+            <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
+                >
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        shouldEnableMaxHeight
+                        testID={NamePage.displayName}
+                    >
+                        <HeaderWithBackButton
+                            title={translate('common.name')}
+                            onBackButtonPress={goBack}
+                        />
+
+                        <FormProvider
+                            formID={ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM}
+                            submitButtonText={translate('workspace.editor.save')}
+                            style={[styles.flexGrow1, styles.ph5]}
+                            scrollContextEnabled
+                            onSubmit={submit}
+                            enabledWhenOffline
+                            validate={validate}
+                        >
+                            <View style={styles.mb4}>
+                                <InputWrapper
+                                    InputComponent={TextInput}
+                                    role={CONST.ROLE.PRESENTATION}
+                                    inputID={INPUT_IDS.NAME}
+                                    label={translate('workspace.editor.nameInputLabel')}
+                                    accessibilityLabel={translate('workspace.editor.nameInputLabel')}
+                                    value={name}
+                                    maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
+                                    onChangeText={setName}
+                                    ref={inputCallbackRef}
+                                />
+                            </View>
+                        </FormProvider>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
+            </PaidPolicyAccessOrNotFoundWrapper>
+        </AdminPolicyAccessOrNotFoundWrapper>
+    );
+}
+
+NamePage.displayName = 'NamePage';
+
+export default withPolicyAndFullscreenLoading(NamePage);
diff --git a/src/pages/workspace/taxes/ValuePage.tsx b/src/pages/workspace/taxes/ValuePage.tsx
new file mode 100644
index 000000000000..d008b11ecb15
--- /dev/null
+++ b/src/pages/workspace/taxes/ValuePage.tsx
@@ -0,0 +1,103 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useState} from 'react';
+import AmountForm from '@components/AmountForm';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updatePolicyTaxValue, validateTaxValue} from '@libs/actions/TaxRate';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
+import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceTaxValueForm';
+
+type ValuePageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAX_VALUE>;
+
+function ValuePage({
+    route: {
+        params: {policyID, taxID},
+    },
+    policy,
+}: ValuePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID);
+    const [value, setValue] = useState(currentTaxRate?.value?.replace('%', ''));
+
+    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '', taxID)), [policyID, taxID]);
+
+    const submit = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM>) => {
+            updatePolicyTaxValue(policyID, taxID, Number(values.value));
+            goBack();
+        },
+        [goBack, policyID, taxID],
+    );
+
+    if (!currentTaxRate) {
+        return <NotFoundPage />;
+    }
+
+    return (
+        <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
+            <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
+                >
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        shouldEnableMaxHeight
+                        testID={ValuePage.displayName}
+                    >
+                        <HeaderWithBackButton
+                            title={translate('workspace.taxes.value')}
+                            onBackButtonPress={goBack}
+                        />
+
+                        <FormProvider
+                            formID={ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM}
+                            submitButtonText={translate('workspace.editor.save')}
+                            style={[styles.flexGrow1]}
+                            scrollContextEnabled
+                            validate={validateTaxValue}
+                            onSubmit={submit}
+                            enabledWhenOffline
+                            disablePressOnEnter={false}
+                            shouldHideFixErrorsAlert
+                            submitFlexEnabled={false}
+                            submitButtonStyles={[styles.mh5]}
+                        >
+                            <InputWrapper
+                                InputComponent={AmountForm}
+                                inputID={INPUT_IDS.VALUE}
+                                defaultValue={value}
+                                onInputChange={setValue}
+                                hideCurrencySymbol
+                                extraSymbol={<Text style={styles.iouAmountText}>%</Text>}
+                            />
+                        </FormProvider>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
+            </PaidPolicyAccessOrNotFoundWrapper>
+        </AdminPolicyAccessOrNotFoundWrapper>
+    );
+}
+
+ValuePage.displayName = 'ValuePage';
+
+export default withPolicyAndFullscreenLoading(ValuePage);
diff --git a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
index c0790bb8abd8..ccc0d4ad9e7b 100644
--- a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
@@ -11,11 +11,11 @@ import Text from '@components/Text';
 import TextPicker from '@components/TextPicker';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {createPolicyTax, getNextTaxCode, getTaxValueWithPercentage} from '@libs/actions/TaxRate';
+import {createPolicyTax, getNextTaxCode, getTaxValueWithPercentage, validateTaxName, validateTaxValue} from '@libs/actions/TaxRate';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import * as ValidationUtils from '@libs/ValidationUtils';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -36,25 +36,6 @@ function WorkspaceCreateTaxPage({
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const validate = useCallback(
-        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM> => {
-            const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.VALUE, INPUT_IDS.NAME]);
-
-            const value = values[INPUT_IDS.VALUE];
-            if (!ValidationUtils.isValidPercentage(value)) {
-                errors[INPUT_IDS.VALUE] = 'workspace.taxes.errors.valuePercentageRange';
-            }
-
-            const name = values[INPUT_IDS.NAME];
-            if (policy?.taxRates?.taxes && ValidationUtils.isExistingTaxName(name, policy.taxRates.taxes)) {
-                errors[INPUT_IDS.NAME] = 'workspace.taxes.errors.taxRateAlreadyExists';
-            }
-
-            return errors;
-        },
-        [policy?.taxRates?.taxes],
-    );
-
     const submitForm = useCallback(
         ({value, ...values}: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM>) => {
             const taxRate = {
@@ -68,52 +49,70 @@ function WorkspaceCreateTaxPage({
         [policy?.taxRates?.taxes, policyID],
     );
 
+    const validateForm = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM> => {
+            if (!policy) {
+                return {};
+            }
+            return {
+                ...validateTaxName(policy, values),
+                ...validateTaxValue(values),
+            };
+        },
+        [policy],
+    );
+
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
-                <ScreenWrapper
-                    testID={WorkspaceCreateTaxPage.displayName}
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
                 >
-                    <View style={[styles.h100, styles.flex1, styles.justifyContentBetween]}>
-                        <HeaderWithBackButton title={translate('workspace.taxes.addRate')} />
-                        <FormProvider
-                            style={[styles.flexGrow1, styles.mh5]}
-                            formID={ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM}
-                            onSubmit={submitForm}
-                            validate={validate}
-                            submitButtonText={translate('common.save')}
-                            enabledWhenOffline
-                            shouldValidateOnBlur={false}
-                            disablePressOnEnter={false}
-                        >
-                            <View style={styles.mhn5}>
-                                <InputWrapper
-                                    InputComponent={TextPicker}
-                                    inputID={INPUT_IDS.NAME}
-                                    label={translate('common.name')}
-                                    description={translate('common.name')}
-                                    rightLabel={translate('common.required')}
-                                    accessibilityLabel={translate('workspace.editor.nameInputLabel')}
-                                    maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
-                                    multiline={false}
-                                    role={CONST.ROLE.PRESENTATION}
-                                    autoFocus
-                                />
-                                <InputWrapper
-                                    InputComponent={AmountPicker}
-                                    inputID={INPUT_IDS.VALUE}
-                                    title={(v) => (v ? getTaxValueWithPercentage(v) : '')}
-                                    description={translate('workspace.taxes.value')}
-                                    rightLabel={translate('common.required')}
-                                    hideCurrencySymbol
-                                    extraSymbol={<Text style={styles.iouAmountText}>%</Text>}
-                                />
-                            </View>
-                        </FormProvider>
-                    </View>
-                </ScreenWrapper>
+                    <ScreenWrapper
+                        testID={WorkspaceCreateTaxPage.displayName}
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                    >
+                        <View style={[styles.h100, styles.flex1, styles.justifyContentBetween]}>
+                            <HeaderWithBackButton title={translate('workspace.taxes.addRate')} />
+                            <FormProvider
+                                style={[styles.flexGrow1, styles.mh5]}
+                                formID={ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM}
+                                onSubmit={submitForm}
+                                validate={validateForm}
+                                submitButtonText={translate('common.save')}
+                                enabledWhenOffline
+                                shouldValidateOnBlur={false}
+                                disablePressOnEnter={false}
+                            >
+                                <View style={styles.mhn5}>
+                                    <InputWrapper
+                                        InputComponent={TextPicker}
+                                        inputID={INPUT_IDS.NAME}
+                                        label={translate('common.name')}
+                                        description={translate('common.name')}
+                                        rightLabel={translate('common.required')}
+                                        accessibilityLabel={translate('workspace.editor.nameInputLabel')}
+                                        maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
+                                        multiline={false}
+                                        role={CONST.ROLE.PRESENTATION}
+                                        autoFocus
+                                    />
+                                    <InputWrapper
+                                        InputComponent={AmountPicker}
+                                        inputID={INPUT_IDS.VALUE}
+                                        title={(v) => (v ? getTaxValueWithPercentage(v) : '')}
+                                        description={translate('workspace.taxes.value')}
+                                        rightLabel={translate('common.required')}
+                                        hideCurrencySymbol
+                                        extraSymbol={<Text style={styles.iouAmountText}>%</Text>}
+                                    />
+                                </View>
+                            </FormProvider>
+                        </View>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
new file mode 100644
index 000000000000..ec04b77df3ca
--- /dev/null
+++ b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
@@ -0,0 +1,163 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo, useState} from 'react';
+import {View} from 'react-native';
+import ConfirmModal from '@components/ConfirmModal';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import type {ThreeDotsMenuItem} from '@components/HeaderWithBackButton/types';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Switch from '@components/Switch';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import {clearTaxRateFieldError, deletePolicyTaxes, setPolicyTaxesEnabled} from '@libs/actions/TaxRate';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
+import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type WorkspaceEditTaxPageBaseProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAX_EDIT>;
+
+function WorkspaceEditTaxPage({
+    route: {
+        params: {policyID, taxID},
+    },
+    policy,
+}: WorkspaceEditTaxPageBaseProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID);
+    const {windowWidth} = useWindowDimensions();
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+    const canEdit = policy && PolicyUtils.canEditTaxRate(policy, taxID);
+
+    const toggleTaxRate = () => {
+        if (!currentTaxRate) {
+            return;
+        }
+        setPolicyTaxesEnabled(policyID, [taxID], !!currentTaxRate.isDisabled);
+    };
+
+    const deleteTaxRate = () => {
+        if (!policyID) {
+            return;
+        }
+        deletePolicyTaxes(policyID, [taxID]);
+        setIsDeleteModalVisible(false);
+        Navigation.goBack();
+    };
+
+    const threeDotsMenuItems: ThreeDotsMenuItem[] = useMemo(
+        () => [
+            {
+                icon: Expensicons.Trashcan,
+                text: translate('common.delete'),
+                onSelected: () => setIsDeleteModalVisible(true),
+            },
+        ],
+        [translate],
+    );
+
+    if (!currentTaxRate) {
+        return <NotFoundPage />;
+    }
+
+    return (
+        <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
+            <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
+                >
+                    <ScreenWrapper
+                        testID={WorkspaceEditTaxPage.displayName}
+                        style={styles.mb5}
+                    >
+                        <View style={[styles.h100, styles.flex1]}>
+                            <HeaderWithBackButton
+                                title={currentTaxRate?.name}
+                                threeDotsMenuItems={threeDotsMenuItems}
+                                shouldShowThreeDotsButton={!!canEdit}
+                                threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
+                            />
+                            <OfflineWithFeedback
+                                errors={ErrorUtils.getLatestErrorField(currentTaxRate, 'isDisabled')}
+                                pendingAction={currentTaxRate?.pendingFields?.isDisabled}
+                                errorRowStyles={styles.mh5}
+                                onClose={() => clearTaxRateFieldError(policyID, taxID, 'isDisabled')}
+                            >
+                                <View style={[styles.mt2, styles.mh5]}>
+                                    <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                        <Text>{translate('workspace.taxes.actions.enable')}</Text>
+                                        <Switch
+                                            isOn={!currentTaxRate?.isDisabled}
+                                            accessibilityLabel={translate('workspace.taxes.actions.enable')}
+                                            onToggle={toggleTaxRate}
+                                            disabled={!canEdit}
+                                        />
+                                    </View>
+                                </View>
+                            </OfflineWithFeedback>
+                            <OfflineWithFeedback
+                                errors={ErrorUtils.getLatestErrorField(currentTaxRate, 'name')}
+                                pendingAction={currentTaxRate?.pendingFields?.name}
+                                errorRowStyles={styles.mh5}
+                                onClose={() => clearTaxRateFieldError(policyID, taxID, 'name')}
+                            >
+                                <MenuItemWithTopDescription
+                                    shouldShowRightIcon
+                                    title={currentTaxRate?.name}
+                                    description={translate('common.name')}
+                                    style={[styles.moneyRequestMenuItem]}
+                                    titleStyle={styles.flex1}
+                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_NAME.getRoute(`${policyID}`, taxID))}
+                                />
+                            </OfflineWithFeedback>
+                            <OfflineWithFeedback
+                                errors={ErrorUtils.getLatestErrorField(currentTaxRate, 'value')}
+                                pendingAction={currentTaxRate?.pendingFields?.value}
+                                errorRowStyles={styles.mh5}
+                                onClose={() => clearTaxRateFieldError(policyID, taxID, 'value')}
+                            >
+                                <MenuItemWithTopDescription
+                                    shouldShowRightIcon
+                                    title={currentTaxRate?.value}
+                                    description={translate('workspace.taxes.value')}
+                                    style={[styles.moneyRequestMenuItem]}
+                                    titleStyle={styles.flex1}
+                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_VALUE.getRoute(`${policyID}`, taxID))}
+                                />
+                            </OfflineWithFeedback>
+                        </View>
+                        <ConfirmModal
+                            title={translate('workspace.taxes.actions.delete')}
+                            isVisible={isDeleteModalVisible}
+                            onConfirm={deleteTaxRate}
+                            onCancel={() => setIsDeleteModalVisible(false)}
+                            prompt={translate('workspace.taxes.deleteTaxConfirmation')}
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
+                        />
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
+            </PaidPolicyAccessOrNotFoundWrapper>
+        </AdminPolicyAccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceEditTaxPage.displayName = 'WorkspaceEditTaxPage';
+
+export default withPolicyAndFullscreenLoading(WorkspaceEditTaxPage);
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index d0724f4592ba..bad82d827c5d 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -1,7 +1,10 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import Button from '@components/Button';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {DropdownOption, WorkspaceTaxRatesBulkActionType} from '@components/ButtonWithDropdownMenu/types';
+import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -17,10 +20,13 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import {openPolicyTaxesPage} from '@libs/actions/Policy';
-import {clearTaxRateError} from '@libs/actions/TaxRate';
+import {clearTaxRateError, deletePolicyTaxes, setPolicyTaxesEnabled} from '@libs/actions/TaxRate';
+import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -30,17 +36,24 @@ import type SCREENS from '@src/SCREENS';
 
 type WorkspaceTaxesPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TAXES>;
 
-function WorkspaceTaxesPage({policy, route}: WorkspaceTaxesPageProps) {
+function WorkspaceTaxesPage({
+    policy,
+    route: {
+        params: {policyID},
+    },
+}: WorkspaceTaxesPageProps) {
     const {isSmallScreenWidth} = useWindowDimensions();
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
     const [selectedTaxesIDs, setSelectedTaxesIDs] = useState<string[]>([]);
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const defaultExternalID = policy?.taxRates?.defaultExternalID;
     const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
+    const dropdownButtonRef = useRef(null);
 
     const fetchTaxes = () => {
-        openPolicyTaxesPage(route.params.policyID);
+        openPolicyTaxesPage(policyID);
     };
 
     const {isOffline} = useNetwork({onReconnect: fetchTaxes});
@@ -66,34 +79,34 @@ function WorkspaceTaxesPage({policy, route}: WorkspaceTaxesPageProps) {
         [defaultExternalID, foreignTaxDefault, translate],
     );
 
-    const taxesList = useMemo<ListItem[]>(
-        () =>
-            Object.entries(policy?.taxRates?.taxes ?? {})
-                .map(([key, value]) => ({
-                    text: value.name,
-                    alternateText: textForDefault(key),
-                    keyForList: key,
-                    isSelected: !!selectedTaxesIDs.includes(key),
-                    isDisabledCheckbox: key === defaultExternalID,
-                    pendingAction: value.pendingAction,
-                    errors: value.errors,
-                    rightElement: (
-                        <View style={styles.flexRow}>
-                            <Text style={[styles.disabledText, styles.alignSelfCenter]}>
-                                {value.isDisabled ? translate('workspace.common.disabled') : translate('workspace.common.enabled')}
-                            </Text>
-                            <View style={[styles.p1, styles.pl2]}>
-                                <Icon
-                                    src={Expensicons.ArrowRight}
-                                    fill={theme.icon}
-                                />
-                            </View>
+    const taxesList = useMemo<ListItem[]>(() => {
+        if (!policy) {
+            return [];
+        }
+        return Object.entries(policy.taxRates?.taxes ?? {})
+            .map(([key, value]) => ({
+                text: value.name,
+                alternateText: textForDefault(key),
+                keyForList: key,
+                isSelected: !!selectedTaxesIDs.includes(key),
+                isDisabledCheckbox: !PolicyUtils.canEditTaxRate(policy, key),
+                isDisabled: value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                pendingAction: value.pendingAction ?? (Object.keys(value.pendingFields ?? {}).length > 0 ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : null),
+                errors: value.errors ?? ErrorUtils.getLatestErrorFieldForAnyField(value),
+                rightElement: (
+                    <View style={styles.flexRow}>
+                        <Text style={[styles.disabledText, styles.alignSelfCenter]}>{value.isDisabled ? translate('workspace.common.disabled') : translate('workspace.common.enabled')}</Text>
+                        <View style={[styles.p1, styles.pl2]}>
+                            <Icon
+                                src={Expensicons.ArrowRight}
+                                fill={theme.icon}
+                            />
                         </View>
-                    ),
-                }))
-                .sort((a, b) => a.text.localeCompare(b.text)),
-        [policy?.taxRates?.taxes, textForDefault, defaultExternalID, selectedTaxesIDs, styles, theme.icon, translate],
-    );
+                    </View>
+                ),
+            }))
+            .sort((a, b) => (a.text ?? a.keyForList ?? '').localeCompare(b.text ?? b.keyForList ?? ''));
+    }, [policy, textForDefault, selectedTaxesIDs, styles.flexRow, styles.disabledText, styles.alignSelfCenter, styles.p1, styles.pl2, translate, theme.icon]);
 
     const isLoading = !isOffline && taxesList === undefined;
 
@@ -129,68 +142,159 @@ function WorkspaceTaxesPage({policy, route}: WorkspaceTaxesPageProps) {
         </View>
     );
 
-    const headerButtons = (
+    const deleteTaxes = useCallback(() => {
+        if (!policyID) {
+            return;
+        }
+        deletePolicyTaxes(policyID, selectedTaxesIDs);
+        setSelectedTaxesIDs([]);
+        setIsDeleteModalVisible(false);
+    }, [policyID, selectedTaxesIDs]);
+
+    const toggleTaxes = useCallback(
+        (isEnabled: boolean) => {
+            if (!policyID) {
+                return;
+            }
+            setPolicyTaxesEnabled(policyID, selectedTaxesIDs, isEnabled);
+            setSelectedTaxesIDs([]);
+        },
+        [policyID, selectedTaxesIDs],
+    );
+
+    const navigateToEditTaxRate = (taxRate: ListItem) => {
+        if (!taxRate.keyForList) {
+            return;
+        }
+        setSelectedTaxesIDs([]);
+        Navigation.navigate(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID, taxRate.keyForList));
+    };
+
+    const dropdownMenuOptions = useMemo(() => {
+        const isMultiple = selectedTaxesIDs.length > 1;
+        const options: Array<DropdownOption<WorkspaceTaxRatesBulkActionType>> = [
+            {
+                icon: Expensicons.Trashcan,
+                text: isMultiple ? translate('workspace.taxes.actions.deleteMultiple') : translate('workspace.taxes.actions.delete'),
+                value: CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES.DELETE,
+                onSelected: () => setIsDeleteModalVisible(true),
+            },
+        ];
+
+        // `Disable rates` when at least one enabled rate is selected.
+        if (selectedTaxesIDs.some((taxID) => !policy?.taxRates?.taxes[taxID]?.isDisabled)) {
+            options.push({
+                icon: Expensicons.DocumentSlash,
+                text: isMultiple ? translate('workspace.taxes.actions.disableMultiple') : translate('workspace.taxes.actions.disable'),
+                value: CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES.DISABLE,
+                onSelected: () => toggleTaxes(false),
+            });
+        }
+
+        // `Enable rates` when at least one disabled rate is selected.
+        if (selectedTaxesIDs.some((taxID) => policy?.taxRates?.taxes[taxID]?.isDisabled)) {
+            options.push({
+                icon: Expensicons.Document,
+                text: isMultiple ? translate('workspace.taxes.actions.enableMultiple') : translate('workspace.taxes.actions.enable'),
+                value: CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES.ENABLE,
+                onSelected: () => toggleTaxes(true),
+            });
+        }
+        return options;
+    }, [policy?.taxRates?.taxes, selectedTaxesIDs, toggleTaxes, translate]);
+
+    const headerButtons = !selectedTaxesIDs.length ? (
         <View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
             <Button
                 medium
                 success
-                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_CREATE.getRoute(route.params.policyID))}
+                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_CREATE.getRoute(policyID))}
                 icon={Expensicons.Plus}
                 text={translate('workspace.taxes.addRate')}
                 style={[styles.mr3, isSmallScreenWidth && styles.w50]}
             />
             <Button
                 medium
-                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(route.params.policyID))}
+                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID))}
                 icon={Expensicons.Gear}
                 text={translate('common.settings')}
                 style={[isSmallScreenWidth && styles.w50]}
             />
         </View>
+    ) : (
+        <ButtonWithDropdownMenu<WorkspaceTaxRatesBulkActionType>
+            buttonRef={dropdownButtonRef}
+            onPress={() => {}}
+            options={dropdownMenuOptions}
+            buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+            customText={translate('workspace.common.selected', {selectedNumber: selectedTaxesIDs.length})}
+            shouldAlwaysShowDropdownMenu
+            pressOnEnter
+            style={[isSmallScreenWidth && styles.w50, isSmallScreenWidth && styles.mb3]}
+        />
     );
 
     return (
-        <AdminPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-            <PaidPolicyAccessOrNotFoundWrapper policyID={route.params.policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    style={[styles.defaultModalContainer]}
-                    testID={WorkspaceTaxesPage.displayName}
-                    shouldShowOfflineIndicatorInWideScreen
+        <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
+            <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
                 >
-                    <HeaderWithBackButton
-                        icon={Illustrations.Coins}
-                        title={translate('workspace.common.taxes')}
-                        shouldShowBackButton={isSmallScreenWidth}
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        style={[styles.defaultModalContainer]}
+                        testID={WorkspaceTaxesPage.displayName}
+                        shouldShowOfflineIndicatorInWideScreen
                     >
-                        {!isSmallScreenWidth && headerButtons}
-                    </HeaderWithBackButton>
+                        <HeaderWithBackButton
+                            icon={Illustrations.Coins}
+                            title={translate('workspace.common.taxes')}
+                            shouldShowBackButton={isSmallScreenWidth}
+                        >
+                            {!isSmallScreenWidth && headerButtons}
+                        </HeaderWithBackButton>
 
-                    {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{headerButtons}</View>}
+                        {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{headerButtons}</View>}
 
-                    <View style={[styles.ph5, styles.pb5]}>
-                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.taxes.subtitle')}</Text>
-                    </View>
-                    {isLoading && (
-                        <ActivityIndicator
-                            size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
-                            style={[styles.flex1]}
-                            color={theme.spinner}
+                        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+                            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.taxes.subtitle')}</Text>
+                        </View>
+                        {isLoading && (
+                            <ActivityIndicator
+                                size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                                style={[styles.flex1]}
+                                color={theme.spinner}
+                            />
+                        )}
+                        <SelectionList
+                            canSelectMultiple
+                            sections={[{data: taxesList, indexOffset: 0, isDisabled: false}]}
+                            onCheckboxPress={toggleTax}
+                            onSelectRow={navigateToEditTaxRate}
+                            onSelectAll={toggleAllTaxes}
+                            showScrollIndicator
+                            ListItem={TableListItem}
+                            customListHeader={getCustomListHeader()}
+                            listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                            onDismissError={(item) => (item.keyForList ? clearTaxRateError(policyID, item.keyForList, item.pendingAction) : undefined)}
+                        />
+                        <ConfirmModal
+                            title={translate('workspace.taxes.actions.delete')}
+                            isVisible={isDeleteModalVisible}
+                            onConfirm={deleteTaxes}
+                            onCancel={() => setIsDeleteModalVisible(false)}
+                            prompt={
+                                selectedTaxesIDs.length > 1
+                                    ? translate('workspace.taxes.deleteMultipleTaxConfirmation', {taxAmount: selectedTaxesIDs.length})
+                                    : translate('workspace.taxes.deleteTaxConfirmation')
+                            }
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
                         />
-                    )}
-                    <SelectionList
-                        canSelectMultiple
-                        sections={[{data: taxesList, indexOffset: 0, isDisabled: false}]}
-                        onCheckboxPress={toggleTax}
-                        onSelectRow={() => {}}
-                        onSelectAll={toggleAllTaxes}
-                        showScrollIndicator
-                        ListItem={TableListItem}
-                        customListHeader={getCustomListHeader()}
-                        listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
-                        onDismissError={(item) => (item.keyForList ? clearTaxRateError(route.params.policyID, item.keyForList, item.pendingAction) : undefined)}
-                    />
-                </ScreenWrapper>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
index 892434ce2d52..5b08a06247b0 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
@@ -13,6 +13,7 @@ import {setPolicyCustomTaxName} from '@libs/actions/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -43,37 +44,42 @@ function WorkspaceTaxesSettingsCustomTaxName({
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    shouldEnableMaxHeight
-                    testID={WorkspaceTaxesSettingsCustomTaxName.displayName}
-                    style={styles.defaultModalContainer}
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
                 >
-                    <HeaderWithBackButton title={translate('workspace.taxes.customTaxName')} />
-
-                    <FormProvider
-                        formID={ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME}
-                        submitButtonText={translate('workspace.editor.save')}
-                        style={[styles.flexGrow1, styles.ph5]}
-                        scrollContextEnabled
-                        enabledWhenOffline
-                        onSubmit={submit}
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        shouldEnableMaxHeight
+                        testID={WorkspaceTaxesSettingsCustomTaxName.displayName}
+                        style={styles.defaultModalContainer}
                     >
-                        <View style={styles.mb4}>
-                            <InputWrapper
-                                InputComponent={TextInput}
-                                role={CONST.ROLE.PRESENTATION}
-                                inputID={INPUT_IDS.NAME}
-                                label={translate('workspace.editor.nameInputLabel')}
-                                accessibilityLabel={translate('workspace.editor.nameInputLabel')}
-                                defaultValue={policy?.taxRates?.name}
-                                maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
-                                multiline={false}
-                                ref={inputCallbackRef}
-                            />
-                        </View>
-                    </FormProvider>
-                </ScreenWrapper>
+                        <HeaderWithBackButton title={translate('workspace.taxes.customTaxName')} />
+
+                        <FormProvider
+                            formID={ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME}
+                            submitButtonText={translate('workspace.editor.save')}
+                            style={[styles.flexGrow1, styles.ph5]}
+                            scrollContextEnabled
+                            enabledWhenOffline
+                            onSubmit={submit}
+                        >
+                            <View style={styles.mb4}>
+                                <InputWrapper
+                                    InputComponent={TextInput}
+                                    role={CONST.ROLE.PRESENTATION}
+                                    inputID={INPUT_IDS.NAME}
+                                    label={translate('workspace.editor.nameInputLabel')}
+                                    accessibilityLabel={translate('workspace.editor.nameInputLabel')}
+                                    defaultValue={policy?.taxRates?.name}
+                                    maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
+                                    multiline={false}
+                                    ref={inputCallbackRef}
+                                />
+                            </View>
+                        </FormProvider>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
index 4a6626a78286..91d543b51b09 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
@@ -11,9 +11,11 @@ import {setForeignCurrencyDefault} from '@libs/actions/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
@@ -37,27 +39,32 @@ function WorkspaceTaxesSettingsForeignCurrency({
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    shouldEnableMaxHeight
-                    testID={WorkspaceTaxesSettingsForeignCurrency.displayName}
-                    style={styles.defaultModalContainer}
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
                 >
-                    {({insets}) => (
-                        <>
-                            <HeaderWithBackButton title={translate('workspace.taxes.foreignDefault')} />
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        shouldEnableMaxHeight
+                        testID={WorkspaceTaxesSettingsForeignCurrency.displayName}
+                        style={styles.defaultModalContainer}
+                    >
+                        {({insets}) => (
+                            <>
+                                <HeaderWithBackButton title={translate('workspace.taxes.foreignDefault')} />
 
-                            <View style={[styles.mb4, styles.flex1]}>
-                                <TaxPicker
-                                    selectedTaxRate={policy?.taxRates?.foreignTaxDefault}
-                                    taxRates={policy?.taxRates}
-                                    insets={insets}
-                                    onSubmit={submit}
-                                />
-                            </View>
-                        </>
-                    )}
-                </ScreenWrapper>
+                                <View style={[styles.mb4, styles.flex1]}>
+                                    <TaxPicker
+                                        selectedTaxRate={policy?.taxRates?.foreignTaxDefault}
+                                        taxRates={policy?.taxRates}
+                                        insets={insets}
+                                        onSubmit={submit}
+                                    />
+                                </View>
+                            </>
+                        )}
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx
index 1fe6abb96b4c..0d1a8f1629c7 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsPage.tsx
@@ -11,9 +11,11 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
@@ -55,31 +57,36 @@ function WorkspaceTaxesSettingsPage({
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
-                <ScreenWrapper
-                    testID={WorkspaceTaxesSettingsPage.displayName}
-                    style={styles.defaultModalContainer}
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
                 >
-                    <ScrollView contentContainerStyle={styles.flexGrow1}>
-                        <HeaderWithBackButton title={translate('common.settings')} />
-                        <View style={styles.flex1}>
-                            {menuItems.map((item) => (
-                                <OfflineWithFeedback
-                                    key={item.description}
-                                    pendingAction={item.pendingAction}
-                                >
-                                    <MenuItemWithTopDescription
-                                        shouldShowRightIcon
-                                        title={item.title}
-                                        description={item.description}
-                                        style={[styles.moneyRequestMenuItem]}
-                                        titleStyle={styles.flex1}
-                                        onPress={item.action}
-                                    />
-                                </OfflineWithFeedback>
-                            ))}
-                        </View>
-                    </ScrollView>
-                </ScreenWrapper>
+                    <ScreenWrapper
+                        testID={WorkspaceTaxesSettingsPage.displayName}
+                        style={styles.defaultModalContainer}
+                    >
+                        <ScrollView contentContainerStyle={styles.flexGrow1}>
+                            <HeaderWithBackButton title={translate('common.settings')} />
+                            <View style={styles.flex1}>
+                                {menuItems.map((item) => (
+                                    <OfflineWithFeedback
+                                        key={item.description}
+                                        pendingAction={item.pendingAction}
+                                    >
+                                        <MenuItemWithTopDescription
+                                            shouldShowRightIcon
+                                            title={item.title}
+                                            description={item.description}
+                                            style={[styles.moneyRequestMenuItem]}
+                                            titleStyle={styles.flex1}
+                                            onPress={item.action}
+                                        />
+                                    </OfflineWithFeedback>
+                                ))}
+                            </View>
+                        </ScrollView>
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
index 68c50f3af830..2fe2985daa22 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
@@ -11,9 +11,11 @@ import {setWorkspaceCurrencyDefault} from '@libs/actions/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import AdminPolicyAccessOrNotFoundWrapper from '@pages/workspace/AdminPolicyAccessOrNotFoundWrapper';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import PaidPolicyAccessOrNotFoundWrapper from '@pages/workspace/PaidPolicyAccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
@@ -37,27 +39,32 @@ function WorkspaceTaxesSettingsWorkspaceCurrency({
     return (
         <AdminPolicyAccessOrNotFoundWrapper policyID={policyID}>
             <PaidPolicyAccessOrNotFoundWrapper policyID={policyID}>
-                <ScreenWrapper
-                    includeSafeAreaPaddingBottom={false}
-                    shouldEnableMaxHeight
-                    testID={WorkspaceTaxesSettingsWorkspaceCurrency.displayName}
-                    style={styles.defaultModalContainer}
+                <FeatureEnabledAccessOrNotFoundWrapper
+                    policyID={policyID}
+                    featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
                 >
-                    {({insets}) => (
-                        <>
-                            <HeaderWithBackButton title={translate('workspace.taxes.workspaceDefault')} />
+                    <ScreenWrapper
+                        includeSafeAreaPaddingBottom={false}
+                        shouldEnableMaxHeight
+                        testID={WorkspaceTaxesSettingsWorkspaceCurrency.displayName}
+                        style={styles.defaultModalContainer}
+                    >
+                        {({insets}) => (
+                            <>
+                                <HeaderWithBackButton title={translate('workspace.taxes.workspaceDefault')} />
 
-                            <View style={[styles.mb4, styles.flex1]}>
-                                <TaxPicker
-                                    selectedTaxRate={policy?.taxRates?.defaultExternalID}
-                                    taxRates={policy?.taxRates}
-                                    insets={insets}
-                                    onSubmit={submit}
-                                />
-                            </View>
-                        </>
-                    )}
-                </ScreenWrapper>
+                                <View style={[styles.mb4, styles.flex1]}>
+                                    <TaxPicker
+                                        selectedTaxRate={policy?.taxRates?.defaultExternalID}
+                                        taxRates={policy?.taxRates}
+                                        insets={insets}
+                                        onSubmit={submit}
+                                    />
+                                </View>
+                            </>
+                        )}
+                    </ScreenWrapper>
+                </FeatureEnabledAccessOrNotFoundWrapper>
             </PaidPolicyAccessOrNotFoundWrapper>
         </AdminPolicyAccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
index cf66af726a72..1dd65ffb2390 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
@@ -1,3 +1,4 @@
+import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useState} from 'react';
 import {FlatList} from 'react-native-gesture-handler';
 import type {ValueOf} from 'type-fest';
@@ -9,20 +10,24 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
 import * as Localize from '@libs/Localize';
 import Navigation from '@libs/Navigation/Navigation';
+import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type AutoReportingFrequencyKey = Exclude<ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>, 'instant'>;
 type Locale = ValueOf<typeof CONST.LOCALES>;
 
-type WorkspaceAutoReportingFrequencyPageProps = WithPolicyOnyxProps;
+type WorkspaceAutoReportingFrequencyPageProps = WithPolicyOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY>;
 
 type WorkspaceAutoReportingFrequencyPageItem = {
     text: string;
@@ -41,7 +46,7 @@ const getAutoReportingFrequencyDisplayNames = (locale: Locale): AutoReportingFre
     [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL]: Localize.translate(locale, 'workflowsPage.frequencies.manually'),
 });
 
-function WorkspaceAutoReportingFrequencyPage({policy}: WorkspaceAutoReportingFrequencyPageProps) {
+function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoReportingFrequencyPageProps) {
     const {translate, preferredLocale, toLocaleOrdinal} = useLocalize();
     const styles = useThemeStyles();
     const [isMonthlyFrequency, setIsMonthlyFrequency] = useState(policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MONTHLY);
@@ -80,7 +85,12 @@ function WorkspaceAutoReportingFrequencyPage({policy}: WorkspaceAutoReportingFre
     };
 
     const monthlyFrequencyDetails = () => (
-        <OfflineWithFeedback pendingAction={policy?.pendingFields?.autoReportingOffset}>
+        <OfflineWithFeedback
+            pendingAction={policy?.pendingFields?.autoReportingOffset}
+            errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_OFFSET)}
+            onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_OFFSET)}
+            errorRowStyles={[styles.ml7]}
+        >
             <MenuItem
                 title={translate('workflowsPage.submissionFrequencyDateOfMonth')}
                 titleStyle={styles.textLabelSupportingNormal}
@@ -105,28 +115,38 @@ function WorkspaceAutoReportingFrequencyPage({policy}: WorkspaceAutoReportingFre
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={WorkspaceAutoReportingFrequencyPage.displayName}
+        <FeatureEnabledAccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <FullPageNotFoundView
-                onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
-                onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
-                shouldShow={isEmptyObject(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy) || !PolicyUtils.isPaidGroupPolicy(policy)}
-                subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceAutoReportingFrequencyPage.displayName}
             >
-                <HeaderWithBackButton
-                    title={translate('workflowsPage.submissionFrequency')}
-                    onBackButtonPress={Navigation.goBack}
-                />
-
-                <FlatList
-                    data={autoReportingFrequencyItems}
-                    renderItem={renderItem}
-                    keyExtractor={(item: WorkspaceAutoReportingFrequencyPageItem) => item.text}
-                />
-            </FullPageNotFoundView>
-        </ScreenWrapper>
+                <FullPageNotFoundView
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                    shouldShow={isEmptyObject(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy) || !PolicyUtils.isPaidGroupPolicy(policy)}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsPage.submissionFrequency')}
+                        onBackButtonPress={Navigation.goBack}
+                    />
+                    <OfflineWithFeedback
+                        pendingAction={policy?.pendingFields?.autoReportingFrequency}
+                        errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_FREQUENCY)}
+                        onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_FREQUENCY)}
+                    >
+                        <FlatList
+                            data={autoReportingFrequencyItems}
+                            renderItem={renderItem}
+                            keyExtractor={(item: WorkspaceAutoReportingFrequencyPageItem) => item.text}
+                        />
+                    </OfflineWithFeedback>
+                </FullPageNotFoundView>
+            </ScreenWrapper>
+        </FeatureEnabledAccessOrNotFoundWrapper>
     );
 }
 
diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
index 84d70e799c42..204857fccb18 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
@@ -1,3 +1,4 @@
+import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useState} from 'react';
 import type {ValueOf} from 'type-fest';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
@@ -7,16 +8,20 @@ import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
 import Navigation from '@libs/Navigation/Navigation';
+import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 const DAYS_OF_MONTH = 28;
 
-type WorkspaceAutoReportingMonthlyOffsetProps = WithPolicyOnyxProps;
+type WorkspaceAutoReportingMonthlyOffsetProps = WithPolicyOnyxProps &
+    StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET>;
 
 type AutoReportingOffsetKeys = ValueOf<typeof CONST.POLICY.AUTO_REPORTING_OFFSET>;
 
@@ -27,7 +32,7 @@ type WorkspaceAutoReportingMonthlyOffsetPageItem = {
     isNumber?: boolean;
 };
 
-function WorkspaceAutoReportingMonthlyOffsetPage({policy}: WorkspaceAutoReportingMonthlyOffsetProps) {
+function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoReportingMonthlyOffsetProps) {
     const {translate, toLocaleOrdinal} = useLocalize();
     const offset = policy?.autoReportingOffset ?? 0;
     const [searchText, setSearchText] = useState('');
@@ -67,34 +72,39 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy}: WorkspaceAutoReportin
     };
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={WorkspaceAutoReportingMonthlyOffsetPage.displayName}
+        <FeatureEnabledAccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <FullPageNotFoundView
-                onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
-                onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
-                shouldShow={isEmptyObject(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy) || !PolicyUtils.isPaidGroupPolicy(policy)}
-                subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceAutoReportingMonthlyOffsetPage.displayName}
             >
-                <HeaderWithBackButton
-                    title={translate('workflowsPage.submissionFrequency')}
-                    onBackButtonPress={Navigation.goBack}
-                />
+                <FullPageNotFoundView
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                    shouldShow={isEmptyObject(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy) || !PolicyUtils.isPaidGroupPolicy(policy)}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsPage.submissionFrequency')}
+                        onBackButtonPress={Navigation.goBack}
+                    />
 
-                <SelectionList
-                    sections={[{data: filteredDaysOfMonth, indexOffset: 0}]}
-                    textInputLabel={translate('workflowsPage.submissionFrequencyDateOfMonth')}
-                    textInputValue={searchText}
-                    onChangeText={setSearchText}
-                    headerMessage={headerMessage}
-                    ListItem={RadioListItem}
-                    onSelectRow={onSelectDayOfMonth}
-                    initiallyFocusedOptionKey={offset.toString()}
-                    showScrollIndicator
-                />
-            </FullPageNotFoundView>
-        </ScreenWrapper>
+                    <SelectionList
+                        sections={[{data: filteredDaysOfMonth, indexOffset: 0}]}
+                        textInputLabel={translate('workflowsPage.submissionFrequencyDateOfMonth')}
+                        textInputValue={searchText}
+                        onChangeText={setSearchText}
+                        headerMessage={headerMessage}
+                        ListItem={RadioListItem}
+                        onSelectRow={onSelectDayOfMonth}
+                        initiallyFocusedOptionKey={offset.toString()}
+                        showScrollIndicator
+                    />
+                </FullPageNotFoundView>
+            </ScreenWrapper>
+        </FeatureEnabledAccessOrNotFoundWrapper>
     );
 }
 
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
index 52406a8033d2..e8913aafe972 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
@@ -1,3 +1,4 @@
+import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useMemo, useState} from 'react';
 import type {SectionListData} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -17,15 +18,18 @@ import compose from '@libs/compose';
 import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
+import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as UserUtils from '@libs/UserUtils';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import * as Policy from '@userActions/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
 import type {PersonalDetailsList, PolicyMember} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
@@ -34,11 +38,13 @@ type WorkspaceWorkflowsApproverPageOnyxProps = {
     personalDetails: OnyxEntry<PersonalDetailsList>;
 };
 
-type WorkspaceWorkflowsApproverPageProps = WorkspaceWorkflowsApproverPageOnyxProps & WithPolicyAndFullscreenLoadingProps;
+type WorkspaceWorkflowsApproverPageProps = WorkspaceWorkflowsApproverPageOnyxProps &
+    WithPolicyAndFullscreenLoadingProps &
+    StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVER>;
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 type MembersSection = SectionListData<MemberOption, Section<MemberOption>>;
 
-function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails, isLoadingReportData = true}: WorkspaceWorkflowsApproverPageProps) {
+function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails, isLoadingReportData = true, route}: WorkspaceWorkflowsApproverPageProps) {
     const {translate} = useLocalize();
     const policyName = policy?.name ?? '';
     const [searchTerm, setSearchTerm] = useState('');
@@ -161,33 +167,38 @@ function WorkspaceWorkflowsApproverPage({policy, policyMembers, personalDetails,
     };
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={WorkspaceWorkflowsApproverPage.displayName}
+        <FeatureEnabledAccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <FullPageNotFoundView
-                shouldShow={(isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)}
-                subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
-                onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
-                onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceWorkflowsApproverPage.displayName}
             >
-                <HeaderWithBackButton
-                    title={translate('workflowsPage.approver')}
-                    subtitle={policyName}
-                    onBackButtonPress={Navigation.goBack}
-                />
-                <SelectionList
-                    sections={sections}
-                    textInputLabel={translate('optionsSelector.findMember')}
-                    textInputValue={searchTerm}
-                    onChangeText={setSearchTerm}
-                    headerMessage={headerMessage}
-                    ListItem={UserListItem}
-                    onSelectRow={setPolicyApprover}
-                    showScrollIndicator
-                />
-            </FullPageNotFoundView>
-        </ScreenWrapper>
+                <FullPageNotFoundView
+                    shouldShow={(isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsPage.approver')}
+                        subtitle={policyName}
+                        onBackButtonPress={Navigation.goBack}
+                    />
+                    <SelectionList
+                        sections={sections}
+                        textInputLabel={translate('optionsSelector.findMember')}
+                        textInputValue={searchTerm}
+                        onChangeText={setSearchTerm}
+                        headerMessage={headerMessage}
+                        ListItem={UserListItem}
+                        onSelectRow={setPolicyApprover}
+                        showScrollIndicator
+                    />
+                </FullPageNotFoundView>
+            </ScreenWrapper>
+        </FeatureEnabledAccessOrNotFoundWrapper>
     );
 }
 
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index c6ace2b0856e..5bcb631c21b0 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -1,8 +1,9 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {FlatList, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
+import ConfirmModal from '@components/ConfirmModal';
 import * as Illustrations from '@components/Icon/Illustrations';
 import MenuItem from '@components/MenuItem';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -19,6 +20,7 @@ import Permissions from '@libs/Permissions';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
+import FeatureEnabledAccessOrNotFoundWrapper from '@pages/workspace/FeatureEnabledAccessOrNotFoundWrapper';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import withPolicy from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
@@ -53,6 +55,7 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
     const policyApproverName = useMemo(() => PersonalDetailsUtils.getPersonalDetailByEmail(policyApproverEmail ?? '')?.displayName ?? policyApproverEmail, [policyApproverEmail]);
     const containerStyle = useMemo(() => [styles.ph8, styles.mhn8, styles.ml11, styles.pv3, styles.pr0, styles.pl4, styles.mr0, styles.widthAuto, styles.mt4], [styles]);
     const canUseDelayedSubmission = Permissions.canUseWorkflowsDelayedSubmission(betas);
+    const [isCurrencyModalOpen, setIsCurrencyModalOpen] = useState(false);
 
     const displayNameForAuthorizedPayer = useMemo(() => {
         const personalDetails = PersonalDetailsUtils.getPersonalDetailsByIDs([policy?.reimburserAccountID ?? 0], session?.accountID ?? 0);
@@ -66,6 +69,15 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
         Policy.openPolicyWorkflowsPage(policy?.id ?? route.params.policyID);
     };
 
+    const confirmCurrencyChangeAndHideModal = useCallback(() => {
+        if (!policy) {
+            return;
+        }
+        Policy.updateGeneralSettings(policy.id, policy.name, CONST.CURRENCY.USD);
+        setIsCurrencyModalOpen(false);
+        navigateToBankAccountRoute(route.params.policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID));
+    }, [policy, route.params.policyID]);
+
     useNetwork({onReconnect: fetchData});
 
     useEffect(() => {
@@ -78,6 +90,8 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
         const hasVBA = state === BankAccount.STATE.OPEN;
         const bankDisplayName = bankName ? `${bankName} ${accountNumber ? `${accountNumber.slice(-5)}` : ''}` : '';
         const hasReimburserEmailError = !!policy?.errorFields?.reimburserEmail;
+        const hasApprovalError = !!policy?.errorFields?.approvalMode;
+        const hasDelayedSubmissionError = !!policy?.errorFields?.autoReporting;
 
         return [
             ...(canUseDelayedSubmission
@@ -108,10 +122,13 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                                   shouldShowRightIcon
                                   wrapperStyle={containerStyle}
                                   hoverAndPressStyle={[styles.mr0, styles.br2]}
+                                  brickRoadIndicator={hasDelayedSubmissionError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                               />
                           ),
-                          isActive: (policy?.harvesting?.enabled && policy.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT) ?? false,
-                          pendingAction: policy?.pendingFields?.isAutoApprovalEnabled,
+                          isActive: (policy?.harvesting?.enabled && policy.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT && !hasDelayedSubmissionError) ?? false,
+                          pendingAction: policy?.pendingFields?.autoReporting,
+                          errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING),
+                          onCloseError: () => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING),
                       },
                   ]
                 : []),
@@ -132,18 +149,28 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                         shouldShowRightIcon
                         wrapperStyle={containerStyle}
                         hoverAndPressStyle={[styles.mr0, styles.br2]}
+                        brickRoadIndicator={hasApprovalError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                     />
                 ),
-                isActive: policy?.isAutoApprovalEnabled ?? false,
+                isActive: (policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.BASIC && !hasApprovalError) ?? false,
                 pendingAction: policy?.pendingFields?.approvalMode,
+                errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.APPROVAL_MODE),
+                onCloseError: () => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.APPROVAL_MODE),
             },
             {
                 icon: Illustrations.WalletAlt,
                 title: translate('workflowsPage.makeOrTrackPaymentsTitle'),
                 subtitle: translate('workflowsPage.makeOrTrackPaymentsDescription'),
-                onToggle: () => {
-                    const isActive = policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
-                    const newReimbursementChoice = isActive ? CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL : CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
+                onToggle: (isEnabled: boolean) => {
+                    let newReimbursementChoice;
+                    if (!isEnabled) {
+                        newReimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
+                    } else if (hasVBA && !Policy.isCurrencySupportedForDirectReimbursement(policy?.outputCurrency ?? '')) {
+                        newReimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+                    } else {
+                        newReimbursementChoice = hasVBA ? CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES : CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+                    }
+
                     const newReimburserAccountID =
                         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                         PersonalDetailsUtils.getPersonalDetailByEmail(policy?.reimburserEmail ?? '')?.accountID || policy?.reimburserAccountID || policy?.ownerAccountID;
@@ -153,20 +180,30 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                 subMenuItems: (
                     <>
                         <MenuItem
-                            titleStyle={styles.textLabelSupportingNormal}
+                            titleStyle={hasVBA ? styles.textLabelSupportingNormal : styles.textLabelSupportingEmptyValue}
                             descriptionTextStyle={styles.textNormalThemeText}
-                            title={hasVBA ? translate('common.bankAccount') : translate('workflowsPage.connectBankAccount')}
+                            title={
+                                hasVBA && policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES
+                                    ? translate('common.bankAccount')
+                                    : translate('workflowsPage.connectBankAccount')
+                            }
                             description={state === BankAccount.STATE.OPEN ? bankDisplayName : undefined}
-                            onPress={() => navigateToBankAccountRoute(route.params.policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID))}
+                            onPress={() => {
+                                if (!Policy.isCurrencySupportedForDirectReimbursement(policy?.outputCurrency ?? '')) {
+                                    setIsCurrencyModalOpen(true);
+                                    return;
+                                }
+                                navigateToBankAccountRoute(route.params.policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID));
+                            }}
                             shouldShowRightIcon
                             wrapperStyle={containerStyle}
                             hoverAndPressStyle={[styles.mr0, styles.br2]}
                         />
-                        {hasVBA && (
+                        {hasVBA && policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && (
                             <OfflineWithFeedback
                                 pendingAction={policy?.pendingFields?.reimburserEmail}
-                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, 'reimburserEmail')}
-                                onClose={() => Policy.clearWorkspacePayerError(policy?.id ?? '')}
+                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.REIMBURSER_EMAIL)}
+                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.REIMBURSER_EMAIL)}
                                 errorRowStyles={[styles.ml7]}
                             >
                                 <MenuItem
@@ -185,10 +222,10 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
                     </>
                 ),
                 isEndOptionRow: true,
-                isActive: policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+                isActive: policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
                 pendingAction: policy?.pendingFields?.reimbursementChoice,
-                errors: ErrorUtils.getLatestErrorField(policy ?? {}, 'reimbursementChoice'),
-                onCloseError: () => Policy.clearWorkspaceReimbursementErrors(policy?.id ?? ''),
+                errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.REIMBURSEMENT_CHOICE),
+                onCloseError: () => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.REIMBURSEMENT_CHOICE),
             },
         ];
     }, [
@@ -227,33 +264,48 @@ function WorkspaceWorkflowsPage({policy, betas, route, reimbursementAccount, ses
     const isLoading = reimbursementAccount?.isLoading ?? true;
 
     return (
-        <WorkspacePageWithSections
-            headerText={translate('workspace.common.workflows')}
-            icon={Illustrations.Workflows}
-            route={route}
-            guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_WORKFLOWS}
-            shouldShowOfflineIndicatorInWideScreen
-            shouldShowNotFoundPage={!isPaidGroupPolicy || !isPolicyAdmin}
-            shouldSkipVBBACall
-            isLoading={isLoading}
+        <FeatureEnabledAccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
         >
-            <View style={[styles.mt3, styles.textStrong, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
-                <Section
-                    title={translate('workflowsPage.workflowTitle')}
-                    titleStyles={styles.textStrong}
-                    containerStyles={isSmallScreenWidth ? styles.p5 : styles.p8}
-                >
-                    <View>
-                        <Text style={[styles.mt3, styles.textSupporting]}>{translate('workflowsPage.workflowDescription')}</Text>
-                        <FlatList
-                            data={optionItems}
-                            renderItem={renderOptionItem}
-                            keyExtractor={(item: ToggleSettingOptionRowProps) => item.title}
-                        />
-                    </View>
-                </Section>
-            </View>
-        </WorkspacePageWithSections>
+            <WorkspacePageWithSections
+                headerText={translate('workspace.common.workflows')}
+                icon={Illustrations.Workflows}
+                route={route}
+                guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_WORKFLOWS}
+                shouldShowOfflineIndicatorInWideScreen
+                shouldShowNotFoundPage={!isPaidGroupPolicy || !isPolicyAdmin}
+                shouldSkipVBBACall
+                isLoading={isLoading}
+            >
+                <View style={[styles.mt3, styles.textStrong, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    <Section
+                        title={translate('workflowsPage.workflowTitle')}
+                        titleStyles={styles.textStrong}
+                        containerStyles={isSmallScreenWidth ? styles.p5 : styles.p8}
+                    >
+                        <View>
+                            <Text style={[styles.mt3, styles.textSupporting]}>{translate('workflowsPage.workflowDescription')}</Text>
+                            <FlatList
+                                data={optionItems}
+                                renderItem={renderOptionItem}
+                                keyExtractor={(item: ToggleSettingOptionRowProps) => item.title}
+                            />
+                            <ConfirmModal
+                                title={translate('workspace.bankAccount.workspaceCurrency')}
+                                isVisible={isCurrencyModalOpen}
+                                onConfirm={confirmCurrencyChangeAndHideModal}
+                                onCancel={() => setIsCurrencyModalOpen(false)}
+                                prompt={translate('workspace.bankAccount.updateCurrencyPrompt')}
+                                confirmText={translate('workspace.bankAccount.updateToUSD')}
+                                cancelText={translate('common.cancel')}
+                                danger
+                            />
+                        </View>
+                    </Section>
+                </View>
+            </WorkspacePageWithSections>
+        </FeatureEnabledAccessOrNotFoundWrapper>
     );
 }
 
diff --git a/src/stories/CheckboxWithLabel.stories.js b/src/stories/CheckboxWithLabel.stories.tsx
similarity index 71%
rename from src/stories/CheckboxWithLabel.stories.js
rename to src/stories/CheckboxWithLabel.stories.tsx
index f978856aaefb..8d3c1610e500 100644
--- a/src/stories/CheckboxWithLabel.stories.js
+++ b/src/stories/CheckboxWithLabel.stories.tsx
@@ -1,29 +1,33 @@
+import type {ComponentMeta, ComponentStory} from '@storybook/react';
 import React from 'react';
 import CheckboxWithLabel from '@components/CheckboxWithLabel';
+import type {CheckboxWithLabelProps} from '@components/CheckboxWithLabel';
 import Text from '@components/Text';
 // eslint-disable-next-line no-restricted-imports
 import {defaultStyles} from '@styles/index';
 
+type CheckboxWithLabelStory = ComponentStory<typeof CheckboxWithLabel>;
+
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
  * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
  */
-const story = {
+const story: ComponentMeta<typeof CheckboxWithLabel> = {
     title: 'Components/CheckboxWithLabel',
     component: CheckboxWithLabel,
 };
 
-function Template(args) {
+function Template(props: CheckboxWithLabelProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return <CheckboxWithLabel {...args} />;
+    return <CheckboxWithLabel {...props} />;
 }
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Default = Template.bind({});
-const WithLabelComponent = Template.bind({});
-const WithErrors = Template.bind({});
+const Default: CheckboxWithLabelStory = Template.bind({});
+const WithLabelComponent: CheckboxWithLabelStory = Template.bind({});
+const WithErrors: CheckboxWithLabelStory = Template.bind({});
 Default.args = {
     isChecked: true,
     label: 'Plain text label',
@@ -44,7 +48,6 @@ WithLabelComponent.args = {
 
 WithErrors.args = {
     isChecked: false,
-    hasError: true,
     errorText: 'Please accept Terms before continuing.',
     onInputChange: () => {},
     label: 'I accept the Terms & Conditions',
diff --git a/src/stories/MenuItem.stories.js b/src/stories/MenuItem.stories.tsx
similarity index 77%
rename from src/stories/MenuItem.stories.js
rename to src/stories/MenuItem.stories.tsx
index 0e7260fa4d1a..da486656cddf 100644
--- a/src/stories/MenuItem.stories.js
+++ b/src/stories/MenuItem.stories.tsx
@@ -1,26 +1,30 @@
+import type {ComponentMeta, ComponentStory} from '@storybook/react';
 import React from 'react';
 import Chase from '@assets/images/bankicons/chase.svg';
 import MenuItem from '@components/MenuItem';
+import type {MenuItemProps} from '@components/MenuItem';
 import variables from '@styles/variables';
 
+type MenuItemStory = ComponentStory<typeof MenuItem>;
+
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
  * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
  */
-const story = {
+const story: ComponentMeta<typeof MenuItem> = {
     title: 'Components/MenuItem',
     component: MenuItem,
 };
 
-function Template(args) {
+function Template(props: MenuItemProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return <MenuItem {...args} />;
+    return <MenuItem {...props} />;
 }
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Default = Template.bind({});
+const Default: MenuItemStory = Template.bind({});
 Default.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
@@ -28,7 +32,7 @@ Default.args = {
     iconWidth: variables.iconSizeExtraLarge,
 };
 
-const Description = Template.bind({});
+const Description: MenuItemStory = Template.bind({});
 Description.args = {
     title: 'Alberta Bobbeth Charleson',
     description: 'Account ending in 1111',
@@ -37,7 +41,7 @@ Description.args = {
     iconWidth: variables.iconSizeExtraLarge,
 };
 
-const RightIcon = Template.bind({});
+const RightIcon: MenuItemStory = Template.bind({});
 RightIcon.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
@@ -46,7 +50,7 @@ RightIcon.args = {
     shouldShowRightIcon: true,
 };
 
-const RightIconAndDescription = Template.bind({});
+const RightIconAndDescription: MenuItemStory = Template.bind({});
 RightIconAndDescription.args = {
     title: 'Alberta Bobbeth Charleson',
     description: 'Account ending in 1111',
@@ -56,7 +60,7 @@ RightIconAndDescription.args = {
     shouldShowRightIcon: true,
 };
 
-const RightIconAndDescriptionWithLabel = Template.bind({});
+const RightIconAndDescriptionWithLabel: MenuItemStory = Template.bind({});
 RightIconAndDescriptionWithLabel.args = {
     label: 'Account number',
     title: 'Alberta Bobbeth Charleson',
@@ -67,7 +71,7 @@ RightIconAndDescriptionWithLabel.args = {
     shouldShowRightIcon: true,
 };
 
-const Selected = Template.bind({});
+const Selected: MenuItemStory = Template.bind({});
 Selected.args = {
     title: 'Alberta Bobbeth Charleson',
     description: 'Account ending in 1111',
@@ -78,7 +82,7 @@ Selected.args = {
     isSelected: true,
 };
 
-const BadgeText = Template.bind({});
+const BadgeText: MenuItemStory = Template.bind({});
 BadgeText.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
@@ -88,7 +92,7 @@ BadgeText.args = {
     badgeText: '$0.00',
 };
 
-const Focused = Template.bind({});
+const Focused: MenuItemStory = Template.bind({});
 Focused.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
@@ -98,7 +102,7 @@ Focused.args = {
     focused: true,
 };
 
-const Disabled = Template.bind({});
+const Disabled: MenuItemStory = Template.bind({});
 Disabled.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
@@ -108,17 +112,17 @@ Disabled.args = {
     disabled: true,
 };
 
-const BrickRoadIndicatorSuccess = Template.bind({});
-BrickRoadIndicatorSuccess.args = {
+const BrickRoadIndicatorInfo: MenuItemStory = Template.bind({});
+BrickRoadIndicatorInfo.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
     iconHeight: variables.iconSizeExtraLarge,
     iconWidth: variables.iconSizeExtraLarge,
     shouldShowRightIcon: true,
-    brickRoadIndicator: 'success',
+    brickRoadIndicator: 'info',
 };
 
-const BrickRoadIndicatorFailure = Template.bind({});
+const BrickRoadIndicatorFailure: MenuItemStory = Template.bind({});
 BrickRoadIndicatorFailure.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
@@ -128,7 +132,7 @@ BrickRoadIndicatorFailure.args = {
     brickRoadIndicator: 'error',
 };
 
-const ErrorMessage = Template.bind({});
+const ErrorMessage: MenuItemStory = Template.bind({});
 ErrorMessage.args = {
     title: 'Alberta Bobbeth Charleson',
     icon: Chase,
@@ -149,7 +153,7 @@ export {
     BadgeText,
     Focused,
     Disabled,
-    BrickRoadIndicatorSuccess,
+    BrickRoadIndicatorInfo,
     BrickRoadIndicatorFailure,
     RightIconAndDescriptionWithLabel,
     ErrorMessage,
diff --git a/src/stories/OptionRow.stories.js b/src/stories/OptionRow.stories.tsx
similarity index 91%
rename from src/stories/OptionRow.stories.js
rename to src/stories/OptionRow.stories.tsx
index 3096940dda5f..ea83816ab340 100644
--- a/src/stories/OptionRow.stories.js
+++ b/src/stories/OptionRow.stories.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import * as Expensicons from '@components/Icon/Expensicons';
 import OnyxProvider from '@components/OnyxProvider';
 import OptionRow from '@components/OptionRow';
+import type {OptionRowProps} from '@components/OptionRow';
 
 /* eslint-disable react/jsx-props-no-spreading */
 
@@ -42,10 +43,10 @@ export default {
     },
 };
 
-function Template(args) {
+function Template(props: OptionRowProps) {
     return (
         <OnyxProvider>
-            <OptionRow {...args} />
+            <OptionRow {...props} />
         </OnyxProvider>
     );
 }
diff --git a/src/stories/PopoverMenu.stories.js b/src/stories/PopoverMenu.stories.tsx
similarity index 78%
rename from src/stories/PopoverMenu.stories.js
rename to src/stories/PopoverMenu.stories.tsx
index c03a554741f1..8396a0ea15b5 100644
--- a/src/stories/PopoverMenu.stories.js
+++ b/src/stories/PopoverMenu.stories.tsx
@@ -1,36 +1,40 @@
+import type {ComponentMeta, ComponentStory} from '@storybook/react';
 import React from 'react';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MenuItem from '@components/MenuItem';
 import PopoverMenu from '@components/PopoverMenu';
+import type {PopoverMenuProps} from '@components/PopoverMenu';
 // eslint-disable-next-line no-restricted-imports
 import themeColors from '@styles/theme/themes/dark';
 
+type PopoverMenuStory = ComponentStory<typeof PopoverMenu>;
+
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
  * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
  */
-const story = {
+const story: ComponentMeta<typeof PopoverMenu> = {
     title: 'Components/PopoverMenu',
     component: PopoverMenu,
 };
 
-function Template(args) {
+function Template(props: PopoverMenuProps) {
     const [isVisible, setIsVisible] = React.useState(false);
     const toggleVisibility = () => setIsVisible(!isVisible);
     return (
         <>
             <MenuItem
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...args.menuItem}
+                title="Add payment Methods"
+                icon={Expensicons.Plus}
                 onPress={toggleVisibility}
                 wrapperStyle={isVisible ? [{backgroundColor: themeColors.border}] : []}
             />
             <SafeAreaProvider>
                 <PopoverMenu
                     // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...args.popoverMenu}
+                    {...props}
                     isVisible={isVisible}
                     onClose={toggleVisibility}
                     onItemSelected={toggleVisibility}
@@ -54,17 +58,11 @@ function Template(args) {
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Default = Template.bind({});
+const Default: PopoverMenuStory = Template.bind({});
 Default.args = {
-    popoverMenu: {
-        anchorPosition: {
-            top: 80,
-            left: 20,
-        },
-    },
-    menuItem: {
-        title: 'Add payment Methods',
-        icon: Expensicons.Plus,
+    anchorPosition: {
+        vertical: 80,
+        horizontal: 20,
     },
 };
 
diff --git a/src/stories/SubscriptAvatar.stories.js b/src/stories/SubscriptAvatar.stories.tsx
similarity index 75%
rename from src/stories/SubscriptAvatar.stories.js
rename to src/stories/SubscriptAvatar.stories.tsx
index f2cf1c216052..4e9c6459aade 100644
--- a/src/stories/SubscriptAvatar.stories.js
+++ b/src/stories/SubscriptAvatar.stories.tsx
@@ -1,9 +1,13 @@
+import type {ComponentStory} from '@storybook/react';
 import React from 'react';
 import * as defaultAvatars from '@components/Icon/DefaultAvatars';
 import * as Expensicons from '@components/Icon/Expensicons';
 import SubscriptAvatar from '@components/SubscriptAvatar';
+import type {SubscriptAvatarProps} from '@components/SubscriptAvatar';
 import CONST from '@src/CONST';
 
+type SubscriptAvatarStory = ComponentStory<typeof SubscriptAvatar>;
+
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
@@ -23,27 +27,27 @@ export default {
     },
 };
 
-function Template(args) {
+function Template(props: SubscriptAvatarProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
-    return <SubscriptAvatar {...args} />;
+    return <SubscriptAvatar {...props} />;
 }
 
 // Arguments can be passed to the component by binding
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
-const Default = Template.bind({});
+const Default: SubscriptAvatarStory = Template.bind({});
 
-const AvatarURLStory = Template.bind({});
+const AvatarURLStory: SubscriptAvatarStory = Template.bind({});
 AvatarURLStory.args = {
     mainAvatar: {source: defaultAvatars.Avatar1, name: '', type: CONST.ICON_TYPE_AVATAR},
     secondaryAvatar: {source: defaultAvatars.Avatar3, name: '', type: CONST.ICON_TYPE_AVATAR},
 };
 
-const SubscriptIcon = Template.bind({});
+const SubscriptIcon: SubscriptAvatarStory = Template.bind({});
 SubscriptIcon.args = {
     subscriptIcon: {source: Expensicons.DownArrow, width: 8, height: 8},
 };
 
-const WorkspaceSubscriptIcon = Template.bind({});
+const WorkspaceSubscriptIcon: SubscriptAvatarStory = Template.bind({});
 WorkspaceSubscriptIcon.args = {
     mainAvatar: {source: defaultAvatars.Avatar1, name: '', type: CONST.ICON_TYPE_WORKSPACE},
     subscriptIcon: {source: Expensicons.DownArrow, width: 8, height: 8},
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 8a91291a0c71..8a65cabaf19f 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -1265,6 +1265,13 @@ const styles = (theme: ThemeColors) =>
             color: theme.textSupporting,
         },
 
+        textLabelSupportingEmptyValue: {
+            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            fontSize: variables.fontSizeNormal,
+            fontWeight: FontUtils.fontWeight.normal,
+            color: theme.textSupporting,
+        },
+
         textLabelSupportingNormal: {
             fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeLabel,
@@ -1443,9 +1450,9 @@ const styles = (theme: ThemeColors) =>
         },
 
         sidebarAvatar: {
-            borderRadius: 28,
-            height: 28,
-            width: 28,
+            borderRadius: variables.sidebarAvatarSize,
+            height: variables.sidebarAvatarSize,
+            width: variables.sidebarAvatarSize,
         },
 
         selectedAvatarBorder: {
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 7fb04a2dad77..671bb36847c9 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -113,7 +113,7 @@ const lightTheme = {
         },
         [SCREENS.SETTINGS.WORKSPACES]: {
             backgroundColor: colors.productLight100,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
+            statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
         [SCREENS.SETTINGS.WALLET.ROOT]: {
             backgroundColor: colors.productLight100,
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 9a25313837fe..4c66967f52b9 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1541,7 +1541,6 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
     getTestToolsModalStyle: (windowWidth: number): ViewStyle[] => [styles.settingsPageBody, styles.p5, {width: windowWidth * 0.9}],
 
     getMultiselectListStyles: (isSelected: boolean, isDisabled: boolean): ViewStyle => ({
-        ...styles.mr3,
         ...(isSelected && styles.checkedContainer),
         ...(isSelected && styles.borderColorFocus),
         ...(isDisabled && styles.cursorDisabled),
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 0ebc4e60991f..d911a2fc4b0e 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -83,6 +83,7 @@ export default {
     iconSizeSuperLarge: 60,
     iconSizeUltraLarge: 120,
     iconBottomBar: 24,
+    sidebarAvatarSize: 28,
     iconHeader: 48,
     emojiSize: 20,
     emojiLineHeight: 28,
diff --git a/src/types/form/AdditionalDetailStepForm.ts b/src/types/form/AdditionalDetailStepForm.ts
new file mode 100644
index 000000000000..ec2838025d54
--- /dev/null
+++ b/src/types/form/AdditionalDetailStepForm.ts
@@ -0,0 +1,36 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    LEGAL_FIRST_NAME: 'legalFirstName',
+    LEGAL_LAST_NAME: 'legalLastName',
+    PHONE_NUMBER: 'phoneNumber',
+    ADDRESS_STREET: 'addressStreet',
+    ADDRESS_CITY: 'addressCity',
+    ADDRESS_ZIP_CODE: 'addressZipCode',
+    ADDRESS_STATE: 'addressState',
+    DOB: 'dob',
+    SSN: 'ssn',
+    ANSWER: 'answer',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type AdditionalDetailStepForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.LEGAL_FIRST_NAME]: string;
+        [INPUT_IDS.LEGAL_LAST_NAME]: string;
+        [INPUT_IDS.PHONE_NUMBER]: string;
+        [INPUT_IDS.ADDRESS_STREET]: string;
+        [INPUT_IDS.ADDRESS_CITY]: string;
+        [INPUT_IDS.ADDRESS_ZIP_CODE]: string;
+        [INPUT_IDS.ADDRESS_STATE]: string;
+        [INPUT_IDS.DOB]: string;
+        [INPUT_IDS.SSN]: string;
+        [INPUT_IDS.ANSWER]: string;
+    }
+>;
+
+export type {AdditionalDetailStepForm};
+export default INPUT_IDS;
diff --git a/src/types/form/WorkspaceTagCreateForm.ts b/src/types/form/WorkspaceTagForm.ts
similarity index 78%
rename from src/types/form/WorkspaceTagCreateForm.ts
rename to src/types/form/WorkspaceTagForm.ts
index 9a9670d84ae8..a6cc4c6c37cd 100644
--- a/src/types/form/WorkspaceTagCreateForm.ts
+++ b/src/types/form/WorkspaceTagForm.ts
@@ -7,12 +7,12 @@ const INPUT_IDS = {
 
 type InputID = ValueOf<typeof INPUT_IDS>;
 
-type WorkspaceTagCreateForm = Form<
+type WorkspaceTagForm = Form<
     InputID,
     {
         [INPUT_IDS.TAG_NAME]: string;
     }
 >;
 
-export type {WorkspaceTagCreateForm};
+export type {WorkspaceTagForm};
 export default INPUT_IDS;
diff --git a/src/types/form/WorkspaceTaxNameForm.ts b/src/types/form/WorkspaceTaxNameForm.ts
new file mode 100644
index 000000000000..dfe01ab55fae
--- /dev/null
+++ b/src/types/form/WorkspaceTaxNameForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    NAME: 'name',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type WorkspaceTaxNameForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.NAME]: string;
+    }
+>;
+
+export type {WorkspaceTaxNameForm};
+export default INPUT_IDS;
diff --git a/src/types/form/WorkspaceTaxValueForm.ts b/src/types/form/WorkspaceTaxValueForm.ts
new file mode 100644
index 000000000000..e53c6cd46cc2
--- /dev/null
+++ b/src/types/form/WorkspaceTaxValueForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    VALUE: 'value',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type WorkspaceTaxValueForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.VALUE]: string;
+    }
+>;
+
+export type {WorkspaceTaxValueForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index ddd460e46eac..f8bc009b7172 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -38,9 +38,12 @@ export type {WorkspaceCategoryForm} from './WorkspaceCategoryForm';
 export type {WorkspaceSettingsForm} from './WorkspaceSettingsForm';
 export type {ReportPhysicalCardForm} from './ReportPhysicalCardForm';
 export type {WorkspaceDescriptionForm} from './WorkspaceDescriptionForm';
+export type {AdditionalDetailStepForm} from './AdditionalDetailStepForm';
 export type {PolicyTagNameForm} from './PolicyTagNameForm';
+export type {WorkspaceTagForm} from './WorkspaceTagForm';
 export type {WorkspaceNewTaxForm} from './WorkspaceNewTaxForm';
-export type {WorkspaceTagCreateForm} from './WorkspaceTagCreateForm';
+export type {WorkspaceTaxNameForm} from './WorkspaceTaxNameForm';
+export type {WorkspaceTaxValueForm} from './WorkspaceTaxValueForm';
 export type {WorkspaceTaxCustomName} from './WorkspaceTaxCustomName';
 export type {PolicyCreateDistanceRateForm} from './PolicyCreateDistanceRateForm';
 export type {default as Form} from './Form';
diff --git a/src/types/onyx/Account.ts b/src/types/onyx/Account.ts
index 534a8ad0f2bc..98ce460a7669 100644
--- a/src/types/onyx/Account.ts
+++ b/src/types/onyx/Account.ts
@@ -4,14 +4,6 @@ import type * as OnyxCommon from './OnyxCommon';
 
 type TwoFactorAuthStep = ValueOf<typeof CONST.TWO_FACTOR_AUTH_STEPS> | '';
 
-type DismissedReferralBanners = {
-    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]?: boolean;
-    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT]?: boolean;
-    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]?: boolean;
-    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]?: boolean;
-    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]?: boolean;
-};
-
 type Account = {
     /** Whether SAML is enabled for the current account */
     isSAMLEnabled?: boolean;
@@ -64,15 +56,11 @@ type Account = {
     /** Whether a sign is loading */
     isLoading?: boolean;
 
-    /** The active policy ID. Initiating a SmartScan will create an expense on this policy by default. */
-    activePolicyID?: string;
-
     errors?: OnyxCommon.Errors | null;
     success?: string;
     codesAreCopied?: boolean;
     twoFactorAuthStep?: TwoFactorAuthStep;
-    dismissedReferralBanners?: DismissedReferralBanners;
 };
 
 export default Account;
-export type {TwoFactorAuthStep, DismissedReferralBanners};
+export type {TwoFactorAuthStep};
diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 68acd88aa120..53415690705a 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -11,6 +11,9 @@ type Card = {
     maskedPan?: string; // do not reference, removing as part of Expensify/App#27943
     lastFourPAN?: string;
     cardName: string;
+    cardTitle: string; // used only for virtual limit cards
+    limitType: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
+    isAdminIssuedVirtualCard: boolean;
     isVirtual: boolean;
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
     cardholderFirstName: string;
diff --git a/src/types/onyx/DismissedReferralBanners.ts b/src/types/onyx/DismissedReferralBanners.ts
new file mode 100644
index 000000000000..43fa6472a6ae
--- /dev/null
+++ b/src/types/onyx/DismissedReferralBanners.ts
@@ -0,0 +1,11 @@
+import type CONST from '@src/CONST';
+
+type DismissedReferralBanners = {
+    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.MONEY_REQUEST]?: boolean;
+    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT]?: boolean;
+    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SEND_MONEY]?: boolean;
+    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]?: boolean;
+    [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]?: boolean;
+};
+
+export default DismissedReferralBanners;
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index 84ac101a7d7a..54f0a65e0c5b 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -25,6 +25,7 @@ type CustomUnit = OnyxCommon.OnyxValueWithOfflineFeedback<{
     defaultCategory?: string;
     enabled?: boolean;
     errors?: OnyxCommon.Errors;
+    errorFields?: OnyxCommon.ErrorFields;
 }>;
 
 type DisabledFields = {
@@ -50,6 +51,9 @@ type TaxRate = OnyxCommon.OnyxValueWithOfflineFeedback<{
 
     /** An error message to display to the user */
     errors?: OnyxCommon.Errors;
+
+    /** An error object keyed by field name containing errors keyed by microtime */
+    errorFields?: OnyxCommon.ErrorFields;
 }>;
 
 type TaxRates = Record<string, TaxRate>;
@@ -180,6 +184,8 @@ type Connections = {
 
 type AutoReportingOffset = number | ValueOf<typeof CONST.POLICY.AUTO_REPORTING_OFFSET>;
 
+type PolicyFeatureName = ValueOf<typeof CONST.POLICY.MORE_FEATURES>;
+
 type PendingJoinRequestPolicy = {
     isJoinRequestPending: boolean;
     policyDetailsForNonMembers: Record<
@@ -292,9 +298,6 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The approval mode set up on this policy */
         approvalMode?: ValueOf<typeof CONST.POLICY.APPROVAL_MODE>;
 
-        /** Whether the auto approval is enabled */
-        isAutoApprovalEnabled?: boolean;
-
         /** Whether transactions should be billable by default */
         defaultBillable?: boolean;
 
@@ -366,4 +369,4 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
 
 export default Policy;
 
-export type {Unit, CustomUnit, Attributes, Rate, TaxRate, TaxRates, TaxRatesWithDefault, PendingJoinRequestPolicy};
+export type {Unit, CustomUnit, Attributes, Rate, TaxRate, TaxRates, TaxRatesWithDefault, PolicyFeatureName, PendingJoinRequestPolicy};
diff --git a/src/types/onyx/QuickAction.ts b/src/types/onyx/QuickAction.ts
new file mode 100644
index 000000000000..6cf1af929a5c
--- /dev/null
+++ b/src/types/onyx/QuickAction.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type QuickAction = {
+    /** The action to take */
+    action?: ValueOf<typeof CONST.QUICK_ACTIONS>;
+
+    /** ID of the report */
+    reportID?: string;
+
+    /** ID of the target account for task actions */
+    targetAccountID?: number;
+
+    /** True if it is the first quick action we store for this user */
+    isFirstQuickAction?: boolean;
+};
+
+export default QuickAction;
diff --git a/src/types/onyx/ReportActionsDrafts.ts b/src/types/onyx/ReportActionsDrafts.ts
index 70d16c62a3bc..e4c51c61ed25 100644
--- a/src/types/onyx/ReportActionsDrafts.ts
+++ b/src/types/onyx/ReportActionsDrafts.ts
@@ -1,5 +1,10 @@
+import type ONYXKEYS from '@src/ONYXKEYS';
+import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
 import type ReportActionsDraft from './ReportActionsDraft';
 
 type ReportActionsDrafts = Record<string, ReportActionsDraft>;
 
+type ReportActionsDraftCollectionDataSet = CollectionDataSet<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS>;
+
 export default ReportActionsDrafts;
+export type {ReportActionsDraftCollectionDataSet};
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index e3118538258e..6a134ed80b07 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -11,6 +11,7 @@ import type Credentials from './Credentials';
 import type Currency from './Currency';
 import type {CurrencyList} from './Currency';
 import type CustomStatusDraft from './CustomStatusDraft';
+import type DismissedReferralBanners from './DismissedReferralBanners';
 import type Download from './Download';
 import type FrequentlyUsedEmoji from './FrequentlyUsedEmoji';
 import type {FundList} from './Fund';
@@ -43,6 +44,7 @@ import type {PolicyTag, PolicyTagList, PolicyTags} from './PolicyTag';
 import type PreferredTheme from './PreferredTheme';
 import type PriorityMode from './PriorityMode';
 import type PrivatePersonalDetails from './PrivatePersonalDetails';
+import type QuickAction from './QuickAction';
 import type RecentlyUsedCategories from './RecentlyUsedCategories';
 import type RecentlyUsedReportFields from './RecentlyUsedReportFields';
 import type RecentlyUsedTags from './RecentlyUsedTags';
@@ -90,6 +92,7 @@ export type {
     Currency,
     CurrencyList,
     CustomStatusDraft,
+    DismissedReferralBanners,
     Download,
     FrequentlyUsedEmoji,
     Fund,
@@ -119,6 +122,7 @@ export type {
     PreferredTheme,
     PriorityMode,
     PrivatePersonalDetails,
+    QuickAction,
     RecentWaypoint,
     RecentlyUsedCategories,
     RecentlyUsedTags,
diff --git a/src/types/utils/CollectionDataSet.ts b/src/types/utils/CollectionDataSet.ts
index 05a0843b6e9b..b8065cee8f84 100644
--- a/src/types/utils/CollectionDataSet.ts
+++ b/src/types/utils/CollectionDataSet.ts
@@ -2,7 +2,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import type {OnyxCollectionKey, OnyxCollectionValuesMapping} from '@src/ONYXKEYS';
 
 /** Helps with typing a collection item update inside Onyx.multiSet call */
-type CollectionDataSet<TCollectionKey extends OnyxCollectionKey> = Record<`${TCollectionKey}${string}`, OnyxCollectionValuesMapping[TCollectionKey]>;
+type CollectionDataSet<TCollectionKey extends OnyxCollectionKey> = Record<`${TCollectionKey}${string}`, OnyxEntry<OnyxCollectionValuesMapping[TCollectionKey]>>;
 
 const toCollectionDataSet = <TCollectionKey extends OnyxCollectionKey>(
     collectionKey: TCollectionKey,
diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.ts
similarity index 84%
rename from tests/actions/ReportTest.js
rename to tests/actions/ReportTest.ts
index a94db507637b..6f1ea2c5ee7f 100644
--- a/tests/actions/ReportTest.js
+++ b/tests/actions/ReportTest.ts
@@ -1,18 +1,19 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import {afterEach, beforeAll, beforeEach, describe, expect, it} from '@jest/globals';
 import {utcToZonedTime} from 'date-fns-tz';
-import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import CONST from '../../src/CONST';
-import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
-import * as PersistedRequests from '../../src/libs/actions/PersistedRequests';
-import * as Report from '../../src/libs/actions/Report';
-import * as User from '../../src/libs/actions/User';
-import DateUtils from '../../src/libs/DateUtils';
-import Log from '../../src/libs/Log';
-import * as SequentialQueue from '../../src/libs/Network/SequentialQueue';
-import * as ReportUtils from '../../src/libs/ReportUtils';
-import ONYXKEYS from '../../src/ONYXKEYS';
+import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as PersistedRequests from '@src/libs/actions/PersistedRequests';
+import * as Report from '@src/libs/actions/Report';
+import * as User from '@src/libs/actions/User';
+import DateUtils from '@src/libs/DateUtils';
+import Log from '@src/libs/Log';
+import * as SequentialQueue from '@src/libs/Network/SequentialQueue';
+import * as ReportUtils from '@src/libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
 import getIsUsingFakeTimers from '../utils/getIsUsingFakeTimers';
 import PusherHelper from '../utils/PusherHelper';
 import * as TestHelper from '../utils/TestHelper';
@@ -20,8 +21,8 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import waitForNetworkPromises from '../utils/waitForNetworkPromises';
 
 const UTC = 'UTC';
-jest.mock('../../src/libs/actions/Report', () => {
-    const originalModule = jest.requireActual('../../src/libs/actions/Report');
+jest.mock('@src/libs/actions/Report', () => {
+    const originalModule = jest.requireActual<Report>('@src/libs/actions/Report');
 
     return {
         ...originalModule,
@@ -35,7 +36,6 @@ describe('actions/Report', () => {
         PusherHelper.setup();
         Onyx.init({
             keys: ONYXKEYS,
-            registerStorageEventListener: () => {},
         });
     });
 
@@ -52,12 +52,13 @@ describe('actions/Report', () => {
     afterEach(PusherHelper.teardown);
 
     it('should store a new report action in Onyx when onyxApiUpdate event is handled via Pusher', () => {
+        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         const TEST_USER_ACCOUNT_ID = 1;
         const TEST_USER_LOGIN = 'test@test.com';
-        const REPORT_ID = 1;
-        let reportActionID;
+        const REPORT_ID = '1';
+        let reportActionID: string;
         const REPORT_ACTION = {
             actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
             actorAccountID: TEST_USER_ACCOUNT_ID,
@@ -68,7 +69,7 @@ describe('actions/Report', () => {
             shouldShow: true,
         };
 
-        let reportActions;
+        let reportActions: OnyxEntry<OnyxTypes.ReportActions>;
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
             callback: (val) => (reportActions = val),
@@ -88,7 +89,7 @@ describe('actions/Report', () => {
                 return waitForBatchedUpdates();
             })
             .then(() => {
-                const resultAction = _.first(_.values(reportActions));
+                const resultAction: OnyxEntry<OnyxTypes.ReportAction> = Object.values(reportActions ?? {})[0];
                 reportActionID = resultAction.reportActionID;
 
                 expect(resultAction.message).toEqual(REPORT_ACTION.message);
@@ -125,12 +126,12 @@ describe('actions/Report', () => {
             })
             .then(() => {
                 // Verify there is only one action and our optimistic comment has been removed
-                expect(_.size(reportActions)).toBe(1);
+                expect(Object.keys(reportActions ?? {}).length).toBe(1);
 
-                const resultAction = reportActions[reportActionID];
+                const resultAction = reportActions?.[reportActionID];
 
                 // Verify that our action is no longer in the loading state
-                expect(resultAction.pendingAction).toBeUndefined();
+                expect(resultAction?.pendingAction).toBeUndefined();
             });
     });
 
@@ -139,10 +140,10 @@ describe('actions/Report', () => {
         const TEST_USER_LOGIN = 'test@test.com';
         const REPORT_ID = '1';
 
-        let reportIsPinned;
+        let reportIsPinned: boolean;
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`,
-            callback: (val) => (reportIsPinned = lodashGet(val, 'isPinned')),
+            callback: (val) => (reportIsPinned = val?.isPinned ?? false),
         });
 
         // Set up Onyx with some test user data
@@ -167,6 +168,7 @@ describe('actions/Report', () => {
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
             .then(() => TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID))
             .then(() => {
+                // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
                 global.fetch = TestHelper.getGlobalFetchMock();
 
                 // WHEN we add enough logs to send a packet
@@ -186,27 +188,28 @@ describe('actions/Report', () => {
             .then(() => {
                 // THEN only ONE call to AddComment will happen
                 const URL_ARGUMENT_INDEX = 0;
-                const addCommentCalls = _.filter(global.fetch.mock.calls, (callArguments) => callArguments[URL_ARGUMENT_INDEX].includes('AddComment'));
+                const addCommentCalls = (global.fetch as jest.Mock).mock.calls.filter((callArguments) => callArguments[URL_ARGUMENT_INDEX].includes('AddComment'));
                 expect(addCommentCalls.length).toBe(1);
             });
     });
 
     it('should be updated correctly when new comments are added, deleted or marked as unread', () => {
         jest.useFakeTimers();
+        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
         const REPORT_ID = '1';
-        let report;
-        let reportActionCreatedDate;
-        let currentTime;
+        let report: OnyxEntry<OnyxTypes.Report>;
+        let reportActionCreatedDate: string;
+        let currentTime: string;
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`,
             callback: (val) => (report = val),
         });
 
-        let reportActions;
+        let reportActions: OnyxTypes.ReportActions;
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
-            callback: (val) => (reportActions = val),
+            callback: (val) => (reportActions = val ?? {}),
         });
 
         const USER_1_LOGIN = 'user@test.com';
@@ -276,7 +279,7 @@ describe('actions/Report', () => {
             .then(() => {
                 // The report will be read
                 expect(ReportUtils.isUnread(report)).toBe(false);
-                expect(utcToZonedTime(report.lastReadTime, UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
 
                 // And no longer show the green dot for unread mentions in the LHN
                 expect(ReportUtils.isUnreadWithMention(report)).toBe(false);
@@ -290,7 +293,7 @@ describe('actions/Report', () => {
                 // Then the report will be unread and show the green dot for unread mentions in LHN
                 expect(ReportUtils.isUnread(report)).toBe(true);
                 expect(ReportUtils.isUnreadWithMention(report)).toBe(true);
-                expect(report.lastReadTime).toBe(DateUtils.subtractMillisecondsFromDateTime(reportActionCreatedDate, 1));
+                expect(report?.lastReadTime).toBe(DateUtils.subtractMillisecondsFromDateTime(reportActionCreatedDate, 1));
 
                 // When a new comment is added by the current user
                 jest.advanceTimersByTime(10);
@@ -302,8 +305,8 @@ describe('actions/Report', () => {
                 // The report will be read, the green dot for unread mentions will go away, and the lastReadTime updated
                 expect(ReportUtils.isUnread(report)).toBe(false);
                 expect(ReportUtils.isUnreadWithMention(report)).toBe(false);
-                expect(utcToZonedTime(report.lastReadTime, UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
-                expect(report.lastMessageText).toBe('Current User Comment 1');
+                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(report?.lastMessageText).toBe('Current User Comment 1');
 
                 // When another comment is added by the current user
                 jest.advanceTimersByTime(10);
@@ -314,8 +317,8 @@ describe('actions/Report', () => {
             .then(() => {
                 // The report will be read and the lastReadTime updated
                 expect(ReportUtils.isUnread(report)).toBe(false);
-                expect(utcToZonedTime(report.lastReadTime, UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
-                expect(report.lastMessageText).toBe('Current User Comment 2');
+                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(report?.lastMessageText).toBe('Current User Comment 2');
 
                 // When another comment is added by the current user
                 jest.advanceTimersByTime(10);
@@ -326,8 +329,8 @@ describe('actions/Report', () => {
             .then(() => {
                 // The report will be read and the lastReadTime updated
                 expect(ReportUtils.isUnread(report)).toBe(false);
-                expect(utcToZonedTime(report.lastReadTime, UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
-                expect(report.lastMessageText).toBe('Current User Comment 3');
+                expect(utcToZonedTime(report?.lastReadTime ?? '', UTC).getTime()).toBeGreaterThanOrEqual(utcToZonedTime(currentTime, UTC).getTime());
+                expect(report?.lastMessageText).toBe('Current User Comment 3');
 
                 const USER_1_BASE_ACTION = {
                     actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
@@ -340,7 +343,7 @@ describe('actions/Report', () => {
                 };
 
                 jest.advanceTimersByTime(10);
-                const optimisticReportActions = {
+                const optimisticReportActions: OnyxUpdate = {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
                     value: {
@@ -350,12 +353,14 @@ describe('actions/Report', () => {
                             created: DateUtils.getDBTime(Date.now() - 2),
                             reportActionID: '200',
                         },
+
                         300: {
                             ...USER_1_BASE_ACTION,
                             message: [{type: 'COMMENT', html: 'Current User Comment 2', text: 'Current User Comment 2'}],
                             created: DateUtils.getDBTime(Date.now() - 1),
                             reportActionID: '300',
                         },
+
                         400: {
                             ...USER_1_BASE_ACTION,
                             message: [{type: 'COMMENT', html: 'Current User Comment 3', text: 'Current User Comment 3'}],
@@ -366,7 +371,10 @@ describe('actions/Report', () => {
                 };
                 jest.advanceTimersByTime(10);
                 reportActionCreatedDate = DateUtils.getDBTime();
-                optimisticReportActions.value[400].created = reportActionCreatedDate;
+
+                if (optimisticReportActions.value?.[400]) {
+                    optimisticReportActions.value[400].created = reportActionCreatedDate;
+                }
 
                 // When we emit the events for these pending created actions to update them to not pending
                 PusherHelper.emitOnyxUpdate([
@@ -394,7 +402,7 @@ describe('actions/Report', () => {
             })
             .then(() => {
                 // Then no change will occur
-                expect(report.lastReadTime).toBe(reportActionCreatedDate);
+                expect(report?.lastReadTime).toBe(reportActionCreatedDate);
                 expect(ReportUtils.isUnread(report)).toBe(false);
 
                 // When the user manually marks a message as "unread"
@@ -404,7 +412,7 @@ describe('actions/Report', () => {
             .then(() => {
                 // Then we should expect the report to be to be unread
                 expect(ReportUtils.isUnread(report)).toBe(true);
-                expect(report.lastReadTime).toBe(DateUtils.subtractMillisecondsFromDateTime(reportActionCreatedDate, 1));
+                expect(report?.lastReadTime).toBe(DateUtils.subtractMillisecondsFromDateTime(reportActionCreatedDate, 1));
 
                 // If the user deletes the last comment after the lastReadTime the lastMessageText will reflect the new last comment
                 Report.deleteReportComment(REPORT_ID, {...reportActions[400]});
@@ -412,7 +420,7 @@ describe('actions/Report', () => {
             })
             .then(() => {
                 expect(ReportUtils.isUnread(report)).toBe(false);
-                expect(report.lastMessageText).toBe('Current User Comment 2');
+                expect(report?.lastMessageText).toBe('Current User Comment 2');
             });
         waitForBatchedUpdates(); // flushing onyx.set as it will be batched
         return setPromise;
@@ -424,6 +432,7 @@ describe('actions/Report', () => {
          * already in the comment and the user deleted it on purpose.
          */
 
+        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         // User edits comment to add link
@@ -536,11 +545,12 @@ describe('actions/Report', () => {
     });
 
     it('should properly toggle reactions on a message', () => {
+        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         const TEST_USER_ACCOUNT_ID = 1;
         const TEST_USER_LOGIN = 'test@test.com';
-        const REPORT_ID = 1;
+        const REPORT_ID = '1';
         const EMOJI_CODE = '👍';
         const EMOJI_SKIN_TONE = 2;
         const EMOJI_NAME = '+1';
@@ -550,20 +560,20 @@ describe('actions/Report', () => {
             types: ['👍🏿', '👍🏾', '👍🏽', '👍🏼', '👍🏻'],
         };
 
-        let reportActions;
+        let reportActions: OnyxTypes.ReportActions;
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
-            callback: (val) => (reportActions = val),
+            callback: (val) => (reportActions = val ?? {}),
         });
-        const reportActionsReactions = {};
+        const reportActionsReactions: OnyxCollection<OnyxTypes.ReportActionReactions> = {};
         Onyx.connect({
             key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
             callback: (val, key) => {
-                reportActionsReactions[key] = val;
+                reportActionsReactions[key] = val ?? {};
             },
         });
-        let reportAction;
-        let reportActionID;
+        let reportAction: OnyxTypes.ReportAction;
+        let reportActionID: string;
 
         // Set up Onyx with some test user data
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
@@ -579,15 +589,15 @@ describe('actions/Report', () => {
                 return waitForBatchedUpdates();
             })
             .then(() => {
-                reportAction = _.first(_.values(reportActions));
+                reportAction = Object.values(reportActions)[0];
                 reportActionID = reportAction.reportActionID;
 
                 // Add a reaction to the comment
-                Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI);
+                Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionsReactions[0]);
                 return waitForBatchedUpdates();
             })
             .then(() => {
-                reportAction = _.first(_.values(reportActions));
+                reportAction = Object.values(reportActions)[0];
 
                 // Expect the reaction to exist in the reportActionsReactions collection
                 expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`);
@@ -597,8 +607,8 @@ describe('actions/Report', () => {
                 expect(reportActionReaction).toHaveProperty(EMOJI.name);
 
                 // Expect the emoji to have the user accountID
-                const reportActionReactionEmoji = reportActionReaction[EMOJI.name];
-                expect(reportActionReactionEmoji.users).toHaveProperty(`${TEST_USER_ACCOUNT_ID}`);
+                const reportActionReactionEmoji = reportActionReaction?.[EMOJI.name];
+                expect(reportActionReactionEmoji?.users).toHaveProperty(`${TEST_USER_ACCOUNT_ID}`);
 
                 // Now we remove the reaction
                 Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction);
@@ -608,23 +618,23 @@ describe('actions/Report', () => {
                 // Expect the reaction to have null where the users reaction used to be
                 expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`);
                 const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`];
-                expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
+                expect(reportActionReaction?.[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
             })
             .then(() => {
-                reportAction = _.first(_.values(reportActions));
+                reportAction = Object.values(reportActions)[0];
 
                 // Add the same reaction to the same report action with a different skintone
-                Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI);
+                Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionsReactions[0]);
                 return waitForBatchedUpdates()
                     .then(() => {
-                        reportAction = _.first(_.values(reportActions));
+                        reportAction = Object.values(reportActions)[0];
 
                         const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`];
                         Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction, EMOJI_SKIN_TONE);
                         return waitForBatchedUpdates();
                     })
                     .then(() => {
-                        reportAction = _.first(_.values(reportActions));
+                        reportAction = Object.values(reportActions)[0];
 
                         // Expect the reaction to exist in the reportActionsReactions collection
                         expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`);
@@ -634,11 +644,11 @@ describe('actions/Report', () => {
                         expect(reportActionReaction).toHaveProperty(EMOJI.name);
 
                         // Expect the emoji to have the user accountID
-                        const reportActionReactionEmoji = reportActionReaction[EMOJI.name];
-                        expect(reportActionReactionEmoji.users).toHaveProperty(`${TEST_USER_ACCOUNT_ID}`);
+                        const reportActionReactionEmoji = reportActionReaction?.[EMOJI.name];
+                        expect(reportActionReactionEmoji?.users).toHaveProperty(`${TEST_USER_ACCOUNT_ID}`);
 
                         // Expect two different skintone reactions
-                        const reportActionReactionEmojiUserSkinTones = reportActionReactionEmoji.users[TEST_USER_ACCOUNT_ID].skinTones;
+                        const reportActionReactionEmojiUserSkinTones = reportActionReactionEmoji?.users[TEST_USER_ACCOUNT_ID].skinTones;
                         expect(reportActionReactionEmojiUserSkinTones).toHaveProperty('-1');
                         expect(reportActionReactionEmojiUserSkinTones).toHaveProperty('2');
 
@@ -650,17 +660,18 @@ describe('actions/Report', () => {
                         // Expect the reaction to have null where the users reaction used to be
                         expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`);
                         const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`];
-                        expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
+                        expect(reportActionReaction?.[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
                     });
             });
     });
 
     it("shouldn't add the same reaction twice when changing preferred skin color and reaction doesn't support skin colors", () => {
+        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         const TEST_USER_ACCOUNT_ID = 1;
         const TEST_USER_LOGIN = 'test@test.com';
-        const REPORT_ID = 1;
+        const REPORT_ID = '1';
         const EMOJI_CODE = '😄';
         const EMOJI_NAME = 'smile';
         const EMOJI = {
@@ -668,20 +679,20 @@ describe('actions/Report', () => {
             name: EMOJI_NAME,
         };
 
-        let reportActions;
+        let reportActions: OnyxTypes.ReportActions = {};
         Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
-            callback: (val) => (reportActions = val),
+            callback: (val) => (reportActions = val ?? {}),
         });
-        const reportActionsReactions = {};
+        const reportActionsReactions: OnyxCollection<OnyxTypes.ReportActionReactions> = {};
         Onyx.connect({
             key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
             callback: (val, key) => {
-                reportActionsReactions[key] = val;
+                reportActionsReactions[key] = val ?? {};
             },
         });
 
-        let resultAction;
+        let resultAction: OnyxTypes.ReportAction;
 
         // Set up Onyx with some test user data
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
@@ -697,14 +708,14 @@ describe('actions/Report', () => {
                 return waitForBatchedUpdates();
             })
             .then(() => {
-                resultAction = _.first(_.values(reportActions));
+                resultAction = Object.values(reportActions)[0];
 
                 // Add a reaction to the comment
                 Report.toggleEmojiReaction(REPORT_ID, resultAction, EMOJI, {});
                 return waitForBatchedUpdates();
             })
             .then(() => {
-                resultAction = _.first(_.values(reportActions));
+                resultAction = Object.values(reportActions)[0];
 
                 // Now we toggle the reaction while the skin tone has changed.
                 // As the emoji doesn't support skin tones, the emoji
@@ -717,7 +728,7 @@ describe('actions/Report', () => {
                 // Expect the reaction to have null where the users reaction used to be
                 expect(reportActionsReactions).toHaveProperty(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${resultAction.reportActionID}`);
                 const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${resultAction.reportActionID}`];
-                expect(reportActionReaction[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
+                expect(reportActionReaction?.[EMOJI.name].users[TEST_USER_ACCOUNT_ID]).toBeUndefined();
             });
     });
 });
diff --git a/tests/perf-test/BaseOptionsList.perf-test.tsx b/tests/perf-test/BaseOptionsList.perf-test.tsx
new file mode 100644
index 000000000000..5e8b5e9f9289
--- /dev/null
+++ b/tests/perf-test/BaseOptionsList.perf-test.tsx
@@ -0,0 +1,127 @@
+import {fireEvent} from '@testing-library/react-native';
+import type {RenderResult} from '@testing-library/react-native';
+import React, {useState} from 'react';
+import {measurePerformance} from 'reassure';
+import BaseOptionsList from '@components/OptionsList/BaseOptionsList';
+import type {OptionData} from '@libs/ReportUtils';
+import variables from '@styles/variables';
+
+type BaseOptionsListWrapperProps = {
+    /** Whether this is a multi-select list */
+    canSelectMultipleOptions?: boolean;
+};
+
+describe('[BaseOptionsList]', () => {
+    function BaseOptionsListWrapper({canSelectMultipleOptions = false}: BaseOptionsListWrapperProps) {
+        const [selectedIds, setSelectedIds] = useState<string[]>([]);
+
+        const sections = [
+            {
+                data: Array.from({length: 10000}, (_, index) => ({
+                    text: `Item ${index}`,
+                    keyForList: `item-${index}`,
+                    isSelected: selectedIds.includes(`item-${index}`),
+                    reportID: `report-${index}`,
+                })),
+                indexOffset: 0,
+                isDisabled: false,
+                shouldShow: true,
+                title: 'Section 1',
+            },
+            {
+                data: Array.from({length: 10000}, (_, index) => ({
+                    text: `Item ${index}`,
+                    keyForList: `item-${index}`,
+                    isSelected: selectedIds.includes(`item-${index}`),
+                    reportID: `report-${index}`,
+                })),
+                indexOffset: 0,
+                isDisabled: false,
+                shouldShow: true,
+                title: 'Section 2',
+            },
+        ];
+
+        const onSelectRow = (item: OptionData) => {
+            if (!item.keyForList) {
+                return;
+            }
+
+            if (canSelectMultipleOptions) {
+                if (selectedIds.includes(item.keyForList)) {
+                    setSelectedIds(selectedIds.filter((selectedId) => selectedId === item.keyForList));
+                } else {
+                    setSelectedIds([...selectedIds, item.keyForList]);
+                }
+            } else {
+                setSelectedIds([item.keyForList]);
+            }
+        };
+
+        return (
+            <BaseOptionsList
+                sections={sections}
+                headerMessage="Base Options List Header"
+                onSelectRow={onSelectRow}
+                canSelectMultipleOptions={canSelectMultipleOptions}
+            />
+        );
+    }
+
+    test('Should render 1 section and a thousand items', () => {
+        measurePerformance(<BaseOptionsListWrapper />);
+    });
+
+    test('Should press a list item', () => {
+        // eslint-disable-next-line @typescript-eslint/require-await
+        const scenario = async (screen: RenderResult) => {
+            fireEvent.press(screen.getByText('Item 5'));
+        };
+
+        measurePerformance(<BaseOptionsListWrapper />, {scenario});
+    });
+
+    test('Should render multiple selection and select 4 items', () => {
+        // eslint-disable-next-line @typescript-eslint/require-await
+        const scenario = async (screen: RenderResult) => {
+            fireEvent.press(screen.getByText('Item 1'));
+            fireEvent.press(screen.getByText('Item 2'));
+            fireEvent.press(screen.getByText('Item 3'));
+            fireEvent.press(screen.getByText('Item 4'));
+        };
+
+        measurePerformance(<BaseOptionsListWrapper canSelectMultipleOptions />, {scenario});
+    });
+
+    test('Should scroll and select a few items', () => {
+        const eventData = {
+            nativeEvent: {
+                contentOffset: {
+                    y: variables.optionRowHeight * 5,
+                },
+                contentSize: {
+                    // Dimensions of the scrollable content
+                    height: variables.optionRowHeight * 10,
+                    width: 100,
+                },
+                layoutMeasurement: {
+                    // Dimensions of the device
+                    height: variables.optionRowHeight * 5,
+                    width: 100,
+                },
+            },
+        };
+
+        // eslint-disable-next-line @typescript-eslint/require-await
+        const scenario = async (screen: RenderResult) => {
+            fireEvent.press(screen.getByText('Item 1'));
+            // see https://github.com/callstack/react-native-testing-library/issues/1540
+            fireEvent(screen.getByTestId('options-list'), 'onContentSizeChange', eventData.nativeEvent.contentSize.width, eventData.nativeEvent.contentSize.height);
+            fireEvent.scroll(screen.getByTestId('options-list'), eventData);
+            fireEvent.press(screen.getByText('Item 7'));
+            fireEvent.press(screen.getByText('Item 15'));
+        };
+
+        measurePerformance(<BaseOptionsListWrapper canSelectMultipleOptions />, {scenario});
+    });
+});
diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx
index e1a1f1b98f51..0726dbc9c88d 100644
--- a/tests/ui/UnreadIndicatorsTest.tsx
+++ b/tests/ui/UnreadIndicatorsTest.tsx
@@ -131,7 +131,7 @@ beforeAll(() => {
     Pusher.init({
         appKey: CONFIG.PUSHER.APP_KEY,
         cluster: CONFIG.PUSHER.CLUSTER,
-        authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api?command=AuthenticatePusher`,
+        authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/AuthenticatePusher?`,
     });
 });
 
@@ -413,7 +413,6 @@ describe('Unread Indicators', () => {
                                 reportActionID: commentReportActionID,
                             },
                         },
-                        // @ts-expect-error -- it's necessary for the test
                         shouldNotify: true,
                     },
                     {
diff --git a/tests/unit/APITest.js b/tests/unit/APITest.ts
similarity index 84%
rename from tests/unit/APITest.js
rename to tests/unit/APITest.ts
index 30c935c48571..359288b2a1ef 100644
--- a/tests/unit/APITest.js
+++ b/tests/unit/APITest.ts
@@ -1,28 +1,46 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import CONST from '../../src/CONST';
-import * as PersistedRequests from '../../src/libs/actions/PersistedRequests';
-import * as API from '../../src/libs/API';
-import HttpUtils from '../../src/libs/HttpUtils';
-import * as MainQueue from '../../src/libs/Network/MainQueue';
-import * as NetworkStore from '../../src/libs/Network/NetworkStore';
-import * as SequentialQueue from '../../src/libs/Network/SequentialQueue';
-import * as Request from '../../src/libs/Request';
-import * as RequestThrottle from '../../src/libs/RequestThrottle';
-import ONYXKEYS from '../../src/ONYXKEYS';
+import MockedOnyx from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import CONST from '@src/CONST';
+import * as PersistedRequests from '@src/libs/actions/PersistedRequests';
+import * as API from '@src/libs/API';
+import HttpUtils from '@src/libs/HttpUtils';
+import * as MainQueue from '@src/libs/Network/MainQueue';
+import * as NetworkStore from '@src/libs/Network/NetworkStore';
+import * as SequentialQueue from '@src/libs/Network/SequentialQueue';
+import * as Request from '@src/libs/Request';
+import * as RequestThrottle from '@src/libs/RequestThrottle';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type ReactNativeOnyxMock from '../../__mocks__/react-native-onyx';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import waitForNetworkPromises from '../utils/waitForNetworkPromises';
 
-jest.mock('../../src/libs/Log');
+const Onyx = MockedOnyx as typeof ReactNativeOnyxMock;
+
+jest.mock('@src/libs/Log');
 
 Onyx.init({
     keys: ONYXKEYS,
 });
 
+type Response = {
+    ok?: boolean;
+    status?: ValueOf<typeof CONST.HTTP_STATUS> | ValueOf<typeof CONST.JSON_CODE>;
+    jsonCode?: ValueOf<typeof CONST.JSON_CODE>;
+    json?: () => Promise<Response>;
+    title?: ValueOf<typeof CONST.ERROR_TITLE>;
+    type?: ValueOf<typeof CONST.ERROR_TYPE>;
+};
+
+type XhrCalls = Array<{
+    resolve: (value: Response | PromiseLike<Response>) => void;
+    reject: (value: unknown) => void;
+}>;
+
 const originalXHR = HttpUtils.xhr;
 
 beforeEach(() => {
+    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
     HttpUtils.xhr = originalXHR;
     MainQueue.clear();
@@ -53,8 +71,11 @@ describe('APITests', () => {
         return Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
             .then(() => {
                 // When API Writes and Reads are called
+                // @ts-expect-error - mocking the parameter
                 API.write('mock command', {param1: 'value1'});
+                // @ts-expect-error - mocking the parameter
                 API.read('mock command', {param2: 'value2'});
+                // @ts-expect-error - mocking the parameter
                 API.write('mock command', {param3: 'value3'});
                 return waitForBatchedUpdates();
             })
@@ -89,7 +110,9 @@ describe('APITests', () => {
             })
                 .then(() => {
                     // When API Write commands are made
+                    // @ts-expect-error - mocking the parameter
                     API.write('mock command', {param1: 'value1'});
+                    // @ts-expect-error - mocking the parameter
                     API.write('mock command', {param2: 'value2'});
                     return waitForBatchedUpdates();
                 })
@@ -120,8 +143,8 @@ describe('APITests', () => {
 
     test('Write request should not be cleared until a backend response occurs', () => {
         // We're setting up xhr handler that will resolve calls programmatically
-        const xhrCalls = [];
-        const promises = [];
+        const xhrCalls: XhrCalls = [];
+        const promises: Array<Promise<Response>> = [];
 
         jest.spyOn(HttpUtils, 'xhr').mockImplementation(() => {
             promises.push(
@@ -130,7 +153,7 @@ describe('APITests', () => {
                 }),
             );
 
-            return _.last(promises);
+            return promises.slice(-1)[0];
         });
 
         // Given we have some requests made while we're offline
@@ -138,7 +161,9 @@ describe('APITests', () => {
             Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
                 .then(() => {
                     // When API Write commands are made
+                    // @ts-expect-error - mocking the parameter
                     API.write('mock command', {param1: 'value1'});
+                    // @ts-expect-error - mocking the parameter
                     API.write('mock command', {param2: 'value2'});
                     return waitForBatchedUpdates();
                 })
@@ -148,14 +173,14 @@ describe('APITests', () => {
                 .then(waitForBatchedUpdates)
                 .then(() => {
                     // Then requests should remain persisted until the xhr call is resolved
-                    expect(_.size(PersistedRequests.getAll())).toEqual(2);
+                    expect(PersistedRequests.getAll().length).toEqual(2);
 
                     xhrCalls[0].resolve({jsonCode: CONST.JSON_CODE.SUCCESS});
                     return waitForBatchedUpdates();
                 })
                 .then(waitForBatchedUpdates)
                 .then(() => {
-                    expect(_.size(PersistedRequests.getAll())).toEqual(1);
+                    expect(PersistedRequests.getAll().length).toEqual(1);
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param2: 'value2'})})]);
 
                     // When a request fails it should be retried
@@ -163,7 +188,7 @@ describe('APITests', () => {
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
-                    expect(_.size(PersistedRequests.getAll())).toEqual(1);
+                    expect(PersistedRequests.getAll().length).toEqual(1);
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param2: 'value2'})})]);
 
                     // We need to advance past the request throttle back off timer because the request won't be retried until then
@@ -177,32 +202,30 @@ describe('APITests', () => {
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
-                    expect(_.size(PersistedRequests.getAll())).toEqual(0);
+                    expect(PersistedRequests.getAll().length).toEqual(0);
                 })
         );
     });
 
     // Given a retry response create a mock and run some expectations for retrying requests
-    const retryExpectations = (retryResponse) => {
-        let successfulResponse = {
+
+    const retryExpectations = (response: Response) => {
+        const successfulResponse: Response = {
             ok: true,
             jsonCode: CONST.JSON_CODE.SUCCESS,
-        };
-
-        // We have to mock response.json() too
-        successfulResponse = {
-            ...successfulResponse,
+            // We have to mock response.json() too
             json: () => Promise.resolve(successfulResponse),
         };
 
         // Given a mock where a retry response is returned twice before a successful response
-        global.fetch = jest.fn().mockResolvedValueOnce(retryResponse).mockResolvedValueOnce(retryResponse).mockResolvedValueOnce(successfulResponse);
+        global.fetch = jest.fn().mockResolvedValueOnce(response).mockResolvedValueOnce(response).mockResolvedValueOnce(successfulResponse);
 
         // Given we have a request made while we're offline
         return (
             Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
                 .then(() => {
                     // When API Write commands are made
+                    // @ts-expect-error - mocking the parameter
                     API.write('mock command', {param1: 'value1'});
                     return waitForNetworkPromises();
                 })
@@ -215,7 +238,7 @@ describe('APITests', () => {
                     expect(global.fetch).toHaveBeenCalledTimes(1);
 
                     // And we still have 1 persisted request since it failed
-                    expect(_.size(PersistedRequests.getAll())).toEqual(1);
+                    expect(PersistedRequests.getAll().length).toEqual(1);
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param1: 'value1'})})]);
 
                     // We let the SequentialQueue process again after its wait time
@@ -228,7 +251,7 @@ describe('APITests', () => {
                     expect(global.fetch).toHaveBeenCalledTimes(2);
 
                     // And we still have 1 persisted request since it failed
-                    expect(_.size(PersistedRequests.getAll())).toEqual(1);
+                    expect(PersistedRequests.getAll().length).toEqual(1);
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param1: 'value1'})})]);
 
                     // We let the SequentialQueue process again after its wait time
@@ -241,7 +264,7 @@ describe('APITests', () => {
                     expect(global.fetch).toHaveBeenCalledTimes(3);
 
                     // The request succeeds so the queue is empty
-                    expect(_.size(PersistedRequests.getAll())).toEqual(0);
+                    expect(PersistedRequests.getAll().length).toEqual(0);
                 })
         );
     };
@@ -256,9 +279,9 @@ describe('APITests', () => {
 
     test('write requests are retried when Auth is down', () => {
         // Given the response data returned when auth is down
-        const responseData = {
+        const responseData: Response = {
             ok: true,
-            status: 200,
+            status: CONST.JSON_CODE.SUCCESS,
             jsonCode: CONST.JSON_CODE.EXP_ERROR,
             title: CONST.ERROR_TITLE.SOCKET,
             type: CONST.ERROR_TYPE.SOCKET,
@@ -289,6 +312,7 @@ describe('APITests', () => {
             waitForBatchedUpdates()
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: true}))
                 .then(() => {
+                    // @ts-expect-error - mocking the parameter
                     API.write('Mock', {param1: 'value1'});
                     return waitForBatchedUpdates();
                 })
@@ -297,7 +321,7 @@ describe('APITests', () => {
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
                 .then(waitForBatchedUpdates)
                 .then(() => {
-                    const nonLogCalls = _.filter(xhr.mock.calls, ([commandName]) => commandName !== 'Log');
+                    const nonLogCalls = xhr.mock.calls.filter(([commandName]) => commandName !== 'Log');
 
                     // The request should be retried once and reauthenticate should be called the second time
                     // expect(xhr).toHaveBeenCalledTimes(3);
@@ -322,12 +346,19 @@ describe('APITests', () => {
         })
             .then(() => {
                 // When we queue 6 persistable commands and one not persistable
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value1'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value2'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value3'});
+                // @ts-expect-error - mocking the parameter
                 API.read('MockCommand', {content: 'not-persisted'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value4'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value5'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value6'});
 
                 return waitForBatchedUpdates();
@@ -359,11 +390,17 @@ describe('APITests', () => {
         })
             .then(() => {
                 // When we queue 6 persistable commands
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value1'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value2'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value3'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value4'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value5'});
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value6'});
                 return waitForBatchedUpdates();
             })
@@ -402,7 +439,14 @@ describe('APITests', () => {
         })
             .then(() => {
                 // When we queue both non-persistable and persistable commands that will trigger reauthentication and go offline at the same time
-                API.makeRequestWithSideEffects('AuthenticatePusher', {content: 'value1'});
+                API.makeRequestWithSideEffects('AuthenticatePusher', {
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    socket_id: 'socket_id',
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    channel_name: 'channel_name',
+                    shouldRetry: false,
+                    forceNetworkRequest: false,
+                });
 
                 Onyx.set(ONYXKEYS.NETWORK, {isOffline: true});
                 expect(NetworkStore.isOffline()).toBe(false);
@@ -410,6 +454,7 @@ describe('APITests', () => {
                 return waitForBatchedUpdates();
             })
             .then(() => {
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand');
                 expect(PersistedRequests.getAll().length).toBe(1);
                 expect(NetworkStore.isOffline()).toBe(true);
@@ -479,6 +524,7 @@ describe('APITests', () => {
                 NetworkStore.resetHasReadRequiredDataFromStorage();
 
                 // And queue a Write request while offline
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommand', {content: 'value1'});
 
                 // Then we should expect the request to get persisted
@@ -515,8 +561,11 @@ describe('APITests', () => {
                 expect(NetworkStore.isOffline()).toBe(false);
 
                 // WHEN we make a request that should be retried, one that should not, and another that should
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommandOne');
+                // @ts-expect-error - mocking the parameter
                 API.read('MockCommandTwo');
+                // @ts-expect-error - mocking the parameter
                 API.write('MockCommandThree');
 
                 // THEN the retryable requests should immediately be added to the persisted requests
diff --git a/tests/unit/MiddlewareTest.js b/tests/unit/MiddlewareTest.js
index 85148cdb40e0..6a9576511f38 100644
--- a/tests/unit/MiddlewareTest.js
+++ b/tests/unit/MiddlewareTest.js
@@ -49,9 +49,9 @@ describe('Middleware', () => {
             await waitForNetworkPromises();
 
             expect(global.fetch).toHaveBeenCalledTimes(2);
-            expect(global.fetch).toHaveBeenLastCalledWith('https://www.expensify.com.dev/api?command=AddComment', expect.anything());
+            expect(global.fetch).toHaveBeenLastCalledWith('https://www.expensify.com.dev/api/AddComment?', expect.anything());
             TestHelper.assertFormDataMatchesObject(global.fetch.mock.calls[1][1].body, {reportID: '1234', reportActionID: '5678', reportComment: 'foo'});
-            expect(global.fetch).toHaveBeenNthCalledWith(1, 'https://www.expensify.com.dev/api?command=OpenReport', expect.anything());
+            expect(global.fetch).toHaveBeenNthCalledWith(1, 'https://www.expensify.com.dev/api/OpenReport?', expect.anything());
             TestHelper.assertFormDataMatchesObject(global.fetch.mock.calls[0][1].body, {reportID: '1234'});
         });
 
@@ -93,9 +93,9 @@ describe('Middleware', () => {
             await waitForNetworkPromises();
 
             expect(global.fetch).toHaveBeenCalledTimes(2);
-            expect(global.fetch).toHaveBeenLastCalledWith('https://www.expensify.com.dev/api?command=AddComment', expect.anything());
+            expect(global.fetch).toHaveBeenLastCalledWith('https://www.expensify.com.dev/api/AddComment?', expect.anything());
             TestHelper.assertFormDataMatchesObject(global.fetch.mock.calls[1][1].body, {reportID: '5555', reportActionID: '5678', reportComment: 'foo'});
-            expect(global.fetch).toHaveBeenNthCalledWith(1, 'https://www.expensify.com.dev/api?command=OpenReport', expect.anything());
+            expect(global.fetch).toHaveBeenNthCalledWith(1, 'https://www.expensify.com.dev/api/OpenReport?', expect.anything());
             TestHelper.assertFormDataMatchesObject(global.fetch.mock.calls[0][1].body, {reportID: '1234'});
         });
     });
diff --git a/tests/unit/MigrationTest.js b/tests/unit/MigrationTest.js
deleted file mode 100644
index 65ab921ac9e1..000000000000
--- a/tests/unit/MigrationTest.js
+++ /dev/null
@@ -1,274 +0,0 @@
-import Onyx from 'react-native-onyx';
-import Log from '../../src/libs/Log';
-import CheckForPreviousReportActionID from '../../src/libs/migrations/CheckForPreviousReportActionID';
-import KeyReportActionsDraftByReportActionID from '../../src/libs/migrations/KeyReportActionsDraftByReportActionID';
-import ONYXKEYS from '../../src/ONYXKEYS';
-import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
-
-jest.mock('../../src/libs/getPlatform');
-
-let LogSpy;
-
-describe('Migrations', () => {
-    beforeAll(() => {
-        Onyx.init({keys: ONYXKEYS});
-        LogSpy = jest.spyOn(Log, 'info');
-        Log.serverLoggingCallback = () => {};
-        return waitForBatchedUpdates();
-    });
-
-    beforeEach(() => {
-        jest.clearAllMocks();
-        Onyx.clear();
-        return waitForBatchedUpdates();
-    });
-
-    describe('CheckForPreviousReportActionID', () => {
-        it("Should work even if there's no reportAction data in Onyx", () =>
-            CheckForPreviousReportActionID().then(() =>
-                expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no reportActions'),
-            ));
-
-        it('Should remove all report actions given that a previousReportActionID does not exist', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {
-                    1: {
-                        reportActionID: '1',
-                    },
-                    2: {
-                        reportActionID: '2',
-                    },
-                },
-            })
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith(
-                        '[Migrate Onyx] CheckForPreviousReportActionID Migration: removing all reportActions because previousReportActionID not found in the first valid reportAction',
-                    );
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction = {};
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
-                        },
-                    });
-                }));
-
-        it('Should not remove any report action given that previousReportActionID exists in first valid report action', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {
-                    1: {
-                        reportActionID: '1',
-                        previousReportActionID: '0',
-                    },
-                    2: {
-                        reportActionID: '2',
-                        previousReportActionID: '1',
-                    },
-                },
-            })
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] CheckForPreviousReportActionID Migration: previousReportActionID found. Migration complete');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction = {
-                                1: {
-                                    reportActionID: '1',
-                                    previousReportActionID: '0',
-                                },
-                                2: {
-                                    reportActionID: '2',
-                                    previousReportActionID: '1',
-                                },
-                            };
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
-                        },
-                    });
-                }));
-
-        it('Should skip zombie report actions and proceed to remove all reportActions given that a previousReportActionID does not exist', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]: {
-                    1: {
-                        reportActionID: '1',
-                    },
-                    2: {
-                        reportActionID: '2',
-                    },
-                },
-            })
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith(
-                        '[Migrate Onyx] CheckForPreviousReportActionID Migration: removing all reportActions because previousReportActionID not found in the first valid reportAction',
-                    );
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction = {};
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toMatchObject(expectedReportAction);
-                        },
-                    });
-                }));
-
-        it('Should skip zombie report actions and should not remove any report action given that previousReportActionID exists in first valid report action', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]: {
-                    1: {
-                        reportActionID: '1',
-                        previousReportActionID: '10',
-                    },
-                    2: {
-                        reportActionID: '2',
-                        previousReportActionID: '23',
-                    },
-                },
-            })
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] CheckForPreviousReportActionID Migration: previousReportActionID found. Migration complete');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction1 = {};
-                            const expectedReportAction4 = {
-                                1: {
-                                    reportActionID: '1',
-                                    previousReportActionID: '10',
-                                },
-                                2: {
-                                    reportActionID: '2',
-                                    previousReportActionID: '23',
-                                },
-                            };
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction1);
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toMatchObject(expectedReportAction4);
-                        },
-                    });
-                }));
-
-        it('Should skip if no valid reportActions', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]: null,
-            })
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no valid reportActions');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction = {};
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toMatchObject(expectedReportAction);
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toMatchObject(expectedReportAction);
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toBeUndefined();
-                        },
-                    });
-                }));
-    });
-
-    describe('KeyReportActionsDraftByReportActionID', () => {
-        it("Should work even if there's no reportActionsDrafts data in Onyx", () =>
-            KeyReportActionsDraftByReportActionID().then(() =>
-                expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsDraftByReportActionID because there were no reportActionsDrafts'),
-            ));
-
-        it('Should move individual draft to a draft collection of report', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]: 'a',
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`]: 'b',
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`]: {3: 'c'},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`]: 'd',
-            })
-                .then(KeyReportActionsDraftByReportActionID)
-                .then(() => {
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActionsDrafts) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportActionDraft1 = {
-                                1: 'a',
-                                2: 'b',
-                            };
-                            const expectedReportActionDraft2 = {
-                                3: 'c',
-                                4: 'd',
-                            };
-                            expect(allReportActionsDrafts[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
-                            expect(allReportActionsDrafts[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`]).toBeUndefined();
-                            expect(allReportActionsDrafts[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`]).toBeUndefined();
-                            expect(allReportActionsDrafts[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1`]).toMatchObject(expectedReportActionDraft1);
-                            expect(allReportActionsDrafts[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`]).toMatchObject(expectedReportActionDraft2);
-                        },
-                    });
-                }));
-
-        it('Should skip if nothing to migrate', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`]: null,
-            })
-                .then(KeyReportActionsDraftByReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsDraftByReportActionID because there are no actions drafts to migrate');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportActionDraft = {};
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`]).toBeUndefined();
-                            expect(allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`]).toMatchObject(expectedReportActionDraft);
-                        },
-                    });
-                }));
-
-        it("Shouldn't move empty individual draft to a draft collection of report", () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]: '',
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1`]: {},
-            })
-                .then(KeyReportActionsDraftByReportActionID)
-                .then(() => {
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActionsDrafts) => {
-                            Onyx.disconnect(connectionID);
-                            expect(allReportActionsDrafts[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
-                        },
-                    });
-                }));
-    });
-});
diff --git a/tests/unit/MigrationTest.ts b/tests/unit/MigrationTest.ts
new file mode 100644
index 000000000000..e50c7bdcee55
--- /dev/null
+++ b/tests/unit/MigrationTest.ts
@@ -0,0 +1,342 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import Log from '@src/libs/Log';
+import CheckForPreviousReportActionID from '@src/libs/migrations/CheckForPreviousReportActionID';
+import KeyReportActionsDraftByReportActionID from '@src/libs/migrations/KeyReportActionsDraftByReportActionID';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ReportActionsDraftCollectionDataSet} from '@src/types/onyx/ReportActionsDrafts';
+import {toCollectionDataSet} from '@src/types/utils/CollectionDataSet';
+import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@src/libs/getPlatform');
+
+let LogSpy: jest.SpyInstance<void, Parameters<(typeof Log)['info']>>;
+
+describe('Migrations', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+        LogSpy = jest.spyOn(Log, 'info');
+        Log.serverLoggingCallback = () => Promise.resolve({requestID: '123'});
+        return waitForBatchedUpdates();
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        Onyx.clear();
+        return waitForBatchedUpdates();
+    });
+
+    describe('CheckForPreviousReportActionID', () => {
+        it("Should work even if there's no reportAction data in Onyx", () =>
+            CheckForPreviousReportActionID().then(() =>
+                expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no reportActions'),
+            ));
+
+        it('Should remove all report actions given that a previousReportActionID does not exist', () => {
+            const reportActionsCollectionDataSet = toCollectionDataSet(
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                [
+                    {
+                        1: {
+                            reportActionID: '1',
+                            created: '',
+                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED,
+                            reportID: '1',
+                        },
+                        2: {reportActionID: '2', created: '', actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED, reportID: '1'},
+                    },
+                ],
+                (item) => item[1].reportID ?? '',
+            );
+
+            return Onyx.multiSet(reportActionsCollectionDataSet)
+                .then(CheckForPreviousReportActionID)
+                .then(() => {
+                    expect(LogSpy).toHaveBeenCalledWith(
+                        '[Migrate Onyx] CheckForPreviousReportActionID Migration: removing all reportActions because previousReportActionID not found in the first valid reportAction',
+                    );
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActions) => {
+                            Onyx.disconnect(connectionID);
+                            const expectedReportAction = {};
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
+                        },
+                    });
+                });
+        });
+
+        it('Should not remove any report action given that previousReportActionID exists in first valid report action', () => {
+            const reportActionsCollectionDataSet = toCollectionDataSet(
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                [
+                    {
+                        1: {
+                            reportActionID: '1',
+                            previousReportActionID: '0',
+                            created: '',
+                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED,
+                            reportID: '1',
+                        },
+                        2: {
+                            reportActionID: '2',
+                            previousReportActionID: '1',
+                            created: '',
+                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED,
+                            reportID: '1',
+                        },
+                    },
+                ],
+                (item) => item[1].reportID ?? '',
+            );
+
+            return Onyx.multiSet(reportActionsCollectionDataSet)
+                .then(CheckForPreviousReportActionID)
+                .then(() => {
+                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] CheckForPreviousReportActionID Migration: previousReportActionID found. Migration complete');
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActions) => {
+                            Onyx.disconnect(connectionID);
+                            const expectedReportAction = {
+                                1: {
+                                    reportActionID: '1',
+                                    previousReportActionID: '0',
+                                },
+                                2: {
+                                    reportActionID: '2',
+                                    previousReportActionID: '1',
+                                },
+                            };
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
+                        },
+                    });
+                });
+        });
+
+        it('Should skip zombie report actions and proceed to remove all reportActions given that a previousReportActionID does not exist', () => {
+            const reportActionsCollectionDataSet = toCollectionDataSet(
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                [
+                    {
+                        1: {
+                            reportActionID: '1',
+                            created: '',
+                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED,
+                            reportID: '4',
+                        },
+                        2: {
+                            reportActionID: '2',
+                            created: '',
+                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED,
+                            reportID: '4',
+                        },
+                    },
+                ],
+                (item) => item[1].reportID ?? '',
+            );
+
+            return Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: null,
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: null,
+                ...reportActionsCollectionDataSet,
+            })
+                .then(CheckForPreviousReportActionID)
+                .then(() => {
+                    expect(LogSpy).toHaveBeenCalledWith(
+                        '[Migrate Onyx] CheckForPreviousReportActionID Migration: removing all reportActions because previousReportActionID not found in the first valid reportAction',
+                    );
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActions) => {
+                            Onyx.disconnect(connectionID);
+                            const expectedReportAction = {};
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toMatchObject(expectedReportAction);
+                        },
+                    });
+                });
+        });
+
+        it('Should skip zombie report actions and should not remove any report action given that previousReportActionID exists in first valid report action', () => {
+            const reportActionsCollectionDataSet = toCollectionDataSet(
+                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                [
+                    {
+                        1: {
+                            reportActionID: '1',
+                            previousReportActionID: '10',
+                            created: '',
+                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED,
+                            reportID: '4',
+                        },
+                        2: {
+                            reportActionID: '2',
+                            previousReportActionID: '23',
+                            created: '',
+                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED,
+                            reportID: '4',
+                        },
+                    },
+                ],
+                (item) => item[1].reportID ?? '',
+            );
+
+            return Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: null,
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: null,
+                ...reportActionsCollectionDataSet,
+            })
+                .then(CheckForPreviousReportActionID)
+                .then(() => {
+                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] CheckForPreviousReportActionID Migration: previousReportActionID found. Migration complete');
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActions) => {
+                            Onyx.disconnect(connectionID);
+                            const expectedReportAction1 = {};
+                            const expectedReportAction4 = {
+                                1: {
+                                    reportActionID: '1',
+                                    previousReportActionID: '10',
+                                },
+                                2: {
+                                    reportActionID: '2',
+                                    previousReportActionID: '23',
+                                },
+                            };
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction1);
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toMatchObject(expectedReportAction4);
+                        },
+                    });
+                });
+        });
+
+        it('Should skip if no valid reportActions', () => {
+            const setQueries: CollectionDataSet<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS> = {
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: null,
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: {},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: {},
+                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]: null,
+            };
+            return Onyx.multiSet(setQueries)
+                .then(CheckForPreviousReportActionID)
+                .then(() => {
+                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no valid reportActions');
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActions) => {
+                            const expectedReportAction = {};
+                            Onyx.disconnect(connectionID);
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toMatchObject(expectedReportAction);
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toMatchObject(expectedReportAction);
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toBeUndefined();
+                        },
+                    });
+                });
+        });
+    });
+
+    describe('KeyReportActionsDraftByReportActionID', () => {
+        it("Should work even if there's no reportActionsDrafts data in Onyx", () =>
+            KeyReportActionsDraftByReportActionID().then(() =>
+                expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsDraftByReportActionID because there were no reportActionsDrafts'),
+            ));
+
+        it('Should move individual draft to a draft collection of report', () => {
+            const setQueries: ReportActionsDraftCollectionDataSet = {};
+
+            // @ts-expect-error preset invalid value
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`] = 'a';
+            // @ts-expect-error preset invalid value
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`] = 'b';
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`] = {3: 'c'};
+            // @ts-expect-error preset invalid value
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`] = 'd';
+
+            return Onyx.multiSet(setQueries)
+                .then(KeyReportActionsDraftByReportActionID)
+                .then(() => {
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActionsDrafts) => {
+                            Onyx.disconnect(connectionID);
+                            const expectedReportActionDraft1 = {
+                                1: 'a',
+                                2: 'b',
+                            };
+                            const expectedReportActionDraft2 = {
+                                3: 'c',
+                                4: 'd',
+                            };
+                            expect(allReportActionsDrafts?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
+                            expect(allReportActionsDrafts?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`]).toBeUndefined();
+                            expect(allReportActionsDrafts?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`]).toBeUndefined();
+                            expect(allReportActionsDrafts?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1`]).toMatchObject(expectedReportActionDraft1);
+                            expect(allReportActionsDrafts?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`]).toMatchObject(expectedReportActionDraft2);
+                        },
+                    });
+                });
+        });
+
+        it('Should skip if nothing to migrate', () => {
+            const setQueries: ReportActionsDraftCollectionDataSet = {};
+
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`] = {};
+
+            return Onyx.multiSet(setQueries)
+                .then(KeyReportActionsDraftByReportActionID)
+                .then(() => {
+                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsDraftByReportActionID because there are no actions drafts to migrate');
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActions) => {
+                            Onyx.disconnect(connectionID);
+                            const expectedReportActionDraft = {};
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`]).toBeUndefined();
+                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`]).toMatchObject(expectedReportActionDraft);
+                        },
+                    });
+                });
+        });
+
+        it("Shouldn't move empty individual draft to a draft collection of report", () => {
+            const setQueries: ReportActionsDraftCollectionDataSet = {};
+
+            // @ts-expect-error preset empty string value
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`] = '';
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1`] = {};
+
+            return Onyx.multiSet(setQueries)
+                .then(KeyReportActionsDraftByReportActionID)
+                .then(() => {
+                    const connectionID = Onyx.connect({
+                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+                        waitForCollectionCallback: true,
+                        callback: (allReportActionsDrafts) => {
+                            Onyx.disconnect(connectionID);
+                            expect(allReportActionsDrafts?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
+                        },
+                    });
+                });
+        });
+    });
+});
diff --git a/tests/unit/NetworkTest.js b/tests/unit/NetworkTest.ts
similarity index 87%
rename from tests/unit/NetworkTest.js
rename to tests/unit/NetworkTest.ts
index 29f5e344b35a..63b275a1a6b6 100644
--- a/tests/unit/NetworkTest.js
+++ b/tests/unit/NetworkTest.ts
@@ -1,21 +1,24 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import CONST from '../../src/CONST';
-import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
-import * as PersistedRequests from '../../src/libs/actions/PersistedRequests';
-import * as PersonalDetails from '../../src/libs/actions/PersonalDetails';
-import * as Session from '../../src/libs/actions/Session';
-import HttpUtils from '../../src/libs/HttpUtils';
-import Log from '../../src/libs/Log';
-import * as Network from '../../src/libs/Network';
-import * as MainQueue from '../../src/libs/Network/MainQueue';
-import * as NetworkStore from '../../src/libs/Network/NetworkStore';
-import NetworkConnection from '../../src/libs/NetworkConnection';
-import ONYXKEYS from '../../src/ONYXKEYS';
+import type {Mock} from 'jest-mock';
+import MockedOnyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as PersistedRequests from '@src/libs/actions/PersistedRequests';
+import * as PersonalDetails from '@src/libs/actions/PersonalDetails';
+import * as Session from '@src/libs/actions/Session';
+import HttpUtils from '@src/libs/HttpUtils';
+import Log from '@src/libs/Log';
+import * as Network from '@src/libs/Network';
+import * as MainQueue from '@src/libs/Network/MainQueue';
+import * as NetworkStore from '@src/libs/Network/NetworkStore';
+import NetworkConnection from '@src/libs/NetworkConnection';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type ReactNativeOnyxMock from '../../__mocks__/react-native-onyx';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
-jest.mock('../../src/libs/Log');
+const Onyx = MockedOnyx as typeof ReactNativeOnyxMock;
+
+jest.mock('@src/libs/Log');
 
 Onyx.init({
     keys: ONYXKEYS,
@@ -25,6 +28,7 @@ OnyxUpdateManager();
 const originalXHR = HttpUtils.xhr;
 
 beforeEach(() => {
+    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
     HttpUtils.xhr = originalXHR;
     MainQueue.clear();
@@ -50,7 +54,7 @@ describe('NetworkTests', () => {
         const TEST_USER_LOGIN = 'test@testguy.com';
         const TEST_USER_ACCOUNT_ID = 1;
 
-        let isOffline;
+        let isOffline: boolean | null = null;
 
         Onyx.connect({
             key: ONYXKEYS.NETWORK,
@@ -67,8 +71,9 @@ describe('NetworkTests', () => {
             global.fetch = jest.fn().mockRejectedValue(new TypeError(CONST.ERROR.FAILED_TO_FETCH));
 
             const actualXhr = HttpUtils.xhr;
-            HttpUtils.xhr = jest.fn();
-            HttpUtils.xhr
+
+            const mockedXhr = jest.fn();
+            mockedXhr
                 .mockImplementationOnce(() =>
                     Promise.resolve({
                         jsonCode: CONST.JSON_CODE.NOT_AUTHENTICATED,
@@ -100,6 +105,8 @@ describe('NetworkTests', () => {
                     }),
                 );
 
+            HttpUtils.xhr = mockedXhr;
+
             // This should first trigger re-authentication and then a Failed to fetch
             PersonalDetails.openPersonalDetails();
             return waitForBatchedUpdates()
@@ -113,8 +120,8 @@ describe('NetworkTests', () => {
                 })
                 .then(() => {
                     // Then we will eventually have 1 call to OpenPersonalDetailsPage and 1 calls to Authenticate
-                    const callsToOpenPersonalDetails = _.filter(HttpUtils.xhr.mock.calls, ([command]) => command === 'OpenPersonalDetailsPage');
-                    const callsToAuthenticate = _.filter(HttpUtils.xhr.mock.calls, ([command]) => command === 'Authenticate');
+                    const callsToOpenPersonalDetails = (HttpUtils.xhr as Mock).mock.calls.filter(([command]) => command === 'OpenPersonalDetailsPage');
+                    const callsToAuthenticate = (HttpUtils.xhr as Mock).mock.calls.filter(([command]) => command === 'Authenticate');
 
                     expect(callsToOpenPersonalDetails.length).toBe(1);
                     expect(callsToAuthenticate.length).toBe(1);
@@ -133,8 +140,8 @@ describe('NetworkTests', () => {
         // When we sign in
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
             .then(() => {
-                HttpUtils.xhr = jest.fn();
-                HttpUtils.xhr
+                const mockedXhr = jest.fn();
+                mockedXhr
 
                     // And mock the first call to openPersonalDetails return with an expired session code
                     .mockImplementationOnce(() =>
@@ -164,6 +171,8 @@ describe('NetworkTests', () => {
                         }),
                     );
 
+                HttpUtils.xhr = mockedXhr;
+
                 // And then make 3 API READ requests in quick succession with an expired authToken and handle the response
                 // It doesn't matter which requests these are really as all the response is mocked we just want to see
                 // that we get re-authenticated
@@ -175,8 +184,8 @@ describe('NetworkTests', () => {
             .then(() => {
                 // We should expect to see the three calls to OpenApp, but only one call to Authenticate.
                 // And we should also see the reconnection callbacks triggered.
-                const callsToOpenPersonalDetails = _.filter(HttpUtils.xhr.mock.calls, ([command]) => command === 'OpenPersonalDetailsPage');
-                const callsToAuthenticate = _.filter(HttpUtils.xhr.mock.calls, ([command]) => command === 'Authenticate');
+                const callsToOpenPersonalDetails = (HttpUtils.xhr as Mock).mock.calls.filter(([command]) => command === 'OpenPersonalDetailsPage');
+                const callsToAuthenticate = (HttpUtils.xhr as Mock).mock.calls.filter(([command]) => command === 'Authenticate');
                 expect(callsToOpenPersonalDetails.length).toBe(3);
                 expect(callsToAuthenticate.length).toBe(1);
                 expect(reconnectionCallbacksSpy.mock.calls.length).toBe(3);
diff --git a/tests/utils/PusherHelper.ts b/tests/utils/PusherHelper.ts
index dcd144e77596..9f0f71baafd3 100644
--- a/tests/utils/PusherHelper.ts
+++ b/tests/utils/PusherHelper.ts
@@ -1,8 +1,8 @@
-import type {OnyxUpdate} from 'react-native-onyx';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import * as Pusher from '@src/libs/Pusher/pusher';
 import PusherConnectionManager from '@src/libs/PusherConnectionManager';
+import type {OnyxServerUpdate} from '@src/types/onyx/OnyxUpdatesFromServer';
 import asMutable from '@src/types/utils/asMutable';
 
 const CHANNEL_NAME = `${CONST.PUSHER.PRIVATE_USER_CHANNEL_PREFIX}1${CONFIG.PUSHER.SUFFIX}`;
@@ -20,11 +20,11 @@ function setup() {
     Pusher.init({
         appKey: CONFIG.PUSHER.APP_KEY,
         cluster: CONFIG.PUSHER.CLUSTER,
-        authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api?command=AuthenticatePusher`,
+        authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/AuthenticatePusher?`,
     });
 }
 
-function emitOnyxUpdate(args: OnyxUpdate[]) {
+function emitOnyxUpdate(args: OnyxServerUpdate[]) {
     const channel = Pusher.getChannel(CHANNEL_NAME);
     channel?.emit(Pusher.TYPE.MULTIPLE_EVENTS, {
         type: 'pusher',
diff --git a/tsconfig.json b/tsconfig.json
index 30708f63d12b..79413fdd2ca7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -48,6 +48,6 @@
         }
     },
     "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js", "**/docs/*"],
-    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*"],
+    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*", "workflow_tests"],
     "extends": "expo/tsconfig.base"
 }
diff --git a/web/proxy.js b/web/proxy.ts
similarity index 71%
rename from web/proxy.js
rename to web/proxy.ts
index 0d82ae60b678..6660db3f5e87 100644
--- a/web/proxy.js
+++ b/web/proxy.ts
@@ -1,7 +1,10 @@
-const http = require('http');
-const https = require('https');
-const proxyConfig = require('../config/proxyConfig');
-require('dotenv').config();
+import dotenv from 'dotenv';
+import http from 'http';
+import type {IncomingMessage, ServerResponse} from 'http';
+import https from 'https';
+import proxyConfig from '../config/proxyConfig';
+
+dotenv.config();
 
 if (process.env.USE_WEB_PROXY === 'false') {
     process.stdout.write('Skipping proxy as USE_WEB_PROXY was set to false.\n');
@@ -20,7 +23,7 @@ console.log(`Creating proxy with host: ${host} for production API and ${stagingH
  * possible to work on the app within a limited development
  * environment that has no local API.
  */
-const server = http.createServer((request, response) => {
+const server = http.createServer((request: IncomingMessage, response: ServerResponse) => {
     let hostname = host;
     let requestPath = request.url;
 
@@ -30,17 +33,17 @@ const server = http.createServer((request, response) => {
      * This is done because the staging api root is only intended for the proxy,
      * the actual server request must use the /api path.
      * For example,
-     * /api?command=OpenReport => request sent to production server
-     * /staging/api?command=OpenReport => request sent to staging server
-     * /staging-secure/api?command=OpenReport => request sent to secure staging server
+     * /api/OpenReport => request sent to production server
+     * /staging/api/OpenReport => request sent to staging server
+     * /staging-secure/api/OpenReport => request sent to secure staging server
      * /chat-attachments/46545... => request sent to production server
      * /receipts/w_... => request sent to production server
      * /staging/chat-attachments/46545... => request sent to staging server
      */
-    if (request.url.startsWith(proxyConfig.STAGING_SECURE)) {
+    if (request.url?.startsWith(proxyConfig.STAGING_SECURE)) {
         hostname = stagingSecureHost;
         requestPath = request.url.replace(proxyConfig.STAGING_SECURE, '/');
-    } else if (request.url.startsWith(proxyConfig.STAGING)) {
+    } else if (request.url?.startsWith(proxyConfig.STAGING)) {
         hostname = stagingHost;
         requestPath = request.url.replace(proxyConfig.STAGING, '/');
     }
@@ -52,14 +55,15 @@ const server = http.createServer((request, response) => {
         headers: {
             ...request.headers,
             host: hostname,
-            'user-agent': request.headers['user-agent'].concat(' Development-NewDot/1.0'),
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            'user-agent': request.headers['user-agent']?.concat(' Development-NewDot/1.0'),
         },
         port: 443,
     });
 
     request.pipe(proxyRequest);
     proxyRequest.on('response', (proxyResponse) => {
-        response.writeHead(proxyResponse.statusCode, proxyResponse.headers);
+        response.writeHead(proxyResponse.statusCode ?? 0, proxyResponse.headers);
         proxyResponse.pipe(response);
     });
 
diff --git a/workflow_tests/authorChecklist.test.js b/workflow_tests/authorChecklist.test.js
index 831e7f695ba4..536ef929ca02 100644
--- a/workflow_tests/authorChecklist.test.js
+++ b/workflow_tests/authorChecklist.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/authorChecklistAssertions');
 const mocks = require('./mocks/authorChecklistMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -49,7 +49,7 @@ describe('test workflow authorChecklist', () => {
             it('executes workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
@@ -68,7 +68,7 @@ describe('test workflow authorChecklist', () => {
             it('does not execute workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
@@ -93,7 +93,7 @@ describe('test workflow authorChecklist', () => {
             it('executes workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
@@ -112,7 +112,7 @@ describe('test workflow authorChecklist', () => {
             it('does not execute workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
@@ -137,7 +137,7 @@ describe('test workflow authorChecklist', () => {
             it('executes workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
@@ -156,7 +156,7 @@ describe('test workflow authorChecklist', () => {
             it('does not execute workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
diff --git a/workflow_tests/cherryPick.test.js b/workflow_tests/cherryPick.test.js
index 592170a7c64e..beae7f03b3ef 100644
--- a/workflow_tests/cherryPick.test.js
+++ b/workflow_tests/cherryPick.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/cherryPickAssertions');
 const mocks = require('./mocks/cherryPickMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -45,7 +45,7 @@ describe('test workflow cherryPick', () => {
             it('workflow ends after validate job', async () => {
                 const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(
                     act,
                     event,
@@ -95,7 +95,7 @@ describe('test workflow cherryPick', () => {
             it('behaviour is the same as with actor being the deployer', async () => {
                 const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 const testMockSteps = {
                     validateActor: mocks.CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
                     cherryPick: mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts),
@@ -147,7 +147,7 @@ describe('test workflow cherryPick', () => {
                     it('workflow executes, PR approved and merged automatically', async () => {
                         const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         const testMockSteps = {
                             validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
                         };
@@ -195,7 +195,7 @@ describe('test workflow cherryPick', () => {
                     it('workflow executes, PR auto-assigned and commented, approved and merged automatically', async () => {
                         const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         const testMockSteps = {
                             validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
                         };
@@ -246,7 +246,7 @@ describe('test workflow cherryPick', () => {
                     it('workflow executes, PR auto-assigned and commented, not merged automatically', async () => {
                         const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         const testMockSteps = {
                             validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
                         };
@@ -294,7 +294,7 @@ describe('test workflow cherryPick', () => {
                     it('workflow executes, PR auto-assigned and commented, not merged automatically', async () => {
                         const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         const testMockSteps = {
                             validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
                         };
@@ -345,7 +345,7 @@ describe('test workflow cherryPick', () => {
         it('workflow does not execute', async () => {
             const repoPath = mockGithub.repo.getPath('testCherryPickWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'cherryPick.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 event,
diff --git a/workflow_tests/cla.test.js b/workflow_tests/cla.test.js
index 301aa7587f53..cf1dfd00ca4a 100644
--- a/workflow_tests/cla.test.js
+++ b/workflow_tests/cla.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/claAssertions');
 const mocks = require('./mocks/claMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -62,7 +62,7 @@ describe('test workflow cla', () => {
             it('workflow executes, CLA assistant step not run', async () => {
                 const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
                 const testMockSteps = {
                     CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
@@ -93,7 +93,7 @@ describe('test workflow cla', () => {
             it('workflow executes, CLA assistant step run', async () => {
                 const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
                 const testMockSteps = {
                     CLA: mocks.CLA__CLA__CHECK_MATCH__STEP_MOCKS,
@@ -124,7 +124,7 @@ describe('test workflow cla', () => {
             it('workflow executes, CLA assistant step run', async () => {
                 const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
                 const testMockSteps = {
                     CLA: mocks.CLA__CLA__RECHECK_MATCH__STEP_MOCKS,
@@ -154,7 +154,7 @@ describe('test workflow cla', () => {
             it('workflow executes, CLA assistant step still run', async () => {
                 const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
                 const testMockSteps = {
                     CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
@@ -178,7 +178,7 @@ describe('test workflow cla', () => {
             };
             const repoPath = mockGithub.repo.getPath('testClaWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'cla.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
             const testMockSteps = {
                 CLA: mocks.CLA__CLA__NO_MATCHES__STEP_MOCKS,
diff --git a/workflow_tests/createNewVersion.test.js b/workflow_tests/createNewVersion.test.js
index dca1afbd9a41..08ac63ba9948 100644
--- a/workflow_tests/createNewVersion.test.js
+++ b/workflow_tests/createNewVersion.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/createNewVersionAssertions');
 const mocks = require('./mocks/createNewVersionMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000); // 90 sec
 let mockGithub;
@@ -58,7 +58,7 @@ describe('test workflow createNewVersion', () => {
             it('executes full workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -81,7 +81,7 @@ describe('test workflow createNewVersion', () => {
             it('executes full workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -104,7 +104,7 @@ describe('test workflow createNewVersion', () => {
             it('stops after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -126,7 +126,7 @@ describe('test workflow createNewVersion', () => {
             it('announces failure on Slack', async () => {
                 const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -148,7 +148,7 @@ describe('test workflow createNewVersion', () => {
         it('chooses source branch depending on the SEMVER_LEVEL', async () => {
             const repoPath = mockGithub.repo.getPath('testCreateNewVersionWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'createNewVersion.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, {SEMVER_LEVEL: 'MAJOR'});
             act = utils.setJobRunners(act, {createNewVersion: 'ubuntu-latest'}, workflowPath);
             const testMockSteps = {
diff --git a/workflow_tests/deploy.test.js b/workflow_tests/deploy.test.js
index b15a167d4702..cf5b658d3ffb 100644
--- a/workflow_tests/deploy.test.js
+++ b/workflow_tests/deploy.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/deployAssertions');
 const mocks = require('./mocks/deployMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -50,7 +50,7 @@ describe('test workflow deploy', () => {
         it('to main - nothing triggered', async () => {
             const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
@@ -77,7 +77,7 @@ describe('test workflow deploy', () => {
         it('to staging - deployStaging triggered', async () => {
             const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
@@ -104,7 +104,7 @@ describe('test workflow deploy', () => {
         it('to production - deployProduction triggered', async () => {
             const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
@@ -132,7 +132,7 @@ describe('test workflow deploy', () => {
     it('different event than push - workflow does not execute', async () => {
         const repoPath = mockGithub.repo.getPath('testDeployWorkflowRepo') || '';
         const workflowPath = path.join(repoPath, '.github', 'workflows', 'deploy.yml');
-        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        let act = new ExtendedAct(repoPath, workflowPath);
         const testMockSteps = {
             deployStaging: mocks.DEPLOY_STAGING_STEP_MOCKS,
             deployProduction: mocks.DEPLOY_PRODUCTION_STEP_MOCKS,
diff --git a/workflow_tests/deployBlocker.test.js b/workflow_tests/deployBlocker.test.js
index 2fee3d01915a..42c4f9e741f7 100644
--- a/workflow_tests/deployBlocker.test.js
+++ b/workflow_tests/deployBlocker.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/deployBlockerAssertions');
 const mocks = require('./mocks/deployBlockerMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -66,7 +66,7 @@ describe('test workflow deployBlocker', () => {
             it('runs the workflow and announces success on Slack', async () => {
                 const repoPath = mockGithub.repo.getPath('testDeployBlockerWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
                 const testMockSteps = {
                     deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
@@ -92,7 +92,7 @@ describe('test workflow deployBlocker', () => {
                 it('announces failure on Slack', async () => {
                     const repoPath = mockGithub.repo.getPath('testDeployBlockerWorkflowRepo') || '';
                     const workflowPath = path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml');
-                    let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                    let act = new ExtendedAct(repoPath, workflowPath);
                     act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
                     const testMockSteps = {
                         deployBlocker: utils.deepCopy(mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS),
@@ -132,7 +132,7 @@ describe('test workflow deployBlocker', () => {
             it('does not run workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testDeployBlockerWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
                 const testMockSteps = {
                     deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
diff --git a/workflow_tests/failureNotifier.test.js b/workflow_tests/failureNotifier.test.js
index 655d5ed64d83..d521c6cde00e 100644
--- a/workflow_tests/failureNotifier.test.js
+++ b/workflow_tests/failureNotifier.test.js
@@ -2,7 +2,7 @@ const path = require('path');
 const kieMockGithub = require('@kie/mock-github');
 const assertions = require('./assertions/failureNotifierAssertions');
 const mocks = require('./mocks/failureNotifierMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -36,7 +36,7 @@ describe('test workflow failureNotifier', () => {
     it('runs the notify failure when main fails', async () => {
         const repoPath = mockGithub.repo.getPath('testFailureNotifierWorkflowRepo') || '';
         const workflowPath = path.join(repoPath, '.github', 'workflows', 'failureNotifier.yml');
-        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        let act = new ExtendedAct(repoPath, workflowPath);
         const event = 'workflow_run';
         act = act.setEvent({
             workflow_run: {
diff --git a/workflow_tests/finishReleaseCycle.test.js b/workflow_tests/finishReleaseCycle.test.js
index 26b4d2f60afc..20ab66471d91 100644
--- a/workflow_tests/finishReleaseCycle.test.js
+++ b/workflow_tests/finishReleaseCycle.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/finishReleaseCycleAssertions');
 const mocks = require('./mocks/finishReleaseCycleMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -52,7 +52,7 @@ describe('test workflow finishReleaseCycle', () => {
                     it('production updated, new version created', async () => {
                         const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -98,7 +98,7 @@ describe('test workflow finishReleaseCycle', () => {
                     it('production not updated, new version not created, issue reopened', async () => {
                         const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -145,7 +145,7 @@ describe('test workflow finishReleaseCycle', () => {
                 it('production not updated, new version not created, issue reopened', async () => {
                     const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
                     const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
-                    let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                    let act = new ExtendedAct(repoPath, workflowPath);
                     act = utils.setUpActParams(
                         act,
                         'issues',
@@ -192,7 +192,7 @@ describe('test workflow finishReleaseCycle', () => {
             it('validate job not run', async () => {
                 const repoPath = mockGithub.repo.getPath('testFinishReleaseCycleWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'finishReleaseCycle.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(
                     act,
                     'issues',
diff --git a/workflow_tests/jest.config.js b/workflow_tests/jest.config.js
index c8a4534764e3..cecdf8589d7f 100644
--- a/workflow_tests/jest.config.js
+++ b/workflow_tests/jest.config.js
@@ -2,6 +2,7 @@ module.exports = {
     verbose: true,
     transform: {
         '^.+\\.jsx?$': 'babel-jest',
+        '^.+\\.tsx?$': 'ts-jest',
     },
     clearMocks: true,
     resetMocks: true,
diff --git a/workflow_tests/lint.test.js b/workflow_tests/lint.test.js
index bc51f31b657c..b13b4c1c3564 100644
--- a/workflow_tests/lint.test.js
+++ b/workflow_tests/lint.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/lintAssertions');
 const mocks = require('./mocks/lintMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -49,7 +49,7 @@ describe('test workflow lint', () => {
         it('runs the lint', async () => {
             const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 lint: mocks.LINT__LINT__STEP_MOCKS,
@@ -68,7 +68,7 @@ describe('test workflow lint', () => {
             it('runs the lint', async () => {
                 const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     lint: mocks.LINT__LINT__STEP_MOCKS,
@@ -93,7 +93,7 @@ describe('test workflow lint', () => {
             it('runs the lint', async () => {
                 const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     lint: mocks.LINT__LINT__STEP_MOCKS,
@@ -112,7 +112,7 @@ describe('test workflow lint', () => {
                 it('does not run the lint', async () => {
                     const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
                     const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
-                    let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                    let act = new ExtendedAct(repoPath, workflowPath);
                     act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                     const testMockSteps = {
                         lint: mocks.LINT__LINT__STEP_MOCKS,
@@ -135,7 +135,7 @@ describe('test workflow lint', () => {
             it('runs the lint', async () => {
                 const repoPath = mockGithub.repo.getPath('testLintWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'lint.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     lint: mocks.LINT__LINT__STEP_MOCKS,
diff --git a/workflow_tests/lockDeploys.test.js b/workflow_tests/lockDeploys.test.js
index a57ed8847fd3..68c78653413c 100644
--- a/workflow_tests/lockDeploys.test.js
+++ b/workflow_tests/lockDeploys.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/lockDeploysAssertions');
 const mocks = require('./mocks/lockDeploysMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -45,7 +45,7 @@ describe('test workflow lockDeploys', () => {
                     it('job triggered, comment left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -87,7 +87,7 @@ describe('test workflow lockDeploys', () => {
                     it('one step fails, comment not left in StagingDeployCash, announced failure in Slack', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -141,7 +141,7 @@ describe('test workflow lockDeploys', () => {
                     it('job not triggered, comment not left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -187,7 +187,7 @@ describe('test workflow lockDeploys', () => {
                     it('job not triggered, comment not left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -231,7 +231,7 @@ describe('test workflow lockDeploys', () => {
                     it('job not triggered, comment not left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -279,7 +279,7 @@ describe('test workflow lockDeploys', () => {
                     it('job not triggered, comment not left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -323,7 +323,7 @@ describe('test workflow lockDeploys', () => {
                     it('job not triggered, comment not left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -369,7 +369,7 @@ describe('test workflow lockDeploys', () => {
                     it('job not triggered, comment not left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
@@ -413,7 +413,7 @@ describe('test workflow lockDeploys', () => {
                     it('job not triggered, comment not left in StagingDeployCash', async () => {
                         const repoPath = mockGithub.repo.getPath('testLockDeploysWorkflowRepo') || '';
                         const workflowPath = path.join(repoPath, '.github', 'workflows', 'lockDeploys.yml');
-                        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                        let act = new ExtendedAct(repoPath, workflowPath);
                         act = utils.setUpActParams(
                             act,
                             'issues',
diff --git a/workflow_tests/platformDeploy.test.js b/workflow_tests/platformDeploy.test.js
index 6bcd5ff5b896..2215ce7f4d83 100644
--- a/workflow_tests/platformDeploy.test.js
+++ b/workflow_tests/platformDeploy.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/platformDeployAssertions');
 const mocks = require('./mocks/platformDeployMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -44,7 +44,7 @@ describe('test workflow platformDeploy', () => {
             it('as team member - platform deploy executes on staging', async () => {
                 const repoPath = mockGithub.repo.getPath('testPlatformDeployWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(
                     act,
                     'push',
@@ -126,7 +126,7 @@ describe('test workflow platformDeploy', () => {
             it('as OSBotify - platform deploy executes on staging', async () => {
                 const repoPath = mockGithub.repo.getPath('testPlatformDeployWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(
                     act,
                     'push',
@@ -208,7 +208,7 @@ describe('test workflow platformDeploy', () => {
             it('as outsider - platform deploy does not execute', async () => {
                 const repoPath = mockGithub.repo.getPath('testPlatformDeployWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'platformDeploy.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(
                     act,
                     'push',
diff --git a/workflow_tests/preDeploy.test.js b/workflow_tests/preDeploy.test.js
index 0d5b126b4430..eef80b904a91 100644
--- a/workflow_tests/preDeploy.test.js
+++ b/workflow_tests/preDeploy.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/preDeployAssertions');
 const mocks = require('./mocks/preDeployMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -47,7 +47,7 @@ describe('test workflow preDeploy', () => {
         const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
 
         // instantiate Act in the context of the test repo and given workflow file
-        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        let act = new ExtendedAct(repoPath, workflowPath);
 
         // set run parameters
         act = utils.setUpActParams(
@@ -119,7 +119,7 @@ describe('test workflow preDeploy', () => {
     it('different event than push - workflow does not execute', async () => {
         const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
         const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        let act = new ExtendedAct(repoPath, workflowPath);
         const testMockSteps = {
             confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
             chooseDeployActions: mocks.CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
@@ -212,7 +212,7 @@ describe('test workflow preDeploy', () => {
         it('typecheck job failed - workflow exits', async () => {
             const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
@@ -285,7 +285,7 @@ describe('test workflow preDeploy', () => {
         it('lint job failed - workflow exits', async () => {
             const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
@@ -356,7 +356,7 @@ describe('test workflow preDeploy', () => {
         it('test job failed - workflow exits', async () => {
             const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
@@ -427,7 +427,7 @@ describe('test workflow preDeploy', () => {
         it('lint and test job succeed - workflow continues', async () => {
             const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
@@ -493,7 +493,7 @@ describe('test workflow preDeploy', () => {
             it('not automated PR - deploy skipped and comment left', async () => {
                 const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, 'push', {ref: 'refs/heads/main'}, {OS_BOTIFY_TOKEN: 'dummy_token', SLACK_WEBHOOK: 'dummy_slack_webhook'}, 'dummy_github_token');
                 const testMockSteps = {
                     confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
@@ -547,7 +547,7 @@ describe('test workflow preDeploy', () => {
             it('automated PR - deploy skipped, but no comment left', async () => {
                 const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, 'push', {ref: 'refs/heads/main'}, {OS_BOTIFY_TOKEN: 'dummy_token', SLACK_WEBHOOK: 'dummy_slack_webhook'}, 'dummy_github_token');
                 const testMockSteps = {
                     confirmPassingBuild: mocks.CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
@@ -603,7 +603,7 @@ describe('test workflow preDeploy', () => {
             it('not automated PR - proceed with deploy', async () => {
                 const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(
                     act,
                     'push',
@@ -667,7 +667,7 @@ describe('test workflow preDeploy', () => {
             it('automated PR - deploy skipped, but no comment left', async () => {
                 const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(
                     act,
                     'push',
@@ -731,7 +731,7 @@ describe('test workflow preDeploy', () => {
         it('one of updateStaging steps failed - failure announced in Slack', async () => {
             const repoPath = mockGithub.repo.getPath('testPreDeployWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'preDeploy.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(
                 act,
                 'push',
diff --git a/workflow_tests/reviewerChecklist.test.js b/workflow_tests/reviewerChecklist.test.js
index 9903c3eb4b8d..0c719a04a987 100644
--- a/workflow_tests/reviewerChecklist.test.js
+++ b/workflow_tests/reviewerChecklist.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/reviewerChecklistAssertions');
 const mocks = require('./mocks/reviewerChecklistMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -46,7 +46,7 @@ describe('test workflow reviewerChecklist', () => {
         it('runs the workflow', async () => {
             const repoPath = mockGithub.repo.getPath('testReviewerChecklistWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 checklist: mocks.REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
@@ -65,7 +65,7 @@ describe('test workflow reviewerChecklist', () => {
             it('does not run the workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testReviewerChecklistWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'reviewerChecklist.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     checklist: mocks.REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
diff --git a/workflow_tests/test.test.js b/workflow_tests/test.test.js
index 6efe8d260928..1ad8a1b48e4b 100644
--- a/workflow_tests/test.test.js
+++ b/workflow_tests/test.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/testAssertions');
 const mocks = require('./mocks/testMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -51,7 +51,7 @@ describe('test workflow test', () => {
         it('runs all tests', async () => {
             const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 jest: mocks.TEST__JEST__STEP_MOCKS,
@@ -71,7 +71,7 @@ describe('test workflow test', () => {
             it('does not run tests', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     jest: mocks.TEST__JEST__STEP_MOCKS,
@@ -98,7 +98,7 @@ describe('test workflow test', () => {
         it('runs all tests', async () => {
             const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 jest: mocks.TEST__JEST__STEP_MOCKS,
@@ -118,7 +118,7 @@ describe('test workflow test', () => {
             it('does not run tests', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     jest: mocks.TEST__JEST__STEP_MOCKS,
@@ -143,7 +143,7 @@ describe('test workflow test', () => {
         it('runs all tests', async () => {
             const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 jest: mocks.TEST__JEST__STEP_MOCKS,
@@ -163,7 +163,7 @@ describe('test workflow test', () => {
             it('runs all tests normally', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'test.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 const testMockSteps = {
                     jest: mocks.TEST__JEST__STEP_MOCKS,
diff --git a/workflow_tests/testBuild.test.js b/workflow_tests/testBuild.test.js
index 371759607ed5..7e93b0a9ac9f 100644
--- a/workflow_tests/testBuild.test.js
+++ b/workflow_tests/testBuild.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/testBuildAssertions');
 const mocks = require('./mocks/testBuildMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -62,7 +62,7 @@ describe('test workflow testBuild', () => {
         it('executes workflow', async () => {
             const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
             act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
             const testMockSteps = {
@@ -93,7 +93,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -125,7 +125,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -157,7 +157,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -189,7 +189,7 @@ describe('test workflow testBuild', () => {
             it('executes workflow, failure reflected', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -222,7 +222,7 @@ describe('test workflow testBuild', () => {
             it('executes workflow, failure reflected', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -255,7 +255,7 @@ describe('test workflow testBuild', () => {
             it('executes workflow, failure reflected', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -297,7 +297,7 @@ describe('test workflow testBuild', () => {
             it('executes workflow, failure reflected', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, {}, secrets, githubToken, {}, inputs);
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -350,7 +350,7 @@ describe('test workflow testBuild', () => {
         it('executes workflow, without getBranchRef', async () => {
             const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
             act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
             const testMockSteps = {
@@ -381,7 +381,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -413,7 +413,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -445,7 +445,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -488,7 +488,7 @@ describe('test workflow testBuild', () => {
         it('executes workflow, without getBranchRef', async () => {
             const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
             act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
             const testMockSteps = {
@@ -519,7 +519,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -551,7 +551,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -583,7 +583,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -626,7 +626,7 @@ describe('test workflow testBuild', () => {
         it('executes workflow, withuout getBranchRef', async () => {
             const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
             act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
             const testMockSteps = {
@@ -657,7 +657,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -689,7 +689,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -721,7 +721,7 @@ describe('test workflow testBuild', () => {
             it('stops the workflow after validation', async () => {
                 const repoPath = mockGithub.repo.getPath('testTestBuildWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'testBuild.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, secrets, githubToken, {});
                 act = utils.setJobRunners(act, {iOS: 'ubuntu-latest', desktop: 'ubuntu-latest', web: 'ubuntu-latest', android: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
diff --git a/workflow_tests/utils/ExtendedAct.js b/workflow_tests/utils/ExtendedAct.js
deleted file mode 100644
index 9b4ab1bebda2..000000000000
--- a/workflow_tests/utils/ExtendedAct.js
+++ /dev/null
@@ -1,44 +0,0 @@
-const kieActJs = require('@kie/act-js');
-const path = require('path');
-const _ = require('underscore');
-const JobMocker = require('./JobMocker');
-
-class ExtendedAct extends kieActJs.Act {
-    async parseRunOpts(opts) {
-        const {cwd, actArguments, proxy} = await super.parseRunOpts(opts);
-        if (opts && opts.actor) {
-            actArguments.push('--actor', opts.actor);
-        }
-        return {cwd, actArguments, proxy};
-    }
-
-    async runEvent(event, opts) {
-        const {mockJobs, ...vanillaOpts} = opts;
-        if (mockJobs) {
-            await this.handleJobMocking((workflow) => workflow.events.includes(event), {mockJobs, workflowFile: opts.workflowFile, cwd: opts.cwd});
-        }
-        return super.runEvent(event, vanillaOpts);
-    }
-
-    async handleJobMocking(filter, opts) {
-        let workflowFiles;
-        if (opts.workflowFile) {
-            workflowFiles = [path.basename(opts.workflowFile)];
-        } else if (this.workflowFile !== this.cwd) {
-            workflowFiles = [path.basename(this.workflowFile)];
-        } else {
-            workflowFiles = _(_(await this.list(undefined, opts.cwd, opts.workflowFile)).filter(filter)).map((l) => l.workflowFile);
-        }
-        return Promise.all(
-            _(workflowFiles).map((workflowFile) => {
-                // eslint-disable-next-line es/no-nullish-coalescing-operators
-                const jobMocker = new JobMocker.JobMocker(workflowFile, opts.cwd ?? this.cwd);
-                return jobMocker.mock(opts.mockJobs);
-            }),
-        );
-    }
-}
-
-module.exports = {
-    ExtendedAct,
-};
diff --git a/workflow_tests/utils/ExtendedAct.ts b/workflow_tests/utils/ExtendedAct.ts
new file mode 100644
index 000000000000..b0f4d7e159e4
--- /dev/null
+++ b/workflow_tests/utils/ExtendedAct.ts
@@ -0,0 +1,58 @@
+/* eslint-disable @typescript-eslint/dot-notation */
+// This eslint-disable comment is here to allow accessing private properties in the Act class
+import type {RunOpts, Step, Workflow} from '@kie/act-js';
+import {Act} from '@kie/act-js';
+import path from 'path';
+import JobMocker from './JobMocker';
+import type {MockJobs} from './JobMocker';
+
+type ExtendedActOpts = RunOpts & {actor?: string; workflowFile?: string; mockJobs?: MockJobs};
+
+type ActOptions = {
+    cwd: string;
+    actArguments: string[];
+    proxy: unknown;
+};
+
+// @ts-expect-error Override shouldn't be done on private methods wait until https://github.com/kiegroup/act-js/issues/77 is resolved or try to create a params workaround
+class ExtendedAct extends Act {
+    async parseRunOpts(opts?: ExtendedActOpts): Promise<ActOptions> {
+        const {cwd, actArguments, proxy} = await super['parseRunOpts'](opts);
+
+        if (opts?.actor) {
+            actArguments.push('--actor', opts.actor);
+        }
+
+        return {cwd, actArguments, proxy};
+    }
+
+    async runEvent(event: string, opts?: ExtendedActOpts): Promise<Step[]> {
+        const {mockJobs, ...vanillaOpts} = opts ?? {};
+
+        if (mockJobs) {
+            await this.handleJobMocking((workflow) => workflow.events.includes(event), {mockJobs, workflowFile: vanillaOpts.workflowFile, cwd: vanillaOpts.cwd});
+        }
+
+        return super.runEvent(event, vanillaOpts);
+    }
+
+    async handleJobMocking(filter: (workflow: Workflow) => boolean, opts: ExtendedActOpts): Promise<void[]> {
+        let workflowFiles: string[];
+
+        if (opts.workflowFile) {
+            workflowFiles = [path.basename(opts.workflowFile)];
+        } else if (this['workflowFile'] !== this['cwd']) {
+            workflowFiles = [path.basename(this['workflowFile'])];
+        } else {
+            const availableWorkflows = await this.list(undefined, opts.cwd, opts.workflowFile);
+            workflowFiles = availableWorkflows.filter(filter).map((workflow: Workflow) => workflow.workflowFile);
+        }
+
+        return workflowFiles.map((workflowFile) => {
+            const jobMocker = new JobMocker(workflowFile, opts.cwd ?? this['cwd']);
+            return jobMocker.mock(opts.mockJobs);
+        });
+    }
+}
+
+export default ExtendedAct;
diff --git a/workflow_tests/utils/JobMocker.js b/workflow_tests/utils/JobMocker.ts
similarity index 57%
rename from workflow_tests/utils/JobMocker.js
rename to workflow_tests/utils/JobMocker.ts
index a2682a657380..b6dc99771dd2 100644
--- a/workflow_tests/utils/JobMocker.js
+++ b/workflow_tests/utils/JobMocker.ts
@@ -1,17 +1,50 @@
-const fs = require('fs');
-const path = require('path');
-const yaml = require('yaml');
-const _ = require('underscore');
+import type {PathOrFileDescriptor} from 'fs';
+import fs from 'fs';
+import path from 'path';
+import yaml from 'yaml';
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+type YamlMockJob = Omit<MockJob, 'runsOn'> & {'runs-on'?: string};
+
+type YamlWorkflow = {
+    jobs: Record<string, YamlMockJob>;
+};
+
+type MockJob = {
+    steps: MockJobStep[];
+    uses?: string;
+    secrets?: string[];
+    with?: string;
+    outputs?: string[];
+    runsOn?: string;
+};
+
+type MockJobs = Record<string, MockJob>;
+
+type MockJobStep = {
+    id?: string;
+    name: string;
+    run?: string;
+    mockWith?: string;
+    with?: string;
+    envs?: string[];
+    inputs?: string[];
+};
 
 class JobMocker {
-    constructor(workflowFile, cwd) {
+    workflowFile: string;
+
+    cwd: string;
+
+    constructor(workflowFile: string, cwd: string) {
         this.workflowFile = workflowFile;
         this.cwd = cwd;
     }
 
-    async mock(mockJobs) {
+    mock(mockJobs: MockJobs = {}) {
         const filePath = this.getWorkflowPath();
-        const workflow = await this.readWorkflowFile(filePath);
+        const workflow = this.readWorkflowFile(filePath);
+
         Object.entries(mockJobs).forEach(([jobId, mockJob]) => {
             const job = this.locateJob(workflow, jobId);
             if (job) {
@@ -21,13 +54,13 @@ class JobMocker {
                 if (job.secrets) {
                     delete job.secrets;
                 }
-                let jobWith;
+                let jobWith: string | undefined;
                 if (job.with) {
                     jobWith = job.with;
                     delete job.with;
                 }
-                job.steps = _(mockJob.steps).map((step) => {
-                    const mockStep = {
+                job.steps = mockJob.steps.map((step) => {
+                    const mockStep: MockJobStep = {
                         name: step.name,
                         run: step.mockWith,
                     };
@@ -52,11 +85,11 @@ class JobMocker {
         return this.writeWorkflowFile(filePath, workflow);
     }
 
-    locateJob(workflow, jobId) {
+    locateJob(workflow: YamlWorkflow, jobId: string): YamlMockJob {
         return workflow.jobs[jobId];
     }
 
-    getWorkflowPath() {
+    getWorkflowPath(): string {
         if (fs.existsSync(path.join(this.cwd, this.workflowFile))) {
             return path.join(this.cwd, this.workflowFile);
         }
@@ -69,15 +102,16 @@ class JobMocker {
         throw new Error(`Could not locate ${this.workflowFile}`);
     }
 
-    async readWorkflowFile(location) {
-        return yaml.parse(fs.readFileSync(location, 'utf8'));
+    readWorkflowFile(location: PathOrFileDescriptor): YamlWorkflow {
+        const test: YamlWorkflow = yaml.parse(fs.readFileSync(location, 'utf8'));
+
+        return test;
     }
 
-    async writeWorkflowFile(location, data) {
+    writeWorkflowFile(location: PathOrFileDescriptor, data: YamlWorkflow) {
         return fs.writeFileSync(location, yaml.stringify(data), 'utf8');
     }
 }
 
-module.exports = {
-    JobMocker,
-};
+export default JobMocker;
+export type {MockJob, MockJobs, YamlWorkflow, YamlMockJob, MockJobStep};
diff --git a/workflow_tests/utils/preGenerateTest.js b/workflow_tests/utils/preGenerateTest.ts
similarity index 69%
rename from workflow_tests/utils/preGenerateTest.js
rename to workflow_tests/utils/preGenerateTest.ts
index df4a12f68dc6..7698e618432d 100644
--- a/workflow_tests/utils/preGenerateTest.js
+++ b/workflow_tests/utils/preGenerateTest.ts
@@ -1,9 +1,10 @@
 /* eslint no-console: ["error", { allow: ["warn", "log"] }] */
-const path = require('path');
-const {exit} = require('process');
-const fs = require('fs');
-const yaml = require('yaml');
-const _ = require('underscore');
+import type {PathLike} from 'fs';
+import fs from 'fs';
+import path from 'path';
+import {exit} from 'process';
+import yaml from 'yaml';
+import type {MockJobStep, YamlMockJob, YamlWorkflow} from './JobMocker';
 
 const workflowsDirectory = path.resolve(__dirname, '..', '..', '.github', 'workflows');
 const workflowTestsDirectory = path.resolve(__dirname, '..');
@@ -12,21 +13,21 @@ const workflowTestAssertionsDirectory = path.join(workflowTestsDirectory, 'asser
 const workflowFilePattern = '\\w+\\.yml';
 const workflowFileRegex = new RegExp(workflowFilePattern, 'g');
 
-const capitalize = (s) => (s && s.charAt(0).toUpperCase() + s.slice(1)) || '';
-const mockFileTemplate = (mockSteps, exports) => `const utils = require('../utils/utils');
+const capitalize = (s: string): string => (s && s.charAt(0).toUpperCase() + s.slice(1)) || '';
+const mockFileTemplate = (mockSteps: string, exports: string) => `const utils = require('../utils/utils');
 ${mockSteps}
 ${exports}
 `;
-const assertionFileTemplate = (jobAssertions, exports) => `const utils = require('../utils/utils');
+const assertionFileTemplate = (jobAssertions: string, exports: string) => `const utils = require('../utils/utils');
 ${jobAssertions}
 ${exports}
 `;
-const testFileTemplate = (workflowName) => `const path = require('path');
+const testFileTemplate = (workflowName: string) => `const path = require('path');
 const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/${workflowName}Assertions');
 const mocks = require('./mocks/${workflowName}Mocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -73,7 +74,7 @@ describe('test workflow ${workflowName}', () => {
     it('test stub', async () => {
         const repoPath = mockGithub.repo.getPath('test${capitalize(workflowName)}WorkflowRepo') || '';
         const workflowPath = path.join(repoPath, '.github', 'workflows', '${workflowName}.yml');
-        let act = new eAct.ExtendedAct(repoPath, workflowPath);
+        let act = new ExtendedAct(repoPath, workflowPath);
         act = utils.setUpActParams(
             act,
             '[EVENT]',
@@ -95,35 +96,42 @@ describe('test workflow ${workflowName}', () => {
     });
 });
 `;
-const mockStepTemplate = (stepMockName, step, jobId) => `
+
+const mockStepTemplate = (stepMockName: string, step: MockJobStep, jobId: string | undefined) => `
 const ${stepMockName} = utils.createMockStep(
-    '${step.name || ''}',
-    '${step.name || ''}',
+    '${step.name ?? ''}',
+    '${step.name ?? ''}',
     ${jobId ? `'${jobId.toUpperCase()}'` : 'null'},
     ${step.inputs ? JSON.stringify(step.inputs).replaceAll('"', "'") : 'null'},
     ${step.envs ? JSON.stringify(step.envs).replaceAll('"', "'") : 'null'},
     // add outputs if needed
 );`;
-const stepAssertionTemplate = (step_name, job_id, step_message, inputs, envs) => `
+
+const stepAssertionTemplate = (stepName: string, jobId: string, stepMessage: string, inputs: string[] = [], envs: string[] = []): string => {
+    const inputsString = inputs.map((input) => `{key: '${input}', value: '[FILL_IN]'}`).join(',');
+    const envsString = envs.map((env) => `{key: '${env}', value: '[FILL_IN]'}`).join(',');
+
+    return `
         utils.createStepAssertion(
-            '${step_name}',
+            '${stepName}',
             true,
             null,
-            '${job_id}',
-            '${step_message}',
-            [${_(inputs).map((input) => `{key: '${input}', value: '[FILL_IN]'}`)}],
-            [${_(envs).map((env) => `{key: '${env}', value: '[FILL_IN]'}`)}],
+            '${jobId}',
+            '${stepMessage}',
+            [${inputsString}],
+            [${envsString}],
         ),`;
-const jobMocksTemplate = (jobMocksName, stepMocks) => `
-const ${jobMocksName} = [${_(stepMocks).map(
-    (stepMock) => `
-    ${stepMock}`,
-)}
-];`;
-const jobAssertionTemplate = (jobAssertionName, stepAssertions) => `
+};
+
+const jobMocksTemplate = (jobMocksName: string, stepMocks: string[]): string => {
+    const stepMocksString = stepMocks.map((stepMock) => `${stepMock}`).join(',');
+
+    return `const ${jobMocksName} = [${stepMocksString}\n];`;
+};
+
+const jobAssertionTemplate = (jobAssertionName: string, stepAssertionsContent: string) => `
 const ${jobAssertionName} = (workflowResult, didExecute = true) => {
-    const steps = [${stepAssertions}
-    ];
+    const steps = [\n${stepAssertionsContent}\n];
 
     for (const expectedStep of steps) {
         if (didExecute) {
@@ -133,80 +141,84 @@ const ${jobAssertionName} = (workflowResult, didExecute = true) => {
         }
     }
 };`;
-const mocksExportsTemplate = (jobMocks) => `
-module.exports = {
-    ${_(jobMocks).map((jobMock) => `${jobMock}`)}
-};`;
-const assertionsExportsTemplate = (jobAssertions) => `
-module.exports = {
-    ${_(jobAssertions).map((jobAssertion) => `${jobAssertion}`)}
-};`;
 
-const checkArguments = (args) => {
+const mocksExportsTemplate = (jobMocks: string[]): string => {
+    const jobMocksString = jobMocks.map((jobMock) => `  ${jobMock}: ${jobMock}`).join(',\n');
+
+    return `module.exports = {\n${jobMocksString}\n};\n`;
+};
+
+const assertionsExportsTemplate = (jobAssertions: string[]): string => {
+    const assertionsString = jobAssertions.map((assertion) => `  ${assertion}: ${assertion}`).join(',\n');
+
+    return `module.exports = {\n${assertionsString}\n};\n`;
+};
+
+const checkArguments = (args: string[]) => {
     if (args.length > 0 && args[0]) {
         return;
     }
     console.warn('Please provide workflow file name');
     exit(1);
 };
-const checkWorkflowFileName = (fileName) => {
+const checkWorkflowFileName = (fileName: string) => {
     if (workflowFileRegex.test(fileName)) {
         return;
     }
     console.warn(`Please provide a valid workflow file name ([workflow].yml) instead of ${fileName}`);
     exit(1);
 };
-const checkWorkflowFilePath = (filePath) => {
+const checkWorkflowFilePath = (filePath: PathLike) => {
     if (fs.existsSync(filePath)) {
         return;
     }
-    console.warn(`Provided workflow file does not exist: ${filePath}`);
+    console.warn(`Provided workflow file does not exist: ${filePath.toString()}`);
     exit(1);
 };
-const checkIfTestFileExists = (testsDirectory, testFileName) => {
+const checkIfTestFileExists = (testsDirectory: string, testFileName: string) => {
     if (!fs.existsSync(path.join(testsDirectory, testFileName))) {
         return;
     }
     console.warn(`The test file ${testFileName} already exists, exiting`);
     exit(1);
 };
-const checkIfMocksFileExists = (mocksDirectory, mocksFileName) => {
+const checkIfMocksFileExists = (mocksDirectory: string, mocksFileName: string) => {
     if (!fs.existsSync(path.join(mocksDirectory, mocksFileName))) {
         return;
     }
     console.warn(`The mocks file ${mocksFileName} already exists, exiting`);
     exit(1);
 };
-const checkIfAssertionsFileExists = (assertionsDirectory, assertionsFileName) => {
+const checkIfAssertionsFileExists = (assertionsDirectory: string, assertionsFileName: string) => {
     if (!fs.existsSync(path.join(assertionsDirectory, assertionsFileName))) {
         return;
     }
     console.warn(`The assertions file ${assertionsFileName} already exists, exiting`);
     exit(1);
 };
-const parseWorkflowFile = (workflow) => {
-    const workflowJobs = {};
+const parseWorkflowFile = (workflow: YamlWorkflow) => {
+    const workflowJobs: Record<string, YamlMockJob> = {};
     Object.entries(workflow.jobs).forEach(([jobId, job]) => {
         workflowJobs[jobId] = {
             steps: [],
         };
         job.steps.forEach((step) => {
             const workflowStep = {
-                name: step.name || '',
-                inputs: _.keys(step.with || {}) || [],
-                envs: _.keys(step.env || {}) || [],
+                name: step.name,
+                inputs: Object.keys(step.with ?? {}),
+                envs: step.envs ?? [],
             };
             workflowJobs[jobId].steps.push(workflowStep);
         });
     });
     return workflowJobs;
 };
-const getMockFileContent = (workflowName, jobs) => {
+const getMockFileContent = (workflowName: string, jobs: Record<string, YamlMockJob>): string => {
     let content = '';
-    const jobMocks = [];
+    const jobMocks: string[] = [];
     Object.entries(jobs).forEach(([jobId, job]) => {
         let mockStepsContent = `\n// ${jobId.toLowerCase()}`;
-        const stepMocks = [];
+        const stepMocks: string[] = [];
         job.steps.forEach((step) => {
             const stepMockName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__${step.name
                 .replaceAll(' ', '_')
@@ -224,9 +236,9 @@ const getMockFileContent = (workflowName, jobs) => {
     });
     return mockFileTemplate(content, mocksExportsTemplate(jobMocks));
 };
-const getAssertionsFileContent = (workflowName, jobs) => {
+const getAssertionsFileContent = (jobs: Record<string, YamlMockJob>): string => {
     let content = '';
-    const jobAssertions = [];
+    const jobAssertions: string[] = [];
     Object.entries(jobs).forEach(([jobId, job]) => {
         let stepAssertionsContent = '';
         job.steps.forEach((step) => {
@@ -238,12 +250,12 @@ const getAssertionsFileContent = (workflowName, jobs) => {
     });
     return assertionFileTemplate(content, assertionsExportsTemplate(jobAssertions));
 };
-const getTestFileContent = (workflowName) => testFileTemplate(workflowName);
+const getTestFileContent = (workflowName: string): string => testFileTemplate(workflowName);
 
-const call_args = process.argv.slice(2);
-checkArguments(call_args);
+const callArgs = process.argv.slice(2);
+checkArguments(callArgs);
 
-const workflowFileName = call_args[0];
+const workflowFileName = callArgs[0];
 checkWorkflowFileName(workflowFileName);
 
 const workflowName = workflowFileName.slice(0, -4);
@@ -268,13 +280,13 @@ console.log(`Creating mock file ${mockFilePath}`);
 fs.writeFileSync(mockFilePath, mockFileContent);
 console.log(`Mock file ${mockFilePath} created`);
 
-const assertionsFileContent = getAssertionsFileContent(workflowName, workflowJobs);
+const assertionsFileContent = getAssertionsFileContent(workflowJobs);
 const assertionsFilePath = path.join(workflowTestAssertionsDirectory, workflowTestAssertionsFileName);
 console.log(`Creating assertions file ${assertionsFilePath}`);
 fs.writeFileSync(assertionsFilePath, assertionsFileContent);
 console.log(`Assertions file ${assertionsFilePath} created`);
 
-const testFileContent = getTestFileContent(workflowName, workflowJobs);
+const testFileContent = getTestFileContent(workflowName);
 const testFilePath = path.join(workflowTestsDirectory, workflowTestFileName);
 console.log(`Creating test file ${testFilePath}`);
 fs.writeFileSync(testFilePath, testFileContent);
diff --git a/workflow_tests/utils/utils.js b/workflow_tests/utils/utils.ts
similarity index 58%
rename from workflow_tests/utils/utils.js
rename to workflow_tests/utils/utils.ts
index 32e106cfb1de..dcc04aee02de 100644
--- a/workflow_tests/utils/utils.js
+++ b/workflow_tests/utils/utils.ts
@@ -1,9 +1,31 @@
-const yaml = require('yaml');
-const fs = require('fs');
-const path = require('path');
+import type {StepIdentifier} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
+import fs from 'fs';
+import path from 'path';
+import yaml from 'yaml';
+import type ExtendedAct from './ExtendedAct';
+
+type EventOptions = {
+    action?: string;
+};
+
+type StepAssertionInputEntry = {key: string; value: string};
+
+type StepAssertion = {
+    name: string;
+    status: number;
+    output: string;
+};
 
-function setUpActParams(act, event = null, eventOptions = null, secrets = null, githubToken = null, envVars = null, inputs = null) {
-    let updated_act = act;
+function setUpActParams(
+    act: ExtendedAct,
+    event: string | null = null,
+    eventOptions: EventOptions | null = null,
+    secrets: Record<string, string> | null = null,
+    githubToken: string | null = null,
+    envVars: Record<string, string> | null = null,
+    inputs: Record<string, string> | null = null,
+): ExtendedAct {
+    let updatedAct = act;
 
     if (event && eventOptions) {
         // according to `Act` docs event data should be under the key with the event name (`[event]: eventOptions`), but
@@ -13,39 +35,49 @@ function setUpActParams(act, event = null, eventOptions = null, secrets = null,
             [event]: eventOptions,
             ...eventOptions,
         };
-        updated_act = updated_act.setEvent(eventData);
+        updatedAct = updatedAct.setEvent(eventData);
     }
 
     if (secrets) {
         Object.entries(secrets).forEach(([key, value]) => {
-            updated_act = updated_act.setSecret(key, value);
+            updatedAct = updatedAct.setSecret(key, value);
         });
     }
 
     if (githubToken) {
-        updated_act = updated_act.setGithubToken(githubToken);
+        updatedAct = updatedAct.setGithubToken(githubToken);
     }
 
     if (envVars) {
         Object.entries(envVars).forEach(([key, value]) => {
-            updated_act = updated_act.setEnv(key, value);
+            updatedAct = updatedAct.setEnv(key, value);
         });
     }
 
     if (inputs) {
         Object.entries(inputs).forEach(([key, value]) => {
-            updated_act = updated_act.setInput(key, value);
+            updatedAct = updatedAct.setInput(key, value);
         });
     }
 
-    return updated_act;
+    return updatedAct;
 }
 
-function createMockStep(name, message, job_id = null, inputs = null, in_envs = null, outputs = null, out_envs = null, isSuccessful = true, id = null) {
+function createMockStep(
+    name: string,
+    message: string,
+    jobId: string | null = null,
+    inputs: string[] | null = null,
+    inEnvs: string[] | null = null,
+    outputs: Record<string, string> | null = null,
+    outEnvs: Record<string, string> | null = null,
+    isSuccessful = true,
+    id: string | null = null,
+): StepIdentifier {
     const mockStepName = name;
     let mockWithCommand = 'echo [MOCK]';
-    if (job_id) {
-        mockWithCommand += ` [${job_id}]`;
+    if (jobId) {
+        mockWithCommand += ` [${jobId}]`;
     }
     mockWithCommand += ` ${message}`;
     if (inputs) {
@@ -53,8 +85,8 @@ function createMockStep(name, message, job_id = null, inputs = null, in_envs = n
             mockWithCommand += `, ${input}="\${{ inputs.${input} && inputs.${input} || github.event.inputs.${input} }}"`;
         });
     }
-    if (in_envs) {
-        in_envs.forEach((env) => {
+    if (inEnvs) {
+        inEnvs.forEach((env) => {
             mockWithCommand += `, ${env}="\${{ env.${env} }}"`;
         });
     }
@@ -63,29 +95,41 @@ function createMockStep(name, message, job_id = null, inputs = null, in_envs = n
             mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_OUTPUT"`;
         });
     }
-    if (out_envs) {
-        Object.entries(out_envs).forEach(([key, value]) => {
+    if (outEnvs) {
+        Object.entries(outEnvs).forEach(([key, value]) => {
             mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_ENV"`;
         });
     }
     if (!isSuccessful) {
         mockWithCommand += '\nexit 1';
     }
-    const mockStep = {
+    if (!id) {
+        return {
+            name: mockStepName,
+            mockWith: mockWithCommand,
+        };
+    }
+
+    return {
+        id,
         name: mockStepName,
         mockWith: mockWithCommand,
     };
-    if (id) {
-        mockStep.id = id;
-    }
-    return mockStep;
 }
 
-function createStepAssertion(name, isSuccessful = true, expectedOutput = null, jobId = null, message = null, inputs = null, envs = null) {
+function createStepAssertion(
+    name: string,
+    isSuccessful = true,
+    expectedOutput: string | null = null,
+    jobId: string | null = null,
+    message: string | null = null,
+    inputs: StepAssertionInputEntry[] | null = null,
+    envs: StepAssertionInputEntry[] | null = null,
+): StepAssertion {
     const stepName = `Main ${name}`;
     const stepStatus = isSuccessful ? 0 : 1;
-    let stepOutput;
-    if (expectedOutput !== undefined && expectedOutput !== null) {
+    let stepOutput: string;
+    if (expectedOutput !== null) {
         stepOutput = expectedOutput;
     } else {
         stepOutput = '[MOCK]';
@@ -113,7 +157,7 @@ function createStepAssertion(name, isSuccessful = true, expectedOutput = null, j
     };
 }
 
-function setJobRunners(act, jobs, workflowPath) {
+function setJobRunners(act: ExtendedAct, jobs: Record<string, string>, workflowPath: string): ExtendedAct {
     if (!act || !jobs || !workflowPath) {
         return act;
     }
@@ -127,11 +171,15 @@ function setJobRunners(act, jobs, workflowPath) {
     return act;
 }
 
-function deepCopy(originalObject) {
-    return JSON.parse(JSON.stringify(originalObject));
+function deepCopy<TObject>(originalObject: TObject): TObject {
+    return JSON.parse(JSON.stringify(originalObject)) as TObject;
 }
 
-function getLogFilePath(workflowName, testName) {
+function getLogFilePath(workflowName: string, testName: string | undefined): string {
+    if (!testName) {
+        throw new Error();
+    }
+
     const logsDir = path.resolve(__dirname, '..', 'logs');
     if (!fs.existsSync(logsDir)) {
         fs.mkdirSync(logsDir);
@@ -166,13 +214,4 @@ const FILES_TO_COPY_INTO_TEST_REPO = [
     },
 ];
 
-module.exports = {
-    setUpActParams,
-    createMockStep,
-    createStepAssertion,
-    setJobRunners,
-    deepCopy,
-    getLogFilePath,
-    FILES_TO_COPY_INTO_TEST_REPO,
-    removeMockRepoDir,
-};
+export {setUpActParams, createMockStep, createStepAssertion, setJobRunners, deepCopy, getLogFilePath, FILES_TO_COPY_INTO_TEST_REPO, removeMockRepoDir};
diff --git a/workflow_tests/validateGithubActions.test.js b/workflow_tests/validateGithubActions.test.js
index dfa5e9362ce7..5a18d4b0efff 100644
--- a/workflow_tests/validateGithubActions.test.js
+++ b/workflow_tests/validateGithubActions.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/validateGithubActionsAssertions');
 const mocks = require('./mocks/validateGithubActionsMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -49,7 +49,7 @@ describe('test workflow validateGithubActions', () => {
         it('executes verification', async () => {
             const repoPath = mockGithub.repo.getPath('testValidateGithubActionsWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 verify: mocks.VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
@@ -72,7 +72,7 @@ describe('test workflow validateGithubActions', () => {
         it('executes verification', async () => {
             const repoPath = mockGithub.repo.getPath('testValidateGithubActionsWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'validateGithubActions.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 verify: mocks.VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
diff --git a/workflow_tests/verifyPodfile.test.js b/workflow_tests/verifyPodfile.test.js
index de062af2a2c2..e90ef8daadd3 100644
--- a/workflow_tests/verifyPodfile.test.js
+++ b/workflow_tests/verifyPodfile.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/verifyPodfileAssertions');
 const mocks = require('./mocks/verifyPodfileMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -50,7 +50,7 @@ describe('test workflow verifyPodfile', () => {
         it('executes workflow', async () => {
             const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
             const testMockSteps = {
@@ -69,7 +69,7 @@ describe('test workflow verifyPodfile', () => {
             it('does not execute workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
@@ -94,7 +94,7 @@ describe('test workflow verifyPodfile', () => {
         it('executes workflow', async () => {
             const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
             const testMockSteps = {
@@ -113,7 +113,7 @@ describe('test workflow verifyPodfile', () => {
             it('does not execute workflow', async () => {
                 const repoPath = mockGithub.repo.getPath('testVerifyPodfileWorkflowRepo') || '';
                 const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifyPodfile.yml');
-                let act = new eAct.ExtendedAct(repoPath, workflowPath);
+                let act = new ExtendedAct(repoPath, workflowPath);
                 act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
                 act = utils.setJobRunners(act, {verify: 'ubuntu-latest'}, workflowPath);
                 const testMockSteps = {
diff --git a/workflow_tests/verifySignedCommits.test.js b/workflow_tests/verifySignedCommits.test.js
index 911208e91f4a..de4df3093715 100644
--- a/workflow_tests/verifySignedCommits.test.js
+++ b/workflow_tests/verifySignedCommits.test.js
@@ -3,7 +3,7 @@ const kieMockGithub = require('@kie/mock-github');
 const utils = require('./utils/utils');
 const assertions = require('./assertions/verifySignedCommitsAssertions');
 const mocks = require('./mocks/verifySignedCommitsMocks');
-const eAct = require('./utils/ExtendedAct');
+const ExtendedAct = require('./utils/ExtendedAct').default;
 
 jest.setTimeout(90 * 1000);
 let mockGithub;
@@ -49,7 +49,7 @@ describe('test workflow verifySignedCommits', () => {
         it('test stub', async () => {
             const repoPath = mockGithub.repo.getPath('testVerifySignedCommitsWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 verifySignedCommits: mocks.VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
@@ -72,7 +72,7 @@ describe('test workflow verifySignedCommits', () => {
         it('test stub', async () => {
             const repoPath = mockGithub.repo.getPath('testVerifySignedCommitsWorkflowRepo') || '';
             const workflowPath = path.join(repoPath, '.github', 'workflows', 'verifySignedCommits.yml');
-            let act = new eAct.ExtendedAct(repoPath, workflowPath);
+            let act = new ExtendedAct(repoPath, workflowPath);
             act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
             const testMockSteps = {
                 verifySignedCommits: mocks.VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,